From d0e7687738bc578ab68688de47893a73af4a12d9 Mon Sep 17 00:00:00 2001 From: Akash Gautam Date: Mon, 20 May 2024 13:33:14 +0530 Subject: [PATCH 01/24] fix: script update for storybook build --- example/storybook-nativewind/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/example/storybook-nativewind/package.json b/example/storybook-nativewind/package.json index 2386dd920..e32ec8cab 100644 --- a/example/storybook-nativewind/package.json +++ b/example/storybook-nativewind/package.json @@ -17,7 +17,8 @@ "storybook:nativewind": "NODE_OPTIONS=--openssl-legacy-provider STYLE_ENGINE=nativewind start-storybook -p 6007", "storybook:gluestack": "NODE_OPTIONS=--openssl-legacy-provider STYLE_ENGINE=gluestack start-storybook -p 6007", "dev": "yarn storybook", - "build-storybook": "build-storybook", + "build-storybook:nativewind": "STYLE_ENGINE=nativewind build-storybook", + "build-storybook:gluestack": "STYLE_ENGINE=gluestack build-storybook", "build": "bob build", "release": "release-it", "test": "jest", From 3fe7eef3de326fc661c817d6f3f2faf737f980bd Mon Sep 17 00:00:00 2001 From: Akash Gautam Date: Mon, 20 May 2024 13:33:26 +0530 Subject: [PATCH 02/24] fix: mdx files fixes --- .../src/components/Actionsheet/index.stories.mdx | 2 +- .../src/components/Tooltip/index.themed.stories.mdx | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/example/storybook-nativewind/src/components/Actionsheet/index.stories.mdx b/example/storybook-nativewind/src/components/Actionsheet/index.stories.mdx index 61f0aa55f..2832b3c9c 100644 --- a/example/storybook-nativewind/src/components/Actionsheet/index.stories.mdx +++ b/example/storybook-nativewind/src/components/Actionsheet/index.stories.mdx @@ -128,7 +128,7 @@ function App(){ }, }} /> - +
diff --git a/example/storybook-nativewind/src/components/Tooltip/index.themed.stories.mdx b/example/storybook-nativewind/src/components/Tooltip/index.themed.stories.mdx index e0edfdf0b..fb16089d1 100644 --- a/example/storybook-nativewind/src/components/Tooltip/index.themed.stories.mdx +++ b/example/storybook-nativewind/src/components/Tooltip/index.themed.stories.mdx @@ -28,7 +28,6 @@ import { Heading, Center, VStack, - Command, Icon, Text } from '../../core-components/themed'; From 2934e3250ab462fb44f1b285fbefd660ead438a4 Mon Sep 17 00:00:00 2001 From: Damini Date: Mon, 20 May 2024 14:21:47 +0530 Subject: [PATCH 03/24] fix: slider build fix --- packages/react-native-aria/slider/src/useSlider.web.ts | 4 +++- yarn.lock | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/react-native-aria/slider/src/useSlider.web.ts b/packages/react-native-aria/slider/src/useSlider.web.ts index 742971b6f..b97aba574 100644 --- a/packages/react-native-aria/slider/src/useSlider.web.ts +++ b/packages/react-native-aria/slider/src/useSlider.web.ts @@ -186,11 +186,13 @@ function useSliderWeb( } }; - if (labelProps.htmlFor) { + //@ts-ignore + if (labelProps.htmlFor !== undefined) { // Ideally the `for` attribute should point to the first thumb, but VoiceOver on iOS // causes this to override the `aria-labelledby` on the thumb. This causes the first // thumb to only be announced as the slider label rather than its individual name as well. // See https://bugs.webkit.org/show_bug.cgi?id=172464. + //@ts-ignore delete labelProps.htmlFor; labelProps.onClick = () => { // Safari does not focus elements when clicking on an associated