diff --git a/example/storybook-nativewind/package.json b/example/storybook-nativewind/package.json index 9bffb0855..a5f80db4a 100644 --- a/example/storybook-nativewind/package.json +++ b/example/storybook-nativewind/package.json @@ -32,7 +32,7 @@ "@gluestack-style/animation-resolver": "^1.0.4", "@gluestack-style/react": "^1.0.57", "@gluestack-ui/config": "^1.1.19", - "@gluestack-ui/themed": "^1.1.58", + "@gluestack-ui/themed": "^1.1.59", "@gluestack/design-system": "^0.5.36", "@gorhom/bottom-sheet": "^5.0.0-alpha.10", "@legendapp/motion": "^2.2.0", diff --git a/packages/config/package.json b/packages/config/package.json index 0054a20d8..b0fa810f6 100644 --- a/packages/config/package.json +++ b/packages/config/package.json @@ -55,7 +55,7 @@ "@gluestack-ui/menu": "0.2.36", "@gluestack-ui/modal": "0.1.34", "@gluestack-ui/overlay": "0.1.15", - "@gluestack-ui/popover": "0.1.40", + "@gluestack-ui/popover": "0.1.41", "@gluestack-ui/pressable": "0.1.16", "@gluestack-ui/progress": "0.1.17", "@gluestack-ui/provider": "0.1.12", @@ -66,14 +66,14 @@ "@gluestack-ui/switch": "0.1.22", "@gluestack-ui/tabs": "0.1.17", "@gluestack-ui/textarea": "0.1.23", - "@gluestack-ui/themed": "1.1.58", + "@gluestack-ui/themed": "1.1.59", "@gluestack-ui/toast": "1.0.7", "@gluestack-ui/tooltip": "0.1.34", "@legendapp/motion": "latest" }, "peerDependencies": { "@gluestack-style/react": ">=1.0.57", - "@gluestack-ui/themed": ">=1.1.58" + "@gluestack-ui/themed": ">=1.1.59" }, "release-it": { "git": { diff --git a/packages/themed/CHANGELOG.md b/packages/themed/CHANGELOG.md index 9da61c05d..23d24e5e3 100644 --- a/packages/themed/CHANGELOG.md +++ b/packages/themed/CHANGELOG.md @@ -1,5 +1,12 @@ # @gluestack-ui/themed +## 1.1.59 + +### Patch Changes + +- Updated dependencies + - @gluestack-ui/popover@0.1.41 + ## 1.1.58 ### Patch Changes diff --git a/packages/themed/package.json b/packages/themed/package.json index 7b6a22a7e..28d71d1d9 100644 --- a/packages/themed/package.json +++ b/packages/themed/package.json @@ -1,6 +1,6 @@ { "name": "@gluestack-ui/themed", - "version": "1.1.58", + "version": "1.1.59", "main": "build/index.js", "types": "build/index.d.ts", "module": "build/index", @@ -54,7 +54,7 @@ "@gluestack-ui/menu": "0.2.36", "@gluestack-ui/modal": "0.1.34", "@gluestack-ui/overlay": "0.1.15", - "@gluestack-ui/popover": "0.1.40", + "@gluestack-ui/popover": "0.1.41", "@gluestack-ui/pressable": "0.1.16", "@gluestack-ui/progress": "0.1.17", "@gluestack-ui/provider": "0.1.12", diff --git a/packages/unstyled/popover/CHANGELOG.md b/packages/unstyled/popover/CHANGELOG.md index 71e93f51b..4e5eb0d78 100644 --- a/packages/unstyled/popover/CHANGELOG.md +++ b/packages/unstyled/popover/CHANGELOG.md @@ -1,5 +1,11 @@ # @gluestack-ui/popover +## 0.1.41 + +### Patch Changes + +- fix: popover error issue + ## 0.1.40 ### Patch Changes diff --git a/packages/unstyled/popover/package.json b/packages/unstyled/popover/package.json index c70d4775b..c0437e452 100644 --- a/packages/unstyled/popover/package.json +++ b/packages/unstyled/popover/package.json @@ -1,6 +1,6 @@ { "name": "@gluestack-ui/popover", - "version": "0.1.40", + "version": "0.1.41", "main": "lib/commonjs/index", "module": "lib/module/index", "types": "lib/typescript/index.d.ts", diff --git a/packages/unstyled/popover/src/PopoverArrow.tsx b/packages/unstyled/popover/src/PopoverArrow.tsx index 1c9471f96..61bdc945c 100644 --- a/packages/unstyled/popover/src/PopoverArrow.tsx +++ b/packages/unstyled/popover/src/PopoverArrow.tsx @@ -27,18 +27,6 @@ const PopoverArrow = (StyledPopoverArrow: any) => }); }, [arrowHeight, arrowWidth, placement, actualPlacement]); - const ArrowStyle = React.useMemo(() => { - return { - top: arrowProps?.style?.top - arrowHeight / 2, - left: arrowProps?.style?.left - arrowWidth / 2, - }; - }, [ - arrowHeight, - arrowWidth, - arrowProps?.style?.top, - arrowProps?.style?.left, - ]); - React.useEffect(() => { const ArrowComponent = ( updateArrowSize({ height, width }); }} {...props} - {...ArrowStyle} key={actualPlacement + 'arrow'} initial={{ opacity: 0, @@ -78,15 +65,15 @@ const PopoverArrow = (StyledPopoverArrow: any) => }} style={[ props?.style, - ArrowStyle, + arrowProps?.style, { // To avoid border radius case top: placement === 'right bottom' || placement === 'left bottom' - ? ArrowStyle?.top > 4 - ? ArrowStyle?.top - 4 - : ArrowStyle?.top - : ArrowStyle?.top, + ? arrowProps?.style?.top > 4 + ? arrowProps?.style?.top - 4 + : arrowProps?.style?.top + : arrowProps?.style?.top, }, additionalStyles, ]}