Skip to content

fix: align timeline component dimensions based on size prop #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hitomihiumi wants to merge 2 commits into
base: main
Choose a base branch
from
Open

fix: align timeline component dimensions based on size prop #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
36fc6b6
fix: align timeline component dimensions based on size prop for consi…
hitomihiumi Mar 13, 2026
47b1997
docs: remove 'type' prop from Text component
hitomihiumi Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion apps/docs/src/content/once-ui/components/text.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,6 @@ Control the rendered tag using the `as` prop.
["variant", "TextVariant"],
["size", ["xs", "s", "m", "l", "xl"]],
["weight", ["default", "strong"]],
["type", ["display", "heading", "body", "label", "code"]],
["family", ["display", "heading", "body", "label", "code"]],
["onBackground", "`${ColorScheme}-${ColorWeight}`"],
["onSolid", "`${ColorScheme}-${ColorWeight}`"],
Expand Down
178 changes: 124 additions & 54 deletions packages/core/src/components/Timeline.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,34 +12,38 @@ export interface TimelineItem {
children?: React.ReactNode;
}

interface TimelineProps extends Omit<React.ComponentProps<typeof Flex>, 'children'> {
interface TimelineProps extends Omit<React.ComponentProps<typeof Flex>, "children"> {
items: TimelineItem[];
alignment?: "left" | "right";
size?: TShirtSizes;
}

const Timeline: React.FC<TimelineProps> = ({
items,
alignment = "left",
size = "m",
...flex
}) => {
const Timeline: React.FC<TimelineProps> = ({ items, alignment = "left", size = "m", ...flex }) => {
// Helper to get color variable for state
const getStateColor = (state: string) => {
switch (state) {
case "active": return "var(--brand-solid-strong)";
case "success": return "var(--success-solid-strong)";
case "danger": return "var(--danger-solid-strong)";
default: return "var(--neutral-solid-strong)";
case "active":
return "var(--brand-solid-strong)";
case "success":
return "var(--success-solid-strong)";
case "danger":
return "var(--danger-solid-strong)";
default:
return "var(--neutral-solid-strong)";
}
};

const dimensionSize =
size === "xs" ? "8" : size === "s" ? "24" : size === "m" ? "32" : size === "l" ? "40" : "48";
const topOffset =
size === "xs" ? "20" : size === "s" ? "12" : size === "m" ? "8" : size === "l" ? "4" : "0";

return (
<Column {...flex}>
{items.map((item, index) => {
const state = item.state || "default";
const nextState = index < items.length - 1 ? (items[index + 1].state || "default") : state;
const nextState = index < items.length - 1 ? items[index + 1].state || "default" : state;

const currentColor = getStateColor(state);
const nextColor = getStateColor(nextState);

Expand All @@ -57,41 +61,79 @@ const Timeline: React.FC<TimelineProps> = ({
{/* Marker */}
<Column
fillWidth
horizontal="center"
marginTop={isHorizontal ? undefined : index === 0 ? (size === "xl" ? "8" : size === "l" ? "12" : size === "m" ? "16" : size === "s" ? "20" : "16") : undefined}
horizontal="center"
marginTop={isHorizontal ? undefined : index === 0 ? topOffset : undefined}
paddingLeft={isHorizontal && index === 0 ? "20" : undefined}
paddingRight={isHorizontal && index === items.length - 1 ? "20" : undefined}
vertical={isHorizontal ? "center" : undefined}
direction={isHorizontal ? "row" : "column"}
minWidth={!isHorizontal ? (size === "xs" ? "8" : size === "s" ? "24" : size === "m" ? "32" : size === "l" ? "40" : "48") : undefined}
maxWidth={!isHorizontal ? (size === "xs" ? "8" : size === "s" ? "24" : size === "m" ? "32" : size === "l" ? "40" : "48") : undefined}>
minWidth={!isHorizontal ? dimensionSize : undefined}
maxWidth={!isHorizontal ? dimensionSize : undefined}
>
{index !== 0 && (
<Line
vert={!isHorizontal}
background={undefined}
solid={state === "active" ? "brand-strong" : state === "success" ? "success-strong" : state === "danger" ? "danger-strong" : "neutral-strong"}
minHeight={flex.direction === "row" ? undefined : "8"}
maxHeight={flex.direction === "row" ? undefined : "8"}
solid={
state === "active"
? "brand-strong"
: state === "success"
? "success-strong"
: state === "danger"
? "danger-strong"
: "neutral-strong"
}
minHeight={isHorizontal ? undefined : topOffset}
maxHeight={isHorizontal ? undefined : topOffset}
/>
)}
<Flex
fillWidth
center radius="full"
solid={state === "active" ? "brand-strong" : state === "success" ? "success-strong" : state === "danger" ? "danger-strong" : undefined}
background={state === "default" ? "neutral-weak" : undefined}
border={state === "success" ? "success-strong" : state === "danger" ? "danger-strong" : state === "active" ? "brand-strong" : "neutral-strong"}
minHeight={size === "xs" ? "8" : size === "s" ? "24" : size === "m" ? "32" : size === "l" ? "40" : "48"}
maxHeight={size === "xs" ? "8" : size === "s" ? "24" : size === "m" ? "32" : size === "l" ? "40" : "48"}
minWidth={size === "xs" ? "8" : size === "s" ? "24" : size === "m" ? "32" : size === "l" ? "40" : "48"}
maxWidth={size === "xs" ? "8" : size === "s" ? "24" : size === "m" ? "32" : size === "l" ? "40" : "48"}>
{item.marker && (
<Flex
center
onSolid={state === "active" ? "brand-strong" : state === "success" ? "success-strong" : state === "danger" ? "danger-strong" : undefined}
onBackground={state === "default" ? "neutral-weak" : undefined}
textVariant="label-default-m">
{item.marker}
</Flex>
)}
</Flex>
<Flex
fillWidth
center
radius="full"
solid={
state === "active"
? "brand-strong"
: state === "success"
? "success-strong"
: state === "danger"
? "danger-strong"
: undefined
}
background={state === "default" ? "neutral-weak" : undefined}
border={
state === "success"
? "success-strong"
: state === "danger"
? "danger-strong"
: state === "active"
? "brand-strong"
: "neutral-strong"
}
minHeight={dimensionSize}
maxHeight={dimensionSize}
minWidth={dimensionSize}
maxWidth={dimensionSize}
>
{item.marker && (
<Flex
center
onSolid={
state === "active"
? "brand-strong"
: state === "success"
? "success-strong"
: state === "danger"
? "danger-strong"
: undefined
}
onBackground={state === "default" ? "neutral-weak" : undefined}
textVariant="label-default-m"
>
{item.marker}
</Flex>
)}
</Flex>
{index !== items.length - 1 && (
<Line
vert={!isHorizontal}
Expand All @@ -104,22 +146,50 @@ const Timeline: React.FC<TimelineProps> = ({
{/* Content */}
<Column
fillWidth
paddingX="20" paddingTop="12" paddingBottom="24"
horizontal={isHorizontal && index === 0 ? "start" : isHorizontal && index === items.length - 1 ? "end" : isHorizontal ? "center" : undefined}
align={isHorizontal && index === 0 ? "left" : isHorizontal && index === items.length - 1 ? "right" : isHorizontal ? "center" : alignment === "right" ? "right" : undefined}
paddingX="20"
paddingTop="12"
paddingBottom="24"
horizontal={
isHorizontal && index === 0
? "start"
: isHorizontal && index === items.length - 1
? "end"
: isHorizontal
? "center"
: undefined
}
align={
isHorizontal && index === 0
? "left"
: isHorizontal && index === items.length - 1
? "right"
: isHorizontal
? "center"
: alignment === "right"
? "right"
: undefined
}
gap="2"
>
<>
{item.label && (
<Text variant="label-default-m" onBackground={state === "danger" ? "danger-weak" : undefined}>{item.label}</Text>
)}
{item.description && (
<Text variant="body-default-s" onBackground={state === "danger" ? "danger-weak" : "neutral-weak"}>
{item.description}
</Text>
)}
{item.children}
</>
<>
{item.label && (
<Text
variant="label-default-m"
onBackground={state === "danger" ? "danger-weak" : undefined}
>
{item.label}
</Text>
)}
{item.description && (
<Text
variant="body-default-s"
onBackground={state === "danger" ? "danger-weak" : "neutral-weak"}
>
{item.description}
</Text>
)}
{item.children}
</>
</Column>
</Flex>
);
Expand Down
Loading