Skip to content

Commit 929c979

Browse files
authored
Merge pull request #4883 from GeekyAnts/release/3.4.0-rc.6
Release/3.4.0 rc.6
2 parents 4df2567 + 1ea530b commit 929c979

File tree

3 files changed

+68
-60
lines changed

3 files changed

+68
-60
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"prettier --write"
3737
]
3838
},
39-
"version": "3.4.0-rc.5",
39+
"version": "3.4.0-rc.6",
4040
"license": "MIT",
4141
"private": false,
4242
"main": "lib/commonjs/index",

src/components/composites/Menu/Menu.tsx

Lines changed: 30 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -79,34 +79,36 @@ const Menu = (
7979
return (
8080
<>
8181
{updatedTrigger()}
82-
<Overlay
83-
isOpen={isOpen}
84-
onRequestClose={handleClose}
85-
useRNModalOnAndroid
86-
{..._overlay}
87-
>
88-
<PresenceTransition visible={isOpen} {..._presenceTransition}>
89-
<Popper
90-
triggerRef={triggerRef}
91-
onClose={handleClose}
92-
placement={placement}
93-
{...resolvedProps}
94-
>
95-
<Backdrop onPress={handleClose} {..._backdrop} />
96-
<Popper.Content isOpen={isOpen}>
97-
<MenuContext.Provider
98-
value={{ closeOnSelect, onClose: handleClose }}
99-
>
100-
<FocusScope contain restoreFocus autoFocus>
101-
<MenuContent menuRef={ref} {...resolvedProps}>
102-
{children}
103-
</MenuContent>
104-
</FocusScope>
105-
</MenuContext.Provider>
106-
</Popper.Content>
107-
</Popper>
108-
</PresenceTransition>
109-
</Overlay>
82+
{isOpen && (
83+
<Overlay
84+
isOpen={isOpen}
85+
onRequestClose={handleClose}
86+
useRNModalOnAndroid
87+
{..._overlay}
88+
>
89+
<PresenceTransition visible={isOpen} {..._presenceTransition}>
90+
<Popper
91+
triggerRef={triggerRef}
92+
onClose={handleClose}
93+
placement={placement}
94+
{...resolvedProps}
95+
>
96+
<Backdrop onPress={handleClose} {..._backdrop} />
97+
<Popper.Content isOpen={isOpen}>
98+
<MenuContext.Provider
99+
value={{ closeOnSelect, onClose: handleClose }}
100+
>
101+
<FocusScope contain restoreFocus autoFocus>
102+
<MenuContent menuRef={ref} {...resolvedProps}>
103+
{children}
104+
</MenuContent>
105+
</FocusScope>
106+
</MenuContext.Provider>
107+
</Popper.Content>
108+
</Popper>
109+
</PresenceTransition>
110+
</Overlay>
111+
)}
110112
</>
111113
);
112114
};

src/components/composites/Popover/Popover.tsx

Lines changed: 37 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -73,38 +73,44 @@ const Popover = (
7373
return (
7474
<Box ref={ref}>
7575
{updatedTrigger()}
76-
<Overlay isOpen={isOpen} onRequestClose={handleClose} useRNModalOnAndroid>
77-
<PresenceTransition
78-
initial={{ opacity: 0 }}
79-
animate={{ opacity: 1, transition: { duration: 150 } }}
80-
exit={{ opacity: 0, scale: 0.95, transition: { duration: 100 } }}
81-
visible={isOpen}
82-
style={StyleSheet.absoluteFill}
76+
{isOpen && (
77+
<Overlay
78+
isOpen={isOpen}
79+
onRequestClose={handleClose}
80+
useRNModalOnAndroid
8381
>
84-
<Popper onClose={handleClose} triggerRef={triggerRef} {...props}>
85-
<Backdrop onPress={handleClose} bg="transparent" />
86-
<PopoverContext.Provider
87-
value={{
88-
onClose: handleClose,
89-
initialFocusRef,
90-
finalFocusRef,
91-
popoverContentId,
92-
bodyId,
93-
headerId,
94-
headerMounted,
95-
bodyMounted,
96-
setBodyMounted,
97-
setHeaderMounted,
98-
isOpen,
99-
}}
100-
>
101-
<FocusScope contain={trapFocus} restoreFocus autoFocus>
102-
{children}
103-
</FocusScope>
104-
</PopoverContext.Provider>
105-
</Popper>
106-
</PresenceTransition>
107-
</Overlay>
82+
<PresenceTransition
83+
initial={{ opacity: 0 }}
84+
animate={{ opacity: 1, transition: { duration: 150 } }}
85+
exit={{ opacity: 0, scale: 0.95, transition: { duration: 100 } }}
86+
visible={isOpen}
87+
style={StyleSheet.absoluteFill}
88+
>
89+
<Popper onClose={handleClose} triggerRef={triggerRef} {...props}>
90+
<Backdrop onPress={handleClose} bg="transparent" />
91+
<PopoverContext.Provider
92+
value={{
93+
onClose: handleClose,
94+
initialFocusRef,
95+
finalFocusRef,
96+
popoverContentId,
97+
bodyId,
98+
headerId,
99+
headerMounted,
100+
bodyMounted,
101+
setBodyMounted,
102+
setHeaderMounted,
103+
isOpen,
104+
}}
105+
>
106+
<FocusScope contain={trapFocus} restoreFocus autoFocus>
107+
{children}
108+
</FocusScope>
109+
</PopoverContext.Provider>
110+
</Popper>
111+
</PresenceTransition>
112+
</Overlay>
113+
)}
108114
</Box>
109115
);
110116
};

0 commit comments

Comments
 (0)