react-native-screen-transitions 3.6.0-alpha.3 → 3.6.0-beta.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (177) hide show
  1. package/lib/commonjs/shared/components/screen-container/layers/content.js +1 -11
  2. package/lib/commonjs/shared/components/screen-container/layers/content.js.map +1 -1
  3. package/lib/commonjs/shared/constants.js +2 -1
  4. package/lib/commonjs/shared/constants.js.map +1 -1
  5. package/lib/commonjs/shared/hooks/navigation/use-stack.js.map +1 -1
  6. package/lib/commonjs/shared/providers/screen/animation/helpers/build-screen-transition-options.js +1 -1
  7. package/lib/commonjs/shared/providers/screen/animation/helpers/build-screen-transition-options.js.map +1 -1
  8. package/lib/commonjs/shared/providers/screen/animation/helpers/hydrate-transition-state/index.js +10 -3
  9. package/lib/commonjs/shared/providers/screen/animation/helpers/hydrate-transition-state/index.js.map +1 -1
  10. package/lib/commonjs/shared/providers/screen/animation/helpers/hydrate-transition-state/snap-points.js +2 -2
  11. package/lib/commonjs/shared/providers/screen/animation/helpers/hydrate-transition-state/snap-points.js.map +1 -1
  12. package/lib/commonjs/shared/providers/screen/animation/helpers/pipeline.js +7 -2
  13. package/lib/commonjs/shared/providers/screen/animation/helpers/pipeline.js.map +1 -1
  14. package/lib/commonjs/shared/providers/screen/animation/helpers/selected-interpolator-options.js +1 -1
  15. package/lib/commonjs/shared/providers/screen/animation/helpers/selected-interpolator-options.js.map +1 -1
  16. package/lib/commonjs/shared/providers/screen/animation/helpers/stack-progress.js +25 -0
  17. package/lib/commonjs/shared/providers/screen/animation/helpers/stack-progress.js.map +1 -0
  18. package/lib/commonjs/shared/providers/screen/animation/helpers/use-build-transition-state.js +1 -0
  19. package/lib/commonjs/shared/providers/screen/animation/helpers/use-build-transition-state.js.map +1 -1
  20. package/lib/commonjs/shared/providers/screen/gestures/shared/policy.js +13 -4
  21. package/lib/commonjs/shared/providers/screen/gestures/shared/policy.js.map +1 -1
  22. package/lib/commonjs/shared/providers/screen/options/helpers.js +9 -4
  23. package/lib/commonjs/shared/providers/screen/options/helpers.js.map +1 -1
  24. package/lib/commonjs/shared/providers/screen/styles/helpers/resolve-slot-styles/index.js +94 -13
  25. package/lib/commonjs/shared/providers/screen/styles/helpers/resolve-slot-styles/index.js.map +1 -1
  26. package/lib/commonjs/shared/providers/screen/styles/helpers/resolve-slot-styles/materialize-slot.js +4 -1
  27. package/lib/commonjs/shared/providers/screen/styles/helpers/resolve-slot-styles/materialize-slot.js.map +1 -1
  28. package/lib/commonjs/shared/providers/screen/styles/helpers/resolve-slot-styles/types.js +4 -0
  29. package/lib/commonjs/shared/providers/screen/styles/hooks/use-interpolated-style-maps.js +85 -28
  30. package/lib/commonjs/shared/providers/screen/styles/hooks/use-interpolated-style-maps.js.map +1 -1
  31. package/lib/commonjs/shared/providers/screen/styles/hooks/use-resolved-slot-style-map.js +5 -4
  32. package/lib/commonjs/shared/providers/screen/styles/hooks/use-resolved-slot-style-map.js.map +1 -1
  33. package/lib/commonjs/shared/providers/screen/styles/styles.provider.js +2 -2
  34. package/lib/commonjs/shared/providers/screen/styles/styles.provider.js.map +1 -1
  35. package/lib/commonjs/shared/providers/stack/direct.provider.js +1 -3
  36. package/lib/commonjs/shared/providers/stack/direct.provider.js.map +1 -1
  37. package/lib/commonjs/shared/providers/stack/helpers/use-stack-derived.js +2 -12
  38. package/lib/commonjs/shared/providers/stack/helpers/use-stack-derived.js.map +1 -1
  39. package/lib/commonjs/shared/providers/stack/managed.provider.js +1 -3
  40. package/lib/commonjs/shared/providers/stack/managed.provider.js.map +1 -1
  41. package/lib/commonjs/shared/stores/animation.store.js +5 -3
  42. package/lib/commonjs/shared/stores/animation.store.js.map +1 -1
  43. package/lib/commonjs/shared/stores/bounds/internals/links.js +18 -3
  44. package/lib/commonjs/shared/stores/bounds/internals/links.js.map +1 -1
  45. package/lib/commonjs/shared/utils/bounds/navigation/reveal/build.js +0 -2
  46. package/lib/commonjs/shared/utils/bounds/navigation/reveal/build.js.map +1 -1
  47. package/lib/commonjs/shared/utils/bounds/navigation/zoom/build.js +5 -2
  48. package/lib/commonjs/shared/utils/bounds/navigation/zoom/build.js.map +1 -1
  49. package/lib/module/shared/components/screen-container/layers/content.js +3 -13
  50. package/lib/module/shared/components/screen-container/layers/content.js.map +1 -1
  51. package/lib/module/shared/constants.js +1 -0
  52. package/lib/module/shared/constants.js.map +1 -1
  53. package/lib/module/shared/hooks/navigation/use-stack.js.map +1 -1
  54. package/lib/module/shared/providers/screen/animation/helpers/build-screen-transition-options.js +1 -1
  55. package/lib/module/shared/providers/screen/animation/helpers/build-screen-transition-options.js.map +1 -1
  56. package/lib/module/shared/providers/screen/animation/helpers/hydrate-transition-state/index.js +10 -3
  57. package/lib/module/shared/providers/screen/animation/helpers/hydrate-transition-state/index.js.map +1 -1
  58. package/lib/module/shared/providers/screen/animation/helpers/hydrate-transition-state/snap-points.js +2 -2
  59. package/lib/module/shared/providers/screen/animation/helpers/hydrate-transition-state/snap-points.js.map +1 -1
  60. package/lib/module/shared/providers/screen/animation/helpers/pipeline.js +7 -2
  61. package/lib/module/shared/providers/screen/animation/helpers/pipeline.js.map +1 -1
  62. package/lib/module/shared/providers/screen/animation/helpers/selected-interpolator-options.js +1 -1
  63. package/lib/module/shared/providers/screen/animation/helpers/selected-interpolator-options.js.map +1 -1
  64. package/lib/module/shared/providers/screen/animation/helpers/stack-progress.js +20 -0
  65. package/lib/module/shared/providers/screen/animation/helpers/stack-progress.js.map +1 -0
  66. package/lib/module/shared/providers/screen/animation/helpers/use-build-transition-state.js +1 -0
  67. package/lib/module/shared/providers/screen/animation/helpers/use-build-transition-state.js.map +1 -1
  68. package/lib/module/shared/providers/screen/gestures/shared/policy.js +14 -5
  69. package/lib/module/shared/providers/screen/gestures/shared/policy.js.map +1 -1
  70. package/lib/module/shared/providers/screen/options/helpers.js +10 -5
  71. package/lib/module/shared/providers/screen/options/helpers.js.map +1 -1
  72. package/lib/module/shared/providers/screen/styles/helpers/resolve-slot-styles/index.js +95 -14
  73. package/lib/module/shared/providers/screen/styles/helpers/resolve-slot-styles/index.js.map +1 -1
  74. package/lib/module/shared/providers/screen/styles/helpers/resolve-slot-styles/materialize-slot.js +4 -1
  75. package/lib/module/shared/providers/screen/styles/helpers/resolve-slot-styles/materialize-slot.js.map +1 -1
  76. package/lib/module/shared/providers/screen/styles/helpers/resolve-slot-styles/types.js +2 -0
  77. package/lib/module/shared/providers/screen/styles/hooks/use-interpolated-style-maps.js +84 -28
  78. package/lib/module/shared/providers/screen/styles/hooks/use-interpolated-style-maps.js.map +1 -1
  79. package/lib/module/shared/providers/screen/styles/hooks/use-resolved-slot-style-map.js +5 -4
  80. package/lib/module/shared/providers/screen/styles/hooks/use-resolved-slot-style-map.js.map +1 -1
  81. package/lib/module/shared/providers/screen/styles/styles.provider.js +2 -2
  82. package/lib/module/shared/providers/screen/styles/styles.provider.js.map +1 -1
  83. package/lib/module/shared/providers/stack/direct.provider.js +1 -3
  84. package/lib/module/shared/providers/stack/direct.provider.js.map +1 -1
  85. package/lib/module/shared/providers/stack/helpers/use-stack-derived.js +2 -12
  86. package/lib/module/shared/providers/stack/helpers/use-stack-derived.js.map +1 -1
  87. package/lib/module/shared/providers/stack/managed.provider.js +1 -3
  88. package/lib/module/shared/providers/stack/managed.provider.js.map +1 -1
  89. package/lib/module/shared/stores/animation.store.js +5 -3
  90. package/lib/module/shared/stores/animation.store.js.map +1 -1
  91. package/lib/module/shared/stores/bounds/internals/links.js +18 -3
  92. package/lib/module/shared/stores/bounds/internals/links.js.map +1 -1
  93. package/lib/module/shared/types/animation.types.js +2 -1
  94. package/lib/module/shared/types/animation.types.js.map +1 -1
  95. package/lib/module/shared/utils/bounds/navigation/reveal/build.js +0 -2
  96. package/lib/module/shared/utils/bounds/navigation/reveal/build.js.map +1 -1
  97. package/lib/module/shared/utils/bounds/navigation/zoom/build.js +5 -2
  98. package/lib/module/shared/utils/bounds/navigation/zoom/build.js.map +1 -1
  99. package/lib/typescript/shared/components/screen-container/layers/content.d.ts.map +1 -1
  100. package/lib/typescript/shared/constants.d.ts +2 -1
  101. package/lib/typescript/shared/constants.d.ts.map +1 -1
  102. package/lib/typescript/shared/hooks/navigation/use-stack.d.ts +0 -1
  103. package/lib/typescript/shared/hooks/navigation/use-stack.d.ts.map +1 -1
  104. package/lib/typescript/shared/index.d.ts +12 -12
  105. package/lib/typescript/shared/providers/screen/animation/helpers/build-screen-transition-options.d.ts.map +1 -1
  106. package/lib/typescript/shared/providers/screen/animation/helpers/hydrate-transition-state/index.d.ts +2 -2
  107. package/lib/typescript/shared/providers/screen/animation/helpers/hydrate-transition-state/index.d.ts.map +1 -1
  108. package/lib/typescript/shared/providers/screen/animation/helpers/hydrate-transition-state/snap-points.d.ts +1 -1
  109. package/lib/typescript/shared/providers/screen/animation/helpers/hydrate-transition-state/snap-points.d.ts.map +1 -1
  110. package/lib/typescript/shared/providers/screen/animation/helpers/hydrate-transition-state/types.d.ts +1 -0
  111. package/lib/typescript/shared/providers/screen/animation/helpers/hydrate-transition-state/types.d.ts.map +1 -1
  112. package/lib/typescript/shared/providers/screen/animation/helpers/pipeline.d.ts.map +1 -1
  113. package/lib/typescript/shared/providers/screen/animation/helpers/selected-interpolator-options.d.ts.map +1 -1
  114. package/lib/typescript/shared/providers/screen/animation/helpers/stack-progress.d.ts +3 -0
  115. package/lib/typescript/shared/providers/screen/animation/helpers/stack-progress.d.ts.map +1 -0
  116. package/lib/typescript/shared/providers/screen/animation/helpers/use-build-transition-state.d.ts +1 -0
  117. package/lib/typescript/shared/providers/screen/animation/helpers/use-build-transition-state.d.ts.map +1 -1
  118. package/lib/typescript/shared/providers/screen/gestures/shared/policy.d.ts +4 -4
  119. package/lib/typescript/shared/providers/screen/gestures/shared/policy.d.ts.map +1 -1
  120. package/lib/typescript/shared/providers/screen/options/helpers.d.ts.map +1 -1
  121. package/lib/typescript/shared/providers/screen/options/types.d.ts +1 -1
  122. package/lib/typescript/shared/providers/screen/options/types.d.ts.map +1 -1
  123. package/lib/typescript/shared/providers/screen/styles/helpers/resolve-slot-styles/index.d.ts +4 -4
  124. package/lib/typescript/shared/providers/screen/styles/helpers/resolve-slot-styles/index.d.ts.map +1 -1
  125. package/lib/typescript/shared/providers/screen/styles/helpers/resolve-slot-styles/materialize-slot.d.ts.map +1 -1
  126. package/lib/typescript/shared/providers/screen/styles/helpers/resolve-slot-styles/types.d.ts +2 -0
  127. package/lib/typescript/shared/providers/screen/styles/helpers/resolve-slot-styles/types.d.ts.map +1 -1
  128. package/lib/typescript/shared/providers/screen/styles/hooks/use-interpolated-style-maps.d.ts +6 -6
  129. package/lib/typescript/shared/providers/screen/styles/hooks/use-interpolated-style-maps.d.ts.map +1 -1
  130. package/lib/typescript/shared/providers/screen/styles/hooks/use-resolved-slot-style-map.d.ts +3 -2
  131. package/lib/typescript/shared/providers/screen/styles/hooks/use-resolved-slot-style-map.d.ts.map +1 -1
  132. package/lib/typescript/shared/providers/stack/direct.provider.d.ts.map +1 -1
  133. package/lib/typescript/shared/providers/stack/helpers/use-stack-derived.d.ts +5 -5
  134. package/lib/typescript/shared/providers/stack/helpers/use-stack-derived.d.ts.map +1 -1
  135. package/lib/typescript/shared/providers/stack/managed.provider.d.ts.map +1 -1
  136. package/lib/typescript/shared/stores/animation.store.d.ts +4 -3
  137. package/lib/typescript/shared/stores/animation.store.d.ts.map +1 -1
  138. package/lib/typescript/shared/stores/bounds/internals/links.d.ts.map +1 -1
  139. package/lib/typescript/shared/types/animation.types.d.ts +4 -3
  140. package/lib/typescript/shared/types/animation.types.d.ts.map +1 -1
  141. package/lib/typescript/shared/types/index.d.ts +1 -1
  142. package/lib/typescript/shared/types/index.d.ts.map +1 -1
  143. package/lib/typescript/shared/types/screen.types.d.ts +9 -12
  144. package/lib/typescript/shared/types/screen.types.d.ts.map +1 -1
  145. package/lib/typescript/shared/utils/bounds/navigation/reveal/build.d.ts.map +1 -1
  146. package/lib/typescript/shared/utils/bounds/navigation/zoom/build.d.ts.map +1 -1
  147. package/package.json +1 -1
  148. package/src/shared/components/screen-container/layers/content.tsx +2 -21
  149. package/src/shared/constants.ts +6 -1
  150. package/src/shared/hooks/navigation/use-stack.tsx +0 -1
  151. package/src/shared/providers/screen/animation/helpers/build-screen-transition-options.ts +1 -2
  152. package/src/shared/providers/screen/animation/helpers/hydrate-transition-state/index.ts +16 -8
  153. package/src/shared/providers/screen/animation/helpers/hydrate-transition-state/snap-points.ts +2 -1
  154. package/src/shared/providers/screen/animation/helpers/hydrate-transition-state/types.ts +1 -0
  155. package/src/shared/providers/screen/animation/helpers/pipeline.ts +19 -5
  156. package/src/shared/providers/screen/animation/helpers/selected-interpolator-options.ts +0 -3
  157. package/src/shared/providers/screen/animation/helpers/stack-progress.ts +29 -0
  158. package/src/shared/providers/screen/animation/helpers/use-build-transition-state.ts +2 -0
  159. package/src/shared/providers/screen/gestures/shared/policy.ts +20 -7
  160. package/src/shared/providers/screen/options/helpers.ts +17 -13
  161. package/src/shared/providers/screen/options/types.ts +1 -1
  162. package/src/shared/providers/screen/styles/helpers/resolve-slot-styles/index.ts +140 -19
  163. package/src/shared/providers/screen/styles/helpers/resolve-slot-styles/materialize-slot.ts +5 -1
  164. package/src/shared/providers/screen/styles/helpers/resolve-slot-styles/types.ts +4 -0
  165. package/src/shared/providers/screen/styles/hooks/use-interpolated-style-maps.tsx +132 -44
  166. package/src/shared/providers/screen/styles/hooks/use-resolved-slot-style-map.tsx +7 -5
  167. package/src/shared/providers/screen/styles/styles.provider.tsx +2 -2
  168. package/src/shared/providers/stack/direct.provider.tsx +2 -12
  169. package/src/shared/providers/stack/helpers/use-stack-derived.ts +6 -15
  170. package/src/shared/providers/stack/managed.provider.tsx +1 -5
  171. package/src/shared/stores/animation.store.ts +6 -3
  172. package/src/shared/stores/bounds/internals/links.ts +27 -3
  173. package/src/shared/types/animation.types.ts +7 -3
  174. package/src/shared/types/index.ts +1 -0
  175. package/src/shared/types/screen.types.ts +9 -12
  176. package/src/shared/utils/bounds/navigation/reveal/build.ts +0 -2
  177. package/src/shared/utils/bounds/navigation/zoom/build.ts +6 -2
@@ -2,7 +2,7 @@
2
2
 
3
3
  import { shouldSlotInherit } from "../../constants";
4
4
  import { materializeResolvedSlot } from "./materialize-slot";
5
- import { getResolvedSlotState, hasDisappearedKeys } from "./slot-state";
5
+ import { getResolvedSlotState } from "./slot-state";
6
6
  const getForwardedSlot = (slot, hasAnyKeys) => {
7
7
  "worklet";
8
8
 
@@ -16,6 +16,27 @@ const hasEitherResetPatch = (hasStyleResetPatch, hasPropResetPatch) => {
16
16
 
17
17
  return hasStyleResetPatch || hasPropResetPatch;
18
18
  };
19
+ const hasDefinedBucketValue = value => {
20
+ "worklet";
21
+
22
+ return value !== undefined && value !== null;
23
+ };
24
+ const hasResettableDisappearedKeys = (previousKeys, previousResetValues, currentKeys) => {
25
+ "worklet";
26
+
27
+ if (!previousKeys || !previousResetValues) {
28
+ return false;
29
+ }
30
+ for (const key in previousKeys) {
31
+ if (currentKeys !== undefined && currentKeys[key] === true) {
32
+ continue;
33
+ }
34
+ if (previousResetValues[key] !== undefined) {
35
+ return true;
36
+ }
37
+ }
38
+ return false;
39
+ };
19
40
  const getResolvedSlotOutput = ({
20
41
  slot,
21
42
  previousState,
@@ -25,8 +46,8 @@ const getResolvedSlotOutput = ({
25
46
  "worklet";
26
47
 
27
48
  const state = getResolvedSlotState(slot);
28
- const hasStyleResetPatch = resetDroppedKeys && hasDisappearedKeys(previousState?.styleKeys, state.styleKeys);
29
- const hasPropResetPatch = resetDroppedKeys && hasDisappearedKeys(previousState?.propKeys, state.propKeys);
49
+ const hasStyleResetPatch = resetDroppedKeys && hasResettableDisappearedKeys(previousState?.styleKeys, previousState?.styleResetValues, state.styleKeys);
50
+ const hasPropResetPatch = resetDroppedKeys && hasResettableDisappearedKeys(previousState?.propKeys, previousState?.propResetValues, state.propKeys);
30
51
  const hasResetPatch = hasEitherResetPatch(hasStyleResetPatch, hasPropResetPatch);
31
52
  const nextState = state.nextState ?? (carryPreviousState ? previousState : undefined);
32
53
  if (!hasResetPatch) {
@@ -50,20 +71,72 @@ const getResolvedSlotOutput = ({
50
71
  nextState
51
72
  };
52
73
  };
74
+ const hasLocalStyleSource = context => {
75
+ "worklet";
76
+
77
+ return context.localStylesMaps.length > 0;
78
+ };
79
+ const hasLocalSlot = (context, slotId) => {
80
+ "worklet";
81
+
82
+ for (let index = 0; index < context.localStylesMaps.length; index++) {
83
+ if (context.localStylesMaps[index]?.[slotId] !== undefined) {
84
+ return true;
85
+ }
86
+ }
87
+ return false;
88
+ };
53
89
  const shouldDeferMissingLocalSlotReset = (context, slotId) => {
54
90
  "worklet";
55
91
 
56
92
  const canInherit = shouldSlotInherit(slotId);
57
- const hasCurrentSlot = context.currentStylesMap[slotId] !== undefined;
93
+ const localSlotExists = hasLocalSlot(context, slotId);
58
94
  const hasInheritedSlot = canInherit && context.ancestorStylesMap[slotId] !== undefined;
59
- return context.deferLocalSlotResets && !canInherit && !hasCurrentSlot && !hasInheritedSlot;
95
+ return context.deferLocalSlotResets && !hasLocalStyleSource(context) && !canInherit && !localSlotExists && !hasInheritedSlot;
96
+ };
97
+ const mergeBucket = (resolvedBucket, source) => {
98
+ "worklet";
99
+
100
+ if (!source) {
101
+ return resolvedBucket;
102
+ }
103
+ let nextBucket = resolvedBucket;
104
+ for (const key in source) {
105
+ const value = source[key];
106
+ if (!hasDefinedBucketValue(value)) {
107
+ continue;
108
+ }
109
+ nextBucket = nextBucket ?? {};
110
+ nextBucket[key] = value;
111
+ }
112
+ return nextBucket;
113
+ };
114
+ const getMergedLocalSlot = (context, slotId) => {
115
+ "worklet";
116
+
117
+ let mergedStyle;
118
+ let mergedProps;
119
+ for (let index = 0; index < context.localStylesMaps.length; index++) {
120
+ const slot = context.localStylesMaps[index]?.[slotId];
121
+ if (slot === undefined) {
122
+ continue;
123
+ }
124
+ mergedStyle = mergeBucket(mergedStyle, slot.style);
125
+ mergedProps = mergeBucket(mergedProps, slot.props);
126
+ }
127
+ if (!mergedStyle && !mergedProps) {
128
+ return undefined;
129
+ }
130
+ return {
131
+ style: mergedStyle,
132
+ props: mergedProps
133
+ };
60
134
  };
61
135
  const getSlotForId = (context, slotId) => {
62
136
  "worklet";
63
137
 
64
- const currentSlot = context.currentStylesMap[slotId];
65
- if (currentSlot !== undefined) {
66
- return currentSlot;
138
+ if (hasLocalSlot(context, slotId)) {
139
+ return getMergedLocalSlot(context, slotId);
67
140
  }
68
141
  if (shouldSlotInherit(slotId)) {
69
142
  return context.ancestorStylesMap[slotId];
@@ -219,14 +292,22 @@ const appendResolvedSlot = (context, slotId) => {
219
292
  const appendCurrentSlots = context => {
220
293
  "worklet";
221
294
 
222
- for (const slotId in context.currentStylesMap) {
223
- appendResolvedSlot(context, slotId);
295
+ const appendedSlotIds = {};
296
+ for (let index = 0; index < context.localStylesMaps.length; index++) {
297
+ const stylesMap = context.localStylesMaps[index];
298
+ for (const slotId in stylesMap) {
299
+ if (stylesMap[slotId] === undefined || appendedSlotIds[slotId]) {
300
+ continue;
301
+ }
302
+ appendedSlotIds[slotId] = true;
303
+ appendResolvedSlot(context, slotId);
304
+ }
224
305
  }
225
306
  };
226
307
  const shouldAppendInheritedSlot = (context, slotId) => {
227
308
  "worklet";
228
309
 
229
- return shouldSlotInherit(slotId) && context.currentStylesMap[slotId] === undefined;
310
+ return shouldSlotInherit(slotId) && !hasLocalSlot(context, slotId);
230
311
  };
231
312
  const appendInheritedSlots = context => {
232
313
  "worklet";
@@ -241,7 +322,7 @@ const shouldAppendPreviousSlot = (context, slotId) => {
241
322
  "worklet";
242
323
 
243
324
  const inheritedSlotExists = shouldSlotInherit(slotId) && context.ancestorStylesMap[slotId] !== undefined;
244
- return context.currentStylesMap[slotId] === undefined && !inheritedSlotExists;
325
+ return !hasLocalSlot(context, slotId) && !inheritedSlotExists;
245
326
  };
246
327
  const appendPreviousSlots = context => {
247
328
  "worklet";
@@ -260,7 +341,7 @@ const appendPreviousSlots = context => {
260
341
  * concrete identity values.
261
342
  */
262
343
  export const resolveSlotStyles = ({
263
- currentStylesMap,
344
+ localStylesMaps,
264
345
  ancestorStylesMap,
265
346
  previousStyleStatesBySlot,
266
347
  deferLocalSlotResets = false
@@ -270,7 +351,7 @@ export const resolveSlotStyles = ({
270
351
  const resolvedStylesMap = {};
271
352
  const nextPreviousStyleStatesBySlot = {};
272
353
  const context = {
273
- currentStylesMap,
354
+ localStylesMaps,
274
355
  ancestorStylesMap,
275
356
  previousStyleStatesBySlot,
276
357
  deferLocalSlotResets,
@@ -1 +1 @@
1
- {"version":3,"names":["shouldSlotInherit","materializeResolvedSlot","getResolvedSlotState","hasDisappearedKeys","getForwardedSlot","slot","hasAnyKeys","undefined","hasEitherResetPatch","hasStyleResetPatch","hasPropResetPatch","getResolvedSlotOutput","previousState","resetDroppedKeys","carryPreviousState","state","styleKeys","propKeys","hasResetPatch","nextState","resolvedSlot","baseStyle","baseProps","hasAnyStyleKeys","hasAnyPropKeys","shouldDeferMissingLocalSlotReset","context","slotId","canInherit","hasCurrentSlot","currentStylesMap","hasInheritedSlot","ancestorStylesMap","deferLocalSlotResets","getSlotForId","currentSlot","writeResolvedSlotOutput","nextPreviousStyleStatesBySlot","resolvedStylesMap","areTransformItemsEqual","left","right","leftObject","rightObject","key","areTransformArraysEqual","Array","isArray","length","i","areFlatObjectsEqual","leftValue","rightValue","areSlotsEqual","style","props","reuseEqualResolvedSlots","previousResolvedStylesMap","changed","stableStylesMap","nextSlot","previousSlot","appendResolvedSlot","shouldDeferReset","previousStyleStatesBySlot","appendCurrentSlots","shouldAppendInheritedSlot","appendInheritedSlots","shouldAppendPreviousSlot","inheritedSlotExists","appendPreviousSlots","resolveSlotStyles"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/styles/helpers/resolve-slot-styles/index.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["shouldSlotInherit","materializeResolvedSlot","getResolvedSlotState","getForwardedSlot","slot","hasAnyKeys","undefined","hasEitherResetPatch","hasStyleResetPatch","hasPropResetPatch","hasDefinedBucketValue","value","hasResettableDisappearedKeys","previousKeys","previousResetValues","currentKeys","key","getResolvedSlotOutput","previousState","resetDroppedKeys","carryPreviousState","state","styleKeys","styleResetValues","propKeys","propResetValues","hasResetPatch","nextState","resolvedSlot","baseStyle","baseProps","hasAnyStyleKeys","hasAnyPropKeys","hasLocalStyleSource","context","localStylesMaps","length","hasLocalSlot","slotId","index","shouldDeferMissingLocalSlotReset","canInherit","localSlotExists","hasInheritedSlot","ancestorStylesMap","deferLocalSlotResets","mergeBucket","resolvedBucket","source","nextBucket","getMergedLocalSlot","mergedStyle","mergedProps","style","props","getSlotForId","writeResolvedSlotOutput","nextPreviousStyleStatesBySlot","resolvedStylesMap","areTransformItemsEqual","left","right","leftObject","rightObject","areTransformArraysEqual","Array","isArray","i","areFlatObjectsEqual","leftValue","rightValue","areSlotsEqual","reuseEqualResolvedSlots","previousResolvedStylesMap","changed","stableStylesMap","nextSlot","previousSlot","appendResolvedSlot","shouldDeferReset","previousStyleStatesBySlot","appendCurrentSlots","appendedSlotIds","stylesMap","shouldAppendInheritedSlot","appendInheritedSlots","shouldAppendPreviousSlot","inheritedSlotExists","appendPreviousSlots","resolveSlotStyles"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/styles/helpers/resolve-slot-styles/index.ts"],"mappings":"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","ignoreList":[]}
@@ -23,7 +23,10 @@ const materializeResolvedBucket = ({
23
23
  continue;
24
24
  }
25
25
  const previousResetValue = previousResetValues?.[key];
26
- resolvedBucket[key] = previousResetValue !== undefined ? previousResetValue : resetValues?.[key];
26
+ const resetValue = previousResetValue !== undefined ? previousResetValue : resetValues?.[key];
27
+ if (resetValue !== undefined) {
28
+ resolvedBucket[key] = resetValue;
29
+ }
27
30
  }
28
31
  if (source) {
29
32
  for (const key in source) {
@@ -1 +1 @@
1
- {"version":3,"names":["PROP_RESET_VALUES","STYLE_RESET_VALUES","materializeResolvedBucket","source","previousKeys","previousResetValues","currentKeys","hasAnyKeys","hasResetPatch","resetValues","undefined","resolvedBucket","keysToReset","key","previousResetValue","value","materializeResolvedStyle","baseStyle","previousState","styleKeys","hasAnyStyleKeys","hasStyleResetPatch","styleResetValues","materializeResolvedProps","baseProps","propKeys","hasAnyPropKeys","hasPropResetPatch","propResetValues","materializeResolvedSlot","resolvedSlot","resolvedStyle","resolvedProps","style","props"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/styles/helpers/resolve-slot-styles/materialize-slot.ts"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["PROP_RESET_VALUES","STYLE_RESET_VALUES","materializeResolvedBucket","source","previousKeys","previousResetValues","currentKeys","hasAnyKeys","hasResetPatch","resetValues","undefined","resolvedBucket","keysToReset","key","previousResetValue","resetValue","value","materializeResolvedStyle","baseStyle","previousState","styleKeys","hasAnyStyleKeys","hasStyleResetPatch","styleResetValues","materializeResolvedProps","baseProps","propKeys","hasAnyPropKeys","hasPropResetPatch","propResetValues","materializeResolvedSlot","resolvedSlot","resolvedStyle","resolvedProps","style","props"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/styles/helpers/resolve-slot-styles/materialize-slot.ts"],"mappings":"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","ignoreList":[]}
@@ -1,2 +1,4 @@
1
1
  "use strict";
2
+
3
+ export {};
2
4
  //# sourceMappingURL=types.js.map
@@ -12,9 +12,58 @@ import { syncScreenOptionsOverrides, useScreenOptionsContext } from "../../optio
12
12
  import { normalizeSlots } from "../helpers/normalize-slots";
13
13
  import { preserveAnimatedPropsOnly } from "../helpers/preserve-animated-props-only";
14
14
  import { stripInterpolatorOptions } from "../helpers/strip-interpolator-options";
15
+ const NO_STYLE_LAYERS = [];
16
+ const normalizeRawStyleMap = (rawStyleMap, shouldDeferStyleBuckets) => {
17
+ "worklet";
18
+
19
+ if (!rawStyleMap) {
20
+ return NO_STYLES;
21
+ }
22
+ const stylesMap = normalizeSlots(stripInterpolatorOptions(rawStyleMap));
23
+ return shouldDeferStyleBuckets ? preserveAnimatedPropsOnly(stylesMap) : stylesMap;
24
+ };
25
+ const runInterpolator = ({
26
+ interpolator,
27
+ props,
28
+ progress,
29
+ next,
30
+ bounds,
31
+ shouldDeferStyleBuckets
32
+ }) => {
33
+ "worklet";
34
+
35
+ if (!interpolator) {
36
+ return undefined;
37
+ }
38
+ try {
39
+ const raw = interpolator({
40
+ ...props,
41
+ progress,
42
+ next,
43
+ bounds
44
+ });
45
+ const rawStyleMap = typeof raw === "object" && raw != null ? raw : undefined;
46
+ return {
47
+ rawStyleMap,
48
+ stylesMap: normalizeRawStyleMap(rawStyleMap, shouldDeferStyleBuckets)
49
+ };
50
+ } catch (_) {
51
+ if (__DEV__) {
52
+ logger.warn("screenStyleInterpolator must be a worklet");
53
+ }
54
+ return undefined;
55
+ }
56
+ };
57
+ const appendLayer = (layers, result) => {
58
+ "worklet";
59
+
60
+ if (result) {
61
+ layers.push(result.stylesMap);
62
+ }
63
+ };
15
64
 
16
65
  /**
17
- * Builds the raw interpolated styles map for the current screen pass.
66
+ * Builds the raw interpolated style layers for the current screen pass.
18
67
  *
19
68
  * This hook exists to stabilize style ownership during rapid navigation,
20
69
  * especially when an interactive close gesture overlaps with a new navigation
@@ -34,9 +83,9 @@ import { stripInterpolatorOptions } from "../helpers/strip-interpolator-options"
34
83
  * hidden window so animated props and runtime options stay warm, but defer style
35
84
  * buckets so measurement sees the final untransformed layout.
36
85
  *
37
- * The result stays as a single slot map. Resolution happens downstream, where
38
- * slot ids determine whether a slot may inherit from ancestors or must remain
39
- * local to the owning screen container.
86
+ * The result is ordered from lowest to highest priority. Resolution happens
87
+ * downstream, where slot ids determine whether slots inherit from ancestors and
88
+ * where higher owner layers override lower owner layers per key.
40
89
  */
41
90
  export const useInterpolatedStylesMap = () => {
42
91
  const {
@@ -90,38 +139,45 @@ export const useInterpolatedStylesMap = () => {
90
139
  }
91
140
  const isInGestureMode = !!isDragging || isGesturingDuringCloseAnimation.get();
92
141
  const interpolatorOptionsOwner = isInGestureMode || !nextInterpolator ? "current" : "next";
93
- const interpolator = interpolatorOptionsOwner === "current" ? currentInterpolator : nextInterpolator;
94
- if (!interpolator) {
95
- syncSelectedInterpolatorOptions(selectedInterpolatorOptions, "current");
96
- syncScreenOptionsOverrides(undefined, screenOptions);
97
- return NO_STYLES;
98
- }
99
142
  let effectiveProgress = progress;
100
143
  let effectiveNext = next;
101
144
  if (isInGestureMode) {
102
145
  effectiveProgress = current.progress;
103
146
  effectiveNext = undefined;
104
147
  }
105
- try {
106
- const raw = interpolator({
107
- ...props,
108
- progress: effectiveProgress,
109
- next: effectiveNext,
110
- bounds: boundsAccessor
111
- });
112
- const rawStyleMap = typeof raw === "object" && raw != null ? raw : undefined;
113
- syncSelectedInterpolatorOptions(selectedInterpolatorOptions, interpolatorOptionsOwner, rawStyleMap?.options);
114
- syncScreenOptionsOverrides(interpolatorOptionsOwner === "current" ? rawStyleMap : undefined, screenOptions);
115
- const stylesMap = !rawStyleMap ? NO_STYLES : normalizeSlots(stripInterpolatorOptions(rawStyleMap));
116
- return shouldDeferStyleBuckets ? preserveAnimatedPropsOnly(stylesMap) : stylesMap;
117
- } catch (_) {
118
- if (__DEV__) {
119
- logger.warn("screenStyleInterpolator must be a worklet");
148
+ const currentResult = runInterpolator({
149
+ interpolator: currentInterpolator,
150
+ props,
151
+ progress: effectiveProgress,
152
+ next: effectiveNext,
153
+ bounds: boundsAccessor,
154
+ shouldDeferStyleBuckets
155
+ });
156
+ if (interpolatorOptionsOwner === "current") {
157
+ syncSelectedInterpolatorOptions(selectedInterpolatorOptions, "current", currentResult?.rawStyleMap?.options);
158
+ syncScreenOptionsOverrides(currentResult?.rawStyleMap, screenOptions);
159
+ if (!currentResult) {
160
+ return NO_STYLE_LAYERS;
120
161
  }
121
- syncSelectedInterpolatorOptions(selectedInterpolatorOptions, "current");
122
- syncScreenOptionsOverrides(undefined, screenOptions);
123
- return NO_STYLES;
162
+ return [currentResult.stylesMap];
163
+ }
164
+ const nextResult = runInterpolator({
165
+ interpolator: nextInterpolator,
166
+ props,
167
+ progress: effectiveProgress,
168
+ next: effectiveNext,
169
+ bounds: boundsAccessor,
170
+ shouldDeferStyleBuckets
171
+ });
172
+ syncSelectedInterpolatorOptions(selectedInterpolatorOptions, "next", nextResult?.rawStyleMap?.options);
173
+ syncScreenOptionsOverrides(undefined, screenOptions);
174
+ const layers = [];
175
+ appendLayer(layers, currentResult);
176
+ appendLayer(layers, nextResult);
177
+ if (layers.length === 0) {
178
+ return NO_STYLE_LAYERS;
124
179
  }
180
+ return layers;
125
181
  });
126
182
  };
127
183
  //# sourceMappingURL=use-interpolated-style-maps.js.map
@@ -1 +1 @@
1
- {"version":3,"names":["useDerivedValue","useSharedValue","NO_STYLES","SystemStore","logger","useScreenAnimationContext","useBuildBoundsAccessor","syncSelectedInterpolatorOptions","useDescriptorDerivations","syncScreenOptionsOverrides","useScreenOptionsContext","normalizeSlots","preserveAnimatedPropsOnly","stripInterpolatorOptions","useInterpolatedStylesMap","currentScreenKey","screenOptions","screenInterpolatorProps","screenInterpolatorPropsRevision","selectedInterpolatorOptions","nextInterpolator","currentInterpolator","boundsAccessor","pendingLifecycleStartBlockCount","getValue","isGesturingDuringCloseAnimation","get","props","shouldDeferStyleBuckets","current","next","progress","isDragging","gesture","dragging","isNextClosing","closing","set","isInGestureMode","interpolatorOptionsOwner","interpolator","undefined","effectiveProgress","effectiveNext","raw","bounds","rawStyleMap","options","stylesMap","_","__DEV__","warn"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/hooks/use-interpolated-style-maps.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["useDerivedValue","useSharedValue","NO_STYLES","SystemStore","logger","useScreenAnimationContext","useBuildBoundsAccessor","syncSelectedInterpolatorOptions","useDescriptorDerivations","syncScreenOptionsOverrides","useScreenOptionsContext","normalizeSlots","preserveAnimatedPropsOnly","stripInterpolatorOptions","NO_STYLE_LAYERS","normalizeRawStyleMap","rawStyleMap","shouldDeferStyleBuckets","stylesMap","runInterpolator","interpolator","props","progress","next","bounds","undefined","raw","_","__DEV__","warn","appendLayer","layers","result","push","useInterpolatedStylesMap","currentScreenKey","screenOptions","screenInterpolatorProps","screenInterpolatorPropsRevision","selectedInterpolatorOptions","nextInterpolator","currentInterpolator","boundsAccessor","pendingLifecycleStartBlockCount","getValue","isGesturingDuringCloseAnimation","get","current","isDragging","gesture","dragging","isNextClosing","closing","set","isInGestureMode","interpolatorOptionsOwner","effectiveProgress","effectiveNext","currentResult","options","nextResult","length"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/hooks/use-interpolated-style-maps.tsx"],"mappings":"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","ignoreList":[]}
@@ -5,7 +5,7 @@ import { NO_STYLES } from "../../../../constants";
5
5
  import { useScreenAnimationContext } from "../../animation";
6
6
  import { resolveSlotStyles, reuseEqualResolvedSlots } from "../helpers/resolve-slot-styles";
7
7
  export const useResolvedStylesMap = ({
8
- currentStylesMap,
8
+ localStylesMaps,
9
9
  ancestorStylesMap
10
10
  }) => {
11
11
  const {
@@ -19,14 +19,15 @@ export const useResolvedStylesMap = ({
19
19
 
20
20
  screenInterpolatorPropsRevision.get();
21
21
  const props = screenInterpolatorProps.get();
22
- // Keep missing local slots alive while another route drives this screen.
23
- // Custom ids and keys from slots that still exist are still reset.
22
+ // Keep missing local slots alive only when another route drives this screen
23
+ // and no active local style layer is available. Once a current/next layer
24
+ // runs, omitted local slots and dropped keys are intentional reset signals.
24
25
  const deferLocalSlotResets = !props.focused && !props.current.closing;
25
26
  const {
26
27
  resolvedStylesMap,
27
28
  nextPreviousStyleStatesBySlot
28
29
  } = resolveSlotStyles({
29
- currentStylesMap: currentStylesMap.get(),
30
+ localStylesMaps: localStylesMaps.get(),
30
31
  ancestorStylesMap: ancestorStylesMap?.get() ?? NO_STYLES,
31
32
  previousStyleStatesBySlot: previousStyleStatesBySlot.get(),
32
33
  deferLocalSlotResets
@@ -1 +1 @@
1
- {"version":3,"names":["useDerivedValue","useSharedValue","NO_STYLES","useScreenAnimationContext","resolveSlotStyles","reuseEqualResolvedSlots","useResolvedStylesMap","currentStylesMap","ancestorStylesMap","screenInterpolatorProps","screenInterpolatorPropsRevision","previousStyleStatesBySlot","previousResolvedStylesMap","get","props","deferLocalSlotResets","focused","current","closing","resolvedStylesMap","nextPreviousStyleStatesBySlot","set","stableResolvedStylesMap"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/hooks/use-resolved-slot-style-map.tsx"],"mappings":";;AAAA,SAECA,eAAe,EACfC,cAAc,QACR,yBAAyB;AAChC,SAASC,SAAS,QAAQ,uBAAuB;AAEjD,SAASC,yBAAyB,QAAQ,iBAAiB;AAC3D,SAECC,iBAAiB,EACjBC,uBAAuB,QACjB,gCAAgC;AAOvC,OAAO,MAAMC,oBAAoB,GAAGA,CAAC;EACpCC,gBAAgB;EAChBC;AAC2B,CAAC,KAAK;EACjC,MAAM;IAAEC,uBAAuB;IAAEC;EAAgC,CAAC,GACjEP,yBAAyB,CAAC,CAAC;EAC5B,MAAMQ,yBAAyB,GAAGV,cAAc,CAC/C,CAAC,CACF,CAAC;EACD,MAAMW,yBAAyB,GAC9BX,cAAc,CAAwCC,SAAS,CAAC;EAEjE,OAAOF,eAAe,CAAC,MAAM;IAC5B,SAAS;;IACTU,+BAA+B,CAACG,GAAG,CAAC,CAAC;IAErC,MAAMC,KAAK,GAAGL,uBAAuB,CAACI,GAAG,CAAC,CAAC;IAC3C;IACA;IACA,MAAME,oBAAoB,GAAG,CAACD,KAAK,CAACE,OAAO,IAAI,CAACF,KAAK,CAACG,OAAO,CAACC,OAAO;IAErE,MAAM;MAAEC,iBAAiB;MAAEC;IAA8B,CAAC,GACzDhB,iBAAiB,CAAC;MACjBG,gBAAgB,EAAEA,gBAAgB,CAACM,GAAG,CAAC,CAAC;MACxCL,iBAAiB,EAAEA,iBAAiB,EAAEK,GAAG,CAAC,CAAC,IAAIX,SAAS;MACxDS,yBAAyB,EAAEA,yBAAyB,CAACE,GAAG,CAAC,CAAC;MAC1DE;IACD,CAAC,CAAC;IAEHJ,yBAAyB,CAACU,GAAG,CAACD,6BAA6B,CAAC;IAC5D,MAAME,uBAAuB,GAAGjB,uBAAuB,CAAC;MACvDc,iBAAiB;MACjBP,yBAAyB,EAAEA,yBAAyB,CAACC,GAAG,CAAC;IAC1D,CAAC,CAAC;IACFD,yBAAyB,CAACS,GAAG,CAACC,uBAAuB,CAAC;IAEtD,OAAOA,uBAAuB;EAC/B,CAAC,CAAC;AACH,CAAC","ignoreList":[]}
1
+ {"version":3,"names":["useDerivedValue","useSharedValue","NO_STYLES","useScreenAnimationContext","resolveSlotStyles","reuseEqualResolvedSlots","useResolvedStylesMap","localStylesMaps","ancestorStylesMap","screenInterpolatorProps","screenInterpolatorPropsRevision","previousStyleStatesBySlot","previousResolvedStylesMap","get","props","deferLocalSlotResets","focused","current","closing","resolvedStylesMap","nextPreviousStyleStatesBySlot","set","stableResolvedStylesMap"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/hooks/use-resolved-slot-style-map.tsx"],"mappings":";;AAAA,SAECA,eAAe,EACfC,cAAc,QACR,yBAAyB;AAChC,SAASC,SAAS,QAAQ,uBAAuB;AAEjD,SAASC,yBAAyB,QAAQ,iBAAiB;AAC3D,SAGCC,iBAAiB,EACjBC,uBAAuB,QACjB,gCAAgC;AAOvC,OAAO,MAAMC,oBAAoB,GAAGA,CAAC;EACpCC,eAAe;EACfC;AAC2B,CAAC,KAAK;EACjC,MAAM;IAAEC,uBAAuB;IAAEC;EAAgC,CAAC,GACjEP,yBAAyB,CAAC,CAAC;EAC5B,MAAMQ,yBAAyB,GAAGV,cAAc,CAC/C,CAAC,CACF,CAAC;EACD,MAAMW,yBAAyB,GAC9BX,cAAc,CAAwCC,SAAS,CAAC;EAEjE,OAAOF,eAAe,CAAC,MAAM;IAC5B,SAAS;;IACTU,+BAA+B,CAACG,GAAG,CAAC,CAAC;IAErC,MAAMC,KAAK,GAAGL,uBAAuB,CAACI,GAAG,CAAC,CAAC;IAC3C;IACA;IACA;IACA,MAAME,oBAAoB,GAAG,CAACD,KAAK,CAACE,OAAO,IAAI,CAACF,KAAK,CAACG,OAAO,CAACC,OAAO;IAErE,MAAM;MAAEC,iBAAiB;MAAEC;IAA8B,CAAC,GACzDhB,iBAAiB,CAAC;MACjBG,eAAe,EAAEA,eAAe,CAACM,GAAG,CAAC,CAAC;MACtCL,iBAAiB,EAAEA,iBAAiB,EAAEK,GAAG,CAAC,CAAC,IAAIX,SAAS;MACxDS,yBAAyB,EAAEA,yBAAyB,CAACE,GAAG,CAAC,CAAC;MAC1DE;IACD,CAAC,CAAC;IAEHJ,yBAAyB,CAACU,GAAG,CAACD,6BAA6B,CAAC;IAC5D,MAAME,uBAAuB,GAAGjB,uBAAuB,CAAC;MACvDc,iBAAiB;MACjBP,yBAAyB,EAAEA,yBAAyB,CAACC,GAAG,CAAC;IAC1D,CAAC,CAAC;IACFD,yBAAyB,CAACS,GAAG,CAACC,uBAAuB,CAAC;IAEtD,OAAOA,uBAAuB;EAC/B,CAAC,CAAC;AACH,CAAC","ignoreList":[]}
@@ -20,9 +20,9 @@ export const {
20
20
  isFloatingOverlay
21
21
  }) => {
22
22
  const parentContext = useContext(ScreenStylesContext);
23
- const rawStylesMap = useInterpolatedStylesMap();
23
+ const rawStylesMaps = useInterpolatedStylesMap();
24
24
  const stylesMap = useResolvedStylesMap({
25
- currentStylesMap: rawStylesMap,
25
+ localStylesMaps: rawStylesMaps,
26
26
  ancestorStylesMap: parentContext?.stylesMap
27
27
  });
28
28
  const {
@@ -1 +1 @@
1
- {"version":3,"names":["useContext","StyleSheet","Animated","createProvider","MaybeFloatingContainer","useInterpolatedStylesMap","useMaybeBlockVisibility","useResolvedStylesMap","jsx","_jsx","ScreenStylesProvider","ScreenStylesContext","useScreenStylesContext","useScreenStyles","guarded","children","isFloatingOverlay","parentContext","rawStylesMap","stylesMap","currentStylesMap","ancestorStylesMap","animatedStyle","animatedProps","value","View","style","styles","container","create","flex"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/styles/styles.provider.tsx"],"mappings":";;AAAA,SAAyBA,UAAU,QAAQ,OAAO;AAClD,SAASC,UAAU,QAAQ,cAAc;AACzC,OAAOC,QAAQ,MAA4B,yBAAyB;AAEpE,OAAOC,cAAc,MAAM,gCAAgC;AAC3D,SAASC,sBAAsB,QAAQ,uCAAuC;AAC9E,SAASC,wBAAwB,QAAQ,qCAAqC;AAC9E,SAASC,uBAAuB,QAAQ,oCAAoC;AAC5E,SAASC,oBAAoB,QAAQ,qCAAqC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAW3E,OAAO,MAAM;EACZC,oBAAoB;EACpBC,mBAAmB;EACnBC,sBAAsB,EAAEC;AACzB,CAAC,GAAGV,cAAc,CAAC,cAAc,EAAE;EAClCW,OAAO,EAAE;AACV,CAAC,CAAC,CAAkC,CAAC;EAAEC,QAAQ;EAAEC;AAAkB,CAAC,KAAK;EACxE,MAAMC,aAAa,GAAGjB,UAAU,CAACW,mBAAmB,CAAC;EAErD,MAAMO,YAAY,GAAGb,wBAAwB,CAAC,CAAC;EAE/C,MAAMc,SAAS,GAAGZ,oBAAoB,CAAC;IACtCa,gBAAgB,EAAEF,YAAY;IAC9BG,iBAAiB,EAAEJ,aAAa,EAAEE;EACnC,CAAC,CAAC;EAEF,MAAM;IAAEG,aAAa;IAAEC;EAAc,CAAC,GACrCjB,uBAAuB,CAACU,iBAAiB,CAAC;EAE3C,OAAO;IACNQ,KAAK,EAAE;MACNL;IACD,CAAC;IACDJ,QAAQ,eACPN,IAAA,CAACL,sBAAsB;MAACY,iBAAiB,EAAEA,iBAAkB;MAAAD,QAAA,eAC5DN,IAAA,CAACP,QAAQ,CAACuB,IAAI;QACbC,KAAK,EAAE,CAACC,MAAM,CAACC,SAAS,EAAEN,aAAa,CAAE;QACzCC,aAAa,EAAEA,aAAc;QAAAR,QAAA,EAE5BA;MAAQ,CACK;IAAC,CACO;EAE1B,CAAC;AACF,CAAC,CAAC;AAEF,MAAMY,MAAM,GAAG1B,UAAU,CAAC4B,MAAM,CAAC;EAChCD,SAAS,EAAE;IAAEE,IAAI,EAAE;EAAE;AACtB,CAAC,CAAC","ignoreList":[]}
1
+ {"version":3,"names":["useContext","StyleSheet","Animated","createProvider","MaybeFloatingContainer","useInterpolatedStylesMap","useMaybeBlockVisibility","useResolvedStylesMap","jsx","_jsx","ScreenStylesProvider","ScreenStylesContext","useScreenStylesContext","useScreenStyles","guarded","children","isFloatingOverlay","parentContext","rawStylesMaps","stylesMap","localStylesMaps","ancestorStylesMap","animatedStyle","animatedProps","value","View","style","styles","container","create","flex"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/styles/styles.provider.tsx"],"mappings":";;AAAA,SAAyBA,UAAU,QAAQ,OAAO;AAClD,SAASC,UAAU,QAAQ,cAAc;AACzC,OAAOC,QAAQ,MAA4B,yBAAyB;AAEpE,OAAOC,cAAc,MAAM,gCAAgC;AAC3D,SAASC,sBAAsB,QAAQ,uCAAuC;AAC9E,SAASC,wBAAwB,QAAQ,qCAAqC;AAC9E,SAASC,uBAAuB,QAAQ,oCAAoC;AAC5E,SAASC,oBAAoB,QAAQ,qCAAqC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAW3E,OAAO,MAAM;EACZC,oBAAoB;EACpBC,mBAAmB;EACnBC,sBAAsB,EAAEC;AACzB,CAAC,GAAGV,cAAc,CAAC,cAAc,EAAE;EAClCW,OAAO,EAAE;AACV,CAAC,CAAC,CAAkC,CAAC;EAAEC,QAAQ;EAAEC;AAAkB,CAAC,KAAK;EACxE,MAAMC,aAAa,GAAGjB,UAAU,CAACW,mBAAmB,CAAC;EAErD,MAAMO,aAAa,GAAGb,wBAAwB,CAAC,CAAC;EAEhD,MAAMc,SAAS,GAAGZ,oBAAoB,CAAC;IACtCa,eAAe,EAAEF,aAAa;IAC9BG,iBAAiB,EAAEJ,aAAa,EAAEE;EACnC,CAAC,CAAC;EAEF,MAAM;IAAEG,aAAa;IAAEC;EAAc,CAAC,GACrCjB,uBAAuB,CAACU,iBAAiB,CAAC;EAE3C,OAAO;IACNQ,KAAK,EAAE;MACNL;IACD,CAAC;IACDJ,QAAQ,eACPN,IAAA,CAACL,sBAAsB;MAACY,iBAAiB,EAAEA,iBAAkB;MAAAD,QAAA,eAC5DN,IAAA,CAACP,QAAQ,CAACuB,IAAI;QACbC,KAAK,EAAE,CAACC,MAAM,CAACC,SAAS,EAAEN,aAAa,CAAE;QACzCC,aAAa,EAAEA,aAAc;QAAAR,QAAA,EAE5BA;MAAQ,CACK;IAAC,CACO;EAE1B,CAAC;AACF,CAAC,CAAC;AAEF,MAAMY,MAAM,GAAG1B,UAAU,CAAC4B,MAAM,CAAC;EAChCD,SAAS,EAAE;IAAEE,IAAI,EAAE;EAAE;AACtB,CAAC,CAAC","ignoreList":[]}
@@ -66,7 +66,6 @@ function useDirectStackValue(props) {
66
66
  };
67
67
  }, [state.routes, state.preloadedRoutes, preloadedDescriptors, descriptors]);
68
68
  const {
69
- stackProgress,
70
69
  optimisticFocusedIndex
71
70
  } = useStackDerived(animationMaps);
72
71
  const focusedIndex = state.index;
@@ -76,9 +75,8 @@ function useDirectStackValue(props) {
76
75
  routeKeys,
77
76
  routes: allRoutes,
78
77
  scenes,
79
- stackProgress,
80
78
  optimisticFocusedIndex
81
- }), [flags, navigatorKey, routeKeys, allRoutes, scenes, stackProgress, optimisticFocusedIndex]);
79
+ }), [flags, navigatorKey, routeKeys, allRoutes, scenes, optimisticFocusedIndex]);
82
80
 
83
81
  // DirectStack context value
84
82
  const lifecycleValue = useMemo(() => ({
@@ -1 +1 @@
1
- {"version":3,"names":["useMemo","StackContext","AnimationStore","isOverlayVisible","useStackCoreContext","useStackDerived","jsx","_jsx","useDirectStackValue","props","state","navigation","descriptors","describe","flags","navigatorKey","key","preloadedDescriptors","preloadedRoutes","reduce","acc","route","scenes","shouldShowFloatOverlay","routeKeys","allRoutes","animationMaps","routes","concat","allDescriptors","descriptor","isPreloaded","undefined","push","getBag","options","enableTransitions","stackProgress","optimisticFocusedIndex","focusedIndex","index","stackContextValue","lifecycleValue","withDirectStack","Component","DirectStackProvider","Provider","value","children"],"sourceRoot":"../../../../../src","sources":["shared/providers/stack/direct.provider.tsx"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["useMemo","StackContext","AnimationStore","isOverlayVisible","useStackCoreContext","useStackDerived","jsx","_jsx","useDirectStackValue","props","state","navigation","descriptors","describe","flags","navigatorKey","key","preloadedDescriptors","preloadedRoutes","reduce","acc","route","scenes","shouldShowFloatOverlay","routeKeys","allRoutes","animationMaps","routes","concat","allDescriptors","descriptor","isPreloaded","undefined","push","getBag","options","enableTransitions","optimisticFocusedIndex","focusedIndex","index","stackContextValue","lifecycleValue","withDirectStack","Component","DirectStackProvider","Provider","value","children"],"sourceRoot":"../../../../../src","sources":["shared/providers/stack/direct.provider.tsx"],"mappings":"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","ignoreList":[]}
@@ -2,19 +2,10 @@
2
2
 
3
3
  import { useDerivedValue } from "react-native-reanimated";
4
4
  /**
5
- * Derives aggregated stack progress and an optimistic focused index
6
- * from animation store maps. Shared between managed and direct providers.
5
+ * Derives an optimistic focused index from animation store maps.
6
+ * Shared between managed and direct providers.
7
7
  */
8
8
  export function useStackDerived(animationMaps) {
9
- const stackProgress = useDerivedValue(() => {
10
- "worklet";
11
-
12
- let total = 0;
13
- for (let i = 0; i < animationMaps.length; i++) {
14
- total += animationMaps[i].progress.get();
15
- }
16
- return total;
17
- });
18
9
  const optimisticFocusedIndex = useDerivedValue(() => {
19
10
  "worklet";
20
11
 
@@ -26,7 +17,6 @@ export function useStackDerived(animationMaps) {
26
17
  return lastIndex - closingFromTop;
27
18
  });
28
19
  return {
29
- stackProgress,
30
20
  optimisticFocusedIndex
31
21
  };
32
22
  }
@@ -1 +1 @@
1
- {"version":3,"names":["useDerivedValue","useStackDerived","animationMaps","stackProgress","total","i","length","progress","get","optimisticFocusedIndex","lastIndex","closingFromTop","closing"],"sourceRoot":"../../../../../../src","sources":["shared/providers/stack/helpers/use-stack-derived.ts"],"mappings":";;AAAA,SAA4BA,eAAe,QAAQ,yBAAyB;AAc5E;AACA;AACA;AACA;AACA,OAAO,SAASC,eAAeA,CAC9BC,aAAkC,EACnB;EACf,MAAMC,aAAa,GAAGH,eAAe,CAAC,MAAM;IAC3C,SAAS;;IACT,IAAII,KAAK,GAAG,CAAC;IACb,KAAK,IAAIC,CAAC,GAAG,CAAC,EAAEA,CAAC,GAAGH,aAAa,CAACI,MAAM,EAAED,CAAC,EAAE,EAAE;MAC9CD,KAAK,IAAIF,aAAa,CAACG,CAAC,CAAC,CAACE,QAAQ,CAACC,GAAG,CAAC,CAAC;IACzC;IACA,OAAOJ,KAAK;EACb,CAAC,CAAC;EAEF,MAAMK,sBAAsB,GAAGT,eAAe,CAAC,MAAM;IACpD,SAAS;;IACT,MAAMU,SAAS,GAAGR,aAAa,CAACI,MAAM,GAAG,CAAC;IAC1C,IAAIK,cAAc,GAAG,CAAC;IACtB,KAAK,IAAIN,CAAC,GAAGK,SAAS,EAAEL,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;MACpC,IAAIH,aAAa,CAACG,CAAC,CAAC,CAACO,OAAO,CAACJ,GAAG,CAAC,CAAC,GAAG,CAAC,EAAEG,cAAc,EAAE,CAAC,KACpD;IACN;IACA,OAAOD,SAAS,GAAGC,cAAc;EAClC,CAAC,CAAC;EAEF,OAAO;IAAER,aAAa;IAAEM;EAAuB,CAAC;AACjD","ignoreList":[]}
1
+ {"version":3,"names":["useDerivedValue","useStackDerived","animationMaps","optimisticFocusedIndex","lastIndex","length","closingFromTop","i","closing","get"],"sourceRoot":"../../../../../../src","sources":["shared/providers/stack/helpers/use-stack-derived.ts"],"mappings":";;AAAA,SAA4BA,eAAe,QAAQ,yBAAyB;AAc5E;AACA;AACA;AACA;AACA,OAAO,SAASC,eAAeA,CAC9BC,aAAyC,EAC1B;EACf,MAAMC,sBAAsB,GAAGH,eAAe,CAAC,MAAM;IACpD,SAAS;;IACT,MAAMI,SAAS,GAAGF,aAAa,CAACG,MAAM,GAAG,CAAC;IAC1C,IAAIC,cAAc,GAAG,CAAC;IACtB,KAAK,IAAIC,CAAC,GAAGH,SAAS,EAAEG,CAAC,IAAI,CAAC,EAAEA,CAAC,EAAE,EAAE;MACpC,IAAIL,aAAa,CAACK,CAAC,CAAC,CAACC,OAAO,CAACC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAEH,cAAc,EAAE,CAAC,KACpD;IACN;IACA,OAAOF,SAAS,GAAGE,cAAc;EAClC,CAAC,CAAC;EAEF,OAAO;IAAEH;EAAuB,CAAC;AAClC","ignoreList":[]}
@@ -30,7 +30,6 @@ function useManagedStackValue(props) {
30
30
  const navigatorKey = props.state.key;
31
31
  const processed = useProcessedRoutes(state.routes, state.descriptors);
32
32
  const {
33
- stackProgress,
34
33
  optimisticFocusedIndex
35
34
  } = useStackDerived(processed.animationMaps);
36
35
  const closingRouteMap = useClosingRouteMap(processed.routeKeys, processed.animationMaps);
@@ -43,9 +42,8 @@ function useManagedStackValue(props) {
43
42
  routeKeys: processed.routeKeys,
44
43
  routes: state.routes,
45
44
  scenes: processed.scenes,
46
- stackProgress,
47
45
  optimisticFocusedIndex
48
- }), [flags, navigatorKey, processed.routeKeys, state.routes, processed.scenes, stackProgress, optimisticFocusedIndex]);
46
+ }), [flags, navigatorKey, processed.routeKeys, state.routes, processed.scenes, optimisticFocusedIndex]);
49
47
 
50
48
  // Managed-specific context (consumed by useManagedStackContext())
51
49
  const managedContextValue = useMemo(() => ({