chore: fixing conflict

apps/docs/content/components/disclosure/compact.raw.jsx

@@ -1,4 +1,4 @@
-import {Disclosure} from "@nextui-org/react";
+import {Disclosure} from "@heroui/react";
 
 export default function App() {
   const defaultContent =

apps/docs/content/components/disclosure/controlled.raw.jsx

@@ -1,5 +1,5 @@
 import React from "react";
-import {Disclosure, Button} from "@nextui-org/react";
+import {Disclosure, Button} from "@heroui/react";
 
 export default function App() {
   const defaultContent =

apps/docs/content/components/disclosure/custom-motion.raw.jsx

@@ -1,4 +1,4 @@
-import {Disclosure} from "@nextui-org/react";
+import {Disclosure} from "@heroui/react";
 
 export default function App() {
   const defaultContent =

apps/docs/content/components/disclosure/custom-styles.raw.jsx

@@ -1,4 +1,4 @@
-import {Disclosure} from "@nextui-org/disclosure";
+import {Disclosure} from "@heroui/disclosure";
 
 const MonitorMobileIcon = (props) => {
   return (

apps/docs/content/components/disclosure/default-expanded.raw.jsx

@@ -1,4 +1,4 @@
-import {Disclosure} from "@nextui-org/react";
+import {Disclosure} from "@heroui/react";
 
 export default function App() {
   const defaultContent =

apps/docs/content/components/disclosure/disabled.raw.jsx

@@ -1,4 +1,4 @@
-import {Disclosure} from "@nextui-org/react";
+import {Disclosure} from "@heroui/react";
 
 export default function App() {
   const defaultContent =

apps/docs/content/components/disclosure/indicator-function.raw.jsx

@@ -1,4 +1,4 @@
-import {Disclosure} from "@nextui-org/react";
+import {Disclosure} from "@heroui/react";
 
 const MoonIcon = (props) => {
   return (

apps/docs/content/components/disclosure/indicator.raw.jsx

@@ -1,4 +1,4 @@
-import {Disclosure} from "@nextui-org/react";
+import {Disclosure} from "@heroui/react";
 
 const MoonIcon = (props) => {
   return (

apps/docs/content/components/disclosure/start-content.raw.jsx

@@ -1,4 +1,4 @@
-import {Disclosure, Avatar} from "@nextui-org/react";
+import {Disclosure, Avatar} from "@heroui/react";
 
 export default function App() {
   const defaultContent =

apps/docs/content/components/disclosure/subtitle.raw.jsx

@@ -1,4 +1,4 @@
-import {Disclosure} from "@nextui-org/react";
+import {Disclosure} from "@heroui/react";
 
 export default function App() {
   const defaultContent =

apps/docs/content/components/disclosure/usage.raw.jsx

@@ -1,4 +1,4 @@
-import {Disclosure} from "@nextui-org/react";
+import {Disclosure} from "@heroui/react";
 
 export default function App() {
   const defaultContent =

apps/docs/content/docs/components/disclosure.mdx

@@ -21,19 +21,19 @@ Disclosure displays hidden content that can be revealed or concealed.
   showGlobalInstallWarning
   commands={{
     cli: "npx nextui-cli@latest add disclosure",
-    npm: "npm install @nextui-org/disclosure",
-    yarn: "yarn add @nextui-org/disclosure",
-    pnpm: "pnpm add @nextui-org/disclosure",
-    bun: "bun add @nextui-org/disclosure"
+    npm: "npm install @heroui/disclosure",
+    yarn: "yarn add @heroui/disclosure",
+    pnpm: "pnpm add @heroui/disclosure",
+    bun: "bun add @heroui/disclosure"
   }}
 />
 
 ## Import
 
 <ImportTabs
   commands={{
-    main: 'import {Disclosure} from "@nextui-org/react";',
-    individual: 'import {Disclosure} from "@nextui-org/disclosure";',
+    main: 'import {Disclosure} from "@heroui/react";',
+    individual: 'import {Disclosure} from "@heroui/disclosure";',
   }}
 />
 

packages/components/accordion/src/accordian-context.tsx

@@ -1,4 +1,4 @@
-import {createContext} from "@nextui-org/react-utils";
+import {createContext} from "@heroui/react-utils";
 import {DisclosureGroupState} from "@react-stately/disclosure";
 
 import {ValuesType} from "./use-accordion";

packages/components/accordion/src/base/accordion-item-base.tsx

@@ -1,5 +1,3 @@
-import type {AccordionItemVariantProps, AccordionItemSlots, SlotsToClasses} from "@heroui/theme";
-
 import {As} from "@heroui/system";
 import {ItemProps, BaseItem} from "@heroui/aria-utils";
 import {FocusableProps, PressEvents} from "@react-types/shared";
@@ -62,26 +60,6 @@ export interface Props<T extends object = {}>
    * @deprecated - use `onPress` instead.
    */
   onClick?: MouseEventHandler<HTMLButtonElement>;
-  /**
-   * Classname or List of classes to change the classNames of the element.
-   * if `className` is passed, it will be added to the base slot.
-   *
-   * @example
-   * ```ts
-   * <AccordionItem classNames={{
-   *    base:"base-classes",
-   *    heading: "heading-classes",
-   *    trigger: "trigger-classes",
-   *    startContent: "start-indicator-classes",
-   *    indicator: "indicator-classes",
-   *    titleWrapper: "title-wrapper-classes", // this wraps the title and subtitle
-   *    title: "title-classes",
-   *    subtitle: "subtitle-classes",
-   *    content: "content-classes",
-   * }} />
-   * ```
-   */
-  classNames?: SlotsToClasses<AccordionItemSlots>;
   /**
    * Customizable heading tag for Web accessibility:
    * use headings to describe content and use them consistently and semantically.
@@ -90,7 +68,7 @@ export interface Props<T extends object = {}>
   HeadingComponent?: As;
 }
 
-export type AccordionItemBaseProps<T extends object = {}> = Props<T> & AccordionItemVariantProps;
+export type AccordionItemBaseProps<T extends object = {}> = Props<T>;
 
 const AccordionItemBase = BaseItem as (props: AccordionItemBaseProps) => JSX.Element;
 

packages/components/accordion/src/use-accordion-item.ts

@@ -1,18 +1,11 @@
+import type {DisclosureSlots, DisclosureVariantProps} from "@heroui/theme";
+
 import {HTMLHeroUIProps, PropGetter} from "@heroui/system";
 import {ReactRef} from "@heroui/react-utils";
 import {DisclosureProps} from "@heroui/disclosure";
-import {¯SlotsToClasses} from "@heroui/theme";
-import {PropGetter} from "@heroui/system";
-import {DisclosureProps} from "@heroui/disclosure";
-import {Key, useCallback¯} from "react";
-import type {DisclosureVariantProps} from "@nextui-org/theme";
-
-import {DisclosureSlots, SlotsToClasses} from "@nextui-org/theme";
-import {PropGetter} from "@nextui-org/system";
-import {ReactRef} from "@nextui-org/react-utils";
-import {DisclosureProps} from "@nextui-org/disclosure";
+import {SlotsToClasses} from "@heroui/theme";
 import {Key, useCallback} from "react";
-import {callAllHandlers} from "@nextui-org/shared-utils";
+import {callAllHandlers} from "@heroui/shared-utils";
 
 import {useAccordianContext} from "./accordian-context";
 import {AccordionItemBaseProps} from "./base/accordion-item-base";

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

@@ -1,25 +1,15 @@
 import type {AriaAccordionProps} from "@react-types/accordion";
-import type {AccordionGroupVariantProps} from "@heroui/theme";
 import type {HTMLHeroUIProps, PropGetter} from "@heroui/system";
 
+import {AccordionGroupVariantProps, accordion} from "@heroui/theme";
 import {useProviderContext} from "@heroui/system";
 import {ReactRef, filterDOMProps} from "@heroui/react-utils";
-import {Key, useCallback} from "react";
+import {Children, isValidElement, Key, useCallback} from "react";
 import {mergeProps} from "@react-aria/utils";
-import {accordion} from "@heroui/theme";
 import {useDOMRef} from "@heroui/react-utils";
 import {useMemo} from "react";
 import {DividerProps} from "@heroui/divider";
-import type {AccordionGroupVariantProps} from "@nextui-org/theme";
-
-import {accordion} from "@nextui-org/theme";
-import {PropGetter, useProviderContext} from "@nextui-org/system";
-import {filterDOMProps, ReactRef, useDOMRef} from "@nextui-org/react-utils";
-import {Children, isValidElement, Key, useCallback, useMemo} from "react";
-import {DividerProps} from "@nextui-org/divider";
 import {useDisclosureGroupState} from "@react-stately/disclosure";
-
-import {mergeProps} from "@react-aria/utils";
 import {clsx} from "@heroui/shared-utils";
 
 import {AccordionItemProps} from "./accordion-item";

packages/components/disclosure/README.md

@@ -1,13 +1,13 @@
-# @nextui-org/disclosure
+# @heroui/disclosure
 
 Disclosure displays hidden content that can be revealed or concealed.
 
 ## Installation
 
 ```sh
-yarn add @nextui-org/disclosure
+yarn add @heroui/disclosure
 # or
-npm i @nextui-org/disclosure
+npm i @heroui/disclosure
 ```
 
 ## Contribution

packages/components/disclosure/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "@nextui-org/disclosure",
+  "name": "@heroui/disclosure",
   "version": "2.0.0",
   "description": "A disclosure is a collapsible section of content.",
   "keywords": [
@@ -36,25 +36,25 @@
   "peerDependencies": {
     "react": ">=18 || >=19.0.0-rc.0",
     "react-dom": ">=18 || >=19.0.0-rc.0",
-    "@nextui-org/theme": ">=2.4.0",
-    "@nextui-org/system": ">=2.4.0"
+    "@heroui/theme": ">=2.4.0",
+    "@heroui/system": ">=2.4.0"
   },
   "dependencies": {
-    "@nextui-org/shared-utils": "workspace:*",
-    "@nextui-org/react-utils": "workspace:*",
-    "@nextui-org/shared-icons": "workspace:*",
+    "@heroui/shared-utils": "workspace:*",
+    "@heroui/react-utils": "workspace:*",
+    "@heroui/shared-icons": "workspace:*",
     "@react-aria/disclosure": "^3.0.0",
     "@react-aria/button": "^3.11.0",
     "@react-stately/disclosure": "^3.0.0",
     "@react-aria/utils": "3.26.0",
     "@react-aria/focus": "3.19.0"
   },
   "devDependencies": {
-    "@nextui-org/theme": "workspace:*",
-    "@nextui-org/system": "workspace:*",
-    "@nextui-org/avatar": "workspace:*",
-    "@nextui-org/input": "workspace:*",
-    "@nextui-org/button": "workspace:*",
+    "@heroui/theme": "workspace:*",
+    "@heroui/system": "workspace:*",
+    "@heroui/avatar": "workspace:*",
+    "@heroui/input": "workspace:*",
+    "@heroui/button": "workspace:*",
     "clean-package": "2.2.0",
     "react": "^18.0.0",
     "react-dom": "^18.0.0"

packages/components/disclosure/src/disclosure.tsx

@@ -1,5 +1,5 @@
-import {forwardRef} from "@nextui-org/system";
-import {ChevronIcon} from "@nextui-org/shared-icons";
+import {forwardRef} from "@heroui/system";
+import {ChevronIcon} from "@heroui/shared-icons";
 import {ReactNode, useMemo} from "react";
 
 import {UseDisclosureProps, useDisclosure} from "./use-disclosure";

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

@@ -1,12 +1,12 @@
-import type {DisclosureSlots, DisclosureVariantProps, SlotsToClasses} from "@nextui-org/theme";
+import type {DisclosureSlots, DisclosureVariantProps, SlotsToClasses} from "@heroui/theme";
 
-import {disclosure} from "@nextui-org/theme";
-import {As, HTMLNextUIProps, mapPropsVariants, PropGetter} from "@nextui-org/system";
-import {ReactRef, useDOMRef} from "@nextui-org/react-utils";
+import {disclosure} from "@heroui/theme";
+import {As, HTMLHeroUIProps, mapPropsVariants, PropGetter} from "@heroui/system";
+import {ReactRef, useDOMRef} from "@heroui/react-utils";
 import {useDisclosure as useAriaDisclosure} from "@react-aria/disclosure";
 import {DisclosureProps, useDisclosureState} from "@react-stately/disclosure";
 import {ReactNode, useCallback, useMemo, useRef} from "react";
-import {clsx, dataAttr, objectToDeps} from "@nextui-org/shared-utils";
+import {clsx, dataAttr, objectToDeps} from "@heroui/shared-utils";
 import {chain, mergeProps} from "@react-aria/utils";
 import {useButton} from "@react-aria/button";
 import {useFocusRing} from "@react-aria/focus";
@@ -29,7 +29,7 @@ export type DisclosureIndicatorProps = {
   isDisabled?: boolean;
 };
 
-interface Props extends Omit<HTMLNextUIProps<"div">, "title"> {
+interface Props extends Omit<HTMLHeroUIProps<"div">, "title"> {
   /**
    * Ref to the DOM node.
    */

packages/components/disclosure/stories/disclosure.stories.tsx

@@ -1,10 +1,10 @@
 import React from "react";
 import {Meta} from "@storybook/react";
-import {button, disclosure} from "@nextui-org/theme";
-import {Avatar} from "@nextui-org/avatar";
-import {Button} from "@nextui-org/button";
-import {Input, Textarea} from "@nextui-org/input";
-import {MonitorMobileIcon, MoonIcon} from "@nextui-org/shared-icons";
+import {button, disclosure} from "@heroui/theme";
+import {Avatar} from "@heroui/avatar";
+import {Button} from "@heroui/button";
+import {Input, Textarea} from "@heroui/input";
+import {MonitorMobileIcon, MoonIcon} from "@heroui/shared-icons";
 
 import {Disclosure, DisclosureProps} from "../src";