Merge pull request #4883 from GeekyAnts/release/3.4.0-rc.6

Release/3.4.0 rc.6
GeekyAnts · Apr 6, 2022 · 929c979 · 929c979 · vercel · Apr 6, 2022
2 parents 4df2567 + 1ea530b
commit 929c979
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 60 deletions.
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
       "prettier --write"
     ]
   },
-  "version": "3.4.0-rc.5",
+  "version": "3.4.0-rc.6",
   "license": "MIT",
   "private": false,
   "main": "lib/commonjs/index",

diff --git a/src/components/composites/Menu/Menu.tsx b/src/components/composites/Menu/Menu.tsx
@@ -79,34 +79,36 @@ const Menu = (
   return (
     <>
       {updatedTrigger()}
-      <Overlay
-        isOpen={isOpen}
-        onRequestClose={handleClose}
-        useRNModalOnAndroid
-        {..._overlay}
-      >
-        <PresenceTransition visible={isOpen} {..._presenceTransition}>
-          <Popper
-            triggerRef={triggerRef}
-            onClose={handleClose}
-            placement={placement}
-            {...resolvedProps}
-          >
-            <Backdrop onPress={handleClose} {..._backdrop} />
-            <Popper.Content isOpen={isOpen}>
-              <MenuContext.Provider
-                value={{ closeOnSelect, onClose: handleClose }}
-              >
-                <FocusScope contain restoreFocus autoFocus>
-                  <MenuContent menuRef={ref} {...resolvedProps}>
-                    {children}
-                  </MenuContent>
-                </FocusScope>
-              </MenuContext.Provider>
-            </Popper.Content>
-          </Popper>
-        </PresenceTransition>
-      </Overlay>
+      {isOpen && (
+        <Overlay
+          isOpen={isOpen}
+          onRequestClose={handleClose}
+          useRNModalOnAndroid
+          {..._overlay}
+        >
+          <PresenceTransition visible={isOpen} {..._presenceTransition}>
+            <Popper
+              triggerRef={triggerRef}
+              onClose={handleClose}
+              placement={placement}
+              {...resolvedProps}
+            >
+              <Backdrop onPress={handleClose} {..._backdrop} />
+              <Popper.Content isOpen={isOpen}>
+                <MenuContext.Provider
+                  value={{ closeOnSelect, onClose: handleClose }}
+                >
+                  <FocusScope contain restoreFocus autoFocus>
+                    <MenuContent menuRef={ref} {...resolvedProps}>
+                      {children}
+                    </MenuContent>
+                  </FocusScope>
+                </MenuContext.Provider>
+              </Popper.Content>
+            </Popper>
+          </PresenceTransition>
+        </Overlay>
+      )}
     </>
   );
 };

diff --git a/src/components/composites/Popover/Popover.tsx b/src/components/composites/Popover/Popover.tsx
@@ -73,38 +73,44 @@ const Popover = (
   return (
     <Box ref={ref}>
       {updatedTrigger()}
-      <Overlay isOpen={isOpen} onRequestClose={handleClose} useRNModalOnAndroid>
-        <PresenceTransition
-          initial={{ opacity: 0 }}
-          animate={{ opacity: 1, transition: { duration: 150 } }}
-          exit={{ opacity: 0, scale: 0.95, transition: { duration: 100 } }}
-          visible={isOpen}
-          style={StyleSheet.absoluteFill}
+      {isOpen && (
+        <Overlay
+          isOpen={isOpen}
+          onRequestClose={handleClose}
+          useRNModalOnAndroid
         >
-          <Popper onClose={handleClose} triggerRef={triggerRef} {...props}>
-            <Backdrop onPress={handleClose} bg="transparent" />
-            <PopoverContext.Provider
-              value={{
-                onClose: handleClose,
-                initialFocusRef,
-                finalFocusRef,
-                popoverContentId,
-                bodyId,
-                headerId,
-                headerMounted,
-                bodyMounted,
-                setBodyMounted,
-                setHeaderMounted,
-                isOpen,
-              }}
-            >
-              <FocusScope contain={trapFocus} restoreFocus autoFocus>
-                {children}
-              </FocusScope>
-            </PopoverContext.Provider>
-          </Popper>
-        </PresenceTransition>
-      </Overlay>
+          <PresenceTransition
+            initial={{ opacity: 0 }}
+            animate={{ opacity: 1, transition: { duration: 150 } }}
+            exit={{ opacity: 0, scale: 0.95, transition: { duration: 100 } }}
+            visible={isOpen}
+            style={StyleSheet.absoluteFill}
+          >
+            <Popper onClose={handleClose} triggerRef={triggerRef} {...props}>
+              <Backdrop onPress={handleClose} bg="transparent" />
+              <PopoverContext.Provider
+                value={{
+                  onClose: handleClose,
+                  initialFocusRef,
+                  finalFocusRef,
+                  popoverContentId,
+                  bodyId,
+                  headerId,
+                  headerMounted,
+                  bodyMounted,
+                  setBodyMounted,
+                  setHeaderMounted,
+                  isOpen,
+                }}
+              >
+                <FocusScope contain={trapFocus} restoreFocus autoFocus>
+                  {children}
+                </FocusScope>
+              </PopoverContext.Provider>
+            </Popper>
+          </PresenceTransition>
+        </Overlay>
+      )}
     </Box>
   );
 };