Merge branch 'dev' into shadcn-mobile-menu

Author: pettinarip

package.json

@@ -35,6 +35,7 @@
     "@emotion/styled": "^11.11.0",
     "@hookform/resolvers": "^3.8.0",
     "@radix-ui/react-accordion": "^1.2.0",
+    "@radix-ui/react-checkbox": "^1.1.1",
     "@radix-ui/react-dialog": "^1.1.1",
     "@radix-ui/react-navigation-menu": "^1.2.0",
     "@radix-ui/react-popover": "^1.1.1",

src/layouts/BaseLayout.tsx

@@ -52,7 +52,7 @@ export const BaseLayout = ({
        * layout on initial load.
        */}
       <SkipLink />
-      <div className="max-w-screen-2xl mx-auto">
+      <div className="mx-auto max-w-screen-2xl">
         <Nav />
 
         {/* TODO: FIX TRANSLATION BANNER LOGIC FOR https://github.com/ethereum/ethereum-org-website/issues/11305 */}

tailwind.config.ts

@@ -1,4 +1,5 @@
 import type { Config } from "tailwindcss"
+import plugin from "tailwindcss/plugin"
 
 const config = {
   darkMode: ["class"],
@@ -189,7 +190,24 @@ const config = {
       },
     },
   },
-  plugins: [require("tailwindcss-animate")],
+  plugins: [
+    require("tailwindcss-animate"),
+    plugin(function ({ matchVariant }) {
+      // The :not() pseudo-class. `i.e. not-[:checked]`
+      matchVariant(
+        "not",
+        (value) => {
+          return `&:not(${value})`
+        },
+        {
+          values: {
+            // not-disabled => ":not(:disabled)"
+            disabled: ":disabled",
+          },
+        }
+      )
+    }),
+  ],
 } satisfies Config
 
 export default config

tailwind/ui/Checkbox.tsx

@@ -0,0 +1,30 @@
+import * as React from "react"
+import { RxCheck } from "react-icons/rx"
+import * as CheckboxPrimitive from "@radix-ui/react-checkbox"
+
+import { cn } from "@/lib/utils/cn"
+
+export type CheckboxProps = React.ComponentPropsWithoutRef<
+  typeof CheckboxPrimitive.Root
+>
+
+const Checkbox = React.forwardRef<
+  React.ElementRef<typeof CheckboxPrimitive.Root>,
+  CheckboxProps
+>(({ className, ...props }, ref) => (
+  <CheckboxPrimitive.Root
+    ref={ref}
+    className={cn(
+      "size-4 rounded-sm border border-body-medium text-background hover:border-primary-high-contrast hover:bg-body-light focus-visible:outline-offset-4 focus-visible:outline-primary-hover disabled:cursor-not-allowed disabled:border-disabled disabled:bg-disabled aria-[invalid]:border-error aria-[invalid]:bg-error-light data-[state='checked']:not-disabled:border-primary data-[state='checked']:not-disabled:bg-primary data-[state='checked']:hover:not-disabled:bg-primary-hover",
+      className
+    )}
+    {...props}
+  >
+    <CheckboxPrimitive.Indicator className="flex items-center justify-center">
+      <RxCheck className="text-sm" />
+    </CheckboxPrimitive.Indicator>
+  </CheckboxPrimitive.Root>
+))
+Checkbox.displayName = CheckboxPrimitive.Root.displayName
+
+export default Checkbox

tailwind/ui/Input.tsx

@@ -0,0 +1,39 @@
+import * as React from "react"
+import { cva, type VariantProps } from "class-variance-authority"
+
+import { cn } from "@/lib/utils/cn"
+
+const inputVariants = cva(
+  "rounded border border-body placeholder:text-disabled hover:not-disabled:border-primary-hover focus-visible:outline focus-visible:outline-primary-hover focus-visible:outline-[3px] focus-visible:-outline-offset-2 disabled:cursor-not-allowed disabled:border-disabled bg-background",
+  {
+    variants: {
+      size: {
+        md: "p-2",
+        sm: "p-1 text-sm",
+      },
+    },
+    defaultVariants: {
+      size: "md",
+    },
+  }
+)
+
+export interface InputProps
+  extends Omit<React.InputHTMLAttributes<HTMLInputElement>, "size">,
+    VariantProps<typeof inputVariants> {}
+
+const Input = React.forwardRef<HTMLInputElement, InputProps>(
+  ({ className, type, size, ...props }, ref) => {
+    return (
+      <input
+        type={type}
+        className={cn(inputVariants({ size, className }))}
+        ref={ref}
+        {...props}
+      />
+    )
+  }
+)
+Input.displayName = "Input"
+
+export default Input

tailwind/ui/__stories__/Checkbox.stories.tsx

@@ -0,0 +1,59 @@
+import type { Meta, StoryObj } from "@storybook/react/*"
+
+import { HStack, VStack } from "../../../src/components/ui/flex"
+import CheckboxComponent, { type CheckboxProps } from "../Checkbox"
+
+const meta = {
+  title: "Atoms / Form / ShadCN Checkbox",
+  component: CheckboxComponent,
+} satisfies Meta<typeof CheckboxComponent>
+
+export default meta
+
+const checkboxDataSet: (CheckboxProps & { label: string })[] = [
+  {
+    id: "default",
+    value: "default",
+    label: "default",
+  },
+  {
+    id: "checked",
+    value: "checked",
+    label: "checked",
+    checked: true,
+  },
+  {
+    id: "disabled",
+    value: "disabled",
+    label: "disabled",
+    disabled: true,
+  },
+  {
+    id: "disabled-checked",
+    value: "disabled-checked",
+    label: "disabled-checked",
+    disabled: true,
+    checked: true,
+  },
+  {
+    id: "invalid",
+    value: "invalid",
+    label: "invalid",
+    "aria-invalid": true,
+  },
+]
+
+export const Checkbox: StoryObj<typeof meta> = {
+  render: () => (
+    <VStack className="items-start gap-4">
+      {checkboxDataSet.map(({ label, ...props }) => (
+        <HStack key={props.id} asChild>
+          <label>
+            <CheckboxComponent {...props} />
+            {label}
+          </label>
+        </HStack>
+      ))}
+    </VStack>
+  ),
+}

tailwind/ui/__stories__/Input.stories.tsx

@@ -0,0 +1,37 @@
+import type { Meta, StoryObj } from "@storybook/react/*"
+
+import { VStack } from "../../../src/components/ui/flex"
+import Input from "../Input"
+
+const meta = {
+  title: "Atoms / Form / ShadCN Input",
+  component: Input,
+} satisfies Meta<typeof Input>
+
+export default meta
+
+type Story = StoryObj<typeof meta>
+
+export const Sizes: Story = {
+  args: {
+    placeholder: "Search",
+  },
+  render: (args) => (
+    <VStack className="w-[154px]">
+      <Input {...args} />
+      <Input {...args} size="sm" />
+    </VStack>
+  ),
+}
+
+export const ElementVariations: Story = {
+  args: {
+    placeholder: "input text",
+  },
+  render: (args) => (
+    <VStack className="w-[258px] gap-4">
+      <Input {...args} autoFocus />
+      <Input {...args} disabled />
+    </VStack>
+  ),
+}

yarn.lock

@@ -3789,6 +3789,20 @@
   dependencies:
     "@radix-ui/react-primitive" "2.0.0"
 
+"@radix-ui/react-checkbox@^1.1.1":
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/@radix-ui/react-checkbox/-/react-checkbox-1.1.1.tgz#a559c4303957d797acee99914480b755aa1f27d6"
+  integrity sha512-0i/EKJ222Afa1FE0C6pNJxDq1itzcl3HChE9DwskA4th4KRse8ojx8a1nVcOjwJdbpDLcz7uol77yYnQNMHdKw==
+  dependencies:
+    "@radix-ui/primitive" "1.1.0"
+    "@radix-ui/react-compose-refs" "1.1.0"
+    "@radix-ui/react-context" "1.1.0"
+    "@radix-ui/react-presence" "1.1.0"
+    "@radix-ui/react-primitive" "2.0.0"
+    "@radix-ui/react-use-controllable-state" "1.1.0"
+    "@radix-ui/react-use-previous" "1.1.0"
+    "@radix-ui/react-use-size" "1.1.0"
+
 "@radix-ui/[email protected]":
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/@radix-ui/react-collapsible/-/react-collapsible-1.1.0.tgz#4d49ddcc7b7d38f6c82f1fd29674f6fab5353e77"