feat: storybook + tw setup, link migrated to tv

apps/docs/next-redirect.js

@@ -1,17 +1,19 @@
-const shell = require('shelljs');
+const path = require("path");
-const path = require('path');
 
-const rootDir = path.join(__dirname, '.');
+const shell = require("shelljs");
-const contentDir = path.join(rootDir, 'content');
+
-const docsDir = path.join(contentDir, 'docs');
+const rootDir = path.join(__dirname, ".");
-const componentsDocsDir = path.join(docsDir, 'components');
+const contentDir = path.join(rootDir, "content");
+const docsDir = path.join(contentDir, "docs");
+const componentsDocsDir = path.join(docsDir, "components");
 
 const getComponentsName = () => {
   const names = shell
-    .ls('-R', componentsDocsDir)
+    .ls("-R", componentsDocsDir)
     .map((file) => path.join(process.cwd(), componentsDocsDir, file))
-    .filter((file) => file.endsWith('.mdx'))
+    .filter((file) => file.endsWith(".mdx"))
-    .map((file) => path.basename(file, '.mdx'));
+    .map((file) => path.basename(file, ".mdx"));
+
   return names;
 };
 const getComponentsRoute = (names = []) => {
@@ -19,60 +21,61 @@ const getComponentsRoute = (names = []) => {
     return {
       source: `/${name}`,
       destination: `/docs/components/${name}`,
-      permanent: true
+      permanent: true,
     };
   });
 };
 
 async function redirect() {
   const componentsName = getComponentsName();
+
   return [
     ...getComponentsRoute(componentsName),
     {
-      source: '/docs',
+      source: "/docs",
-      destination: '/docs/guide/getting-started',
+      destination: "/docs/guide/getting-started",
-      permanent: true
-    },
-    {
-      source: '/docs/getting-started',
-      destination: '/docs/guide/getting-started',
-      permanent: true
-    },
-    {
-      source: '/guide',
-      destination: '/docs/guide/getting-started',
-      permanent: true
-    },
-    {
-      source: '/learn',
-      destination: '/docs/guide/getting-started',
-      permanent: true
-    },
-    {
-      source: '/theme',
-      destination: '/docs/theme/default-theme',
-      permanent: true
-    },
-    {
-      source: '/docs/theme',
-      destination: '/docs/theme/default-theme',
-      permanent: true
-    },
-    {
-      source: '/components/:path*',
       permanent: true,
-      destination: '/docs/components/:path*'
     },
     {
-      source: '/docs/components',
+      source: "/docs/getting-started",
-      destination: '/docs/components/button',
+      destination: "/docs/guide/getting-started",
-      permanent: true
+      permanent: true,
     },
     {
-      source: '/components',
+      source: "/guide",
-      destination: '/docs/components/button',
+      destination: "/docs/guide/getting-started",
-      permanent: true
+      permanent: true,
-    }
+    },
+    {
+      source: "/learn",
+      destination: "/docs/guide/getting-started",
+      permanent: true,
+    },
+    {
+      source: "/theme",
+      destination: "/docs/theme/default-theme",
+      permanent: true,
+    },
+    {
+      source: "/docs/theme",
+      destination: "/docs/theme/default-theme",
+      permanent: true,
+    },
+    {
+      source: "/components/:path*",
+      permanent: true,
+      destination: "/docs/components/:path*",
+    },
+    {
+      source: "/docs/components",
+      destination: "/docs/components/button",
+      permanent: true,
+    },
+    {
+      source: "/components",
+      destination: "/docs/components/button",
+      permanent: true,
+    },
   ];
 }
 

packages/components/avatar/package.json

@@ -38,6 +38,7 @@
   },
   "dependencies": {
     "@nextui-org/system": "workspace:*",
+    "@nextui-org/theme": "workspace:*",
     "@nextui-org/shared-utils": "workspace:*",
     "@nextui-org/shared-css": "workspace:*",
     "@nextui-org/dom-utils": "workspace:*",

packages/components/avatar/src/use-avatar.ts

@@ -0,0 +1,64 @@
+import type {AriaLinkProps} from "@react-types/link";
+import type {LinkVariantProps} from "@nextui-org/theme";
+
+import {useLink as useAriaLink} from "@react-aria/link";
+import {link, twMerge} from "@nextui-org/theme";
+import {HTMLNextUIProps} from "@nextui-org/system";
+import {useDOMRef} from "@nextui-org/dom-utils";
+import {ReactRef} from "@nextui-org/shared-utils";
+import {useMemo} from "react";
+
+export interface Props extends HTMLNextUIProps<"a">, LinkVariantProps {
+  /**
+   * Ref to the DOM node.
+   */
+  ref?: ReactRef<HTMLAnchorElement | null>;
+}
+
+export type UseAvatarProps = Props & AriaLinkProps;
+
+export function useAvatar(props: UseAvatarProps) {
+  const {
+    ref,
+    as = "a",
+    color,
+    size,
+    isUnderline,
+    isBlock,
+    disableAnimation,
+    isExternal = false,
+    showAnchorIcon = false,
+    isDisabled = false,
+    className,
+    ...otherProps
+  } = props;
+
+  const domRef = useDOMRef(ref);
+
+  const {linkProps} = useAriaLink({...otherProps, elementType: `${as}`}, domRef);
+
+  if (isExternal) {
+    otherProps.rel = otherProps.rel ?? "noopener";
+    otherProps.target = otherProps.target ?? "_blank";
+  }
+
+  const classes = useMemo(
+    () =>
+      twMerge(
+        link({
+          color,
+          size,
+          isUnderline,
+          isBlock,
+          isDisabled,
+          disableAnimation,
+        }),
+        className,
+      ),
+    [color, size, isUnderline, isBlock, isDisabled, disableAnimation, className],
+  );
+
+  return {as, classes, domRef, linkProps, showAnchorIcon, isDisabled, ...otherProps};
+}
+
+export type UseLinkReturn = ReturnType<typeof useLink>;

packages/components/link/src/use-link.ts

@@ -1,8 +1,8 @@
 import type {AriaLinkProps} from "@react-types/link";
 import type {LinkVariantProps} from "@nextui-org/theme";
 
+import {link} from "@nextui-org/theme";
 import {useLink as useAriaLink} from "@react-aria/link";
-import {link, twMerge} from "@nextui-org/theme";
 import {HTMLNextUIProps} from "@nextui-org/system";
 import {useDOMRef} from "@nextui-org/dom-utils";
 import {ReactRef} from "@nextui-org/shared-utils";
@@ -64,17 +64,15 @@ export function useLink(props: UseLinkProps) {
 
   const classes = useMemo(
     () =>
-      twMerge(
+      link({
-        link({
+        color,
-          color,
+        size,
-          size,
+        isUnderline,
-          isUnderline,
+        isBlock,
-          isBlock,
+        isDisabled,
-          isDisabled,
+        disableAnimation,
-          disableAnimation,
-        }),
         className,
-      ),
+      }),
     [color, size, isUnderline, isBlock, isDisabled, disableAnimation, className],
   );
 

packages/components/link/stories/link.stories.tsx

@@ -1,8 +1,10 @@
+import {ComponentStory, ComponentMeta} from "@storybook/react";
 import React from "react";
 // import {cva, linkVariants, type VariantProps, ExtendVariantProps} from "@nextui-org/theme";
 
 import {Link, LinkProps} from "../src";
 
+// const meta: Meta<typeof Link> = {
 export default {
   title: "Navigation/Link",
   component: Link,
@@ -25,17 +27,20 @@ export default {
       },
     },
   },
-};
+} as ComponentMeta<typeof Link>;
+
+// type Story = StoryObj<LinkProps>;
 
 const text = `"First solve the problem. Then, write the code." - Jon Johnson.`;
 
-const Template = (args: LinkProps) => (
+const Template: ComponentStory<typeof Link> = (args: LinkProps) => (
   <Link {...args} href="#">
     {text}
   </Link>
 );
 
-export const Default = Template.bind({}) as any;
+export const Default = Template.bind({});
+// More on args: https://storybook.js.org/docs/react/writing-stories/args
 Default.args = {
   isDisabled: false,
   color: "foreground",

packages/components/storybook/package.json

@@ -25,9 +25,16 @@
     "url": "https://github.com/nextui-org/nextui/issues"
   },
   "scripts": {
-    "storybook": "start-storybook -p 6006",
+    "storybook": "concurrently \"pnpm:watch:*\"",
-    "build-storybook": "build-storybook -o storybook-static",
+    "build-storybook": "concurrently \"pnpm:build:*\"",
-    "start-storybook": "pnpx serve storybook-static"
+    "build:css": "npx tailwindcss -i ./.storybook/style.css -o ./public/tailwind.css",
+    "build:storybook": "build-storybook build",
+    "watch:css": "npx tailwindcss -i ./.storybook/style.css -o ./public/tailwind.css --watch",
+    "watch:storybook": "start-storybook dev -p 6006",
+    "start:storybook": "pnpx serve storybook-static"
+  },
+  "dependencies": {
+    "@nextui-org/theme": "workspace:*"
   },
   "devDependencies": {
     "@babel/core": "^7.16.7",
@@ -51,6 +58,7 @@
     "babel-loader": "^8.2.3",
     "postcss": "^8.4.21",
     "storybook-dark-mode": "^1.1.2",
+    "concurrently": "^7.6.0",
     "tailwindcss": "^3.2.4"
   },
   "tsup": {

packages/core/theme/package.json

@@ -43,15 +43,14 @@
     "prepack": "clean-package",
     "postpack": "clean-package restore"
   },
+  "dependencies": {
+    "tailwind-variants": "^0.0.30"
+  },
   "devDependencies": {
     "@storybook/addon-storysource": "^6.5.12",
     "clean-package": "2.1.1",
     "tailwindcss": "^3.2.4"
   },
-  "dependencies": {
-    "class-variance-authority": "0.4.0",
-    "tailwind-merge": "^1.8.1"
-  },
   "tsup": {
     "clean": true,
     "target": "es2019",

packages/core/theme/src/components/avatar/avatar-common.ts

@@ -0,0 +1,60 @@
+// import type {DefaultVariants} from "../../utils";
+
+// export const variants = {
+//   radius: {
+//     none: "",
+//     base: "",
+//     sm: "",
+//     md: "",
+//     lg: "",
+//     xl: "",
+//   },
+//   color: {
+//     neutral: "",
+//     primary: "",
+//     secondary: "",
+//     success: "",
+//     warning: "",
+//     error: "",
+//   },
+//   textColor: {
+//     neutral: "",
+//     primary: "",
+//     secondary: "",
+//     success: "",
+//     warning: "",
+//     error: "",
+//   },
+//   size: {
+//     xs: "",
+//     sm: "",
+//     md: "",
+//     lg: "",
+//     xl: "",
+//   },
+//   border: {
+//     none: "",
+//     light: "",
+//     normal: "",
+//     bold: "",
+//     extrabold: "",
+//   },
+//   isZoomed: {
+//     true: "",
+//     false: "",
+//   },
+//   isStacked: {
+//     true: "",
+//     false: "",
+//   },
+// };
+
+// export type Variants = typeof variants;
+
+// export const defaultVariants: DefaultVariants<Variants> = {
+//   color: "neutral",
+//   textColor: "neutral",
+//   radius: "lg",
+// };
+
+export const avatarCommon = {};

packages/core/theme/src/components/avatar/avatar-img.ts

@@ -0,0 +1,80 @@
+// import {CompoundVariants, cva} from "../../utils";
+
+// import {variants, defaultVariants, type Variants} from "./avatar-common";
+
+// const avatarImgBase = [];
+
+// const avatarImgVariants: Variants = {
+//   ...variants,
+//   radius: {
+//     none: "rounded-none",
+//     base: "rounded",
+//     sm: "rounded-sm",
+//     md: "rounded-md",
+//     lg: "rounded-lg",
+//     xl: "rounded-xl",
+//   },
+//   color: {
+//     neutral: "text-neutral dark:text-neutral-dark",
+//     primary: "text-primary",
+//     secondary: "text-secondary dark:text-secondary-dark",
+//     success: "text-success",
+//     warning: "text-warning",
+//     error: "text-error",
+//   },
+//   textColor: {
+//     neutral: "text-neutral dark:text-neutral-dark",
+//     primary: "text-primary",
+//     secondary: "text-secondary dark:text-secondary-dark",
+//     success: "text-success",
+//     warning: "text-warning",
+//     error: "text-error",
+//   },
+//   size: {
+//     xs: "text-xs",
+//     sm: "text-sm",
+//     md: "text-base",
+//     lg: "text-lg",
+//     xl: "text-xl",
+//   },
+//   border: {
+//     none: "border-0",
+//     light: "border",
+//     normal: "border-2",
+//     bold: "border-4",
+//     extrabold: "border-8",
+//   },
+//   isZoomed: {
+//     true: "",
+//     false: "",
+//   },
+//   isStacked: {
+//     true: "",
+//     false: "",
+//   },
+// };
+
+// const avatarImgCompoundVariants: CompoundVariants<Variants> = [
+//   {
+//     color: "neutral",
+//     textColor: "success",
+//   },
+// ];
+
+// /**
+//  * Avatar image cva component
+//  *
+//  * @example
+//  * <div className="avatar-wrapper">
+//  *  <img className={avatarImg()} src="https://picsum.photos/200/300" alt="avatar" />
+//  * </div>
+//  */
+// const avatarImg = cva(avatarImgBase, {
+//   variants: avatarImgVariants,
+//   compoundVariants: avatarImgCompoundVariants,
+//   defaultVariants,
+// });
+
+// export {avatarImgBase, avatarImgVariants, avatarImgCompoundVariants, avatarImg};
+
+export const avatarImg = {};

packages/core/theme/src/components/avatar/avatar.ts

@@ -0,0 +1,90 @@
+// import {cva, type VariantProps, type CompoundVariants} from "../../utils";
+
+// import {variants, defaultVariants, type Variants} from "./avatar-common";
+
+// const avatarBase = [
+//   "flex",
+//   "relative",
+//   "justify-center",
+//   "items-center",
+//   "box-border",
+//   "overflow-hidden",
+//   "align-middle",
+// ];
+
+// const avatarVariants: Variants = {
+//   ...variants,
+//   radius: {
+//     none: "rounded-none",
+//     base: "rounded",
+//     sm: "rounded-sm",
+//     md: "rounded-md",
+//     lg: "rounded-lg",
+//     xl: "rounded-xl",
+//   },
+//   color: {
+//     neutral: "text-neutral dark:text-neutral-dark",
+//     primary: "text-primary",
+//     secondary: "text-secondary dark:text-secondary-dark",
+//     success: "text-success",
+//     warning: "text-warning",
+//     error: "text-error",
+//   },
+//   textColor: {
+//     neutral: "text-neutral dark:text-neutral-dark",
+//     primary: "text-primary",
+//     secondary: "text-secondary dark:text-secondary-dark",
+//     success: "text-success",
+//     warning: "text-warning",
+//     error: "text-error",
+//   },
+//   size: {
+//     xs: "text-xs",
+//     sm: "text-sm",
+//     md: "text-base",
+//     lg: "text-lg",
+//     xl: "text-xl",
+//   },
+//   border: {
+//     none: "border-0",
+//     light: "border",
+//     normal: "border-2",
+//     bold: "border-4",
+//     extrabold: "border-8",
+//   },
+//   isZoomed: {
+//     true: "",
+//     false: "",
+//   },
+//   isStacked: {
+//     true: "",
+//     false: "",
+//   },
+// };
+
+// const avatarCompoundVariants: CompoundVariants<Variants> = [
+//   {
+//     color: "neutral",
+//     textColor: "success",
+//   },
+// ];
+
+// /**
+//  * Avatar wrapper cva component
+//  *
+//  * @example
+//  * <div className={avatar({ color: "secondary", size: "lg" })}>
+//  *  <img src="https://picsum.photos/200/300" alt="your avatar" />
+//  * </div>
+//  */
+// const avatar = cva(avatarBase, {
+//   variants: avatarVariants,
+//   compoundVariants: avatarCompoundVariants,
+//   defaultVariants,
+// });
+
+// export {avatarBase, avatarVariants, avatarCompoundVariants, avatar};
+
+// export type AvatarVariantProps = VariantProps<typeof avatar>;
+
+export const avatarImg = {};

packages/core/theme/src/components/avatar/index.ts

@@ -0,0 +1,4 @@
+// export * from "./avatar-img";
+// export * from "./avatar-wrapper";
+
+export default {};

packages/core/theme/src/components/link/index.ts

@@ -1,96 +1,87 @@
-import {cva, withFocusVisible, type VariantProps} from "../../utils";
+import {tv, type VariantProps} from "tailwind-variants";
 
-const linkBase = withFocusVisible([
+import {focusVisibleClasses} from "../../utils";
-  "inline-flex",
-  "relative",
-  "items-center",
-  "text-current",
-  "rounded-lg",
-  "w-fit",
-]);
 
-const linkVariants = {
+/**
-  size: {
+ * Link **Tailwind Variants** component
-    xs: "text-xs",
+ *
-    sm: "text-sm",
+ * @example
-    md: "text-base",
+ * <a className={link({ color: "secondary", isBlock: true })} href="#" />
-    lg: "text-lg",
+ */
-    xl: "text-xl",
+const link = tv({
+  base: focusVisibleClasses,
+  variants: {
+    size: {
+      xs: "text-xs",
+      sm: "text-sm",
+      md: "text-base",
+      lg: "text-lg",
+      xl: "text-xl",
+    },
+    color: {
+      foreground: "text-foreground dark:text-foreground-dark",
+      primary: "text-primary",
+      secondary: "text-secondary dark:text-secondary-dark",
+      success: "text-success",
+      warning: "text-warning",
+      error: "text-error",
+    },
+    isUnderline: {
+      true: "hover:underline active:underline focus:underline underline-offset-4",
+      false: "no-underline",
+    },
+    isBlock: {
+      true: "px-2 py-1 hover:after:opacity-100 after:content-[' '] after:inset-0 after:opacity-0 after:w-full after:h-full after:rounded-xl after:transition-background after:absolute",
+      false: "hover:opacity-80 transition-opacity",
+    },
+    isDisabled: {
+      true: "opacity-50 cursor-default pointer-events-none",
+    },
+    disableAnimation: {
+      true: "after:transition-none transition-none",
+    },
   },
-  color: {
+  compoundVariants: [
-    foreground: "text-foreground dark:text-foreground-dark",
+    {
-    primary: "text-primary",
+      isBlock: true,
-    secondary: "text-secondary dark:text-secondary-dark",
+      color: "foreground",
-    success: "text-success",
+      class: "hover:after:bg-foreground/25 dark:hover:after:bg-foreground-dark/25",
-    warning: "text-warning",
+    },
-    error: "text-error",
+    {
-  },
+      isBlock: true,
-  isUnderline: {
+      color: "primary",
-    true: "hover:underline active:underline focus:underline",
+      class: "hover:after:bg-primary/25",
-    false: "no-underline",
+    },
-  },
+    {
-  isBlock: {
+      isBlock: true,
-    true: "px-2 py-1 hover:after:opacity-100 after:content-[' '] after:inset-0 after:opacity-0 after:w-full after:h-full after:rounded-xl after:transition-background after:absolute",
+      color: "secondary",
-    false: "hover:opacity-80 transition-opacity",
+      class: "hover:after:bg-secondary/25 dark:hover:after:bg-secondary-dark/25",
-  },
+    },
-  isDisabled: {
+    {
-    true: "opacity-50 cursor-default pointer-events-none",
+      isBlock: true,
-  },
+      color: "success",
-  disableAnimation: {
+      class: "hover:after:bg-success/25",
-    true: "after:transition-none transition-none",
+    },
-  },
+    {
-};
+      isBlock: true,
-
+      color: "warning",
-const linkCompoundVariants = [
+      class: "hover:after:bg-warning/25",
-  {
+    },
-    isBlock: true,
+    {
-    color: "foreground",
+      isBlock: true,
-    class: "hover:after:bg-foreground/25 dark:hover:after:bg-foreground-dark/25",
+      color: "error",
-  },
+      class: "hover:after:bg-error/25",
-  {
+    },
-    isBlock: true,
+  ],
+  defaultVariants: {
     color: "primary",
-    class: "hover:after:bg-primary/25",
+    size: "md",
+    isBlock: false,
+    isUnderline: false,
+    disableAnimation: false,
   },
-  {
+});
-    isBlock: true,
-    color: "secondary",
-    class: "hover:after:bg-secondary/25 dark:hover:after:bg-secondary-dark/25",
-  },
-  {
-    isBlock: true,
-    color: "success",
-    class: "hover:after:bg-success/25",
-  },
-  {
-    isBlock: true,
-    color: "warning",
-    class: "hover:after:bg-warning/25",
-  },
-  {
-    isBlock: true,
-    color: "error",
-    class: "hover:after:bg-error/25",
-  },
-];
-
-const linkDefaultVariants = {
-  color: "primary",
-  size: "md",
-  isBlock: false,
-  isUnderline: false,
-  disableAnimation: false,
-};
-
-const linkStyles = {
-  variants: linkVariants,
-  compoundVariants: linkCompoundVariants,
-  defaultVariants: linkDefaultVariants,
-};
-
-// @ts-ignore
-const link = cva(linkBase, linkStyles);
-
-export {linkBase, linkVariants, linkCompoundVariants, linkDefaultVariants, linkStyles, link};
 
 export type LinkVariantProps = VariantProps<typeof link>;
+
+export {link};

packages/core/theme/src/utils/cva.ts

@@ -1,3 +0,0 @@
-export {cva, cx} from "class-variance-authority";
-export {twMerge} from "tailwind-merge";
-export * from "class-variance-authority";

packages/core/theme/src/utils/index.ts

@@ -1,3 +1 @@
-export * from "./cva";
 export * from "./styles";
-export * from "./types";

packages/core/theme/src/utils/styles.ts

@@ -1,5 +1,3 @@
-import {cx} from "./cva";
-
 /**
  * focus styles when the element is focused by keyboard.
  */
@@ -12,7 +10,3 @@ export const focusVisibleClasses = [
   "focus-visible:ring-offset-background",
   "dark:focus-visible:ring-offset-background-dark",
 ];
-
-export const withFocusVisible = (classes: Array<string>) => {
-  return cx(classes, focusVisibleClasses);
-};

packages/core/theme/src/utils/types.ts

@@ -1,27 +0,0 @@
-import type {VariantProps} from "class-variance-authority";
-
-/**
- *  This is a utility type that allows you to extend the props of a component and add variant props.
- * @example
- *
- * import {cva, VariantProps, ExtendVariantProps} from "@nextui-org/theme";
- *
- * type ComponentProps = {
- *  foo: string;
- *  bar: string;
- * }
- *
- * const myComponent = cva(["text-blue-500", "font-bold"], {
- *  variants: {
- *    isFoo: {
- *      true: "text-red-500",
- *      false: "text-green-500"
- *    }
- *  }
- * })
- *
- * type MyVariantProps = VariantProps<typeof myComponent>;
- *
- * type MyComponentProps = ExtendVariantProps<ComponentProps, MyVariantProps>;
- */
-export type ExtendVariantProps<P, T extends VariantProps<any>> = Omit<P, keyof T> & T;