From 7bdd04ed437a24fdcb69e685ee3bdb481868bfae Mon Sep 17 00:00:00 2001
From: Junior Garcia <jrgarciadev@gmail.com>
Date: Sat, 5 Aug 2023 18:19:17 -0300
Subject: [PATCH 1/2] feat(root): rsc components added, packages modified,
 filter dom props function adapted

---
 .changeset/fresh-jobs-draw.md                 | 22 +++++++
 apps/docs/app/page.tsx                        |  2 +-
 apps/docs/components/blog-post.tsx            |  9 ++-
 .../docs/components/component-links.tsx       | 66 ++++++++++++++-----
 apps/docs/content/docs/components/badge.mdx   |  2 +-
 apps/docs/content/docs/components/code.mdx    |  2 +-
 apps/docs/content/docs/components/divider.mdx |  2 +-
 apps/docs/content/docs/components/kbd.mdx     |  2 +-
 .../docs/content/docs/components/skeleton.mdx |  2 +-
 apps/docs/content/docs/components/spacer.mdx  |  2 +-
 apps/docs/content/docs/components/spinner.mdx |  2 +-
 apps/docs/package.json                        |  7 ++
 .../accordion/src/use-accordion-item.ts       | 10 ++-
 packages/components/badge/src/badge.tsx       |  7 +-
 packages/components/badge/src/use-badge.ts    |  9 +--
 packages/components/badge/tsup.config.ts      |  1 -
 packages/components/button/src/use-button.ts  |  6 +-
 packages/components/card/src/use-card.ts      |  6 +-
 packages/components/code/src/code.tsx         | 10 ++-
 packages/components/code/src/use-code.ts      |  9 +--
 packages/components/code/tsup.config.ts       |  1 -
 packages/components/divider/package.json      |  5 +-
 packages/components/divider/src/divider.tsx   |  6 +-
 .../components/divider/src/use-divider.ts     | 18 +++--
 .../components/divider/src/use-separator.ts   | 53 +++++++++++++++
 packages/components/divider/tsup.config.ts    |  1 -
 .../dropdown/src/use-dropdown-item.ts         |  5 +-
 packages/components/input/src/use-input.ts    |  1 +
 packages/components/kbd/src/kbd.tsx           |  5 +-
 packages/components/kbd/src/use-kbd.ts        | 13 ++--
 packages/components/kbd/tsup.config.ts        |  1 -
 packages/components/skeleton/src/skeleton.tsx |  6 +-
 .../components/skeleton/src/use-skeleton.ts   | 16 ++---
 packages/components/skeleton/tsup.config.ts   |  1 -
 packages/components/spacer/src/spacer.tsx     |  6 +-
 packages/components/spacer/src/use-spacer.ts  |  9 +--
 packages/components/spacer/tsup.config.ts     |  1 -
 packages/components/spinner/src/spinner.tsx   |  6 +-
 .../components/spinner/src/use-spinner.ts     | 15 ++---
 packages/components/spinner/tsup.config.ts    |  1 -
 packages/components/table/src/table-body.tsx  | 10 ++-
 packages/components/table/src/table-cell.tsx  | 11 +++-
 .../table/src/table-checkbox-cell.tsx         | 11 +++-
 .../table/src/table-column-header.tsx         |  6 +-
 .../components/table/src/table-header-row.tsx |  9 ++-
 packages/components/table/src/table-row.tsx   |  5 +-
 .../table/src/table-select-all-checkbox.tsx   | 10 ++-
 packages/components/table/src/use-table.ts    | 11 +++-
 packages/components/tabs/src/tab.tsx          |  5 +-
 packages/components/tabs/src/use-tabs.ts      |  8 ++-
 packages/core/system/extend-variants.d.ts     |  1 +
 packages/core/system/extend-variants.js       |  1 +
 packages/core/system/package.json             |  8 ++-
 packages/core/system/types.d.ts               |  1 +
 packages/core/system/types.js                 |  1 +
 packages/core/system/utils.d.ts               |  1 +
 packages/core/system/utils.js                 |  1 +
 packages/utilities/react-rsc-utils/README.md  | 24 +++++++
 .../utilities/react-rsc-utils/children.d.ts   |  1 +
 .../utilities/react-rsc-utils/children.js     |  1 +
 .../react-rsc-utils/filter-dom-props.d.ts     |  1 +
 .../react-rsc-utils/filter-dom-props.js       |  1 +
 .../utilities/react-rsc-utils/package.json    | 52 +++++++++++++++
 .../src/children.ts                           |  0
 .../src/filter-dom-props.ts                   |  9 +++
 .../utilities/react-rsc-utils/src/index.ts    |  2 +
 .../utilities/react-rsc-utils/tsconfig.json   |  4 ++
 packages/utilities/react-utils/package.json   |  2 +-
 packages/utilities/react-utils/src/index.ts   |  4 +-
 pnpm-lock.yaml                                | 57 +++++++++-------
 70 files changed, 449 insertions(+), 157 deletions(-)
 create mode 100644 .changeset/fresh-jobs-draw.md
 create mode 100644 packages/components/divider/src/use-separator.ts
 create mode 100644 packages/core/system/extend-variants.d.ts
 create mode 100644 packages/core/system/extend-variants.js
 create mode 100644 packages/core/system/types.d.ts
 create mode 100644 packages/core/system/types.js
 create mode 100644 packages/core/system/utils.d.ts
 create mode 100644 packages/core/system/utils.js
 create mode 100644 packages/utilities/react-rsc-utils/README.md
 create mode 100644 packages/utilities/react-rsc-utils/children.d.ts
 create mode 100644 packages/utilities/react-rsc-utils/children.js
 create mode 100644 packages/utilities/react-rsc-utils/filter-dom-props.d.ts
 create mode 100644 packages/utilities/react-rsc-utils/filter-dom-props.js
 create mode 100644 packages/utilities/react-rsc-utils/package.json
 rename packages/utilities/{react-utils => react-rsc-utils}/src/children.ts (100%)
 rename packages/utilities/{react-utils => react-rsc-utils}/src/filter-dom-props.ts (90%)
 create mode 100644 packages/utilities/react-rsc-utils/src/index.ts
 create mode 100644 packages/utilities/react-rsc-utils/tsconfig.json

diff --git a/.changeset/fresh-jobs-draw.md b/.changeset/fresh-jobs-draw.md
new file mode 100644
index 0000000000..9c9900eee4
--- /dev/null
+++ b/.changeset/fresh-jobs-draw.md
@@ -0,0 +1,22 @@
+---
+"@nextui-org/react-utils": patch
+"@nextui-org/accordion": patch
+"@nextui-org/dropdown": patch
+"@nextui-org/skeleton": patch
+"@nextui-org/divider": patch
+"@nextui-org/spinner": patch
+"@nextui-org/button": patch
+"@nextui-org/spacer": patch
+"@nextui-org/badge": patch
+"@nextui-org/input": patch
+"@nextui-org/table": patch
+"@nextui-org/card": patch
+"@nextui-org/code": patch
+"@nextui-org/tabs": patch
+"@nextui-org/kbd": patch
+"@nextui-org/system": patch
+---
+
+- "use client" directive removed from components that didn't need it
+- packages adapted to support RSC imports
+- filterDomProps function was modified to enable/disabled it
diff --git a/apps/docs/app/page.tsx b/apps/docs/app/page.tsx
index b3e3f87bd5..6dc92eb071 100644
--- a/apps/docs/app/page.tsx
+++ b/apps/docs/app/page.tsx
@@ -1,4 +1,4 @@
-import {Spacer} from "@nextui-org/react";
+import {Spacer} from "@nextui-org/spacer";
 
 import {Hero} from "@/components/marketing/hero";
 import {FeaturesGrid} from "@/components/marketing/features-grid";
diff --git a/apps/docs/components/blog-post.tsx b/apps/docs/components/blog-post.tsx
index 06cda66e72..6dec50c216 100644
--- a/apps/docs/components/blog-post.tsx
+++ b/apps/docs/components/blog-post.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import {BlogPost} from "contentlayer/generated";
-import {Card, CardFooter, CardBody, CardHeader, Link, Avatar} from "@nextui-org/react";
+import {Card, CardFooter, CardBody, CardHeader, Link, Avatar, Image} from "@nextui-org/react";
 import Balancer from "react-wrap-balancer";
 import {format, parseISO} from "date-fns";
 import NextLink from "next/link";
@@ -39,10 +39,9 @@ const BlogPostCard = (post: BlogPost) => {
                 <Balancer>{post.title}</Balancer>
               </Link>
             </CardHeader>
-            <CardBody className="px-3 pt-0 pb-1">
-              <p className="font-normal text-default-600">
-                <Balancer>{post.description}</Balancer>
-              </p>
+            <CardBody className="pt-0 px-2 pb-1">
+              <Image className="mb-3" src={post.image} />
+              <p className="font-normal px-1 text-default-600">{post.description}</p>
             </CardBody>
             <CardFooter className="flex justify-between items-center">
               <time className="block text-small text-default-500" dateTime={post.date}>
diff --git a/apps/docs/components/docs/components/component-links.tsx b/apps/docs/components/docs/components/component-links.tsx
index 3518970bde..c02edc918e 100644
--- a/apps/docs/components/docs/components/component-links.tsx
+++ b/apps/docs/components/docs/components/component-links.tsx
@@ -1,12 +1,15 @@
-import {Button, ButtonProps, Link} from "@nextui-org/react";
+import {Button, ButtonProps, Code, Link, Tooltip} from "@nextui-org/react";
+import {ReactNode} from "react";
+import Balancer from "react-wrap-balancer";
 
-import {GithubIcon, NpmIcon, AdobeIcon, StorybookIcon} from "@/components/icons";
+import {GithubIcon, NpmIcon, AdobeIcon, StorybookIcon, NextJsIcon} from "@/components/icons";
 import {COMPONENT_PATH, COMPONENT_THEME_PATH} from "@/libs/github/constants";
 
 export interface ComponentLinksProps {
   component: string;
   styles?: string;
   storybook?: string;
+  rscCompatible?: boolean;
   reactAriaHook?: string;
 }
 
@@ -14,27 +17,40 @@ const ButtonLink = ({
   children,
   href,
   startContent,
+  tooltip,
   ...props
 }: ButtonProps & {
   href: string;
-}) => (
-  <Button
-    isExternal
-    as={Link}
-    className="!text-small py-4 bg-default-100 dark:bg-default-50 text-default-700"
-    href={href}
-    size="sm"
-    startContent={startContent}
-    {...props}
-  >
-    {children}
-  </Button>
-);
+  tooltip?: string | ReactNode;
+}) => {
+  const button = (
+    <Button
+      isExternal
+      as={Link}
+      className="!text-small py-4 bg-default-100 dark:bg-default-50 text-default-700"
+      href={href}
+      size="sm"
+      startContent={startContent}
+      {...props}
+    >
+      {children}
+    </Button>
+  );
+
+  return tooltip ? (
+    <Tooltip className="max-w-[230px]" content={tooltip}>
+      {button}
+    </Tooltip>
+  ) : (
+    button
+  );
+};
 
 export const ComponentLinks = ({
   component,
   storybook,
   styles,
+  rscCompatible,
   reactAriaHook,
 }: ComponentLinksProps) => {
   if (!component) {
@@ -63,6 +79,26 @@ export const ComponentLinks = ({
           React Aria
         </ButtonLink>
       )}
+      {rscCompatible && (
+        <ButtonLink
+          href="https://nextjs.org/docs/getting-started/react-essentials#server-components"
+          startContent={<NextJsIcon size={18} />}
+          tooltip={
+            <p>
+              <Balancer>
+                This component doesn&apos;t use the
+                <Code className="font-normal bg-transparent px-0 py-0 text-code-mdx">
+                  `use client;`
+                </Code>
+                directive making it compatible with RSC.
+              </Balancer>
+            </p>
+          }
+        >
+          Server component
+        </ButtonLink>
+      )}
+
       <ButtonLink href={`${COMPONENT_PATH}/${component}`} startContent={<GithubIcon size={20} />}>
         Source
       </ButtonLink>
diff --git a/apps/docs/content/docs/components/badge.mdx b/apps/docs/content/docs/components/badge.mdx
index b738881082..dec0782364 100644
--- a/apps/docs/content/docs/components/badge.mdx
+++ b/apps/docs/content/docs/components/badge.mdx
@@ -9,7 +9,7 @@ import {badgeContent} from "@/content/components/badge";
 
 Badges are used as a small numerical value or status descriptor for UI elements.
 
-<ComponentLinks component="badge" />
+<ComponentLinks component="badge" rscCompatible />
 
 ---
 
diff --git a/apps/docs/content/docs/components/code.mdx b/apps/docs/content/docs/components/code.mdx
index d7b0bb4b09..56374bd6c1 100644
--- a/apps/docs/content/docs/components/code.mdx
+++ b/apps/docs/content/docs/components/code.mdx
@@ -9,7 +9,7 @@ import {codeContent} from "@/content/components/code";
 
 Code is a component used to display inline code.
 
-<ComponentLinks component="code" />
+<ComponentLinks component="code" rscCompatible />
 
 ---
 
diff --git a/apps/docs/content/docs/components/divider.mdx b/apps/docs/content/docs/components/divider.mdx
index 9e89e3bc0c..3e09a10f02 100644
--- a/apps/docs/content/docs/components/divider.mdx
+++ b/apps/docs/content/docs/components/divider.mdx
@@ -9,7 +9,7 @@ import {dividerContent} from "@/content/components/divider";
 
 Divider is a component that separates content in a page.
 
-<ComponentLinks component="divider" reactAriaHook="useSeparator" />
+<ComponentLinks component="divider" reactAriaHook="useSeparator" rscCompatible />
 
 ---
 
diff --git a/apps/docs/content/docs/components/kbd.mdx b/apps/docs/content/docs/components/kbd.mdx
index 8ad47174a4..3a918df838 100644
--- a/apps/docs/content/docs/components/kbd.mdx
+++ b/apps/docs/content/docs/components/kbd.mdx
@@ -9,7 +9,7 @@ import {kbdContent} from "@/content/components/kbd";
 
 Keyboard key is a component to display which key or combination of keys performs a given action.
 
-<ComponentLinks component="kbd" />
+<ComponentLinks component="kbd" rscCompatible />
 
 ---
 
diff --git a/apps/docs/content/docs/components/skeleton.mdx b/apps/docs/content/docs/components/skeleton.mdx
index 034b99c82f..f726a5a37c 100644
--- a/apps/docs/content/docs/components/skeleton.mdx
+++ b/apps/docs/content/docs/components/skeleton.mdx
@@ -9,7 +9,7 @@ import {skeletonContent} from "@/content/components/skeleton";
 
 Skeleton is a placeholder to show a loading state and the expected shape of a component.
 
-<ComponentLinks component="skeleton" />
+<ComponentLinks component="skeleton" rscCompatible />
 
 ---
 
diff --git a/apps/docs/content/docs/components/spacer.mdx b/apps/docs/content/docs/components/spacer.mdx
index 7729473b36..ab206ff761 100644
--- a/apps/docs/content/docs/components/spacer.mdx
+++ b/apps/docs/content/docs/components/spacer.mdx
@@ -9,7 +9,7 @@ import {spacerContent} from "@/content/components/spacer";
 
 Spacer is a component used to add space between components.
 
-<ComponentLinks component="spacer" />
+<ComponentLinks component="spacer" rscCompatible />
 
 ---
 
diff --git a/apps/docs/content/docs/components/spinner.mdx b/apps/docs/content/docs/components/spinner.mdx
index 68c5533f98..0a4947bf5b 100644
--- a/apps/docs/content/docs/components/spinner.mdx
+++ b/apps/docs/content/docs/components/spinner.mdx
@@ -9,7 +9,7 @@ import {spinnerContent} from "@/content/components/spinner";
 
 Spinner express an unspecified wait time or display the length of a process.
 
-<ComponentLinks component="spinner" />
+<ComponentLinks component="spinner" rscCompatible />
 
 ---
 
diff --git a/apps/docs/package.json b/apps/docs/package.json
index 5371ee3aca..7ea138815c 100644
--- a/apps/docs/package.json
+++ b/apps/docs/package.json
@@ -22,6 +22,13 @@
     "@nextui-org/shared-icons": "workspace:*",
     "@nextui-org/shared-utils": "workspace:*",
     "@nextui-org/theme": "workspace:*",
+    "@nextui-org/spacer": "workspace:*",
+    "@nextui-org/kbd": "workspace:*",
+    "@nextui-org/code": "workspace:*",
+    "@nextui-org/badge": "workspace:*",
+    "@nextui-org/skeleton": "workspace:*",
+    "@nextui-org/spinner": "workspace:*",
+    "@nextui-org/divider": "workspace:*",
     "@nextui-org/use-clipboard": "workspace:*",
     "@nextui-org/use-infinite-scroll": "workspace:*",
     "@nextui-org/use-is-mobile": "workspace:*",
diff --git a/packages/components/accordion/src/use-accordion-item.ts b/packages/components/accordion/src/use-accordion-item.ts
index b8703cd602..107a5354e2 100644
--- a/packages/components/accordion/src/use-accordion-item.ts
+++ b/packages/components/accordion/src/use-accordion-item.ts
@@ -67,6 +67,7 @@ export function useAccordionItem<T extends object = {}>(props: UseAccordionItemP
   } = props;
 
   const Component = as || "div";
+  const shouldFilterDOMProps = typeof Component === "string";
 
   const domRef = useDOMRef<HTMLButtonElement>(ref);
 
@@ -132,10 +133,15 @@ export function useAccordionItem<T extends object = {}>(props: UseAccordionItemP
         "data-open": dataAttr(isOpen),
         "data-disabled": dataAttr(isDisabled),
         className: slots.base({class: baseStyles}),
-        ...mergeProps(filterDOMProps(otherProps), props),
+        ...mergeProps(
+          filterDOMProps(otherProps, {
+            enabled: shouldFilterDOMProps,
+          }),
+          props,
+        ),
       };
     },
-    [baseStyles, otherProps, slots, item.props, isOpen, isDisabled],
+    [baseStyles, shouldFilterDOMProps, otherProps, slots, item.props, isOpen, isDisabled],
   );
 
   const getButtonProps: PropGetter = (props = {}) => {
diff --git a/packages/components/badge/src/badge.tsx b/packages/components/badge/src/badge.tsx
index 2d953643ad..2abc2bedc2 100644
--- a/packages/components/badge/src/badge.tsx
+++ b/packages/components/badge/src/badge.tsx
@@ -1,6 +1,6 @@
 import type {ReactNode} from "react";
 
-import {forwardRef} from "@nextui-org/system";
+import {forwardRef} from "@nextui-org/system/utils";
 
 import {UseBadgeProps, useBadge} from "./use-badge";
 
@@ -11,13 +11,14 @@ export interface BadgeProps extends UseBadgeProps {
 const Badge = forwardRef<"span", BadgeProps>((props, ref) => {
   const {Component, children, content, slots, classNames, getBadgeProps} = useBadge({
     ...props,
-    ref,
   });
 
   return (
     <div className={slots.base({class: classNames?.base})}>
       {children}
-      <Component {...getBadgeProps()}>{content}</Component>
+      <Component ref={ref} {...getBadgeProps()}>
+        {content}
+      </Component>
     </div>
   );
 });
diff --git a/packages/components/badge/src/use-badge.ts b/packages/components/badge/src/use-badge.ts
index e5135f0eaa..c0fee99c7d 100644
--- a/packages/components/badge/src/use-badge.ts
+++ b/packages/components/badge/src/use-badge.ts
@@ -2,8 +2,8 @@ import type {BadgeSlots, BadgeVariantProps, SlotsToClasses} from "@nextui-org/th
 import type {ReactNode} from "react";
 
 import {badge} from "@nextui-org/theme";
-import {HTMLNextUIProps, mapPropsVariants, PropGetter} from "@nextui-org/system";
-import {useDOMRef} from "@nextui-org/react-utils";
+import {HTMLNextUIProps, PropGetter} from "@nextui-org/system/types";
+import {mapPropsVariants} from "@nextui-org/system/utils";
 import {clsx} from "@nextui-org/shared-utils";
 import {ReactRef} from "@nextui-org/react-utils";
 import {useMemo} from "react";
@@ -41,12 +41,10 @@ export type UseBadgeProps = Props & BadgeVariantProps;
 export function useBadge(originalProps: UseBadgeProps) {
   const [props, variantProps] = mapPropsVariants(originalProps, badge.variantKeys);
 
-  const {as, ref, children, className, content, classNames, ...otherProps} = props;
+  const {as, children, className, content, classNames, ...otherProps} = props;
 
   const Component = as || "span";
 
-  const domRef = useDOMRef(ref);
-
   const isOneChar = useMemo(
     () => String(content)?.length === 1 || originalProps?.isOneChar,
     [content, originalProps?.isOneChar],
@@ -68,7 +66,6 @@ export function useBadge(originalProps: UseBadgeProps) {
 
   const getBadgeProps: PropGetter = () => {
     return {
-      ref: domRef,
       className: slots.badge({class: baseStyles}),
       "data-invisible": originalProps.isInvisible,
       ...otherProps,
diff --git a/packages/components/badge/tsup.config.ts b/packages/components/badge/tsup.config.ts
index 3e2bcff6cc..e7ef417947 100644
--- a/packages/components/badge/tsup.config.ts
+++ b/packages/components/badge/tsup.config.ts
@@ -4,5 +4,4 @@ export default defineConfig({
   clean: true,
   target: "es2019",
   format: ["cjs", "esm"],
-  banner: {js: '"use client";'},
 });
diff --git a/packages/components/button/src/use-button.ts b/packages/components/button/src/use-button.ts
index f7fe415c1b..a00febb5c5 100644
--- a/packages/components/button/src/use-button.ts
+++ b/packages/components/button/src/use-button.ts
@@ -92,6 +92,7 @@ export function useButton(props: UseButtonProps) {
   } = props;
 
   const Component = as || "button";
+  const shouldFilterDOMProps = typeof Component === "string";
 
   const domRef = useDOMRef(ref);
 
@@ -164,7 +165,9 @@ export function useButton(props: UseButtonProps) {
         ariaButtonProps,
         focusProps,
         hoverProps,
-        filterDOMProps(otherProps),
+        filterDOMProps(otherProps, {
+          enabled: shouldFilterDOMProps,
+        }),
         filterDOMProps(props),
       ),
     }),
@@ -173,6 +176,7 @@ export function useButton(props: UseButtonProps) {
       isDisabled,
       isFocused,
       isPressed,
+      shouldFilterDOMProps,
       isFocusVisible,
       isHovered,
       ariaButtonProps,
diff --git a/packages/components/card/src/use-card.ts b/packages/components/card/src/use-card.ts
index 78ae50b440..9d631d7546 100644
--- a/packages/components/card/src/use-card.ts
+++ b/packages/components/card/src/use-card.ts
@@ -81,6 +81,7 @@ export function useCard(originalProps: UseCardProps) {
 
   const domRef = useDOMRef<HTMLDivElement>(ref);
   const Component = as || (originalProps.isPressable ? "button" : "div");
+  const shouldFilterDOMProps = typeof Component === "string";
 
   const baseStyles = clsx(classNames?.base, className);
 
@@ -154,7 +155,9 @@ export function useCard(originalProps: UseCardProps) {
         ...mergeProps(
           originalProps.isPressable ? {...buttonProps, ...focusProps, role: "button"} : {},
           originalProps.isHoverable ? hoverProps : {},
-          filterDOMProps(otherProps),
+          filterDOMProps(otherProps, {
+            enabled: shouldFilterDOMProps,
+          }),
           filterDOMProps(props),
         ),
       };
@@ -163,6 +166,7 @@ export function useCard(originalProps: UseCardProps) {
       domRef,
       slots,
       baseStyles,
+      shouldFilterDOMProps,
       originalProps.isPressable,
       originalProps.isHoverable,
       originalProps.isDisabled,
diff --git a/packages/components/code/src/code.tsx b/packages/components/code/src/code.tsx
index 1f76580813..174c10e305 100644
--- a/packages/components/code/src/code.tsx
+++ b/packages/components/code/src/code.tsx
@@ -1,13 +1,17 @@
-import {forwardRef} from "@nextui-org/system";
+import {forwardRef} from "@nextui-org/system/utils";
 
 import {useCode, UseCodeProps} from "./use-code";
 
 export interface CodeProps extends UseCodeProps {}
 
 const Code = forwardRef<"div", CodeProps>((props, ref) => {
-  const {Component, children, getCodeProps} = useCode({...props, ref});
+  const {Component, children, getCodeProps} = useCode({...props});
 
-  return <Component {...getCodeProps()}>{children}</Component>;
+  return (
+    <Component ref={ref} {...getCodeProps()}>
+      {children}
+    </Component>
+  );
 });
 
 Code.displayName = "NextUI.Code";
diff --git a/packages/components/code/src/use-code.ts b/packages/components/code/src/use-code.ts
index 544f90b2b8..3b205afa25 100644
--- a/packages/components/code/src/use-code.ts
+++ b/packages/components/code/src/use-code.ts
@@ -1,8 +1,8 @@
 import type {CodeVariantProps} from "@nextui-org/theme";
 
 import {code} from "@nextui-org/theme";
-import {HTMLNextUIProps, PropGetter, mapPropsVariants} from "@nextui-org/system";
-import {useDOMRef} from "@nextui-org/react-utils";
+import {HTMLNextUIProps, PropGetter} from "@nextui-org/system/types";
+import {mapPropsVariants} from "@nextui-org/system/utils";
 import {ReactRef} from "@nextui-org/react-utils";
 import {useMemo} from "react";
 
@@ -16,12 +16,10 @@ export interface UseCodeProps extends HTMLNextUIProps<"code">, CodeVariantProps
 export function useCode(originalProps: UseCodeProps) {
   const [props, variantProps] = mapPropsVariants(originalProps, code.variantKeys);
 
-  const {ref, as, children, className, ...otherProps} = props;
+  const {as, children, className, ...otherProps} = props;
 
   const Component = as || "code";
 
-  const domRef = useDOMRef(ref);
-
   const classNames = useMemo(
     () =>
       code({
@@ -33,7 +31,6 @@ export function useCode(originalProps: UseCodeProps) {
 
   const getCodeProps: PropGetter = () => {
     return {
-      ref: domRef,
       className: classNames,
       ...otherProps,
     };
diff --git a/packages/components/code/tsup.config.ts b/packages/components/code/tsup.config.ts
index 3e2bcff6cc..e7ef417947 100644
--- a/packages/components/code/tsup.config.ts
+++ b/packages/components/code/tsup.config.ts
@@ -4,5 +4,4 @@ export default defineConfig({
   clean: true,
   target: "es2019",
   format: ["cjs", "esm"],
-  banner: {js: '"use client";'},
 });
diff --git a/packages/components/divider/package.json b/packages/components/divider/package.json
index f21c54a833..08368607d7 100644
--- a/packages/components/divider/package.json
+++ b/packages/components/divider/package.json
@@ -38,11 +38,10 @@
   },
   "dependencies": {
     "@nextui-org/shared-utils": "workspace:*",
-    "@nextui-org/react-utils": "workspace:*",
+    "@nextui-org/react-rsc-utils": "workspace:*",
     "@nextui-org/system": "workspace:*",
     "@nextui-org/theme": "workspace:*",
-    "@react-aria/separator": "^3.3.3",
-    "@react-aria/utils": "^3.18.0"
+    "@react-types/shared": "^3.18.1"
   },
   "devDependencies": {
     "clean-package": "2.2.0",
diff --git a/packages/components/divider/src/divider.tsx b/packages/components/divider/src/divider.tsx
index 01a4cf2c26..8f87bc687a 100644
--- a/packages/components/divider/src/divider.tsx
+++ b/packages/components/divider/src/divider.tsx
@@ -1,13 +1,13 @@
-import {forwardRef} from "@nextui-org/system";
+import {forwardRef} from "@nextui-org/system/utils";
 
 import {UseDividerProps, useDivider} from "./use-divider";
 
 export interface DividerProps extends Omit<UseDividerProps, "children"> {}
 
 const Divider = forwardRef<"div", DividerProps>((props, ref) => {
-  const {Component, getDividerProps} = useDivider({ref, ...props});
+  const {Component, getDividerProps} = useDivider({...props});
 
-  return <Component {...getDividerProps()} />;
+  return <Component ref={ref} {...getDividerProps()} />;
 });
 
 Divider.displayName = "NextUI.Divider";
diff --git a/packages/components/divider/src/use-divider.ts b/packages/components/divider/src/use-divider.ts
index a9b8b25bee..03482781ef 100644
--- a/packages/components/divider/src/use-divider.ts
+++ b/packages/components/divider/src/use-divider.ts
@@ -1,11 +1,10 @@
 import type {DividerVariantProps} from "@nextui-org/theme";
 
-import {SeparatorProps as AriaSeparatorProps, useSeparator} from "@react-aria/separator";
-import {HTMLNextUIProps, PropGetter} from "@nextui-org/system";
+import {HTMLNextUIProps, PropGetter} from "@nextui-org/system/types";
 import {divider} from "@nextui-org/theme";
-import {useDOMRef} from "@nextui-org/react-utils";
 import {Ref, useCallback, useMemo} from "react";
-import {mergeProps} from "@react-aria/utils";
+
+import {SeparatorProps as AriaSeparatorProps, useSeparator} from "./use-separator";
 
 interface Props extends HTMLNextUIProps<"hr"> {
   /**
@@ -17,12 +16,10 @@ interface Props extends HTMLNextUIProps<"hr"> {
 export type UseDividerProps = Props & DividerVariantProps & Omit<AriaSeparatorProps, "elementType">;
 
 export function useDivider(props: UseDividerProps) {
-  const {ref, as, className, orientation, ...otherProps} = props;
+  const {as, className, orientation, ...otherProps} = props;
 
   let Component = as || "hr";
 
-  const domRef = useDOMRef(ref);
-
   if (Component === "hr" && orientation === "vertical") {
     Component = "div";
   }
@@ -43,13 +40,14 @@ export function useDivider(props: UseDividerProps) {
 
   const getDividerProps: PropGetter = useCallback(
     (props = {}) => ({
-      ref: domRef,
       className: styles,
       role: "separator",
       "data-orientation": orientation,
-      ...mergeProps(separatorProps, otherProps, props),
+      ...separatorProps,
+      ...otherProps,
+      ...props,
     }),
-    [domRef, styles, orientation, separatorProps, otherProps],
+    [styles, orientation, separatorProps, otherProps],
   );
 
   return {Component, getDividerProps};
diff --git a/packages/components/divider/src/use-separator.ts b/packages/components/divider/src/use-separator.ts
new file mode 100644
index 0000000000..ecf8dfffae
--- /dev/null
+++ b/packages/components/divider/src/use-separator.ts
@@ -0,0 +1,53 @@
+/*
+ * Based on @react-aria/separator but with some changes to support RSC.
+ */
+
+import type {AriaLabelingProps, DOMAttributes, DOMProps, Orientation} from "@react-types/shared";
+
+import {filterDOMProps} from "@nextui-org/react-rsc-utils";
+
+export interface SeparatorProps extends DOMProps, AriaLabelingProps {
+  /**
+   * The orientation of the separator.
+   * @default 'horizontal'
+   */
+  orientation?: Orientation;
+  /** The HTML element type that will be used to render the separator. */
+  elementType?: string;
+}
+
+export interface SeparatorAria {
+  /** Props for the separator element. */
+  separatorProps: DOMAttributes;
+}
+
+/**
+ * Provides the accessibility implementation for a separator.
+ * A separator is a visual divider between two groups of content,
+ * e.g. groups of menu items or sections of a page.
+ */
+export function useSeparator(props: SeparatorProps): SeparatorAria {
+  let domProps = filterDOMProps(props, {
+    enabled: typeof props.elementType === "string",
+  });
+
+  let ariaOrientation: Orientation | undefined;
+
+  // if orientation is horizontal, aria-orientation default is horizontal, so we leave it undefined
+  // if it's vertical, we need to specify it
+  if (props.orientation === "vertical") {
+    ariaOrientation = "vertical";
+  }
+  // hr elements implicitly have role = separator and a horizontal orientation
+  if (props.elementType !== "hr") {
+    return {
+      separatorProps: {
+        ...domProps,
+        role: "separator",
+        "aria-orientation": ariaOrientation,
+      },
+    };
+  }
+
+  return {separatorProps: domProps};
+}
diff --git a/packages/components/divider/tsup.config.ts b/packages/components/divider/tsup.config.ts
index 3e2bcff6cc..e7ef417947 100644
--- a/packages/components/divider/tsup.config.ts
+++ b/packages/components/divider/tsup.config.ts
@@ -4,5 +4,4 @@ export default defineConfig({
   clean: true,
   target: "es2019",
   format: ["cjs", "esm"],
-  banner: {js: '"use client";'},
 });
diff --git a/packages/components/dropdown/src/use-dropdown-item.ts b/packages/components/dropdown/src/use-dropdown-item.ts
index 74ac317478..51fab421c3 100644
--- a/packages/components/dropdown/src/use-dropdown-item.ts
+++ b/packages/components/dropdown/src/use-dropdown-item.ts
@@ -59,6 +59,7 @@ export function useDropdownItem<T extends object>(originalProps: UseDropdownItem
   const domRef = useRef<HTMLLIElement>(null);
 
   const Component = as || "li";
+  const shouldFilterDOMProps = typeof Component === "string";
 
   const {rendered, key} = item;
 
@@ -127,7 +128,9 @@ export function useDropdownItem<T extends object>(originalProps: UseDropdownItem
       itemProps,
       isReadOnly ? {} : mergeProps(focusProps, pressProps),
       hoverProps,
-      filterDOMProps(otherProps),
+      filterDOMProps(otherProps, {
+        enabled: shouldFilterDOMProps,
+      }),
       props,
     ),
     "data-focus": dataAttr(isFocused),
diff --git a/packages/components/input/src/use-input.ts b/packages/components/input/src/use-input.ts
index f9e4e98cf4..e84a3b13e5 100644
--- a/packages/components/input/src/use-input.ts
+++ b/packages/components/input/src/use-input.ts
@@ -93,6 +93,7 @@ export function useInput<T extends HTMLInputElement | HTMLTextAreaElement = HTML
   );
 
   const Component = as || "div";
+
   const baseStyles = clsx(classNames?.base, className, !!inputValue ? "is-filled" : "");
   const isMultiline = originalProps.isMultiline;
 
diff --git a/packages/components/kbd/src/kbd.tsx b/packages/components/kbd/src/kbd.tsx
index 944730c690..079ed27c70 100644
--- a/packages/components/kbd/src/kbd.tsx
+++ b/packages/components/kbd/src/kbd.tsx
@@ -1,5 +1,5 @@
 import {useMemo} from "react";
-import {forwardRef} from "@nextui-org/system";
+import {forwardRef} from "@nextui-org/system/utils";
 
 import {UseKbdProps, useKbd} from "./use-kbd";
 import {kbdKeysLabelMap, kbdKeysMap} from "./utils";
@@ -9,7 +9,6 @@ export interface KbdProps extends UseKbdProps {}
 const Kbd = forwardRef<"kbd", KbdProps>((props, ref) => {
   const {Component, children, slots, classNames, keysToRender, getKbdProps} = useKbd({
     ...props,
-    ref,
   });
 
   const keysContent = useMemo(() => {
@@ -25,7 +24,7 @@ const Kbd = forwardRef<"kbd", KbdProps>((props, ref) => {
   }, [keysToRender]);
 
   return (
-    <Component {...getKbdProps()}>
+    <Component ref={ref} {...getKbdProps()}>
       {keysContent}
       {children && <span className={slots.content({class: classNames?.content})}>{children}</span>}
     </Component>
diff --git a/packages/components/kbd/src/use-kbd.ts b/packages/components/kbd/src/use-kbd.ts
index d936a11c72..065974b58a 100644
--- a/packages/components/kbd/src/use-kbd.ts
+++ b/packages/components/kbd/src/use-kbd.ts
@@ -1,12 +1,11 @@
 import type {KbdVariantProps, KbdSlots, SlotsToClasses} from "@nextui-org/theme";
 
-import {HTMLNextUIProps, mapPropsVariants, PropGetter} from "@nextui-org/system";
+import {HTMLNextUIProps, PropGetter} from "@nextui-org/system/types";
+import {mapPropsVariants} from "@nextui-org/system/utils";
 import {kbd} from "@nextui-org/theme";
-import {useDOMRef} from "@nextui-org/react-utils";
 import {clsx} from "@nextui-org/shared-utils";
 import {ReactRef} from "@nextui-org/react-utils";
 import {useMemo} from "react";
-import {mergeProps} from "@react-aria/utils";
 
 import {KbdKey} from "./utils";
 
@@ -40,12 +39,10 @@ export type UseKbdProps = Props & KbdVariantProps;
 export function useKbd(originalProps: UseKbdProps) {
   const [props, variantProps] = mapPropsVariants(originalProps, kbd.variantKeys);
 
-  const {ref, as, children, className, keys, title, classNames, ...otherProps} = props;
+  const {as, children, className, keys, title, classNames, ...otherProps} = props;
 
   const Component = as || "kbd";
 
-  const domRef = useDOMRef(ref);
-
   const slots = useMemo(
     () =>
       kbd({
@@ -59,8 +56,8 @@ export function useKbd(originalProps: UseKbdProps) {
   const keysToRender = typeof keys === "string" ? [keys] : Array.isArray(keys) ? keys : [];
 
   const getKbdProps: PropGetter = (props = {}) => ({
-    ref: domRef,
-    ...mergeProps(otherProps, props),
+    ...otherProps,
+    ...props,
     className: clsx(slots.base({class: clsx(baseStyles, props.className)})),
   });
 
diff --git a/packages/components/kbd/tsup.config.ts b/packages/components/kbd/tsup.config.ts
index 3e2bcff6cc..e7ef417947 100644
--- a/packages/components/kbd/tsup.config.ts
+++ b/packages/components/kbd/tsup.config.ts
@@ -4,5 +4,4 @@ export default defineConfig({
   clean: true,
   target: "es2019",
   format: ["cjs", "esm"],
-  banner: {js: '"use client";'},
 });
diff --git a/packages/components/skeleton/src/skeleton.tsx b/packages/components/skeleton/src/skeleton.tsx
index 688d8e81d6..c56d612fa9 100644
--- a/packages/components/skeleton/src/skeleton.tsx
+++ b/packages/components/skeleton/src/skeleton.tsx
@@ -1,14 +1,14 @@
-import {forwardRef} from "@nextui-org/system";
+import {forwardRef} from "@nextui-org/system/utils";
 
 import {UseSkeletonProps, useSkeleton} from "./use-skeleton";
 
 export interface SkeletonProps extends UseSkeletonProps {}
 
 const Skeleton = forwardRef<"div", SkeletonProps>((props, ref) => {
-  const {Component, children, getSkeletonProps, getContentProps} = useSkeleton({...props, ref});
+  const {Component, children, getSkeletonProps, getContentProps} = useSkeleton({...props});
 
   return (
-    <Component {...getSkeletonProps()}>
+    <Component ref={ref} {...getSkeletonProps()}>
       <div {...getContentProps()}>{children}</div>
     </Component>
   );
diff --git a/packages/components/skeleton/src/use-skeleton.ts b/packages/components/skeleton/src/use-skeleton.ts
index 2b2e75d3aa..0e118c77fe 100644
--- a/packages/components/skeleton/src/use-skeleton.ts
+++ b/packages/components/skeleton/src/use-skeleton.ts
@@ -1,17 +1,16 @@
 import type {SkeletonVariantProps, SkeletonSlots, SlotsToClasses} from "@nextui-org/theme";
+import type {HTMLNextUIProps, PropGetter} from "@nextui-org/system/types";
 
-import {HTMLNextUIProps, mapPropsVariants, PropGetter} from "@nextui-org/system";
+import {mapPropsVariants} from "@nextui-org/system/utils";
 import {skeleton} from "@nextui-org/theme";
-import {useDOMRef} from "@nextui-org/react-utils";
 import {clsx, dataAttr} from "@nextui-org/shared-utils";
-import {ReactRef} from "@nextui-org/react-utils";
-import {useMemo} from "react";
+import {useMemo, Ref} from "react";
 
 interface Props extends HTMLNextUIProps<"div"> {
   /**
    * Ref to the DOM node.
    */
-  ref?: ReactRef<HTMLElement | null>;
+  ref?: Ref<HTMLElement | null>;
   /**
    * The skeleton will be visible while isLoading is `false`.
    * @default false
@@ -37,12 +36,10 @@ export type UseSkeletonProps = Props & SkeletonVariantProps;
 export function useSkeleton(originalProps: UseSkeletonProps) {
   const [props, variantProps] = mapPropsVariants(originalProps, skeleton.variantKeys);
 
-  const {ref, as, children, isLoaded = false, className, classNames, ...otherProps} = props;
+  const {as, children, isLoaded = false, className, classNames, ...otherProps} = props;
 
   const Component = as || "div";
 
-  const domRef = useDOMRef(ref);
-
   const slots = useMemo(
     () =>
       skeleton({
@@ -55,7 +52,6 @@ export function useSkeleton(originalProps: UseSkeletonProps) {
 
   const getSkeletonProps: PropGetter = (props = {}) => {
     return {
-      ref: domRef,
       "data-loaded": dataAttr(isLoaded),
       className: slots.base({class: clsx(baseStyles, props?.className)}),
       ...otherProps,
@@ -68,7 +64,7 @@ export function useSkeleton(originalProps: UseSkeletonProps) {
     };
   };
 
-  return {Component, domRef, children, slots, classNames, getSkeletonProps, getContentProps};
+  return {Component, children, slots, classNames, getSkeletonProps, getContentProps};
 }
 
 export type UseSkeletonReturn = ReturnType<typeof useSkeleton>;
diff --git a/packages/components/skeleton/tsup.config.ts b/packages/components/skeleton/tsup.config.ts
index 3e2bcff6cc..e7ef417947 100644
--- a/packages/components/skeleton/tsup.config.ts
+++ b/packages/components/skeleton/tsup.config.ts
@@ -4,5 +4,4 @@ export default defineConfig({
   clean: true,
   target: "es2019",
   format: ["cjs", "esm"],
-  banner: {js: '"use client";'},
 });
diff --git a/packages/components/spacer/src/spacer.tsx b/packages/components/spacer/src/spacer.tsx
index a56ffa7f14..54feb99ea7 100644
--- a/packages/components/spacer/src/spacer.tsx
+++ b/packages/components/spacer/src/spacer.tsx
@@ -1,13 +1,13 @@
-import {forwardRef} from "@nextui-org/system";
+import {forwardRef} from "@nextui-org/system/utils";
 
 import {UseSpacerProps, useSpacer} from "./use-spacer";
 
 export interface SpacerProps extends UseSpacerProps {}
 
 const Spacer = forwardRef<"span", SpacerProps>((props, ref) => {
-  const {Component, getSpacerProps} = useSpacer({...props, ref});
+  const {Component, getSpacerProps} = useSpacer({...props});
 
-  return <Component {...getSpacerProps()} />;
+  return <Component ref={ref} {...getSpacerProps()} />;
 });
 
 Spacer.displayName = "NextUI.Spacer";
diff --git a/packages/components/spacer/src/use-spacer.ts b/packages/components/spacer/src/use-spacer.ts
index 1e192bbf69..e0ace79c38 100644
--- a/packages/components/spacer/src/use-spacer.ts
+++ b/packages/components/spacer/src/use-spacer.ts
@@ -1,8 +1,8 @@
 import type {SpacerVariantProps} from "@nextui-org/theme";
 
-import {HTMLNextUIProps, mapPropsVariants, PropGetter} from "@nextui-org/system";
+import {HTMLNextUIProps, PropGetter} from "@nextui-org/system/types";
+import {mapPropsVariants} from "@nextui-org/system/utils";
 import {spacer} from "@nextui-org/theme";
-import {useDOMRef} from "@nextui-org/react-utils";
 import {clsx, dataAttr} from "@nextui-org/shared-utils";
 import {ReactRef} from "@nextui-org/react-utils";
 import {useMemo} from "react";
@@ -39,12 +39,10 @@ export const getMargin = (value: Space) => {
 export function useSpacer(originalProps: UseSpacerProps) {
   const [props, variantProps] = mapPropsVariants(originalProps, spacer.variantKeys);
 
-  const {ref, as, className, x = 1, y = 1, ...otherProps} = props;
+  const {as, className, x = 1, y = 1, ...otherProps} = props;
 
   const Component = as || "span";
 
-  const domRef = useDOMRef(ref);
-
   const styles = useMemo(
     () =>
       spacer({
@@ -58,7 +56,6 @@ export function useSpacer(originalProps: UseSpacerProps) {
   const marginTop = getMargin(y);
 
   const getSpacerProps: PropGetter = (props = {}) => ({
-    ref: domRef,
     ...props,
     ...otherProps,
     "aria-hidden": dataAttr(true),
diff --git a/packages/components/spacer/tsup.config.ts b/packages/components/spacer/tsup.config.ts
index 3e2bcff6cc..e7ef417947 100644
--- a/packages/components/spacer/tsup.config.ts
+++ b/packages/components/spacer/tsup.config.ts
@@ -4,5 +4,4 @@ export default defineConfig({
   clean: true,
   target: "es2019",
   format: ["cjs", "esm"],
-  banner: {js: '"use client";'},
 });
diff --git a/packages/components/spinner/src/spinner.tsx b/packages/components/spinner/src/spinner.tsx
index f98dcd8597..9817b5da14 100644
--- a/packages/components/spinner/src/spinner.tsx
+++ b/packages/components/spinner/src/spinner.tsx
@@ -1,14 +1,14 @@
-import {forwardRef} from "@nextui-org/system";
+import {forwardRef} from "@nextui-org/system/utils";
 
 import {UseSpinnerProps, useSpinner} from "./use-spinner";
 
 export interface SpinnerProps extends UseSpinnerProps {}
 
 const Spinner = forwardRef<"div", SpinnerProps>((props, ref) => {
-  const {domRef, slots, classNames, label, getSpinnerProps} = useSpinner({ref, ...props});
+  const {slots, classNames, label, getSpinnerProps} = useSpinner({...props});
 
   return (
-    <div ref={domRef} {...getSpinnerProps()}>
+    <div ref={ref} {...getSpinnerProps()}>
       <div className={slots.wrapper({class: classNames?.wrapper})}>
         <i className={slots.circle1({class: classNames?.circle1})} />
         <i className={slots.circle2({class: classNames?.circle2})} />
diff --git a/packages/components/spinner/src/use-spinner.ts b/packages/components/spinner/src/use-spinner.ts
index 234abe08ec..0f6c09ba6d 100644
--- a/packages/components/spinner/src/use-spinner.ts
+++ b/packages/components/spinner/src/use-spinner.ts
@@ -1,17 +1,16 @@
 import type {SpinnerVariantProps, SpinnerSlots, SlotsToClasses} from "@nextui-org/theme";
+import type {HTMLNextUIProps, PropGetter} from "@nextui-org/system/types";
 
-import {HTMLNextUIProps, mapPropsVariants, PropGetter} from "@nextui-org/system";
+import {mapPropsVariants} from "@nextui-org/system/utils";
 import {spinner} from "@nextui-org/theme";
 import {clsx} from "@nextui-org/shared-utils";
-import {ReactRef} from "@nextui-org/react-utils";
-import {useDOMRef} from "@nextui-org/react-utils";
-import {useMemo, useCallback} from "react";
+import {useMemo, useCallback, Ref} from "react";
 
 interface Props extends HTMLNextUIProps<"div"> {
   /**
    * Ref to the DOM node.
    */
-  ref?: ReactRef<HTMLElement | null>;
+  ref?: Ref<HTMLElement | null>;
   /**
    * Spinner label, in case you passed it will be used as `aria-label`.
    */
@@ -39,9 +38,7 @@ export type UseSpinnerProps = Props & SpinnerVariantProps;
 export function useSpinner(originalProps: UseSpinnerProps) {
   const [props, variantProps] = mapPropsVariants(originalProps, spinner.variantKeys);
 
-  const {ref, children, className, classNames, label: labelProp, ...otherProps} = props;
-
-  const domRef = useDOMRef(ref);
+  const {children, className, classNames, label: labelProp, ...otherProps} = props;
 
   const slots = useMemo(() => spinner({...variantProps}), [...Object.values(variantProps)]);
 
@@ -68,7 +65,7 @@ export function useSpinner(originalProps: UseSpinnerProps) {
     [ariaLabel, slots, baseStyles, otherProps],
   );
 
-  return {domRef, label, slots, classNames, getSpinnerProps};
+  return {label, slots, classNames, getSpinnerProps};
 }
 
 export type UseSpinnerReturn = ReturnType<typeof useSpinner>;
diff --git a/packages/components/spinner/tsup.config.ts b/packages/components/spinner/tsup.config.ts
index 3e2bcff6cc..e7ef417947 100644
--- a/packages/components/spinner/tsup.config.ts
+++ b/packages/components/spinner/tsup.config.ts
@@ -4,5 +4,4 @@ export default defineConfig({
   clean: true,
   target: "es2019",
   format: ["cjs", "esm"],
-  banner: {js: '"use client";'},
 });
diff --git a/packages/components/table/src/table-body.tsx b/packages/components/table/src/table-body.tsx
index 0017f898ce..bf6c0b9e50 100644
--- a/packages/components/table/src/table-body.tsx
+++ b/packages/components/table/src/table-body.tsx
@@ -41,6 +41,8 @@ const TableBody = forwardRef<"tbody", TableBodyProps>((props, ref) => {
   } = props;
 
   const Component = as || "tbody";
+  const shouldFilterDOMProps = typeof Component === "string";
+
   const domRef = useDOMRef(ref);
 
   const {rowGroupProps} = useTableRowGroup();
@@ -126,7 +128,13 @@ const TableBody = forwardRef<"tbody", TableBodyProps>((props, ref) => {
   return (
     <Component
       ref={domRef}
-      {...mergeProps(rowGroupProps, filterDOMProps(bodyProps), otherProps)}
+      {...mergeProps(
+        rowGroupProps,
+        filterDOMProps(bodyProps, {
+          enabled: shouldFilterDOMProps,
+        }),
+        otherProps,
+      )}
       className={slots.tbody?.({class: tbodyStyles})}
       data-empty={dataAttr(collection.size === 0)}
       data-loading={dataAttr(isLoading)}
diff --git a/packages/components/table/src/table-cell.tsx b/packages/components/table/src/table-cell.tsx
index 857f309b5e..bece7645dd 100644
--- a/packages/components/table/src/table-cell.tsx
+++ b/packages/components/table/src/table-cell.tsx
@@ -29,6 +29,8 @@ const TableCell = forwardRef<"td", TableCellProps>((props, ref) => {
   const {as, className, node, rowKey, slots, state, classNames, ...otherProps} = props;
 
   const Component = as || "td";
+  const shouldFilterDOMProps = typeof Component === "string";
+
   const domRef = useDOMRef(ref);
 
   const {gridCellProps} = useTableCell({node}, state, domRef);
@@ -52,7 +54,14 @@ const TableCell = forwardRef<"td", TableCellProps>((props, ref) => {
       ref={domRef}
       data-focus-visible={dataAttr(isFocusVisible)}
       data-selected={dataAttr(isRowSelected)}
-      {...mergeProps(gridCellProps, focusProps, filterDOMProps(node.props), otherProps)}
+      {...mergeProps(
+        gridCellProps,
+        focusProps,
+        filterDOMProps(node.props, {
+          enabled: shouldFilterDOMProps,
+        }),
+        otherProps,
+      )}
       className={slots.td?.({class: tdStyles})}
     >
       {cell}
diff --git a/packages/components/table/src/table-checkbox-cell.tsx b/packages/components/table/src/table-checkbox-cell.tsx
index d372f91ed0..1b70045430 100644
--- a/packages/components/table/src/table-checkbox-cell.tsx
+++ b/packages/components/table/src/table-checkbox-cell.tsx
@@ -48,6 +48,8 @@ const TableCheckboxCell = forwardRef<"td", TableCheckboxCellProps>((props, ref)
   } = props;
 
   const Component = as || "td";
+  const shouldFilterDOMProps = typeof Component === "string";
+
   const domRef = useDOMRef(ref);
 
   const {gridCellProps} = useTableCell({node}, state, domRef);
@@ -67,7 +69,14 @@ const TableCheckboxCell = forwardRef<"td", TableCheckboxCellProps>((props, ref)
       ref={domRef}
       data-focus-visible={dataAttr(isFocusVisible)}
       data-selected={dataAttr(isRowSelected)}
-      {...mergeProps(gridCellProps, focusProps, filterDOMProps(node.props), otherProps)}
+      {...mergeProps(
+        gridCellProps,
+        focusProps,
+        filterDOMProps(node.props, {
+          enabled: shouldFilterDOMProps,
+        }),
+        otherProps,
+      )}
       className={slots.td?.({class: tdStyles})}
     >
       {isSingleSelectionMode ? (
diff --git a/packages/components/table/src/table-column-header.tsx b/packages/components/table/src/table-column-header.tsx
index 8d7724447e..9c8cc1d9c6 100644
--- a/packages/components/table/src/table-column-header.tsx
+++ b/packages/components/table/src/table-column-header.tsx
@@ -27,6 +27,8 @@ const TableColumnHeader = forwardRef<"th", TableColumnHeaderProps>((props, ref)
   const {as, className, state, node, slots, classNames, ...otherProps} = props;
 
   const Component = as || "th";
+  const shouldFilterDOMProps = typeof Component === "string";
+
   const domRef = useDOMRef(ref);
 
   const {columnHeaderProps} = useTableColumnHeader({node}, state, domRef);
@@ -49,7 +51,9 @@ const TableColumnHeader = forwardRef<"th", TableColumnHeaderProps>((props, ref)
       {...mergeProps(
         columnHeaderProps,
         focusProps,
-        filterDOMProps(columnProps),
+        filterDOMProps(columnProps, {
+          enabled: shouldFilterDOMProps,
+        }),
         allowsSorting ? hoverProps : {},
         otherProps,
       )}
diff --git a/packages/components/table/src/table-header-row.tsx b/packages/components/table/src/table-header-row.tsx
index f7eddbf106..8f94f9efdc 100644
--- a/packages/components/table/src/table-header-row.tsx
+++ b/packages/components/table/src/table-header-row.tsx
@@ -23,6 +23,7 @@ const TableHeaderRow = forwardRef<"tr", TableHeaderRowProps>((props, ref) => {
   const {as, className, children, node, slots, classNames, state, ...otherProps} = props;
 
   const Component = as || "tr";
+  const shouldFilterDOMProps = typeof Component === "string";
   const domRef = useDOMRef(ref);
 
   const {rowProps} = useTableHeaderRow({node}, state, domRef);
@@ -32,7 +33,13 @@ const TableHeaderRow = forwardRef<"tr", TableHeaderRowProps>((props, ref) => {
   return (
     <Component
       ref={domRef}
-      {...mergeProps(rowProps, filterDOMProps(node.props), otherProps)}
+      {...mergeProps(
+        rowProps,
+        filterDOMProps(node.props, {
+          enabled: shouldFilterDOMProps,
+        }),
+        otherProps,
+      )}
       className={slots.tr?.({class: trStyles})}
     >
       {children}
diff --git a/packages/components/table/src/table-row.tsx b/packages/components/table/src/table-row.tsx
index 265f610dc6..2d027cae9f 100644
--- a/packages/components/table/src/table-row.tsx
+++ b/packages/components/table/src/table-row.tsx
@@ -28,6 +28,7 @@ const TableRow = forwardRef<"tr", TableRowProps>((props, ref) => {
     props;
 
   const Component = as || "tr";
+  const shouldFilterDOMProps = typeof Component === "string";
 
   const domRef = useDOMRef(ref);
 
@@ -70,7 +71,9 @@ const TableRow = forwardRef<"tr", TableRowProps>((props, ref) => {
       {...mergeProps(
         rowProps,
         isSelectable ? {...hoverProps, ...focusProps} : {},
-        filterDOMProps(node.props),
+        filterDOMProps(node.props, {
+          enabled: shouldFilterDOMProps,
+        }),
         otherProps,
       )}
       className={slots.tr?.({class: trStyles})}
diff --git a/packages/components/table/src/table-select-all-checkbox.tsx b/packages/components/table/src/table-select-all-checkbox.tsx
index a4f4bbdf82..aef6fa967f 100644
--- a/packages/components/table/src/table-select-all-checkbox.tsx
+++ b/packages/components/table/src/table-select-all-checkbox.tsx
@@ -41,6 +41,8 @@ const TableSelectAllCheckbox = forwardRef<"th", TableSelectAllCheckboxProps>((pr
   } = props;
 
   const Component = as || "th";
+  const shouldFilterDOMProps = typeof Component === "string";
+
   const domRef = useDOMRef(ref);
 
   const {columnHeaderProps} = useTableColumnHeader({node}, state, domRef);
@@ -61,8 +63,12 @@ const TableSelectAllCheckbox = forwardRef<"th", TableSelectAllCheckboxProps>((pr
       {...mergeProps(
         columnHeaderProps,
         focusProps,
-        filterDOMProps(node.props),
-        filterDOMProps(otherProps),
+        filterDOMProps(node.props, {
+          enabled: shouldFilterDOMProps,
+        }),
+        filterDOMProps(otherProps, {
+          enabled: shouldFilterDOMProps,
+        }),
       )}
       className={slots.th?.({class: thStyles})}
     >
diff --git a/packages/components/table/src/use-table.ts b/packages/components/table/src/use-table.ts
index eaa79e22da..23046ff515 100644
--- a/packages/components/table/src/use-table.ts
+++ b/packages/components/table/src/use-table.ts
@@ -162,6 +162,7 @@ export function useTable<T extends object>(originalProps: UseTableProps<T>) {
   } = props;
 
   const Component = as || "table";
+  const shouldFilterDOMProps = typeof Component === "string";
 
   const domRef = useDOMRef(ref);
   const domBaseRef = useDOMRef(baseRef);
@@ -248,11 +249,17 @@ export function useTable<T extends object>(originalProps: UseTableProps<T>) {
 
   const getTableProps: PropGetter = useCallback(
     (props) => ({
-      ...mergeProps(gridProps, filterDOMProps(otherProps), props),
+      ...mergeProps(
+        gridProps,
+        filterDOMProps(otherProps, {
+          enabled: shouldFilterDOMProps,
+        }),
+        props,
+      ),
       ref: domRef,
       className: slots.table({class: clsx(classNames?.table, props?.className)}),
     }),
-    [classNames?.table, slots, gridProps, otherProps],
+    [classNames?.table, shouldFilterDOMProps, slots, gridProps, otherProps],
   );
 
   return {
diff --git a/packages/components/tabs/src/tab.tsx b/packages/components/tabs/src/tab.tsx
index 3df9ec92b2..86178b8b4e 100644
--- a/packages/components/tabs/src/tab.tsx
+++ b/packages/components/tabs/src/tab.tsx
@@ -49,6 +49,7 @@ const Tab = forwardRef<"button", TabItemProps>((props, ref) => {
   const domRef = useDOMRef(ref);
 
   const Component = as || "button";
+  const shouldFilterDOMProps = typeof Component === "string";
 
   const {
     tabProps,
@@ -103,7 +104,9 @@ const Tab = forwardRef<"button", TabItemProps>((props, ref) => {
               ...hoverProps,
             }
           : {},
-        filterDOMProps(otherProps),
+        filterDOMProps(otherProps, {
+          enabled: shouldFilterDOMProps,
+        }),
       )}
       className={slots.tab?.({class: tabStyles})}
       type={Component === "button" ? "button" : undefined}
diff --git a/packages/components/tabs/src/use-tabs.ts b/packages/components/tabs/src/use-tabs.ts
index 72c120d153..9700e32bac 100644
--- a/packages/components/tabs/src/use-tabs.ts
+++ b/packages/components/tabs/src/use-tabs.ts
@@ -76,6 +76,7 @@ export function useTabs<T extends object>(originalProps: UseTabsProps<T>) {
   } = props;
 
   const Component = as || "div";
+  const shouldFilterDOMProps = typeof Component === "string";
 
   const domRef = useDOMRef(ref);
 
@@ -123,7 +124,12 @@ export function useTabs<T extends object>(originalProps: UseTabsProps<T>) {
     (props) => ({
       "data-slot": "base",
       className: slots.base({class: clsx(baseStyles, props?.className)}),
-      ...mergeProps(filterDOMProps(otherProps), props),
+      ...mergeProps(
+        filterDOMProps(otherProps, {
+          enabled: shouldFilterDOMProps,
+        }),
+        props,
+      ),
     }),
     [baseStyles, otherProps, slots],
   );
diff --git a/packages/core/system/extend-variants.d.ts b/packages/core/system/extend-variants.d.ts
new file mode 100644
index 0000000000..11c864c1e6
--- /dev/null
+++ b/packages/core/system/extend-variants.d.ts
@@ -0,0 +1 @@
+export * from "./dist/extend-variants";
diff --git a/packages/core/system/extend-variants.js b/packages/core/system/extend-variants.js
new file mode 100644
index 0000000000..e5a278e8f6
--- /dev/null
+++ b/packages/core/system/extend-variants.js
@@ -0,0 +1 @@
+module.exports = require("./dist/extend-variants");
diff --git a/packages/core/system/package.json b/packages/core/system/package.json
index 8305b4cf00..a848345445 100644
--- a/packages/core/system/package.json
+++ b/packages/core/system/package.json
@@ -11,7 +11,13 @@
   "main": "src/index.ts",
   "sideEffects": false,
   "files": [
-    "dist"
+    "dist",
+    "utils.js",
+    "utils.d.ts",
+    "types.js",
+    "types.d.ts",
+    "extend-variants.js",
+    "extend-variants.d.ts"
   ],
   "publishConfig": {
     "access": "public"
diff --git a/packages/core/system/types.d.ts b/packages/core/system/types.d.ts
new file mode 100644
index 0000000000..9dc5fa2347
--- /dev/null
+++ b/packages/core/system/types.d.ts
@@ -0,0 +1 @@
+export * from "./dist/types";
diff --git a/packages/core/system/types.js b/packages/core/system/types.js
new file mode 100644
index 0000000000..6a339e3712
--- /dev/null
+++ b/packages/core/system/types.js
@@ -0,0 +1 @@
+module.exports = require("./dist/types");
diff --git a/packages/core/system/utils.d.ts b/packages/core/system/utils.d.ts
new file mode 100644
index 0000000000..59cabd3e95
--- /dev/null
+++ b/packages/core/system/utils.d.ts
@@ -0,0 +1 @@
+export * from "./dist/utils";
diff --git a/packages/core/system/utils.js b/packages/core/system/utils.js
new file mode 100644
index 0000000000..6ac0085a52
--- /dev/null
+++ b/packages/core/system/utils.js
@@ -0,0 +1 @@
+module.exports = require("./dist/utils");
diff --git a/packages/utilities/react-rsc-utils/README.md b/packages/utilities/react-rsc-utils/README.md
new file mode 100644
index 0000000000..d335932dfb
--- /dev/null
+++ b/packages/utilities/react-rsc-utils/README.md
@@ -0,0 +1,24 @@
+# @nextui-org/react-rsc-utils
+
+A Quick description of the component
+
+> This is an internal utility, not intended for public usage.
+
+## Installation
+
+```sh
+yarn add @nextui-org/react-rsc-utils
+# or
+npm i @nextui-org/react-rsc-utils
+```
+
+## Contribution
+
+Yes please! See the
+[contributing guidelines](https://github.com/nextui-org/nextui/blob/master/CONTRIBUTING.md)
+for details.
+
+## Licence
+
+This project is licensed under the terms of the
+[MIT license](https://github.com/nextui-org/nextui/blob/master/LICENSE).
diff --git a/packages/utilities/react-rsc-utils/children.d.ts b/packages/utilities/react-rsc-utils/children.d.ts
new file mode 100644
index 0000000000..844dd8f634
--- /dev/null
+++ b/packages/utilities/react-rsc-utils/children.d.ts
@@ -0,0 +1 @@
+export * from "./dist/children";
diff --git a/packages/utilities/react-rsc-utils/children.js b/packages/utilities/react-rsc-utils/children.js
new file mode 100644
index 0000000000..ed1cd7255e
--- /dev/null
+++ b/packages/utilities/react-rsc-utils/children.js
@@ -0,0 +1 @@
+module.exports = require("./dist/children");
diff --git a/packages/utilities/react-rsc-utils/filter-dom-props.d.ts b/packages/utilities/react-rsc-utils/filter-dom-props.d.ts
new file mode 100644
index 0000000000..10d1249ea5
--- /dev/null
+++ b/packages/utilities/react-rsc-utils/filter-dom-props.d.ts
@@ -0,0 +1 @@
+export * from "./dist/filter-dom-props";
diff --git a/packages/utilities/react-rsc-utils/filter-dom-props.js b/packages/utilities/react-rsc-utils/filter-dom-props.js
new file mode 100644
index 0000000000..84a7dcfbdb
--- /dev/null
+++ b/packages/utilities/react-rsc-utils/filter-dom-props.js
@@ -0,0 +1 @@
+module.exports = require("./dist/filter-dom-props");
diff --git a/packages/utilities/react-rsc-utils/package.json b/packages/utilities/react-rsc-utils/package.json
new file mode 100644
index 0000000000..682e7c7384
--- /dev/null
+++ b/packages/utilities/react-rsc-utils/package.json
@@ -0,0 +1,52 @@
+{
+  "name": "@nextui-org/react-rsc-utils",
+  "version": "2.0.1",
+  "description": "A set of utilities for react compatible with RSC",
+  "keywords": [
+    "react-rsc-utils"
+  ],
+  "author": "Junior Garcia <jrgarciadev@gmail.com>",
+  "homepage": "https://nextui.org",
+  "license": "MIT",
+  "main": "src/index.ts",
+  "sideEffects": false,
+  "files": [
+    "dist",
+    "children.d.ts",
+    "children.js",
+    "filter-dom-props.d.ts",
+    "filter-dom-props.js"
+  ],
+  "publishConfig": {
+    "access": "public"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/nextui-org/nextui.git",
+    "directory": "packages/utilities/react-rsc-utils"
+  },
+  "bugs": {
+    "url": "https://github.com/nextui-org/nextui/issues"
+  },
+  "scripts": {
+    "build": "tsup src --dts",
+    "build:fast": "tsup src",
+    "dev": "yarn build:fast -- --watch",
+    "clean": "rimraf dist .turbo",
+    "typecheck": "tsc --noEmit",
+    "prepack": "clean-package",
+    "postpack": "clean-package restore"
+  },
+  "devDependencies": {
+    "clean-package": "2.2.0"
+  },
+  "clean-package": "../../../clean-package.config.json",
+  "tsup": {
+    "clean": true,
+    "target": "es2019",
+    "format": [
+      "cjs",
+      "esm"
+    ]
+  }
+}
diff --git a/packages/utilities/react-utils/src/children.ts b/packages/utilities/react-rsc-utils/src/children.ts
similarity index 100%
rename from packages/utilities/react-utils/src/children.ts
rename to packages/utilities/react-rsc-utils/src/children.ts
diff --git a/packages/utilities/react-utils/src/filter-dom-props.ts b/packages/utilities/react-rsc-utils/src/filter-dom-props.ts
similarity index 90%
rename from packages/utilities/react-utils/src/filter-dom-props.ts
rename to packages/utilities/react-rsc-utils/src/filter-dom-props.ts
index cc4778fb95..3ef011ec0a 100644
--- a/packages/utilities/react-utils/src/filter-dom-props.ts
+++ b/packages/utilities/react-rsc-utils/src/filter-dom-props.ts
@@ -14,6 +14,10 @@ const DOMPropNames = new Set([
 ]);
 
 interface Options {
+  /**
+   * If the filter should be enabled.
+   */
+  enabled?: boolean;
   /**
    * If labelling associated aria properties should be included in the filter.
    */
@@ -37,11 +41,16 @@ export function filterDOMProps(
   props: DOMProps & AriaLabelingProps,
   opts: Options = {
     labelable: true,
+    enabled: true,
   },
 ): DOMProps & AriaLabelingProps {
   let {labelable, propNames} = opts;
   let filteredProps = {};
 
+  if (!opts.enabled) {
+    return props;
+  }
+
   for (const prop in props) {
     if (
       (Object.prototype.hasOwnProperty.call(props, prop) &&
diff --git a/packages/utilities/react-rsc-utils/src/index.ts b/packages/utilities/react-rsc-utils/src/index.ts
new file mode 100644
index 0000000000..3e8a607275
--- /dev/null
+++ b/packages/utilities/react-rsc-utils/src/index.ts
@@ -0,0 +1,2 @@
+export * from "./children";
+export * from "./filter-dom-props";
diff --git a/packages/utilities/react-rsc-utils/tsconfig.json b/packages/utilities/react-rsc-utils/tsconfig.json
new file mode 100644
index 0000000000..46e3b466c2
--- /dev/null
+++ b/packages/utilities/react-rsc-utils/tsconfig.json
@@ -0,0 +1,4 @@
+{
+  "extends": "../../../tsconfig.json",
+  "include": ["src", "index.ts"]
+}
diff --git a/packages/utilities/react-utils/package.json b/packages/utilities/react-utils/package.json
index ffc5b8498f..4180d6244d 100644
--- a/packages/utilities/react-utils/package.json
+++ b/packages/utilities/react-utils/package.json
@@ -38,7 +38,7 @@
   },
   "dependencies": {
     "@nextui-org/shared-utils": "workspace:*",
-    "@react-aria/utils": "^3.18.0"
+    "@nextui-org/react-rsc-utils": "workspace:*"
   },
   "devDependencies": {
     "clean-package": "2.2.0",
diff --git a/packages/utilities/react-utils/src/index.ts b/packages/utilities/react-utils/src/index.ts
index 6deb161da2..e42852bce0 100644
--- a/packages/utilities/react-utils/src/index.ts
+++ b/packages/utilities/react-utils/src/index.ts
@@ -1,6 +1,6 @@
 export * from "./context";
-export * from "./children";
 export * from "./refs";
 export * from "./dom";
 export * from "./dimensions";
-export * from "./filter-dom-props";
+
+export * from "@nextui-org/react-rsc-utils";
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 976ad87925..c6b53a3c96 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -273,6 +273,18 @@ importers:
       '@nextui-org/aria-utils':
         specifier: workspace:*
         version: link:../../packages/utilities/aria-utils
+      '@nextui-org/badge':
+        specifier: workspace:*
+        version: link:../../packages/components/badge
+      '@nextui-org/code':
+        specifier: workspace:*
+        version: link:../../packages/components/code
+      '@nextui-org/divider':
+        specifier: workspace:*
+        version: link:../../packages/components/divider
+      '@nextui-org/kbd':
+        specifier: workspace:*
+        version: link:../../packages/components/kbd
       '@nextui-org/react':
         specifier: workspace:*
         version: link:../../packages/core/react
@@ -282,6 +294,15 @@ importers:
       '@nextui-org/shared-utils':
         specifier: workspace:*
         version: link:../../packages/utilities/shared-utils
+      '@nextui-org/skeleton':
+        specifier: workspace:*
+        version: link:../../packages/components/skeleton
+      '@nextui-org/spacer':
+        specifier: workspace:*
+        version: link:../../packages/components/spacer
+      '@nextui-org/spinner':
+        specifier: workspace:*
+        version: link:../../packages/components/spinner
       '@nextui-org/theme':
         specifier: workspace:*
         version: link:../../packages/core/theme
@@ -930,9 +951,9 @@ importers:
 
   packages/components/divider:
     dependencies:
-      '@nextui-org/react-utils':
+      '@nextui-org/react-rsc-utils':
         specifier: workspace:*
-        version: link:../../utilities/react-utils
+        version: link:../../utilities/react-rsc-utils
       '@nextui-org/shared-utils':
         specifier: workspace:*
         version: link:../../utilities/shared-utils
@@ -942,12 +963,9 @@ importers:
       '@nextui-org/theme':
         specifier: workspace:*
         version: link:../../core/theme
-      '@react-aria/separator':
-        specifier: ^3.3.3
-        version: 3.3.3(react@18.2.0)
-      '@react-aria/utils':
-        specifier: ^3.18.0
-        version: 3.18.0(react@18.2.0)
+      '@react-types/shared':
+        specifier: ^3.18.1
+        version: 3.18.1(react@18.2.0)
     devDependencies:
       clean-package:
         specifier: 2.2.0
@@ -2539,14 +2557,20 @@ importers:
         specifier: ^18.2.0
         version: 18.2.0
 
+  packages/utilities/react-rsc-utils:
+    devDependencies:
+      clean-package:
+        specifier: 2.2.0
+        version: 2.2.0
+
   packages/utilities/react-utils:
     dependencies:
+      '@nextui-org/react-rsc-utils':
+        specifier: workspace:*
+        version: link:../react-rsc-utils
       '@nextui-org/shared-utils':
         specifier: workspace:*
         version: link:../shared-utils
-      '@react-aria/utils':
-        specifier: ^3.18.0
-        version: 3.18.0(react@18.2.0)
     devDependencies:
       clean-package:
         specifier: 2.2.0
@@ -7782,17 +7806,6 @@ packages:
       react: 18.2.0
     dev: false
 
-  /@react-aria/separator@3.3.3(react@18.2.0):
-    resolution: {integrity: sha512-kBGEXSSUiJLPS9foS5/7jgzpdp3/Yb1aMvVuvRGuNxDUsPAmvaYUT3qZ44Zf3hoxKfRFb4452KcoZ03w3Jfcvg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0-rc.1 || ^18.0.0
-    dependencies:
-      '@react-aria/utils': 3.18.0(react@18.2.0)
-      '@react-types/shared': 3.18.1(react@18.2.0)
-      '@swc/helpers': 0.5.1
-      react: 18.2.0
-    dev: false
-
   /@react-aria/ssr@3.6.0(react@18.2.0):
     resolution: {integrity: sha512-OFiYQdv+Yk7AO7IsQu/fAEPijbeTwrrEYvdNoJ3sblBBedD5j5fBTNWrUPNVlwC4XWWnWTCMaRIVsJujsFiWXg==}
     peerDependencies:

From fbb7c3fb7fbd5176ba5cf31579a27e04ac291c2b Mon Sep 17 00:00:00 2001
From: Junior Garcia <jrgarciadev@gmail.com>
Date: Sat, 5 Aug 2023 18:51:29 -0300
Subject: [PATCH 2/2] fix(root): eslint/prettier issues

---
 apps/docs/components/sandpack/theme.ts           | 3 +--
 packages/utilities/test-utils/src/mocks/image.ts | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/docs/components/sandpack/theme.ts b/apps/docs/components/sandpack/theme.ts
index 68491d00a5..38b34e4b61 100644
--- a/apps/docs/components/sandpack/theme.ts
+++ b/apps/docs/components/sandpack/theme.ts
@@ -30,8 +30,7 @@ export const nextuiTheme: SandpackTheme = {
   },
   font: {
     body: "Inter var",
-    mono:
-      'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
+    mono: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace',
     size: "14px",
     lineHeight: "1.5rem",
   },
diff --git a/packages/utilities/test-utils/src/mocks/image.ts b/packages/utilities/test-utils/src/mocks/image.ts
index 0995fcfb2b..e965d7ada6 100644
--- a/packages/utilities/test-utils/src/mocks/image.ts
+++ b/packages/utilities/test-utils/src/mocks/image.ts
@@ -8,6 +8,7 @@ export function mockImage() {
   //@ts-expect-error
   window.Image = class Image {
     onload: VoidFunction = () => {
+      // eslint-disable-next-line no-console
       console.log("called");
     };
     onerror: VoidFunction = () => {};