react-native-screen-transitions 3.11.0 → 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/components/boundary/hooks/lifecycles/use-initial-destination-measurement.js +27 -15
- package/lib/commonjs/shared/components/boundary/hooks/lifecycles/use-initial-destination-measurement.js.map +1 -1
- package/lib/commonjs/shared/components/boundary/hooks/lifecycles/use-initial-source-measurement.js +3 -1
- package/lib/commonjs/shared/components/boundary/hooks/lifecycles/use-initial-source-measurement.js.map +1 -1
- package/lib/commonjs/shared/components/boundary/hooks/lifecycles/use-refresh-boundary.js +3 -5
- package/lib/commonjs/shared/components/boundary/hooks/lifecycles/use-refresh-boundary.js.map +1 -1
- package/lib/commonjs/shared/components/boundary/hooks/use-boundary-measurement.js +5 -4
- package/lib/commonjs/shared/components/boundary/hooks/use-boundary-measurement.js.map +1 -1
- package/lib/commonjs/shared/components/boundary/portal/components/boundary-content-portal/components/host.js +1 -1
- package/lib/commonjs/shared/components/boundary/portal/components/boundary-content-portal/components/host.js.map +1 -1
- package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/components/portal-boundary-host.js +4 -15
- package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/components/portal-boundary-host.js.map +1 -1
- package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.js +22 -24
- package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.js.map +1 -1
- package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.js +3 -36
- package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.js.map +1 -1
- package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.js +1 -1
- package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.js.map +1 -1
- package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.js +1 -1
- package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.js.map +1 -1
- package/lib/commonjs/shared/components/boundary/utils/destination-signals.js +8 -4
- package/lib/commonjs/shared/components/boundary/utils/destination-signals.js.map +1 -1
- package/lib/commonjs/shared/components/boundary/utils/refresh-signals.js +2 -4
- package/lib/commonjs/shared/components/boundary/utils/refresh-signals.js.map +1 -1
- package/lib/commonjs/shared/providers/screen/descriptors/descriptors.provider.js +3 -7
- package/lib/commonjs/shared/providers/screen/descriptors/descriptors.provider.js.map +1 -1
- package/lib/commonjs/shared/providers/screen/descriptors/helpers/derive-descriptor-derivations.js +1 -3
- package/lib/commonjs/shared/providers/screen/descriptors/helpers/derive-descriptor-derivations.js.map +1 -1
- package/lib/commonjs/shared/providers/screen/descriptors/helpers/get-ancestor-keys.js +3 -20
- package/lib/commonjs/shared/providers/screen/descriptors/helpers/get-ancestor-keys.js.map +1 -1
- 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/helpers/resolve-interpolator-style-handoff.js +15 -14
- package/lib/commonjs/shared/providers/screen/styles/helpers/resolve-interpolator-style-handoff.js.map +1 -1
- package/lib/commonjs/shared/providers/screen/styles/hooks/use-interpolated-style-maps.js +22 -27
- package/lib/commonjs/shared/providers/screen/styles/hooks/use-interpolated-style-maps.js.map +1 -1
- package/lib/commonjs/shared/stores/bounds/internals/entries.js +27 -0
- package/lib/commonjs/shared/stores/bounds/internals/entries.js.map +1 -1
- package/lib/commonjs/shared/stores/bounds/internals/links.js +25 -0
- package/lib/commonjs/shared/stores/bounds/internals/links.js.map +1 -1
- package/lib/commonjs/shared/stores/bounds/internals/resolver.js +2 -12
- package/lib/commonjs/shared/stores/bounds/internals/resolver.js.map +1 -1
- package/lib/commonjs/shared/utils/bounds/helpers/create-link-accessor.js +2 -2
- package/lib/commonjs/shared/utils/bounds/helpers/create-link-accessor.js.map +1 -1
- package/lib/module/shared/components/boundary/hooks/lifecycles/use-initial-destination-measurement.js +30 -18
- package/lib/module/shared/components/boundary/hooks/lifecycles/use-initial-destination-measurement.js.map +1 -1
- package/lib/module/shared/components/boundary/hooks/lifecycles/use-initial-source-measurement.js +3 -1
- package/lib/module/shared/components/boundary/hooks/lifecycles/use-initial-source-measurement.js.map +1 -1
- package/lib/module/shared/components/boundary/hooks/lifecycles/use-refresh-boundary.js +3 -5
- package/lib/module/shared/components/boundary/hooks/lifecycles/use-refresh-boundary.js.map +1 -1
- package/lib/module/shared/components/boundary/hooks/use-boundary-measurement.js +5 -4
- package/lib/module/shared/components/boundary/hooks/use-boundary-measurement.js.map +1 -1
- package/lib/module/shared/components/boundary/portal/components/boundary-content-portal/components/host.js +1 -1
- package/lib/module/shared/components/boundary/portal/components/boundary-content-portal/components/host.js.map +1 -1
- package/lib/module/shared/components/boundary/portal/components/boundary-portal/components/portal-boundary-host.js +4 -15
- package/lib/module/shared/components/boundary/portal/components/boundary-portal/components/portal-boundary-host.js.map +1 -1
- package/lib/module/shared/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.js +22 -24
- package/lib/module/shared/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.js.map +1 -1
- package/lib/module/shared/components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.js +3 -36
- package/lib/module/shared/components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.js.map +1 -1
- package/lib/module/shared/components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.js +2 -2
- package/lib/module/shared/components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.js.map +1 -1
- package/lib/module/shared/components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.js +1 -1
- package/lib/module/shared/components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.js.map +1 -1
- package/lib/module/shared/components/boundary/utils/destination-signals.js +8 -4
- package/lib/module/shared/components/boundary/utils/destination-signals.js.map +1 -1
- package/lib/module/shared/components/boundary/utils/refresh-signals.js +2 -4
- package/lib/module/shared/components/boundary/utils/refresh-signals.js.map +1 -1
- package/lib/module/shared/providers/screen/descriptors/descriptors.provider.js +4 -8
- package/lib/module/shared/providers/screen/descriptors/descriptors.provider.js.map +1 -1
- package/lib/module/shared/providers/screen/descriptors/helpers/derive-descriptor-derivations.js +1 -3
- package/lib/module/shared/providers/screen/descriptors/helpers/derive-descriptor-derivations.js.map +1 -1
- package/lib/module/shared/providers/screen/descriptors/helpers/get-ancestor-keys.js +3 -19
- package/lib/module/shared/providers/screen/descriptors/helpers/get-ancestor-keys.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/helpers/resolve-interpolator-style-handoff.js +15 -14
- package/lib/module/shared/providers/screen/styles/helpers/resolve-interpolator-style-handoff.js.map +1 -1
- package/lib/module/shared/providers/screen/styles/hooks/use-interpolated-style-maps.js +22 -27
- package/lib/module/shared/providers/screen/styles/hooks/use-interpolated-style-maps.js.map +1 -1
- package/lib/module/shared/stores/bounds/internals/entries.js +27 -1
- package/lib/module/shared/stores/bounds/internals/entries.js.map +1 -1
- package/lib/module/shared/stores/bounds/internals/links.js +25 -2
- package/lib/module/shared/stores/bounds/internals/links.js.map +1 -1
- package/lib/module/shared/stores/bounds/internals/resolver.js +3 -13
- package/lib/module/shared/stores/bounds/internals/resolver.js.map +1 -1
- package/lib/module/shared/utils/bounds/helpers/create-link-accessor.js +3 -3
- package/lib/module/shared/utils/bounds/helpers/create-link-accessor.js.map +1 -1
- package/lib/typescript/shared/components/boundary/hooks/lifecycles/use-initial-destination-measurement.d.ts.map +1 -1
- package/lib/typescript/shared/components/boundary/hooks/lifecycles/use-initial-source-measurement.d.ts.map +1 -1
- package/lib/typescript/shared/components/boundary/hooks/lifecycles/use-refresh-boundary.d.ts.map +1 -1
- package/lib/typescript/shared/components/boundary/hooks/use-boundary-measurement.d.ts.map +1 -1
- package/lib/typescript/shared/components/boundary/portal/components/boundary-portal/components/portal-boundary-host.d.ts.map +1 -1
- package/lib/typescript/shared/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.d.ts +1 -5
- package/lib/typescript/shared/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.d.ts.map +1 -1
- package/lib/typescript/shared/components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.d.ts.map +1 -1
- package/lib/typescript/shared/components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.d.ts.map +1 -1
- package/lib/typescript/shared/components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.d.ts +0 -2
- package/lib/typescript/shared/components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.d.ts.map +1 -1
- package/lib/typescript/shared/components/boundary/utils/destination-signals.d.ts +2 -3
- package/lib/typescript/shared/components/boundary/utils/destination-signals.d.ts.map +1 -1
- package/lib/typescript/shared/components/boundary/utils/refresh-signals.d.ts +0 -2
- package/lib/typescript/shared/components/boundary/utils/refresh-signals.d.ts.map +1 -1
- package/lib/typescript/shared/providers/screen/descriptors/descriptors.provider.d.ts.map +1 -1
- package/lib/typescript/shared/providers/screen/descriptors/helpers/derive-descriptor-derivations.d.ts +1 -3
- package/lib/typescript/shared/providers/screen/descriptors/helpers/derive-descriptor-derivations.d.ts.map +1 -1
- package/lib/typescript/shared/providers/screen/descriptors/helpers/get-ancestor-keys.d.ts +0 -8
- package/lib/typescript/shared/providers/screen/descriptors/helpers/get-ancestor-keys.d.ts.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/helpers/resolve-interpolator-style-handoff.d.ts +1 -3
- package/lib/typescript/shared/providers/screen/styles/helpers/resolve-interpolator-style-handoff.d.ts.map +1 -1
- package/lib/typescript/shared/providers/screen/styles/hooks/use-interpolated-style-maps.d.ts +4 -4
- package/lib/typescript/shared/providers/screen/styles/hooks/use-interpolated-style-maps.d.ts.map +1 -1
- package/lib/typescript/shared/stores/bounds/internals/entries.d.ts +2 -1
- package/lib/typescript/shared/stores/bounds/internals/entries.d.ts.map +1 -1
- package/lib/typescript/shared/stores/bounds/internals/links.d.ts +3 -1
- package/lib/typescript/shared/stores/bounds/internals/links.d.ts.map +1 -1
- package/lib/typescript/shared/stores/bounds/internals/resolver.d.ts.map +1 -1
- package/lib/typescript/shared/utils/bounds/helpers/create-link-accessor.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/shared/components/boundary/hooks/lifecycles/use-initial-destination-measurement.ts +67 -24
- package/src/shared/components/boundary/hooks/lifecycles/use-initial-source-measurement.ts +6 -1
- package/src/shared/components/boundary/hooks/lifecycles/use-refresh-boundary.ts +8 -9
- package/src/shared/components/boundary/hooks/use-boundary-measurement.ts +5 -4
- package/src/shared/components/boundary/portal/components/boundary-content-portal/components/host.tsx +1 -1
- package/src/shared/components/boundary/portal/components/boundary-portal/components/portal-boundary-host.tsx +4 -20
- package/src/shared/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.ts +27 -37
- package/src/shared/components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.ts +10 -57
- package/src/shared/components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.ts +1 -8
- package/src/shared/components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.ts +0 -3
- package/src/shared/components/boundary/utils/destination-signals.ts +8 -8
- package/src/shared/components/boundary/utils/refresh-signals.ts +2 -10
- package/src/shared/providers/screen/descriptors/descriptors.provider.tsx +4 -11
- package/src/shared/providers/screen/descriptors/helpers/derive-descriptor-derivations.ts +0 -4
- package/src/shared/providers/screen/descriptors/helpers/get-ancestor-keys.ts +3 -30
- package/src/shared/providers/screen/styles/helpers/create-interpolator-scope.ts +45 -0
- package/src/shared/providers/screen/styles/helpers/resolve-interpolator-style-handoff.ts +16 -16
- package/src/shared/providers/screen/styles/hooks/use-interpolated-style-maps.tsx +28 -35
- package/src/shared/stores/bounds/internals/entries.ts +38 -1
- package/src/shared/stores/bounds/internals/links.ts +36 -0
- package/src/shared/stores/bounds/internals/resolver.ts +7 -21
- package/src/shared/utils/bounds/helpers/create-link-accessor.ts +9 -3
- package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.js +0 -18
- package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.js.map +0 -1
- 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/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.js +0 -13
- package/lib/module/shared/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.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/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.d.ts +0 -3
- package/lib/typescript/shared/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.d.ts.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/components/boundary/portal/components/boundary-portal/helpers/has-local-slot.ts +0 -16
- package/src/shared/providers/screen/animation/helpers/accessors/use-build-bounds-accessor.tsx +0 -15
|
@@ -64,7 +64,7 @@ const useHostMeasurement = ({
|
|
|
64
64
|
viewportWidth,
|
|
65
65
|
viewportHeight
|
|
66
66
|
});
|
|
67
|
-
if (
|
|
67
|
+
if (correctedMeasured.width <= 0 || correctedMeasured.height <= 0) {
|
|
68
68
|
(0, _reactNativeReanimated.cancelAnimation)(retryToken);
|
|
69
69
|
retryToken.set((0, _reactNativeReanimated.withDelay)(HOST_MEASUREMENT_RETRY_DELAY_MS, (0, _reactNativeReanimated.withTiming)(retryToken.get() + 1, {
|
|
70
70
|
duration: 0
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_reactNativeReanimated","_scroll","_visibilityBlockOffset","_measuredBounds","_hostBounds","HOST_MEASUREMENT_RETRY_DELAY_MS","useHostMeasurement","capturesScroll","enabled","hostKey","screenKey","visibilityBlocked","viewportHeight","viewportWidth","hostRef","useAnimatedRef","scrollMetadata","ScrollStore","getValue","hasMeasuredHost","useSharedValue","retryToken","useAnimatedReaction","get","state","cancelAnimation","hasAlreadyMeasured","measured","measure","set","withDelay","withTiming","duration","currentScroll","overscrollNormalized","adjustedMeasuredBoundsForOverscrollDeltas","correctedMeasured","correctMeasuredBoundsForVisibilityGate","visibilityBlockOffset","getVisibilityBlockOffset","
|
|
1
|
+
{"version":3,"names":["_react","require","_reactNativeReanimated","_scroll","_visibilityBlockOffset","_measuredBounds","_hostBounds","HOST_MEASUREMENT_RETRY_DELAY_MS","useHostMeasurement","capturesScroll","enabled","hostKey","screenKey","visibilityBlocked","viewportHeight","viewportWidth","hostRef","useAnimatedRef","scrollMetadata","ScrollStore","getValue","hasMeasuredHost","useSharedValue","retryToken","useAnimatedReaction","get","state","cancelAnimation","hasAlreadyMeasured","measured","measure","set","withDelay","withTiming","duration","currentScroll","overscrollNormalized","adjustedMeasuredBoundsForOverscrollDeltas","correctedMeasured","correctMeasuredBoundsForVisibilityGate","visibilityBlockOffset","getVisibilityBlockOffset","width","height","setPortalHostBounds","x","y","pageX","pageY","scroll","useLayoutEffect","runOnUI","clearPortalHostBounds","exports"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -29,7 +29,7 @@ const emit = () => {
|
|
|
29
29
|
}
|
|
30
30
|
};
|
|
31
31
|
const isSameHost = (a, b) => {
|
|
32
|
-
return a.boundaryId === b.boundaryId && a.hostKey === b.hostKey && a.
|
|
32
|
+
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;
|
|
33
33
|
};
|
|
34
34
|
const mountPortalBoundaryHost = host => {
|
|
35
35
|
const previous = activeBoundaryHosts.get(host.portalHostName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","EMPTY_HOSTS","listeners","Set","activeBoundaryHosts","Map","snapshot","hostsByScope","buildSnapshot","host","values","hosts","hostKey","push","emit","listener","isSameHost","a","b","boundaryId","
|
|
1
|
+
{"version":3,"names":["_react","require","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","exports","unmountPortalBoundaryHostByName","delete","subscribe","add","useActivePortalBoundaryHosts","useSyncExternalStore"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AAkBA,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;AAEM,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;AAACe,OAAA,CAAAJ,uBAAA,GAAAA,uBAAA;AAEK,MAAMK,+BAA+B,GAC3CT,cAAyC,IACrC;EACJ,IAAI,CAACA,cAAc,IAAI,CAACjB,mBAAmB,CAAC2B,MAAM,CAACV,cAAc,CAAC,EAAE;IACnE;EACD;EAEAP,IAAI,CAAC,CAAC;AACP,CAAC;AAACe,OAAA,CAAAC,+BAAA,GAAAA,+BAAA;AAEF,MAAME,SAAS,GAAIjB,QAAoB,IAAK;EAC3Cb,SAAS,CAAC+B,GAAG,CAAClB,QAAQ,CAAC;EAEvB,OAAO,MAAM;IACZb,SAAS,CAAC6B,MAAM,CAAChB,QAAQ,CAAC;EAC3B,CAAC;AACF,CAAC;AAEM,MAAMmB,4BAA4B,GAAItB,OAAe,IAAK;EAChE,OAAO,IAAAuB,2BAAoB,EAC1BH,SAAS,EACT,MAAM1B,QAAQ,CAACC,YAAY,CAACK,OAAO,CAAC,IAAIX,WAAW,EACnD,MAAMA,WACP,CAAC;AACF,CAAC;AAAC4B,OAAA,CAAAK,4BAAA,GAAAA,4BAAA","ignoreList":[]}
|
|
@@ -10,18 +10,22 @@ const getInitialDestinationMeasurementSignal = params => {
|
|
|
10
10
|
|
|
11
11
|
const {
|
|
12
12
|
enabled,
|
|
13
|
-
|
|
14
|
-
ancestorDestinationPairKey,
|
|
13
|
+
pairKey,
|
|
15
14
|
linkId,
|
|
16
15
|
group,
|
|
17
16
|
destinationPresent,
|
|
18
17
|
sourcePresent,
|
|
19
18
|
linkState
|
|
20
19
|
} = params;
|
|
21
|
-
|
|
22
|
-
if (!enabled || !pairKey) {
|
|
20
|
+
if (!enabled) {
|
|
23
21
|
return null;
|
|
24
22
|
}
|
|
23
|
+
if (!pairKey) {
|
|
24
|
+
return {
|
|
25
|
+
pairKey: null,
|
|
26
|
+
action: "wait"
|
|
27
|
+
};
|
|
28
|
+
}
|
|
25
29
|
if (!destinationPresent) {
|
|
26
30
|
return {
|
|
27
31
|
pairKey,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_linkPairs","require","getInitialDestinationMeasurementSignal","params","enabled","
|
|
1
|
+
{"version":3,"names":["_linkPairs","require","getInitialDestinationMeasurementSignal","params","enabled","pairKey","linkId","group","destinationPresent","sourcePresent","linkState","action","linkKey","getLinkKeyFromTag","activeGroupId","getActiveGroupId","link","links","destination","source","exports"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/utils/destination-signals.ts"],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAoBO,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,GAAG,IAAAC,4BAAiB,EAACP,MAAM,CAAC;EACzC,MAAMQ,aAAa,GAClBP,KAAK,IAAIG,SAAS,GAAG,IAAAK,2BAAgB,EAACL,SAAS,EAAEL,OAAO,EAAEE,KAAK,CAAC,GAAG,IAAI;EAExE,IAAIO,aAAa,IAAIA,aAAa,KAAKF,OAAO,EAAE;IAC/C,OAAO;MAAEP,OAAO;MAAEM,MAAM,EAAE;IAAU,CAAC;EACtC;EAEA,MAAMK,IAAI,GAAGN,SAAS,GAAGL,OAAO,CAAC,EAAEY,KAAK,GAAGL,OAAO,CAAC;EAEnD,IAAI,CAACI,IAAI,EAAEE,WAAW,EAAE;IACvB,OAAO;MAAEb,OAAO;MAAEM,MAAM,EAAE;IAAU,CAAC;EACtC;EAEA,IAAI,CAACK,IAAI,CAACG,MAAM,EAAE;IACjB,OAAO;MAAEd,OAAO;MAAEM,MAAM,EAAE;IAAO,CAAC;EACnC;EAEA,OAAO;IAAEN,OAAO;IAAEM,MAAM,EAAE;EAAW,CAAC;AACvC,CAAC;AAACS,OAAA,CAAAlB,sCAAA,GAAAA,sCAAA","ignoreList":[]}
|
|
@@ -24,8 +24,6 @@ const getRefreshBoundarySignal = params => {
|
|
|
24
24
|
currentScreenKey,
|
|
25
25
|
sourcePairKey,
|
|
26
26
|
destinationPairKey,
|
|
27
|
-
ancestorDestinationPairKey,
|
|
28
|
-
nextScreenKey,
|
|
29
27
|
linkId,
|
|
30
28
|
group,
|
|
31
29
|
shouldRefresh,
|
|
@@ -48,7 +46,7 @@ const getRefreshBoundarySignal = params => {
|
|
|
48
46
|
}
|
|
49
47
|
return buildRefreshSignal("source", sourcePairKey, [currentScreenKey, closing ? "closing" : "settled"].join("|"));
|
|
50
48
|
}
|
|
51
|
-
const refreshDestinationPairKey = destinationPairKey
|
|
49
|
+
const refreshDestinationPairKey = destinationPairKey;
|
|
52
50
|
if (!refreshDestinationPairKey) {
|
|
53
51
|
return null;
|
|
54
52
|
}
|
|
@@ -67,7 +65,7 @@ const getRefreshBoundarySignal = params => {
|
|
|
67
65
|
}
|
|
68
66
|
return buildRefreshSignal("source", sourcePairKey, [group, linkId, closing ? "closing" : "settled"].join("|"));
|
|
69
67
|
}
|
|
70
|
-
const refreshDestinationPairKey = destinationPairKey
|
|
68
|
+
const refreshDestinationPairKey = destinationPairKey;
|
|
71
69
|
if (!refreshDestinationPairKey) return null;
|
|
72
70
|
|
|
73
71
|
// Destination side:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["SOURCE_SIGNAL_PREFIX","DESTINATION_SIGNAL_PREFIX","buildRefreshSignal","type","pairKey","key","prefix","signal","getRefreshBoundarySignal","params","enabled","currentScreenKey","sourcePairKey","destinationPairKey","
|
|
1
|
+
{"version":3,"names":["SOURCE_SIGNAL_PREFIX","DESTINATION_SIGNAL_PREFIX","buildRefreshSignal","type","pairKey","key","prefix","signal","getRefreshBoundarySignal","params","enabled","currentScreenKey","sourcePairKey","destinationPairKey","linkId","group","shouldRefresh","closing","linkState","sourcePair","participates","links","sourceRequests","join","refreshDestinationPairKey","activeId","groups","exports"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/utils/refresh-signals.ts"],"mappings":";;;;;;AAMA,MAAMA,oBAAoB,GAAG,SAAS;AACtC,MAAMC,yBAAyB,GAAG,cAAc;AAMhD,MAAMC,kBAAkB,GAAGA,CAC1BC,IAA2B,EAC3BC,OAAsB,EACtBC,GAAW,KACgB;EAC3B,SAAS;;EACT,MAAMC,MAAM,GACXH,IAAI,KAAK,QAAQ,GAAGH,oBAAoB,GAAGC,yBAAyB;EACrE,OAAO;IACNE,IAAI;IACJC,OAAO;IACPG,MAAM,EAAE,GAAGD,MAAM,GAAGF,OAAO,IAAIC,GAAG;EACnC,CAAC;AACF,CAAC;AAEM,MAAMG,wBAAwB,GAAIC,MAUxC,IAAmC;EACnC,SAAS;;EACT,MAAM;IACLC,OAAO;IACPC,gBAAgB;IAChBC,aAAa;IACbC,kBAAkB;IAClBC,MAAM;IACNC,KAAK;IACLC,aAAa;IACbC,OAAO;IACPC;EACD,CAAC,GAAGT,MAAM;EAEV,IAAI,CAACC,OAAO,EAAE,OAAO,IAAI;EAEzB,IAAI,CAACM,aAAa,EAAE;IACnB,OAAO,IAAI;EACZ;;EAEA;EACA;EACA,IAAI,CAACD,KAAK,EAAE;IACX,IAAIH,aAAa,EAAE;MAClB,MAAMO,UAAU,GAAGD,SAAS,GAAGN,aAAa,CAAC;MAC7C,MAAMQ,YAAY,GACjB,CAAC,CAACD,UAAU,EAAEE,KAAK,GAAGP,MAAM,CAAC,IAAI,CAAC,CAACK,UAAU,EAAEG,cAAc,GAAGR,MAAM,CAAC;MAExE,IAAI,CAACM,YAAY,EAAE;QAClB,OAAO,IAAI;MACZ;MAEA,OAAOlB,kBAAkB,CACxB,QAAQ,EACRU,aAAa,EACb,CAACD,gBAAgB,EAAEM,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC,CAACM,IAAI,CAAC,GAAG,CAC7D,CAAC;IACF;IAEA,MAAMC,yBAAyB,GAAGX,kBAAkB;IAEpD,IAAI,CAACW,yBAAyB,EAAE;MAC/B,OAAO,IAAI;IACZ;IAEA,IAAI,CAACN,SAAS,GAAGM,yBAAyB,CAAC,EAAEH,KAAK,GAAGP,MAAM,CAAC,EAAE;MAC7D,OAAO,IAAI;IACZ;IAEA,OAAOZ,kBAAkB,CACxB,aAAa,EACbsB,yBAAyB,EACzB,CAACb,gBAAgB,EAAEM,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC,CAACM,IAAI,CAAC,GAAG,CAC7D,CAAC;EACF;;EAEA;EACA;EACA,IAAIX,aAAa,EAAE;IAClB,MAAMa,QAAQ,GAAGP,SAAS,GAAGN,aAAa,CAAC,EAAEc,MAAM,GAAGX,KAAK,CAAC,EAAEU,QAAQ;IAEtE,IAAIA,QAAQ,KAAKX,MAAM,EAAE;MACxB,OAAO,IAAI;IACZ;IAEA,OAAOZ,kBAAkB,CACxB,QAAQ,EACRU,aAAa,EACb,CAACG,KAAK,EAAED,MAAM,EAAEG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC,CAACM,IAAI,CAAC,GAAG,CAC1D,CAAC;EACF;EAEA,MAAMC,yBAAyB,GAAGX,kBAAkB;EAEpD,IAAI,CAACW,yBAAyB,EAAE,OAAO,IAAI;;EAE3C;EACA;EACA,MAAMC,QAAQ,GACbP,SAAS,GAAGM,yBAAyB,CAAC,EAAEE,MAAM,GAAGX,KAAK,CAAC,EAAEU,QAAQ;;EAElE;EACA;EACA,IAAIA,QAAQ,KAAKX,MAAM,EAAE;IACxB,OAAO,IAAI;EACZ;EAEA,OAAOZ,kBAAkB,CACxB,aAAa,EACbsB,yBAAyB,EACzB,CAACT,KAAK,EAAED,MAAM,EAAEG,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC,CAACM,IAAI,CAAC,GAAG,CAC1D,CAAC;AACF,CAAC;AAACI,OAAA,CAAAnB,wBAAA,GAAAA,wBAAA","ignoreList":[]}
|
|
@@ -45,17 +45,13 @@ const {
|
|
|
45
45
|
current: resolvedCurrent,
|
|
46
46
|
next: resolvedNext
|
|
47
47
|
}), [resolvedPrevious, resolvedCurrent, resolvedNext]);
|
|
48
|
-
const
|
|
49
|
-
ancestorKeys,
|
|
50
|
-
ancestorDestinationPairKey
|
|
51
|
-
} = (0, _react.useMemo)(() => (0, _getAncestorKeys.getAncestorKeyState)(resolvedCurrent), [resolvedCurrent]);
|
|
48
|
+
const ancestorKeys = (0, _react.useMemo)(() => (0, _getAncestorKeys.getAncestorKeys)(resolvedCurrent), [resolvedCurrent]);
|
|
52
49
|
const derivations = (0, _react.useMemo)(() => (0, _deriveDescriptorDerivations.deriveDescriptorDerivations)({
|
|
53
50
|
previous: resolvedPrevious,
|
|
54
51
|
current: resolvedCurrent,
|
|
55
52
|
next: resolvedNext,
|
|
56
|
-
ancestorKeys
|
|
57
|
-
|
|
58
|
-
}), [resolvedPrevious, resolvedCurrent, resolvedNext, ancestorKeys, ancestorDestinationPairKey]);
|
|
53
|
+
ancestorKeys
|
|
54
|
+
}), [resolvedPrevious, resolvedCurrent, resolvedNext, ancestorKeys]);
|
|
59
55
|
return {
|
|
60
56
|
value: {
|
|
61
57
|
previous: resolvedPrevious,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","require","_context","_blankStack","_createProvider","_interopRequireDefault","_deriveDescriptorDerivations","_getAncestorKeys","e","__esModule","default","DescriptorsProvider","useDescriptorsStore","createProvider","guarded","previous","current","next","routeKey","children","blankStackCurrent","useBlankStackStore","store","scenesByKey","descriptor","undefined","blankStackPrevious","previousDescriptor","blankStackNext","nextDescriptor","adapterContext","useScreenTransitionsAdapterOptionalContext","adapterScene","scenes","routeIndexByKey","get","resolvedCurrent","resolvedPrevious","resolvedNext","Error","descriptors","useMemo","ancestorKeys","
|
|
1
|
+
{"version":3,"names":["_react","require","_context","_blankStack","_createProvider","_interopRequireDefault","_deriveDescriptorDerivations","_getAncestorKeys","e","__esModule","default","DescriptorsProvider","useDescriptorsStore","createProvider","guarded","previous","current","next","routeKey","children","blankStackCurrent","useBlankStackStore","store","scenesByKey","descriptor","undefined","blankStackPrevious","previousDescriptor","blankStackNext","nextDescriptor","adapterContext","useScreenTransitionsAdapterOptionalContext","adapterScene","scenes","routeIndexByKey","get","resolvedCurrent","resolvedPrevious","resolvedNext","Error","descriptors","useMemo","ancestorKeys","getAncestorKeys","derivations","deriveDescriptorDerivations","value","options","exports"],"sourceRoot":"../../../../../../src","sources":["shared/providers/screen/descriptors/descriptors.provider.tsx"],"mappings":"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","ignoreList":[]}
|
package/lib/commonjs/shared/providers/screen/descriptors/helpers/derive-descriptor-derivations.js
CHANGED
|
@@ -9,8 +9,7 @@ function deriveDescriptorDerivations({
|
|
|
9
9
|
previous,
|
|
10
10
|
current,
|
|
11
11
|
next,
|
|
12
|
-
ancestorKeys
|
|
13
|
-
ancestorDestinationPairKey
|
|
12
|
+
ancestorKeys
|
|
14
13
|
}) {
|
|
15
14
|
const previousScreenKey = previous?.route.key;
|
|
16
15
|
const currentScreenKey = current.route.key;
|
|
@@ -28,7 +27,6 @@ function deriveDescriptorDerivations({
|
|
|
28
27
|
nextScreenKey,
|
|
29
28
|
sourcePairKey,
|
|
30
29
|
destinationPairKey,
|
|
31
|
-
ancestorDestinationPairKey,
|
|
32
30
|
parentScreenKey: ancestorKeys[0],
|
|
33
31
|
isFirstKey,
|
|
34
32
|
isTopMostScreen,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_linkPairs","require","deriveDescriptorDerivations","previous","current","next","ancestorKeys","
|
|
1
|
+
{"version":3,"names":["_linkPairs","require","deriveDescriptorDerivations","previous","current","next","ancestorKeys","previousScreenKey","route","key","currentScreenKey","nextScreenKey","sourcePairKey","createScreenPairKey","undefined","destinationPairKey","navigationState","navigation","getState","routes","isFirstKey","findIndex","isTopMostScreen","hasConfiguredInterpolator","options","screenStyleInterpolator","parentScreenKey"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/descriptors/helpers/derive-descriptor-derivations.ts"],"mappings":";;;;;;AAAA,IAAAA,UAAA,GAAAC,OAAA;AAwBO,SAASC,2BAA2BA,CAAC;EAC3CC,QAAQ;EACRC,OAAO;EACPC,IAAI;EACJC;AACO,CAAC,EAAyB;EACjC,MAAMC,iBAAiB,GAAGJ,QAAQ,EAAEK,KAAK,CAACC,GAAG;EAC7C,MAAMC,gBAAgB,GAAGN,OAAO,CAACI,KAAK,CAACC,GAAG;EAC1C,MAAME,aAAa,GAAGN,IAAI,EAAEG,KAAK,CAACC,GAAG;EACrC,MAAMG,aAAa,GAAGD,aAAa,GAChC,IAAAE,8BAAmB,EAACH,gBAAgB,EAAEC,aAAa,CAAC,GACpDG,SAAS;EACZ,MAAMC,kBAAkB,GAAGR,iBAAiB,GACzC,IAAAM,8BAAmB,EAACN,iBAAiB,EAAEG,gBAAgB,CAAC,GACxDI,SAAS;EAEZ,MAAME,eAAe,GAAGZ,OAAO,CAACa,UAAU,CAACC,QAAQ,CAAC,CAAC;EACrD,MAAMC,MAAM,GAAGH,eAAe,EAAEG,MAAM,IAAI,EAAE;EAC5C,MAAMC,UAAU,GACfD,MAAM,CAACE,SAAS,CAAEb,KAAK,IAAKA,KAAK,CAACC,GAAG,KAAKL,OAAO,CAACI,KAAK,CAACC,GAAG,CAAC,KAAK,CAAC;EACnE,MAAMa,eAAe,GAAG,CAACjB,IAAI;EAC7B,MAAMkB,yBAAyB,GAC9B,CAAC,CAACnB,OAAO,CAACoB,OAAO,CAACC,uBAAuB,IACzC,CAAC,CAACpB,IAAI,EAAEmB,OAAO,EAAEC,uBAAuB;EAEzC,OAAO;IACNlB,iBAAiB;IACjBG,gBAAgB;IAChBC,aAAa;IACbC,aAAa;IACbG,kBAAkB;IAClBW,eAAe,EAAEpB,YAAY,CAAC,CAAC,CAAC;IAChCc,UAAU;IACVE,eAAe;IACfhB,YAAY;IACZiB;EACD,CAAC;AACF","ignoreList":[]}
|
|
@@ -3,22 +3,15 @@
|
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
|
5
5
|
});
|
|
6
|
-
exports.getAncestorKeyState = getAncestorKeyState;
|
|
7
6
|
exports.getAncestorKeys = getAncestorKeys;
|
|
8
|
-
var _linkPairs = require("../../../../stores/bounds/helpers/link-pairs.helpers");
|
|
9
7
|
/**
|
|
10
8
|
* Builds nested navigator ancestor keys from immediate parent to root.
|
|
11
|
-
* The nearest ancestor destination pair lets child routes attach measurements
|
|
12
|
-
* to the transition owned by the parent stack.
|
|
13
9
|
*/
|
|
14
|
-
function
|
|
10
|
+
function getAncestorKeys(current) {
|
|
15
11
|
const ancestors = [];
|
|
16
|
-
let ancestorDestinationPairKey;
|
|
17
12
|
const nav = current.navigation;
|
|
18
13
|
if (typeof nav?.getParent !== "function") {
|
|
19
|
-
return
|
|
20
|
-
ancestorKeys: ancestors
|
|
21
|
-
};
|
|
14
|
+
return ancestors;
|
|
22
15
|
}
|
|
23
16
|
let parent = nav.getParent();
|
|
24
17
|
while (parent) {
|
|
@@ -27,20 +20,10 @@ function getAncestorKeyState(current) {
|
|
|
27
20
|
const focusedRoute = state.routes[state.index];
|
|
28
21
|
if (focusedRoute?.key) {
|
|
29
22
|
ancestors.push(focusedRoute.key);
|
|
30
|
-
const previousRoute = state.routes[state.index - 1];
|
|
31
|
-
if (!ancestorDestinationPairKey && previousRoute?.key) {
|
|
32
|
-
ancestorDestinationPairKey = (0, _linkPairs.createScreenPairKey)(previousRoute.key, focusedRoute.key);
|
|
33
|
-
}
|
|
34
23
|
}
|
|
35
24
|
}
|
|
36
25
|
parent = parent.getParent();
|
|
37
26
|
}
|
|
38
|
-
return
|
|
39
|
-
ancestorKeys: ancestors,
|
|
40
|
-
ancestorDestinationPairKey
|
|
41
|
-
};
|
|
42
|
-
}
|
|
43
|
-
function getAncestorKeys(current) {
|
|
44
|
-
return getAncestorKeyState(current).ancestorKeys;
|
|
27
|
+
return ancestors;
|
|
45
28
|
}
|
|
46
29
|
//# sourceMappingURL=get-ancestor-keys.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["
|
|
1
|
+
{"version":3,"names":["getAncestorKeys","current","ancestors","nav","navigation","getParent","parent","state","getState","routes","index","undefined","focusedRoute","key","push"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/descriptors/helpers/get-ancestor-keys.ts"],"mappings":";;;;;;AAEA;AACA;AACA;AACO,SAASA,eAAeA,CAACC,OAA4B,EAAY;EACvE,MAAMC,SAAmB,GAAG,EAAE;EAC9B,MAAMC,GAAG,GAAGF,OAAO,CAACG,UAAiB;EAErC,IAAI,OAAOD,GAAG,EAAEE,SAAS,KAAK,UAAU,EAAE;IACzC,OAAOH,SAAS;EACjB;EAEA,IAAII,MAAM,GAAGH,GAAG,CAACE,SAAS,CAAC,CAAC;EAE5B,OAAOC,MAAM,EAAE;IACd,MAAMC,KAAK,GAAGD,MAAM,CAACE,QAAQ,CAAC,CAAC;IAC/B,IAAID,KAAK,EAAEE,MAAM,IAAIF,KAAK,CAACG,KAAK,KAAKC,SAAS,EAAE;MAC/C,MAAMC,YAAY,GAAGL,KAAK,CAACE,MAAM,CAACF,KAAK,CAACG,KAAK,CAAC;MAC9C,IAAIE,YAAY,EAAEC,GAAG,EAAE;QACtBX,SAAS,CAACY,IAAI,CAACF,YAAY,CAACC,GAAG,CAAC;MACjC;IACD;IACAP,MAAM,GAAGA,MAAM,CAACD,SAAS,CAAC,CAAC;EAC5B;EAEA,OAAOH,SAAS;AACjB","ignoreList":[]}
|
|
@@ -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":[]}
|
package/lib/commonjs/shared/providers/screen/styles/helpers/resolve-interpolator-style-handoff.js
CHANGED
|
@@ -50,16 +50,16 @@ const mergeSlots = (frozen, live) => {
|
|
|
50
50
|
}
|
|
51
51
|
return merged;
|
|
52
52
|
};
|
|
53
|
-
const
|
|
53
|
+
const composeCurrentAndNextStyles = (current, next) => {
|
|
54
54
|
"worklet";
|
|
55
55
|
|
|
56
56
|
const composed = {
|
|
57
|
-
...
|
|
57
|
+
...current
|
|
58
58
|
};
|
|
59
|
-
for (const slotId in
|
|
60
|
-
const
|
|
61
|
-
if (
|
|
62
|
-
composed[slotId] = mergeSlots(
|
|
59
|
+
for (const slotId in next) {
|
|
60
|
+
const nextSlot = next[slotId];
|
|
61
|
+
if (nextSlot) {
|
|
62
|
+
composed[slotId] = mergeSlots(current[slotId], nextSlot);
|
|
63
63
|
}
|
|
64
64
|
}
|
|
65
65
|
return composed;
|
|
@@ -67,26 +67,27 @@ const composeFrozenAndLiveStyles = (frozen, live) => {
|
|
|
67
67
|
const resolveInterpolatorStyleHandoff = ({
|
|
68
68
|
currentOwnsInterpolator,
|
|
69
69
|
currentStylesMap,
|
|
70
|
-
nextStylesMap
|
|
71
|
-
frozenCurrentStylesMap
|
|
70
|
+
nextStylesMap
|
|
72
71
|
}) => {
|
|
73
72
|
"worklet";
|
|
74
73
|
|
|
75
74
|
if (currentOwnsInterpolator) {
|
|
76
75
|
return {
|
|
77
|
-
localStylesMaps: currentStylesMap ? [currentStylesMap] : []
|
|
78
|
-
nextFrozenCurrentStylesMap: currentStylesMap ?? frozenCurrentStylesMap
|
|
76
|
+
localStylesMaps: currentStylesMap ? [currentStylesMap] : []
|
|
79
77
|
};
|
|
80
78
|
}
|
|
81
79
|
if (!nextStylesMap) {
|
|
82
80
|
return {
|
|
83
|
-
localStylesMaps:
|
|
84
|
-
|
|
81
|
+
localStylesMaps: currentStylesMap ? [currentStylesMap] : []
|
|
82
|
+
};
|
|
83
|
+
}
|
|
84
|
+
if (!currentStylesMap) {
|
|
85
|
+
return {
|
|
86
|
+
localStylesMaps: [nextStylesMap]
|
|
85
87
|
};
|
|
86
88
|
}
|
|
87
89
|
return {
|
|
88
|
-
localStylesMaps: [
|
|
89
|
-
nextFrozenCurrentStylesMap: frozenCurrentStylesMap
|
|
90
|
+
localStylesMaps: [composeCurrentAndNextStyles(currentStylesMap, nextStylesMap)]
|
|
90
91
|
};
|
|
91
92
|
};
|
|
92
93
|
exports.resolveInterpolatorStyleHandoff = resolveInterpolatorStyleHandoff;
|
|
@@ -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","exports"],"sourceRoot":"../../../../../../../src","sources":["shared/providers/screen/styles/helpers/resolve-interpolator-style-handoff.ts"],"mappings":"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","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,
|
|
@@ -82,10 +80,10 @@ const runInterpolator = ({
|
|
|
82
80
|
* normal interpolator selection once the gesture-driven close is no longer in
|
|
83
81
|
* play.
|
|
84
82
|
*
|
|
85
|
-
* At an ownership handoff, the
|
|
86
|
-
*
|
|
87
|
-
*
|
|
88
|
-
*
|
|
83
|
+
* At an ownership handoff, the current interpolator remains live but is
|
|
84
|
+
* evaluated without the next-screen relationship. The next owner replaces
|
|
85
|
+
* matching scalar keys and composes its live transforms after the current
|
|
86
|
+
* screen's self-owned transforms.
|
|
89
87
|
*/
|
|
90
88
|
const useInterpolatedStylesMap = ({
|
|
91
89
|
enabled,
|
|
@@ -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
|
|
|
@@ -123,7 +120,6 @@ const useInterpolatedStylesMap = ({
|
|
|
123
120
|
} = _system.SystemStore.getBag(activeScreenKey);
|
|
124
121
|
const isGesturingDuringCloseAnimation = (0, _reactNativeReanimated.useSharedValue)(false);
|
|
125
122
|
const initialDestinationStylesReady = (0, _reactNativeReanimated.useSharedValue)(0);
|
|
126
|
-
const frozenCurrentStylesMap = (0, _reactNativeReanimated.useSharedValue)(_constants.NO_STYLES);
|
|
127
123
|
const shouldPrepareInitialDestinationStyles = enabled && !!destinationPairKey && !nextScreenKey && !!currentInterpolator;
|
|
128
124
|
(0, _reactNativeReanimated.useAnimatedReaction)(() => {
|
|
129
125
|
"worklet";
|
|
@@ -184,14 +180,18 @@ const useInterpolatedStylesMap = ({
|
|
|
184
180
|
const nextReady = currentOwnsInterpolator ? 0 : 1;
|
|
185
181
|
nextInterpolatorReady.set(nextReady);
|
|
186
182
|
const interpolatorOptionsOwner = currentOwnsInterpolator ? "current" : "next";
|
|
187
|
-
|
|
188
|
-
|
|
183
|
+
|
|
184
|
+
// Once the next interpolator owns the relationship, the current
|
|
185
|
+
// interpolator remains responsible only for its own live presentation.
|
|
186
|
+
// This preserves snap-point transforms without letting current-screen
|
|
187
|
+
// unfocus rules compete with the next screen's outgoing transition.
|
|
188
|
+
const currentSelectedFrame = (0, _selectInterpolatorFrame.selectInterpolatorFrame)(props, isInGestureMode || !!nextInterpolator);
|
|
189
|
+
const currentResult = runInterpolator({
|
|
189
190
|
interpolator: currentInterpolator,
|
|
190
191
|
props,
|
|
191
|
-
selectedFrame,
|
|
192
|
-
bounds: boundsAccessor,
|
|
192
|
+
selectedFrame: currentSelectedFrame,
|
|
193
193
|
transition
|
|
194
|
-
})
|
|
194
|
+
});
|
|
195
195
|
const initialDestinationStyleGate = (0, _visibilityGate.resolveInitialDestinationStyleGate)({
|
|
196
196
|
shouldPrepareStyles: shouldPrepareInitialDestinationStyles,
|
|
197
197
|
isVisibilityBlocked: visibilityBlocked.get(),
|
|
@@ -206,19 +206,15 @@ const useInterpolatedStylesMap = ({
|
|
|
206
206
|
const handoff = (0, _resolveInterpolatorStyleHandoff.resolveInterpolatorStyleHandoff)({
|
|
207
207
|
currentOwnsInterpolator: true,
|
|
208
208
|
currentStylesMap: currentResult?.stylesMap,
|
|
209
|
-
nextStylesMap: undefined
|
|
210
|
-
frozenCurrentStylesMap: frozenCurrentStylesMap.get()
|
|
209
|
+
nextStylesMap: undefined
|
|
211
210
|
});
|
|
212
|
-
if (handoff.nextFrozenCurrentStylesMap !== frozenCurrentStylesMap.get()) {
|
|
213
|
-
frozenCurrentStylesMap.set(handoff.nextFrozenCurrentStylesMap);
|
|
214
|
-
}
|
|
215
211
|
return handoff.localStylesMaps.length ? handoff.localStylesMaps : NO_STYLE_LAYERS;
|
|
216
212
|
}
|
|
213
|
+
const nextSelectedFrame = (0, _selectInterpolatorFrame.selectInterpolatorFrame)(props, false);
|
|
217
214
|
const nextResult = runInterpolator({
|
|
218
215
|
interpolator: nextInterpolator,
|
|
219
216
|
props,
|
|
220
|
-
selectedFrame,
|
|
221
|
-
bounds: boundsAccessor,
|
|
217
|
+
selectedFrame: nextSelectedFrame,
|
|
222
218
|
transition
|
|
223
219
|
});
|
|
224
220
|
(0, _selectedInterpolatorOptions.syncSelectedInterpolatorOptions)(selectedInterpolatorOptions, "next", nextResult?.rawStyleMap?.options);
|
|
@@ -226,8 +222,7 @@ const useInterpolatedStylesMap = ({
|
|
|
226
222
|
const handoff = (0, _resolveInterpolatorStyleHandoff.resolveInterpolatorStyleHandoff)({
|
|
227
223
|
currentOwnsInterpolator: false,
|
|
228
224
|
currentStylesMap: currentResult?.stylesMap,
|
|
229
|
-
nextStylesMap: nextResult?.stylesMap
|
|
230
|
-
frozenCurrentStylesMap: frozenCurrentStylesMap.get()
|
|
225
|
+
nextStylesMap: nextResult?.stylesMap
|
|
231
226
|
});
|
|
232
227
|
return handoff.localStylesMaps.length ? handoff.localStylesMaps : NO_STYLE_LAYERS;
|
|
233
228
|
});
|
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":[]}
|