react-native-screen-transitions 4.0.0-alpha.4 → 4.0.0-alpha.6
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/components/boundary/hooks/lifecycles/use-initial-destination-measurement.js +17 -9
- package/lib/commonjs/components/boundary/hooks/lifecycles/use-initial-destination-measurement.js.map +1 -1
- package/lib/commonjs/components/boundary/portal/components/boundary-portal/components/portal-boundary-host.js +4 -15
- package/lib/commonjs/components/boundary/portal/components/boundary-portal/components/portal-boundary-host.js.map +1 -1
- package/lib/commonjs/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.js +22 -24
- package/lib/commonjs/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.js.map +1 -1
- package/lib/commonjs/components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.js +3 -36
- package/lib/commonjs/components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.js.map +1 -1
- package/lib/commonjs/components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.js +1 -1
- package/lib/commonjs/components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.js.map +1 -1
- package/lib/commonjs/components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.js +1 -1
- package/lib/commonjs/components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.js.map +1 -1
- package/lib/commonjs/components/boundary/utils/destination-signals.js +7 -1
- package/lib/commonjs/components/boundary/utils/destination-signals.js.map +1 -1
- package/lib/commonjs/providers/screen/styles/helpers/create-interpolator-scope.js +40 -0
- package/lib/commonjs/providers/screen/styles/helpers/create-interpolator-scope.js.map +1 -0
- package/lib/commonjs/providers/screen/styles/helpers/resolve-interpolator-style-handoff.js +15 -14
- package/lib/commonjs/providers/screen/styles/helpers/resolve-interpolator-style-handoff.js.map +1 -1
- package/lib/commonjs/providers/screen/styles/hooks/use-interpolated-style-maps.js +22 -27
- package/lib/commonjs/providers/screen/styles/hooks/use-interpolated-style-maps.js.map +1 -1
- package/lib/commonjs/stores/bounds/internals/entries.js +13 -3
- package/lib/commonjs/stores/bounds/internals/entries.js.map +1 -1
- package/lib/module/components/boundary/hooks/lifecycles/use-initial-destination-measurement.js +18 -10
- package/lib/module/components/boundary/hooks/lifecycles/use-initial-destination-measurement.js.map +1 -1
- package/lib/module/components/boundary/portal/components/boundary-portal/components/portal-boundary-host.js +4 -15
- package/lib/module/components/boundary/portal/components/boundary-portal/components/portal-boundary-host.js.map +1 -1
- package/lib/module/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.js +22 -24
- package/lib/module/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.js.map +1 -1
- package/lib/module/components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.js +3 -36
- package/lib/module/components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.js.map +1 -1
- package/lib/module/components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.js +2 -2
- package/lib/module/components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.js.map +1 -1
- package/lib/module/components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.js +1 -1
- package/lib/module/components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.js.map +1 -1
- package/lib/module/components/boundary/utils/destination-signals.js +7 -1
- package/lib/module/components/boundary/utils/destination-signals.js.map +1 -1
- package/lib/module/providers/screen/styles/helpers/create-interpolator-scope.js +35 -0
- package/lib/module/providers/screen/styles/helpers/create-interpolator-scope.js.map +1 -0
- package/lib/module/providers/screen/styles/helpers/resolve-interpolator-style-handoff.js +15 -14
- package/lib/module/providers/screen/styles/helpers/resolve-interpolator-style-handoff.js.map +1 -1
- package/lib/module/providers/screen/styles/hooks/use-interpolated-style-maps.js +22 -27
- package/lib/module/providers/screen/styles/hooks/use-interpolated-style-maps.js.map +1 -1
- package/lib/module/stores/bounds/internals/entries.js +13 -3
- package/lib/module/stores/bounds/internals/entries.js.map +1 -1
- package/lib/typescript/components/boundary/hooks/lifecycles/use-initial-destination-measurement.d.ts.map +1 -1
- package/lib/typescript/components/boundary/portal/components/boundary-portal/components/portal-boundary-host.d.ts.map +1 -1
- package/lib/typescript/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.d.ts +1 -5
- package/lib/typescript/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.d.ts.map +1 -1
- package/lib/typescript/components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.d.ts.map +1 -1
- package/lib/typescript/components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.d.ts.map +1 -1
- package/lib/typescript/components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.d.ts +0 -2
- package/lib/typescript/components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.d.ts.map +1 -1
- package/lib/typescript/components/boundary/utils/destination-signals.d.ts +1 -1
- package/lib/typescript/components/boundary/utils/destination-signals.d.ts.map +1 -1
- package/lib/typescript/navigators/react-navigation/index.d.ts +1 -1
- package/lib/typescript/providers/screen/styles/helpers/create-interpolator-scope.d.ts +9 -0
- package/lib/typescript/providers/screen/styles/helpers/create-interpolator-scope.d.ts.map +1 -0
- package/lib/typescript/providers/screen/styles/helpers/resolve-interpolator-style-handoff.d.ts +1 -3
- package/lib/typescript/providers/screen/styles/helpers/resolve-interpolator-style-handoff.d.ts.map +1 -1
- package/lib/typescript/providers/screen/styles/hooks/use-interpolated-style-maps.d.ts +4 -4
- package/lib/typescript/providers/screen/styles/hooks/use-interpolated-style-maps.d.ts.map +1 -1
- package/lib/typescript/stores/bounds/internals/entries.d.ts +1 -1
- package/lib/typescript/stores/bounds/internals/entries.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/components/boundary/hooks/lifecycles/use-initial-destination-measurement.ts +34 -13
- package/src/components/boundary/portal/components/boundary-portal/components/portal-boundary-host.tsx +4 -20
- package/src/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.ts +27 -37
- package/src/components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.ts +10 -57
- package/src/components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.ts +1 -8
- package/src/components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.ts +0 -3
- package/src/components/boundary/utils/destination-signals.ts +6 -2
- package/src/providers/screen/styles/helpers/create-interpolator-scope.ts +45 -0
- package/src/providers/screen/styles/helpers/resolve-interpolator-style-handoff.ts +16 -16
- package/src/providers/screen/styles/hooks/use-interpolated-style-maps.tsx +28 -35
- package/src/stores/bounds/internals/entries.ts +12 -1
- package/lib/commonjs/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.js +0 -18
- package/lib/commonjs/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.js.map +0 -1
- package/lib/commonjs/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.js +0 -21
- package/lib/commonjs/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.js.map +0 -1
- package/lib/module/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.js +0 -13
- package/lib/module/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.js.map +0 -1
- package/lib/module/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.js +0 -16
- package/lib/module/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.js.map +0 -1
- package/lib/typescript/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.d.ts +0 -3
- package/lib/typescript/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.d.ts.map +0 -1
- package/lib/typescript/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.d.ts +0 -2
- package/lib/typescript/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.d.ts.map +0 -1
- package/src/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.ts +0 -16
- package/src/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.tsx +0 -15
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCallback","useLayoutEffect","useRef","useState","useAnimatedReaction","scheduleOnRN","
|
|
1
|
+
{"version":3,"names":["useCallback","useLayoutEffect","useRef","useState","useAnimatedReaction","scheduleOnRN","getPairKeyForSource","createBoundaryPortalHostName","mountPortalBoundaryHost","unmountPortalBoundaryHostByName","useActivePortalBoundaryHost","boundaryId","currentScreenKey","escapeHostKey","portalHostName","portalHostReady","slotsMap","activePortal","setActivePortal","activePairKeyRef","updateActivePortal","pairKey","current","isBoundaryAnimating","get","undefined","previousPairKey","set","nextPortalHostName","hostKey","screenKey"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,eAAe,EAAEC,MAAM,EAAEC,QAAQ,QAAQ,OAAO;AACtE,SAA2BC,mBAAmB,QAAQ,yBAAyB;AAC/E,SAASC,YAAY,QAAQ,uBAAuB;AACpD,SAASC,mBAAmB,QAAQ,iDAAiD;AAGrF,SAASC,4BAA4B,QAAQ,uBAAuB;AACpE,SACCC,uBAAuB,EACvBC,+BAA+B,QACzB,sCAAsC;AAe7C,OAAO,MAAMC,2BAA2B,GAAGA,CAAC;EAC3CC,UAAU;EACVC,gBAAgB;EAChBC,aAAa;EACbC,cAAc;EACdC,eAAe;EACfC;AACkC,CAAC,KAAK;EACxC,MAAM,CAACC,YAAY,EAAEC,eAAe,CAAC,GAAGf,QAAQ,CAAsB,IAAI,CAAC;EAC3E,MAAMgB,gBAAgB,GAAGjB,MAAM,CAAuB,IAAI,CAAC;EAE3D,MAAMkB,kBAAkB,GAAGpB,WAAW,CAAEqB,OAA6B,IAAK;IACzE,IAAIF,gBAAgB,CAACG,OAAO,KAAKD,OAAO,EAAE;MACzC;IACD;IAEAF,gBAAgB,CAACG,OAAO,GAAGD,OAAO;IAClCH,eAAe,CAACG,OAAO,GAAG;MAAEA;IAAQ,CAAC,GAAG,IAAI,CAAC;EAC9C,CAAC,EAAE,EAAE,CAAC;EAENjB,mBAAmB,CAClB,MAAM;IACL,SAAS;;IACT,MAAMmB,mBAAmB,GAAGP,QAAQ,CAACQ,GAAG,CAAC,CAAC,CAACb,UAAU,CAAC,KAAKc,SAAS;IACpE,IAAI,CAACF,mBAAmB,EAAE;MACzB,OAAO,IAAI;IACZ;IAEA,OAAOjB,mBAAmB,CAACK,UAAU,EAAEC,gBAAgB,CAAC;EACzD,CAAC,EACD,CAACS,OAAO,EAAEK,eAAe,KAAK;IAC7B,SAAS;;IACT,IAAIL,OAAO,KAAKK,eAAe,EAAE;MAChC;IACD;IAEArB,YAAY,CAACe,kBAAkB,EAAEC,OAAO,CAAC;EAC1C,CACD,CAAC;EAEDpB,eAAe,CAAC,MAAM;IACrB,IAAI,CAACgB,YAAY,IAAI,CAACJ,aAAa,EAAE;MACpCC,cAAc,CAACa,GAAG,CAAC,IAAI,CAAC;MACxBZ,eAAe,CAACY,GAAG,CAAC,KAAK,CAAC;MAC1B;IACD;IAEA,MAAMC,kBAAkB,GAAGrB,4BAA4B,CACtDM,aAAa,EACbF,UAAU,EACVM,YAAY,CAACI,OACd,CAAC;IAEDb,uBAAuB,CAAC;MACvBG,UAAU;MACVkB,OAAO,EAAEhB,aAAa;MACtBQ,OAAO,EAAEJ,YAAY,CAACI,OAAO;MAC7BP,cAAc,EAAEc,kBAAkB;MAClCb,eAAe;MACfe,SAAS,EAAElB,gBAAgB;MAC3BI;IACD,CAAC,CAAC;IACFF,cAAc,CAACa,GAAG,CAACC,kBAAkB,CAAC;IAEtC,OAAO,MAAM;MACZd,cAAc,CAACa,GAAG,CAAC,IAAI,CAAC;MACxBZ,eAAe,CAACY,GAAG,CAAC,KAAK,CAAC;MAC1BlB,+BAA+B,CAACmB,kBAAkB,CAAC;IACpD,CAAC;EACF,CAAC,EAAE,CACFX,YAAY,EACZN,UAAU,EACVC,gBAAgB,EAChBC,aAAa,EACbC,cAAc,EACdC,eAAe,EACfC,QAAQ,CACR,CAAC;AACH,CAAC","ignoreList":[]}
|
|
@@ -3,40 +3,26 @@
|
|
|
3
3
|
import { useAnimatedProps, useSharedValue } from "react-native-reanimated";
|
|
4
4
|
import { useDescriptorsStore } from "../../../../../../providers/screen/descriptors";
|
|
5
5
|
import { useScreenSlots } from "../../../../../../providers/screen/styles";
|
|
6
|
-
import { hasCloseTransitionFinished } from "../../../../../../providers/screen/styles/helpers/transition-visual-state";
|
|
7
|
-
import { AnimationStore } from "../../../../../../stores/animation.store";
|
|
8
|
-
import { pairs } from "../../../../../../stores/bounds/internals/state";
|
|
9
|
-
import { SystemStore } from "../../../../../../stores/system.store";
|
|
10
6
|
import { PORTAL_HOST_NAME_RESET_VALUE } from "../../../utils/naming";
|
|
11
7
|
import { isTeleportEnabled } from "../../../utils/teleport-control";
|
|
12
|
-
import { hasActiveBoundaryPortalLink } from "../helpers/active-pair";
|
|
13
8
|
import { useActiveHostKey } from "../stores/host-registry.store";
|
|
14
9
|
import { useActivePortalBoundaryHost } from "./use-active-portal-boundary-host";
|
|
15
10
|
export const useBoundaryPortalAttachment = ({
|
|
16
11
|
boundaryId
|
|
17
12
|
}) => {
|
|
18
|
-
const sourcePairKey = useDescriptorsStore(s => s.derivations.sourcePairKey);
|
|
19
13
|
const currentScreenKey = useDescriptorsStore(s => s.derivations.currentScreenKey);
|
|
20
|
-
const nextScreenKey = useDescriptorsStore(s => s.derivations.nextScreenKey);
|
|
21
|
-
const destinationScreenKey = nextScreenKey ?? currentScreenKey;
|
|
22
|
-
const destinationAnimationProgress = SystemStore.getValue(destinationScreenKey, "animationProgress");
|
|
23
|
-
const destinationClosing = AnimationStore.getValue(destinationScreenKey, "closing");
|
|
24
14
|
const {
|
|
25
|
-
localStylesMaps,
|
|
26
15
|
slotsMap
|
|
27
16
|
} = useScreenSlots();
|
|
28
17
|
const portalHostName = useSharedValue(null);
|
|
29
18
|
const portalHostReady = useSharedValue(false);
|
|
30
|
-
const attachedDestination = useSharedValue(null);
|
|
31
19
|
const escapeHostKey = useActiveHostKey(currentScreenKey);
|
|
32
20
|
useActivePortalBoundaryHost({
|
|
33
21
|
boundaryId,
|
|
34
22
|
currentScreenKey,
|
|
35
23
|
escapeHostKey,
|
|
36
|
-
localStylesMaps,
|
|
37
24
|
portalHostName,
|
|
38
25
|
portalHostReady,
|
|
39
|
-
sourcePairKey,
|
|
40
26
|
slotsMap
|
|
41
27
|
});
|
|
42
28
|
const teleportProps = useAnimatedProps(() => {
|
|
@@ -48,30 +34,11 @@ export const useBoundaryPortalAttachment = ({
|
|
|
48
34
|
teleport,
|
|
49
35
|
...slotProps
|
|
50
36
|
} = slot?.props ?? {};
|
|
51
|
-
const
|
|
52
|
-
const hostName = portalHostName.get();
|
|
53
|
-
const hasActiveLink = hasActiveBoundaryPortalLink({
|
|
54
|
-
boundaryId,
|
|
55
|
-
pairsState: pairs.get(),
|
|
56
|
-
sourcePairKey
|
|
57
|
-
});
|
|
58
|
-
const hasAttachableHost = shouldTeleport && hasActiveLink && portalHostReady.get() && hostName;
|
|
59
|
-
if (hasAttachableHost) {
|
|
60
|
-
attachedDestination.set({
|
|
61
|
-
animationProgress: destinationAnimationProgress,
|
|
62
|
-
closing: destinationClosing
|
|
63
|
-
});
|
|
64
|
-
}
|
|
65
|
-
const attached = attachedDestination.get();
|
|
66
|
-
const hasAttachedCloseFinished = attached !== null && hasCloseTransitionFinished({
|
|
67
|
-
animationProgress: attached.animationProgress.get(),
|
|
68
|
-
closing: attached.closing.get()
|
|
69
|
-
});
|
|
70
|
-
const canAttach = hasAttachableHost && !hasAttachedCloseFinished;
|
|
71
|
-
const targetHostName = canAttach ? hostName : PORTAL_HOST_NAME_RESET_VALUE;
|
|
37
|
+
const shouldAttach = slot !== undefined && isTeleportEnabled(teleport) && portalHostReady.get();
|
|
38
|
+
const hostName = shouldAttach ? portalHostName.get() : PORTAL_HOST_NAME_RESET_VALUE;
|
|
72
39
|
return {
|
|
73
40
|
...slotProps,
|
|
74
|
-
hostName
|
|
41
|
+
hostName
|
|
75
42
|
};
|
|
76
43
|
});
|
|
77
44
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useAnimatedProps","useSharedValue","useDescriptorsStore","useScreenSlots","
|
|
1
|
+
{"version":3,"names":["useAnimatedProps","useSharedValue","useDescriptorsStore","useScreenSlots","PORTAL_HOST_NAME_RESET_VALUE","isTeleportEnabled","useActiveHostKey","useActivePortalBoundaryHost","useBoundaryPortalAttachment","boundaryId","currentScreenKey","s","derivations","slotsMap","portalHostName","portalHostReady","escapeHostKey","teleportProps","slot","get","pointerEvents","_pointerEvents","teleport","slotProps","props","shouldAttach","undefined","hostName"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.ts"],"mappings":";;AAAA,SAASA,gBAAgB,EAAEC,cAAc,QAAQ,yBAAyB;AAC1E,SAASC,mBAAmB,QAAQ,gDAAgD;AACpF,SAASC,cAAc,QAAQ,2CAA2C;AAC1E,SAASC,4BAA4B,QAAQ,uBAAuB;AACpE,SAASC,iBAAiB,QAAQ,iCAAiC;AACnE,SAASC,gBAAgB,QAAQ,+BAA+B;AAChE,SAASC,2BAA2B,QAAQ,mCAAmC;AAM/E,OAAO,MAAMC,2BAA2B,GAAGA,CAAC;EAC3CC;AACkC,CAAC,KAAK;EACxC,MAAMC,gBAAgB,GAAGR,mBAAmB,CAC1CS,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACF,gBACtB,CAAC;EACD,MAAM;IAAEG;EAAS,CAAC,GAAGV,cAAc,CAAC,CAAC;EACrC,MAAMW,cAAc,GAAGb,cAAc,CAAgB,IAAI,CAAC;EAC1D,MAAMc,eAAe,GAAGd,cAAc,CAAC,KAAK,CAAC;EAC7C,MAAMe,aAAa,GAAGV,gBAAgB,CAACI,gBAAgB,CAAC;EAExDH,2BAA2B,CAAC;IAC3BE,UAAU;IACVC,gBAAgB;IAChBM,aAAa;IACbF,cAAc;IACdC,eAAe;IACfF;EACD,CAAC,CAAC;EAEF,MAAMI,aAAa,GAAGjB,gBAAgB,CAAC,MAAM;IAC5C,SAAS;;IAET,MAAMkB,IAAI,GAAGL,QAAQ,CAACM,GAAG,CAAC,CAAC,CAACV,UAAU,CAAC;IACvC,MAAM;MACLW,aAAa,EAAEC,cAAc;MAC7BC,QAAQ;MACR,GAAGC;IACJ,CAAC,GAAGL,IAAI,EAAEM,KAAK,IAAI,CAAC,CAAC;IACrB,MAAMC,YAAY,GACjBP,IAAI,KAAKQ,SAAS,IAClBrB,iBAAiB,CAACiB,QAAQ,CAAC,IAC3BP,eAAe,CAACI,GAAG,CAAC,CAAC;IACtB,MAAMQ,QAAQ,GAAGF,YAAY,GAC1BX,cAAc,CAACK,GAAG,CAAC,CAAC,GACpBf,4BAA4B;IAE/B,OAAO;MACN,GAAGmB,SAAS;MACZI;IACD,CAAC;EACF,CAAC,CAAC;EAEF,OAAO;IAAEV;EAAc,CAAC;AACzB,CAAC","ignoreList":[]}
|
|
@@ -5,7 +5,7 @@ import { cancelAnimation, measure, useAnimatedReaction, useAnimatedRef, useShare
|
|
|
5
5
|
import { scheduleOnUI } from "react-native-worklets";
|
|
6
6
|
import { ScrollStore } from "../../../../../../stores/scroll.store";
|
|
7
7
|
import { getVisibilityBlockOffset } from "../../../../../../utils/visibility-block-offset";
|
|
8
|
-
import { adjustedMeasuredBoundsForOverscrollDeltas, correctMeasuredBoundsForVisibilityGate
|
|
8
|
+
import { adjustedMeasuredBoundsForOverscrollDeltas, correctMeasuredBoundsForVisibilityGate } from "../../../../utils/measured-bounds";
|
|
9
9
|
import { clearPortalHostBounds, setPortalHostBounds } from "../stores/host-bounds.store";
|
|
10
10
|
const HOST_MEASUREMENT_RETRY_DELAY_MS = 16;
|
|
11
11
|
export const useHostMeasurement = ({
|
|
@@ -61,7 +61,7 @@ export const useHostMeasurement = ({
|
|
|
61
61
|
viewportWidth,
|
|
62
62
|
viewportHeight
|
|
63
63
|
});
|
|
64
|
-
if (
|
|
64
|
+
if (correctedMeasured.width <= 0 || correctedMeasured.height <= 0) {
|
|
65
65
|
cancelAnimation(retryToken);
|
|
66
66
|
retryToken.set(withDelay(HOST_MEASUREMENT_RETRY_DELAY_MS, withTiming(retryToken.get() + 1, {
|
|
67
67
|
duration: 0
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useLayoutEffect","cancelAnimation","measure","useAnimatedReaction","useAnimatedRef","useSharedValue","withDelay","withTiming","scheduleOnUI","ScrollStore","getVisibilityBlockOffset","adjustedMeasuredBoundsForOverscrollDeltas","correctMeasuredBoundsForVisibilityGate","
|
|
1
|
+
{"version":3,"names":["useLayoutEffect","cancelAnimation","measure","useAnimatedReaction","useAnimatedRef","useSharedValue","withDelay","withTiming","scheduleOnUI","ScrollStore","getVisibilityBlockOffset","adjustedMeasuredBoundsForOverscrollDeltas","correctMeasuredBoundsForVisibilityGate","clearPortalHostBounds","setPortalHostBounds","HOST_MEASUREMENT_RETRY_DELAY_MS","useHostMeasurement","capturesScroll","enabled","hostKey","screenKey","visibilityBlocked","viewportHeight","viewportWidth","hostRef","scrollMetadata","getValue","hasMeasuredHost","retryToken","get","state","hasAlreadyMeasured","measured","set","duration","currentScroll","overscrollNormalized","correctedMeasured","visibilityBlockOffset","width","height","x","y","pageX","pageY","scroll"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -25,7 +25,7 @@ const emit = () => {
|
|
|
25
25
|
}
|
|
26
26
|
};
|
|
27
27
|
const isSameHost = (a, b) => {
|
|
28
|
-
return a.boundaryId === b.boundaryId && a.hostKey === b.hostKey && a.
|
|
28
|
+
return a.boundaryId === b.boundaryId && a.hostKey === b.hostKey && a.pairKey === b.pairKey && a.portalHostName === b.portalHostName && a.portalHostReady === b.portalHostReady && a.screenKey === b.screenKey && a.slotsMap === b.slotsMap;
|
|
29
29
|
};
|
|
30
30
|
export const mountPortalBoundaryHost = host => {
|
|
31
31
|
const previous = activeBoundaryHosts.get(host.portalHostName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useSyncExternalStore","EMPTY_HOSTS","listeners","Set","activeBoundaryHosts","Map","snapshot","hostsByScope","buildSnapshot","host","values","hosts","hostKey","push","emit","listener","isSameHost","a","b","boundaryId","
|
|
1
|
+
{"version":3,"names":["useSyncExternalStore","EMPTY_HOSTS","listeners","Set","activeBoundaryHosts","Map","snapshot","hostsByScope","buildSnapshot","host","values","hosts","hostKey","push","emit","listener","isSameHost","a","b","boundaryId","pairKey","portalHostName","portalHostReady","screenKey","slotsMap","mountPortalBoundaryHost","previous","get","set","unmountPortalBoundaryHostByName","delete","subscribe","add","useActivePortalBoundaryHosts"],"sourceRoot":"../../../../../../../../src","sources":["components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.ts"],"mappings":";;AAAA,SAASA,oBAAoB,QAAQ,OAAO;AAkB5C,MAAMC,WAAuC,GAAG,EAAE;AAElD,MAAMC,SAAS,GAAG,IAAIC,GAAG,CAAa,CAAC;AACvC,MAAMC,mBAAmB,GAAG,IAAIC,GAAG,CAAmC,CAAC;AAEvE,IAAIC,QAAwB,GAAG;EAC9BC,YAAY,EAAE,CAAC;AAChB,CAAC;AAED,MAAMC,aAAa,GAAGA,CAAA,KAAsB;EAC3C,MAAMD,YAAwD,GAAG,CAAC,CAAC;EAEnE,KAAK,MAAME,IAAI,IAAIL,mBAAmB,CAACM,MAAM,CAAC,CAAC,EAAE;IAChD,MAAMC,KAAK,GAAGJ,YAAY,CAACE,IAAI,CAACG,OAAO,CAAC,IAAI,EAAE;IAC9CD,KAAK,CAACE,IAAI,CAACJ,IAAI,CAAC;IAChBF,YAAY,CAACE,IAAI,CAACG,OAAO,CAAC,GAAGD,KAAK;EACnC;EAEA,OAAO;IACNJ;EACD,CAAC;AACF,CAAC;AAED,MAAMO,IAAI,GAAGA,CAAA,KAAM;EAClBR,QAAQ,GAAGE,aAAa,CAAC,CAAC;EAE1B,KAAK,MAAMO,QAAQ,IAAIb,SAAS,EAAE;IACjCa,QAAQ,CAAC,CAAC;EACX;AACD,CAAC;AAED,MAAMC,UAAU,GAAGA,CAClBC,CAA2B,EAC3BC,CAA2B,KACvB;EACJ,OACCD,CAAC,CAACE,UAAU,KAAKD,CAAC,CAACC,UAAU,IAC7BF,CAAC,CAACL,OAAO,KAAKM,CAAC,CAACN,OAAO,IACvBK,CAAC,CAACG,OAAO,KAAKF,CAAC,CAACE,OAAO,IACvBH,CAAC,CAACI,cAAc,KAAKH,CAAC,CAACG,cAAc,IACrCJ,CAAC,CAACK,eAAe,KAAKJ,CAAC,CAACI,eAAe,IACvCL,CAAC,CAACM,SAAS,KAAKL,CAAC,CAACK,SAAS,IAC3BN,CAAC,CAACO,QAAQ,KAAKN,CAAC,CAACM,QAAQ;AAE3B,CAAC;AAED,OAAO,MAAMC,uBAAuB,GAAIhB,IAA8B,IAAK;EAC1E,MAAMiB,QAAQ,GAAGtB,mBAAmB,CAACuB,GAAG,CAAClB,IAAI,CAACY,cAAc,CAAC;EAC7D,IAAIK,QAAQ,IAAIV,UAAU,CAACU,QAAQ,EAAEjB,IAAI,CAAC,EAAE;IAC3C;EACD;EAEAL,mBAAmB,CAACwB,GAAG,CAACnB,IAAI,CAACY,cAAc,EAAEZ,IAAI,CAAC;EAClDK,IAAI,CAAC,CAAC;AACP,CAAC;AAED,OAAO,MAAMe,+BAA+B,GAC3CR,cAAyC,IACrC;EACJ,IAAI,CAACA,cAAc,IAAI,CAACjB,mBAAmB,CAAC0B,MAAM,CAACT,cAAc,CAAC,EAAE;IACnE;EACD;EAEAP,IAAI,CAAC,CAAC;AACP,CAAC;AAED,MAAMiB,SAAS,GAAIhB,QAAoB,IAAK;EAC3Cb,SAAS,CAAC8B,GAAG,CAACjB,QAAQ,CAAC;EAEvB,OAAO,MAAM;IACZb,SAAS,CAAC4B,MAAM,CAACf,QAAQ,CAAC;EAC3B,CAAC;AACF,CAAC;AAED,OAAO,MAAMkB,4BAA4B,GAAIrB,OAAe,IAAK;EAChE,OAAOZ,oBAAoB,CAC1B+B,SAAS,EACT,MAAMzB,QAAQ,CAACC,YAAY,CAACK,OAAO,CAAC,IAAIX,WAAW,EACnD,MAAMA,WACP,CAAC;AACF,CAAC","ignoreList":[]}
|
|
@@ -13,9 +13,15 @@ export const getInitialDestinationMeasurementSignal = params => {
|
|
|
13
13
|
sourcePresent,
|
|
14
14
|
linkState
|
|
15
15
|
} = params;
|
|
16
|
-
if (!enabled
|
|
16
|
+
if (!enabled) {
|
|
17
17
|
return null;
|
|
18
18
|
}
|
|
19
|
+
if (!pairKey) {
|
|
20
|
+
return {
|
|
21
|
+
pairKey: null,
|
|
22
|
+
action: "wait"
|
|
23
|
+
};
|
|
24
|
+
}
|
|
19
25
|
if (!destinationPresent) {
|
|
20
26
|
return {
|
|
21
27
|
pairKey,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["getActiveGroupId","getLinkKeyFromTag","getInitialDestinationMeasurementSignal","params","enabled","pairKey","linkId","group","destinationPresent","sourcePresent","linkState","action","linkKey","activeGroupId","link","links","destination","source"],"sourceRoot":"../../../../../src","sources":["components/boundary/utils/destination-signals.ts"],"mappings":";;AAAA,SACCA,gBAAgB,EAChBC,iBAAiB,QACX,mDAAmD;AAiB1D,OAAO,MAAMC,sCAAsC,GAAIC,MAQtD,IAAiD;EACjD,SAAS;;EACT,MAAM;IACLC,OAAO;IACPC,OAAO;IACPC,MAAM;IACNC,KAAK;IACLC,kBAAkB;IAClBC,aAAa;IACbC;EACD,CAAC,GAAGP,MAAM;EACV,IAAI,CAACC,OAAO,IAAI,CAACC,OAAO,EAAE;
|
|
1
|
+
{"version":3,"names":["getActiveGroupId","getLinkKeyFromTag","getInitialDestinationMeasurementSignal","params","enabled","pairKey","linkId","group","destinationPresent","sourcePresent","linkState","action","linkKey","activeGroupId","link","links","destination","source"],"sourceRoot":"../../../../../src","sources":["components/boundary/utils/destination-signals.ts"],"mappings":";;AAAA,SACCA,gBAAgB,EAChBC,iBAAiB,QACX,mDAAmD;AAiB1D,OAAO,MAAMC,sCAAsC,GAAIC,MAQtD,IAAiD;EACjD,SAAS;;EACT,MAAM;IACLC,OAAO;IACPC,OAAO;IACPC,MAAM;IACNC,KAAK;IACLC,kBAAkB;IAClBC,aAAa;IACbC;EACD,CAAC,GAAGP,MAAM;EACV,IAAI,CAACC,OAAO,EAAE;IACb,OAAO,IAAI;EACZ;EAEA,IAAI,CAACC,OAAO,EAAE;IACb,OAAO;MAAEA,OAAO,EAAE,IAAI;MAAEM,MAAM,EAAE;IAAO,CAAC;EACzC;EAEA,IAAI,CAACH,kBAAkB,EAAE;IACxB,OAAO;MAAEH,OAAO;MAAEM,MAAM,EAAE;IAAO,CAAC;EACnC;EAEA,IAAI,CAACF,aAAa,EAAE;IACnB,OAAO;MAAEJ,OAAO;MAAEM,MAAM,EAAE;IAAU,CAAC;EACtC;EAEA,MAAMC,OAAO,GAAGX,iBAAiB,CAACK,MAAM,CAAC;EACzC,MAAMO,aAAa,GAClBN,KAAK,IAAIG,SAAS,GAAGV,gBAAgB,CAACU,SAAS,EAAEL,OAAO,EAAEE,KAAK,CAAC,GAAG,IAAI;EAExE,IAAIM,aAAa,IAAIA,aAAa,KAAKD,OAAO,EAAE;IAC/C,OAAO;MAAEP,OAAO;MAAEM,MAAM,EAAE;IAAU,CAAC;EACtC;EAEA,MAAMG,IAAI,GAAGJ,SAAS,GAAGL,OAAO,CAAC,EAAEU,KAAK,GAAGH,OAAO,CAAC;EAEnD,IAAI,CAACE,IAAI,EAAEE,WAAW,EAAE;IACvB,OAAO;MAAEX,OAAO;MAAEM,MAAM,EAAE;IAAU,CAAC;EACtC;EAEA,IAAI,CAACG,IAAI,CAACG,MAAM,EAAE;IACjB,OAAO;MAAEZ,OAAO;MAAEM,MAAM,EAAE;IAAO,CAAC;EACnC;EAEA,OAAO;IAAEN,OAAO;IAAEM,MAAM,EAAE;EAAW,CAAC;AACvC,CAAC","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":["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":[]}
|
|
@@ -46,16 +46,16 @@ const mergeSlots = (frozen, live) => {
|
|
|
46
46
|
}
|
|
47
47
|
return merged;
|
|
48
48
|
};
|
|
49
|
-
const
|
|
49
|
+
const composeCurrentAndNextStyles = (current, next) => {
|
|
50
50
|
"worklet";
|
|
51
51
|
|
|
52
52
|
const composed = {
|
|
53
|
-
...
|
|
53
|
+
...current
|
|
54
54
|
};
|
|
55
|
-
for (const slotId in
|
|
56
|
-
const
|
|
57
|
-
if (
|
|
58
|
-
composed[slotId] = mergeSlots(
|
|
55
|
+
for (const slotId in next) {
|
|
56
|
+
const nextSlot = next[slotId];
|
|
57
|
+
if (nextSlot) {
|
|
58
|
+
composed[slotId] = mergeSlots(current[slotId], nextSlot);
|
|
59
59
|
}
|
|
60
60
|
}
|
|
61
61
|
return composed;
|
|
@@ -63,26 +63,27 @@ const composeFrozenAndLiveStyles = (frozen, live) => {
|
|
|
63
63
|
export const resolveInterpolatorStyleHandoff = ({
|
|
64
64
|
currentOwnsInterpolator,
|
|
65
65
|
currentStylesMap,
|
|
66
|
-
nextStylesMap
|
|
67
|
-
frozenCurrentStylesMap
|
|
66
|
+
nextStylesMap
|
|
68
67
|
}) => {
|
|
69
68
|
"worklet";
|
|
70
69
|
|
|
71
70
|
if (currentOwnsInterpolator) {
|
|
72
71
|
return {
|
|
73
|
-
localStylesMaps: currentStylesMap ? [currentStylesMap] : []
|
|
74
|
-
nextFrozenCurrentStylesMap: currentStylesMap ?? frozenCurrentStylesMap
|
|
72
|
+
localStylesMaps: currentStylesMap ? [currentStylesMap] : []
|
|
75
73
|
};
|
|
76
74
|
}
|
|
77
75
|
if (!nextStylesMap) {
|
|
78
76
|
return {
|
|
79
|
-
localStylesMaps:
|
|
80
|
-
|
|
77
|
+
localStylesMaps: currentStylesMap ? [currentStylesMap] : []
|
|
78
|
+
};
|
|
79
|
+
}
|
|
80
|
+
if (!currentStylesMap) {
|
|
81
|
+
return {
|
|
82
|
+
localStylesMaps: [nextStylesMap]
|
|
81
83
|
};
|
|
82
84
|
}
|
|
83
85
|
return {
|
|
84
|
-
localStylesMaps: [
|
|
85
|
-
nextFrozenCurrentStylesMap: frozenCurrentStylesMap
|
|
86
|
+
localStylesMaps: [composeCurrentAndNextStyles(currentStylesMap, nextStylesMap)]
|
|
86
87
|
};
|
|
87
88
|
};
|
|
88
89
|
//# sourceMappingURL=resolve-interpolator-style-handoff.js.map
|
package/lib/module/providers/screen/styles/helpers/resolve-interpolator-style-handoff.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["mergeBuckets","frozen","live","composeTransforms","merged","key","liveValue","undefined","frozenValue","Array","isArray","mergeSlots","style","props","boundsLocalTransform","
|
|
1
|
+
{"version":3,"names":["mergeBuckets","frozen","live","composeTransforms","merged","key","liveValue","undefined","frozenValue","Array","isArray","mergeSlots","style","props","boundsLocalTransform","composeCurrentAndNextStyles","current","next","composed","slotId","nextSlot","resolveInterpolatorStyleHandoff","currentOwnsInterpolator","currentStylesMap","nextStylesMap","localStylesMaps"],"sourceRoot":"../../../../../../src","sources":["providers/screen/styles/helpers/resolve-interpolator-style-handoff.ts"],"mappings":"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","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,
|
|
@@ -78,10 +76,10 @@ const runInterpolator = ({
|
|
|
78
76
|
* normal interpolator selection once the gesture-driven close is no longer in
|
|
79
77
|
* play.
|
|
80
78
|
*
|
|
81
|
-
* At an ownership handoff, the
|
|
82
|
-
*
|
|
83
|
-
*
|
|
84
|
-
*
|
|
79
|
+
* At an ownership handoff, the current interpolator remains live but is
|
|
80
|
+
* evaluated without the next-screen relationship. The next owner replaces
|
|
81
|
+
* matching scalar keys and composes its live transforms after the current
|
|
82
|
+
* screen's self-owned transforms.
|
|
85
83
|
*/
|
|
86
84
|
export const useInterpolatedStylesMap = ({
|
|
87
85
|
enabled,
|
|
@@ -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
|
|
|
@@ -119,7 +116,6 @@ export const useInterpolatedStylesMap = ({
|
|
|
119
116
|
} = SystemStore.getBag(activeScreenKey);
|
|
120
117
|
const isGesturingDuringCloseAnimation = useSharedValue(false);
|
|
121
118
|
const initialDestinationStylesReady = useSharedValue(0);
|
|
122
|
-
const frozenCurrentStylesMap = useSharedValue(NO_STYLES);
|
|
123
119
|
const shouldPrepareInitialDestinationStyles = enabled && !!destinationPairKey && !nextScreenKey && !!currentInterpolator;
|
|
124
120
|
useAnimatedReaction(() => {
|
|
125
121
|
"worklet";
|
|
@@ -180,14 +176,18 @@ export const useInterpolatedStylesMap = ({
|
|
|
180
176
|
const nextReady = currentOwnsInterpolator ? 0 : 1;
|
|
181
177
|
nextInterpolatorReady.set(nextReady);
|
|
182
178
|
const interpolatorOptionsOwner = currentOwnsInterpolator ? "current" : "next";
|
|
183
|
-
|
|
184
|
-
|
|
179
|
+
|
|
180
|
+
// Once the next interpolator owns the relationship, the current
|
|
181
|
+
// interpolator remains responsible only for its own live presentation.
|
|
182
|
+
// This preserves snap-point transforms without letting current-screen
|
|
183
|
+
// unfocus rules compete with the next screen's outgoing transition.
|
|
184
|
+
const currentSelectedFrame = selectInterpolatorFrame(props, isInGestureMode || !!nextInterpolator);
|
|
185
|
+
const currentResult = runInterpolator({
|
|
185
186
|
interpolator: currentInterpolator,
|
|
186
187
|
props,
|
|
187
|
-
selectedFrame,
|
|
188
|
-
bounds: boundsAccessor,
|
|
188
|
+
selectedFrame: currentSelectedFrame,
|
|
189
189
|
transition
|
|
190
|
-
})
|
|
190
|
+
});
|
|
191
191
|
const initialDestinationStyleGate = resolveInitialDestinationStyleGate({
|
|
192
192
|
shouldPrepareStyles: shouldPrepareInitialDestinationStyles,
|
|
193
193
|
isVisibilityBlocked: visibilityBlocked.get(),
|
|
@@ -202,19 +202,15 @@ export const useInterpolatedStylesMap = ({
|
|
|
202
202
|
const handoff = resolveInterpolatorStyleHandoff({
|
|
203
203
|
currentOwnsInterpolator: true,
|
|
204
204
|
currentStylesMap: currentResult?.stylesMap,
|
|
205
|
-
nextStylesMap: undefined
|
|
206
|
-
frozenCurrentStylesMap: frozenCurrentStylesMap.get()
|
|
205
|
+
nextStylesMap: undefined
|
|
207
206
|
});
|
|
208
|
-
if (handoff.nextFrozenCurrentStylesMap !== frozenCurrentStylesMap.get()) {
|
|
209
|
-
frozenCurrentStylesMap.set(handoff.nextFrozenCurrentStylesMap);
|
|
210
|
-
}
|
|
211
207
|
return handoff.localStylesMaps.length ? handoff.localStylesMaps : NO_STYLE_LAYERS;
|
|
212
208
|
}
|
|
209
|
+
const nextSelectedFrame = selectInterpolatorFrame(props, false);
|
|
213
210
|
const nextResult = runInterpolator({
|
|
214
211
|
interpolator: nextInterpolator,
|
|
215
212
|
props,
|
|
216
|
-
selectedFrame,
|
|
217
|
-
bounds: boundsAccessor,
|
|
213
|
+
selectedFrame: nextSelectedFrame,
|
|
218
214
|
transition
|
|
219
215
|
});
|
|
220
216
|
syncSelectedInterpolatorOptions(selectedInterpolatorOptions, "next", nextResult?.rawStyleMap?.options);
|
|
@@ -222,8 +218,7 @@ export const useInterpolatedStylesMap = ({
|
|
|
222
218
|
const handoff = resolveInterpolatorStyleHandoff({
|
|
223
219
|
currentOwnsInterpolator: false,
|
|
224
220
|
currentStylesMap: currentResult?.stylesMap,
|
|
225
|
-
nextStylesMap: nextResult?.stylesMap
|
|
226
|
-
frozenCurrentStylesMap: frozenCurrentStylesMap.get()
|
|
221
|
+
nextStylesMap: nextResult?.stylesMap
|
|
227
222
|
});
|
|
228
223
|
return handoff.localStylesMaps.length ? handoff.localStylesMaps : NO_STYLE_LAYERS;
|
|
229
224
|
});
|
|
@@ -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":["providers/screen/styles/hooks/use-interpolated-style-maps.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -54,17 +54,27 @@ function getEntry(tag, key) {
|
|
|
54
54
|
|
|
55
55
|
return boundaryRegistry.get()[tag]?.screens[key] ?? null;
|
|
56
56
|
}
|
|
57
|
-
function getMatchingSourceScreenKey(tag, destinationScreenKey, preferredScreenKey) {
|
|
57
|
+
function getMatchingSourceScreenKey(tag, destinationScreenKey, preferredScreenKey, excludedScreenKeys) {
|
|
58
58
|
"worklet";
|
|
59
59
|
|
|
60
60
|
const screens = boundaryRegistry.get()[tag]?.screens;
|
|
61
61
|
if (!screens) return null;
|
|
62
|
-
|
|
62
|
+
const isExcluded = screenKey => {
|
|
63
|
+
"worklet";
|
|
64
|
+
|
|
65
|
+
for (let index = 0; index < (excludedScreenKeys?.length ?? 0); index++) {
|
|
66
|
+
if (excludedScreenKeys?.[index] === screenKey) {
|
|
67
|
+
return true;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
return false;
|
|
71
|
+
};
|
|
72
|
+
if (preferredScreenKey && preferredScreenKey !== destinationScreenKey && !isExcluded(preferredScreenKey) && screens[preferredScreenKey]) {
|
|
63
73
|
return preferredScreenKey;
|
|
64
74
|
}
|
|
65
75
|
let latestScreenKey = null;
|
|
66
76
|
for (const screenKey in screens) {
|
|
67
|
-
if (screenKey !== destinationScreenKey) {
|
|
77
|
+
if (screenKey !== destinationScreenKey && !isExcluded(screenKey)) {
|
|
68
78
|
latestScreenKey = screenKey;
|
|
69
79
|
}
|
|
70
80
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["hasAnyKeys","boundaryRegistry","ensureBoundaryState","state","tag","screens","ensureScreenEntry","screenKey","tagState","bounds","styles","applyEntryPatch","entry","patch","undefined","boundaryConfig","handoff","escapeClipping","getEntry","key","get","getMatchingSourceScreenKey","destinationScreenKey","preferredScreenKey","latestScreenKey","setEntry","modify","removeEntry"],"sourceRoot":"../../../../../src","sources":["stores/bounds/internals/entries.ts"],"mappings":";;AAAA,SAASA,UAAU,QAAQ,iBAAiB;AAE5C,SAAoCC,gBAAgB,QAAQ,SAAS;AAErE,MAAMC,mBAAmB,GAAGA,CAACC,KAA2B,EAAEC,GAAU,KAAK;EACxE,SAAS;;EACT,IAAI,CAACD,KAAK,CAACC,GAAG,CAAC,EAAE;IAChBD,KAAK,CAACC,GAAG,CAAC,GAAG;MACZC,OAAO,EAAE,CAAC;IACX,CAAC;EACF;EACA,OAAOF,KAAK,CAACC,GAAG,CAAC;AAClB,CAAC;AAED,MAAME,iBAAiB,GAAGA,CACzBH,KAA2B,EAC3BC,GAAU,EACVG,SAAoB,KACT;EACX,SAAS;;EACT,MAAMC,QAAQ,GAAGN,mBAAmB,CAACC,KAAK,EAAEC,GAAG,CAAC;EAChD,IAAI,CAACI,QAAQ,CAACH,OAAO,CAACE,SAAS,CAAC,EAAE;IACjCC,QAAQ,CAACH,OAAO,CAACE,SAAS,CAAC,GAAG;MAC7BE,MAAM,EAAE,IAAI;MACZC,MAAM,EAAE,CAAC;IACV,CAAC;EACF;EACA,OAAOF,QAAQ,CAACH,OAAO,CAACE,SAAS,CAAC;AACnC,CAAC;AAED,MAAMI,eAAe,GAAGA,CAACC,KAAY,EAAEC,KAAiB,KAAK;EAC5D,SAAS;;EACT,IAAIA,KAAK,CAACJ,MAAM,KAAKK,SAAS,EAAE;IAC/BF,KAAK,CAACH,MAAM,GAAGI,KAAK,CAACJ,MAAM;EAC5B;EAEA,IAAII,KAAK,CAACH,MAAM,KAAKI,SAAS,EAAE;IAC/BF,KAAK,CAACF,MAAM,GAAGG,KAAK,CAACH,MAAM,IAAI,CAAC,CAAC;EAClC;EAEA,IAAIG,KAAK,CAACE,cAAc,KAAK,IAAI,EAAE;IAClC,OAAOH,KAAK,CAACG,cAAc;EAC5B,CAAC,MAAM,IAAIF,KAAK,CAACE,cAAc,KAAKD,SAAS,EAAE;IAC9CF,KAAK,CAACG,cAAc,GAAGF,KAAK,CAACE,cAAc;EAC5C;EAEA,IAAIF,KAAK,CAACG,OAAO,KAAK,IAAI,EAAE;IAC3B,OAAOJ,KAAK,CAACI,OAAO;EACrB,CAAC,MAAM,IAAIH,KAAK,CAACG,OAAO,KAAKF,SAAS,EAAE;IACvCF,KAAK,CAACI,OAAO,GAAGH,KAAK,CAACG,OAAO;EAC9B;EAEA,IAAIH,KAAK,CAACI,cAAc,KAAK,IAAI,EAAE;IAClC,OAAOL,KAAK,CAACK,cAAc;EAC5B,CAAC,MAAM,IAAIJ,KAAK,CAACI,cAAc,KAAKH,SAAS,EAAE;IAC9CF,KAAK,CAACK,cAAc,GAAGJ,KAAK,CAACI,cAAc;EAC5C;AACD,CAAC;AAED,SAASC,QAAQA,CAACd,GAAU,EAAEe,GAAc,EAAgB;EAC3D,SAAS;;EACT,OAAOlB,gBAAgB,CAACmB,GAAG,CAAC,CAAC,CAAChB,GAAG,CAAC,EAAEC,OAAO,CAACc,GAAG,CAAC,IAAI,IAAI;AACzD;AAEA,SAASE,0BAA0BA,CAClCjB,GAAU,EACVkB,oBAA+B,EAC/BC,kBAA8B,
|
|
1
|
+
{"version":3,"names":["hasAnyKeys","boundaryRegistry","ensureBoundaryState","state","tag","screens","ensureScreenEntry","screenKey","tagState","bounds","styles","applyEntryPatch","entry","patch","undefined","boundaryConfig","handoff","escapeClipping","getEntry","key","get","getMatchingSourceScreenKey","destinationScreenKey","preferredScreenKey","excludedScreenKeys","isExcluded","index","length","latestScreenKey","setEntry","modify","removeEntry"],"sourceRoot":"../../../../../src","sources":["stores/bounds/internals/entries.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-initial-destination-measurement.d.ts","sourceRoot":"","sources":["../../../../../../src/components/boundary/hooks/lifecycles/use-initial-destination-measurement.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"use-initial-destination-measurement.d.ts","sourceRoot":"","sources":["../../../../../../src/components/boundary/hooks/lifecycles/use-initial-destination-measurement.ts"],"names":[],"mappings":"AAsBA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAGhE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAanD,UAAU,sCAAsC;IAC/C,QAAQ,EAAE,QAAQ,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,cAAc,EAAE,OAAO,CAAC;IACxB,eAAe,EAAE,eAAe,CAAC;CACjC;AAED,eAAO,MAAM,gCAAgC,GAAI,yDAK9C,sCAAsC,SAsOxC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portal-boundary-host.d.ts","sourceRoot":"","sources":["../../../../../../../../src/components/boundary/portal/components/boundary-portal/components/portal-boundary-host.tsx"],"names":[],"mappings":"AACA,OAAO,EAEN,KAAK,SAAS,EAEd,KAAK,SAAS,EACd,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"portal-boundary-host.d.ts","sourceRoot":"","sources":["../../../../../../../../src/components/boundary/portal/components/boundary-portal/components/portal-boundary-host.tsx"],"names":[],"mappings":"AACA,OAAO,EAEN,KAAK,SAAS,EAEd,KAAK,SAAS,EACd,MAAM,cAAc,CAAC;AActB,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,sCAAsC,CAAC;AAMrF,KAAK,uBAAuB,GAAG;IAC9B,IAAI,EAAE,wBAAwB,CAAC;IAC/B,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CAC7B,CAAC;AAEF,eAAO,MAAM,kBAAkB,yDAG5B,uBAAuB,wCAiGxB,CAAC"}
|
|
@@ -1,17 +1,13 @@
|
|
|
1
1
|
import { type SharedValue } from "react-native-reanimated";
|
|
2
|
-
import type { LocalStyleLayers } from "../../../../../../providers/screen/styles/helpers/resolve-slot-styles";
|
|
3
|
-
import type { ScreenPairKey } from "../../../../../../stores/bounds/types";
|
|
4
2
|
import type { NormalizedTransitionInterpolatedStyle } from "../../../../../../types/animation.types";
|
|
5
3
|
type UseActivePortalBoundaryHostParams = {
|
|
6
4
|
boundaryId: string;
|
|
7
5
|
currentScreenKey: string;
|
|
8
6
|
escapeHostKey?: string;
|
|
9
|
-
localStylesMaps: SharedValue<LocalStyleLayers>;
|
|
10
7
|
portalHostName: SharedValue<string | null>;
|
|
11
8
|
portalHostReady: SharedValue<boolean>;
|
|
12
9
|
slotsMap: SharedValue<NormalizedTransitionInterpolatedStyle>;
|
|
13
|
-
sourcePairKey?: ScreenPairKey;
|
|
14
10
|
};
|
|
15
|
-
export declare const useActivePortalBoundaryHost: ({ boundaryId, currentScreenKey, escapeHostKey,
|
|
11
|
+
export declare const useActivePortalBoundaryHost: ({ boundaryId, currentScreenKey, escapeHostKey, portalHostName, portalHostReady, slotsMap, }: UseActivePortalBoundaryHostParams) => void;
|
|
16
12
|
export {};
|
|
17
13
|
//# sourceMappingURL=use-active-portal-boundary-host.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-active-portal-boundary-host.d.ts","sourceRoot":"","sources":["../../../../../../../../src/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,WAAW,EAAuB,MAAM,yBAAyB,CAAC;
|
|
1
|
+
{"version":3,"file":"use-active-portal-boundary-host.d.ts","sourceRoot":"","sources":["../../../../../../../../src/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,WAAW,EAAuB,MAAM,yBAAyB,CAAC;AAIhF,OAAO,KAAK,EAAE,qCAAqC,EAAE,MAAM,yCAAyC,CAAC;AAOrG,KAAK,iCAAiC,GAAG;IACxC,UAAU,EAAE,MAAM,CAAC;IACnB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,EAAE,WAAW,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC;IAC3C,eAAe,EAAE,WAAW,CAAC,OAAO,CAAC,CAAC;IACtC,QAAQ,EAAE,WAAW,CAAC,qCAAqC,CAAC,CAAC;CAC7D,CAAC;AAMF,eAAO,MAAM,2BAA2B,GAAI,6FAOzC,iCAAiC,SAuEnC,CAAC"}
|