react-native-screen-transitions 3.7.0-alpha.0 → 3.7.0-beta.1
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/shared/adapters/with-screen-transitions/index.js +0 -6
- package/lib/commonjs/shared/adapters/with-screen-transitions/index.js.map +1 -1
- package/lib/commonjs/shared/adapters/with-screen-transitions/options.js +22 -68
- package/lib/commonjs/shared/adapters/with-screen-transitions/options.js.map +1 -1
- package/lib/commonjs/shared/adapters/with-screen-transitions/stack-layout.js +1 -1
- package/lib/commonjs/shared/adapters/with-screen-transitions/stack-layout.js.map +1 -1
- package/lib/commonjs/shared/components/activity/helpers.js +1 -1
- package/lib/commonjs/shared/components/activity/helpers.js.map +1 -1
- package/lib/commonjs/shared/components/activity/variants/activity-screen.js +4 -3
- package/lib/commonjs/shared/components/activity/variants/activity-screen.js.map +1 -1
- package/lib/commonjs/shared/index.js.map +1 -1
- package/lib/commonjs/shared/providers/screen/styles/helpers/resolve-slot-styles/index.js +7 -28
- package/lib/commonjs/shared/providers/screen/styles/helpers/resolve-slot-styles/index.js.map +1 -1
- package/lib/commonjs/shared/providers/screen/styles/hooks/use-resolved-slot-style-map.js +2 -14
- package/lib/commonjs/shared/providers/screen/styles/hooks/use-resolved-slot-style-map.js.map +1 -1
- package/lib/commonjs/shared/providers/stack/helpers/managed-stack-state/helpers/build-managed-stack-state.js +5 -7
- package/lib/commonjs/shared/providers/stack/helpers/managed-stack-state/helpers/build-managed-stack-state.js.map +1 -1
- package/lib/commonjs/shared/providers/stack/helpers/managed-stack-state/helpers/derive-managed-stack-state.js +1 -5
- package/lib/commonjs/shared/providers/stack/helpers/managed-stack-state/helpers/derive-managed-stack-state.js.map +1 -1
- package/lib/commonjs/shared/providers/stack/helpers/managed-stack-state/helpers/helpers.js +12 -1
- package/lib/commonjs/shared/providers/stack/helpers/managed-stack-state/helpers/helpers.js.map +1 -1
- package/lib/commonjs/shared/providers/stack/helpers/managed-stack-state/helpers/reconcile-managed-routes.js +2 -7
- package/lib/commonjs/shared/providers/stack/helpers/managed-stack-state/helpers/reconcile-managed-routes.js.map +1 -1
- package/lib/commonjs/shared/providers/stack/helpers/managed-stack-state/managed-stack-controller.js +4 -4
- package/lib/commonjs/shared/providers/stack/helpers/managed-stack-state/managed-stack-controller.js.map +1 -1
- package/lib/commonjs/shared/utils/bounds/navigation/reveal/build.js +4 -4
- package/lib/commonjs/shared/utils/bounds/navigation/reveal/build.js.map +1 -1
- package/lib/commonjs/shared/utils/bounds/navigation/reveal/config.js +2 -1
- package/lib/commonjs/shared/utils/bounds/navigation/reveal/config.js.map +1 -1
- package/lib/module/shared/adapters/with-screen-transitions/index.js +0 -1
- package/lib/module/shared/adapters/with-screen-transitions/index.js.map +1 -1
- package/lib/module/shared/adapters/with-screen-transitions/options.js +21 -67
- package/lib/module/shared/adapters/with-screen-transitions/options.js.map +1 -1
- package/lib/module/shared/adapters/with-screen-transitions/stack-layout.js +2 -2
- package/lib/module/shared/adapters/with-screen-transitions/stack-layout.js.map +1 -1
- package/lib/module/shared/components/activity/helpers.js +1 -1
- package/lib/module/shared/components/activity/helpers.js.map +1 -1
- package/lib/module/shared/components/activity/variants/activity-screen.js +4 -3
- package/lib/module/shared/components/activity/variants/activity-screen.js.map +1 -1
- package/lib/module/shared/index.js.map +1 -1
- package/lib/module/shared/providers/screen/styles/helpers/resolve-slot-styles/index.js +7 -28
- package/lib/module/shared/providers/screen/styles/helpers/resolve-slot-styles/index.js.map +1 -1
- package/lib/module/shared/providers/screen/styles/hooks/use-resolved-slot-style-map.js +3 -15
- package/lib/module/shared/providers/screen/styles/hooks/use-resolved-slot-style-map.js.map +1 -1
- package/lib/module/shared/providers/stack/helpers/managed-stack-state/helpers/build-managed-stack-state.js +6 -8
- package/lib/module/shared/providers/stack/helpers/managed-stack-state/helpers/build-managed-stack-state.js.map +1 -1
- package/lib/module/shared/providers/stack/helpers/managed-stack-state/helpers/derive-managed-stack-state.js +2 -6
- package/lib/module/shared/providers/stack/helpers/managed-stack-state/helpers/derive-managed-stack-state.js.map +1 -1
- package/lib/module/shared/providers/stack/helpers/managed-stack-state/helpers/helpers.js +9 -0
- package/lib/module/shared/providers/stack/helpers/managed-stack-state/helpers/helpers.js.map +1 -1
- package/lib/module/shared/providers/stack/helpers/managed-stack-state/helpers/reconcile-managed-routes.js +2 -7
- package/lib/module/shared/providers/stack/helpers/managed-stack-state/helpers/reconcile-managed-routes.js.map +1 -1
- package/lib/module/shared/providers/stack/helpers/managed-stack-state/managed-stack-controller.js +4 -4
- package/lib/module/shared/providers/stack/helpers/managed-stack-state/managed-stack-controller.js.map +1 -1
- package/lib/module/shared/utils/bounds/navigation/reveal/build.js +5 -5
- package/lib/module/shared/utils/bounds/navigation/reveal/build.js.map +1 -1
- package/lib/module/shared/utils/bounds/navigation/reveal/config.js +1 -0
- package/lib/module/shared/utils/bounds/navigation/reveal/config.js.map +1 -1
- package/lib/typescript/blank-stack/types.d.ts +10 -9
- package/lib/typescript/blank-stack/types.d.ts.map +1 -1
- package/lib/typescript/shared/adapters/with-screen-transitions/index.d.ts +1 -2
- package/lib/typescript/shared/adapters/with-screen-transitions/index.d.ts.map +1 -1
- package/lib/typescript/shared/adapters/with-screen-transitions/options.d.ts +3 -10
- package/lib/typescript/shared/adapters/with-screen-transitions/options.d.ts.map +1 -1
- package/lib/typescript/shared/components/activity/helpers.d.ts.map +1 -1
- package/lib/typescript/shared/components/activity/variants/activity-screen.d.ts.map +1 -1
- package/lib/typescript/shared/index.d.ts +1 -1
- package/lib/typescript/shared/index.d.ts.map +1 -1
- package/lib/typescript/shared/providers/screen/styles/helpers/resolve-slot-styles/index.d.ts +1 -2
- package/lib/typescript/shared/providers/screen/styles/helpers/resolve-slot-styles/index.d.ts.map +1 -1
- package/lib/typescript/shared/providers/screen/styles/hooks/use-resolved-slot-style-map.d.ts.map +1 -1
- package/lib/typescript/shared/providers/stack/helpers/managed-stack-state/helpers/build-managed-stack-state.d.ts.map +1 -1
- package/lib/typescript/shared/providers/stack/helpers/managed-stack-state/helpers/derive-managed-stack-state.d.ts.map +1 -1
- package/lib/typescript/shared/providers/stack/helpers/managed-stack-state/helpers/helpers.d.ts +2 -0
- package/lib/typescript/shared/providers/stack/helpers/managed-stack-state/helpers/helpers.d.ts.map +1 -1
- package/lib/typescript/shared/providers/stack/helpers/managed-stack-state/helpers/reconcile-managed-routes.d.ts.map +1 -1
- package/lib/typescript/shared/types/bounds.types.d.ts +19 -0
- package/lib/typescript/shared/types/bounds.types.d.ts.map +1 -1
- package/lib/typescript/shared/types/screen.types.d.ts +15 -14
- package/lib/typescript/shared/types/screen.types.d.ts.map +1 -1
- package/lib/typescript/shared/utils/bounds/navigation/reveal/build.d.ts.map +1 -1
- package/lib/typescript/shared/utils/bounds/navigation/reveal/config.d.ts +1 -0
- package/lib/typescript/shared/utils/bounds/navigation/reveal/config.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/blank-stack/types.ts +10 -9
- package/src/shared/adapters/with-screen-transitions/index.tsx +1 -6
- package/src/shared/adapters/with-screen-transitions/options.ts +38 -109
- package/src/shared/adapters/with-screen-transitions/stack-layout.tsx +5 -5
- package/src/shared/components/activity/helpers.ts +1 -1
- package/src/shared/components/activity/variants/activity-screen.tsx +4 -3
- package/src/shared/index.ts +1 -5
- package/src/shared/providers/screen/styles/helpers/resolve-slot-styles/index.ts +12 -53
- package/src/shared/providers/screen/styles/hooks/use-resolved-slot-style-map.tsx +3 -16
- package/src/shared/providers/stack/helpers/managed-stack-state/helpers/build-managed-stack-state.ts +9 -12
- package/src/shared/providers/stack/helpers/managed-stack-state/helpers/derive-managed-stack-state.ts +2 -10
- package/src/shared/providers/stack/helpers/managed-stack-state/helpers/helpers.ts +19 -0
- package/src/shared/providers/stack/helpers/managed-stack-state/helpers/reconcile-managed-routes.ts +2 -12
- package/src/shared/providers/stack/helpers/managed-stack-state/managed-stack-controller.ts +4 -4
- package/src/shared/types/bounds.types.ts +19 -0
- package/src/shared/types/screen.types.ts +15 -14
- package/src/shared/utils/bounds/navigation/reveal/build.ts +10 -6
- package/src/shared/utils/bounds/navigation/reveal/config.ts +1 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["FlatList","Pressable","ScrollView","View","withScreenTransitions","Boundary","createBoundaryComponent","createTransitionAwareComponent","MaskedView","Presets","Specs","isScrollable","snapTo","NAVIGATION_MASK_CONTAINER_STYLE_ID","NAVIGATION_MASK_ELEMENT_STYLE_ID","TRANSFORM_RESET","useHistory","useScreenState","useScreenAnimation","useScreenGesture"],"sourceRoot":"../../../src","sources":["shared/index.ts"],"mappings":";;AAAA,SAASA,QAAQ,EAAEC,SAAS,EAAEC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AACpE,SAASC,qBAAqB,QAAQ,oCAAoC;AAC1E,SACCC,QAAQ,EACRC,uBAAuB,QACjB,wCAAwC;AAC/C,SAASC,8BAA8B,QAAQ,gDAAgD;AAC/F,OAAOC,UAAU,MAAM,uCAAuC;AAC9D,SAASC,OAAO,EAAEC,KAAK,QAAQ,WAAW;AAE1C,eAAe;EACdH,8BAA8B;EAC9BD,uBAAuB;EACvBF,qBAAqB;EACrBC,QAAQ;EACRF,IAAI,EAAEI,8BAA8B,CAACJ,IAAI,CAAC;EAC1CF,SAAS,EAAEM,8BAA8B,CAACN,SAAS,CAAC;EACpDC,UAAU,EAAEK,8BAA8B,CAACL,UAAU,EAAE;IACtDS,YAAY,EAAE;EACf,CAAC,CAAC;EACFX,QAAQ,EAAEO,8BAA8B,CAACP,QAAQ,EAAE;IAClDW,YAAY,EAAE;EACf,CAAC,CAAC;EACFH,UAAU,EAAEA,UAAU;EACtBC,OAAO;EACPC;AACD,CAAC;
|
|
1
|
+
{"version":3,"names":["FlatList","Pressable","ScrollView","View","withScreenTransitions","Boundary","createBoundaryComponent","createTransitionAwareComponent","MaskedView","Presets","Specs","isScrollable","snapTo","NAVIGATION_MASK_CONTAINER_STYLE_ID","NAVIGATION_MASK_ELEMENT_STYLE_ID","TRANSFORM_RESET","useHistory","useScreenState","useScreenAnimation","useScreenGesture"],"sourceRoot":"../../../src","sources":["shared/index.ts"],"mappings":";;AAAA,SAASA,QAAQ,EAAEC,SAAS,EAAEC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AACpE,SAASC,qBAAqB,QAAQ,oCAAoC;AAC1E,SACCC,QAAQ,EACRC,uBAAuB,QACjB,wCAAwC;AAC/C,SAASC,8BAA8B,QAAQ,gDAAgD;AAC/F,OAAOC,UAAU,MAAM,uCAAuC;AAC9D,SAASC,OAAO,EAAEC,KAAK,QAAQ,WAAW;AAE1C,eAAe;EACdH,8BAA8B;EAC9BD,uBAAuB;EACvBF,qBAAqB;EACrBC,QAAQ;EACRF,IAAI,EAAEI,8BAA8B,CAACJ,IAAI,CAAC;EAC1CF,SAAS,EAAEM,8BAA8B,CAACN,SAAS,CAAC;EACpDC,UAAU,EAAEK,8BAA8B,CAACL,UAAU,EAAE;IACtDS,YAAY,EAAE;EACf,CAAC,CAAC;EACFX,QAAQ,EAAEO,8BAA8B,CAACP,QAAQ,EAAE;IAClDW,YAAY,EAAE;EACf,CAAC,CAAC;EACFH,UAAU,EAAEA,UAAU;EACtBC,OAAO;EACPC;AACD,CAAC;AAGD,SAASN,qBAAqB,QAAQ,oCAAoC;AAC1E,SAASQ,MAAM,QAAQ,qBAAqB;AAC5C,SACCC,kCAAkC,EAClCC,gCAAgC,EAChCC,eAAe,QACT,aAAa;AACpB,SAASC,UAAU,QAAQ,gCAAgC;AAC3D,SAECC,cAAc,QACR,qCAAqC;AAC5C,SAECC,kBAAkB,QACZ,8BAA8B;AACrC,SAECC,gBAAgB,QACV,sDAAsD","ignoreList":[]}
|
|
@@ -39,21 +39,18 @@ const hasResettableDisappearedKeys = (previousKeys, previousResetValues, current
|
|
|
39
39
|
};
|
|
40
40
|
const getResolvedSlotOutput = ({
|
|
41
41
|
slot,
|
|
42
|
-
previousState
|
|
43
|
-
resetDroppedKeys,
|
|
44
|
-
carryPreviousState
|
|
42
|
+
previousState
|
|
45
43
|
}) => {
|
|
46
44
|
"worklet";
|
|
47
45
|
|
|
48
46
|
const state = getResolvedSlotState(slot);
|
|
49
|
-
const hasStyleResetPatch =
|
|
50
|
-
const hasPropResetPatch =
|
|
47
|
+
const hasStyleResetPatch = hasResettableDisappearedKeys(previousState?.styleKeys, previousState?.styleResetValues, state.styleKeys);
|
|
48
|
+
const hasPropResetPatch = hasResettableDisappearedKeys(previousState?.propKeys, previousState?.propResetValues, state.propKeys);
|
|
51
49
|
const hasResetPatch = hasEitherResetPatch(hasStyleResetPatch, hasPropResetPatch);
|
|
52
|
-
const nextState = state.nextState ?? (carryPreviousState ? previousState : undefined);
|
|
53
50
|
if (!hasResetPatch) {
|
|
54
51
|
return {
|
|
55
52
|
resolvedSlot: getForwardedSlot(slot, state.hasAnyKeys),
|
|
56
|
-
nextState
|
|
53
|
+
nextState: state.nextState
|
|
57
54
|
};
|
|
58
55
|
}
|
|
59
56
|
return {
|
|
@@ -68,14 +65,9 @@ const getResolvedSlotOutput = ({
|
|
|
68
65
|
hasStyleResetPatch,
|
|
69
66
|
hasPropResetPatch
|
|
70
67
|
}),
|
|
71
|
-
nextState
|
|
68
|
+
nextState: state.nextState
|
|
72
69
|
};
|
|
73
70
|
};
|
|
74
|
-
const hasLocalStyleSource = context => {
|
|
75
|
-
"worklet";
|
|
76
|
-
|
|
77
|
-
return context.localStylesMaps.length > 0;
|
|
78
|
-
};
|
|
79
71
|
const hasLocalSlot = (context, slotId) => {
|
|
80
72
|
"worklet";
|
|
81
73
|
|
|
@@ -86,14 +78,6 @@ const hasLocalSlot = (context, slotId) => {
|
|
|
86
78
|
}
|
|
87
79
|
return false;
|
|
88
80
|
};
|
|
89
|
-
const shouldDeferMissingLocalSlotReset = (context, slotId) => {
|
|
90
|
-
"worklet";
|
|
91
|
-
|
|
92
|
-
const canInherit = shouldSlotInherit(slotId);
|
|
93
|
-
const localSlotExists = hasLocalSlot(context, slotId);
|
|
94
|
-
const hasInheritedSlot = canInherit && context.ancestorStylesMap[slotId] !== undefined;
|
|
95
|
-
return context.deferLocalSlotResets && !hasLocalStyleSource(context) && !canInherit && !localSlotExists && !hasInheritedSlot;
|
|
96
|
-
};
|
|
97
81
|
const mergeBucket = (resolvedBucket, source) => {
|
|
98
82
|
"worklet";
|
|
99
83
|
|
|
@@ -272,15 +256,12 @@ export const reuseEqualResolvedSlots = ({
|
|
|
272
256
|
const appendResolvedSlot = (context, slotId) => {
|
|
273
257
|
"worklet";
|
|
274
258
|
|
|
275
|
-
const shouldDeferReset = shouldDeferMissingLocalSlotReset(context, slotId);
|
|
276
259
|
const {
|
|
277
260
|
resolvedSlot,
|
|
278
261
|
nextState
|
|
279
262
|
} = getResolvedSlotOutput({
|
|
280
263
|
slot: getSlotForId(context, slotId),
|
|
281
|
-
previousState: context.previousStyleStatesBySlot[slotId]
|
|
282
|
-
resetDroppedKeys: !shouldDeferReset,
|
|
283
|
-
carryPreviousState: shouldDeferReset
|
|
264
|
+
previousState: context.previousStyleStatesBySlot[slotId]
|
|
284
265
|
});
|
|
285
266
|
writeResolvedSlotOutput({
|
|
286
267
|
context,
|
|
@@ -343,8 +324,7 @@ const appendPreviousSlots = context => {
|
|
|
343
324
|
export const resolveSlotStyles = ({
|
|
344
325
|
localStylesMaps,
|
|
345
326
|
ancestorStylesMap,
|
|
346
|
-
previousStyleStatesBySlot
|
|
347
|
-
deferLocalSlotResets = false
|
|
327
|
+
previousStyleStatesBySlot
|
|
348
328
|
}) => {
|
|
349
329
|
"worklet";
|
|
350
330
|
|
|
@@ -354,7 +334,6 @@ export const resolveSlotStyles = ({
|
|
|
354
334
|
localStylesMaps,
|
|
355
335
|
ancestorStylesMap,
|
|
356
336
|
previousStyleStatesBySlot,
|
|
357
|
-
deferLocalSlotResets,
|
|
358
337
|
resolvedStylesMap,
|
|
359
338
|
nextPreviousStyleStatesBySlot
|
|
360
339
|
};
|
|
@@ -1 +1 @@
|
|
|
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":[]}
|
|
1
|
+
{"version":3,"names":["shouldSlotInherit","materializeResolvedSlot","getResolvedSlotState","getForwardedSlot","slot","hasAnyKeys","undefined","hasEitherResetPatch","hasStyleResetPatch","hasPropResetPatch","hasDefinedBucketValue","value","hasResettableDisappearedKeys","previousKeys","previousResetValues","currentKeys","key","getResolvedSlotOutput","previousState","state","styleKeys","styleResetValues","propKeys","propResetValues","hasResetPatch","resolvedSlot","nextState","baseStyle","baseProps","hasAnyStyleKeys","hasAnyPropKeys","hasLocalSlot","context","slotId","index","localStylesMaps","length","mergeBucket","resolvedBucket","source","nextBucket","getMergedLocalSlot","mergedStyle","mergedProps","style","props","getSlotForId","ancestorStylesMap","writeResolvedSlotOutput","nextPreviousStyleStatesBySlot","resolvedStylesMap","areTransformItemsEqual","left","right","leftObject","rightObject","areTransformArraysEqual","Array","isArray","i","areFlatObjectsEqual","leftValue","rightValue","areSlotsEqual","reuseEqualResolvedSlots","previousResolvedStylesMap","changed","stableStylesMap","nextSlot","previousSlot","appendResolvedSlot","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":[]}
|
|
@@ -1,36 +1,24 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import { useDerivedValue, useSharedValue } from "react-native-reanimated";
|
|
4
|
-
import { NO_STYLES } from "../../../../constants";
|
|
5
|
-
import { useScreenAnimationContext } from "../../animation";
|
|
4
|
+
import { NO_PROPS, NO_STYLES } from "../../../../constants";
|
|
6
5
|
import { resolveSlotStyles, reuseEqualResolvedSlots } from "../helpers/resolve-slot-styles";
|
|
7
6
|
export const useResolvedStylesMap = ({
|
|
8
7
|
localStylesMaps,
|
|
9
8
|
ancestorStylesMap
|
|
10
9
|
}) => {
|
|
11
|
-
const
|
|
12
|
-
screenInterpolatorProps,
|
|
13
|
-
screenInterpolatorPropsRevision
|
|
14
|
-
} = useScreenAnimationContext();
|
|
15
|
-
const previousStyleStatesBySlot = useSharedValue({});
|
|
10
|
+
const previousStyleStatesBySlot = useSharedValue(NO_PROPS);
|
|
16
11
|
const previousResolvedStylesMap = useSharedValue(NO_STYLES);
|
|
17
12
|
return useDerivedValue(() => {
|
|
18
13
|
"worklet";
|
|
19
14
|
|
|
20
|
-
screenInterpolatorPropsRevision.get();
|
|
21
|
-
const props = screenInterpolatorProps.get();
|
|
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.
|
|
25
|
-
const deferLocalSlotResets = !props.focused && !props.current.closing;
|
|
26
15
|
const {
|
|
27
16
|
resolvedStylesMap,
|
|
28
17
|
nextPreviousStyleStatesBySlot
|
|
29
18
|
} = resolveSlotStyles({
|
|
30
19
|
localStylesMaps: localStylesMaps.get(),
|
|
31
20
|
ancestorStylesMap: ancestorStylesMap?.get() ?? NO_STYLES,
|
|
32
|
-
previousStyleStatesBySlot: previousStyleStatesBySlot.get()
|
|
33
|
-
deferLocalSlotResets
|
|
21
|
+
previousStyleStatesBySlot: previousStyleStatesBySlot.get()
|
|
34
22
|
});
|
|
35
23
|
previousStyleStatesBySlot.set(nextPreviousStyleStatesBySlot);
|
|
36
24
|
const stableResolvedStylesMap = reuseEqualResolvedSlots({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useDerivedValue","useSharedValue","
|
|
1
|
+
{"version":3,"names":["useDerivedValue","useSharedValue","NO_PROPS","NO_STYLES","resolveSlotStyles","reuseEqualResolvedSlots","useResolvedStylesMap","localStylesMaps","ancestorStylesMap","previousStyleStatesBySlot","previousResolvedStylesMap","resolvedStylesMap","nextPreviousStyleStatesBySlot","get","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,QAAQ,EAAEC,SAAS,QAAQ,uBAAuB;AAE3D,SAGCC,iBAAiB,EACjBC,uBAAuB,QACjB,gCAAgC;AAOvC,OAAO,MAAMC,oBAAoB,GAAGA,CAAC;EACpCC,eAAe;EACfC;AAC2B,CAAC,KAAK;EACjC,MAAMC,yBAAyB,GAC9BR,cAAc,CAA8BC,QAAQ,CAAC;EACtD,MAAMQ,yBAAyB,GAC9BT,cAAc,CAAwCE,SAAS,CAAC;EAEjE,OAAOH,eAAe,CAAC,MAAM;IAC5B,SAAS;;IACT,MAAM;MAAEW,iBAAiB;MAAEC;IAA8B,CAAC,GACzDR,iBAAiB,CAAC;MACjBG,eAAe,EAAEA,eAAe,CAACM,GAAG,CAAC,CAAC;MACtCL,iBAAiB,EAAEA,iBAAiB,EAAEK,GAAG,CAAC,CAAC,IAAIV,SAAS;MACxDM,yBAAyB,EAAEA,yBAAyB,CAACI,GAAG,CAAC;IAC1D,CAAC,CAAC;IAEHJ,yBAAyB,CAACK,GAAG,CAACF,6BAA6B,CAAC;IAC5D,MAAMG,uBAAuB,GAAGV,uBAAuB,CAAC;MACvDM,iBAAiB;MACjBD,yBAAyB,EAAEA,yBAAyB,CAACG,GAAG,CAAC;IAC1D,CAAC,CAAC;IACFH,yBAAyB,CAACI,GAAG,CAACC,uBAAuB,CAAC;IAEtD,OAAOA,uBAAuB;EAC/B,CAAC,CAAC;AACH,CAAC","ignoreList":[]}
|
|
@@ -2,12 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
import { resolveSceneNeighbors } from "../../../../../utils/navigation/resolve-scene-neighbors";
|
|
4
4
|
import { isOverlayVisible } from "../../../../../utils/overlay/visibility";
|
|
5
|
-
import { areDescriptorSourcesEquivalent, areDescriptorsEqual, areRouteChildStateMapsEqual, getRouteChildState, setsAreEqual } from "./helpers";
|
|
6
|
-
const areRouteKeysEqual = (a, b) => {
|
|
7
|
-
if (a === b) return true;
|
|
8
|
-
if (a.length !== b.length) return false;
|
|
9
|
-
return a.every((key, index) => key === b[index]);
|
|
10
|
-
};
|
|
5
|
+
import { areDescriptorSourcesEquivalent, areDescriptorsEqual, areRouteChildStateMapsEqual, getRouteChildState, routeKeyListsAreEqual, setsAreEqual } from "./helpers";
|
|
11
6
|
const resolveStableDescriptorSource = ({
|
|
12
7
|
routeKey,
|
|
13
8
|
sourceDescriptor,
|
|
@@ -46,7 +41,10 @@ const getSceneActivityWindow = ({
|
|
|
46
41
|
closingRouteKeys
|
|
47
42
|
}) => {
|
|
48
43
|
const focusedRouteKey = props.state.routes[props.state.index]?.key;
|
|
49
|
-
let focusedIndex =
|
|
44
|
+
let focusedIndex = routes.findIndex(route => route.key === focusedRouteKey);
|
|
45
|
+
if (focusedIndex === -1) {
|
|
46
|
+
throw new Error(`Focused route "${focusedRouteKey}" is missing from routes`);
|
|
47
|
+
}
|
|
50
48
|
while (focusedIndex > 0 && closingRouteKeys.has(routes[focusedIndex]?.key)) {
|
|
51
49
|
focusedIndex--;
|
|
52
50
|
}
|
|
@@ -186,7 +184,7 @@ export const buildManagedStackState = params => {
|
|
|
186
184
|
focusedRouteKey,
|
|
187
185
|
routeChildStates: params.previousState && areRouteChildStateMapsEqual(params.previousState.routeChildStates, routeChildStates) ? params.previousState.routeChildStates : routeChildStates,
|
|
188
186
|
scenes,
|
|
189
|
-
routeKeys: params.previousState &&
|
|
187
|
+
routeKeys: params.previousState && routeKeyListsAreEqual(params.previousState.routeKeys, routeKeys) ? params.previousState.routeKeys : routeKeys,
|
|
190
188
|
shouldShowFloatOverlay,
|
|
191
189
|
closingRouteKeys: params.previousState && setsAreEqual(params.previousState.closingRouteKeys, closingRouteKeys) ? params.previousState.closingRouteKeys : closingRouteKeys
|
|
192
190
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["resolveSceneNeighbors","isOverlayVisible","areDescriptorSourcesEquivalent","areDescriptorsEqual","areRouteChildStateMapsEqual","getRouteChildState","
|
|
1
|
+
{"version":3,"names":["resolveSceneNeighbors","isOverlayVisible","areDescriptorSourcesEquivalent","areDescriptorsEqual","areRouteChildStateMapsEqual","getRouteChildState","routeKeyListsAreEqual","setsAreEqual","resolveStableDescriptorSource","routeKey","sourceDescriptor","previousState","previousSourceDescriptor","sourceDescriptors","getSceneActivity","focusedIndex","isClosing","sceneIndex","topIndex","topIsClosing","getSceneActivityWindow","props","routes","closingRouteKeys","focusedRouteKey","state","index","key","findIndex","route","Error","has","length","topRoute","undefined","withDescriptorActivityState","descriptor","activity","buildBaseScenes","descriptors","activityWindow","routeKeys","scenes","routeChildStates","managedDescriptors","shouldShowFloatOverlay","rawSourceDescriptor","routeChildState","childStateUnchanged","Object","is","previousDescriptor","navigation","options","push","withSceneRelationships","isRouteClosing","closingRouteOrder","Map","Array","from","previousScenesByRouteKey","map","scene","reusedEveryScene","relationshipScenes","nextScenes","nextDescriptor","get","nextScene","previousScene","buildManagedStackState","params","baseScenes","Set"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/stack/helpers/managed-stack-state/helpers/build-managed-stack-state.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -1,17 +1,13 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import { buildManagedStackState } from "./build-managed-stack-state";
|
|
4
|
-
import { areDescriptorSourceMapsEquivalent, areDescriptorsEqual, areRouteChildStateMapsEqual, getRouteChildStateMap, setsAreEqual } from "./helpers";
|
|
4
|
+
import { areDescriptorSourceMapsEquivalent, areDescriptorsEqual, areRouteChildStateMapsEqual, getRouteChildStateMap, routesHaveSameKeys, setsAreEqual } from "./helpers";
|
|
5
5
|
import { reconcileManagedRoutes } from "./reconcile-managed-routes";
|
|
6
6
|
const routesAreIdentical = (a, b) => {
|
|
7
7
|
if (a === b) return true;
|
|
8
8
|
if (a.length !== b.length) return false;
|
|
9
9
|
return a.every((route, index) => route === b[index]);
|
|
10
10
|
};
|
|
11
|
-
const routeKeysAreEqual = (a, b) => {
|
|
12
|
-
if (a.length !== b.length) return false;
|
|
13
|
-
return a.every((route, index) => route.key === b[index]?.key);
|
|
14
|
-
};
|
|
15
11
|
export const deriveManagedStackState = ({
|
|
16
12
|
props,
|
|
17
13
|
current,
|
|
@@ -29,7 +25,7 @@ export const deriveManagedStackState = ({
|
|
|
29
25
|
if (alreadyAligned) {
|
|
30
26
|
return current;
|
|
31
27
|
}
|
|
32
|
-
const logicallyAligned = focusedRouteUnchanged && closingRouteKeysUnchanged && routeChildStatesUnchanged &&
|
|
28
|
+
const logicallyAligned = focusedRouteUnchanged && closingRouteKeysUnchanged && routeChildStatesUnchanged && routesHaveSameKeys(current.routes, nextRoutesSnapshot) && areDescriptorSourceMapsEquivalent(current.sourceDescriptors, nextDescriptors);
|
|
33
29
|
if (logicallyAligned) {
|
|
34
30
|
return current;
|
|
35
31
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["buildManagedStackState","areDescriptorSourceMapsEquivalent","areDescriptorsEqual","areRouteChildStateMapsEqual","getRouteChildStateMap","setsAreEqual","reconcileManagedRoutes","routesAreIdentical","a","b","length","every","route","index","
|
|
1
|
+
{"version":3,"names":["buildManagedStackState","areDescriptorSourceMapsEquivalent","areDescriptorsEqual","areRouteChildStateMapsEqual","getRouteChildStateMap","routesHaveSameKeys","setsAreEqual","reconcileManagedRoutes","routesAreIdentical","a","b","length","every","route","index","deriveManagedStackState","props","current","previousRoutesSnapshot","closingRouteKeys","nextRoutesSnapshot","state","routes","nextDescriptors","descriptors","nextRouteChildStates","nextFocusedRouteKey","key","focusedRouteUnchanged","focusedRouteKey","closingRouteKeysUnchanged","routeChildStatesUnchanged","routeChildStates","alreadyAligned","sourceDescriptors","logicallyAligned","result","routesChanged","descriptorsChanged","closingRouteKeysChanged","previousState"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/stack/helpers/managed-stack-state/helpers/derive-managed-stack-state.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -18,6 +18,15 @@ export const setsAreEqual = (left, right) => {
|
|
|
18
18
|
}
|
|
19
19
|
return true;
|
|
20
20
|
};
|
|
21
|
+
export const routeKeyListsAreEqual = (a, b) => {
|
|
22
|
+
if (a === b) return true;
|
|
23
|
+
if (a.length !== b.length) return false;
|
|
24
|
+
return a.every((key, index) => key === b[index]);
|
|
25
|
+
};
|
|
26
|
+
export const routesHaveSameKeys = (a, b) => {
|
|
27
|
+
if (a.length !== b.length) return false;
|
|
28
|
+
return a.every((route, index) => route.key === b[index]?.key);
|
|
29
|
+
};
|
|
21
30
|
export const getRouteChildState = route => {
|
|
22
31
|
if (!route || typeof route !== "object") {
|
|
23
32
|
return undefined;
|
package/lib/module/shared/providers/stack/helpers/managed-stack-state/helpers/helpers.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["areDescriptorsEqual","a","b","aKeys","Object","keys","bKeys","length","every","key","setsAreEqual","left","right","size","value","has","
|
|
1
|
+
{"version":3,"names":["areDescriptorsEqual","a","b","aKeys","Object","keys","bKeys","length","every","key","setsAreEqual","left","right","size","value","has","routeKeyListsAreEqual","index","routesHaveSameKeys","route","getRouteChildState","undefined","childStateSymbol","getOwnPropertySymbols","find","symbol","description","state","getRouteChildStateMap","routes","childStates","areRouteChildStateMapsEqual","previous","next","previousKeys","nextKeys","is","areRecordsShallowEqual","areDescriptorSourcesEquivalent","navigation","options","areDescriptorSourceMapsEquivalent","previousDescriptor","nextDescriptor"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/stack/helpers/managed-stack-state/helpers/helpers.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -2,12 +2,7 @@
|
|
|
2
2
|
|
|
3
3
|
import { composeDescriptors } from "../../../../../utils/navigation/compose-descriptors";
|
|
4
4
|
import { syncRoutesWithRemoved } from "../../../../../utils/navigation/sync-routes-with-removed";
|
|
5
|
-
|
|
6
|
-
if (previous.length !== next.length) {
|
|
7
|
-
return false;
|
|
8
|
-
}
|
|
9
|
-
return previous.every((route, index) => route?.key === next[index]?.key);
|
|
10
|
-
};
|
|
5
|
+
import { routesHaveSameKeys } from "./helpers";
|
|
11
6
|
const alignRoutesWithLatest = (currentRoutes, currentDescriptors, nextRoutes, nextDescriptors) => {
|
|
12
7
|
if (currentRoutes.length === 0) {
|
|
13
8
|
return {
|
|
@@ -91,7 +86,7 @@ export const reconcileManagedRoutes = params => {
|
|
|
91
86
|
nextDescriptors,
|
|
92
87
|
closingRouteKeys
|
|
93
88
|
} = params;
|
|
94
|
-
const routeKeysUnchanged =
|
|
89
|
+
const routeKeysUnchanged = routesHaveSameKeys(previousRoutesSnapshot, nextRoutesSnapshot);
|
|
95
90
|
if (routeKeysUnchanged) {
|
|
96
91
|
const result = alignRoutesWithLatest(current.routes, current.sourceDescriptors, nextRoutesSnapshot, nextDescriptors);
|
|
97
92
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["composeDescriptors","syncRoutesWithRemoved","
|
|
1
|
+
{"version":3,"names":["composeDescriptors","syncRoutesWithRemoved","routesHaveSameKeys","alignRoutesWithLatest","currentRoutes","currentDescriptors","nextRoutes","nextDescriptors","length","routes","descriptors","nextRouteLookup","Map","route","set","key","didChange","alignedRoutes","map","nextRoute","get","routesResult","acceptAlreadyClosingRouteRemovals","current","previousRoutesSnapshot","nextRoutesSnapshot","closingRouteKeys","nextRouteKeys","Set","acceptedRemovedKeys","has","add","delete","size","remainingClosingRoutes","filter","descriptor","sourceDescriptors","reconcileManagedRoutes","params","routeKeysUnchanged","result","acceptedRemoval","prevRoutes","prevDescriptors"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/stack/helpers/managed-stack-state/helpers/reconcile-managed-routes.ts"],"mappings":"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","ignoreList":[]}
|
package/lib/module/shared/providers/stack/helpers/managed-stack-state/managed-stack-controller.js
CHANGED
|
@@ -13,7 +13,7 @@ import { deriveManagedStackState } from "./helpers/derive-managed-stack-state";
|
|
|
13
13
|
export const createManagedStackController = initialProps => {
|
|
14
14
|
const closingRouteKeys = new Set();
|
|
15
15
|
let props = initialProps;
|
|
16
|
-
let
|
|
16
|
+
let previousRoutesSnapshot = initialProps.state.routes;
|
|
17
17
|
let snapshot = {
|
|
18
18
|
state: buildManagedStackState({
|
|
19
19
|
props,
|
|
@@ -38,15 +38,15 @@ export const createManagedStackController = initialProps => {
|
|
|
38
38
|
return snapshot;
|
|
39
39
|
};
|
|
40
40
|
const update = nextProps => {
|
|
41
|
-
const
|
|
41
|
+
const lastRoutesSnapshot = previousRoutesSnapshot;
|
|
42
42
|
props = nextProps;
|
|
43
43
|
const nextState = deriveManagedStackState({
|
|
44
44
|
props,
|
|
45
45
|
current: snapshot.state,
|
|
46
|
-
previousRoutesSnapshot,
|
|
46
|
+
previousRoutesSnapshot: lastRoutesSnapshot,
|
|
47
47
|
closingRouteKeys
|
|
48
48
|
});
|
|
49
|
-
|
|
49
|
+
previousRoutesSnapshot = nextProps.state.routes;
|
|
50
50
|
if (nextState === snapshot.state) {
|
|
51
51
|
return;
|
|
52
52
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["StackActions","buildManagedStackState","deriveManagedStackState","createManagedStackController","initialProps","closingRouteKeys","Set","props","
|
|
1
|
+
{"version":3,"names":["StackActions","buildManagedStackState","deriveManagedStackState","createManagedStackController","initialProps","closingRouteKeys","Set","props","previousRoutesSnapshot","state","routes","snapshot","descriptors","listeners","emit","listener","subscribe","add","delete","getSnapshot","update","nextProps","lastRoutesSnapshot","nextState","current","handleCloseRoute","route","navigation","some","candidate","key","dispatch","pop","source","target","routeExists","nextRoutes","filter","nextDescriptors","sourceDescriptors","previousState","requestDismiss","routeIndex","findIndex","has"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/stack/helpers/managed-stack-state/managed-stack-controller.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -4,7 +4,7 @@ import { interpolate } from "react-native-reanimated";
|
|
|
4
4
|
import { NAVIGATION_MASK_ELEMENT_STYLE_ID } from "../../../../constants";
|
|
5
5
|
import { createLinkAccessor } from "../../helpers/create-link-accessor";
|
|
6
6
|
import { getSourceBorderRadius } from "../helpers";
|
|
7
|
-
import { CLOSE_SOURCE_HANDOFF_PROGRESS, CONTENT_CLOSING_OPACITY_OUTPUT, CONTENT_CLOSING_OPACITY_RANGE, CONTENT_ENTERING_OPACITY_OUTPUT, CONTENT_ENTERING_OPACITY_RANGE, CONTENT_SHADOW_OPACITY_OUTPUT, DISMISS_SCALE_ORBIT_DEPTH, DRAG_MASK_HEIGHT_COLLAPSE_END, HORIZONTAL_DRAG_MASK_COLLAPSE_SCALE, IDENTITY_DRAG_SCALE_OUTPUT, REVEAL_BORDER_RADIUS, REVEAL_SHADOW_OFFSET, REVEAL_USES_TRANSFORM_MASK, UNFOCUSED_ELEMENT_OPACITY_OUTPUT, ZERO_TO_ONE_RANGE } from "./config";
|
|
7
|
+
import { CLOSE_SOURCE_HANDOFF_PROGRESS, CONTENT_CLOSING_OPACITY_OUTPUT, CONTENT_CLOSING_OPACITY_RANGE, CONTENT_ENTERING_OPACITY_OUTPUT, CONTENT_ENTERING_OPACITY_RANGE, CONTENT_SHADOW_OPACITY_OUTPUT, DISMISS_SCALE_ORBIT_DEPTH, DRAG_MASK_HEIGHT_COLLAPSE_END, HORIZONTAL_DRAG_MASK_COLLAPSE_SCALE, IDENTITY_DRAG_SCALE_OUTPUT, REVEAL_BACKGROUND_SCALE, REVEAL_BORDER_RADIUS, REVEAL_SHADOW_OFFSET, REVEAL_USES_TRANSFORM_MASK, UNFOCUSED_ELEMENT_OPACITY_OUTPUT, ZERO_TO_ONE_RANGE } from "./config";
|
|
8
8
|
import { interpolateClamped, mixUnit, resolveAspectRatioMaskHeight, resolveDismissScaleHandoff, resolveRevealContentBaseTransform, resolveRevealDirectionalDragScale, resolveRevealGestureHandoff, resolveSafeScale, resolveTrackedSourceElementTransform, resolveUniformScale, resolveUnitDragTranslation } from "./math";
|
|
9
9
|
/* -------------------------------------------------------------------------- */
|
|
10
10
|
/* BUILD REVEAL STYLES */
|
|
@@ -37,6 +37,8 @@ export function buildRevealStyles({
|
|
|
37
37
|
const gestureProgressMode = revealOptions?.gestureProgressMode ?? "freeform";
|
|
38
38
|
const disablePointerEventsTillElementTransition = revealOptions?.disablePointerEventsTillElementTransition ?? true;
|
|
39
39
|
const maskSizingMode = revealOptions?.maskSizingMode ?? "auto";
|
|
40
|
+
const backgroundScale = revealOptions?.backgroundScale ?? REVEAL_BACKGROUND_SCALE;
|
|
41
|
+
const shouldBackgroundScaleResetOnSettled = revealOptions?.shouldBackgroundScaleResetOnSettled ?? true;
|
|
40
42
|
const usesTransformMask = maskSizingMode === "auto" ? REVEAL_USES_TRANSFORM_MASK : maskSizingMode === "transform";
|
|
41
43
|
const boundsAccessor = createLinkAccessor(() => props);
|
|
42
44
|
const link = boundsAccessor.getLink(tag);
|
|
@@ -198,8 +200,6 @@ export function buildRevealStyles({
|
|
|
198
200
|
},
|
|
199
201
|
[link.id]: {
|
|
200
202
|
style: {
|
|
201
|
-
position: "relative",
|
|
202
|
-
zIndex: 999,
|
|
203
203
|
transform: [{
|
|
204
204
|
translateX: elementTX
|
|
205
205
|
}, {
|
|
@@ -212,8 +212,8 @@ export function buildRevealStyles({
|
|
|
212
212
|
|
|
213
213
|
/* ---------------------------- Unfocused Screen ---------------------------- */
|
|
214
214
|
|
|
215
|
-
const unfocusedScale = mixUnit(1,
|
|
216
|
-
const unfocusedContentScale = props.active.logicallySettled ? 1 : unfocusedScale;
|
|
215
|
+
const unfocusedScale = mixUnit(1, backgroundScale, props.active.progress);
|
|
216
|
+
const unfocusedContentScale = props.active.logicallySettled && shouldBackgroundScaleResetOnSettled ? 1 : unfocusedScale;
|
|
217
217
|
const trackingContentTarget = initialDestinationTarget ?? link.destination.bounds;
|
|
218
218
|
const trackingContentBaseTransform = resolveRevealContentBaseTransform({
|
|
219
219
|
progress: props.active.progress,
|