@tamagui/popover 1.90.2 → 1.90.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tamagui/popover",
-  "version": "1.90.2",
+  "version": "1.90.3",
   "sideEffects": [
     "*.css"
   ],
@@ -33,24 +33,24 @@
   },
   "dependencies": {
     "@floating-ui/react": "^0.26.6",
-    "@tamagui/adapt": "1.90.2",
-    "@tamagui/animate": "1.90.2",
-    "@tamagui/aria-hidden": "1.90.2",
-    "@tamagui/compose-refs": "1.90.2",
-    "@tamagui/constants": "1.90.2",
-    "@tamagui/core": "1.90.2",
-    "@tamagui/dismissable": "1.90.2",
-    "@tamagui/floating": "1.90.2",
-    "@tamagui/focus-scope": "1.90.2",
-    "@tamagui/helpers": "1.90.2",
-    "@tamagui/polyfill-dev": "1.90.2",
-    "@tamagui/popper": "1.90.2",
-    "@tamagui/portal": "1.90.2",
-    "@tamagui/remove-scroll": "1.90.2",
-    "@tamagui/scroll-view": "1.90.2",
-    "@tamagui/sheet": "1.90.2",
-    "@tamagui/stacks": "1.90.2",
-    "@tamagui/use-controllable-state": "1.90.2",
+    "@tamagui/adapt": "1.90.3",
+    "@tamagui/animate": "1.90.3",
+    "@tamagui/aria-hidden": "1.90.3",
+    "@tamagui/compose-refs": "1.90.3",
+    "@tamagui/constants": "1.90.3",
+    "@tamagui/core": "1.90.3",
+    "@tamagui/dismissable": "1.90.3",
+    "@tamagui/floating": "1.90.3",
+    "@tamagui/focus-scope": "1.90.3",
+    "@tamagui/helpers": "1.90.3",
+    "@tamagui/polyfill-dev": "1.90.3",
+    "@tamagui/popper": "1.90.3",
+    "@tamagui/portal": "1.90.3",
+    "@tamagui/remove-scroll": "1.90.3",
+    "@tamagui/scroll-view": "1.90.3",
+    "@tamagui/sheet": "1.90.3",
+    "@tamagui/stacks": "1.90.3",
+    "@tamagui/use-controllable-state": "1.90.3",
     "react-freeze": "^1.0.3"
   },
   "peerDependencies": {
@@ -58,7 +58,7 @@
     "react-native": "*"
   },
   "devDependencies": {
-    "@tamagui/build": "1.90.2",
+    "@tamagui/build": "1.90.3",
     "react": "^18.2.0",
     "react-native": "^0.73.4"
   },

package/src/Popover.tsx

@@ -410,9 +410,7 @@ const PopoverContentImpl = React.forwardRef<
   const { open, keepChildrenMounted } = context
   const popperContext = usePopperContext(__scopePopover || POPOVER_SCOPE)
 
-  const contents = React.useMemo(() => {
-    return isWeb ? <div style={{ display: 'contents' }}>{children}</div> : children
-  }, [children])
+  const contents = isWeb ? <div style={dspContentsStyle}>{children}</div> : children
 
   if (context.breakpointActive) {
     // unwrap the PopoverScrollView if used, as it will use the SheetScrollView if that exists
@@ -426,7 +424,7 @@ const PopoverContentImpl = React.forwardRef<
       return child
     })
 
-    let content = childrenWithoutScrollView as any
+    let content = <ResetPresence>{childrenWithoutScrollView}</ResetPresence>
 
     if (Platform.OS === 'android' || Platform.OS === 'ios') {
       content = (
@@ -434,11 +432,9 @@ const PopoverContentImpl = React.forwardRef<
           scope={__scopePopover || POPOVER_SCOPE}
           {...popperContext}
         >
-          <ResetPresence>{childrenWithoutScrollView}</ResetPresence>
+          {childrenWithoutScrollView}
         </PopperContext.Provider>
       )
-    } else {
-      content = <ResetPresence>{content}</ResetPresence>
     }
 
     // doesn't show as popover yet on native, must use as sheet
@@ -459,14 +455,16 @@ const PopoverContentImpl = React.forwardRef<
 
   // const freeze = Boolean(isFullyHidden && freezeContentsWhenHidden)
 
+  const handleExitComplete = React.useCallback(() => {
+    setIsFullyHidden?.(true)
+  }, [setIsFullyHidden])
+
   return (
     <Animate
       type="presence"
       present={Boolean(open)}
       keepChildrenMounted={keepChildrenMounted}
-      onExitComplete={() => {
-        setIsFullyHidden && setIsFullyHidden(true)
-      }}
+      onExitComplete={handleExitComplete}
     >
       <PopperContent
         __scopePopper={__scopePopover || POPOVER_SCOPE}
@@ -481,9 +479,7 @@ const PopoverContentImpl = React.forwardRef<
           allowPinchZoom
           // causes lots of bugs on touch web on site
           removeScrollBar={false}
-          style={{
-            display: 'contents',
-          }}
+          style={dspContentsStyle}
         >
           <ResetPresence>
             <FocusScope
@@ -502,6 +498,10 @@ const PopoverContentImpl = React.forwardRef<
   )
 })
 
+const dspContentsStyle = {
+  display: 'contents',
+}
+
 /* -------------------------------------------------------------------------------------------------
  * PopoverClose
  * -----------------------------------------------------------------------------------------------*/
@@ -599,14 +599,16 @@ export const Popover = withStaticProperties(
         },
       })
 
+      const handleOpenChange = useEvent((val, via) => {
+        viaRef.current = via
+        setOpen(val)
+      })
+
       const sheetActive = useSheetBreakpointActive(sheetBreakpoint)
 
       const floatingContext = useFloatingContext({
         open,
-        setOpen: (val, via) => {
-          viaRef.current = via
-          setOpen(val)
-        },
+        setOpen: handleOpenChange,
         disable: sheetActive,
         hoverable,
         disableFocus: disableFocus,
@@ -623,6 +625,7 @@ export const Popover = withStaticProperties(
         anchorTo: setAnchorTo,
       }))
 
+      // needs to be entirely memoized!
       const popoverContext = {
         id,
         sheetBreakpoint,
@@ -630,10 +633,7 @@ export const Popover = withStaticProperties(
         triggerRef,
         open,
         breakpointActive: sheetActive,
-        onOpenChange: (val, via) => {
-          viaRef.current = via
-          setOpen(val)
-        },
+        onOpenChange: handleOpenChange,
         onOpenToggle: useEvent(() => {
           if (open && sheetActive) {
             return