@tamagui/popover 1.48.11 → 1.49.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/Popover.js +6 -32
- package/dist/cjs/Popover.js.map +2 -2
- package/dist/esm/Popover.js +6 -32
- package/dist/esm/Popover.js.map +2 -2
- package/dist/jsx/Popover.js +7 -30
- package/dist/jsx/Popover.js.map +2 -2
- package/package.json +18 -18
- package/src/Popover.tsx +18 -53
- package/types/Popover.d.ts.map +1 -1
package/dist/cjs/Popover.js
CHANGED
|
@@ -91,13 +91,6 @@ const PopoverTrigger = React.forwardRef(
|
|
|
91
91
|
const PopoverContent = import_popper.PopperContentFrame.extractable(
|
|
92
92
|
React.forwardRef(
|
|
93
93
|
function PopoverContent2(props, forwardedRef) {
|
|
94
|
-
return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(PopoverContentPortal, { zIndex: props.zIndex, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(PopoverContentInner, { ...props, ref: forwardedRef }) });
|
|
95
|
-
}
|
|
96
|
-
)
|
|
97
|
-
);
|
|
98
|
-
const PopoverContentInner = React.memo(
|
|
99
|
-
React.forwardRef(
|
|
100
|
-
(props, forwardedRef) => {
|
|
101
94
|
const {
|
|
102
95
|
allowPinchZoom,
|
|
103
96
|
trapFocus,
|
|
@@ -109,7 +102,6 @@ const PopoverContentInner = React.memo(
|
|
|
109
102
|
const contentRef = React.useRef(null);
|
|
110
103
|
const composedRefs = (0, import_compose_refs.useComposedRefs)(forwardedRef, contentRef);
|
|
111
104
|
const isRightClickOutsideRef = React.useRef(false);
|
|
112
|
-
const themeName = (0, import_core.useThemeName)();
|
|
113
105
|
React.useEffect(() => {
|
|
114
106
|
if (!context.open)
|
|
115
107
|
return;
|
|
@@ -117,7 +109,7 @@ const PopoverContentInner = React.memo(
|
|
|
117
109
|
if (content)
|
|
118
110
|
return (0, import_aria_hidden.hideOthers)(content);
|
|
119
111
|
}, [context.open]);
|
|
120
|
-
return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
112
|
+
return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(PopoverContentPortal, { zIndex: props.zIndex, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_core.Stack, { pointerEvents: context.open ? "auto" : "none", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
121
113
|
PopoverContentImpl,
|
|
122
114
|
{
|
|
123
115
|
...contentImplProps,
|
|
@@ -158,26 +150,12 @@ function PopoverContentPortal(props) {
|
|
|
158
150
|
const zIndex = props.zIndex ?? 15e4;
|
|
159
151
|
const context = usePopoverContext();
|
|
160
152
|
const popperContext = (0, import_popper.usePopperContext)();
|
|
161
|
-
return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_portal.Portal, { zIndex, children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
162
|
-
PopoverContentPortalContents,
|
|
163
|
-
{
|
|
164
|
-
popperContext,
|
|
165
|
-
context,
|
|
166
|
-
...props
|
|
167
|
-
}
|
|
168
|
-
) });
|
|
169
|
-
}
|
|
170
|
-
const PopoverContentPortalContents = ({
|
|
171
|
-
context,
|
|
172
|
-
popperContext,
|
|
173
|
-
...props
|
|
174
|
-
}) => {
|
|
175
153
|
const themeName = (0, import_core.useThemeName)();
|
|
176
|
-
let contents =
|
|
154
|
+
let contents = props.children;
|
|
177
155
|
if (import_react_native.Platform.OS === "android" || import_react_native.Platform.OS === "ios") {
|
|
178
156
|
contents = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(PopoverRepropagateContext, { popperContext, context, children: props.children });
|
|
179
157
|
}
|
|
180
|
-
return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_core.Theme, { forceClassName: true, name: themeName, children: [
|
|
158
|
+
return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_portal.Portal, { zIndex, children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_core.Theme, { forceClassName: true, name: themeName, children: [
|
|
181
159
|
!!context.open && !context.breakpointActive && /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
182
160
|
import_stacks.YStack,
|
|
183
161
|
{
|
|
@@ -186,9 +164,9 @@ const PopoverContentPortalContents = ({
|
|
|
186
164
|
}
|
|
187
165
|
),
|
|
188
166
|
contents
|
|
189
|
-
] });
|
|
190
|
-
}
|
|
191
|
-
const PopoverContentImpl = React.forwardRef((props, forwardedRef)
|
|
167
|
+
] }) });
|
|
168
|
+
}
|
|
169
|
+
const PopoverContentImpl = React.forwardRef(function PopoverContentImpl2(props, forwardedRef) {
|
|
192
170
|
const {
|
|
193
171
|
trapFocus,
|
|
194
172
|
onOpenAutoFocus,
|
|
@@ -207,16 +185,12 @@ const PopoverContentImpl = React.forwardRef((props, forwardedRef) => {
|
|
|
207
185
|
const { open, keepChildrenMounted } = context;
|
|
208
186
|
const popperContext = (0, import_popper.usePopperContext)();
|
|
209
187
|
const [isFullyHidden, setIsFullyHidden] = React.useState(!context.open);
|
|
210
|
-
const [hasShownOnce, setHasShownOnce] = React.useState(false);
|
|
211
188
|
const contents = React.useMemo(() => {
|
|
212
189
|
return import_core.isWeb ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { style: { display: "contents" }, children }) : children;
|
|
213
190
|
}, [children]);
|
|
214
191
|
if (open && isFullyHidden) {
|
|
215
192
|
setIsFullyHidden(false);
|
|
216
193
|
}
|
|
217
|
-
if (!open && isFullyHidden && !hasShownOnce) {
|
|
218
|
-
setHasShownOnce(true);
|
|
219
|
-
}
|
|
220
194
|
if (!keepChildrenMounted) {
|
|
221
195
|
if (isFullyHidden) {
|
|
222
196
|
return null;
|
package/dist/cjs/Popover.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Popover.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAgGW;AAhGX,0BAAO;AAEP,mBAAsC;AACtC,qBAAwB;AACxB,yBAA2B;AAC3B,0BAAgC;AAChC,kBAiBO;AAEP,sBAAwC;AACxC,yBAA4C;AAC5C,oBAYO;AACP,oBAA+C;AAC/C,2BAAgD;AAChD,mBAAuC;AACvC,oBAAoC;AACpC,oCAAqC;AACrC,YAAuB;AACvB,0BAAuB;AACvB,0BAAsD;AAEtD,gCAAmC;AA2B5B,MAAM,qBAAiB,iCAAyC,CAAC,CAAQ;AAEzE,MAAM,oBAAoB,MAAM,MAAM,WAAW,cAAc;AAQ/D,MAAM,gBAAgB,MAAM;AAAA,EACjC,SAASA,eAAc,OAA2B,cAAc;AAC9D,UAAM,UAAU,kBAAkB;AAClC,UAAM,EAAE,mBAAmB,qBAAqB,IAAI;AAEpD,UAAM,UAAU,MAAM;AACpB,wBAAkB;AAClB,aAAO,MAAM,qBAAqB;AAAA,IACpC,GAAG,CAAC,mBAAmB,oBAAoB,CAAC;AAE5C,WAAO,4CAAC,8BAAc,GAAG,OAAO,KAAK,cAAc;AAAA,EACrD;AACF;AAQO,MAAM,iBAAiB,MAAM;AAAA,EAClC,SAASC,gBAAe,OAA4B,cAAc;AAChE,UAAM,UAAU,kBAAkB;AAClC,UAAM,yBAAqB,qCAAgB,cAAc,QAAQ,UAAU;AAE3E,UAAM,UACJ;AAAA,MAAC;AAAA;AAAA,QACC,iBAAc;AAAA,QACd,iBAAe,QAAQ;AAAA,QAGvB,cAAY,SAAS,QAAQ,IAAI;AAAA,QAChC,GAAG;AAAA,QAEJ,KAAK;AAAA,QACL,aAAS,kCAAqB,MAAM,SAAgB,QAAQ,YAAY;AAAA;AAAA,IAC1E;AAGF,WAAO,QAAQ,kBACb,UAEA,4CAAC,8BAAa,SAAO,MAAE,mBAAQ;AAAA,EAEnC;AACF;AAkBO,MAAM,iBAAiB,iCAAmB;AAAA,EAC/C,MAAM;AAAA,IACJ,SAASC,gBAAe,OAAgC,cAAc;AACpE,
|
|
5
|
-
"names": ["PopoverAnchor", "PopoverTrigger", "PopoverContent", "PopoverClose", "PopoverArrow", "Popover"]
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["PopoverAnchor", "PopoverTrigger", "PopoverContent", "PopoverContentImpl", "PopoverClose", "PopoverArrow", "Popover"]
|
|
6
6
|
}
|
package/dist/esm/Popover.js
CHANGED
|
@@ -71,13 +71,6 @@ const PopoverTrigger = React.forwardRef(
|
|
|
71
71
|
const PopoverContent = PopperContentFrame.extractable(
|
|
72
72
|
React.forwardRef(
|
|
73
73
|
function PopoverContent2(props, forwardedRef) {
|
|
74
|
-
return /* @__PURE__ */ jsx(PopoverContentPortal, { zIndex: props.zIndex, children: /* @__PURE__ */ jsx(PopoverContentInner, { ...props, ref: forwardedRef }) });
|
|
75
|
-
}
|
|
76
|
-
)
|
|
77
|
-
);
|
|
78
|
-
const PopoverContentInner = React.memo(
|
|
79
|
-
React.forwardRef(
|
|
80
|
-
(props, forwardedRef) => {
|
|
81
74
|
const {
|
|
82
75
|
allowPinchZoom,
|
|
83
76
|
trapFocus,
|
|
@@ -89,7 +82,6 @@ const PopoverContentInner = React.memo(
|
|
|
89
82
|
const contentRef = React.useRef(null);
|
|
90
83
|
const composedRefs = useComposedRefs(forwardedRef, contentRef);
|
|
91
84
|
const isRightClickOutsideRef = React.useRef(false);
|
|
92
|
-
const themeName = useThemeName();
|
|
93
85
|
React.useEffect(() => {
|
|
94
86
|
if (!context.open)
|
|
95
87
|
return;
|
|
@@ -97,7 +89,7 @@ const PopoverContentInner = React.memo(
|
|
|
97
89
|
if (content)
|
|
98
90
|
return hideOthers(content);
|
|
99
91
|
}, [context.open]);
|
|
100
|
-
return /* @__PURE__ */ jsx(
|
|
92
|
+
return /* @__PURE__ */ jsx(PopoverContentPortal, { zIndex: props.zIndex, children: /* @__PURE__ */ jsx(Stack, { pointerEvents: context.open ? "auto" : "none", children: /* @__PURE__ */ jsx(
|
|
101
93
|
PopoverContentImpl,
|
|
102
94
|
{
|
|
103
95
|
...contentImplProps,
|
|
@@ -138,26 +130,12 @@ function PopoverContentPortal(props) {
|
|
|
138
130
|
const zIndex = props.zIndex ?? 15e4;
|
|
139
131
|
const context = usePopoverContext();
|
|
140
132
|
const popperContext = usePopperContext();
|
|
141
|
-
return /* @__PURE__ */ jsx(Portal, { zIndex, children: /* @__PURE__ */ jsx(
|
|
142
|
-
PopoverContentPortalContents,
|
|
143
|
-
{
|
|
144
|
-
popperContext,
|
|
145
|
-
context,
|
|
146
|
-
...props
|
|
147
|
-
}
|
|
148
|
-
) });
|
|
149
|
-
}
|
|
150
|
-
const PopoverContentPortalContents = ({
|
|
151
|
-
context,
|
|
152
|
-
popperContext,
|
|
153
|
-
...props
|
|
154
|
-
}) => {
|
|
155
133
|
const themeName = useThemeName();
|
|
156
|
-
let contents =
|
|
134
|
+
let contents = props.children;
|
|
157
135
|
if (Platform.OS === "android" || Platform.OS === "ios") {
|
|
158
136
|
contents = /* @__PURE__ */ jsx(PopoverRepropagateContext, { popperContext, context, children: props.children });
|
|
159
137
|
}
|
|
160
|
-
return /* @__PURE__ */ jsxs(Theme, { forceClassName: true, name: themeName, children: [
|
|
138
|
+
return /* @__PURE__ */ jsx(Portal, { zIndex, children: /* @__PURE__ */ jsxs(Theme, { forceClassName: true, name: themeName, children: [
|
|
161
139
|
!!context.open && !context.breakpointActive && /* @__PURE__ */ jsx(
|
|
162
140
|
YStack,
|
|
163
141
|
{
|
|
@@ -166,9 +144,9 @@ const PopoverContentPortalContents = ({
|
|
|
166
144
|
}
|
|
167
145
|
),
|
|
168
146
|
contents
|
|
169
|
-
] });
|
|
170
|
-
}
|
|
171
|
-
const PopoverContentImpl = React.forwardRef((props, forwardedRef)
|
|
147
|
+
] }) });
|
|
148
|
+
}
|
|
149
|
+
const PopoverContentImpl = React.forwardRef(function PopoverContentImpl2(props, forwardedRef) {
|
|
172
150
|
const {
|
|
173
151
|
trapFocus,
|
|
174
152
|
onOpenAutoFocus,
|
|
@@ -187,16 +165,12 @@ const PopoverContentImpl = React.forwardRef((props, forwardedRef) => {
|
|
|
187
165
|
const { open, keepChildrenMounted } = context;
|
|
188
166
|
const popperContext = usePopperContext();
|
|
189
167
|
const [isFullyHidden, setIsFullyHidden] = React.useState(!context.open);
|
|
190
|
-
const [hasShownOnce, setHasShownOnce] = React.useState(false);
|
|
191
168
|
const contents = React.useMemo(() => {
|
|
192
169
|
return isWeb ? /* @__PURE__ */ jsx("div", { style: { display: "contents" }, children }) : children;
|
|
193
170
|
}, [children]);
|
|
194
171
|
if (open && isFullyHidden) {
|
|
195
172
|
setIsFullyHidden(false);
|
|
196
173
|
}
|
|
197
|
-
if (!open && isFullyHidden && !hasShownOnce) {
|
|
198
|
-
setHasShownOnce(true);
|
|
199
|
-
}
|
|
200
174
|
if (!keepChildrenMounted) {
|
|
201
175
|
if (isFullyHidden) {
|
|
202
176
|
return null;
|
package/dist/esm/Popover.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Popover.tsx"],
|
|
4
|
-
"mappings": "AAgGW,
|
|
5
|
-
"names": ["PopoverAnchor", "PopoverTrigger", "PopoverContent", "PopoverClose", "PopoverArrow", "Popover"]
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["PopoverAnchor", "PopoverTrigger", "PopoverContent", "PopoverContentImpl", "PopoverClose", "PopoverArrow", "Popover"]
|
|
6
6
|
}
|
package/dist/jsx/Popover.js
CHANGED
|
@@ -67,13 +67,6 @@ const PopoverTrigger = React.forwardRef(
|
|
|
67
67
|
const PopoverContent = PopperContentFrame.extractable(
|
|
68
68
|
React.forwardRef(
|
|
69
69
|
function PopoverContent2(props, forwardedRef) {
|
|
70
|
-
return <PopoverContentPortal zIndex={props.zIndex}><PopoverContentInner {...props} ref={forwardedRef} /></PopoverContentPortal>;
|
|
71
|
-
}
|
|
72
|
-
)
|
|
73
|
-
);
|
|
74
|
-
const PopoverContentInner = React.memo(
|
|
75
|
-
React.forwardRef(
|
|
76
|
-
(props, forwardedRef) => {
|
|
77
70
|
const {
|
|
78
71
|
allowPinchZoom,
|
|
79
72
|
trapFocus,
|
|
@@ -85,7 +78,6 @@ const PopoverContentInner = React.memo(
|
|
|
85
78
|
const contentRef = React.useRef(null);
|
|
86
79
|
const composedRefs = useComposedRefs(forwardedRef, contentRef);
|
|
87
80
|
const isRightClickOutsideRef = React.useRef(false);
|
|
88
|
-
const themeName = useThemeName();
|
|
89
81
|
React.useEffect(() => {
|
|
90
82
|
if (!context.open)
|
|
91
83
|
return;
|
|
@@ -93,7 +85,7 @@ const PopoverContentInner = React.memo(
|
|
|
93
85
|
if (content)
|
|
94
86
|
return hideOthers(content);
|
|
95
87
|
}, [context.open]);
|
|
96
|
-
return <Stack pointerEvents={context.open ? "auto" : "none"}><
|
|
88
|
+
return <PopoverContentPortal zIndex={props.zIndex}><Stack pointerEvents={context.open ? "auto" : "none"}><PopoverContentImpl
|
|
97
89
|
{...contentImplProps}
|
|
98
90
|
disableRemoveScroll={disableRemoveScroll}
|
|
99
91
|
ref={composedRefs}
|
|
@@ -119,7 +111,7 @@ const PopoverContentInner = React.memo(
|
|
|
119
111
|
(event) => event.preventDefault(),
|
|
120
112
|
{ checkDefaultPrevented: false }
|
|
121
113
|
)}
|
|
122
|
-
/></
|
|
114
|
+
/></Stack></PopoverContentPortal>;
|
|
123
115
|
}
|
|
124
116
|
)
|
|
125
117
|
);
|
|
@@ -130,31 +122,20 @@ function PopoverContentPortal(props) {
|
|
|
130
122
|
const zIndex = props.zIndex ?? 15e4;
|
|
131
123
|
const context = usePopoverContext();
|
|
132
124
|
const popperContext = usePopperContext();
|
|
133
|
-
return <Portal zIndex={zIndex}><PopoverContentPortalContents
|
|
134
|
-
popperContext={popperContext}
|
|
135
|
-
context={context}
|
|
136
|
-
{...props}
|
|
137
|
-
/></Portal>;
|
|
138
|
-
}
|
|
139
|
-
const PopoverContentPortalContents = ({
|
|
140
|
-
context,
|
|
141
|
-
popperContext,
|
|
142
|
-
...props
|
|
143
|
-
}) => {
|
|
144
125
|
const themeName = useThemeName();
|
|
145
|
-
let contents =
|
|
126
|
+
let contents = props.children;
|
|
146
127
|
if (Platform.OS === "android" || Platform.OS === "ios") {
|
|
147
128
|
contents = <PopoverRepropagateContext popperContext={popperContext} context={context}>{props.children}</PopoverRepropagateContext>;
|
|
148
129
|
}
|
|
149
|
-
return <Theme forceClassName name={themeName}>
|
|
130
|
+
return <Portal zIndex={zIndex}><Theme forceClassName name={themeName}>
|
|
150
131
|
{!!context.open && !context.breakpointActive && <YStack
|
|
151
132
|
fullscreen
|
|
152
133
|
onPress={composeEventHandlers(props.onPress, context.onOpenToggle)}
|
|
153
134
|
/>}
|
|
154
135
|
{contents}
|
|
155
|
-
</Theme>;
|
|
156
|
-
}
|
|
157
|
-
const PopoverContentImpl = React.forwardRef((props, forwardedRef)
|
|
136
|
+
</Theme></Portal>;
|
|
137
|
+
}
|
|
138
|
+
const PopoverContentImpl = React.forwardRef(function PopoverContentImpl2(props, forwardedRef) {
|
|
158
139
|
const {
|
|
159
140
|
trapFocus,
|
|
160
141
|
onOpenAutoFocus,
|
|
@@ -173,16 +154,12 @@ const PopoverContentImpl = React.forwardRef((props, forwardedRef) => {
|
|
|
173
154
|
const { open, keepChildrenMounted } = context;
|
|
174
155
|
const popperContext = usePopperContext();
|
|
175
156
|
const [isFullyHidden, setIsFullyHidden] = React.useState(!context.open);
|
|
176
|
-
const [hasShownOnce, setHasShownOnce] = React.useState(false);
|
|
177
157
|
const contents = React.useMemo(() => {
|
|
178
158
|
return isWeb ? <div style={{ display: "contents" }}>{children}</div> : children;
|
|
179
159
|
}, [children]);
|
|
180
160
|
if (open && isFullyHidden) {
|
|
181
161
|
setIsFullyHidden(false);
|
|
182
162
|
}
|
|
183
|
-
if (!open && isFullyHidden && !hasShownOnce) {
|
|
184
|
-
setHasShownOnce(true);
|
|
185
|
-
}
|
|
186
163
|
if (!keepChildrenMounted) {
|
|
187
164
|
if (isFullyHidden) {
|
|
188
165
|
return null;
|
package/dist/jsx/Popover.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Popover.tsx"],
|
|
4
|
-
"mappings": "AAAA,OAAO;AAEP,SAAS,OAAO,sBAAsB;AACtC,SAAS,eAAe;AACxB,SAAS,kBAAkB;AAC3B,SAAS,uBAAuB;AAChC;AAAA,EAGE;AAAA,EAGA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AAEP,SAAS,+BAA+B;AACxC,SAAS,kBAAmC;AAC5C;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EAEA;AAAA,EACA;AAAA,EAEA;AAAA,EAGA;AAAA,OACK;AACP,SAAS,QAAQ,YAAY,kBAAkB;AAC/C,SAAS,oBAAuC;AAChD,SAAS,OAAO,uBAAuB;AACvC,SAAS,cAA2B;AACpC,SAAS,4BAA4B;AACrC,YAAY,WAAW;AACvB,SAAS,cAAc;AACvB,SAAS,UAAU,kBAAmC;AAEtD,SAAS,0BAA0B;AA2B5B,MAAM,iBAAiB,oBAAyC,CAAC,CAAQ;AAEzE,MAAM,oBAAoB,MAAM,MAAM,WAAW,cAAc;AAQ/D,MAAM,gBAAgB,MAAM;AAAA,EACjC,SAASA,eAAc,OAA2B,cAAc;AAC9D,UAAM,UAAU,kBAAkB;AAClC,UAAM,EAAE,mBAAmB,qBAAqB,IAAI;AAEpD,UAAM,UAAU,MAAM;AACpB,wBAAkB;AAClB,aAAO,MAAM,qBAAqB;AAAA,IACpC,GAAG,CAAC,mBAAmB,oBAAoB,CAAC;AAE5C,WAAO,CAAC,iBAAiB,OAAO,KAAK,cAAc;AAAA,EACrD;AACF;AAQO,MAAM,iBAAiB,MAAM;AAAA,EAClC,SAASC,gBAAe,OAA4B,cAAc;AAChE,UAAM,UAAU,kBAAkB;AAClC,UAAM,qBAAqB,gBAAgB,cAAc,QAAQ,UAAU;AAE3E,UAAM,UACJ,CAAC;AAAA,MACC,cAAc;AAAA,MACd,eAAe,QAAQ;AAAA,MAGvB,YAAY,SAAS,QAAQ,IAAI;AAAA,UAC7B;AAAA,MAEJ,KAAK;AAAA,MACL,SAAS,qBAAqB,MAAM,SAAgB,QAAQ,YAAY;AAAA,IAC1E;AAGF,WAAO,QAAQ,kBACb,UAEA,CAAC,aAAa,SAAS,QAAQ,EAA9B;AAAA,EAEL;AACF;AAkBO,MAAM,iBAAiB,mBAAmB;AAAA,EAC/C,MAAM;AAAA,IACJ,SAASC,gBAAe,OAAgC,cAAc;AACpE,
|
|
5
|
-
"names": ["PopoverAnchor", "PopoverTrigger", "PopoverContent", "PopoverClose", "PopoverArrow", "Popover"]
|
|
4
|
+
"mappings": "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",
|
|
5
|
+
"names": ["PopoverAnchor", "PopoverTrigger", "PopoverContent", "PopoverContentImpl", "PopoverClose", "PopoverArrow", "Popover"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/popover",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.49.0",
|
|
4
4
|
"sideEffects": [
|
|
5
5
|
"*.css"
|
|
6
6
|
],
|
|
@@ -32,22 +32,22 @@
|
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@floating-ui/react": "^0.24.7",
|
|
35
|
-
"@tamagui/adapt": "1.
|
|
36
|
-
"@tamagui/animate": "1.
|
|
37
|
-
"@tamagui/aria-hidden": "1.
|
|
38
|
-
"@tamagui/compose-refs": "1.
|
|
39
|
-
"@tamagui/core": "1.
|
|
40
|
-
"@tamagui/dismissable": "1.
|
|
41
|
-
"@tamagui/floating": "1.
|
|
42
|
-
"@tamagui/focus-scope": "1.
|
|
43
|
-
"@tamagui/polyfill-dev": "1.
|
|
44
|
-
"@tamagui/popper": "1.
|
|
45
|
-
"@tamagui/portal": "1.
|
|
46
|
-
"@tamagui/remove-scroll": "1.
|
|
47
|
-
"@tamagui/scroll-view": "1.
|
|
48
|
-
"@tamagui/sheet": "1.
|
|
49
|
-
"@tamagui/stacks": "1.
|
|
50
|
-
"@tamagui/use-controllable-state": "1.
|
|
35
|
+
"@tamagui/adapt": "1.49.0",
|
|
36
|
+
"@tamagui/animate": "1.49.0",
|
|
37
|
+
"@tamagui/aria-hidden": "1.49.0",
|
|
38
|
+
"@tamagui/compose-refs": "1.49.0",
|
|
39
|
+
"@tamagui/core": "1.49.0",
|
|
40
|
+
"@tamagui/dismissable": "1.49.0",
|
|
41
|
+
"@tamagui/floating": "1.49.0",
|
|
42
|
+
"@tamagui/focus-scope": "1.49.0",
|
|
43
|
+
"@tamagui/polyfill-dev": "1.49.0",
|
|
44
|
+
"@tamagui/popper": "1.49.0",
|
|
45
|
+
"@tamagui/portal": "1.49.0",
|
|
46
|
+
"@tamagui/remove-scroll": "1.49.0",
|
|
47
|
+
"@tamagui/scroll-view": "1.49.0",
|
|
48
|
+
"@tamagui/sheet": "1.49.0",
|
|
49
|
+
"@tamagui/stacks": "1.49.0",
|
|
50
|
+
"@tamagui/use-controllable-state": "1.49.0",
|
|
51
51
|
"react-freeze": "^1.0.3"
|
|
52
52
|
},
|
|
53
53
|
"peerDependencies": {
|
|
@@ -55,7 +55,7 @@
|
|
|
55
55
|
"react-native": "*"
|
|
56
56
|
},
|
|
57
57
|
"devDependencies": {
|
|
58
|
-
"@tamagui/build": "1.
|
|
58
|
+
"@tamagui/build": "1.49.0",
|
|
59
59
|
"react": "^18.2.0",
|
|
60
60
|
"react-native": "^0.72.1"
|
|
61
61
|
},
|
package/src/Popover.tsx
CHANGED
|
@@ -150,18 +150,6 @@ export interface PopoverContentTypeProps
|
|
|
150
150
|
export const PopoverContent = PopperContentFrame.extractable(
|
|
151
151
|
React.forwardRef<PopoverContentTypeElement, PopoverContentTypeProps>(
|
|
152
152
|
function PopoverContent(props: PopoverContentTypeProps, forwardedRef) {
|
|
153
|
-
return (
|
|
154
|
-
<PopoverContentPortal zIndex={props.zIndex}>
|
|
155
|
-
<PopoverContentInner {...props} ref={forwardedRef} />
|
|
156
|
-
</PopoverContentPortal>
|
|
157
|
-
)
|
|
158
|
-
}
|
|
159
|
-
)
|
|
160
|
-
)
|
|
161
|
-
|
|
162
|
-
const PopoverContentInner = React.memo(
|
|
163
|
-
React.forwardRef<PopoverContentTypeElement, PopoverContentTypeProps>(
|
|
164
|
-
(props, forwardedRef) => {
|
|
165
153
|
const {
|
|
166
154
|
allowPinchZoom,
|
|
167
155
|
trapFocus,
|
|
@@ -173,7 +161,6 @@ const PopoverContentInner = React.memo(
|
|
|
173
161
|
const contentRef = React.useRef<any>(null)
|
|
174
162
|
const composedRefs = useComposedRefs(forwardedRef, contentRef)
|
|
175
163
|
const isRightClickOutsideRef = React.useRef(false)
|
|
176
|
-
const themeName = useThemeName()
|
|
177
164
|
|
|
178
165
|
// aria-hide everything except the content (better supported equivalent to setting aria-modal)
|
|
179
166
|
React.useEffect(() => {
|
|
@@ -183,8 +170,8 @@ const PopoverContentInner = React.memo(
|
|
|
183
170
|
}, [context.open])
|
|
184
171
|
|
|
185
172
|
return (
|
|
186
|
-
<
|
|
187
|
-
<
|
|
173
|
+
<PopoverContentPortal zIndex={props.zIndex}>
|
|
174
|
+
<Stack pointerEvents={context.open ? 'auto' : 'none'}>
|
|
188
175
|
<PopoverContentImpl
|
|
189
176
|
{...contentImplProps}
|
|
190
177
|
disableRemoveScroll={disableRemoveScroll}
|
|
@@ -216,8 +203,8 @@ const PopoverContentInner = React.memo(
|
|
|
216
203
|
{ checkDefaultPrevented: false }
|
|
217
204
|
)}
|
|
218
205
|
/>
|
|
219
|
-
</
|
|
220
|
-
</
|
|
206
|
+
</Stack>
|
|
207
|
+
</PopoverContentPortal>
|
|
221
208
|
)
|
|
222
209
|
}
|
|
223
210
|
)
|
|
@@ -241,30 +228,9 @@ function PopoverContentPortal(props: PopoverContentTypeProps) {
|
|
|
241
228
|
const zIndex = props.zIndex ?? 150_000
|
|
242
229
|
const context = usePopoverContext()
|
|
243
230
|
const popperContext = usePopperContext()
|
|
244
|
-
|
|
245
|
-
// Portal the contents and add a transparent bg overlay to handle dismiss on native
|
|
246
|
-
return (
|
|
247
|
-
<Portal zIndex={zIndex}>
|
|
248
|
-
<PopoverContentPortalContents
|
|
249
|
-
popperContext={popperContext}
|
|
250
|
-
context={context}
|
|
251
|
-
{...props}
|
|
252
|
-
/>
|
|
253
|
-
</Portal>
|
|
254
|
-
)
|
|
255
|
-
}
|
|
256
|
-
|
|
257
|
-
const PopoverContentPortalContents = ({
|
|
258
|
-
context,
|
|
259
|
-
popperContext,
|
|
260
|
-
...props
|
|
261
|
-
}: PopoverContentTypeProps & {
|
|
262
|
-
context: PopoverContextValue
|
|
263
|
-
popperContext: PopperContextValue
|
|
264
|
-
}) => {
|
|
265
231
|
const themeName = useThemeName()
|
|
266
232
|
|
|
267
|
-
let contents =
|
|
233
|
+
let contents = props.children
|
|
268
234
|
|
|
269
235
|
// native doesnt support portals
|
|
270
236
|
if (Platform.OS === 'android' || Platform.OS === 'ios') {
|
|
@@ -275,16 +241,19 @@ const PopoverContentPortalContents = ({
|
|
|
275
241
|
)
|
|
276
242
|
}
|
|
277
243
|
|
|
244
|
+
// Portal the contents and add a transparent bg overlay to handle dismiss on native
|
|
278
245
|
return (
|
|
279
|
-
<
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
246
|
+
<Portal zIndex={zIndex}>
|
|
247
|
+
<Theme forceClassName name={themeName}>
|
|
248
|
+
{!!context.open && !context.breakpointActive && (
|
|
249
|
+
<YStack
|
|
250
|
+
fullscreen
|
|
251
|
+
onPress={composeEventHandlers(props.onPress as any, context.onOpenToggle)}
|
|
252
|
+
/>
|
|
253
|
+
)}
|
|
254
|
+
{contents}
|
|
255
|
+
</Theme>
|
|
256
|
+
</Portal>
|
|
288
257
|
)
|
|
289
258
|
}
|
|
290
259
|
|
|
@@ -321,7 +290,7 @@ export interface PopoverContentImplProps
|
|
|
321
290
|
const PopoverContentImpl = React.forwardRef<
|
|
322
291
|
PopoverContentImplElement,
|
|
323
292
|
PopoverContentImplProps
|
|
324
|
-
>((props: PopoverContentImplProps, forwardedRef)
|
|
293
|
+
>(function PopoverContentImpl(props: PopoverContentImplProps, forwardedRef) {
|
|
325
294
|
const {
|
|
326
295
|
trapFocus,
|
|
327
296
|
onOpenAutoFocus,
|
|
@@ -341,7 +310,6 @@ const PopoverContentImpl = React.forwardRef<
|
|
|
341
310
|
const { open, keepChildrenMounted } = context
|
|
342
311
|
const popperContext = usePopperContext()
|
|
343
312
|
const [isFullyHidden, setIsFullyHidden] = React.useState(!context.open)
|
|
344
|
-
const [hasShownOnce, setHasShownOnce] = React.useState(false)
|
|
345
313
|
|
|
346
314
|
const contents = React.useMemo(() => {
|
|
347
315
|
return isWeb ? <div style={{ display: 'contents' }}>{children}</div> : children
|
|
@@ -350,9 +318,6 @@ const PopoverContentImpl = React.forwardRef<
|
|
|
350
318
|
if (open && isFullyHidden) {
|
|
351
319
|
setIsFullyHidden(false)
|
|
352
320
|
}
|
|
353
|
-
if (!open && isFullyHidden && !hasShownOnce) {
|
|
354
|
-
setHasShownOnce(true)
|
|
355
|
-
}
|
|
356
321
|
|
|
357
322
|
if (!keepChildrenMounted) {
|
|
358
323
|
if (isFullyHidden) {
|
package/types/Popover.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Popover.d.ts","sourceRoot":"","sources":["../src/Popover.tsx"],"names":[],"mappings":"AAAA,OAAO,uBAAuB,CAAA;AAM9B,OAAO,EAEL,UAAU,EAEV,UAAU,EACV,cAAc,EAYf,MAAM,eAAe,CAAA;AACtB,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,OAAO,EAAc,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAClE,OAAO,EAIL,gBAAgB,EAGhB,kBAAkB,EAGlB,WAAW,EAEZ,MAAM,iBAAiB,CAAA;AAExB,OAAO,EAAgB,iBAAiB,EAAE,MAAM,wBAAwB,CAAA;AAExE,OAAO,EAAU,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAErD,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,EAAY,UAAU,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAMpE,MAAM,MAAM,YAAY,GAAG,WAAW,GAAG;IACvC,IAAI,CAAC,EAAE,OAAO,CAAA;IACd,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAA;IACtC,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC9B,CAAA;AAED,KAAK,mBAAmB,GAAG;IACzB,EAAE,EAAE,MAAM,CAAA;IACV,UAAU,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;IAChC,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,IAAI,EAAE,OAAO,CAAA;IACb,YAAY,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,CAAA;IACjC,YAAY,IAAI,IAAI,CAAA;IACpB,eAAe,EAAE,OAAO,CAAA;IACxB,iBAAiB,IAAI,IAAI,CAAA;IACzB,oBAAoB,IAAI,IAAI,CAAA;IAC5B,IAAI,CAAC,EAAE,UAAU,CAAA;IACjB,eAAe,EAAE,GAAG,CAAA;IACpB,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,mBAAmB,CAAC,EAAE,OAAO,CAAA;CAC9B,CAAA;AAED,eAAO,MAAM,cAAc,4DAAsD,CAAA;AAEjF,eAAO,MAAM,iBAAiB,2BAAyC,CAAA;AAMvE,MAAM,MAAM,kBAAkB,GAAG,WAAW,CAAA;AAE5C,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;0CAYzB,CAAA;AAMD,MAAM,MAAM,mBAAmB,GAAG,UAAU,CAAA;AAE5C,eAAO,MAAM,cAAc;;8+BAyB1B,CAAA;AAMD,MAAM,MAAM,mBAAmB,GAAG,uBAAuB,CAAA;AAIzD,MAAM,WAAW,uBACf,SAAQ,IAAI,CAAC,uBAAuB,EAAE,6BAA6B,CAAC;IACpE;;OAEG;IACH,cAAc,CAAC,EAAE,iBAAiB,CAAC,gBAAgB,CAAC,CAAA;CACrD;AAED,eAAO,MAAM,cAAc,
|
|
1
|
+
{"version":3,"file":"Popover.d.ts","sourceRoot":"","sources":["../src/Popover.tsx"],"names":[],"mappings":"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"}
|