Merge pull request #272 from gluestack/release/@gluestack-ui/[email protected]

Release/@gluestack UI/[email protected]

Author: makkarMeenu

example/storybook/src/components/Feedback/Spinner/Spinner.stories.tsx

@@ -7,7 +7,7 @@ const SpinnerMeta: ComponentMeta<typeof Spinner> = {
   argTypes: {
     size: {
       control: 'select',
-      options: ['xs', 'small', 'md', 'large', 'xl'],
+      options: ['xs', 'sm', 'md', 'lg', 'xl'],
       description: 'The size of the button.',
       table: {
         defaultValue: { summary: 'md' },

example/storybook/src/components/Feedback/Spinner/Spinner.tsx

@@ -5,7 +5,7 @@ import { Spinner } from '../../../ui-components';
 export const SpinnerStory = ({ ...props }) => {
   return (
     <Wrapper>
-      <Spinner color="$primary500" {...props} size="small" />
+      <Spinner color="$primary500" {...props} />
     </Wrapper>
   );
 };

example/storybook/src/ui-components/Spinner/index.tsx

@@ -1,6 +1,2 @@
-import { createSpinner } from '@gluestack-ui/spinner';
-import { Root } from './styled-components';
-
-export const Spinner = createSpinner({
-  Root,
-}) as any;
+import { Spinner } from './styled-components';
+export { Spinner };

example/storybook/src/ui-components/Spinner/styled-components/index.tsx

@@ -1 +1,3 @@
-export { default as Root } from './Root';
+import Root from './Root';
+import { createSpinner } from '@gluestack-ui/spinner';
+export const Spinner = createSpinner({ Root });

packages/spinner/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @gluestack-ui/spinner
 
+## 0.1.2
+
+### Patch Changes
+
+- Added typings for spinner
+
 ## 0.1.1
 
 ### Patch Changes

packages/spinner/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gluestack-ui/spinner",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",
   "types": "lib/typescript/index.d.ts",

packages/spinner/src/Spinner.tsx

@@ -1,12 +1,10 @@
 import React, { forwardRef } from 'react';
-
-export function Spinner<StyledSpinnerProps>(
-  StyledSpinner: React.ComponentType<StyledSpinnerProps>
-) {
-  return forwardRef(({ ...props }: StyledSpinnerProps, ref: any) => {
+import type { ActivityIndicatorProps } from 'react-native';
+export function Spinner<T>(StyledSpinner: React.ComponentType<T>) {
+  return forwardRef(({ ...props }: T & ActivityIndicatorProps, ref: any) => {
     return (
       <StyledSpinner
-        {...(props as StyledSpinnerProps)}
+        {...props}
         ref={ref}
         accessible
         accessibilityLabel="loading"

yarn.lock

@@ -2280,7 +2280,7 @@
     "@react-native-aria/focus" "^0.2.7"
     react-native-svg "13.4.0"
 
-"@gluestack-ui/form-control@latest":
+"@gluestack-ui/form-control@0.1.1", "@gluestack-ui/form-control@latest":
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/@gluestack-ui/form-control/-/form-control-0.1.1.tgz#890b05310137dd437b8fd23f2f326e7b9aea0408"
   integrity sha512-Tritq+0tT4RZGsBlcSD5dTjm5UqqoWoZQj1B4Rif0kTSdGBVAMrk3ZJZGnBX7ql9Bo9kv34Ne7yYAd7+GwotSg==