diff --git a/package.json b/package.json index f1f9b75ce..6a3b3bc9b 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "prettier --write" ] }, - "version": "3.4.25", + "version": "3.4.26", "license": "MIT", "private": false, "main": "lib/commonjs/index", @@ -64,10 +64,11 @@ "@types/lodash.omit": "^4.5.6", "@types/lodash.omitby": "^4.6.6", "@types/lodash.pick": "^4.4.6", + "@types/lodash.uniqueid": "^4.0.7", "@types/react": "^16.9.19", "@types/react-native": "~0.63.2", "@types/tinycolor2": "^1.4.2", - "@types/use-subscription": "^1.0.0", + "@types/use-sync-external-store": "^0.0.3", "babel-plugin-transform-remove-console": "^6.9.4", "commitlint": "^8.3.5", "eslint": "^7.10.0", @@ -183,7 +184,7 @@ "@react-native-aria/focus": "^0.2.6", "@react-native-aria/interactions": "^0.2.2", "@react-native-aria/listbox": "^0.2.4-alpha.3", - "@react-native-aria/overlays": "0.3.3-rc.0", + "@react-native-aria/overlays": "^0.3.3", "@react-native-aria/radio": "^0.2.4", "@react-native-aria/slider": "^0.2.5-alpha.1", "@react-native-aria/tabs": "^0.2.7", @@ -207,9 +208,10 @@ "lodash.omit": "^4.5.0", "lodash.omitby": "^4.6.0", "lodash.pick": "^4.4.0", + "lodash.uniqueid": "^4.0.1", "stable-hash": "^0.0.2", "tinycolor2": "^1.4.2", - "use-subscription": "^1.8.0" + "use-sync-external-store": "^1.2.0" }, "directories": { "example": "example", diff --git a/src/components/composites/AlertDialog/AlertDialog.tsx b/src/components/composites/AlertDialog/AlertDialog.tsx index fbfece2b7..377112fbd 100644 --- a/src/components/composites/AlertDialog/AlertDialog.tsx +++ b/src/components/composites/AlertDialog/AlertDialog.tsx @@ -37,6 +37,7 @@ const AlertDialog = ( _backdropFade, _fade, _slide, + _overlay, useRNModal, ...restThemeProps } = usePropsResolution('AlertDialog', rest); @@ -65,6 +66,7 @@ const AlertDialog = ( if (useHasResponsiveProps(rest)) { return null; } + return ( , diff --git a/src/components/composites/Menu/Menu.tsx b/src/components/composites/Menu/Menu.tsx index 9a70f1d34..df276a975 100644 --- a/src/components/composites/Menu/Menu.tsx +++ b/src/components/composites/Menu/Menu.tsx @@ -77,6 +77,7 @@ const Menu = ( if (useHasResponsiveProps(resolvedProps)) { return null; } + return ( <> {updatedTrigger()} @@ -86,7 +87,6 @@ const Menu = ( useRNModalOnAndroid useRNModal={useRNModal} {..._overlay} - unmountOnExit > void; diff --git a/src/components/composites/Modal/Modal.tsx b/src/components/composites/Modal/Modal.tsx index 8de8e51c2..7c67156e7 100644 --- a/src/components/composites/Modal/Modal.tsx +++ b/src/components/composites/Modal/Modal.tsx @@ -77,7 +77,7 @@ const Modal = ( if (useHasResponsiveProps(rest)) { return null; } - // console.log('visible here', visible); + return ( { + const { _overlay } = usePropsResolution('Popover', props); + const triggerRef = React.useRef(null); const mergedRef = mergeRefs([triggerRef]); const [isOpen, setIsOpen] = useControllableState({ @@ -92,7 +95,7 @@ const Popover = ( onRequestClose={handleClose} useRNModalOnAndroid useRNModal={useRNModal} - unmountOnExit + {..._overlay} >