react-native-screen-transitions 3.11.1 → 3.11.2
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/providers/screen/styles/helpers/create-interpolator-scope.js +40 -0
- package/lib/commonjs/shared/providers/screen/styles/helpers/create-interpolator-scope.js.map +1 -0
- package/lib/commonjs/shared/providers/screen/styles/hooks/use-interpolated-style-maps.js +5 -10
- package/lib/commonjs/shared/providers/screen/styles/hooks/use-interpolated-style-maps.js.map +1 -1
- package/lib/module/shared/providers/screen/styles/helpers/create-interpolator-scope.js +35 -0
- package/lib/module/shared/providers/screen/styles/helpers/create-interpolator-scope.js.map +1 -0
- package/lib/module/shared/providers/screen/styles/hooks/use-interpolated-style-maps.js +5 -10
- package/lib/module/shared/providers/screen/styles/hooks/use-interpolated-style-maps.js.map +1 -1
- package/lib/typescript/shared/providers/screen/styles/helpers/create-interpolator-scope.d.ts +9 -0
- package/lib/typescript/shared/providers/screen/styles/helpers/create-interpolator-scope.d.ts.map +1 -0
- package/lib/typescript/shared/providers/screen/styles/hooks/use-interpolated-style-maps.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/shared/providers/screen/styles/helpers/create-interpolator-scope.ts +45 -0
- package/src/shared/providers/screen/styles/hooks/use-interpolated-style-maps.tsx +8 -12
- package/lib/commonjs/shared/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.js +0 -21
- package/lib/commonjs/shared/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.js.map +0 -1
- package/lib/module/shared/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.js +0 -16
- package/lib/module/shared/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.js.map +0 -1
- package/lib/typescript/shared/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.d.ts +0 -2
- package/lib/typescript/shared/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.d.ts.map +0 -1
- package/src/shared/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.tsx +0 -15
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.createInterpolatorScope = void 0;
|
|
7
|
+
var _bounds = require("../../../../utils/bounds");
|
|
8
|
+
const createInterpolatorScope = ({
|
|
9
|
+
frame,
|
|
10
|
+
selectedFrame,
|
|
11
|
+
transition
|
|
12
|
+
}) => {
|
|
13
|
+
"worklet";
|
|
14
|
+
|
|
15
|
+
const selectedProps = {
|
|
16
|
+
...frame,
|
|
17
|
+
...selectedFrame
|
|
18
|
+
};
|
|
19
|
+
let scope;
|
|
20
|
+
const scopedTransition = target => {
|
|
21
|
+
"worklet";
|
|
22
|
+
|
|
23
|
+
if ((target?.depth ?? 0) === 0) {
|
|
24
|
+
return scope;
|
|
25
|
+
}
|
|
26
|
+
return transition(target);
|
|
27
|
+
};
|
|
28
|
+
scope = {
|
|
29
|
+
...selectedProps,
|
|
30
|
+
bounds: (0, _bounds.createBoundsAccessor)(() => {
|
|
31
|
+
"worklet";
|
|
32
|
+
|
|
33
|
+
return selectedProps;
|
|
34
|
+
}),
|
|
35
|
+
transition: scopedTransition
|
|
36
|
+
};
|
|
37
|
+
return scope;
|
|
38
|
+
};
|
|
39
|
+
exports.createInterpolatorScope = createInterpolatorScope;
|
|
40
|
+
//# sourceMappingURL=create-interpolator-scope.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["_bounds","require","createInterpolatorScope","frame","selectedFrame","transition","selectedProps","scope","scopedTransition","target","depth","bounds","createBoundsAccessor","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/helpers/create-interpolator-scope.ts"],"mappings":";;;;;;AAIA,IAAAA,OAAA,GAAAC,OAAA;AAIO,MAAMC,uBAAuB,GAAGA,CAAC;EACvCC,KAAK;EACLC,aAAa;EACbC;AAKD,CAAC,KAA+B;EAC/B,SAAS;;EAET,MAAMC,aAAa,GAAG;IACrB,GAAGH,KAAK;IACR,GAAGC;EACJ,CAAC;EACD,IAAIG,KAA+B;EACnC,MAAMC,gBAA0C,GAAIC,MAAM,IAAK;IAC9D,SAAS;;IAET,IAAI,CAACA,MAAM,EAAEC,KAAK,IAAI,CAAC,MAAM,CAAC,EAAE;MAC/B,OAAOH,KAAK;IACb;IAEA,OAAOF,UAAU,CAACI,MAAM,CAAC;EAC1B,CAAC;EAEDF,KAAK,GAAG;IACP,GAAGD,aAAa;IAChBK,MAAM,EAAE,IAAAC,4BAAoB,EAAC,MAAM;MAClC,SAAS;;MACT,OAAON,aAAa;IACrB,CAAC,CAAC;IACFD,UAAU,EAAEG;EACb,CAAC;EAED,OAAOD,KAAK;AACb,CAAC;AAACM,OAAA,CAAAX,uBAAA,GAAAA,uBAAA","ignoreList":[]}
|
|
@@ -11,13 +11,13 @@ var _animation = require("../../../../stores/animation.store");
|
|
|
11
11
|
var _system = require("../../../../stores/system.store");
|
|
12
12
|
var _logger = require("../../../../utils/logger");
|
|
13
13
|
var _animation2 = require("../../animation");
|
|
14
|
-
var _useBuildBoundsAccessor = require("../../animation/helpers/accessors/use-build-bounds-accessor");
|
|
15
14
|
var _useBuildTransitionAccessor = require("../../animation/helpers/accessors/use-build-transition-accessor");
|
|
16
15
|
var _readScreenAnimationRevisions = require("../../animation/helpers/read-screen-animation-revisions");
|
|
17
16
|
var _selectedInterpolatorOptions = require("../../animation/helpers/selected-interpolator-options");
|
|
18
17
|
var _descriptors = require("../../descriptors");
|
|
19
18
|
var _options = require("../../options");
|
|
20
19
|
var _collectInterpolatorSharedValues = require("../helpers/collect-interpolator-shared-values");
|
|
20
|
+
var _createInterpolatorScope = require("../helpers/create-interpolator-scope");
|
|
21
21
|
var _normalizeSlots = require("../helpers/normalize-slots");
|
|
22
22
|
var _resolveInterpolatorStyleHandoff = require("../helpers/resolve-interpolator-style-handoff");
|
|
23
23
|
var _selectInterpolatorFrame = require("../helpers/select-interpolator-frame");
|
|
@@ -38,7 +38,6 @@ const runInterpolator = ({
|
|
|
38
38
|
interpolator,
|
|
39
39
|
props,
|
|
40
40
|
selectedFrame,
|
|
41
|
-
bounds,
|
|
42
41
|
transition
|
|
43
42
|
}) => {
|
|
44
43
|
"worklet";
|
|
@@ -47,12 +46,11 @@ const runInterpolator = ({
|
|
|
47
46
|
return undefined;
|
|
48
47
|
}
|
|
49
48
|
try {
|
|
50
|
-
const raw = interpolator({
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
bounds,
|
|
49
|
+
const raw = interpolator((0, _createInterpolatorScope.createInterpolatorScope)({
|
|
50
|
+
frame: props,
|
|
51
|
+
selectedFrame,
|
|
54
52
|
transition
|
|
55
|
-
});
|
|
53
|
+
}));
|
|
56
54
|
const rawStyleMap = typeof raw === "object" && raw != null ? raw : undefined;
|
|
57
55
|
return {
|
|
58
56
|
rawStyleMap,
|
|
@@ -104,7 +102,6 @@ const useInterpolatedStylesMap = ({
|
|
|
104
102
|
ancestorScreenAnimationSources,
|
|
105
103
|
descendantScreenAnimationSources
|
|
106
104
|
} = (0, _animation2.useScreenAnimationStore)();
|
|
107
|
-
const boundsAccessor = (0, _useBuildBoundsAccessor.useBuildBoundsAccessor)();
|
|
108
105
|
const transition = (0, _useBuildTransitionAccessor.useBuildTransitionAccessor)();
|
|
109
106
|
const nextInterpolatorReady = (0, _reactNativeReanimated.useSharedValue)(0);
|
|
110
107
|
|
|
@@ -193,7 +190,6 @@ const useInterpolatedStylesMap = ({
|
|
|
193
190
|
interpolator: currentInterpolator,
|
|
194
191
|
props,
|
|
195
192
|
selectedFrame: currentSelectedFrame,
|
|
196
|
-
bounds: boundsAccessor,
|
|
197
193
|
transition
|
|
198
194
|
});
|
|
199
195
|
const initialDestinationStyleGate = (0, _visibilityGate.resolveInitialDestinationStyleGate)({
|
|
@@ -219,7 +215,6 @@ const useInterpolatedStylesMap = ({
|
|
|
219
215
|
interpolator: nextInterpolator,
|
|
220
216
|
props,
|
|
221
217
|
selectedFrame: nextSelectedFrame,
|
|
222
|
-
bounds: boundsAccessor,
|
|
223
218
|
transition
|
|
224
219
|
});
|
|
225
220
|
(0, _selectedInterpolatorOptions.syncSelectedInterpolatorOptions)(selectedInterpolatorOptions, "next", nextResult?.rawStyleMap?.options);
|
package/lib/commonjs/shared/providers/screen/styles/hooks/use-interpolated-style-maps.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_reactNativeReanimated","_constants","_animation","_system","_logger","_animation2","
|
|
1
|
+
{"version":3,"names":["_react","require","_reactNativeReanimated","_constants","_animation","_system","_logger","_animation2","_useBuildTransitionAccessor","_readScreenAnimationRevisions","_selectedInterpolatorOptions","_descriptors","_options","_collectInterpolatorSharedValues","_createInterpolatorScope","_normalizeSlots","_resolveInterpolatorStyleHandoff","_selectInterpolatorFrame","_stripInterpolatorOptions","_transitionVisualState","_visibilityGate","NO_STYLE_LAYERS","normalizeRawStyleMap","rawStyleMap","NO_STYLES","stylesMap","normalizeSlots","stripInterpolatorOptions","runInterpolator","interpolator","props","selectedFrame","transition","undefined","raw","createInterpolatorScope","frame","_","__DEV__","logger","warn","useInterpolatedStylesMap","enabled","visibilityBlocked","currentScreenKey","useDescriptorsStore","s","derivations","nextScreenKey","destinationPairKey","screenOptions","useScreenOptionsStore","screenInterpolatorProps","screenInterpolatorPropsRevision","selectedInterpolatorOptions","nextInterpolator","currentInterpolator","ancestorScreenAnimationSources","descendantScreenAnimationSources","useScreenAnimationStore","useBuildTransitionAccessor","nextInterpolatorReady","useSharedValue","interpolatorSharedValues","useMemo","collectInterpolatorSharedValues","activeScreenKey","closing","activeClosing","entering","activeEntering","AnimationStore","getBag","animationProgress","activeAnimationProgress","pendingLifecycleRequestKind","activePendingLifecycleRequestKind","pendingLifecycleStartBlockCount","activePendingLifecycleStartBlockCount","SystemStore","isGesturingDuringCloseAnimation","initialDestinationStylesReady","shouldPrepareInitialDestinationStyles","useAnimatedReaction","get","isVisibilityBlocked","styleGate","resolveInitialDestinationStyleGate","shouldPrepareStyles","stylesReady","shouldMarkStylesReady","set","localStylesMaps","useDerivedValue","readScreenAnimationRevisions","current","next","isDragging","gesture","dragging","isNextClosing","isInGestureMode","isPendingOpen","LifecycleTransitionRequestKind","Open","activeOpening","isOpeningBlocked","isOpenTransitionBlocked","opening","hasCloseFinished","hasCloseTransitionFinished","currentOwnsInterpolator","nextReady","interpolatorOptionsOwner","currentSelectedFrame","selectInterpolatorFrame","currentResult","initialDestinationStyleGate","shouldWithholdStyles","syncSelectedInterpolatorOptions","options","syncScreenOptionsOverrides","handoff","resolveInterpolatorStyleHandoff","currentStylesMap","nextStylesMap","length","nextSelectedFrame","nextResult","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/hooks/use-interpolated-style-maps.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -0,0 +1,35 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
import { createBoundsAccessor } from "../../../../utils/bounds";
|
|
4
|
+
export const createInterpolatorScope = ({
|
|
5
|
+
frame,
|
|
6
|
+
selectedFrame,
|
|
7
|
+
transition
|
|
8
|
+
}) => {
|
|
9
|
+
"worklet";
|
|
10
|
+
|
|
11
|
+
const selectedProps = {
|
|
12
|
+
...frame,
|
|
13
|
+
...selectedFrame
|
|
14
|
+
};
|
|
15
|
+
let scope;
|
|
16
|
+
const scopedTransition = target => {
|
|
17
|
+
"worklet";
|
|
18
|
+
|
|
19
|
+
if ((target?.depth ?? 0) === 0) {
|
|
20
|
+
return scope;
|
|
21
|
+
}
|
|
22
|
+
return transition(target);
|
|
23
|
+
};
|
|
24
|
+
scope = {
|
|
25
|
+
...selectedProps,
|
|
26
|
+
bounds: createBoundsAccessor(() => {
|
|
27
|
+
"worklet";
|
|
28
|
+
|
|
29
|
+
return selectedProps;
|
|
30
|
+
}),
|
|
31
|
+
transition: scopedTransition
|
|
32
|
+
};
|
|
33
|
+
return scope;
|
|
34
|
+
};
|
|
35
|
+
//# sourceMappingURL=create-interpolator-scope.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["createBoundsAccessor","createInterpolatorScope","frame","selectedFrame","transition","selectedProps","scope","scopedTransition","target","depth","bounds"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/helpers/create-interpolator-scope.ts"],"mappings":";;AAIA,SAASA,oBAAoB,QAAQ,0BAA0B;AAI/D,OAAO,MAAMC,uBAAuB,GAAGA,CAAC;EACvCC,KAAK;EACLC,aAAa;EACbC;AAKD,CAAC,KAA+B;EAC/B,SAAS;;EAET,MAAMC,aAAa,GAAG;IACrB,GAAGH,KAAK;IACR,GAAGC;EACJ,CAAC;EACD,IAAIG,KAA+B;EACnC,MAAMC,gBAA0C,GAAIC,MAAM,IAAK;IAC9D,SAAS;;IAET,IAAI,CAACA,MAAM,EAAEC,KAAK,IAAI,CAAC,MAAM,CAAC,EAAE;MAC/B,OAAOH,KAAK;IACb;IAEA,OAAOF,UAAU,CAACI,MAAM,CAAC;EAC1B,CAAC;EAEDF,KAAK,GAAG;IACP,GAAGD,aAAa;IAChBK,MAAM,EAAEV,oBAAoB,CAAC,MAAM;MAClC,SAAS;;MACT,OAAOK,aAAa;IACrB,CAAC,CAAC;IACFD,UAAU,EAAEG;EACb,CAAC;EAED,OAAOD,KAAK;AACb,CAAC","ignoreList":[]}
|
|
@@ -7,13 +7,13 @@ import { AnimationStore } from "../../../../stores/animation.store";
|
|
|
7
7
|
import { LifecycleTransitionRequestKind, SystemStore } from "../../../../stores/system.store";
|
|
8
8
|
import { logger } from "../../../../utils/logger";
|
|
9
9
|
import { useScreenAnimationStore } from "../../animation";
|
|
10
|
-
import { useBuildBoundsAccessor } from "../../animation/helpers/accessors/use-build-bounds-accessor";
|
|
11
10
|
import { useBuildTransitionAccessor } from "../../animation/helpers/accessors/use-build-transition-accessor";
|
|
12
11
|
import { readScreenAnimationRevisions } from "../../animation/helpers/read-screen-animation-revisions";
|
|
13
12
|
import { syncSelectedInterpolatorOptions } from "../../animation/helpers/selected-interpolator-options";
|
|
14
13
|
import { useDescriptorsStore } from "../../descriptors";
|
|
15
14
|
import { syncScreenOptionsOverrides, useScreenOptionsStore } from "../../options";
|
|
16
15
|
import { collectInterpolatorSharedValues } from "../helpers/collect-interpolator-shared-values";
|
|
16
|
+
import { createInterpolatorScope } from "../helpers/create-interpolator-scope";
|
|
17
17
|
import { normalizeSlots } from "../helpers/normalize-slots";
|
|
18
18
|
import { resolveInterpolatorStyleHandoff } from "../helpers/resolve-interpolator-style-handoff";
|
|
19
19
|
import { selectInterpolatorFrame } from "../helpers/select-interpolator-frame";
|
|
@@ -34,7 +34,6 @@ const runInterpolator = ({
|
|
|
34
34
|
interpolator,
|
|
35
35
|
props,
|
|
36
36
|
selectedFrame,
|
|
37
|
-
bounds,
|
|
38
37
|
transition
|
|
39
38
|
}) => {
|
|
40
39
|
"worklet";
|
|
@@ -43,12 +42,11 @@ const runInterpolator = ({
|
|
|
43
42
|
return undefined;
|
|
44
43
|
}
|
|
45
44
|
try {
|
|
46
|
-
const raw = interpolator({
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
bounds,
|
|
45
|
+
const raw = interpolator(createInterpolatorScope({
|
|
46
|
+
frame: props,
|
|
47
|
+
selectedFrame,
|
|
50
48
|
transition
|
|
51
|
-
});
|
|
49
|
+
}));
|
|
52
50
|
const rawStyleMap = typeof raw === "object" && raw != null ? raw : undefined;
|
|
53
51
|
return {
|
|
54
52
|
rawStyleMap,
|
|
@@ -100,7 +98,6 @@ export const useInterpolatedStylesMap = ({
|
|
|
100
98
|
ancestorScreenAnimationSources,
|
|
101
99
|
descendantScreenAnimationSources
|
|
102
100
|
} = useScreenAnimationStore();
|
|
103
|
-
const boundsAccessor = useBuildBoundsAccessor();
|
|
104
101
|
const transition = useBuildTransitionAccessor();
|
|
105
102
|
const nextInterpolatorReady = useSharedValue(0);
|
|
106
103
|
|
|
@@ -189,7 +186,6 @@ export const useInterpolatedStylesMap = ({
|
|
|
189
186
|
interpolator: currentInterpolator,
|
|
190
187
|
props,
|
|
191
188
|
selectedFrame: currentSelectedFrame,
|
|
192
|
-
bounds: boundsAccessor,
|
|
193
189
|
transition
|
|
194
190
|
});
|
|
195
191
|
const initialDestinationStyleGate = resolveInitialDestinationStyleGate({
|
|
@@ -215,7 +211,6 @@ export const useInterpolatedStylesMap = ({
|
|
|
215
211
|
interpolator: nextInterpolator,
|
|
216
212
|
props,
|
|
217
213
|
selectedFrame: nextSelectedFrame,
|
|
218
|
-
bounds: boundsAccessor,
|
|
219
214
|
transition
|
|
220
215
|
});
|
|
221
216
|
syncSelectedInterpolatorOptions(selectedInterpolatorOptions, "next", nextResult?.rawStyleMap?.options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useMemo","useAnimatedReaction","useDerivedValue","useSharedValue","NO_STYLES","AnimationStore","LifecycleTransitionRequestKind","SystemStore","logger","useScreenAnimationStore","
|
|
1
|
+
{"version":3,"names":["useMemo","useAnimatedReaction","useDerivedValue","useSharedValue","NO_STYLES","AnimationStore","LifecycleTransitionRequestKind","SystemStore","logger","useScreenAnimationStore","useBuildTransitionAccessor","readScreenAnimationRevisions","syncSelectedInterpolatorOptions","useDescriptorsStore","syncScreenOptionsOverrides","useScreenOptionsStore","collectInterpolatorSharedValues","createInterpolatorScope","normalizeSlots","resolveInterpolatorStyleHandoff","selectInterpolatorFrame","stripInterpolatorOptions","hasCloseTransitionFinished","isOpenTransitionBlocked","resolveInitialDestinationStyleGate","NO_STYLE_LAYERS","normalizeRawStyleMap","rawStyleMap","stylesMap","runInterpolator","interpolator","props","selectedFrame","transition","undefined","raw","frame","_","__DEV__","warn","useInterpolatedStylesMap","enabled","visibilityBlocked","currentScreenKey","s","derivations","nextScreenKey","destinationPairKey","screenOptions","screenInterpolatorProps","screenInterpolatorPropsRevision","selectedInterpolatorOptions","nextInterpolator","currentInterpolator","ancestorScreenAnimationSources","descendantScreenAnimationSources","nextInterpolatorReady","interpolatorSharedValues","activeScreenKey","closing","activeClosing","entering","activeEntering","getBag","animationProgress","activeAnimationProgress","pendingLifecycleRequestKind","activePendingLifecycleRequestKind","pendingLifecycleStartBlockCount","activePendingLifecycleStartBlockCount","isGesturingDuringCloseAnimation","initialDestinationStylesReady","shouldPrepareInitialDestinationStyles","get","isVisibilityBlocked","styleGate","shouldPrepareStyles","stylesReady","shouldMarkStylesReady","set","localStylesMaps","current","next","isDragging","gesture","dragging","isNextClosing","isInGestureMode","isPendingOpen","Open","activeOpening","isOpeningBlocked","opening","hasCloseFinished","currentOwnsInterpolator","nextReady","interpolatorOptionsOwner","currentSelectedFrame","currentResult","initialDestinationStyleGate","shouldWithholdStyles","options","handoff","currentStylesMap","nextStylesMap","length","nextSelectedFrame","nextResult"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/hooks/use-interpolated-style-maps.tsx"],"mappings":";;AAAA,SAASA,OAAO,QAAQ,OAAO;AAC/B,SAECC,mBAAmB,EACnBC,eAAe,EACfC,cAAc,QACR,yBAAyB;AAChC,SAASC,SAAS,QAAQ,uBAAuB;AACjD,SAASC,cAAc,QAAQ,oCAAoC;AACnE,SACCC,8BAA8B,EAC9BC,WAAW,QACL,iCAAiC;AAMxC,SAASC,MAAM,QAAQ,0BAA0B;AACjD,SAASC,uBAAuB,QAAQ,iBAAiB;AACzD,SAASC,0BAA0B,QAAQ,iEAAiE;AAE5G,SAASC,4BAA4B,QAAQ,yDAAyD;AACtG,SAASC,+BAA+B,QAAQ,uDAAuD;AACvG,SAASC,mBAAmB,QAAQ,mBAAmB;AACvD,SACCC,0BAA0B,EAC1BC,qBAAqB,QACf,eAAe;AACtB,SAASC,+BAA+B,QAAQ,+CAA+C;AAC/F,SAASC,uBAAuB,QAAQ,sCAAsC;AAC9E,SAASC,cAAc,QAAQ,4BAA4B;AAC3D,SAASC,+BAA+B,QAAQ,+CAA+C;AAE/F,SAECC,uBAAuB,QACjB,sCAAsC;AAC7C,SAASC,wBAAwB,QAAQ,uCAAuC;AAChF,SACCC,0BAA0B,EAC1BC,uBAAuB,QACjB,oCAAoC;AAC3C,SAASC,kCAAkC,QAAQ,4BAA4B;AAE/E,MAAMC,eAAiC,GAAG,EAAE;AAc5C,MAAMC,oBAAoB,GACzBC,WAAoD,IAChD;EACJ,SAAS;;EAET,IAAI,CAACA,WAAW,EAAE;IACjB,OAAOvB,SAAS;EACjB;EAEA,MAAMwB,SAAS,GAAGV,cAAc,CAACG,wBAAwB,CAACM,WAAW,CAAC,CAAC;EAEvE,OAAOC,SAAS;AACjB,CAAC;AAED,MAAMC,eAAe,GAAGA,CAAC;EACxBC,YAAY;EACZC,KAAK;EACLC,aAAa;EACbC;AACsB,CAAC,KAAqC;EAC5D,SAAS;;EAET,IAAI,CAACH,YAAY,EAAE;IAClB,OAAOI,SAAS;EACjB;EAEA,IAAI;IACH,MAAMC,GAAG,GAAGL,YAAY,CACvBb,uBAAuB,CAAC;MACvBmB,KAAK,EAAEL,KAAK;MACZC,aAAa;MACbC;IACD,CAAC,CACF,CAAC;IAED,MAAMN,WAAoD,GACzD,OAAOQ,GAAG,KAAK,QAAQ,IAAIA,GAAG,IAAI,IAAI,GAAGA,GAAG,GAAGD,SAAS;IAEzD,OAAO;MACNP,WAAW;MACXC,SAAS,EAAEF,oBAAoB,CAACC,WAAW;IAC5C,CAAC;EACF,CAAC,CAAC,OAAOU,CAAC,EAAE;IACX,IAAIC,OAAO,EAAE;MACZ9B,MAAM,CAAC+B,IAAI,CAAC,2CAA2C,CAAC;IACzD;IAEA,OAAOL,SAAS;EACjB;AACD,CAAC;;AAED;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMM,wBAAwB,GAAGA,CAAC;EACxCC,OAAO;EACPC;AAID,CAAC,KAAK;EACL,MAAMC,gBAAgB,GAAG9B,mBAAmB,CAC1C+B,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACF,gBACtB,CAAC;EACD,MAAMG,aAAa,GAAGjC,mBAAmB,CAAE+B,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACC,aAAa,CAAC;EAC7E,MAAMC,kBAAkB,GAAGlC,mBAAmB,CAC5C+B,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACE,kBACtB,CAAC;EACD,MAAMC,aAAa,GAAGjC,qBAAqB,CAAC,CAAC;EAC7C,MAAM;IACLkC,uBAAuB;IACvBC,+BAA+B;IAC/BC,2BAA2B;IAC3BC,gBAAgB;IAChBC,mBAAmB;IACnBC,8BAA8B;IAC9BC;EACD,CAAC,GAAG9C,uBAAuB,CAAC,CAAC;EAC7B,MAAMwB,UAAU,GAAGvB,0BAA0B,CAAC,CAAC;EAC/C,MAAM8C,qBAAqB,GAAGrD,cAAc,CAAC,CAAC,CAAC;;EAE/C;EACA;EACA,MAAMsD,wBAAwB,GAAGzD,OAAO,CACvC,MACCgB,+BAA+B,CAAC,CAACqC,mBAAmB,EAAED,gBAAgB,CAAC,CAAC,EACzE,CAACC,mBAAmB,EAAED,gBAAgB,CACvC,CAAC;EAED,MAAMM,eAAe,GAAGZ,aAAa,IAAIH,gBAAgB;EACzD,MAAM;IAAEgB,OAAO,EAAEC,aAAa;IAAEC,QAAQ,EAAEC;EAAe,CAAC,GACzDzD,cAAc,CAAC0D,MAAM,CAACL,eAAe,CAAC;EACvC,MAAM;IACLM,iBAAiB,EAAEC,uBAAuB;IAC1CC,2BAA2B,EAAEC,iCAAiC;IAC9DC,+BAA+B,EAAEC;EAClC,CAAC,GAAG9D,WAAW,CAACwD,MAAM,CAACL,eAAe,CAAC;EAEvC,MAAMY,+BAA+B,GAAGnE,cAAc,CAAC,KAAK,CAAC;EAC7D,MAAMoE,6BAA6B,GAAGpE,cAAc,CAAC,CAAC,CAAC;EACvD,MAAMqE,qCAAqC,GAC1C/B,OAAO,IAAI,CAAC,CAACM,kBAAkB,IAAI,CAACD,aAAa,IAAI,CAAC,CAACO,mBAAmB;EAE3EpD,mBAAmB,CAClB,MAAM;IACL,SAAS;;IACT,OAAOyC,iBAAiB,CAAC+B,GAAG,CAAC,CAAC;EAC/B,CAAC,EACAC,mBAAmB,IAAK;IACxB,SAAS;;IACT,MAAMC,SAAS,GAAGnD,kCAAkC,CAAC;MACpDoD,mBAAmB,EAAEJ,qCAAqC;MAC1DE,mBAAmB;MACnBG,WAAW,EAAE,CAAC,CAACN,6BAA6B,CAACE,GAAG,CAAC;IAClD,CAAC,CAAC;IAEF,IAAIE,SAAS,CAACG,qBAAqB,EAAE;MACpCP,6BAA6B,CAACQ,GAAG,CAAC,CAAC,CAAC;IACrC;EACD,CACD,CAAC;EAED,MAAMC,eAAe,GAAG9E,eAAe,CAAmB,MAAM;IAC/D,SAAS;;IACTS,4BAA4B,CAC3BuC,+BAA+B,EAC/BI,8BAA8B,EAC9BC,gCAAgC,EAChCE,wBACD,CAAC;IACD,MAAM1B,KAAK,GAAGkB,uBAAuB,CAACwB,GAAG,CAAC,CAAC;IAE3C,MAAM;MAAEQ,OAAO;MAAEC;IAAK,CAAC,GAAGnD,KAAK;IAC/B,MAAMoD,UAAU,GAAGF,OAAO,CAACG,OAAO,CAACC,QAAQ;IAC3C,MAAMC,aAAa,GAAG,CAAC,CAACJ,IAAI,EAAEvB,OAAO;;IAErC;IACA;IACA;IACA,IAAIwB,UAAU,IAAIG,aAAa,EAAE;MAChChB,+BAA+B,CAACS,GAAG,CAAC,IAAI,CAAC;IAC1C;IAEA,IAAI,CAACI,UAAU,IAAI,CAACG,aAAa,EAAE;MAClChB,+BAA+B,CAACS,GAAG,CAAC,KAAK,CAAC;IAC3C;IAEA,MAAMQ,eAAe,GACpB,CAAC,CAACJ,UAAU,IAAIb,+BAA+B,CAACG,GAAG,CAAC,CAAC;;IAEtD;IACA;IACA;IACA;IACA;IACA,MAAMe,aAAa,GAClBrB,iCAAiC,CAACM,GAAG,CAAC,CAAC,KACvCnE,8BAA8B,CAACmF,IAAI;IACpC,MAAMC,aAAa,GAAGF,aAAa,IAAI,CAAC,CAAC1B,cAAc,CAACW,GAAG,CAAC,CAAC;IAC7D,MAAMkB,gBAAgB,GAAGpE,uBAAuB,CAAC;MAChDqE,OAAO,EAAEF,aAAa;MACtBtB,+BAA+B,EAC9BC,qCAAqC,CAACI,GAAG,CAAC,CAAC;MAC5CT,iBAAiB,EAAEC,uBAAuB,CAACQ,GAAG,CAAC;IAChD,CAAC,CAAC;IACF,MAAMoB,gBAAgB,GAAGvE,0BAA0B,CAAC;MACnDqC,OAAO,EAAEC,aAAa,CAACa,GAAG,CAAC,CAAC;MAC5BT,iBAAiB,EAAEC,uBAAuB,CAACQ,GAAG,CAAC;IAChD,CAAC,CAAC;IACF,MAAMqB,uBAAuB,GAC5BP,eAAe,IACf,CAACnC,gBAAgB,IACjBuC,gBAAgB,IAChBE,gBAAgB;IACjB,MAAME,SAAS,GAAGD,uBAAuB,GAAG,CAAC,GAAG,CAAC;IAEjDtC,qBAAqB,CAACuB,GAAG,CAACgB,SAAS,CAAC;IAEpC,MAAMC,wBAAwB,GAAGF,uBAAuB,GACrD,SAAS,GACT,MAAM;;IAET;IACA;IACA;IACA;IACA,MAAMG,oBAAoB,GAAG7E,uBAAuB,CACnDW,KAAK,EACLwD,eAAe,IAAI,CAAC,CAACnC,gBACtB,CAAC;IACD,MAAM8C,aAAa,GAAGrE,eAAe,CAAC;MACrCC,YAAY,EAAEuB,mBAAmB;MACjCtB,KAAK;MACLC,aAAa,EAAEiE,oBAAoB;MACnChE;IACD,CAAC,CAAC;IAEF,MAAMkE,2BAA2B,GAAG3E,kCAAkC,CAAC;MACtEoD,mBAAmB,EAAEJ,qCAAqC;MAC1DE,mBAAmB,EAAEhC,iBAAiB,CAAC+B,GAAG,CAAC,CAAC;MAC5CI,WAAW,EAAE,CAAC,CAACN,6BAA6B,CAACE,GAAG,CAAC;IAClD,CAAC,CAAC;IAEF,IAAI0B,2BAA2B,CAACC,oBAAoB,EAAE;MACrD,OAAO3E,eAAe;IACvB;IAEA,IAAIuE,wBAAwB,KAAK,SAAS,EAAE;MAC3CpF,+BAA+B,CAC9BuC,2BAA2B,EAC3B,SAAS,EACT+C,aAAa,EAAEvE,WAAW,EAAE0E,OAC7B,CAAC;MACDvF,0BAA0B,CAACoF,aAAa,EAAEvE,WAAW,EAAEqB,aAAa,CAAC;MAErE,MAAMsD,OAAO,GAAGnF,+BAA+B,CAAC;QAC/C2E,uBAAuB,EAAE,IAAI;QAC7BS,gBAAgB,EAAEL,aAAa,EAAEtE,SAAS;QAC1C4E,aAAa,EAAEtE;MAChB,CAAC,CAAC;MAEF,OAAOoE,OAAO,CAACtB,eAAe,CAACyB,MAAM,GAClCH,OAAO,CAACtB,eAAe,GACvBvD,eAAe;IACnB;IAEA,MAAMiF,iBAAiB,GAAGtF,uBAAuB,CAACW,KAAK,EAAE,KAAK,CAAC;IAC/D,MAAM4E,UAAU,GAAG9E,eAAe,CAAC;MAClCC,YAAY,EAAEsB,gBAAgB;MAC9BrB,KAAK;MACLC,aAAa,EAAE0E,iBAAiB;MAChCzE;IACD,CAAC,CAAC;IAEFrB,+BAA+B,CAC9BuC,2BAA2B,EAC3B,MAAM,EACNwD,UAAU,EAAEhF,WAAW,EAAE0E,OAC1B,CAAC;IACDvF,0BAA0B,CAACoB,SAAS,EAAEc,aAAa,CAAC;IAEpD,MAAMsD,OAAO,GAAGnF,+BAA+B,CAAC;MAC/C2E,uBAAuB,EAAE,KAAK;MAC9BS,gBAAgB,EAAEL,aAAa,EAAEtE,SAAS;MAC1C4E,aAAa,EAAEG,UAAU,EAAE/E;IAC5B,CAAC,CAAC;IAEF,OAAO0E,OAAO,CAACtB,eAAe,CAACyB,MAAM,GAClCH,OAAO,CAACtB,eAAe,GACvBvD,eAAe;EACnB,CAAC,CAAC;EAEF,OAAO;IACNuD,eAAe;IACfxB;EACD,CAAC;AACF,CAAC","ignoreList":[]}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import type { ScreenInterpolationProps, ScreenTransitionAccessor } from "../../../../types/animation.types";
|
|
2
|
+
import type { ScreenInterpolatorFrame } from "../../animation/helpers/pipeline";
|
|
3
|
+
import type { SelectedInterpolatorFrame } from "./select-interpolator-frame";
|
|
4
|
+
export declare const createInterpolatorScope: ({ frame, selectedFrame, transition, }: {
|
|
5
|
+
frame: ScreenInterpolatorFrame;
|
|
6
|
+
selectedFrame: SelectedInterpolatorFrame;
|
|
7
|
+
transition: ScreenTransitionAccessor;
|
|
8
|
+
}) => ScreenInterpolationProps;
|
|
9
|
+
//# sourceMappingURL=create-interpolator-scope.d.ts.map
|
package/lib/typescript/shared/providers/screen/styles/helpers/create-interpolator-scope.d.ts.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"create-interpolator-scope.d.ts","sourceRoot":"","sources":["../../../../../../../src/shared/providers/screen/styles/helpers/create-interpolator-scope.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,wBAAwB,EACxB,wBAAwB,EACxB,MAAM,mCAAmC,CAAC;AAE3C,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAChF,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AAE7E,eAAO,MAAM,uBAAuB,GAAI,uCAIrC;IACF,KAAK,EAAE,uBAAuB,CAAC;IAC/B,aAAa,EAAE,yBAAyB,CAAC;IACzC,UAAU,EAAE,wBAAwB,CAAC;CACrC,KAAG,wBA4BH,CAAC"}
|
package/lib/typescript/shared/providers/screen/styles/hooks/use-interpolated-style-maps.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-interpolated-style-maps.d.ts","sourceRoot":"","sources":["../../../../../../../src/shared/providers/screen/styles/hooks/use-interpolated-style-maps.tsx"],"names":[],"mappings":"AACA,OAAO,EACN,KAAK,WAAW,EAIhB,MAAM,yBAAyB,CAAC;AA2BjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"use-interpolated-style-maps.d.ts","sourceRoot":"","sources":["../../../../../../../src/shared/providers/screen/styles/hooks/use-interpolated-style-maps.tsx"],"names":[],"mappings":"AACA,OAAO,EACN,KAAK,WAAW,EAIhB,MAAM,yBAAyB,CAAC;AA2BjC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gCAAgC,CAAC;AA6EvE;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,wBAAwB,GAAI,iCAGtC;IACF,OAAO,EAAE,OAAO,CAAC;IACjB,iBAAiB,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;CACxC;;;CAoMA,CAAC"}
|
package/package.json
CHANGED
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
import type {
|
|
2
|
+
ScreenInterpolationProps,
|
|
3
|
+
ScreenTransitionAccessor,
|
|
4
|
+
} from "../../../../types/animation.types";
|
|
5
|
+
import { createBoundsAccessor } from "../../../../utils/bounds";
|
|
6
|
+
import type { ScreenInterpolatorFrame } from "../../animation/helpers/pipeline";
|
|
7
|
+
import type { SelectedInterpolatorFrame } from "./select-interpolator-frame";
|
|
8
|
+
|
|
9
|
+
export const createInterpolatorScope = ({
|
|
10
|
+
frame,
|
|
11
|
+
selectedFrame,
|
|
12
|
+
transition,
|
|
13
|
+
}: {
|
|
14
|
+
frame: ScreenInterpolatorFrame;
|
|
15
|
+
selectedFrame: SelectedInterpolatorFrame;
|
|
16
|
+
transition: ScreenTransitionAccessor;
|
|
17
|
+
}): ScreenInterpolationProps => {
|
|
18
|
+
"worklet";
|
|
19
|
+
|
|
20
|
+
const selectedProps = {
|
|
21
|
+
...frame,
|
|
22
|
+
...selectedFrame,
|
|
23
|
+
};
|
|
24
|
+
let scope: ScreenInterpolationProps;
|
|
25
|
+
const scopedTransition: ScreenTransitionAccessor = (target) => {
|
|
26
|
+
"worklet";
|
|
27
|
+
|
|
28
|
+
if ((target?.depth ?? 0) === 0) {
|
|
29
|
+
return scope;
|
|
30
|
+
}
|
|
31
|
+
|
|
32
|
+
return transition(target);
|
|
33
|
+
};
|
|
34
|
+
|
|
35
|
+
scope = {
|
|
36
|
+
...selectedProps,
|
|
37
|
+
bounds: createBoundsAccessor(() => {
|
|
38
|
+
"worklet";
|
|
39
|
+
return selectedProps;
|
|
40
|
+
}),
|
|
41
|
+
transition: scopedTransition,
|
|
42
|
+
};
|
|
43
|
+
|
|
44
|
+
return scope;
|
|
45
|
+
};
|
|
@@ -18,7 +18,6 @@ import type {
|
|
|
18
18
|
} from "../../../../types/animation.types";
|
|
19
19
|
import { logger } from "../../../../utils/logger";
|
|
20
20
|
import { useScreenAnimationStore } from "../../animation";
|
|
21
|
-
import { useBuildBoundsAccessor } from "../../animation/helpers/accessors/use-build-bounds-accessor";
|
|
22
21
|
import { useBuildTransitionAccessor } from "../../animation/helpers/accessors/use-build-transition-accessor";
|
|
23
22
|
import type { ScreenInterpolatorFrame } from "../../animation/helpers/pipeline";
|
|
24
23
|
import { readScreenAnimationRevisions } from "../../animation/helpers/read-screen-animation-revisions";
|
|
@@ -29,6 +28,7 @@ import {
|
|
|
29
28
|
useScreenOptionsStore,
|
|
30
29
|
} from "../../options";
|
|
31
30
|
import { collectInterpolatorSharedValues } from "../helpers/collect-interpolator-shared-values";
|
|
31
|
+
import { createInterpolatorScope } from "../helpers/create-interpolator-scope";
|
|
32
32
|
import { normalizeSlots } from "../helpers/normalize-slots";
|
|
33
33
|
import { resolveInterpolatorStyleHandoff } from "../helpers/resolve-interpolator-style-handoff";
|
|
34
34
|
import type { LocalStyleLayers } from "../helpers/resolve-slot-styles";
|
|
@@ -54,7 +54,6 @@ type RunInterpolatorParams = {
|
|
|
54
54
|
interpolator: ScreenStyleInterpolator | undefined;
|
|
55
55
|
props: ScreenInterpolatorFrame;
|
|
56
56
|
selectedFrame: SelectedInterpolatorFrame;
|
|
57
|
-
bounds: Parameters<ScreenStyleInterpolator>[0]["bounds"];
|
|
58
57
|
transition: Parameters<ScreenStyleInterpolator>[0]["transition"];
|
|
59
58
|
};
|
|
60
59
|
|
|
@@ -76,7 +75,6 @@ const runInterpolator = ({
|
|
|
76
75
|
interpolator,
|
|
77
76
|
props,
|
|
78
77
|
selectedFrame,
|
|
79
|
-
bounds,
|
|
80
78
|
transition,
|
|
81
79
|
}: RunInterpolatorParams): InterpolatorResult | undefined => {
|
|
82
80
|
"worklet";
|
|
@@ -86,12 +84,13 @@ const runInterpolator = ({
|
|
|
86
84
|
}
|
|
87
85
|
|
|
88
86
|
try {
|
|
89
|
-
const raw = interpolator(
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
87
|
+
const raw = interpolator(
|
|
88
|
+
createInterpolatorScope({
|
|
89
|
+
frame: props,
|
|
90
|
+
selectedFrame,
|
|
91
|
+
transition,
|
|
92
|
+
}),
|
|
93
|
+
);
|
|
95
94
|
|
|
96
95
|
const rawStyleMap: TransitionInterpolatedStyle | undefined =
|
|
97
96
|
typeof raw === "object" && raw != null ? raw : undefined;
|
|
@@ -154,7 +153,6 @@ export const useInterpolatedStylesMap = ({
|
|
|
154
153
|
ancestorScreenAnimationSources,
|
|
155
154
|
descendantScreenAnimationSources,
|
|
156
155
|
} = useScreenAnimationStore();
|
|
157
|
-
const boundsAccessor = useBuildBoundsAccessor();
|
|
158
156
|
const transition = useBuildTransitionAccessor();
|
|
159
157
|
const nextInterpolatorReady = useSharedValue(0);
|
|
160
158
|
|
|
@@ -271,7 +269,6 @@ export const useInterpolatedStylesMap = ({
|
|
|
271
269
|
interpolator: currentInterpolator,
|
|
272
270
|
props,
|
|
273
271
|
selectedFrame: currentSelectedFrame,
|
|
274
|
-
bounds: boundsAccessor,
|
|
275
272
|
transition,
|
|
276
273
|
});
|
|
277
274
|
|
|
@@ -309,7 +306,6 @@ export const useInterpolatedStylesMap = ({
|
|
|
309
306
|
interpolator: nextInterpolator,
|
|
310
307
|
props,
|
|
311
308
|
selectedFrame: nextSelectedFrame,
|
|
312
|
-
bounds: boundsAccessor,
|
|
313
309
|
transition,
|
|
314
310
|
});
|
|
315
311
|
|
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
Object.defineProperty(exports, "__esModule", {
|
|
4
|
-
value: true
|
|
5
|
-
});
|
|
6
|
-
exports.useBuildBoundsAccessor = void 0;
|
|
7
|
-
var _react = require("react");
|
|
8
|
-
var _bounds = require("../../../../../utils/bounds");
|
|
9
|
-
var _animation = require("../../animation.provider");
|
|
10
|
-
const useBuildBoundsAccessor = () => {
|
|
11
|
-
const screenInterpolatorProps = (0, _animation.useScreenAnimationStore)(store => store.screenInterpolatorProps);
|
|
12
|
-
return (0, _react.useMemo)(() => {
|
|
13
|
-
return (0, _bounds.createBoundsAccessor)(() => {
|
|
14
|
-
"worklet";
|
|
15
|
-
|
|
16
|
-
return screenInterpolatorProps.get();
|
|
17
|
-
});
|
|
18
|
-
}, [screenInterpolatorProps]);
|
|
19
|
-
};
|
|
20
|
-
exports.useBuildBoundsAccessor = useBuildBoundsAccessor;
|
|
21
|
-
//# sourceMappingURL=use-build-bounds-accessor.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_bounds","_animation","useBuildBoundsAccessor","screenInterpolatorProps","useScreenAnimationStore","store","useMemo","createBoundsAccessor","get","exports"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,OAAA,GAAAD,OAAA;AACA,IAAAE,UAAA,GAAAF,OAAA;AAEO,MAAMG,sBAAsB,GAAGA,CAAA,KAAM;EAC3C,MAAMC,uBAAuB,GAAG,IAAAC,kCAAuB,EACrDC,KAAK,IAAKA,KAAK,CAACF,uBAClB,CAAC;EACD,OAAO,IAAAG,cAAO,EAAC,MAAM;IACpB,OAAO,IAAAC,4BAAoB,EAAC,MAAM;MACjC,SAAS;;MACT,OAAOJ,uBAAuB,CAACK,GAAG,CAAC,CAAC;IACrC,CAAC,CAAC;EACH,CAAC,EAAE,CAACL,uBAAuB,CAAC,CAAC;AAC9B,CAAC;AAACM,OAAA,CAAAP,sBAAA,GAAAA,sBAAA","ignoreList":[]}
|
package/lib/module/shared/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.js
DELETED
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
|
|
3
|
-
import { useMemo } from "react";
|
|
4
|
-
import { createBoundsAccessor } from "../../../../../utils/bounds";
|
|
5
|
-
import { useScreenAnimationStore } from "../../animation.provider";
|
|
6
|
-
export const useBuildBoundsAccessor = () => {
|
|
7
|
-
const screenInterpolatorProps = useScreenAnimationStore(store => store.screenInterpolatorProps);
|
|
8
|
-
return useMemo(() => {
|
|
9
|
-
return createBoundsAccessor(() => {
|
|
10
|
-
"worklet";
|
|
11
|
-
|
|
12
|
-
return screenInterpolatorProps.get();
|
|
13
|
-
});
|
|
14
|
-
}, [screenInterpolatorProps]);
|
|
15
|
-
};
|
|
16
|
-
//# sourceMappingURL=use-build-bounds-accessor.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"names":["useMemo","createBoundsAccessor","useScreenAnimationStore","useBuildBoundsAccessor","screenInterpolatorProps","store","get"],"sourceRoot":"../../../../../../../../src","sources":["shared/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.tsx"],"mappings":";;AAAA,SAASA,OAAO,QAAQ,OAAO;AAC/B,SAASC,oBAAoB,QAAQ,6BAA6B;AAClE,SAASC,uBAAuB,QAAQ,0BAA0B;AAElE,OAAO,MAAMC,sBAAsB,GAAGA,CAAA,KAAM;EAC3C,MAAMC,uBAAuB,GAAGF,uBAAuB,CACrDG,KAAK,IAAKA,KAAK,CAACD,uBAClB,CAAC;EACD,OAAOJ,OAAO,CAAC,MAAM;IACpB,OAAOC,oBAAoB,CAAC,MAAM;MACjC,SAAS;;MACT,OAAOG,uBAAuB,CAACE,GAAG,CAAC,CAAC;IACrC,CAAC,CAAC;EACH,CAAC,EAAE,CAACF,uBAAuB,CAAC,CAAC;AAC9B,CAAC","ignoreList":[]}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"use-build-bounds-accessor.d.ts","sourceRoot":"","sources":["../../../../../../../../src/shared/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.tsx"],"names":[],"mappings":"AAIA,eAAO,MAAM,sBAAsB,qDAUlC,CAAC"}
|
package/src/shared/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.tsx
DELETED
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
import { useMemo } from "react";
|
|
2
|
-
import { createBoundsAccessor } from "../../../../../utils/bounds";
|
|
3
|
-
import { useScreenAnimationStore } from "../../animation.provider";
|
|
4
|
-
|
|
5
|
-
export const useBuildBoundsAccessor = () => {
|
|
6
|
-
const screenInterpolatorProps = useScreenAnimationStore(
|
|
7
|
-
(store) => store.screenInterpolatorProps,
|
|
8
|
-
);
|
|
9
|
-
return useMemo(() => {
|
|
10
|
-
return createBoundsAccessor(() => {
|
|
11
|
-
"worklet";
|
|
12
|
-
return screenInterpolatorProps.get();
|
|
13
|
-
});
|
|
14
|
-
}, [screenInterpolatorProps]);
|
|
15
|
-
};
|