@tamagui/sheet 1.30.1 → 1.30.3
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/SheetImplementationCustom.js +5 -3
- package/dist/cjs/SheetImplementationCustom.js.map +1 -1
- package/dist/cjs/createSheet.js +13 -13
- package/dist/cjs/createSheet.js.map +1 -1
- package/dist/esm/SheetImplementationCustom.js +5 -3
- package/dist/esm/SheetImplementationCustom.js.map +1 -1
- package/dist/esm/createSheet.js +14 -13
- package/dist/esm/createSheet.js.map +1 -1
- package/dist/jsx/SheetImplementationCustom.js +5 -3
- package/dist/jsx/SheetImplementationCustom.js.map +1 -1
- package/dist/jsx/SheetImplementationCustom.mjs +5 -3
- package/dist/jsx/SheetImplementationCustom.mjs.map +1 -1
- package/dist/jsx/createSheet.js +14 -18
- package/dist/jsx/createSheet.js.map +1 -1
- package/dist/jsx/createSheet.mjs +14 -18
- package/dist/jsx/createSheet.mjs.map +1 -1
- package/package.json +13 -13
- package/src/SheetImplementationCustom.tsx +7 -3
- package/src/createSheet.tsx +15 -14
- package/types/Sheet.d.ts +4 -4
- package/types/SheetImplementationCustom.d.ts.map +1 -1
- package/types/createSheet.d.ts +2 -2
- package/types/createSheet.d.ts.map +1 -1
|
@@ -94,7 +94,6 @@ const SheetImplementationCustom = (0, import_core.themeable)(
|
|
|
94
94
|
);
|
|
95
95
|
const animatedNumber = useAnimatedNumber(import_constants.HIDDEN_SIZE);
|
|
96
96
|
const at = (0, import_react.useRef)(import_constants.HIDDEN_SIZE);
|
|
97
|
-
const currentId = (0, import_react.useRef)(0);
|
|
98
97
|
useAnimatedNumberReaction(
|
|
99
98
|
{
|
|
100
99
|
value: animatedNumber,
|
|
@@ -103,6 +102,7 @@ const SheetImplementationCustom = (0, import_core.themeable)(
|
|
|
103
102
|
(value) => {
|
|
104
103
|
if (!driver.isReactNative)
|
|
105
104
|
return;
|
|
105
|
+
console.warn("setting it to", value);
|
|
106
106
|
at.current = value;
|
|
107
107
|
scrollBridge.paneY = value;
|
|
108
108
|
}
|
|
@@ -118,19 +118,21 @@ const SheetImplementationCustom = (0, import_core.themeable)(
|
|
|
118
118
|
const animateTo = (0, import_core.useEvent)((position2) => {
|
|
119
119
|
if (frameSize === 0)
|
|
120
120
|
return;
|
|
121
|
-
|
|
121
|
+
let toValue = hasntMeasured || isHidden || position2 === -1 ? screenSize : positions[position2];
|
|
122
122
|
if (at.current === toValue)
|
|
123
123
|
return;
|
|
124
|
+
at.current = toValue;
|
|
124
125
|
stopSpring();
|
|
125
126
|
if (hasntMeasured || isHidden) {
|
|
126
127
|
animatedNumber.setValue(screenSize, {
|
|
127
128
|
type: "timing",
|
|
128
129
|
duration: 0
|
|
129
130
|
});
|
|
130
|
-
at.current = toValue;
|
|
131
131
|
if (isHidden) {
|
|
132
132
|
return;
|
|
133
133
|
}
|
|
134
|
+
toValue = positions[position2];
|
|
135
|
+
at.current = toValue;
|
|
134
136
|
}
|
|
135
137
|
animatedNumber.setValue(toValue, {
|
|
136
138
|
...animationConfig,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/SheetImplementationCustom.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["SheetImplementationCustom", "position", "at", "state"]
|
|
6
6
|
}
|
package/dist/cjs/createSheet.js
CHANGED
|
@@ -59,7 +59,7 @@ function createSheet({ Handle, Frame, Overlay }) {
|
|
|
59
59
|
}
|
|
60
60
|
);
|
|
61
61
|
const SheetOverlay = Overlay.extractable(
|
|
62
|
-
(propsIn) => {
|
|
62
|
+
(0, import_react.memo)((propsIn) => {
|
|
63
63
|
const { __scopeSheet, ...props } = propsIn;
|
|
64
64
|
const context = (0, import_SheetContext.useSheetContext)(import_constants.SHEET_OVERLAY_NAME, __scopeSheet);
|
|
65
65
|
const element = (0, import_react.useMemo)(
|
|
@@ -79,13 +79,7 @@ function createSheet({ Handle, Frame, Overlay }) {
|
|
|
79
79
|
}
|
|
80
80
|
)
|
|
81
81
|
),
|
|
82
|
-
[
|
|
83
|
-
context.open,
|
|
84
|
-
props,
|
|
85
|
-
context.hidden,
|
|
86
|
-
props.onPress,
|
|
87
|
-
context.dismissOnOverlayPress
|
|
88
|
-
]
|
|
82
|
+
[context.open, propsIn, context.hidden, context.dismissOnOverlayPress]
|
|
89
83
|
);
|
|
90
84
|
(0, import_react.useLayoutEffect)(() => {
|
|
91
85
|
var _a;
|
|
@@ -95,7 +89,7 @@ function createSheet({ Handle, Frame, Overlay }) {
|
|
|
95
89
|
return null;
|
|
96
90
|
}
|
|
97
91
|
return null;
|
|
98
|
-
}
|
|
92
|
+
})
|
|
99
93
|
);
|
|
100
94
|
const SheetFrame = Frame.extractable(
|
|
101
95
|
(0, import_react.forwardRef)(
|
|
@@ -108,6 +102,15 @@ function createSheet({ Handle, Frame, Overlay }) {
|
|
|
108
102
|
const { removeScrollEnabled, frameSize, contentRef } = context;
|
|
109
103
|
const composedContentRef = (0, import_compose_refs.useComposedRefs)(forwardedRef, contentRef);
|
|
110
104
|
const offscreenSize = (0, import_useSheetOffscreenSize.useSheetOffscreenSize)(context);
|
|
105
|
+
const sheetContents = (0, import_react.useMemo)(() => {
|
|
106
|
+
return (
|
|
107
|
+
// @ts-ignore
|
|
108
|
+
/* @__PURE__ */ (0, import_jsx_runtime.jsxs)(Frame, { ref: composedContentRef, height: frameSize, ...props, children: [
|
|
109
|
+
children,
|
|
110
|
+
/* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_core.Stack, { "data-sheet-offscreen-pad": true, height: offscreenSize, width: "100%" })
|
|
111
|
+
] })
|
|
112
|
+
);
|
|
113
|
+
}, [props, frameSize, offscreenSize]);
|
|
111
114
|
return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, { children: [
|
|
112
115
|
/* @__PURE__ */ (0, import_jsx_runtime.jsx)(
|
|
113
116
|
import_remove_scroll.RemoveScroll,
|
|
@@ -117,10 +120,7 @@ function createSheet({ Handle, Frame, Overlay }) {
|
|
|
117
120
|
allowPinchZoom: true,
|
|
118
121
|
shards: [contentRef],
|
|
119
122
|
removeScrollBar: false,
|
|
120
|
-
children:
|
|
121
|
-
children,
|
|
122
|
-
/* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_core.Stack, { "data-sheet-offscreen-pad": true, height: offscreenSize, width: "100%" })
|
|
123
|
-
] })
|
|
123
|
+
children: sheetContents
|
|
124
124
|
}
|
|
125
125
|
),
|
|
126
126
|
!props.disableHideBottomOverflow && // @ts-ignore
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createSheet.tsx"],
|
|
4
|
-
"mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["Sheet"]
|
|
6
6
|
}
|
|
@@ -91,7 +91,6 @@ const SheetImplementationCustom = themeable(
|
|
|
91
91
|
);
|
|
92
92
|
const animatedNumber = useAnimatedNumber(HIDDEN_SIZE);
|
|
93
93
|
const at = useRef(HIDDEN_SIZE);
|
|
94
|
-
const currentId = useRef(0);
|
|
95
94
|
useAnimatedNumberReaction(
|
|
96
95
|
{
|
|
97
96
|
value: animatedNumber,
|
|
@@ -100,6 +99,7 @@ const SheetImplementationCustom = themeable(
|
|
|
100
99
|
(value) => {
|
|
101
100
|
if (!driver.isReactNative)
|
|
102
101
|
return;
|
|
102
|
+
console.warn("setting it to", value);
|
|
103
103
|
at.current = value;
|
|
104
104
|
scrollBridge.paneY = value;
|
|
105
105
|
}
|
|
@@ -115,19 +115,21 @@ const SheetImplementationCustom = themeable(
|
|
|
115
115
|
const animateTo = useEvent((position2) => {
|
|
116
116
|
if (frameSize === 0)
|
|
117
117
|
return;
|
|
118
|
-
|
|
118
|
+
let toValue = hasntMeasured || isHidden || position2 === -1 ? screenSize : positions[position2];
|
|
119
119
|
if (at.current === toValue)
|
|
120
120
|
return;
|
|
121
|
+
at.current = toValue;
|
|
121
122
|
stopSpring();
|
|
122
123
|
if (hasntMeasured || isHidden) {
|
|
123
124
|
animatedNumber.setValue(screenSize, {
|
|
124
125
|
type: "timing",
|
|
125
126
|
duration: 0
|
|
126
127
|
});
|
|
127
|
-
at.current = toValue;
|
|
128
128
|
if (isHidden) {
|
|
129
129
|
return;
|
|
130
130
|
}
|
|
131
|
+
toValue = positions[position2];
|
|
132
|
+
at.current = toValue;
|
|
131
133
|
}
|
|
132
134
|
animatedNumber.setValue(toValue, {
|
|
133
135
|
...animationConfig,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/SheetImplementationCustom.tsx"],
|
|
4
|
-
"mappings": "
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["SheetImplementationCustom", "position", "at", "state"]
|
|
6
6
|
}
|
package/dist/esm/createSheet.js
CHANGED
|
@@ -9,6 +9,7 @@ import {
|
|
|
9
9
|
import { RemoveScroll } from "@tamagui/remove-scroll";
|
|
10
10
|
import {
|
|
11
11
|
forwardRef,
|
|
12
|
+
memo,
|
|
12
13
|
useLayoutEffect,
|
|
13
14
|
useMemo
|
|
14
15
|
} from "react";
|
|
@@ -45,7 +46,7 @@ function createSheet({ Handle, Frame, Overlay }) {
|
|
|
45
46
|
}
|
|
46
47
|
);
|
|
47
48
|
const SheetOverlay = Overlay.extractable(
|
|
48
|
-
(propsIn) => {
|
|
49
|
+
memo((propsIn) => {
|
|
49
50
|
const { __scopeSheet, ...props } = propsIn;
|
|
50
51
|
const context = useSheetContext(SHEET_OVERLAY_NAME, __scopeSheet);
|
|
51
52
|
const element = useMemo(
|
|
@@ -65,13 +66,7 @@ function createSheet({ Handle, Frame, Overlay }) {
|
|
|
65
66
|
}
|
|
66
67
|
)
|
|
67
68
|
),
|
|
68
|
-
[
|
|
69
|
-
context.open,
|
|
70
|
-
props,
|
|
71
|
-
context.hidden,
|
|
72
|
-
props.onPress,
|
|
73
|
-
context.dismissOnOverlayPress
|
|
74
|
-
]
|
|
69
|
+
[context.open, propsIn, context.hidden, context.dismissOnOverlayPress]
|
|
75
70
|
);
|
|
76
71
|
useLayoutEffect(() => {
|
|
77
72
|
var _a;
|
|
@@ -81,7 +76,7 @@ function createSheet({ Handle, Frame, Overlay }) {
|
|
|
81
76
|
return null;
|
|
82
77
|
}
|
|
83
78
|
return null;
|
|
84
|
-
}
|
|
79
|
+
})
|
|
85
80
|
);
|
|
86
81
|
const SheetFrame = Frame.extractable(
|
|
87
82
|
forwardRef(
|
|
@@ -94,6 +89,15 @@ function createSheet({ Handle, Frame, Overlay }) {
|
|
|
94
89
|
const { removeScrollEnabled, frameSize, contentRef } = context;
|
|
95
90
|
const composedContentRef = useComposedRefs(forwardedRef, contentRef);
|
|
96
91
|
const offscreenSize = useSheetOffscreenSize(context);
|
|
92
|
+
const sheetContents = useMemo(() => {
|
|
93
|
+
return (
|
|
94
|
+
// @ts-ignore
|
|
95
|
+
/* @__PURE__ */ jsxs(Frame, { ref: composedContentRef, height: frameSize, ...props, children: [
|
|
96
|
+
children,
|
|
97
|
+
/* @__PURE__ */ jsx(Stack, { "data-sheet-offscreen-pad": true, height: offscreenSize, width: "100%" })
|
|
98
|
+
] })
|
|
99
|
+
);
|
|
100
|
+
}, [props, frameSize, offscreenSize]);
|
|
97
101
|
return /* @__PURE__ */ jsxs(Fragment, { children: [
|
|
98
102
|
/* @__PURE__ */ jsx(
|
|
99
103
|
RemoveScroll,
|
|
@@ -103,10 +107,7 @@ function createSheet({ Handle, Frame, Overlay }) {
|
|
|
103
107
|
allowPinchZoom: true,
|
|
104
108
|
shards: [contentRef],
|
|
105
109
|
removeScrollBar: false,
|
|
106
|
-
children:
|
|
107
|
-
children,
|
|
108
|
-
/* @__PURE__ */ jsx(Stack, { "data-sheet-offscreen-pad": true, height: offscreenSize, width: "100%" })
|
|
109
|
-
] })
|
|
110
|
+
children: sheetContents
|
|
110
111
|
}
|
|
111
112
|
),
|
|
112
113
|
!props.disableHideBottomOverflow && // @ts-ignore
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createSheet.tsx"],
|
|
4
|
-
"mappings": "
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["Sheet"]
|
|
6
6
|
}
|
|
@@ -90,7 +90,6 @@ const SheetImplementationCustom = themeable(
|
|
|
90
90
|
);
|
|
91
91
|
const animatedNumber = useAnimatedNumber(HIDDEN_SIZE);
|
|
92
92
|
const at = useRef(HIDDEN_SIZE);
|
|
93
|
-
const currentId = useRef(0);
|
|
94
93
|
useAnimatedNumberReaction(
|
|
95
94
|
{
|
|
96
95
|
value: animatedNumber,
|
|
@@ -99,6 +98,7 @@ const SheetImplementationCustom = themeable(
|
|
|
99
98
|
(value) => {
|
|
100
99
|
if (!driver.isReactNative)
|
|
101
100
|
return;
|
|
101
|
+
console.warn("setting it to", value);
|
|
102
102
|
at.current = value;
|
|
103
103
|
scrollBridge.paneY = value;
|
|
104
104
|
}
|
|
@@ -114,19 +114,21 @@ const SheetImplementationCustom = themeable(
|
|
|
114
114
|
const animateTo = useEvent((position2) => {
|
|
115
115
|
if (frameSize === 0)
|
|
116
116
|
return;
|
|
117
|
-
|
|
117
|
+
let toValue = hasntMeasured || isHidden || position2 === -1 ? screenSize : positions[position2];
|
|
118
118
|
if (at.current === toValue)
|
|
119
119
|
return;
|
|
120
|
+
at.current = toValue;
|
|
120
121
|
stopSpring();
|
|
121
122
|
if (hasntMeasured || isHidden) {
|
|
122
123
|
animatedNumber.setValue(screenSize, {
|
|
123
124
|
type: "timing",
|
|
124
125
|
duration: 0
|
|
125
126
|
});
|
|
126
|
-
at.current = toValue;
|
|
127
127
|
if (isHidden) {
|
|
128
128
|
return;
|
|
129
129
|
}
|
|
130
|
+
toValue = positions[position2];
|
|
131
|
+
at.current = toValue;
|
|
130
132
|
}
|
|
131
133
|
animatedNumber.setValue(toValue, {
|
|
132
134
|
...animationConfig,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/SheetImplementationCustom.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,0BAA0B;AACnC,SAAS,uBAAuB;AAChC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,cAAc;AACvB,SAAS,0BAA0B;AACnC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP;AAAA,EAGE;AAAA,EAEA;AAAA,OAGK;AAEP,SAAS,aAAa,+BAA+B;AACrD,SAAS,oBAAoB,+BAA+B;AAC5D,SAAS,gBAAgB;AACzB,SAAS,qBAAqB;AAE9B,SAAS,yBAAyB;AAClC,SAAS,6BAA6B;AAE/B,MAAM,4BAA4B;AAAA,EACvC,WAA6B,SAASA,2BAA0B,OAAO,cAAc;AACnF,UAAM,cAAc,WAAW,kBAAkB;AAEjD,UAAM;AAAA,MACJ;AAAA,MACA,QAAQ;AAAA,MACR,SAAS,YAAY,SAAS;AAAA,MAC9B,uBAAuB;AAAA,MACvB,4BAA4B;AAAA,MAC5B;AAAA,IACF,IAAI;AAEJ,UAAM,oBAAoB,mBAAmB;AAC7C,UAAM,QAAQ,kBAAkB,KAAK;AACrC,UAAM,CAAC,kBAAkB,mBAAmB,IAAI,SAAc,IAAI;AAClE,UAAM,gBAAgB,sBAAsB,OAAO,OAAO;AAAA,MACxD,oBAAoB;AAAA,IACtB,CAAC;AACD,UAAM;AAAA,MACJ;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF,IAAI;AACJ,UAAM,EAAE,MAAM,YAAY,SAAS,IAAI;AAEvC,UAAM,WAAW,OAAa,IAAI;AAClC,UAAM,MAAM,gBAAgB,cAAc,QAAQ;AAKlD,UAAM,CAAC,qBAAqB,sBAAsB,IAAI,SAAS,KAAK;AACpE,UAAM,wBAAwB,CAAC,SAAS,SAAS;AACjD,UAAM,qBAAqB,WAAW,uBAAuB;AAC7D,UAAM,eAAe,YAAY,CAAC,aAAsB;AACtD,6BAAuB,QAAQ;AAAA,IACjC,GAAG,CAAC,CAAC;AAEL,UAAM,YAAY;AAAA,MAChB,MAAM,WAAW,IAAI,CAAC,UAAU,eAAe,OAAO,UAAU,CAAC;AAAA,MACjE,CAAC,WAAW,UAAU;AAAA,IACxB;AAEA,UAAM,SAAS,mBAAmB;AAClC,UAAM,EAAE,mBAAmB,wBAAwB,0BAA0B,IAC3E;AAGF,UAAM,eAAgB,OAAO,YAAY,KAAK,OAAO;AAErD,8BAA0B,MAAM;AAC9B,UAAI,EAAE,sBAAsB;AAAO;AACnC,yBAAmB,IAAI;AACvB,aAAO,MAAM;AACX,2BAAmB,KAAK;AAAA,MAC1B;AAAA,IACF,GAAG,CAAC,oBAAoB,IAAI,CAAC;AAE7B,UAAM,oBAAoB;AAAA,MACxB,OAAO;AAAA,QACL;AAAA,MACF;AAAA,MACA,CAAC,MAAM;AAAA,IACT;AAEA,UAAM,iBAAiB,kBAAkB,WAAW;AACpD,UAAM,KAAK,OAAO,WAAW;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["SheetImplementationCustom", "position", "at", "state"]
|
|
6
6
|
}
|
|
@@ -90,7 +90,6 @@ const SheetImplementationCustom = themeable(
|
|
|
90
90
|
);
|
|
91
91
|
const animatedNumber = useAnimatedNumber(HIDDEN_SIZE);
|
|
92
92
|
const at = useRef(HIDDEN_SIZE);
|
|
93
|
-
const currentId = useRef(0);
|
|
94
93
|
useAnimatedNumberReaction(
|
|
95
94
|
{
|
|
96
95
|
value: animatedNumber,
|
|
@@ -99,6 +98,7 @@ const SheetImplementationCustom = themeable(
|
|
|
99
98
|
(value) => {
|
|
100
99
|
if (!driver.isReactNative)
|
|
101
100
|
return;
|
|
101
|
+
console.warn("setting it to", value);
|
|
102
102
|
at.current = value;
|
|
103
103
|
scrollBridge.paneY = value;
|
|
104
104
|
}
|
|
@@ -114,19 +114,21 @@ const SheetImplementationCustom = themeable(
|
|
|
114
114
|
const animateTo = useEvent((position2) => {
|
|
115
115
|
if (frameSize === 0)
|
|
116
116
|
return;
|
|
117
|
-
|
|
117
|
+
let toValue = hasntMeasured || isHidden || position2 === -1 ? screenSize : positions[position2];
|
|
118
118
|
if (at.current === toValue)
|
|
119
119
|
return;
|
|
120
|
+
at.current = toValue;
|
|
120
121
|
stopSpring();
|
|
121
122
|
if (hasntMeasured || isHidden) {
|
|
122
123
|
animatedNumber.setValue(screenSize, {
|
|
123
124
|
type: "timing",
|
|
124
125
|
duration: 0
|
|
125
126
|
});
|
|
126
|
-
at.current = toValue;
|
|
127
127
|
if (isHidden) {
|
|
128
128
|
return;
|
|
129
129
|
}
|
|
130
|
+
toValue = positions[position2];
|
|
131
|
+
at.current = toValue;
|
|
130
132
|
}
|
|
131
133
|
animatedNumber.setValue(toValue, {
|
|
132
134
|
...animationConfig,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/SheetImplementationCustom.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,0BAA0B;AACnC,SAAS,uBAAuB;AAChC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,cAAc;AACvB,SAAS,0BAA0B;AACnC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP;AAAA,EAGE;AAAA,EAEA;AAAA,OAGK;AAEP,SAAS,aAAa,+BAA+B;AACrD,SAAS,oBAAoB,+BAA+B;AAC5D,SAAS,gBAAgB;AACzB,SAAS,qBAAqB;AAE9B,SAAS,yBAAyB;AAClC,SAAS,6BAA6B;AAE/B,MAAM,4BAA4B;AAAA,EACvC,WAA6B,SAASA,2BAA0B,OAAO,cAAc;AACnF,UAAM,cAAc,WAAW,kBAAkB;AAEjD,UAAM;AAAA,MACJ;AAAA,MACA,QAAQ;AAAA,MACR,SAAS,YAAY,SAAS;AAAA,MAC9B,uBAAuB;AAAA,MACvB,4BAA4B;AAAA,MAC5B;AAAA,IACF,IAAI;AAEJ,UAAM,oBAAoB,mBAAmB;AAC7C,UAAM,QAAQ,kBAAkB,KAAK;AACrC,UAAM,CAAC,kBAAkB,mBAAmB,IAAI,SAAc,IAAI;AAClE,UAAM,gBAAgB,sBAAsB,OAAO,OAAO;AAAA,MACxD,oBAAoB;AAAA,IACtB,CAAC;AACD,UAAM;AAAA,MACJ;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF,IAAI;AACJ,UAAM,EAAE,MAAM,YAAY,SAAS,IAAI;AAEvC,UAAM,WAAW,OAAa,IAAI;AAClC,UAAM,MAAM,gBAAgB,cAAc,QAAQ;AAKlD,UAAM,CAAC,qBAAqB,sBAAsB,IAAI,SAAS,KAAK;AACpE,UAAM,wBAAwB,CAAC,SAAS,SAAS;AACjD,UAAM,qBAAqB,WAAW,uBAAuB;AAC7D,UAAM,eAAe,YAAY,CAAC,aAAsB;AACtD,6BAAuB,QAAQ;AAAA,IACjC,GAAG,CAAC,CAAC;AAEL,UAAM,YAAY;AAAA,MAChB,MAAM,WAAW,IAAI,CAAC,UAAU,eAAe,OAAO,UAAU,CAAC;AAAA,MACjE,CAAC,WAAW,UAAU;AAAA,IACxB;AAEA,UAAM,SAAS,mBAAmB;AAClC,UAAM,EAAE,mBAAmB,wBAAwB,0BAA0B,IAC3E;AAGF,UAAM,eAAgB,OAAO,YAAY,KAAK,OAAO;AAErD,8BAA0B,MAAM;AAC9B,UAAI,EAAE,sBAAsB;AAAO;AACnC,yBAAmB,IAAI;AACvB,aAAO,MAAM;AACX,2BAAmB,KAAK;AAAA,MAC1B;AAAA,IACF,GAAG,CAAC,oBAAoB,IAAI,CAAC;AAE7B,UAAM,oBAAoB;AAAA,MACxB,OAAO;AAAA,QACL;AAAA,MACF;AAAA,MACA,CAAC,MAAM;AAAA,IACT;AAEA,UAAM,iBAAiB,kBAAkB,WAAW;AACpD,UAAM,KAAK,OAAO,WAAW;
|
|
4
|
+
"mappings": "AAAA,SAAS,0BAA0B;AACnC,SAAS,uBAAuB;AAChC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,cAAc;AACvB,SAAS,0BAA0B;AACnC;AAAA,EACE;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP;AAAA,EAGE;AAAA,EAEA;AAAA,OAGK;AAEP,SAAS,aAAa,+BAA+B;AACrD,SAAS,oBAAoB,+BAA+B;AAC5D,SAAS,gBAAgB;AACzB,SAAS,qBAAqB;AAE9B,SAAS,yBAAyB;AAClC,SAAS,6BAA6B;AAE/B,MAAM,4BAA4B;AAAA,EACvC,WAA6B,SAASA,2BAA0B,OAAO,cAAc;AACnF,UAAM,cAAc,WAAW,kBAAkB;AAEjD,UAAM;AAAA,MACJ;AAAA,MACA,QAAQ;AAAA,MACR,SAAS,YAAY,SAAS;AAAA,MAC9B,uBAAuB;AAAA,MACvB,4BAA4B;AAAA,MAC5B;AAAA,IACF,IAAI;AAEJ,UAAM,oBAAoB,mBAAmB;AAC7C,UAAM,QAAQ,kBAAkB,KAAK;AACrC,UAAM,CAAC,kBAAkB,mBAAmB,IAAI,SAAc,IAAI;AAClE,UAAM,gBAAgB,sBAAsB,OAAO,OAAO;AAAA,MACxD,oBAAoB;AAAA,IACtB,CAAC;AACD,UAAM;AAAA,MACJ;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,MACA;AAAA,IACF,IAAI;AACJ,UAAM,EAAE,MAAM,YAAY,SAAS,IAAI;AAEvC,UAAM,WAAW,OAAa,IAAI;AAClC,UAAM,MAAM,gBAAgB,cAAc,QAAQ;AAKlD,UAAM,CAAC,qBAAqB,sBAAsB,IAAI,SAAS,KAAK;AACpE,UAAM,wBAAwB,CAAC,SAAS,SAAS;AACjD,UAAM,qBAAqB,WAAW,uBAAuB;AAC7D,UAAM,eAAe,YAAY,CAAC,aAAsB;AACtD,6BAAuB,QAAQ;AAAA,IACjC,GAAG,CAAC,CAAC;AAEL,UAAM,YAAY;AAAA,MAChB,MAAM,WAAW,IAAI,CAAC,UAAU,eAAe,OAAO,UAAU,CAAC;AAAA,MACjE,CAAC,WAAW,UAAU;AAAA,IACxB;AAEA,UAAM,SAAS,mBAAmB;AAClC,UAAM,EAAE,mBAAmB,wBAAwB,0BAA0B,IAC3E;AAGF,UAAM,eAAgB,OAAO,YAAY,KAAK,OAAO;AAErD,8BAA0B,MAAM;AAC9B,UAAI,EAAE,sBAAsB;AAAO;AACnC,yBAAmB,IAAI;AACvB,aAAO,MAAM;AACX,2BAAmB,KAAK;AAAA,MAC1B;AAAA,IACF,GAAG,CAAC,oBAAoB,IAAI,CAAC;AAE7B,UAAM,oBAAoB;AAAA,MACxB,OAAO;AAAA,QACL;AAAA,MACF;AAAA,MACA,CAAC,MAAM;AAAA,IACT;AAEA,UAAM,iBAAiB,kBAAkB,WAAW;AACpD,UAAM,KAAK,OAAO,WAAW;AAE7B;AAAA,MACE;AAAA,QACE,OAAO;AAAA,QACP,SAAS;AAAA,MACX;AAAA,MACA,CAAC,UAAU;AACT,YAAI,CAAC,OAAO;AAAe;AAC3B,gBAAQ,KAAK,iBAAiB,KAAK;AACnC,WAAG,UAAU;AACb,qBAAa,QAAQ;AAAA,MACvB;AAAA,IACF;AAEA,aAAS,aAAa;AACpB,qBAAe,KAAK;AACpB,UAAI,aAAa,iBAAiB;AAChC,qBAAa,gBAAgB;AAC7B,qBAAa,kBAAkB;AAAA,MACjC;AAAA,IACF;AAEA,UAAM,gBAAgB,GAAG,YAAY;AAErC,UAAM,YAAY,SAAS,CAACC,cAAqB;AAC/C,UAAI,cAAc;AAAG;AAErB,UAAI,UACF,iBAAiB,YAAYA,cAAa,KAAK,aAAa,UAAUA,SAAQ;AAEhF,UAAI,GAAG,YAAY;AAAS;AAC5B,SAAG,UAAU;AAEb,iBAAW;AAEX,UAAI,iBAAiB,UAAU;AAE7B,uBAAe,SAAS,YAAY;AAAA,UAClC,MAAM;AAAA,UACN,UAAU;AAAA,QACZ,CAAC;AAED,YAAI,UAAU;AACZ;AAAA,QACF;AAEA,kBAAU,UAAUA,SAAQ;AAC5B,WAAG,UAAU;AAAA,MACf;AAEA,qBAAe,SAAS,SAAS;AAAA,QAC/B,GAAG;AAAA,QACH,MAAM;AAAA,MACR,CAAC;AAAA,IACH,CAAC;AAED,8BAA0B,MAAM;AAC9B,UAAI,cAAc,eAAe;AAC/B,uBAAe,SAAS,YAAY;AAAA,UAClC,MAAM;AAAA,UACN,UAAU;AAAA,QACZ,CAAC;AAAA,MACH;AAAA,IACF,GAAG,CAAC,eAAe,UAAU,CAAC;AAE9B,8BAA0B,MAAM;AAC9B,UAAI,CAAC,aAAa,YAAa,iBAAiB,CAAC,MAAO;AACtD;AAAA,MACF;AACA,gBAAU,QAAQ;AAAA,IACpB,GAAG,CAAC,UAAU,WAAW,MAAM,QAAQ,CAAC;AAExC,UAAM,cAAc,MAAM,eAAe,YAAY;AACrD,UAAM,YAAY,aAAa;AAE/B,UAAM,eAAe;AAAA,MACnB,MAAM;AACJ,YAAI;AAAa;AACjB,YAAI,CAAC;AAAW;AAChB,YAAI;AAAqB;AAEzB,cAAM,OAAO,UAAU,CAAC;AACxB,qBAAa,WAAW;AACxB,YAAI,SAAS,GAAG;AAEhB,iBAAS,iBAAiB,KAAc;AACtC,cAAI,CAAC;AAAyB;AAC9B,cAAI,CAAC,KAAK;AACR,oCAAwB,YAAY;AAAA,UACtC,OAAO;AACL,oCAAwB,YACtB;AAAA,UACJ;AAAA,QACF;AAEA,cAAM,UAAU,CAAC,EAAE,IAAI,OAAO,MAAsC;AAClE,2BAAiB;AACjB,gCAAsB;AACtB,2BAAiB,KAAK;AACtB,gBAAMC,MAAK,SAAS;AAGpB,gBAAM,MAAMA,MAAK,YAAY,KAAK;AAClC,cAAI,eAAe;AACnB,cAAI,OAAO;AACX,mBAAS,IAAI,GAAG,IAAI,UAAU,QAAQ,KAAK;AACzC,kBAAMD,YAAW,UAAU,CAAC;AAC5B,kBAAM,UAAU,MAAMA,YAAW,MAAMA,YAAWA,YAAW;AAC7D,gBAAI,UAAU,MAAM;AAClB,qBAAO;AACP,6BAAe;AAAA,YACjB;AAAA,UACF;AAEA,sBAAY,YAAY;AACxB,oBAAU,YAAY;AAAA,QACxB;AAEA,cAAM,SAAS,CAAC,IAA2BE,WAAoC;AAC7E,kBAAQ;AAAA,YACN,IAAIA,OAAM;AAAA,YACV,QAAQA,OAAM;AAAA,UAChB,CAAC;AAAA,QACH;AAEA,YAAI,sBAAsB;AAE1B,cAAM,kBAAkB,CACtB,IACA,EAAE,GAAG,MACF;AACH,gBAAM,aAAa,aAAa,MAAM;AACtC,gBAAM,eAAe,KAAK;AAE1B,gBAAM,YAAY,aAAa,QAAQ,KAAK,aAAa;AACzD,cAAI,YAAY;AACd,kCAAsB;AACtB,mBAAO;AAAA,UACT;AAEA,cAAI,WAAW;AACb,gBAAI,CAAC,cAAc,cAAc;AAC/B,qBAAO;AAAA,YACT;AAAA,UACF;AAEA,iBAAO,KAAK,IAAI,EAAE,IAAI;AAAA,QACxB;AAEA,cAAM,QAAQ,MAAM;AAClB,2BAAiB,IAAI;AACrB,qBAAW;AACX,mBAAS,GAAG;AAAA,QACd;AAEA,YAAI,iBAAiB;AAErB,qBAAa,OAAO,CAAC,OAAO;AAC1B,cAAI,CAAC,gBAAgB;AACnB,6BAAiB;AACjB,kBAAM;AAAA,UACR;AACA,gBAAM,KAAK,KAAK;AAChB,yBAAe,SAAS,SAAS,IAAI,IAAI,GAAG,EAAE,MAAM,SAAS,CAAC;AAAA,QAChE;AAEA,qBAAa,UAAU;AAEvB,eAAO,aAAa,OAAO;AAAA,UACzB,6BAA6B;AAAA,UAC7B,qBAAqB;AAAA,UACrB,oBAAoB,CAAC,IAAI,EAAE,GAAG,MAAM;AAClC,kBAAM,SAAS,KAAK;AACpB,kBAAM,KAAK,SAAS,QAAQ,IAAI;AAChC,2BAAe,SAAS,IAAI,EAAE,MAAM,SAAS,CAAC;AAAA,UAChD;AAAA,UACA,mBAAmB;AAAA,UACnB,yBAAyB;AAAA,UACzB,uBAAuB;AAAA,QACzB,CAAC;AAAA,MACH;AAAA;AAAA,MAEA,CAAC,aAAa,qBAAqB,WAAW,WAAW,WAAW,WAAW;AAAA,IACjF;AAEA,UAAM,4BAA4B;AAAA,MAChC,CAAC,MAAyB;AACxB,cAAM,QAAQ,MAAM;AAClB,cAAI,IAAI,EAAE,aAAa,OAAO;AAC9B,cAAI,SAAS,eAAe,CAAC,MAAM;AAEjC,iBAAK;AAAA,UACP;AACA,iBAAO;AAAA,QACT,GAAG;AAEH,YAAI,CAAC;AAAM;AACX,qBAAa,IAAI;AAAA,MACnB;AAAA,MACA,CAAC,iBAAiB;AAAA,IACpB;AAEA,UAAM,gBAAgB,uBAAuB,gBAAgB,CAAC,QAAQ;AACpE;AACA,YAAM,aAAa,cAAc,IAAI,cAAc;AACnD,aAAO;AAAA,QACL,WAAW,CAAC,EAAE,WAAW,CAAC;AAAA,MAC5B;AAAA,IACF,CAAC;AAED,UAAM,qBAAqB,OAAsB,IAAI;AACrD,cAAU,MAAM;AACd,UAAI,SAAS,CAAC;AAAsB;AACpC,YAAM,0BAA0B,SAAS,YAAY,mBAAmB,CAAC,MAAM;AAC7E,YAAI,mBAAmB,YAAY;AAAM;AACzC,2BAAmB,UAAU,eAAe,SAAS;AACrD,uBAAe;AAAA,UACb,KAAK,IAAI,eAAe,SAAS,IAAI,EAAE,eAAe,QAAQ,CAAC;AAAA,QACjE;AAAA,MACF,CAAC;AACD,YAAM,0BAA0B,SAAS,YAAY,mBAAmB,MAAM;AAC5E,YAAI,mBAAmB,YAAY;AAAM;AACzC,uBAAe,SAAS,mBAAmB,OAAO;AAClD,2BAAmB,UAAU;AAAA,MAC/B,CAAC;AAED,aAAO,MAAM;AACX,gCAAwB,OAAO;AAC/B,gCAAwB,OAAO;AAAA,MACjC;AAAA,IACF,GAAG,CAAC,oBAAoB,CAAC;AAIzB,UAAM,CAAC,SAAS,UAAU,IAAI,SAAS,OAAO,IAAI,CAAC;AACnD,QAAI,QAAQ,YAAY,GAAG;AACzB,iBAAW,CAAC;AAAA,IACd;AACA,cAAU,MAAM;AACd,UAAI,CAAC,MAAM;AAET,cAAM,KAAK,WAAW,MAAM;AAC1B,qBAAW,CAAC;AAAA,QACd,GAAG,GAAG;AACN,eAAO,MAAM;AACX,uBAAa,EAAE;AAAA,QACjB;AAAA,MACF;AAAA,IACF,GAAG,CAAC,IAAI,CAAC;AAET,UAAM,WACJ,CAAC,mBAAmB,SAAS,OAAO,mBAClC,CAAC,kBAAkB;AAAA,OAChB,wBAAwB,OAAO;AAAA,MAEhC,CAAC;AAAA,QACC,KAAK;AAAA,YACD,cAAc;AAAA,QAClB,UAAU;AAAA,QACV,eAAe,QAAQ,CAAC,wBAAwB,SAAS;AAAA,QAEzD,WAAW,MAAM;AAAA,QACjB,OAAO;AAAA,UACL;AAAA,YACE,UAAU;AAAA,YACV;AAAA,YACA,OAAO;AAAA,YACP,QAAQ,GAAG;AAAA,YACX,WAAW,GAAG;AAAA,YACd;AAAA,UACF;AAAA,UACA;AAAA,QACF;AAAA,QAEC,MAAM,SACT,EApBC;AAAA,IAqBH,EAxBC,cAyBH,EA1BC,mBAAmB;AA6BtB,UAAM,eAAe,WAAW,kBAAkB;AAGlD,UAAM,sBAAsB,QAAQ,WAAW,CAAC,yBAAyB;AAEzE,QAAI,OAAO;AACT,YAAM,gBACJ,CAAC,OAAO,QAAQ,YAAY,cACzB,uBACC,CAAC,MAAM,eAAe,MAAM,WAC1B,CAAC,mBAAmB,SAAS,OAAO,eACjC,SACH,EAFC,mBAAmB,SAGtB,EAJC,OAML,EARC;AAWH,UAAI,OAAO;AACT,eAAO;AAAA,MACT;AAGA,aACE,CAAC,wBAAwB,SAAS,OAAO,eACtC,cACH,EAFC,wBAAwB;AAAA,IAI7B;AAEA,WAAO;AAAA,EACT,CAAC;AACH;AAEA,SAAS,eAAe,OAAgB,YAAqB;AAC3D,MAAI,CAAC;AAAY,WAAO;AACxB,MAAI,UAAU,QAAW;AACvB,YAAQ,KAAK,cAAc;AAC3B,WAAO;AAAA,EACT;AACA,QAAM,MAAM,QAAQ;AACpB,QAAM,OAAO,KAAK,MAAM,aAAa,MAAM,UAAU;AAErD,SAAO;AACT;",
|
|
5
5
|
"names": ["SheetImplementationCustom", "position", "at", "state"]
|
|
6
6
|
}
|
package/dist/jsx/createSheet.js
CHANGED
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
import { RemoveScroll } from "@tamagui/remove-scroll";
|
|
9
9
|
import {
|
|
10
10
|
forwardRef,
|
|
11
|
+
memo,
|
|
11
12
|
useLayoutEffect,
|
|
12
13
|
useMemo
|
|
13
14
|
} from "react";
|
|
@@ -41,7 +42,7 @@ function createSheet({ Handle, Frame, Overlay }) {
|
|
|
41
42
|
}
|
|
42
43
|
);
|
|
43
44
|
const SheetOverlay = Overlay.extractable(
|
|
44
|
-
(propsIn) => {
|
|
45
|
+
memo((propsIn) => {
|
|
45
46
|
const { __scopeSheet, ...props } = propsIn;
|
|
46
47
|
const context = useSheetContext(SHEET_OVERLAY_NAME, __scopeSheet);
|
|
47
48
|
const element = useMemo(
|
|
@@ -58,13 +59,7 @@ function createSheet({ Handle, Frame, Overlay }) {
|
|
|
58
59
|
)}
|
|
59
60
|
/>
|
|
60
61
|
),
|
|
61
|
-
[
|
|
62
|
-
context.open,
|
|
63
|
-
props,
|
|
64
|
-
context.hidden,
|
|
65
|
-
props.onPress,
|
|
66
|
-
context.dismissOnOverlayPress
|
|
67
|
-
]
|
|
62
|
+
[context.open, propsIn, context.hidden, context.dismissOnOverlayPress]
|
|
68
63
|
);
|
|
69
64
|
useLayoutEffect(() => {
|
|
70
65
|
context.onOverlayComponent?.(element);
|
|
@@ -73,7 +68,7 @@ function createSheet({ Handle, Frame, Overlay }) {
|
|
|
73
68
|
return null;
|
|
74
69
|
}
|
|
75
70
|
return null;
|
|
76
|
-
}
|
|
71
|
+
})
|
|
77
72
|
);
|
|
78
73
|
const SheetFrame = Frame.extractable(
|
|
79
74
|
forwardRef(
|
|
@@ -86,6 +81,15 @@ function createSheet({ Handle, Frame, Overlay }) {
|
|
|
86
81
|
const { removeScrollEnabled, frameSize, contentRef } = context;
|
|
87
82
|
const composedContentRef = useComposedRefs(forwardedRef, contentRef);
|
|
88
83
|
const offscreenSize = useSheetOffscreenSize(context);
|
|
84
|
+
const sheetContents = useMemo(() => {
|
|
85
|
+
return (
|
|
86
|
+
// @ts-ignore
|
|
87
|
+
<Frame ref={composedContentRef} height={frameSize} {...props}>
|
|
88
|
+
{children}
|
|
89
|
+
<Stack data-sheet-offscreen-pad height={offscreenSize} width="100%" />
|
|
90
|
+
</Frame>
|
|
91
|
+
);
|
|
92
|
+
}, [props, frameSize, offscreenSize]);
|
|
89
93
|
return <>
|
|
90
94
|
<RemoveScroll
|
|
91
95
|
forwardProps
|
|
@@ -93,15 +97,7 @@ function createSheet({ Handle, Frame, Overlay }) {
|
|
|
93
97
|
allowPinchZoom
|
|
94
98
|
shards={[contentRef]}
|
|
95
99
|
removeScrollBar={false}
|
|
96
|
-
>
|
|
97
|
-
{
|
|
98
|
-
/* @ts-ignore */
|
|
99
|
-
}
|
|
100
|
-
<Frame ref={composedContentRef} height={frameSize} {...props}>
|
|
101
|
-
{children}
|
|
102
|
-
<Stack data-sheet-offscreen-pad height={offscreenSize} width="100%" />
|
|
103
|
-
</Frame>
|
|
104
|
-
</RemoveScroll>
|
|
100
|
+
>{sheetContents}</RemoveScroll>
|
|
105
101
|
{
|
|
106
102
|
/* below frame hide when bouncing past 100% */
|
|
107
103
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createSheet.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,uBAAuB;AAChC;AAAA,EAEE;AAAA,EAGA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,oBAAoB;AAC7B;AAAA,EAGE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,gBAAsB;AAE/B,SAAS,mBAAmB,YAAY,0BAA0B;AAClE,SAAS,sBAAsB;AAC/B,SAAS,uBAAuB;AAChC,SAAS,iCAAiC;AAC1C,SAAS,uBAAuB;AAEhC,SAAS,0BAA0B;AACnC,SAAS,6BAA6B;AAU/B,SAAS,YAId,EAAE,QAAQ,OAAO,QAAQ,GAAwC;AACjE,QAAM,cAAc,OAAO;AAAA,IACzB,CAAC,EAAE,cAAc,GAAG,MAAM,MAAiD;AACzE,YAAM,UAAU,gBAAgB,mBAAmB,YAAY;AAE/D,UAAI,QAAQ,eAAe;AACzB,eAAO;AAAA,MACT;AAEA;AAAA;AAAA,QAEE,CAAC;AAAA,UACC,SAAS,MAAM;AAEb,kBAAM,MACJ,QAAQ,WAAW,UAAU,QAAQ,wBAAwB,KAAK;AACpE,kBAAM,WAAW,QAAQ,WAAW,KAAK;AACzC,oBAAQ,YAAY,OAAO;AAAA,UAC7B;AAAA,UACA,MAAM,QAAQ;AAAA,cACV;AAAA,QACN;AAAA;AAAA,IAEJ;AAAA,EACF;AAMA,QAAM,eAAe,QAAQ;AAAA,IAC3B,CAAC,YAAwD;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["Sheet"]
|
|
6
6
|
}
|
package/dist/jsx/createSheet.mjs
CHANGED
|
@@ -8,6 +8,7 @@ import {
|
|
|
8
8
|
import { RemoveScroll } from "@tamagui/remove-scroll";
|
|
9
9
|
import {
|
|
10
10
|
forwardRef,
|
|
11
|
+
memo,
|
|
11
12
|
useLayoutEffect,
|
|
12
13
|
useMemo
|
|
13
14
|
} from "react";
|
|
@@ -41,7 +42,7 @@ function createSheet({ Handle, Frame, Overlay }) {
|
|
|
41
42
|
}
|
|
42
43
|
);
|
|
43
44
|
const SheetOverlay = Overlay.extractable(
|
|
44
|
-
(propsIn) => {
|
|
45
|
+
memo((propsIn) => {
|
|
45
46
|
const { __scopeSheet, ...props } = propsIn;
|
|
46
47
|
const context = useSheetContext(SHEET_OVERLAY_NAME, __scopeSheet);
|
|
47
48
|
const element = useMemo(
|
|
@@ -58,13 +59,7 @@ function createSheet({ Handle, Frame, Overlay }) {
|
|
|
58
59
|
)}
|
|
59
60
|
/>
|
|
60
61
|
),
|
|
61
|
-
[
|
|
62
|
-
context.open,
|
|
63
|
-
props,
|
|
64
|
-
context.hidden,
|
|
65
|
-
props.onPress,
|
|
66
|
-
context.dismissOnOverlayPress
|
|
67
|
-
]
|
|
62
|
+
[context.open, propsIn, context.hidden, context.dismissOnOverlayPress]
|
|
68
63
|
);
|
|
69
64
|
useLayoutEffect(() => {
|
|
70
65
|
context.onOverlayComponent?.(element);
|
|
@@ -73,7 +68,7 @@ function createSheet({ Handle, Frame, Overlay }) {
|
|
|
73
68
|
return null;
|
|
74
69
|
}
|
|
75
70
|
return null;
|
|
76
|
-
}
|
|
71
|
+
})
|
|
77
72
|
);
|
|
78
73
|
const SheetFrame = Frame.extractable(
|
|
79
74
|
forwardRef(
|
|
@@ -86,6 +81,15 @@ function createSheet({ Handle, Frame, Overlay }) {
|
|
|
86
81
|
const { removeScrollEnabled, frameSize, contentRef } = context;
|
|
87
82
|
const composedContentRef = useComposedRefs(forwardedRef, contentRef);
|
|
88
83
|
const offscreenSize = useSheetOffscreenSize(context);
|
|
84
|
+
const sheetContents = useMemo(() => {
|
|
85
|
+
return (
|
|
86
|
+
// @ts-ignore
|
|
87
|
+
<Frame ref={composedContentRef} height={frameSize} {...props}>
|
|
88
|
+
{children}
|
|
89
|
+
<Stack data-sheet-offscreen-pad height={offscreenSize} width="100%" />
|
|
90
|
+
</Frame>
|
|
91
|
+
);
|
|
92
|
+
}, [props, frameSize, offscreenSize]);
|
|
89
93
|
return <>
|
|
90
94
|
<RemoveScroll
|
|
91
95
|
forwardProps
|
|
@@ -93,15 +97,7 @@ function createSheet({ Handle, Frame, Overlay }) {
|
|
|
93
97
|
allowPinchZoom
|
|
94
98
|
shards={[contentRef]}
|
|
95
99
|
removeScrollBar={false}
|
|
96
|
-
>
|
|
97
|
-
{
|
|
98
|
-
/* @ts-ignore */
|
|
99
|
-
}
|
|
100
|
-
<Frame ref={composedContentRef} height={frameSize} {...props}>
|
|
101
|
-
{children}
|
|
102
|
-
<Stack data-sheet-offscreen-pad height={offscreenSize} width="100%" />
|
|
103
|
-
</Frame>
|
|
104
|
-
</RemoveScroll>
|
|
100
|
+
>{sheetContents}</RemoveScroll>
|
|
105
101
|
{
|
|
106
102
|
/* below frame hide when bouncing past 100% */
|
|
107
103
|
}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../src/createSheet.tsx"],
|
|
4
|
-
"mappings": "AAAA,SAAS,uBAAuB;AAChC;AAAA,EAEE;AAAA,EAGA;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,oBAAoB;AAC7B;AAAA,EAGE;AAAA,EACA;AAAA,EACA;AAAA,OACK;AACP,SAAS,gBAAsB;AAE/B,SAAS,mBAAmB,YAAY,0BAA0B;AAClE,SAAS,sBAAsB;AAC/B,SAAS,uBAAuB;AAChC,SAAS,iCAAiC;AAC1C,SAAS,uBAAuB;AAEhC,SAAS,0BAA0B;AACnC,SAAS,6BAA6B;AAU/B,SAAS,YAId,EAAE,QAAQ,OAAO,QAAQ,GAAwC;AACjE,QAAM,cAAc,OAAO;AAAA,IACzB,CAAC,EAAE,cAAc,GAAG,MAAM,MAAiD;AACzE,YAAM,UAAU,gBAAgB,mBAAmB,YAAY;AAE/D,UAAI,QAAQ,eAAe;AACzB,eAAO;AAAA,MACT;AAEA;AAAA;AAAA,QAEE,CAAC;AAAA,UACC,SAAS,MAAM;AAEb,kBAAM,MACJ,QAAQ,WAAW,UAAU,QAAQ,wBAAwB,KAAK;AACpE,kBAAM,WAAW,QAAQ,WAAW,KAAK;AACzC,oBAAQ,YAAY,OAAO;AAAA,UAC7B;AAAA,UACA,MAAM,QAAQ;AAAA,cACV;AAAA,QACN;AAAA;AAAA,IAEJ;AAAA,EACF;AAMA,QAAM,eAAe,QAAQ;AAAA,IAC3B,CAAC,YAAwD;
|
|
4
|
+
"mappings": "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",
|
|
5
5
|
"names": ["Sheet"]
|
|
6
6
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tamagui/sheet",
|
|
3
|
-
"version": "1.30.
|
|
3
|
+
"version": "1.30.3",
|
|
4
4
|
"sideEffects": [
|
|
5
5
|
"*.css"
|
|
6
6
|
],
|
|
@@ -31,24 +31,24 @@
|
|
|
31
31
|
}
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@tamagui/animations-react-native": "1.30.
|
|
35
|
-
"@tamagui/compose-refs": "1.30.
|
|
36
|
-
"@tamagui/core": "1.30.
|
|
37
|
-
"@tamagui/create-context": "1.30.
|
|
38
|
-
"@tamagui/portal": "1.30.
|
|
39
|
-
"@tamagui/remove-scroll": "1.30.
|
|
40
|
-
"@tamagui/scroll-view": "1.30.
|
|
41
|
-
"@tamagui/stacks": "1.30.
|
|
42
|
-
"@tamagui/use-constant": "1.30.
|
|
43
|
-
"@tamagui/use-controllable-state": "1.30.
|
|
44
|
-
"@tamagui/use-keyboard-visible": "1.30.
|
|
34
|
+
"@tamagui/animations-react-native": "1.30.3",
|
|
35
|
+
"@tamagui/compose-refs": "1.30.3",
|
|
36
|
+
"@tamagui/core": "1.30.3",
|
|
37
|
+
"@tamagui/create-context": "1.30.3",
|
|
38
|
+
"@tamagui/portal": "1.30.3",
|
|
39
|
+
"@tamagui/remove-scroll": "1.30.3",
|
|
40
|
+
"@tamagui/scroll-view": "1.30.3",
|
|
41
|
+
"@tamagui/stacks": "1.30.3",
|
|
42
|
+
"@tamagui/use-constant": "1.30.3",
|
|
43
|
+
"@tamagui/use-controllable-state": "1.30.3",
|
|
44
|
+
"@tamagui/use-keyboard-visible": "1.30.3"
|
|
45
45
|
},
|
|
46
46
|
"peerDependencies": {
|
|
47
47
|
"react": "*",
|
|
48
48
|
"react-native": "*"
|
|
49
49
|
},
|
|
50
50
|
"devDependencies": {
|
|
51
|
-
"@tamagui/build": "1.30.
|
|
51
|
+
"@tamagui/build": "1.30.3",
|
|
52
52
|
"react": "^18.2.0",
|
|
53
53
|
"react-native": "^0.71.7"
|
|
54
54
|
},
|
|
@@ -112,7 +112,6 @@ export const SheetImplementationCustom = themeable(
|
|
|
112
112
|
|
|
113
113
|
const animatedNumber = useAnimatedNumber(HIDDEN_SIZE)
|
|
114
114
|
const at = useRef(HIDDEN_SIZE)
|
|
115
|
-
const currentId = useRef(0)
|
|
116
115
|
|
|
117
116
|
useAnimatedNumberReaction(
|
|
118
117
|
{
|
|
@@ -121,6 +120,7 @@ export const SheetImplementationCustom = themeable(
|
|
|
121
120
|
},
|
|
122
121
|
(value) => {
|
|
123
122
|
if (!driver.isReactNative) return
|
|
123
|
+
console.warn('setting it to', value)
|
|
124
124
|
at.current = value
|
|
125
125
|
scrollBridge.paneY = value
|
|
126
126
|
}
|
|
@@ -138,10 +138,12 @@ export const SheetImplementationCustom = themeable(
|
|
|
138
138
|
|
|
139
139
|
const animateTo = useEvent((position: number) => {
|
|
140
140
|
if (frameSize === 0) return
|
|
141
|
-
|
|
141
|
+
|
|
142
|
+
let toValue =
|
|
142
143
|
hasntMeasured || isHidden || position === -1 ? screenSize : positions[position]
|
|
143
144
|
|
|
144
145
|
if (at.current === toValue) return
|
|
146
|
+
at.current = toValue
|
|
145
147
|
|
|
146
148
|
stopSpring()
|
|
147
149
|
|
|
@@ -151,11 +153,13 @@ export const SheetImplementationCustom = themeable(
|
|
|
151
153
|
type: 'timing',
|
|
152
154
|
duration: 0,
|
|
153
155
|
})
|
|
154
|
-
at.current = toValue
|
|
155
156
|
|
|
156
157
|
if (isHidden) {
|
|
157
158
|
return
|
|
158
159
|
}
|
|
160
|
+
|
|
161
|
+
toValue = positions[position]
|
|
162
|
+
at.current = toValue
|
|
159
163
|
}
|
|
160
164
|
|
|
161
165
|
animatedNumber.setValue(toValue, {
|
package/src/createSheet.tsx
CHANGED
|
@@ -13,6 +13,7 @@ import {
|
|
|
13
13
|
FunctionComponent,
|
|
14
14
|
RefAttributes,
|
|
15
15
|
forwardRef,
|
|
16
|
+
memo,
|
|
16
17
|
useLayoutEffect,
|
|
17
18
|
useMemo,
|
|
18
19
|
} from 'react'
|
|
@@ -70,7 +71,7 @@ export function createSheet<
|
|
|
70
71
|
* -----------------------------------------------------------------------------------------------*/
|
|
71
72
|
|
|
72
73
|
const SheetOverlay = Overlay.extractable(
|
|
73
|
-
(propsIn: SheetScopedProps<GetProps<typeof Overlay>>) => {
|
|
74
|
+
memo((propsIn: SheetScopedProps<GetProps<typeof Overlay>>) => {
|
|
74
75
|
const { __scopeSheet, ...props } = propsIn
|
|
75
76
|
const context = useSheetContext(SHEET_OVERLAY_NAME, __scopeSheet)
|
|
76
77
|
|
|
@@ -93,13 +94,7 @@ export function createSheet<
|
|
|
93
94
|
)}
|
|
94
95
|
/>
|
|
95
96
|
),
|
|
96
|
-
[
|
|
97
|
-
context.open,
|
|
98
|
-
props,
|
|
99
|
-
context.hidden,
|
|
100
|
-
props.onPress,
|
|
101
|
-
context.dismissOnOverlayPress,
|
|
102
|
-
]
|
|
97
|
+
[context.open, propsIn, context.hidden, context.dismissOnOverlayPress]
|
|
103
98
|
)
|
|
104
99
|
|
|
105
100
|
useLayoutEffect(() => {
|
|
@@ -111,7 +106,7 @@ export function createSheet<
|
|
|
111
106
|
}
|
|
112
107
|
|
|
113
108
|
return null
|
|
114
|
-
}
|
|
109
|
+
})
|
|
115
110
|
)
|
|
116
111
|
|
|
117
112
|
/* -------------------------------------------------------------------------------------------------
|
|
@@ -137,6 +132,16 @@ export function createSheet<
|
|
|
137
132
|
const composedContentRef = useComposedRefs(forwardedRef, contentRef)
|
|
138
133
|
const offscreenSize = useSheetOffscreenSize(context)
|
|
139
134
|
|
|
135
|
+
const sheetContents = useMemo(() => {
|
|
136
|
+
return (
|
|
137
|
+
// @ts-ignore
|
|
138
|
+
<Frame ref={composedContentRef} height={frameSize} {...props}>
|
|
139
|
+
{children}
|
|
140
|
+
<Stack data-sheet-offscreen-pad height={offscreenSize} width="100%" />
|
|
141
|
+
</Frame>
|
|
142
|
+
)
|
|
143
|
+
}, [props, frameSize, offscreenSize])
|
|
144
|
+
|
|
140
145
|
return (
|
|
141
146
|
<>
|
|
142
147
|
<RemoveScroll
|
|
@@ -147,11 +152,7 @@ export function createSheet<
|
|
|
147
152
|
// causes lots of bugs on touch web on site
|
|
148
153
|
removeScrollBar={false}
|
|
149
154
|
>
|
|
150
|
-
{
|
|
151
|
-
<Frame ref={composedContentRef} height={frameSize} {...props}>
|
|
152
|
-
{children}
|
|
153
|
-
<Stack data-sheet-offscreen-pad height={offscreenSize} width="100%" />
|
|
154
|
-
</Frame>
|
|
155
|
+
{sheetContents}
|
|
155
156
|
</RemoveScroll>
|
|
156
157
|
|
|
157
158
|
{/* below frame hide when bouncing past 100% */}
|
package/types/Sheet.d.ts
CHANGED
|
@@ -172,7 +172,7 @@ export declare const Sheet: import("react").ForwardRefExoticComponent<{
|
|
|
172
172
|
} & {
|
|
173
173
|
__scopeSheet?: import("@tamagui/create-context").Scope<any>;
|
|
174
174
|
} & import("react").RefAttributes<unknown>>;
|
|
175
|
-
Overlay: (propsIn: import("./types").SheetScopedProps<Omit<import("react-native/types").ViewProps, "display" | "children" | "onLayout" | keyof import("react-native/types").GestureResponderHandlers> & import("@tamagui/core").ExtendBaseStackProps & import("@tamagui/core").TamaguiComponentPropsBase & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase>> & import("@tamagui/core/types/reactNativeTypes").RNViewProps & Omit<{
|
|
175
|
+
Overlay: import("react").MemoExoticComponent<(propsIn: import("./types").SheetScopedProps<Omit<import("react-native/types").ViewProps, "display" | "children" | "onLayout" | keyof import("react-native/types").GestureResponderHandlers> & import("@tamagui/core").ExtendBaseStackProps & import("@tamagui/core").TamaguiComponentPropsBase & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase>> & import("@tamagui/core/types/reactNativeTypes").RNViewProps & Omit<{
|
|
176
176
|
readonly fullscreen?: boolean | undefined;
|
|
177
177
|
readonly elevation?: import("@tamagui/core").SizeTokens | undefined;
|
|
178
178
|
} & {
|
|
@@ -226,7 +226,7 @@ export declare const Sheet: import("react").ForwardRefExoticComponent<{
|
|
|
226
226
|
}, "open" | "unstyled"> & {
|
|
227
227
|
readonly open?: boolean | undefined;
|
|
228
228
|
readonly unstyled?: boolean | undefined;
|
|
229
|
-
}>>>) => null
|
|
229
|
+
}>>>) => null>;
|
|
230
230
|
Handle: ({ __scopeSheet, ...props }: import("./types").SheetScopedProps<Omit<import("react-native/types").ViewProps, "display" | "children" | "onLayout" | keyof import("react-native/types").GestureResponderHandlers> & import("@tamagui/core").ExtendBaseStackProps & import("@tamagui/core").TamaguiComponentPropsBase & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase>> & import("@tamagui/core/types/reactNativeTypes").RNViewProps & Omit<{
|
|
231
231
|
readonly fullscreen?: boolean | undefined;
|
|
232
232
|
readonly elevation?: import("@tamagui/core").SizeTokens | undefined;
|
|
@@ -274,7 +274,7 @@ export declare const Sheet: import("react").ForwardRefExoticComponent<{
|
|
|
274
274
|
} & {
|
|
275
275
|
__scopeSheet?: import("@tamagui/create-context").Scope<any>;
|
|
276
276
|
} & import("react").RefAttributes<unknown>>;
|
|
277
|
-
Overlay: (propsIn: import("./types").SheetScopedProps<Omit<import("react-native/types").ViewProps, "display" | "children" | "onLayout" | keyof import("react-native/types").GestureResponderHandlers> & import("@tamagui/core").ExtendBaseStackProps & import("@tamagui/core").TamaguiComponentPropsBase & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase>> & import("@tamagui/core/types/reactNativeTypes").RNViewProps & Omit<{
|
|
277
|
+
Overlay: import("react").MemoExoticComponent<(propsIn: import("./types").SheetScopedProps<Omit<import("react-native/types").ViewProps, "display" | "children" | "onLayout" | keyof import("react-native/types").GestureResponderHandlers> & import("@tamagui/core").ExtendBaseStackProps & import("@tamagui/core").TamaguiComponentPropsBase & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase>> & import("@tamagui/core/types/reactNativeTypes").RNViewProps & Omit<{
|
|
278
278
|
readonly fullscreen?: boolean | undefined;
|
|
279
279
|
readonly elevation?: import("@tamagui/core").SizeTokens | undefined;
|
|
280
280
|
} & {
|
|
@@ -328,7 +328,7 @@ export declare const Sheet: import("react").ForwardRefExoticComponent<{
|
|
|
328
328
|
}, "open" | "unstyled"> & {
|
|
329
329
|
readonly open?: boolean | undefined;
|
|
330
330
|
readonly unstyled?: boolean | undefined;
|
|
331
|
-
}>>>) => null
|
|
331
|
+
}>>>) => null>;
|
|
332
332
|
Handle: ({ __scopeSheet, ...props }: import("./types").SheetScopedProps<Omit<import("react-native/types").ViewProps, "display" | "children" | "onLayout" | keyof import("react-native/types").GestureResponderHandlers> & import("@tamagui/core").ExtendBaseStackProps & import("@tamagui/core").TamaguiComponentPropsBase & import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase> & import("@tamagui/core").WithShorthands<import("@tamagui/core").WithThemeValues<import("@tamagui/core").StackStylePropsBase>> & import("@tamagui/core/types/reactNativeTypes").RNViewProps & Omit<{
|
|
333
333
|
readonly fullscreen?: boolean | undefined;
|
|
334
334
|
readonly elevation?: import("@tamagui/core").SizeTokens | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SheetImplementationCustom.d.ts","sourceRoot":"","sources":["../src/SheetImplementationCustom.tsx"],"names":[],"mappings":";AAuBA,OAAO,EAOL,IAAI,EACL,MAAM,cAAc,CAAA;AAUrB,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"SheetImplementationCustom.d.ts","sourceRoot":"","sources":["../src/SheetImplementationCustom.tsx"],"names":[],"mappings":";AAuBA,OAAO,EAOL,IAAI,EACL,MAAM,cAAc,CAAA;AAUrB,eAAO,MAAM,yBAAyB;;;;;;;;;;;;;;;;;;;;;;;;6MAiYrC,CAAA"}
|
package/types/createSheet.d.ts
CHANGED
|
@@ -40,7 +40,7 @@ export declare function createSheet<H extends SheetStyledComponent, F extends Sh
|
|
|
40
40
|
Frame: import("react").ForwardRefExoticComponent<import("react").PropsWithoutRef<SheetScopedProps<GetProps<F> & {
|
|
41
41
|
disableHideBottomOverflow?: boolean | undefined;
|
|
42
42
|
}>> & RefAttributes<unknown>>;
|
|
43
|
-
Overlay: (propsIn: SheetScopedProps<GetProps<typeof Overlay>>) => null
|
|
43
|
+
Overlay: import("react").MemoExoticComponent<(propsIn: SheetScopedProps<GetProps<typeof Overlay>>) => null>;
|
|
44
44
|
Handle: ({ __scopeSheet, ...props }: SheetScopedProps<GetProps<typeof Handle>>) => JSX.Element | null;
|
|
45
45
|
ScrollView: import("react").ForwardRefExoticComponent<import("react-native").ScrollViewProps & Omit<StackProps, keyof import("react-native").ScrollViewProps> & Omit<{}, "fullscreen"> & {
|
|
46
46
|
readonly fullscreen?: boolean | undefined;
|
|
@@ -53,7 +53,7 @@ export declare function createSheet<H extends SheetStyledComponent, F extends Sh
|
|
|
53
53
|
Frame: import("react").ForwardRefExoticComponent<import("react").PropsWithoutRef<SheetScopedProps<GetProps<F> & {
|
|
54
54
|
disableHideBottomOverflow?: boolean | undefined;
|
|
55
55
|
}>> & RefAttributes<unknown>>;
|
|
56
|
-
Overlay: (propsIn: SheetScopedProps<GetProps<typeof Overlay>>) => null
|
|
56
|
+
Overlay: import("react").MemoExoticComponent<(propsIn: SheetScopedProps<GetProps<typeof Overlay>>) => null>;
|
|
57
57
|
Handle: ({ __scopeSheet, ...props }: SheetScopedProps<GetProps<typeof Handle>>) => JSX.Element | null;
|
|
58
58
|
ScrollView: import("react").ForwardRefExoticComponent<import("react-native").ScrollViewProps & Omit<StackProps, keyof import("react-native").ScrollViewProps> & Omit<{}, "fullscreen"> & {
|
|
59
59
|
readonly fullscreen?: boolean | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createSheet.d.ts","sourceRoot":"","sources":["../src/createSheet.tsx"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAER,UAAU,EACV,iCAAiC,EAIlC,MAAM,eAAe,CAAA;AAEtB,OAAO,EACL,iBAAiB,EACjB,aAAa,
|
|
1
|
+
{"version":3,"file":"createSheet.d.ts","sourceRoot":"","sources":["../src/createSheet.tsx"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EAER,UAAU,EACV,iCAAiC,EAIlC,MAAM,eAAe,CAAA;AAEtB,OAAO,EACL,iBAAiB,EACjB,aAAa,EAKd,MAAM,OAAO,CAAA;AACd,OAAO,EAAY,IAAI,EAAE,MAAM,cAAc,CAAA;AAO7C,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAA;AAItD,KAAK,gBAAgB,GAAG;IACtB,IAAI,CAAC,EAAE,OAAO,CAAA;CACf,CAAA;AAED,KAAK,SAAS,GAAG,UAAU,GAAG,gBAAgB,CAAA;AAE9C,KAAK,oBAAoB,GAAG,iCAAiC,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAA;AAE1F,wBAAgB,WAAW,CACzB,CAAC,SAAS,oBAAoB,EAC9B,CAAC,SAAS,oBAAoB,EAC9B,CAAC,SAAS,oBAAoB,EAC9B,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE;IAAE,MAAM,EAAE,CAAC,CAAC;IAAC,KAAK,EAAE,CAAC,CAAC;IAAC,OAAO,EAAE,CAAC,CAAA;CAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;+DA+B9C,iBAAiB,SAAS,cAAc,CAAC,CAAC;6CA7B5B,iBAAiB,SAAS,aAAa,CAAC,CAAC;;;;;;;;;;;;2DA6BvD,iBAAiB,SAAS,cAAc,CAAC,CAAC;yCA7B5B,iBAAiB,SAAS,aAAa,CAAC,CAAC;;;;;;;;EAkLzE"}
|