From f1e3ba3095be6cd93fa4e63b1d7f82d76a1bca57 Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Thu, 26 Dec 2024 17:52:03 +0000 Subject: [PATCH 1/4] chore: add Collapsible component --- site/package.json | 7 ++- site/pnpm-lock.yaml | 32 +++++++++++ .../Collapsible/Collapsible.stories.tsx | 53 +++++++++++++++++++ .../components/Collapsible/Collapsible.tsx | 9 ++++ 4 files changed, 100 insertions(+), 1 deletion(-) create mode 100644 site/src/components/Collapsible/Collapsible.stories.tsx create mode 100644 site/src/components/Collapsible/Collapsible.tsx diff --git a/site/package.json b/site/package.json index 0c40a9bee2784..36db89d4c048d 100644 --- a/site/package.json +++ b/site/package.json @@ -51,6 +51,7 @@ "@mui/utils": "5.16.6", "@mui/x-tree-view": "7.18.0", "@radix-ui/react-avatar": "1.1.2", + "@radix-ui/react-collapsible": "1.1.2", "@radix-ui/react-dialog": "1.1.2", "@radix-ui/react-dropdown-menu": "2.1.4", "@radix-ui/react-label": "2.1.0", @@ -185,7 +186,11 @@ "vite-plugin-checker": "0.8.0", "vite-plugin-turbosnap": "1.0.3" }, - "browserslist": ["chrome 110", "firefox 111", "safari 16.0"], + "browserslist": [ + "chrome 110", + "firefox 111", + "safari 16.0" + ], "resolutions": { "optionator": "0.9.3", "semver": "7.6.2" diff --git a/site/pnpm-lock.yaml b/site/pnpm-lock.yaml index ec5c0b97d4762..d1650c218f7ea 100644 --- a/site/pnpm-lock.yaml +++ b/site/pnpm-lock.yaml @@ -66,6 +66,9 @@ importers: '@radix-ui/react-avatar': specifier: 1.1.2 version: 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-collapsible': + specifier: 1.1.2 + version: 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) '@radix-ui/react-dialog': specifier: 1.1.2 version: 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) @@ -1603,6 +1606,19 @@ packages: '@types/react-dom': optional: true + '@radix-ui/react-collapsible@1.1.2': + resolution: {integrity: sha512-PliMB63vxz7vggcyq0IxNYk8vGDrLXVWw4+W4B8YnwI1s18x7YZYqlG9PLX7XxAJUi0g2DxP4XKJMFHh/iVh9A==} + peerDependencies: + '@types/react': '*' + '@types/react-dom': '*' + react: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc + react-dom: ^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc + peerDependenciesMeta: + '@types/react': + optional: true + '@types/react-dom': + optional: true + '@radix-ui/react-collection@1.1.0': resolution: {integrity: sha512-GZsZslMJEyo1VKm5L1ZJY8tGDxZNPAoUeQUIbKeJfoi7Q4kmig5AsgLMYYuyYbfjd8fBmFORAIwYAkXMnXZgZw==} peerDependencies: @@ -7568,6 +7584,22 @@ snapshots: '@types/react': 18.3.12 '@types/react-dom': 18.3.1 + '@radix-ui/react-collapsible@1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': + dependencies: + '@radix-ui/primitive': 1.1.1 + '@radix-ui/react-compose-refs': 1.1.1(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-context': 1.1.1(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-id': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-presence': 1.1.2(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-primitive': 2.0.1(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + '@radix-ui/react-use-controllable-state': 1.1.0(@types/react@18.3.12)(react@18.3.1) + '@radix-ui/react-use-layout-effect': 1.1.0(@types/react@18.3.12)(react@18.3.1) + react: 18.3.1 + react-dom: 18.3.1(react@18.3.1) + optionalDependencies: + '@types/react': 18.3.12 + '@types/react-dom': 18.3.1 + '@radix-ui/react-collection@1.1.0(@types/react-dom@18.3.1)(@types/react@18.3.12)(react-dom@18.3.1(react@18.3.1))(react@18.3.1)': dependencies: '@radix-ui/react-compose-refs': 1.1.0(@types/react@18.3.12)(react@18.3.1) diff --git a/site/src/components/Collapsible/Collapsible.stories.tsx b/site/src/components/Collapsible/Collapsible.stories.tsx new file mode 100644 index 0000000000000..42e8109fefbcc --- /dev/null +++ b/site/src/components/Collapsible/Collapsible.stories.tsx @@ -0,0 +1,53 @@ +import type { Meta, StoryObj } from "@storybook/react"; +import { + Collapsible, + CollapsibleContent, + CollapsibleTrigger, +} from "./Collapsible"; +import { ChevronsUpDown } from "lucide-react"; +import { Button } from "components/Button/Button"; + +const meta: Meta = { + title: "components/Collapsible", + component: Collapsible, + args: { + className: "w-[350px] space-y-2", + children: ( + <> +
+

+ @peduarte starred 3 repositories +

+ + + +
+
+ @radix-ui/primitives +
+ +
+ @radix-ui/colors +
+
+ @stitches/react +
+ + + ), + }, +}; + +export default meta; +type Story = StoryObj; + +export const Close: Story = {}; + +export const Open: Story = { + args: { + open: true, + }, +}; diff --git a/site/src/components/Collapsible/Collapsible.tsx b/site/src/components/Collapsible/Collapsible.tsx new file mode 100644 index 0000000000000..5c28cbcc3bce7 --- /dev/null +++ b/site/src/components/Collapsible/Collapsible.tsx @@ -0,0 +1,9 @@ +import * as CollapsiblePrimitive from "@radix-ui/react-collapsible"; + +const Collapsible = CollapsiblePrimitive.Root; + +const CollapsibleTrigger = CollapsiblePrimitive.CollapsibleTrigger; + +const CollapsibleContent = CollapsiblePrimitive.CollapsibleContent; + +export { Collapsible, CollapsibleTrigger, CollapsibleContent }; From 547e5d91afd4f3aece9860def416e8d9ce8427e9 Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Thu, 26 Dec 2024 17:55:52 +0000 Subject: [PATCH 2/4] Add copied comment --- site/src/components/Collapsible/Collapsible.tsx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/site/src/components/Collapsible/Collapsible.tsx b/site/src/components/Collapsible/Collapsible.tsx index 5c28cbcc3bce7..8c9e611330cec 100644 --- a/site/src/components/Collapsible/Collapsible.tsx +++ b/site/src/components/Collapsible/Collapsible.tsx @@ -1,3 +1,8 @@ +/** + * Copied from shadc/ui on 12/26/2024 + * @see {@link https://ui.shadcn.com/docs/components/collapsible} + */ + import * as CollapsiblePrimitive from "@radix-ui/react-collapsible"; const Collapsible = CollapsiblePrimitive.Root; From 1e5d58fb0f9f7686234181def3a28e36ec30e23c Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Thu, 26 Dec 2024 18:02:22 +0000 Subject: [PATCH 3/4] Fix fmt --- site/package.json | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/site/package.json b/site/package.json index 36db89d4c048d..9ca6bac5257fa 100644 --- a/site/package.json +++ b/site/package.json @@ -186,11 +186,7 @@ "vite-plugin-checker": "0.8.0", "vite-plugin-turbosnap": "1.0.3" }, - "browserslist": [ - "chrome 110", - "firefox 111", - "safari 16.0" - ], + "browserslist": ["chrome 110", "firefox 111", "safari 16.0"], "resolutions": { "optionator": "0.9.3", "semver": "7.6.2" From c2f76e47884995435b436a6ac882357823125a0f Mon Sep 17 00:00:00 2001 From: BrunoQuaresma Date: Thu, 26 Dec 2024 18:06:34 +0000 Subject: [PATCH 4/4] Run make fmt --- site/src/components/Collapsible/Collapsible.stories.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site/src/components/Collapsible/Collapsible.stories.tsx b/site/src/components/Collapsible/Collapsible.stories.tsx index 42e8109fefbcc..cb391c4d83135 100644 --- a/site/src/components/Collapsible/Collapsible.stories.tsx +++ b/site/src/components/Collapsible/Collapsible.stories.tsx @@ -1,11 +1,11 @@ import type { Meta, StoryObj } from "@storybook/react"; +import { Button } from "components/Button/Button"; +import { ChevronsUpDown } from "lucide-react"; import { Collapsible, CollapsibleContent, CollapsibleTrigger, } from "./Collapsible"; -import { ChevronsUpDown } from "lucide-react"; -import { Button } from "components/Button/Button"; const meta: Meta = { title: "components/Collapsible",