Skip to content

Commit b1e1722

Browse files
feat: update toggle styles (#1645)
1 parent 3da4d79 commit b1e1722

File tree

5 files changed

+11
-56
lines changed

5 files changed

+11
-56
lines changed

packages/design-system/src/new-ui/ToggleGroup/ToggleGroup.tsx

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,11 @@ const ToggleGroupRoot = React.forwardRef<
1010
<Toggles.Root
1111
ref={ref}
1212
className={cn(
13-
"inline-flex flex-row space-x-px rounded bg-semantic-bg-line relative after:pointer-events-none after:content-[''] after:w-full after:h-full after:rounded-[inherit] after:border after:border-semantic-bg-line after:absolute after:top-0 after:left-0",
13+
"inline-flex flex-row h-10 space-x-1 rounded-sm bg-semantic-bg-secondary relative border-2 border-semantic-bg-line",
1414
className,
1515
)}
1616
{...props}
17+
style={{ padding: "3px" }}
1718
/>
1819
));
1920
ToggleGroupRoot.displayName = Toggles.Root.displayName;
@@ -25,8 +26,9 @@ const ToggleGroupItem = React.forwardRef<
2526
<Toggles.Item
2627
ref={ref}
2728
className={cn(
28-
"flex h-full cursor-pointer items-center justify-center bg-semantic-bg-primary px-4 py-2 text-base font-semibold",
29-
"first:rounded-l last:rounded-r focus:outline-none data-[state=on]:cursor-default data-[state=on]:bg-semantic-accent-bg data-[state=on]:text-semantic-accent-default",
29+
"transition-all duration-200 ease-in-out",
30+
"flex h-full cursor-pointer items-center justify-center text-base text-semantic-fg-disabled product-body-text-3-semibold rounded px-2.5 py-1.5 hover:bg-semantic-bg-line",
31+
"focus:outline-none data-[state=on]:shadow data-[state=on]:text-semantic-fg-primary data-[state=on]:bg-semantic-bg-primary data-[state=on]:pointer-events-none data-[state=on]:cursor-default",
3032
className,
3133
)}
3234
{...props}

packages/toolkit/src/components/ReadmeEditor.tsx

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -127,22 +127,8 @@ export const ReadmeEditor = ({
127127
value={editorMode}
128128
onValueChange={(value: EditorMode) => setEditorMode(value)}
129129
>
130-
<ToggleGroup.Item
131-
value="edit"
132-
className={
133-
editorMode === "edit" ? "pointer-events-none" : undefined
134-
}
135-
>
136-
Edit
137-
</ToggleGroup.Item>
138-
<ToggleGroup.Item
139-
value="preview"
140-
className={
141-
editorMode === "preview" ? "pointer-events-none" : undefined
142-
}
143-
>
144-
Preview
145-
</ToggleGroup.Item>
130+
<ToggleGroup.Item value="edit">Edit</ToggleGroup.Item>
131+
<ToggleGroup.Item value="preview">Preview</ToggleGroup.Item>
146132
</ToggleGroup.Root>
147133
<div className="flex flex-row gap-x-4">
148134
<Button

packages/toolkit/src/view/dashboard/DashboardContainer.tsx

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,11 @@ export const DashboardContainer = ({
3333
>
3434
<ToggleGroup.Item
3535
value="pipeline"
36-
className={type === "pipeline" ? "pointer-events-none" : undefined}
3736
>
3837
Pipeline
3938
</ToggleGroup.Item>
4039
<ToggleGroup.Item
4140
value="credit"
42-
className={type === "credit" ? "pointer-events-none" : undefined}
4341
>
4442
Credit
4543
</ToggleGroup.Item>

packages/toolkit/src/view/dashboard/UsageSwitch.tsx

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
"use client";
22

33
import { usePathname, useRouter } from "next/navigation";
4-
import cn from "clsx";
54
import { Nullable } from "instill-sdk";
65

76
import { ToggleGroup } from "@instill-ai/design-system";
@@ -46,19 +45,10 @@ export const UsageSwitch = ({
4645
type="single"
4746
value={activeTab}
4847
onValueChange={handleTabChange}
49-
className="flex !h-10 space-x-1 bg-semantic-bg-secondary p-1 rounded-sm border-semantic-bg-line w-fit border"
48+
className="w-fit"
5049
>
5150
{options.map((option) => (
52-
<ToggleGroup.Item
53-
key={option.value}
54-
value={option.value}
55-
className={cn(
56-
"flex items-center justify-center px-4 py-2 rounded transition-all duration-200 ease-in-out product-body-text-3-semibold",
57-
option.value === activeTab
58-
? "!bg-semantic-bg-primary shadow !text-semantic-fg-primary pointer-events-none"
59-
: "bg-transparent text-semantic-fg-disabled hover:bg-semantic-bg-line",
60-
)}
61-
>
51+
<ToggleGroup.Item key={option.value} value={option.value}>
6252
{option.label}
6353
</ToggleGroup.Item>
6454
))}

packages/toolkit/src/view/recipe-editor/commands/ComponentCmdo.tsx

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -594,30 +594,9 @@ export const ComponentCmdo = () => {
594594
onValueChange={(value: "component" | "event") =>
595595
onSwitchComponentType(value)
596596
}
597-
className="flex h-10 space-x-1 rounded-sm border border-semantic-bg-line bg-semantic-bg-secondary p-1"
598597
>
599-
<ToggleGroup.Item
600-
value="component"
601-
className={cn(
602-
"flex items-center justify-center rounded px-2.5 py-1.5 transition-all duration-200 ease-in-out product-body-text-3-semibold",
603-
selectingComponentType === "component"
604-
? "pointer-events-none !bg-semantic-bg-primary !text-semantic-fg-primary shadow"
605-
: "bg-transparent text-semantic-fg-disabled hover:bg-semantic-bg-line",
606-
)}
607-
>
608-
Tasks
609-
</ToggleGroup.Item>
610-
<ToggleGroup.Item
611-
value="event"
612-
className={cn(
613-
"flex items-center justify-center rounded px-2.5 py-1.5 transition-all duration-200 ease-in-out product-body-text-3-semibold",
614-
selectingComponentType === "event"
615-
? "pointer-events-none !bg-semantic-bg-primary !text-semantic-fg-primary shadow"
616-
: "bg-transparent text-semantic-fg-disabled hover:bg-semantic-bg-line",
617-
)}
618-
>
619-
Events
620-
</ToggleGroup.Item>
598+
<ToggleGroup.Item value="component">Tasks</ToggleGroup.Item>
599+
<ToggleGroup.Item value="event">Events</ToggleGroup.Item>
621600
</ToggleGroup.Root>
622601
<button
623602
onClick={() => {

0 commit comments

Comments
 (0)