react-native-bottom-sheet-stack 1.7.2 → 1.7.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/lib/commonjs/BottomSheetDefaultIndex.context.js +14 -0
- package/lib/commonjs/BottomSheetDefaultIndex.context.js.map +1 -0
- package/lib/commonjs/BottomSheetManaged.js +59 -65
- package/lib/commonjs/BottomSheetManaged.js.map +1 -1
- package/lib/commonjs/BottomSheetPersistent.js +30 -17
- package/lib/commonjs/BottomSheetPersistent.js.map +1 -1
- package/lib/commonjs/bottomSheetCoordinator.js +1 -3
- package/lib/commonjs/bottomSheetCoordinator.js.map +1 -1
- package/lib/commonjs/store/store.js +9 -6
- package/lib/commonjs/store/store.js.map +1 -1
- package/lib/typescript/src/BottomSheetDefaultIndex.context.d.ts +7 -0
- package/lib/typescript/src/BottomSheetDefaultIndex.context.d.ts.map +1 -0
- package/lib/typescript/src/BottomSheetManaged.d.ts.map +1 -1
- package/lib/typescript/src/BottomSheetPersistent.d.ts.map +1 -1
- package/lib/typescript/src/bottomSheetCoordinator.d.ts.map +1 -1
- package/lib/typescript/src/store/store.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/BottomSheetDefaultIndex.context.ts +14 -0
- package/src/BottomSheetManaged.tsx +3 -6
- package/src/BottomSheetPersistent.tsx +7 -4
- package/src/bottomSheetCoordinator.ts +1 -3
- package/src/store/store.ts +13 -5
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.BottomSheetDefaultIndexContext = void 0;
|
|
7
|
+
exports.useBottomSheetDefaultIndex = useBottomSheetDefaultIndex;
|
|
8
|
+
var _react = require("react");
|
|
9
|
+
const BottomSheetDefaultIndexContext = exports.BottomSheetDefaultIndexContext = /*#__PURE__*/(0, _react.createContext)(null);
|
|
10
|
+
function useBottomSheetDefaultIndex() {
|
|
11
|
+
const context = (0, _react.useContext)(BottomSheetDefaultIndexContext);
|
|
12
|
+
return context?.defaultIndex ?? 0;
|
|
13
|
+
}
|
|
14
|
+
//# sourceMappingURL=BottomSheetDefaultIndex.context.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["_react","require","BottomSheetDefaultIndexContext","exports","createContext","useBottomSheetDefaultIndex","context","useContext","defaultIndex"],"sourceRoot":"../../src","sources":["BottomSheetDefaultIndex.context.ts"],"mappings":";;;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAMO,MAAMC,8BAA8B,GAAAC,OAAA,CAAAD,8BAAA,gBACzC,IAAAE,oBAAa,EAA6C,IAAI,CAAC;AAE1D,SAAAC,2BAAA;EACL,MAAAC,OAAA,GAAgB,IAAAC,iBAAU,EAACL,8BAA8B,CAAC;EAAC,OAEpDI,OAAO,EAAAE,YAAmB,IAA1B,CAA0B;AAAA","ignoreList":[]}
|
|
@@ -8,7 +8,7 @@ var _compilerRuntime = require("react/compiler-runtime");
|
|
|
8
8
|
var _bottomSheet = _interopRequireWildcard(require("@gorhom/bottom-sheet"));
|
|
9
9
|
var _react = _interopRequireDefault(require("react"));
|
|
10
10
|
var _animatedRegistry = require("./animatedRegistry");
|
|
11
|
-
var
|
|
11
|
+
var _BottomSheetDefaultIndex = require("./BottomSheetDefaultIndex.context");
|
|
12
12
|
var _bottomSheetCoordinator = require("./bottomSheetCoordinator");
|
|
13
13
|
var _BottomSheetRef = require("./BottomSheetRef.context");
|
|
14
14
|
var _useBottomSheetContext = require("./useBottomSheetContext");
|
|
@@ -18,10 +18,9 @@ function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return
|
|
|
18
18
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
19
19
|
const nullBackdrop = () => null;
|
|
20
20
|
const BottomSheetManaged = exports.BottomSheetManaged = /*#__PURE__*/_react.default.forwardRef((t0, forwardedRef) => {
|
|
21
|
-
const $ = (0, _compilerRuntime.c)(
|
|
21
|
+
const $ = (0, _compilerRuntime.c)(36);
|
|
22
22
|
let children;
|
|
23
23
|
let externalAnimatedIndex;
|
|
24
|
-
let externalIndex;
|
|
25
24
|
let onAnimate;
|
|
26
25
|
let onChange;
|
|
27
26
|
let onClose;
|
|
@@ -37,29 +36,26 @@ const BottomSheetManaged = exports.BottomSheetManaged = /*#__PURE__*/_react.defa
|
|
|
37
36
|
enablePanDownToClose: t1,
|
|
38
37
|
backdropComponent: t2,
|
|
39
38
|
animatedIndex: externalAnimatedIndex,
|
|
40
|
-
index: externalIndex,
|
|
41
39
|
...props
|
|
42
40
|
} = t0);
|
|
43
41
|
$[0] = t0;
|
|
44
42
|
$[1] = children;
|
|
45
43
|
$[2] = externalAnimatedIndex;
|
|
46
|
-
$[3] =
|
|
47
|
-
$[4] =
|
|
48
|
-
$[5] =
|
|
49
|
-
$[6] =
|
|
50
|
-
$[7] =
|
|
51
|
-
$[8] =
|
|
52
|
-
$[9] = t2;
|
|
44
|
+
$[3] = onAnimate;
|
|
45
|
+
$[4] = onChange;
|
|
46
|
+
$[5] = onClose;
|
|
47
|
+
$[6] = props;
|
|
48
|
+
$[7] = t1;
|
|
49
|
+
$[8] = t2;
|
|
53
50
|
} else {
|
|
54
51
|
children = $[1];
|
|
55
52
|
externalAnimatedIndex = $[2];
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
t2 = $[9];
|
|
53
|
+
onAnimate = $[3];
|
|
54
|
+
onChange = $[4];
|
|
55
|
+
onClose = $[5];
|
|
56
|
+
props = $[6];
|
|
57
|
+
t1 = $[7];
|
|
58
|
+
t2 = $[8];
|
|
63
59
|
}
|
|
64
60
|
const enablePanDownToClose = t1 === undefined ? true : t1;
|
|
65
61
|
const backdropComponent = t2 === undefined ? nullBackdrop : t2;
|
|
@@ -68,26 +64,24 @@ const BottomSheetManaged = exports.BottomSheetManaged = /*#__PURE__*/_react.defa
|
|
|
68
64
|
} = (0, _useBottomSheetContext.useBottomSheetContext)();
|
|
69
65
|
const contextRef = (0, _BottomSheetRef.useBottomSheetRefContext)();
|
|
70
66
|
const ref = contextRef ?? forwardedRef;
|
|
71
|
-
const
|
|
72
|
-
const shouldBeClosed = status === "hidden" || status === "closing";
|
|
73
|
-
const index = externalIndex ?? (shouldBeClosed ? -1 : 0);
|
|
67
|
+
const defaultIndex = (0, _BottomSheetDefaultIndex.useBottomSheetDefaultIndex)();
|
|
74
68
|
let t3;
|
|
75
|
-
if ($[
|
|
69
|
+
if ($[9] !== externalAnimatedIndex || $[10] !== id) {
|
|
76
70
|
t3 = externalAnimatedIndex ?? (0, _animatedRegistry.getAnimatedIndex)(id);
|
|
77
|
-
$[
|
|
78
|
-
$[
|
|
79
|
-
$[
|
|
71
|
+
$[9] = externalAnimatedIndex;
|
|
72
|
+
$[10] = id;
|
|
73
|
+
$[11] = t3;
|
|
80
74
|
} else {
|
|
81
|
-
t3 = $[
|
|
75
|
+
t3 = $[11];
|
|
82
76
|
}
|
|
83
77
|
const animatedIndex = t3;
|
|
84
78
|
let t4;
|
|
85
|
-
if ($[
|
|
79
|
+
if ($[12] !== id) {
|
|
86
80
|
t4 = (0, _bottomSheetCoordinator.createSheetEventHandlers)(id);
|
|
87
|
-
$[
|
|
88
|
-
$[
|
|
81
|
+
$[12] = id;
|
|
82
|
+
$[13] = t4;
|
|
89
83
|
} else {
|
|
90
|
-
t4 = $[
|
|
84
|
+
t4 = $[13];
|
|
91
85
|
}
|
|
92
86
|
const {
|
|
93
87
|
handleAnimate,
|
|
@@ -95,63 +89,63 @@ const BottomSheetManaged = exports.BottomSheetManaged = /*#__PURE__*/_react.defa
|
|
|
95
89
|
handleClose
|
|
96
90
|
} = t4;
|
|
97
91
|
let t5;
|
|
98
|
-
if ($[
|
|
92
|
+
if ($[14] !== handleAnimate || $[15] !== onAnimate) {
|
|
99
93
|
t5 = (fromIndex, toIndex, fromPosition, toPosition) => {
|
|
100
94
|
handleAnimate(fromIndex, toIndex);
|
|
101
95
|
onAnimate?.(fromIndex, toIndex, fromPosition, toPosition);
|
|
102
96
|
};
|
|
103
|
-
$[
|
|
104
|
-
$[
|
|
105
|
-
$[
|
|
97
|
+
$[14] = handleAnimate;
|
|
98
|
+
$[15] = onAnimate;
|
|
99
|
+
$[16] = t5;
|
|
106
100
|
} else {
|
|
107
|
-
t5 = $[
|
|
101
|
+
t5 = $[16];
|
|
108
102
|
}
|
|
109
103
|
const wrappedOnAnimate = t5;
|
|
110
104
|
let t6;
|
|
111
|
-
if ($[
|
|
112
|
-
t6 = (
|
|
113
|
-
handleChange(
|
|
114
|
-
onChange?.(
|
|
105
|
+
if ($[17] !== handleChange || $[18] !== onChange) {
|
|
106
|
+
t6 = (index, position, type) => {
|
|
107
|
+
handleChange(index);
|
|
108
|
+
onChange?.(index, position, type);
|
|
115
109
|
};
|
|
116
|
-
$[
|
|
117
|
-
$[
|
|
118
|
-
$[
|
|
110
|
+
$[17] = handleChange;
|
|
111
|
+
$[18] = onChange;
|
|
112
|
+
$[19] = t6;
|
|
119
113
|
} else {
|
|
120
|
-
t6 = $[
|
|
114
|
+
t6 = $[19];
|
|
121
115
|
}
|
|
122
116
|
const wrappedOnChange = t6;
|
|
123
117
|
let t7;
|
|
124
|
-
if ($[
|
|
118
|
+
if ($[20] !== handleClose || $[21] !== onClose) {
|
|
125
119
|
t7 = () => {
|
|
126
120
|
onClose?.();
|
|
127
121
|
handleClose();
|
|
128
122
|
};
|
|
129
|
-
$[
|
|
130
|
-
$[
|
|
131
|
-
$[
|
|
123
|
+
$[20] = handleClose;
|
|
124
|
+
$[21] = onClose;
|
|
125
|
+
$[22] = t7;
|
|
132
126
|
} else {
|
|
133
|
-
t7 = $[
|
|
127
|
+
t7 = $[22];
|
|
134
128
|
}
|
|
135
129
|
const wrappedOnClose = t7;
|
|
136
130
|
let t8;
|
|
137
|
-
if ($[
|
|
131
|
+
if ($[23] === Symbol.for("react.memo_cache_sentinel")) {
|
|
138
132
|
t8 = {
|
|
139
133
|
stiffness: 400,
|
|
140
134
|
damping: 80,
|
|
141
135
|
mass: 0.7
|
|
142
136
|
};
|
|
143
|
-
$[
|
|
137
|
+
$[23] = t8;
|
|
144
138
|
} else {
|
|
145
|
-
t8 = $[
|
|
139
|
+
t8 = $[23];
|
|
146
140
|
}
|
|
147
141
|
const config = (0, _bottomSheet.useBottomSheetSpringConfigs)(t8);
|
|
148
142
|
let t9;
|
|
149
|
-
if ($[
|
|
143
|
+
if ($[24] !== animatedIndex || $[25] !== backdropComponent || $[26] !== children || $[27] !== config || $[28] !== defaultIndex || $[29] !== enablePanDownToClose || $[30] !== props || $[31] !== ref || $[32] !== wrappedOnAnimate || $[33] !== wrappedOnChange || $[34] !== wrappedOnClose) {
|
|
150
144
|
t9 = /*#__PURE__*/(0, _jsxRuntime.jsx)(_bottomSheet.default, {
|
|
151
145
|
animationConfigs: config,
|
|
152
146
|
ref: ref,
|
|
153
147
|
...props,
|
|
154
|
-
index:
|
|
148
|
+
index: defaultIndex,
|
|
155
149
|
animatedIndex: animatedIndex,
|
|
156
150
|
onChange: wrappedOnChange,
|
|
157
151
|
onClose: wrappedOnClose,
|
|
@@ -160,20 +154,20 @@ const BottomSheetManaged = exports.BottomSheetManaged = /*#__PURE__*/_react.defa
|
|
|
160
154
|
enablePanDownToClose: enablePanDownToClose,
|
|
161
155
|
children: children
|
|
162
156
|
});
|
|
163
|
-
$[
|
|
164
|
-
$[
|
|
165
|
-
$[
|
|
166
|
-
$[
|
|
157
|
+
$[24] = animatedIndex;
|
|
158
|
+
$[25] = backdropComponent;
|
|
159
|
+
$[26] = children;
|
|
160
|
+
$[27] = config;
|
|
161
|
+
$[28] = defaultIndex;
|
|
167
162
|
$[29] = enablePanDownToClose;
|
|
168
|
-
$[30] =
|
|
169
|
-
$[31] =
|
|
170
|
-
$[32] =
|
|
171
|
-
$[33] =
|
|
172
|
-
$[34] =
|
|
173
|
-
$[35] =
|
|
174
|
-
$[36] = t9;
|
|
163
|
+
$[30] = props;
|
|
164
|
+
$[31] = ref;
|
|
165
|
+
$[32] = wrappedOnAnimate;
|
|
166
|
+
$[33] = wrappedOnChange;
|
|
167
|
+
$[34] = wrappedOnClose;
|
|
168
|
+
$[35] = t9;
|
|
175
169
|
} else {
|
|
176
|
-
t9 = $[
|
|
170
|
+
t9 = $[35];
|
|
177
171
|
}
|
|
178
172
|
return t9;
|
|
179
173
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_bottomSheet","_interopRequireWildcard","require","_react","_interopRequireDefault","_animatedRegistry","
|
|
1
|
+
{"version":3,"names":["_bottomSheet","_interopRequireWildcard","require","_react","_interopRequireDefault","_animatedRegistry","_BottomSheetDefaultIndex","_bottomSheetCoordinator","_BottomSheetRef","_useBottomSheetContext","_jsxRuntime","e","__esModule","default","_getRequireWildcardCache","WeakMap","r","t","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","nullBackdrop","BottomSheetManaged","exports","React","forwardRef","t0","forwardedRef","$","_compilerRuntime","c","children","externalAnimatedIndex","onAnimate","onChange","onClose","props","t1","t2","enablePanDownToClose","backdropComponent","animatedIndex","undefined","id","useBottomSheetContext","contextRef","useBottomSheetRefContext","ref","defaultIndex","useBottomSheetDefaultIndex","t3","getAnimatedIndex","t4","createSheetEventHandlers","handleAnimate","handleChange","handleClose","t5","fromIndex","toIndex","fromPosition","toPosition","wrappedOnAnimate","t6","index","position","type","wrappedOnChange","t7","wrappedOnClose","t8","Symbol","for","stiffness","damping","mass","config","useBottomSheetSpringConfigs","t9","jsx"],"sourceRoot":"../../src","sources":["BottomSheetManaged.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -7,16 +7,17 @@ exports.BottomSheetPersistent = BottomSheetPersistent;
|
|
|
7
7
|
var _compilerRuntime = require("react/compiler-runtime");
|
|
8
8
|
var _react = _interopRequireWildcard(require("react"));
|
|
9
9
|
var _bottomSheet = require("./bottomSheet.store");
|
|
10
|
+
var _BottomSheetDefaultIndex = require("./BottomSheetDefaultIndex.context");
|
|
10
11
|
var _BottomSheetManager = require("./BottomSheetManager.provider");
|
|
11
12
|
var _BottomSheetPortal = require("./BottomSheetPortal");
|
|
12
13
|
var _BottomSheetRef = require("./BottomSheetRef.context");
|
|
13
|
-
var _useEvent = require("./useEvent");
|
|
14
14
|
var _refsMap = require("./refsMap");
|
|
15
|
+
var _useEvent = require("./useEvent");
|
|
15
16
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
16
17
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
17
18
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
18
19
|
function BottomSheetPersistent(t0) {
|
|
19
|
-
const $ = (0, _compilerRuntime.c)(
|
|
20
|
+
const $ = (0, _compilerRuntime.c)(19);
|
|
20
21
|
const {
|
|
21
22
|
id,
|
|
22
23
|
children
|
|
@@ -86,28 +87,40 @@ function BottomSheetPersistent(t0) {
|
|
|
86
87
|
return null;
|
|
87
88
|
}
|
|
88
89
|
let t6;
|
|
89
|
-
if ($[13]
|
|
90
|
-
t6 =
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
$[13] = children;
|
|
95
|
-
$[14] = t6;
|
|
90
|
+
if ($[13] === Symbol.for("react.memo_cache_sentinel")) {
|
|
91
|
+
t6 = {
|
|
92
|
+
defaultIndex: -1
|
|
93
|
+
};
|
|
94
|
+
$[13] = t6;
|
|
96
95
|
} else {
|
|
97
|
-
t6 = $[
|
|
96
|
+
t6 = $[13];
|
|
98
97
|
}
|
|
99
98
|
let t7;
|
|
100
|
-
if ($[
|
|
101
|
-
t7 = /*#__PURE__*/(0, _jsxRuntime.jsx)(
|
|
99
|
+
if ($[14] !== children) {
|
|
100
|
+
t7 = /*#__PURE__*/(0, _jsxRuntime.jsx)(_BottomSheetDefaultIndex.BottomSheetDefaultIndexContext.Provider, {
|
|
101
|
+
value: t6,
|
|
102
|
+
children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_BottomSheetRef.BottomSheetRefContext.Provider, {
|
|
103
|
+
value: sheetRef,
|
|
104
|
+
children: children
|
|
105
|
+
})
|
|
106
|
+
});
|
|
107
|
+
$[14] = children;
|
|
108
|
+
$[15] = t7;
|
|
109
|
+
} else {
|
|
110
|
+
t7 = $[15];
|
|
111
|
+
}
|
|
112
|
+
let t8;
|
|
113
|
+
if ($[16] !== id || $[17] !== t7) {
|
|
114
|
+
t8 = /*#__PURE__*/(0, _jsxRuntime.jsx)(_BottomSheetPortal.BottomSheetPortal, {
|
|
102
115
|
id: id,
|
|
103
|
-
children:
|
|
116
|
+
children: t7
|
|
104
117
|
});
|
|
105
|
-
$[
|
|
106
|
-
$[16] = t6;
|
|
118
|
+
$[16] = id;
|
|
107
119
|
$[17] = t7;
|
|
120
|
+
$[18] = t8;
|
|
108
121
|
} else {
|
|
109
|
-
|
|
122
|
+
t8 = $[18];
|
|
110
123
|
}
|
|
111
|
-
return
|
|
124
|
+
return t8;
|
|
112
125
|
}
|
|
113
126
|
//# sourceMappingURL=BottomSheetPersistent.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","_interopRequireWildcard","require","_bottomSheet","_BottomSheetManager","_BottomSheetPortal","_BottomSheetRef","
|
|
1
|
+
{"version":3,"names":["_react","_interopRequireWildcard","require","_bottomSheet","_BottomSheetDefaultIndex","_BottomSheetManager","_BottomSheetPortal","_BottomSheetRef","_refsMap","_useEvent","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","BottomSheetPersistent","t0","$","_compilerRuntime","c","id","children","bottomSheetManagerContext","useMaybeBottomSheetManagerContext","mount","useMount","unmount","useUnmount","sheetExists","useSheetExists","sheetRef","useRef","groupId","t1","content","usePortal","keepMounted","mountSheet","useEvent","t2","t3","setSheetRef","useEffect","t4","t5","t6","Symbol","for","defaultIndex","t7","jsx","BottomSheetDefaultIndexContext","Provider","value","BottomSheetRefContext","t8","BottomSheetPortal"],"sourceRoot":"../../src","sources":["BottomSheetPersistent.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -23,9 +23,7 @@ function initBottomSheetCoordinator(groupId) {
|
|
|
23
23
|
const ref = (0, _refsMap.getSheetRef)(id)?.current;
|
|
24
24
|
switch (status) {
|
|
25
25
|
case 'opening':
|
|
26
|
-
|
|
27
|
-
(0, _refsMap.getSheetRef)(id)?.current?.expand();
|
|
28
|
-
});
|
|
26
|
+
(0, _refsMap.getSheetRef)(id)?.current?.expand();
|
|
29
27
|
break;
|
|
30
28
|
case 'hidden':
|
|
31
29
|
if (ref) ref.close();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_bottomSheet","require","_refsMap","initBottomSheetCoordinator","groupId","useBottomSheetStore","subscribe","s","stackOrder","filter","id","sheetsById","map","status","next","prev","forEach","prevStatus","find","p","ref","getSheetRef","current","
|
|
1
|
+
{"version":3,"names":["_bottomSheet","require","_refsMap","initBottomSheetCoordinator","groupId","useBottomSheetStore","subscribe","s","stackOrder","filter","id","sheetsById","map","status","next","prev","forEach","prevStatus","find","p","ref","getSheetRef","current","expand","close","createSheetEventHandlers","sheetId","startClosing","finishClosing","markOpen","getState","handleAnimate","_fromIndex","toIndex","state","currentStatus","handleChange","index","handleClose"],"sourceRoot":"../../src","sources":["bottomSheetCoordinator.ts"],"mappings":";;;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,QAAA,GAAAD,OAAA;AAEO,SAASE,0BAA0BA,CAACC,OAAe,EAAE;EAC1D,OAAOC,gCAAmB,CAACC,SAAS,CACjCC,CAAC,IACAA,CAAC,CAACC,UAAU,CACTC,MAAM,CAAEC,EAAE,IAAKH,CAAC,CAACI,UAAU,CAACD,EAAE,CAAC,EAAEN,OAAO,KAAKA,OAAO,CAAC,CACrDQ,GAAG,CAAEF,EAAE,KAAM;IAAEA,EAAE;IAAEG,MAAM,EAAEN,CAAC,CAACI,UAAU,CAACD,EAAE,CAAC,EAAEG;EAAO,CAAC,CAAC,CAAC,EAC5D,CAACC,IAAI,EAAEC,IAAI,KAAK;IACdD,IAAI,CAACE,OAAO,CAAC,CAAC;MAAEN,EAAE;MAAEG;IAAO,CAAC,KAAK;MAC/B,MAAMI,UAAU,GAAGF,IAAI,CAACG,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACT,EAAE,KAAKA,EAAE,CAAC,EAAEG,MAAM;MAExD,IAAII,UAAU,KAAKJ,MAAM,EAAE;QACzB;MACF;MAEA,MAAMO,GAAG,GAAG,IAAAC,oBAAW,EAACX,EAAE,CAAC,EAAEY,OAAO;MAEpC,QAAQT,MAAM;QACZ,KAAK,SAAS;UACZ,IAAAQ,oBAAW,EAACX,EAAE,CAAC,EAAEY,OAAO,EAAEC,MAAM,CAAC,CAAC;UAClC;QACF,KAAK,QAAQ;UACX,IAAIH,GAAG,EAAEA,GAAG,CAACI,KAAK,CAAC,CAAC;UACpB;QACF,KAAK,SAAS;UACZ,IAAIJ,GAAG,EAAEA,GAAG,CAACI,KAAK,CAAC,CAAC;UACpB;MACJ;IACF,CAAC,CAAC;EACJ,CACF,CAAC;AACH;;AAEA;AACA;AACA;AACA;AACO,SAASC,wBAAwBA,CAACC,OAAe,EAAE;EACxD,MAAM;IAAEC,YAAY;IAAEC,aAAa;IAAEC;EAAS,CAAC,GAC7CxB,gCAAmB,CAACyB,QAAQ,CAAC,CAAC;EAEhC,MAAMC,aAAa,GAAGA,CAACC,UAAkB,EAAEC,OAAe,KAAK;IAC7D,MAAMC,KAAK,GAAG7B,gCAAmB,CAACyB,QAAQ,CAAC,CAAC;IAC5C,MAAMK,aAAa,GAAGD,KAAK,CAACvB,UAAU,CAACe,OAAO,CAAC,EAAEb,MAAM;IAEvD,IAAIoB,OAAO,KAAK,CAAC,CAAC,IAAIE,aAAa,KAAK,MAAM,EAAE;MAC9CR,YAAY,CAACD,OAAO,CAAC;IACvB;EACF,CAAC;EAED,MAAMU,YAAY,GAAIC,KAAa,IAAK;IACtC,MAAMH,KAAK,GAAG7B,gCAAmB,CAACyB,QAAQ,CAAC,CAAC;IAC5C,MAAMK,aAAa,GAAGD,KAAK,CAACvB,UAAU,CAACe,OAAO,CAAC,EAAEb,MAAM;IAEvD,IAAIwB,KAAK,IAAI,CAAC,IAAIF,aAAa,KAAK,SAAS,EAAE;MAC7CN,QAAQ,CAACH,OAAO,CAAC;IACnB;EACF,CAAC;EAED,MAAMY,WAAW,GAAGA,CAAA,KAAM;IACxB,MAAMJ,KAAK,GAAG7B,gCAAmB,CAACyB,QAAQ,CAAC,CAAC;IAC5C,MAAMK,aAAa,GAAGD,KAAK,CAACvB,UAAU,CAACe,OAAO,CAAC,EAAEb,MAAM;IAEvD,IAAIsB,aAAa,KAAK,QAAQ,EAAE;MAC9BP,aAAa,CAACF,OAAO,CAAC;IACxB;EACF,CAAC;EAED,OAAO;IACLK,aAAa;IACbK,YAAY;IACZE;EACF,CAAC;AACH","ignoreList":[]}
|
|
@@ -17,16 +17,14 @@ const useBottomSheetStore = exports.useBottomSheetStore = (0, _traditional.creat
|
|
|
17
17
|
return state;
|
|
18
18
|
}
|
|
19
19
|
const updatedSheetsById = (0, _helpers.applyModeToTopSheet)(state.sheetsById, state.stackOrder, mode);
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
// Registry persists across sheet deletions to ensure unique Portal/PortalHost names
|
|
23
|
-
const nextPortalSession = sheet.usePortal ? (0, _portalSessionRegistry.getNextPortalSession)(sheet.id) : undefined;
|
|
20
|
+
const shouldGetNewPortalSession = sheet.usePortal && (!existingSheet || !existingSheet.keepMounted);
|
|
21
|
+
const nextPortalSession = shouldGetNewPortalSession ? (0, _portalSessionRegistry.getNextPortalSession)(sheet.id) : undefined;
|
|
24
22
|
const newSheet = existingSheet ? {
|
|
25
23
|
...existingSheet,
|
|
26
24
|
status: 'opening',
|
|
27
25
|
scaleBackground: sheet.scaleBackground ?? existingSheet.scaleBackground,
|
|
28
26
|
params: sheet.params ?? existingSheet.params,
|
|
29
|
-
portalSession: nextPortalSession ?? existingSheet.portalSession
|
|
27
|
+
portalSession: existingSheet.keepMounted ? existingSheet.portalSession : nextPortalSession ?? existingSheet.portalSession
|
|
30
28
|
} : {
|
|
31
29
|
...sheet,
|
|
32
30
|
status: 'opening',
|
|
@@ -115,12 +113,17 @@ const useBottomSheetStore = exports.useBottomSheetStore = (0, _traditional.creat
|
|
|
115
113
|
}),
|
|
116
114
|
mount: sheet => set(state => {
|
|
117
115
|
if (state.sheetsById[sheet.id]) return state;
|
|
116
|
+
|
|
117
|
+
// For portal-based persistent sheets, set initial portalSession
|
|
118
|
+
// This session will be reused across open/close cycles
|
|
119
|
+
const portalSession = sheet.usePortal ? (0, _portalSessionRegistry.getNextPortalSession)(sheet.id) : undefined;
|
|
118
120
|
return {
|
|
119
121
|
sheetsById: {
|
|
120
122
|
...state.sheetsById,
|
|
121
123
|
[sheet.id]: {
|
|
122
124
|
...sheet,
|
|
123
|
-
status: 'hidden'
|
|
125
|
+
status: 'hidden',
|
|
126
|
+
portalSession
|
|
124
127
|
}
|
|
125
128
|
}
|
|
126
129
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_middleware","require","_traditional","_helpers","_portalSessionRegistry","useBottomSheetStore","exports","create","subscribeWithSelector","set","sheetsById","stackOrder","open","sheet","mode","state","existingSheet","id","isActivatableKeepMounted","updatedSheetsById","applyModeToTopSheet","
|
|
1
|
+
{"version":3,"names":["_middleware","require","_traditional","_helpers","_portalSessionRegistry","useBottomSheetStore","exports","create","subscribeWithSelector","set","sheetsById","stackOrder","open","sheet","mode","state","existingSheet","id","isActivatableKeepMounted","updatedSheetsById","applyModeToTopSheet","shouldGetNewPortalSession","usePortal","keepMounted","nextPortalSession","getNextPortalSession","undefined","newSheet","status","scaleBackground","params","portalSession","markOpen","updateSheet","startClosing","isHidden","isOpening","belowId","getSheetBelowId","finishClosing","newStackOrder","removeFromStack","topId","getTopSheetId","updateParams","clearGroup","groupId","idsToRemove","Set","Object","keys","filter","size","forEach","has","clearAll","mount","unmount"],"sourceRoot":"../../../src","sources":["store/store.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
interface BottomSheetDefaultIndexContextValue {
|
|
2
|
+
defaultIndex: number;
|
|
3
|
+
}
|
|
4
|
+
export declare const BottomSheetDefaultIndexContext: import("react").Context<BottomSheetDefaultIndexContextValue | null>;
|
|
5
|
+
export declare function useBottomSheetDefaultIndex(): number;
|
|
6
|
+
export {};
|
|
7
|
+
//# sourceMappingURL=BottomSheetDefaultIndex.context.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"BottomSheetDefaultIndex.context.d.ts","sourceRoot":"","sources":["../../../src/BottomSheetDefaultIndex.context.ts"],"names":[],"mappings":"AAEA,UAAU,mCAAmC;IAC3C,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,8BAA8B,qEACsB,CAAC;AAElE,wBAAgB,0BAA0B,IAAI,MAAM,CAInD"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BottomSheetManaged.d.ts","sourceRoot":"","sources":["../../../src/BottomSheetManaged.tsx"],"names":[],"mappings":"AAAA,OAA4B,EAE1B,KAAK,gBAAgB,EACtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AACpF,OAAO,KAAK,MAAM,OAAO,CAAC;AAQ1B,MAAM,WAAW,cAAe,SAAQ,kBAAkB;CAAG;AAE7D,UAAU,uBAAwB,SAAQ,gBAAgB;CAAG;AAI7D,eAAO,MAAM,kBAAkB,
|
|
1
|
+
{"version":3,"file":"BottomSheetManaged.d.ts","sourceRoot":"","sources":["../../../src/BottomSheetManaged.tsx"],"names":[],"mappings":"AAAA,OAA4B,EAE1B,KAAK,gBAAgB,EACtB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AACpF,OAAO,KAAK,MAAM,OAAO,CAAC;AAQ1B,MAAM,WAAW,cAAe,SAAQ,kBAAkB;CAAG;AAE7D,UAAU,uBAAwB,SAAQ,gBAAgB;CAAG;AAI7D,eAAO,MAAM,kBAAkB,gGA0E9B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BottomSheetPersistent.d.ts","sourceRoot":"","sources":["../../../src/BottomSheetPersistent.tsx"],"names":[],"mappings":"AACA,OAAO,KAA4B,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"BottomSheetPersistent.d.ts","sourceRoot":"","sources":["../../../src/BottomSheetPersistent.tsx"],"names":[],"mappings":"AACA,OAAO,KAA4B,MAAM,OAAO,CAAC;AAOjD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAI1D,UAAU,0BAA0B;IAClC,EAAE,EAAE,mBAAmB,CAAC;IACxB,QAAQ,EAAE,KAAK,CAAC,YAAY,CAAC;CAC9B;AAED,wBAAgB,qBAAqB,CAAC,EACpC,EAAE,EACF,QAAQ,GACT,EAAE,0BAA0B,kDAuC5B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bottomSheetCoordinator.d.ts","sourceRoot":"","sources":["../../../src/bottomSheetCoordinator.ts"],"names":[],"mappings":"AAGA,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"bottomSheetCoordinator.d.ts","sourceRoot":"","sources":["../../../src/bottomSheetCoordinator.ts"],"names":[],"mappings":"AAGA,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,MAAM,cA8BzD;AAED;;;GAGG;AACH,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM;gCAInB,MAAM,WAAW,MAAM;0BAS7B,MAAM;;EAuBpC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../../../src/store/store.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAoB,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAElE,eAAO,MAAM,mBAAmB;;;;;;;;
|
|
1
|
+
{"version":3,"file":"store.d.ts","sourceRoot":"","sources":["../../../../src/store/store.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAoB,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAElE,eAAO,MAAM,mBAAmB;;;;;;;;EA+J/B,CAAC"}
|
package/package.json
CHANGED
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { createContext, useContext } from 'react';
|
|
2
|
+
|
|
3
|
+
interface BottomSheetDefaultIndexContextValue {
|
|
4
|
+
defaultIndex: number;
|
|
5
|
+
}
|
|
6
|
+
|
|
7
|
+
export const BottomSheetDefaultIndexContext =
|
|
8
|
+
createContext<BottomSheetDefaultIndexContextValue | null>(null);
|
|
9
|
+
|
|
10
|
+
export function useBottomSheetDefaultIndex(): number {
|
|
11
|
+
const context = useContext(BottomSheetDefaultIndexContext);
|
|
12
|
+
// Default to 0 (open) if no provider - for regular sheets
|
|
13
|
+
return context?.defaultIndex ?? 0;
|
|
14
|
+
}
|
|
@@ -6,7 +6,7 @@ import { type BottomSheetMethods } from '@gorhom/bottom-sheet/lib/typescript/typ
|
|
|
6
6
|
import React from 'react';
|
|
7
7
|
|
|
8
8
|
import { getAnimatedIndex } from './animatedRegistry';
|
|
9
|
-
import {
|
|
9
|
+
import { useBottomSheetDefaultIndex } from './BottomSheetDefaultIndex.context';
|
|
10
10
|
import { createSheetEventHandlers } from './bottomSheetCoordinator';
|
|
11
11
|
import { useBottomSheetRefContext } from './BottomSheetRef.context';
|
|
12
12
|
import { useBottomSheetContext } from './useBottomSheetContext';
|
|
@@ -30,7 +30,6 @@ export const BottomSheetManaged = React.forwardRef<
|
|
|
30
30
|
enablePanDownToClose = true,
|
|
31
31
|
backdropComponent = nullBackdrop,
|
|
32
32
|
animatedIndex: externalAnimatedIndex,
|
|
33
|
-
index: externalIndex,
|
|
34
33
|
...props
|
|
35
34
|
},
|
|
36
35
|
forwardedRef
|
|
@@ -39,9 +38,7 @@ export const BottomSheetManaged = React.forwardRef<
|
|
|
39
38
|
const contextRef = useBottomSheetRefContext();
|
|
40
39
|
const ref = contextRef ?? forwardedRef;
|
|
41
40
|
|
|
42
|
-
const
|
|
43
|
-
const shouldBeClosed = status === 'hidden' || status === 'closing';
|
|
44
|
-
const index = externalIndex ?? (shouldBeClosed ? -1 : 0);
|
|
41
|
+
const defaultIndex = useBottomSheetDefaultIndex();
|
|
45
42
|
|
|
46
43
|
const animatedIndex = externalAnimatedIndex ?? getAnimatedIndex(id);
|
|
47
44
|
const { handleAnimate, handleChange, handleClose } =
|
|
@@ -82,7 +79,7 @@ export const BottomSheetManaged = React.forwardRef<
|
|
|
82
79
|
animationConfigs={config}
|
|
83
80
|
ref={ref}
|
|
84
81
|
{...props}
|
|
85
|
-
index={
|
|
82
|
+
index={defaultIndex}
|
|
86
83
|
animatedIndex={animatedIndex}
|
|
87
84
|
onChange={wrappedOnChange}
|
|
88
85
|
onClose={wrappedOnClose}
|
|
@@ -2,12 +2,13 @@ import type { BottomSheetMethods } from '@gorhom/bottom-sheet/lib/typescript/typ
|
|
|
2
2
|
import React, { useEffect, useRef } from 'react';
|
|
3
3
|
|
|
4
4
|
import { useMount, useSheetExists, useUnmount } from './bottomSheet.store';
|
|
5
|
+
import { BottomSheetDefaultIndexContext } from './BottomSheetDefaultIndex.context';
|
|
5
6
|
import { useMaybeBottomSheetManagerContext } from './BottomSheetManager.provider';
|
|
6
7
|
import { BottomSheetPortal } from './BottomSheetPortal';
|
|
7
8
|
import { BottomSheetRefContext } from './BottomSheetRef.context';
|
|
8
9
|
import type { BottomSheetPortalId } from './portal.types';
|
|
9
|
-
import { useEvent } from './useEvent';
|
|
10
10
|
import { setSheetRef } from './refsMap';
|
|
11
|
+
import { useEvent } from './useEvent';
|
|
11
12
|
|
|
12
13
|
interface BottomSheetPersistentProps {
|
|
13
14
|
id: BottomSheetPortalId;
|
|
@@ -49,9 +50,11 @@ export function BottomSheetPersistent({
|
|
|
49
50
|
|
|
50
51
|
return (
|
|
51
52
|
<BottomSheetPortal id={id}>
|
|
52
|
-
<
|
|
53
|
-
{
|
|
54
|
-
|
|
53
|
+
<BottomSheetDefaultIndexContext.Provider value={{ defaultIndex: -1 }}>
|
|
54
|
+
<BottomSheetRefContext.Provider value={sheetRef}>
|
|
55
|
+
{children}
|
|
56
|
+
</BottomSheetRefContext.Provider>
|
|
57
|
+
</BottomSheetDefaultIndexContext.Provider>
|
|
55
58
|
</BottomSheetPortal>
|
|
56
59
|
);
|
|
57
60
|
}
|
|
@@ -19,9 +19,7 @@ export function initBottomSheetCoordinator(groupId: string) {
|
|
|
19
19
|
|
|
20
20
|
switch (status) {
|
|
21
21
|
case 'opening':
|
|
22
|
-
|
|
23
|
-
getSheetRef(id)?.current?.expand();
|
|
24
|
-
});
|
|
22
|
+
getSheetRef(id)?.current?.expand();
|
|
25
23
|
break;
|
|
26
24
|
case 'hidden':
|
|
27
25
|
if (ref) ref.close();
|
package/src/store/store.ts
CHANGED
|
@@ -33,9 +33,9 @@ export const useBottomSheetStore = create(
|
|
|
33
33
|
mode
|
|
34
34
|
);
|
|
35
35
|
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
const nextPortalSession =
|
|
36
|
+
const shouldGetNewPortalSession =
|
|
37
|
+
sheet.usePortal && (!existingSheet || !existingSheet.keepMounted);
|
|
38
|
+
const nextPortalSession = shouldGetNewPortalSession
|
|
39
39
|
? getNextPortalSession(sheet.id)
|
|
40
40
|
: undefined;
|
|
41
41
|
|
|
@@ -46,7 +46,9 @@ export const useBottomSheetStore = create(
|
|
|
46
46
|
scaleBackground:
|
|
47
47
|
sheet.scaleBackground ?? existingSheet.scaleBackground,
|
|
48
48
|
params: sheet.params ?? existingSheet.params,
|
|
49
|
-
portalSession:
|
|
49
|
+
portalSession: existingSheet.keepMounted
|
|
50
|
+
? existingSheet.portalSession
|
|
51
|
+
: (nextPortalSession ?? existingSheet.portalSession),
|
|
50
52
|
}
|
|
51
53
|
: { ...sheet, status: 'opening', portalSession: nextPortalSession };
|
|
52
54
|
|
|
@@ -144,10 +146,16 @@ export const useBottomSheetStore = create(
|
|
|
144
146
|
set((state) => {
|
|
145
147
|
if (state.sheetsById[sheet.id]) return state;
|
|
146
148
|
|
|
149
|
+
// For portal-based persistent sheets, set initial portalSession
|
|
150
|
+
// This session will be reused across open/close cycles
|
|
151
|
+
const portalSession = sheet.usePortal
|
|
152
|
+
? getNextPortalSession(sheet.id)
|
|
153
|
+
: undefined;
|
|
154
|
+
|
|
147
155
|
return {
|
|
148
156
|
sheetsById: {
|
|
149
157
|
...state.sheetsById,
|
|
150
|
-
[sheet.id]: { ...sheet, status: 'hidden' },
|
|
158
|
+
[sheet.id]: { ...sheet, status: 'hidden', portalSession },
|
|
151
159
|
},
|
|
152
160
|
};
|
|
153
161
|
}),
|