Merge branch 'patch' of github.com:gluestack/gluestack-ui into patch

Viraj Ajay Joshi · Viraj Ajay Joshi · commit 43cd082c2b34 · 2024-03-05T17:11:45.000+05:30
diff --git a/example/storybook-nativewind/src/components/Actionsheet/index.nw.storiesold.mdx b/example/storybook-nativewind/src/components/Actionsheet/index.nw.storiesold.mdx
@@ -150,7 +150,7 @@ npm i @gluestack-ui/actionsheet
 <CollapsibleCode>
 
 ```jsx 
-%%-- File: core-components/nativewind/Actionsheet/index.tsx --%% 
+%%-- File: core-components/nativewind/actionsheet/index.tsx --%% 
 ```
 
 </CollapsibleCode>
diff --git a/example/storybook-nativewind/src/components/Alert/index.nw.stories.mdx b/example/storybook-nativewind/src/components/Alert/index.nw.stories.mdx
@@ -100,7 +100,7 @@ npm i @gluestack-ui/alert
 <CollapsibleCode>
 
 ```jsx 
-%%-- File: core-components/nativewind/Alert/index.tsx --%% 
+%%-- File: core-components/nativewind/alert/index.tsx --%% 
 ```
 
 </CollapsibleCode>
diff --git a/example/storybook-nativewind/src/components/AlertDialog/index.nw.storiesold.mdx b/example/storybook-nativewind/src/components/AlertDialog/index.nw.storiesold.mdx
@@ -153,7 +153,7 @@ npm i @gluestack-ui/alert-dialog
 <CollapsibleCode>
 
 ```jsx 
-%%-- File: core-components/nativewind/AlertDialog/index.tsx --%% 
+%%-- File: core-components/nativewind/alert-dialog/index.tsx --%% 
 ```
 
 </CollapsibleCode>
diff --git a/example/storybook-nativewind/src/components/Avatar/index.nw.stories.mdx b/example/storybook-nativewind/src/components/Avatar/index.nw.stories.mdx
@@ -91,7 +91,7 @@ npm i @gluestack-ui/avatar
 <CollapsibleCode>
 
 ```jsx 
-%%-- File: core-components/nativewind/Avatar/index.tsx --%% 
+%%-- File: core-components/nativewind/avatar/index.tsx --%% 
 ```
 
 </CollapsibleCode>
diff --git a/example/storybook-nativewind/src/components/Avatar/index.stories.mdx b/example/storybook-nativewind/src/components/Avatar/index.stories.mdx
@@ -122,7 +122,7 @@ Step 2: Copy and paste the following code into your project.
 <CollapsibleCode>
 
 ```jsx 
-%%-- File: core-components/nativewind/Avatar/index.tsx --%% 
+%%-- File: core-components/nativewind/avatar/index.tsx --%% 
 ```
 
 </CollapsibleCode>
diff --git a/example/storybook-nativewind/src/components/Badge/index.nw.stories.mdx b/example/storybook-nativewind/src/components/Badge/index.nw.stories.mdx
@@ -116,7 +116,7 @@ npm i @gluestack-ui/badge
 <CollapsibleCode>
 
 ```jsx 
-%%-- File: core-components/nativewind/Badge/index.tsx --%% 
+%%-- File: core-components/nativewind/badge/index.tsx --%% 
 ```
 
 </CollapsibleCode>
diff --git a/example/storybook-nativewind/src/components/Box/index.nw.stories.mdx b/example/storybook-nativewind/src/components/Box/index.nw.stories.mdx
@@ -63,7 +63,7 @@ This is an illustration of **Box** component.
 <CollapsibleCode>
 
 ```jsx 
-%%-- File: core-components/nativewind/Box/index.tsx --%% 
+%%-- File: core-components/nativewind/box/index.tsx --%% 
 ```
 
 </CollapsibleCode>
diff --git a/example/storybook-nativewind/src/components/Button/index.nw.stories.mdx b/example/storybook-nativewind/src/components/Button/index.nw.stories.mdx
@@ -98,7 +98,7 @@ npm i @gluestack-ui/button
 <CollapsibleCode>
 
 ```jsx 
-%%-- File: core-components/nativewind/Button/index.tsx --%% 
+%%-- File: core-components/nativewind/button/index.tsx --%% 
 ```
 
 </CollapsibleCode>
diff --git a/example/storybook-nativewind/src/components/Button/index.stories.mdx b/example/storybook-nativewind/src/components/Button/index.stories.mdx
@@ -76,7 +76,7 @@ npm install @gluestack-ui/button
 <CollapsibleCode>
 
 ```jsx 
-%%-- File: core-components/nativewind/Button/index.tsx --%% 
+%%-- File: core-components/nativewind/button/index.tsx --%% 
 ```
 
 </CollapsibleCode>
diff --git a/example/storybook-nativewind/src/components/Card/index.nw.stories.mdx b/example/storybook-nativewind/src/components/Card/index.nw.stories.mdx
@@ -103,7 +103,7 @@ npm i @gluestack-ui/card
 <CollapsibleCode>
 
 ```jsx 
-%%-- File: core-components/nativewind/Card/index.tsx --%% 
+%%-- File: core-components/nativewind/card/index.tsx --%% 
 ```
 
 </CollapsibleCode>
diff --git a/example/storybook-nativewind/src/components/Menu/index.stories.mdx b/example/storybook-nativewind/src/components/Menu/index.stories.mdx
@@ -16,7 +16,7 @@ import { Meta } from '@storybook/addon-docs';
 
 <Meta title="common/components/Menu" />
 
-import { Menu, MenuIcon, MenuItem, MenuItemLabel } from './Menu';
+import { Menu, MenuIcon, MenuItem, MenuItemLabel } from '../../core-components/themed';
 import {
   ThemeIcon,
   SettingsIcon,
diff --git a/example/storybook-nativewind/src/components/Select/index.stories.mdx b/example/storybook-nativewind/src/components/Select/index.stories.mdx
@@ -27,7 +27,7 @@ import {
   SelectDragIndicatorWrapper,
   SelectDragIndicator,
   SelectItem,
-} from './Select';
+} from '../../core-components/themed';
 import {
   Icon,
   ChevronDownIcon,
diff --git a/example/storybook-nativewind/src/components/Switch/index.nw.stories.mdx b/example/storybook-nativewind/src/components/Switch/index.nw.stories.mdx
@@ -16,7 +16,7 @@ import { Meta } from '@storybook/addon-docs';
 
 <Meta title="with-nativewind/components/Forms/Switch" />
 
-import { Switch } from './Switch';
+import { Switch } from '../../core-components/nativewind';
 import { VStack, Text } from '../../core-components/nativewind';
 import { HStack } from '../../core-components/nativewind';
 import { transformedCode } from '../../utils';
diff --git a/example/storybook-nativewind/src/components/View/index.stories.mdx b/example/storybook-nativewind/src/components/View/index.stories.mdx
@@ -12,7 +12,7 @@ import {
   TableContainer,
   InlineCode,
 } from '@gluestack/design-system';
-import { View } from './View';
+import { View } from '../../core-components/themed';
 import { Text, Heading } from '@gluestack-ui/themed';
 import Wrapper from '../../core-components/themed/Wrapper';
 
diff --git a/example/storybook-nativewind/src/core-components/themed/gluestack-ui-provider/config.ts b/example/storybook-nativewind/src/core-components/themed/gluestack-ui-provider/config.ts
@@ -2,7 +2,7 @@ import { AnimationResolver } from '@gluestack-style/animation-resolver';
 import { MotionAnimationDriver } from '@gluestack-style/legend-motion-animation-driver';
 import { createConfig } from '@gluestack-style/react';
 
-export const gluestackUIConfig = createConfig({
+export const config = createConfig({
   aliases: {
     bg: 'backgroundColor',
     bgColor: 'backgroundColor',
@@ -833,15 +833,8 @@ export const gluestackUIConfig = createConfig({
   plugins: [new AnimationResolver(MotionAnimationDriver)],
 });
 
-type Config = typeof gluestackUIConfig; // Assuming `config` is defined elsewhere
-
-export interface IConfig {}
-export interface IComponents {}
+type Config = typeof config;
 
 declare module '@gluestack-style/react' {
-  interface UIConfig extends Omit<Config, keyof IConfig>, IConfig {}
+  interface ICustomConfig extends Config {}
 }
-
-export const config = {
-  ...gluestackUIConfig,
-};
diff --git a/example/storybook/src/ui/theme-configuration/customizing-theme/EjectLibrary/index.stories.mdx b/example/storybook/src/ui/theme-configuration/customizing-theme/EjectLibrary/index.stories.mdx
@@ -74,17 +74,17 @@ export const config = createConfig({
 type Config = typeof config;
 type Components = typeof components;
 
-declare module '@gluestack-ui/themed' {
-  interface UIConfig extends Config {}
-  interface UIComponents extends Components {}
+declare module '@gluestack-style/react' {
+  interface ICustomConfig extends Config {}
+  interface ICustomComponents extends Components {}
 }
 
 ```
-> Note: The updated config will be applied automatically, as it is passed inside `GluestackUIProvider` component located at "./components/GluestackUIProvider/index.tsx"
+> Note: The updated config will be applied automatically, as it is passed inside `GluestackUIProvider` component located at "./components/gluestack-ui-provider/index.tsx"
 
 You can customize all the tokens of the theme in `config`. For a complete list of tokens and default values, please check [default Tokens](https://gluestack.io/ui/docs/theme-configuration/theme/default-tokens).
 
-5. **Update Components**: you can find all of your components theme inside `./components` folder. For example, if you want to customize `Button` component, you can find its theme file at `./components/Button/index.tsx`. Update component's style as per your requirements.
+5. **Update Components**: you can find all of your components theme inside `./components` folder. For example, if you want to customize `Button` component, you can find its theme file at `./components/button/index.tsx`. Update component's style as per your requirements.
 
 ## Customizing Animations
 
@@ -117,9 +117,9 @@ export const config = createConfig({
 type Config = typeof config;
 type Components = typeof components;
 
-declare module '@gluestack-ui/themed' {
-  interface UIConfig extends Config {}
-  interface UIComponents extends Components {}
+declare module '@gluestack-style/react' {
+  interface ICustomConfig extends Config {}
+  interface ICustomComponents extends Components {}
 }
 
 ```
diff --git a/packages/config/src/components/gluestack-ui.config.ts b/packages/config/src/components/gluestack-ui.config.ts
@@ -709,11 +709,14 @@ export const gluestackUIConfig = createConfig({
   plugins: [new AnimationResolver(MotionAnimationDriver)],
 });
 
-export type { UIConfig, UIComponents } from '@gluestack-ui/themed';
-
-export interface IConfig {}
-export interface IComponents {}
-
 export const config = {
   ...gluestackUIConfig,
 };
+
+type Config = typeof gluestackUIConfig; // Assuming `config` is defined elsewhere
+// type Components = typeof gluestackUIConfig.components; // Assuming `config` is defined elsewhere
+
+declare module '@gluestack-style/react' {
+  interface ICustomConfig extends Config {}
+  // interface ICustomComponents extends Components {}
+}
