@tamagui/popper 1.30.8 → 1.30.9
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/Popper.js +13 -27
- package/dist/cjs/Popper.js.map +1 -1
- package/dist/esm/Popper.js +13 -25
- package/dist/esm/Popper.js.map +1 -1
- package/dist/jsx/Popper.js +14 -26
- package/dist/jsx/Popper.js.map +1 -1
- package/dist/jsx/Popper.mjs +14 -26
- package/dist/jsx/Popper.mjs.map +1 -1
- package/package.json +8 -9
- package/src/Popper.tsx +20 -36
- package/types/Popper.d.ts +3 -54
- package/types/Popper.d.ts.map +1 -1
package/dist/cjs/Popper.js
CHANGED
|
@@ -33,27 +33,22 @@ __export(Popper_exports, {
|
|
|
33
33
|
PopperArrow: () => PopperArrow,
|
|
34
34
|
PopperContent: () => PopperContent,
|
|
35
35
|
PopperContentFrame: () => PopperContentFrame,
|
|
36
|
-
|
|
37
|
-
createPopperScope: () => createPopperScope,
|
|
36
|
+
PopperContext: () => PopperContext,
|
|
38
37
|
usePopperContext: () => usePopperContext
|
|
39
38
|
});
|
|
40
39
|
module.exports = __toCommonJS(Popper_exports);
|
|
41
40
|
var import_jsx_runtime = require("react/jsx-runtime");
|
|
42
41
|
var import_compose_refs = require("@tamagui/compose-refs");
|
|
43
42
|
var import_core = require("@tamagui/core");
|
|
44
|
-
var import_create_context = require("@tamagui/create-context");
|
|
45
43
|
var import_floating = require("@tamagui/floating");
|
|
46
44
|
var import_get_token = require("@tamagui/get-token");
|
|
47
45
|
var import_stacks = require("@tamagui/stacks");
|
|
48
46
|
var React = __toESM(require("react"));
|
|
49
47
|
var import_react_native = require("react-native");
|
|
50
|
-
const
|
|
51
|
-
const
|
|
52
|
-
const createPopperScope = createScope;
|
|
53
|
-
const [PopperProvider, usePopperContext] = createPopperContext(POPPER_NAME);
|
|
48
|
+
const PopperContext = (0, import_core.createStyledContext)({});
|
|
49
|
+
const usePopperContext = () => React.useContext(PopperContext);
|
|
54
50
|
function Popper(props) {
|
|
55
51
|
const {
|
|
56
|
-
__scopePopper,
|
|
57
52
|
children,
|
|
58
53
|
size,
|
|
59
54
|
strategy = "absolute",
|
|
@@ -84,7 +79,7 @@ function Popper(props) {
|
|
|
84
79
|
const { refs, middlewareData } = floating;
|
|
85
80
|
const composedArrowRefs = (0, import_compose_refs.useComposedRefs)(arrowRef, setArrow);
|
|
86
81
|
(0, import_core.useIsomorphicLayoutEffect)(() => {
|
|
87
|
-
floating.
|
|
82
|
+
floating.refs.setReference(anchorRef.current);
|
|
88
83
|
}, [anchorRef]);
|
|
89
84
|
if (import_core.isWeb) {
|
|
90
85
|
React.useEffect(() => {
|
|
@@ -113,9 +108,8 @@ function Popper(props) {
|
|
|
113
108
|
}, [dimensions, keyboardOpen]);
|
|
114
109
|
}
|
|
115
110
|
return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
116
|
-
|
|
111
|
+
PopperContext.Provider,
|
|
117
112
|
{
|
|
118
|
-
scope: __scopePopper,
|
|
119
113
|
anchorRef,
|
|
120
114
|
size,
|
|
121
115
|
arrowRef: composedArrowRefs,
|
|
@@ -130,8 +124,8 @@ function Popper(props) {
|
|
|
130
124
|
const ANCHOR_NAME = "PopperAnchor";
|
|
131
125
|
const PopperAnchor = import_stacks.YStack.extractable(
|
|
132
126
|
React.forwardRef(function PopperAnchor2(props, forwardedRef) {
|
|
133
|
-
const {
|
|
134
|
-
const { anchorRef, getReferenceProps } = usePopperContext(
|
|
127
|
+
const { virtualRef, ...anchorProps } = props;
|
|
128
|
+
const { anchorRef, getReferenceProps } = usePopperContext();
|
|
135
129
|
const ref = React.useRef(null);
|
|
136
130
|
const composedRefs = (0, import_compose_refs.useComposedRefs)(forwardedRef, ref, anchorRef);
|
|
137
131
|
if (virtualRef) {
|
|
@@ -171,8 +165,7 @@ const PopperContentFrame = (0, import_core.styled)(import_stacks.ThemeableStack,
|
|
|
171
165
|
});
|
|
172
166
|
const PopperContent = React.forwardRef(
|
|
173
167
|
function PopperContent2(props, forwardedRef) {
|
|
174
|
-
const {
|
|
175
|
-
const { strategy, placement, floating, x, y, getFloatingProps, size, isMounted } = usePopperContext(CONTENT_NAME, __scopePopper);
|
|
168
|
+
const { strategy, placement, floating, x, y, getFloatingProps, size, isMounted } = usePopperContext();
|
|
176
169
|
const contentRefs = (0, import_compose_refs.useComposedRefs)(floating, forwardedRef);
|
|
177
170
|
const contents = React.useMemo(() => {
|
|
178
171
|
return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
@@ -180,8 +173,8 @@ const PopperContent = React.forwardRef(
|
|
|
180
173
|
{
|
|
181
174
|
"data-placement": placement,
|
|
182
175
|
"data-strategy": strategy,
|
|
183
|
-
size
|
|
184
|
-
...
|
|
176
|
+
size,
|
|
177
|
+
...props
|
|
185
178
|
},
|
|
186
179
|
"popper-content-frame"
|
|
187
180
|
);
|
|
@@ -249,14 +242,8 @@ const PopperArrow = PopperArrowFrame.styleable(
|
|
|
249
242
|
function PopperArrow2(propsIn, forwardedRef) {
|
|
250
243
|
var _a, _b;
|
|
251
244
|
const props = (0, import_core.useProps)(propsIn);
|
|
252
|
-
const {
|
|
253
|
-
|
|
254
|
-
offset: offset2,
|
|
255
|
-
size: sizeProp,
|
|
256
|
-
borderWidth = 0,
|
|
257
|
-
...arrowProps
|
|
258
|
-
} = props;
|
|
259
|
-
const context = usePopperContext(ARROW_NAME, __scopePopper);
|
|
245
|
+
const { offset: offset2, size: sizeProp, borderWidth = 0, ...arrowProps } = props;
|
|
246
|
+
const context = usePopperContext();
|
|
260
247
|
const sizeVal = sizeProp ?? context.size;
|
|
261
248
|
const sizeValResolved = (0, import_core.getVariableValue)(
|
|
262
249
|
(0, import_get_token.getSpace)(sizeVal, {
|
|
@@ -326,8 +313,7 @@ const PopperArrow = PopperArrowFrame.styleable(
|
|
|
326
313
|
PopperArrow,
|
|
327
314
|
PopperContent,
|
|
328
315
|
PopperContentFrame,
|
|
329
|
-
|
|
330
|
-
createPopperScope,
|
|
316
|
+
PopperContext,
|
|
331
317
|
usePopperContext
|
|
332
318
|
});
|
|
333
319
|
//# sourceMappingURL=Popper.js.map
|
package/dist/cjs/Popper.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Popper.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["PopperAnchor", "PopperContent", "PopperArrow", "offset", "_a"]
|
|
6
6
|
}
|
package/dist/esm/Popper.js
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { jsx } from "react/jsx-runtime";
|
|
2
2
|
import { useComposedRefs } from "@tamagui/compose-refs";
|
|
3
3
|
import {
|
|
4
|
+
createStyledContext,
|
|
4
5
|
getVariableValue,
|
|
5
6
|
isWeb,
|
|
6
7
|
styled,
|
|
7
8
|
useIsomorphicLayoutEffect,
|
|
8
9
|
useProps
|
|
9
10
|
} from "@tamagui/core";
|
|
10
|
-
import { createContextScope } from "@tamagui/create-context";
|
|
11
11
|
import {
|
|
12
12
|
arrow,
|
|
13
13
|
autoUpdate,
|
|
@@ -20,13 +20,10 @@ import { getSpace } from "@tamagui/get-token";
|
|
|
20
20
|
import { ThemeableStack, YStack } from "@tamagui/stacks";
|
|
21
21
|
import * as React from "react";
|
|
22
22
|
import { Keyboard, useWindowDimensions } from "react-native";
|
|
23
|
-
const
|
|
24
|
-
const
|
|
25
|
-
const createPopperScope = createScope;
|
|
26
|
-
const [PopperProvider, usePopperContext] = createPopperContext(POPPER_NAME);
|
|
23
|
+
const PopperContext = createStyledContext({});
|
|
24
|
+
const usePopperContext = () => React.useContext(PopperContext);
|
|
27
25
|
function Popper(props) {
|
|
28
26
|
const {
|
|
29
|
-
__scopePopper,
|
|
30
27
|
children,
|
|
31
28
|
size,
|
|
32
29
|
strategy = "absolute",
|
|
@@ -57,7 +54,7 @@ function Popper(props) {
|
|
|
57
54
|
const { refs, middlewareData } = floating;
|
|
58
55
|
const composedArrowRefs = useComposedRefs(arrowRef, setArrow);
|
|
59
56
|
useIsomorphicLayoutEffect(() => {
|
|
60
|
-
floating.
|
|
57
|
+
floating.refs.setReference(anchorRef.current);
|
|
61
58
|
}, [anchorRef]);
|
|
62
59
|
if (isWeb) {
|
|
63
60
|
React.useEffect(() => {
|
|
@@ -86,9 +83,8 @@ function Popper(props) {
|
|
|
86
83
|
}, [dimensions, keyboardOpen]);
|
|
87
84
|
}
|
|
88
85
|
return /* @__PURE__ */ jsx(
|
|
89
|
-
|
|
86
|
+
PopperContext.Provider,
|
|
90
87
|
{
|
|
91
|
-
scope: __scopePopper,
|
|
92
88
|
anchorRef,
|
|
93
89
|
size,
|
|
94
90
|
arrowRef: composedArrowRefs,
|
|
@@ -103,8 +99,8 @@ function Popper(props) {
|
|
|
103
99
|
const ANCHOR_NAME = "PopperAnchor";
|
|
104
100
|
const PopperAnchor = YStack.extractable(
|
|
105
101
|
React.forwardRef(function PopperAnchor2(props, forwardedRef) {
|
|
106
|
-
const {
|
|
107
|
-
const { anchorRef, getReferenceProps } = usePopperContext(
|
|
102
|
+
const { virtualRef, ...anchorProps } = props;
|
|
103
|
+
const { anchorRef, getReferenceProps } = usePopperContext();
|
|
108
104
|
const ref = React.useRef(null);
|
|
109
105
|
const composedRefs = useComposedRefs(forwardedRef, ref, anchorRef);
|
|
110
106
|
if (virtualRef) {
|
|
@@ -144,8 +140,7 @@ const PopperContentFrame = styled(ThemeableStack, {
|
|
|
144
140
|
});
|
|
145
141
|
const PopperContent = React.forwardRef(
|
|
146
142
|
function PopperContent2(props, forwardedRef) {
|
|
147
|
-
const {
|
|
148
|
-
const { strategy, placement, floating, x, y, getFloatingProps, size, isMounted } = usePopperContext(CONTENT_NAME, __scopePopper);
|
|
143
|
+
const { strategy, placement, floating, x, y, getFloatingProps, size, isMounted } = usePopperContext();
|
|
149
144
|
const contentRefs = useComposedRefs(floating, forwardedRef);
|
|
150
145
|
const contents = React.useMemo(() => {
|
|
151
146
|
return /* @__PURE__ */ jsx(
|
|
@@ -153,8 +148,8 @@ const PopperContent = React.forwardRef(
|
|
|
153
148
|
{
|
|
154
149
|
"data-placement": placement,
|
|
155
150
|
"data-strategy": strategy,
|
|
156
|
-
size
|
|
157
|
-
...
|
|
151
|
+
size,
|
|
152
|
+
...props
|
|
158
153
|
},
|
|
159
154
|
"popper-content-frame"
|
|
160
155
|
);
|
|
@@ -222,14 +217,8 @@ const PopperArrow = PopperArrowFrame.styleable(
|
|
|
222
217
|
function PopperArrow2(propsIn, forwardedRef) {
|
|
223
218
|
var _a, _b;
|
|
224
219
|
const props = useProps(propsIn);
|
|
225
|
-
const {
|
|
226
|
-
|
|
227
|
-
offset: offset2,
|
|
228
|
-
size: sizeProp,
|
|
229
|
-
borderWidth = 0,
|
|
230
|
-
...arrowProps
|
|
231
|
-
} = props;
|
|
232
|
-
const context = usePopperContext(ARROW_NAME, __scopePopper);
|
|
220
|
+
const { offset: offset2, size: sizeProp, borderWidth = 0, ...arrowProps } = props;
|
|
221
|
+
const context = usePopperContext();
|
|
233
222
|
const sizeVal = sizeProp ?? context.size;
|
|
234
223
|
const sizeValResolved = getVariableValue(
|
|
235
224
|
getSpace(sizeVal, {
|
|
@@ -298,8 +287,7 @@ export {
|
|
|
298
287
|
PopperArrow,
|
|
299
288
|
PopperContent,
|
|
300
289
|
PopperContentFrame,
|
|
301
|
-
|
|
302
|
-
createPopperScope,
|
|
290
|
+
PopperContext,
|
|
303
291
|
usePopperContext
|
|
304
292
|
};
|
|
305
293
|
//# sourceMappingURL=Popper.js.map
|
package/dist/esm/Popper.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Popper.tsx"],
|
|
4
|
-
"mappings": "
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["PopperAnchor", "PopperContent", "PopperArrow", "offset", "_a"]
|
|
6
6
|
}
|
package/dist/jsx/Popper.js
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { useComposedRefs } from "@tamagui/compose-refs";
|
|
2
2
|
import {
|
|
3
|
+
createStyledContext,
|
|
3
4
|
getVariableValue,
|
|
4
5
|
isWeb,
|
|
5
6
|
styled,
|
|
6
7
|
useIsomorphicLayoutEffect,
|
|
7
8
|
useProps
|
|
8
9
|
} from "@tamagui/core";
|
|
9
|
-
import { createContextScope } from "@tamagui/create-context";
|
|
10
10
|
import {
|
|
11
11
|
arrow,
|
|
12
12
|
autoUpdate,
|
|
@@ -19,13 +19,10 @@ import { getSpace } from "@tamagui/get-token";
|
|
|
19
19
|
import { ThemeableStack, YStack } from "@tamagui/stacks";
|
|
20
20
|
import * as React from "react";
|
|
21
21
|
import { Keyboard, useWindowDimensions } from "react-native";
|
|
22
|
-
const
|
|
23
|
-
const
|
|
24
|
-
const createPopperScope = createScope;
|
|
25
|
-
const [PopperProvider, usePopperContext] = createPopperContext(POPPER_NAME);
|
|
22
|
+
const PopperContext = createStyledContext({});
|
|
23
|
+
const usePopperContext = () => React.useContext(PopperContext);
|
|
26
24
|
function Popper(props) {
|
|
27
25
|
const {
|
|
28
|
-
__scopePopper,
|
|
29
26
|
children,
|
|
30
27
|
size,
|
|
31
28
|
strategy = "absolute",
|
|
@@ -56,7 +53,7 @@ function Popper(props) {
|
|
|
56
53
|
const { refs, middlewareData } = floating;
|
|
57
54
|
const composedArrowRefs = useComposedRefs(arrowRef, setArrow);
|
|
58
55
|
useIsomorphicLayoutEffect(() => {
|
|
59
|
-
floating.
|
|
56
|
+
floating.refs.setReference(anchorRef.current);
|
|
60
57
|
}, [anchorRef]);
|
|
61
58
|
if (isWeb) {
|
|
62
59
|
React.useEffect(() => {
|
|
@@ -84,8 +81,7 @@ function Popper(props) {
|
|
|
84
81
|
floating.update();
|
|
85
82
|
}, [dimensions, keyboardOpen]);
|
|
86
83
|
}
|
|
87
|
-
return <
|
|
88
|
-
scope={__scopePopper}
|
|
84
|
+
return <PopperContext.Provider
|
|
89
85
|
anchorRef={anchorRef}
|
|
90
86
|
size={size}
|
|
91
87
|
arrowRef={composedArrowRefs}
|
|
@@ -93,13 +89,13 @@ function Popper(props) {
|
|
|
93
89
|
onArrowSize={setArrowSize}
|
|
94
90
|
isMounted={isMounted}
|
|
95
91
|
{...floating}
|
|
96
|
-
>{children}</
|
|
92
|
+
>{children}</PopperContext.Provider>;
|
|
97
93
|
}
|
|
98
94
|
const ANCHOR_NAME = "PopperAnchor";
|
|
99
95
|
const PopperAnchor = YStack.extractable(
|
|
100
96
|
React.forwardRef(function PopperAnchor2(props, forwardedRef) {
|
|
101
|
-
const {
|
|
102
|
-
const { anchorRef, getReferenceProps } = usePopperContext(
|
|
97
|
+
const { virtualRef, ...anchorProps } = props;
|
|
98
|
+
const { anchorRef, getReferenceProps } = usePopperContext();
|
|
103
99
|
const ref = React.useRef(null);
|
|
104
100
|
const composedRefs = useComposedRefs(forwardedRef, ref, anchorRef);
|
|
105
101
|
if (virtualRef) {
|
|
@@ -139,16 +135,15 @@ const PopperContentFrame = styled(ThemeableStack, {
|
|
|
139
135
|
});
|
|
140
136
|
const PopperContent = React.forwardRef(
|
|
141
137
|
function PopperContent2(props, forwardedRef) {
|
|
142
|
-
const {
|
|
143
|
-
const { strategy, placement, floating, x, y, getFloatingProps, size, isMounted } = usePopperContext(CONTENT_NAME, __scopePopper);
|
|
138
|
+
const { strategy, placement, floating, x, y, getFloatingProps, size, isMounted } = usePopperContext();
|
|
144
139
|
const contentRefs = useComposedRefs(floating, forwardedRef);
|
|
145
140
|
const contents = React.useMemo(() => {
|
|
146
141
|
return <PopperContentFrame
|
|
147
142
|
key="popper-content-frame"
|
|
148
143
|
data-placement={placement}
|
|
149
144
|
data-strategy={strategy}
|
|
150
|
-
size={
|
|
151
|
-
{...
|
|
145
|
+
size={size}
|
|
146
|
+
{...props}
|
|
152
147
|
/>;
|
|
153
148
|
}, [placement, strategy, props]);
|
|
154
149
|
if (!isMounted) {
|
|
@@ -209,14 +204,8 @@ const opposites = {
|
|
|
209
204
|
const PopperArrow = PopperArrowFrame.styleable(
|
|
210
205
|
function PopperArrow2(propsIn, forwardedRef) {
|
|
211
206
|
const props = useProps(propsIn);
|
|
212
|
-
const {
|
|
213
|
-
|
|
214
|
-
offset: offset2,
|
|
215
|
-
size: sizeProp,
|
|
216
|
-
borderWidth = 0,
|
|
217
|
-
...arrowProps
|
|
218
|
-
} = props;
|
|
219
|
-
const context = usePopperContext(ARROW_NAME, __scopePopper);
|
|
207
|
+
const { offset: offset2, size: sizeProp, borderWidth = 0, ...arrowProps } = props;
|
|
208
|
+
const context = usePopperContext();
|
|
220
209
|
const sizeVal = sizeProp ?? context.size;
|
|
221
210
|
const sizeValResolved = getVariableValue(
|
|
222
211
|
getSpace(sizeVal, {
|
|
@@ -281,8 +270,7 @@ export {
|
|
|
281
270
|
PopperArrow,
|
|
282
271
|
PopperContent,
|
|
283
272
|
PopperContentFrame,
|
|
284
|
-
|
|
285
|
-
createPopperScope,
|
|
273
|
+
PopperContext,
|
|
286
274
|
usePopperContext
|
|
287
275
|
};
|
|
288
276
|
//# sourceMappingURL=Popper.js.map
|
package/dist/jsx/Popper.js.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Popper.tsx"],
|
|
4
|
-
"mappings": "AAEA,SAAS,uBAAuB;AAChC;AAAA,EAGE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["PopperAnchor", "PopperContent", "PopperArrow", "offset"]
|
|
6
6
|
}
|
package/dist/jsx/Popper.mjs
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { useComposedRefs } from "@tamagui/compose-refs";
|
|
2
2
|
import {
|
|
3
|
+
createStyledContext,
|
|
3
4
|
getVariableValue,
|
|
4
5
|
isWeb,
|
|
5
6
|
styled,
|
|
6
7
|
useIsomorphicLayoutEffect,
|
|
7
8
|
useProps
|
|
8
9
|
} from "@tamagui/core";
|
|
9
|
-
import { createContextScope } from "@tamagui/create-context";
|
|
10
10
|
import {
|
|
11
11
|
arrow,
|
|
12
12
|
autoUpdate,
|
|
@@ -19,13 +19,10 @@ import { getSpace } from "@tamagui/get-token";
|
|
|
19
19
|
import { ThemeableStack, YStack } from "@tamagui/stacks";
|
|
20
20
|
import * as React from "react";
|
|
21
21
|
import { Keyboard, useWindowDimensions } from "react-native";
|
|
22
|
-
const
|
|
23
|
-
const
|
|
24
|
-
const createPopperScope = createScope;
|
|
25
|
-
const [PopperProvider, usePopperContext] = createPopperContext(POPPER_NAME);
|
|
22
|
+
const PopperContext = createStyledContext({});
|
|
23
|
+
const usePopperContext = () => React.useContext(PopperContext);
|
|
26
24
|
function Popper(props) {
|
|
27
25
|
const {
|
|
28
|
-
__scopePopper,
|
|
29
26
|
children,
|
|
30
27
|
size,
|
|
31
28
|
strategy = "absolute",
|
|
@@ -56,7 +53,7 @@ function Popper(props) {
|
|
|
56
53
|
const { refs, middlewareData } = floating;
|
|
57
54
|
const composedArrowRefs = useComposedRefs(arrowRef, setArrow);
|
|
58
55
|
useIsomorphicLayoutEffect(() => {
|
|
59
|
-
floating.
|
|
56
|
+
floating.refs.setReference(anchorRef.current);
|
|
60
57
|
}, [anchorRef]);
|
|
61
58
|
if (isWeb) {
|
|
62
59
|
React.useEffect(() => {
|
|
@@ -84,8 +81,7 @@ function Popper(props) {
|
|
|
84
81
|
floating.update();
|
|
85
82
|
}, [dimensions, keyboardOpen]);
|
|
86
83
|
}
|
|
87
|
-
return <
|
|
88
|
-
scope={__scopePopper}
|
|
84
|
+
return <PopperContext.Provider
|
|
89
85
|
anchorRef={anchorRef}
|
|
90
86
|
size={size}
|
|
91
87
|
arrowRef={composedArrowRefs}
|
|
@@ -93,13 +89,13 @@ function Popper(props) {
|
|
|
93
89
|
onArrowSize={setArrowSize}
|
|
94
90
|
isMounted={isMounted}
|
|
95
91
|
{...floating}
|
|
96
|
-
>{children}</
|
|
92
|
+
>{children}</PopperContext.Provider>;
|
|
97
93
|
}
|
|
98
94
|
const ANCHOR_NAME = "PopperAnchor";
|
|
99
95
|
const PopperAnchor = YStack.extractable(
|
|
100
96
|
React.forwardRef(function PopperAnchor2(props, forwardedRef) {
|
|
101
|
-
const {
|
|
102
|
-
const { anchorRef, getReferenceProps } = usePopperContext(
|
|
97
|
+
const { virtualRef, ...anchorProps } = props;
|
|
98
|
+
const { anchorRef, getReferenceProps } = usePopperContext();
|
|
103
99
|
const ref = React.useRef(null);
|
|
104
100
|
const composedRefs = useComposedRefs(forwardedRef, ref, anchorRef);
|
|
105
101
|
if (virtualRef) {
|
|
@@ -139,16 +135,15 @@ const PopperContentFrame = styled(ThemeableStack, {
|
|
|
139
135
|
});
|
|
140
136
|
const PopperContent = React.forwardRef(
|
|
141
137
|
function PopperContent2(props, forwardedRef) {
|
|
142
|
-
const {
|
|
143
|
-
const { strategy, placement, floating, x, y, getFloatingProps, size, isMounted } = usePopperContext(CONTENT_NAME, __scopePopper);
|
|
138
|
+
const { strategy, placement, floating, x, y, getFloatingProps, size, isMounted } = usePopperContext();
|
|
144
139
|
const contentRefs = useComposedRefs(floating, forwardedRef);
|
|
145
140
|
const contents = React.useMemo(() => {
|
|
146
141
|
return <PopperContentFrame
|
|
147
142
|
key="popper-content-frame"
|
|
148
143
|
data-placement={placement}
|
|
149
144
|
data-strategy={strategy}
|
|
150
|
-
size={
|
|
151
|
-
{...
|
|
145
|
+
size={size}
|
|
146
|
+
{...props}
|
|
152
147
|
/>;
|
|
153
148
|
}, [placement, strategy, props]);
|
|
154
149
|
if (!isMounted) {
|
|
@@ -209,14 +204,8 @@ const opposites = {
|
|
|
209
204
|
const PopperArrow = PopperArrowFrame.styleable(
|
|
210
205
|
function PopperArrow2(propsIn, forwardedRef) {
|
|
211
206
|
const props = useProps(propsIn);
|
|
212
|
-
const {
|
|
213
|
-
|
|
214
|
-
offset: offset2,
|
|
215
|
-
size: sizeProp,
|
|
216
|
-
borderWidth = 0,
|
|
217
|
-
...arrowProps
|
|
218
|
-
} = props;
|
|
219
|
-
const context = usePopperContext(ARROW_NAME, __scopePopper);
|
|
207
|
+
const { offset: offset2, size: sizeProp, borderWidth = 0, ...arrowProps } = props;
|
|
208
|
+
const context = usePopperContext();
|
|
220
209
|
const sizeVal = sizeProp ?? context.size;
|
|
221
210
|
const sizeValResolved = getVariableValue(
|
|
222
211
|
getSpace(sizeVal, {
|
|
@@ -281,8 +270,7 @@ export {
|
|
|
281
270
|
PopperArrow,
|
|
282
271
|
PopperContent,
|
|
283
272
|
PopperContentFrame,
|
|
284
|
-
|
|
285
|
-
createPopperScope,
|
|
273
|
+
PopperContext,
|
|
286
274
|
usePopperContext
|
|
287
275
|
};
|
|
288
276
|
//# sourceMappingURL=Popper.mjs.map
|
package/dist/jsx/Popper.mjs.map
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/Popper.tsx"],
|
|
4
|
-
"mappings": "AAEA,SAAS,uBAAuB;AAChC;AAAA,EAGE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["PopperAnchor", "PopperContent", "PopperArrow", "offset"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/popper",
|
|
3
|
-
"version": "1.30.
|
|
3
|
+
"version": "1.30.9",
|
|
4
4
|
"sideEffects": [
|
|
5
5
|
"*.css"
|
|
6
6
|
],
|
|
@@ -33,13 +33,12 @@
|
|
|
33
33
|
"dependencies": {
|
|
34
34
|
"@floating-ui/react-dom": "^2.0.0",
|
|
35
35
|
"@floating-ui/react-native": "^0.10.0",
|
|
36
|
-
"@tamagui/compose-refs": "1.30.
|
|
37
|
-
"@tamagui/core": "1.30.
|
|
38
|
-
"@tamagui/
|
|
39
|
-
"@tamagui/
|
|
40
|
-
"@tamagui/
|
|
41
|
-
"@tamagui/
|
|
42
|
-
"@tamagui/use-controllable-state": "1.30.8"
|
|
36
|
+
"@tamagui/compose-refs": "1.30.9",
|
|
37
|
+
"@tamagui/core": "1.30.9",
|
|
38
|
+
"@tamagui/floating": "1.30.9",
|
|
39
|
+
"@tamagui/get-token": "1.30.9",
|
|
40
|
+
"@tamagui/stacks": "1.30.9",
|
|
41
|
+
"@tamagui/use-controllable-state": "1.30.9"
|
|
43
42
|
},
|
|
44
43
|
"peerDependencies": {
|
|
45
44
|
"react": "*",
|
|
@@ -47,7 +46,7 @@
|
|
|
47
46
|
"react-native": "*"
|
|
48
47
|
},
|
|
49
48
|
"devDependencies": {
|
|
50
|
-
"@tamagui/build": "1.30.
|
|
49
|
+
"@tamagui/build": "1.30.9",
|
|
51
50
|
"react": "^18.2.0",
|
|
52
51
|
"react-dom": "^18.2.0",
|
|
53
52
|
"react-native": "^0.71.7"
|
package/src/Popper.tsx
CHANGED
|
@@ -4,13 +4,13 @@ import { useComposedRefs } from '@tamagui/compose-refs'
|
|
|
4
4
|
import {
|
|
5
5
|
SizeTokens,
|
|
6
6
|
StackProps,
|
|
7
|
+
createStyledContext,
|
|
7
8
|
getVariableValue,
|
|
8
9
|
isWeb,
|
|
9
10
|
styled,
|
|
10
11
|
useIsomorphicLayoutEffect,
|
|
11
12
|
useProps,
|
|
12
13
|
} from '@tamagui/core'
|
|
13
|
-
import { Scope, createContextScope } from '@tamagui/create-context'
|
|
14
14
|
import {
|
|
15
15
|
Coords,
|
|
16
16
|
Placement,
|
|
@@ -35,13 +35,6 @@ type FlipProps = typeof flip extends (options: infer Opts) => void ? Opts : neve
|
|
|
35
35
|
* Popper
|
|
36
36
|
* -----------------------------------------------------------------------------------------------*/
|
|
37
37
|
|
|
38
|
-
const POPPER_NAME = 'Popper'
|
|
39
|
-
|
|
40
|
-
type ScopedProps<P> = P & { __scopePopper?: Scope }
|
|
41
|
-
const [createPopperContext, createScope] = createContextScope(POPPER_NAME)
|
|
42
|
-
|
|
43
|
-
export const createPopperScope = createScope
|
|
44
|
-
|
|
45
38
|
type PopperContextValue = UseFloatingReturn & {
|
|
46
39
|
isMounted: boolean
|
|
47
40
|
anchorRef: any
|
|
@@ -53,8 +46,10 @@ type PopperContextValue = UseFloatingReturn & {
|
|
|
53
46
|
centerOffset: number
|
|
54
47
|
}
|
|
55
48
|
}
|
|
56
|
-
|
|
57
|
-
|
|
49
|
+
|
|
50
|
+
export const PopperContext = createStyledContext<PopperContextValue>({} as any)
|
|
51
|
+
|
|
52
|
+
export const usePopperContext = () => React.useContext(PopperContext)
|
|
58
53
|
|
|
59
54
|
export type PopperProps = {
|
|
60
55
|
size?: SizeTokens
|
|
@@ -65,9 +60,8 @@ export type PopperProps = {
|
|
|
65
60
|
strategy?: Strategy
|
|
66
61
|
}
|
|
67
62
|
|
|
68
|
-
export function Popper(props:
|
|
63
|
+
export function Popper(props: PopperProps) {
|
|
69
64
|
const {
|
|
70
|
-
__scopePopper,
|
|
71
65
|
children,
|
|
72
66
|
size,
|
|
73
67
|
strategy = 'absolute',
|
|
@@ -105,7 +99,7 @@ export function Popper(props: ScopedProps<PopperProps>) {
|
|
|
105
99
|
const composedArrowRefs = useComposedRefs<any>(arrowRef, setArrow)
|
|
106
100
|
|
|
107
101
|
useIsomorphicLayoutEffect(() => {
|
|
108
|
-
floating.
|
|
102
|
+
floating.refs.setReference(anchorRef.current)
|
|
109
103
|
}, [anchorRef])
|
|
110
104
|
|
|
111
105
|
if (isWeb) {
|
|
@@ -144,8 +138,7 @@ export function Popper(props: ScopedProps<PopperProps>) {
|
|
|
144
138
|
}
|
|
145
139
|
|
|
146
140
|
return (
|
|
147
|
-
<
|
|
148
|
-
scope={__scopePopper}
|
|
141
|
+
<PopperContext.Provider
|
|
149
142
|
anchorRef={anchorRef}
|
|
150
143
|
size={size}
|
|
151
144
|
arrowRef={composedArrowRefs}
|
|
@@ -155,7 +148,7 @@ export function Popper(props: ScopedProps<PopperProps>) {
|
|
|
155
148
|
{...floating}
|
|
156
149
|
>
|
|
157
150
|
{children}
|
|
158
|
-
</
|
|
151
|
+
</PopperContext.Provider>
|
|
159
152
|
)
|
|
160
153
|
}
|
|
161
154
|
|
|
@@ -173,11 +166,11 @@ export type PopperAnchorProps = YStackProps & {
|
|
|
173
166
|
|
|
174
167
|
export const PopperAnchor = YStack.extractable(
|
|
175
168
|
React.forwardRef<PopperAnchorRef, PopperAnchorProps>(function PopperAnchor(
|
|
176
|
-
props:
|
|
169
|
+
props: PopperAnchorProps,
|
|
177
170
|
forwardedRef
|
|
178
171
|
) {
|
|
179
|
-
const {
|
|
180
|
-
const { anchorRef, getReferenceProps } = usePopperContext(
|
|
172
|
+
const { virtualRef, ...anchorProps } = props
|
|
173
|
+
const { anchorRef, getReferenceProps } = usePopperContext()
|
|
181
174
|
const ref = React.useRef<PopperAnchorRef>(null)
|
|
182
175
|
const composedRefs = useComposedRefs(forwardedRef, ref, anchorRef)
|
|
183
176
|
if (virtualRef) {
|
|
@@ -232,10 +225,9 @@ export const PopperContentFrame = styled(ThemeableStack, {
|
|
|
232
225
|
})
|
|
233
226
|
|
|
234
227
|
export const PopperContent = React.forwardRef<PopperContentElement, PopperContentProps>(
|
|
235
|
-
function PopperContent(props:
|
|
236
|
-
const { __scopePopper, ...contentProps } = props
|
|
228
|
+
function PopperContent(props: PopperContentProps, forwardedRef) {
|
|
237
229
|
const { strategy, placement, floating, x, y, getFloatingProps, size, isMounted } =
|
|
238
|
-
usePopperContext(
|
|
230
|
+
usePopperContext()
|
|
239
231
|
const contentRefs = useComposedRefs<any>(floating, forwardedRef)
|
|
240
232
|
|
|
241
233
|
const contents = React.useMemo(() => {
|
|
@@ -244,8 +236,8 @@ export const PopperContent = React.forwardRef<PopperContentElement, PopperConten
|
|
|
244
236
|
key="popper-content-frame"
|
|
245
237
|
data-placement={placement}
|
|
246
238
|
data-strategy={strategy}
|
|
247
|
-
size={
|
|
248
|
-
{...
|
|
239
|
+
size={size}
|
|
240
|
+
{...props}
|
|
249
241
|
/>
|
|
250
242
|
)
|
|
251
243
|
}, [placement, strategy, props])
|
|
@@ -280,8 +272,6 @@ export const PopperContent = React.forwardRef<PopperContentElement, PopperConten
|
|
|
280
272
|
|
|
281
273
|
const ARROW_NAME = 'PopperArrow'
|
|
282
274
|
|
|
283
|
-
type PopperArrowElement = HTMLElement | View
|
|
284
|
-
|
|
285
275
|
export type PopperArrowProps = YStackProps & {
|
|
286
276
|
offset?: number
|
|
287
277
|
size?: SizeTokens
|
|
@@ -336,17 +326,11 @@ const opposites = {
|
|
|
336
326
|
type Sides = keyof typeof opposites
|
|
337
327
|
|
|
338
328
|
export const PopperArrow = PopperArrowFrame.styleable<PopperArrowProps>(
|
|
339
|
-
function PopperArrow(propsIn:
|
|
329
|
+
function PopperArrow(propsIn: PopperArrowProps, forwardedRef) {
|
|
340
330
|
const props = useProps(propsIn)
|
|
341
|
-
const {
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
size: sizeProp,
|
|
345
|
-
borderWidth = 0,
|
|
346
|
-
...arrowProps
|
|
347
|
-
} = props
|
|
348
|
-
|
|
349
|
-
const context = usePopperContext(ARROW_NAME, __scopePopper)
|
|
331
|
+
const { offset, size: sizeProp, borderWidth = 0, ...arrowProps } = props
|
|
332
|
+
|
|
333
|
+
const context = usePopperContext()
|
|
350
334
|
const sizeVal = sizeProp ?? context.size
|
|
351
335
|
const sizeValResolved = getVariableValue(
|
|
352
336
|
getSpace(sizeVal, {
|
package/types/Popper.d.ts
CHANGED
|
@@ -1,15 +1,10 @@
|
|
|
1
1
|
import { SizeTokens } from '@tamagui/core';
|
|
2
|
-
import { Scope } from '@tamagui/create-context';
|
|
3
2
|
import { Coords, Placement, Strategy, UseFloatingReturn, flip, shift } from '@tamagui/floating';
|
|
4
3
|
import { SizableStackProps, YStackProps } from '@tamagui/stacks';
|
|
5
4
|
import * as React from 'react';
|
|
6
5
|
import { View } from 'react-native';
|
|
7
6
|
type ShiftProps = typeof shift extends (options: infer Opts) => void ? Opts : never;
|
|
8
7
|
type FlipProps = typeof flip extends (options: infer Opts) => void ? Opts : never;
|
|
9
|
-
type ScopedProps<P> = P & {
|
|
10
|
-
__scopePopper?: Scope;
|
|
11
|
-
};
|
|
12
|
-
export declare const createPopperScope: import("@tamagui/create-context").CreateScope;
|
|
13
8
|
type PopperContextValue = UseFloatingReturn & {
|
|
14
9
|
isMounted: boolean;
|
|
15
10
|
anchorRef: any;
|
|
@@ -21,54 +16,8 @@ type PopperContextValue = UseFloatingReturn & {
|
|
|
21
16
|
centerOffset: number;
|
|
22
17
|
};
|
|
23
18
|
};
|
|
24
|
-
export declare const
|
|
25
|
-
|
|
26
|
-
x: number | null;
|
|
27
|
-
y: number | null;
|
|
28
|
-
isPositioned: boolean;
|
|
29
|
-
} & {
|
|
30
|
-
update: () => void;
|
|
31
|
-
reference: (node: import("@tamagui/floating").ReferenceType | null) => void;
|
|
32
|
-
floating: (node: HTMLElement | null) => void;
|
|
33
|
-
refs: {
|
|
34
|
-
reference: React.MutableRefObject<import("@tamagui/floating").ReferenceType | null>;
|
|
35
|
-
floating: React.MutableRefObject<HTMLElement | null>;
|
|
36
|
-
setReference: (node: import("@tamagui/floating").ReferenceType | null) => void;
|
|
37
|
-
setFloating: (node: HTMLElement | null) => void;
|
|
38
|
-
};
|
|
39
|
-
elements: {
|
|
40
|
-
reference: import("@tamagui/floating").ReferenceType | null;
|
|
41
|
-
floating: HTMLElement | null;
|
|
42
|
-
};
|
|
43
|
-
} & {
|
|
44
|
-
context?: any;
|
|
45
|
-
getFloatingProps?: ((props: {
|
|
46
|
-
[key: string]: any;
|
|
47
|
-
ref: any;
|
|
48
|
-
}) => any) | undefined;
|
|
49
|
-
getReferenceProps?: ((props: {
|
|
50
|
-
[key: string]: any;
|
|
51
|
-
ref: any;
|
|
52
|
-
}) => any) | undefined;
|
|
53
|
-
} & {
|
|
54
|
-
isMounted: boolean;
|
|
55
|
-
anchorRef: any;
|
|
56
|
-
size?: SizeTokens | undefined;
|
|
57
|
-
placement?: Placement | undefined;
|
|
58
|
-
arrowRef: any;
|
|
59
|
-
onArrowSize?: ((val: number) => void) | undefined;
|
|
60
|
-
arrowStyle?: (Partial<Coords> & {
|
|
61
|
-
centerOffset: number;
|
|
62
|
-
}) | undefined;
|
|
63
|
-
} & {
|
|
64
|
-
scope: Scope<PopperContextValue>;
|
|
65
|
-
children: React.ReactNode;
|
|
66
|
-
}): JSX.Element;
|
|
67
|
-
displayName: string;
|
|
68
|
-
}, usePopperContext: (consumerName: string, scope: Scope<PopperContextValue | undefined>, options?: {
|
|
69
|
-
warn?: boolean | undefined;
|
|
70
|
-
fallback?: Partial<PopperContextValue> | undefined;
|
|
71
|
-
} | undefined) => PopperContextValue;
|
|
19
|
+
export declare const PopperContext: import("@tamagui/core").StyledContext<PopperContextValue>;
|
|
20
|
+
export declare const usePopperContext: () => PopperContextValue;
|
|
72
21
|
export type PopperProps = {
|
|
73
22
|
size?: SizeTokens;
|
|
74
23
|
children?: React.ReactNode;
|
|
@@ -77,7 +26,7 @@ export type PopperProps = {
|
|
|
77
26
|
allowFlip?: FlipProps | boolean;
|
|
78
27
|
strategy?: Strategy;
|
|
79
28
|
};
|
|
80
|
-
export declare function Popper(props:
|
|
29
|
+
export declare function Popper(props: PopperProps): JSX.Element;
|
|
81
30
|
type PopperAnchorRef = HTMLElement | View;
|
|
82
31
|
export type PopperAnchorProps = YStackProps & {
|
|
83
32
|
virtualRef?: React.RefObject<any>;
|
package/types/Popper.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Popper.d.ts","sourceRoot":"","sources":["../src/Popper.tsx"],"names":[],"mappings":"AAGA,OAAO,EACL,UAAU,
|
|
1
|
+
{"version":3,"file":"Popper.d.ts","sourceRoot":"","sources":["../src/Popper.tsx"],"names":[],"mappings":"AAGA,OAAO,EACL,UAAU,EAQX,MAAM,eAAe,CAAA;AACtB,OAAO,EACL,MAAM,EACN,SAAS,EACT,QAAQ,EACR,iBAAiB,EAGjB,IAAI,EAEJ,KAAK,EAEN,MAAM,mBAAmB,CAAA;AAE1B,OAAO,EAAE,iBAAiB,EAA0B,WAAW,EAAE,MAAM,iBAAiB,CAAA;AACxF,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAY,IAAI,EAAuB,MAAM,cAAc,CAAA;AAElE,KAAK,UAAU,GAAG,OAAO,KAAK,SAAS,CAAC,OAAO,EAAE,MAAM,IAAI,KAAK,IAAI,GAAG,IAAI,GAAG,KAAK,CAAA;AACnF,KAAK,SAAS,GAAG,OAAO,IAAI,SAAS,CAAC,OAAO,EAAE,MAAM,IAAI,KAAK,IAAI,GAAG,IAAI,GAAG,KAAK,CAAA;AAMjF,KAAK,kBAAkB,GAAG,iBAAiB,GAAG;IAC5C,SAAS,EAAE,OAAO,CAAA;IAClB,SAAS,EAAE,GAAG,CAAA;IACd,IAAI,CAAC,EAAE,UAAU,CAAA;IACjB,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,QAAQ,EAAE,GAAG,CAAA;IACb,WAAW,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,IAAI,CAAA;IACnC,UAAU,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,GAAG;QAC7B,YAAY,EAAE,MAAM,CAAA;KACrB,CAAA;CACF,CAAA;AAED,eAAO,MAAM,aAAa,2DAAqD,CAAA;AAE/E,eAAO,MAAM,gBAAgB,0BAAwC,CAAA;AAErE,MAAM,MAAM,WAAW,GAAG;IACxB,IAAI,CAAC,EAAE,UAAU,CAAA;IACjB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,SAAS,CAAC,EAAE,SAAS,CAAA;IACrB,WAAW,CAAC,EAAE,UAAU,GAAG,OAAO,CAAA;IAClC,SAAS,CAAC,EAAE,SAAS,GAAG,OAAO,CAAA;IAC/B,QAAQ,CAAC,EAAE,QAAQ,CAAA;CACpB,CAAA;AAED,wBAAgB,MAAM,CAAC,KAAK,EAAE,WAAW,eA0FxC;AAQD,KAAK,eAAe,GAAG,WAAW,GAAG,IAAI,CAAA;AAEzC,MAAM,MAAM,iBAAiB,GAAG,WAAW,GAAG;IAC5C,UAAU,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;CAClC,CAAA;AAED,eAAO,MAAM,YAAY;;;;;;;;;;;yCAoBxB,CAAA;AAQD,KAAK,oBAAoB,GAAG,WAAW,GAAG,IAAI,CAAA;AAE9C,MAAM,MAAM,kBAAkB,GAAG,iBAAiB,CAAA;AAElD,eAAO,MAAM,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0B7B,CAAA;AAEF,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;gDAwCzB,CAAA;AAQD,MAAM,MAAM,gBAAgB,GAAG,WAAW,GAAG;IAC3C,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,UAAU,CAAA;CAClB,CAAA;AAkDD,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8EvB,CAAA"}
|