react-native-screen-transitions 3.11.2 → 3.11.3
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/native-stack/views/NativeStackView.native.js +1 -1
- package/lib/commonjs/native-stack/views/NativeStackView.native.js.map +1 -1
- package/lib/commonjs/shared/components/boundary/components/boundary-lifecycle.js +36 -0
- package/lib/commonjs/shared/components/boundary/components/boundary-lifecycle.js.map +1 -0
- package/lib/commonjs/shared/components/boundary/hooks/lifecycles/use-initial-destination-measurement.js +1 -13
- 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-refresh-boundary.js +9 -2
- 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 +3 -2
- package/lib/commonjs/shared/components/boundary/hooks/use-boundary-measurement.js.map +1 -1
- package/lib/commonjs/shared/components/boundary/hooks/use-measurer.js +9 -2
- package/lib/commonjs/shared/components/boundary/hooks/use-measurer.js.map +1 -1
- package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/components/host.js +5 -12
- package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/components/host.js.map +1 -1
- package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/components/portal-boundary-host.js +25 -43
- 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/helpers/local-measurement.js +13 -0
- package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/helpers/local-measurement.js.map +1 -0
- package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/helpers/offset-style.js +8 -31
- package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/helpers/offset-style.js.map +1 -1
- package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.js +14 -19
- 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 +8 -0
- 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 +19 -47
- 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/index.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/providers/boundary-root.provider.js +19 -17
- package/lib/commonjs/shared/components/boundary/providers/boundary-root.provider.js.map +1 -1
- package/lib/commonjs/shared/components/boundary/utils/refresh-signals.js +19 -5
- package/lib/commonjs/shared/components/boundary/utils/refresh-signals.js.map +1 -1
- package/lib/commonjs/shared/components/screen-container/layers/backdrop.js +11 -7
- package/lib/commonjs/shared/components/screen-container/layers/backdrop.js.map +1 -1
- package/lib/commonjs/shared/components/screen-lifecycle/hooks/helpers/close-interception-rules.js +31 -0
- package/lib/commonjs/shared/components/screen-lifecycle/hooks/helpers/close-interception-rules.js.map +1 -0
- package/lib/commonjs/shared/components/screen-lifecycle/hooks/use-close-completion.js +26 -0
- package/lib/commonjs/shared/components/screen-lifecycle/hooks/use-close-completion.js.map +1 -0
- package/lib/commonjs/shared/components/screen-lifecycle/hooks/use-close-transition-intent.js +60 -86
- package/lib/commonjs/shared/components/screen-lifecycle/hooks/use-close-transition-intent.js.map +1 -1
- package/lib/commonjs/shared/components/screen-lifecycle/hooks/use-transition-start-controller.js +1 -5
- package/lib/commonjs/shared/components/screen-lifecycle/hooks/use-transition-start-controller.js.map +1 -1
- package/lib/commonjs/shared/components/screen-lifecycle/index.js +9 -6
- package/lib/commonjs/shared/components/screen-lifecycle/index.js.map +1 -1
- package/lib/commonjs/shared/hooks/navigation/use-navigation-helpers.js +28 -6
- package/lib/commonjs/shared/hooks/navigation/use-navigation-helpers.js.map +1 -1
- package/lib/commonjs/shared/providers/helpers/measured-bounds-writes.js +1 -2
- package/lib/commonjs/shared/providers/helpers/measured-bounds-writes.js.map +1 -1
- package/lib/commonjs/shared/providers/screen/gestures/hooks/use-screen-gesture-config.js +9 -2
- package/lib/commonjs/shared/providers/screen/gestures/hooks/use-screen-gesture-config.js.map +1 -1
- package/lib/commonjs/shared/providers/screen/gestures/pan/behavior/pan-lifecycle.js +4 -5
- package/lib/commonjs/shared/providers/screen/gestures/pan/behavior/pan-lifecycle.js.map +1 -1
- package/lib/commonjs/shared/providers/screen/gestures/pan/behavior/use-pan-behavior.js +2 -3
- package/lib/commonjs/shared/providers/screen/gestures/pan/behavior/use-pan-behavior.js.map +1 -1
- package/lib/commonjs/shared/providers/screen/gestures/pinch/behavior/pinch-lifecycle.js +4 -5
- package/lib/commonjs/shared/providers/screen/gestures/pinch/behavior/pinch-lifecycle.js.map +1 -1
- package/lib/commonjs/shared/providers/screen/gestures/pinch/behavior/use-pinch-behavior.js +2 -3
- package/lib/commonjs/shared/providers/screen/gestures/pinch/behavior/use-pinch-behavior.js.map +1 -1
- package/lib/commonjs/shared/providers/screen/gestures/shared/policy.js +9 -5
- package/lib/commonjs/shared/providers/screen/gestures/shared/policy.js.map +1 -1
- package/lib/commonjs/shared/providers/stack/blank-stack-state/blank-stack-controller.js +5 -1
- package/lib/commonjs/shared/providers/stack/blank-stack-state/blank-stack-controller.js.map +1 -1
- package/lib/commonjs/shared/stores/bounds/internals/links.js +1 -1
- package/lib/commonjs/shared/stores/bounds/internals/links.js.map +1 -1
- package/lib/commonjs/shared/stores/system.store.js +1 -2
- package/lib/commonjs/shared/stores/system.store.js.map +1 -1
- package/lib/commonjs/shared/utils/animation/animate-to-progress.js +0 -22
- package/lib/commonjs/shared/utils/animation/animate-to-progress.js.map +1 -1
- package/lib/commonjs/shared/utils/navigation/close-action-replay.js +22 -0
- package/lib/commonjs/shared/utils/navigation/close-action-replay.js.map +1 -0
- package/lib/module/native-stack/views/NativeStackView.native.js +1 -1
- package/lib/module/native-stack/views/NativeStackView.native.js.map +1 -1
- package/lib/module/shared/components/boundary/components/boundary-lifecycle.js +32 -0
- package/lib/module/shared/components/boundary/components/boundary-lifecycle.js.map +1 -0
- package/lib/module/shared/components/boundary/hooks/lifecycles/use-initial-destination-measurement.js +1 -13
- 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-refresh-boundary.js +9 -2
- 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 +3 -2
- package/lib/module/shared/components/boundary/hooks/use-boundary-measurement.js.map +1 -1
- package/lib/module/shared/components/boundary/hooks/use-measurer.js +9 -2
- package/lib/module/shared/components/boundary/hooks/use-measurer.js.map +1 -1
- package/lib/module/shared/components/boundary/portal/components/boundary-portal/components/host.js +5 -12
- package/lib/module/shared/components/boundary/portal/components/boundary-portal/components/host.js.map +1 -1
- package/lib/module/shared/components/boundary/portal/components/boundary-portal/components/portal-boundary-host.js +27 -45
- 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/helpers/local-measurement.js +8 -0
- package/lib/module/shared/components/boundary/portal/components/boundary-portal/helpers/local-measurement.js.map +1 -0
- package/lib/module/shared/components/boundary/portal/components/boundary-portal/helpers/offset-style.js +8 -32
- package/lib/module/shared/components/boundary/portal/components/boundary-portal/helpers/offset-style.js.map +1 -1
- package/lib/module/shared/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.js +15 -20
- 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 +8 -0
- 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 +20 -48
- 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/index.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/providers/boundary-root.provider.js +20 -18
- package/lib/module/shared/components/boundary/providers/boundary-root.provider.js.map +1 -1
- package/lib/module/shared/components/boundary/utils/refresh-signals.js +19 -5
- package/lib/module/shared/components/boundary/utils/refresh-signals.js.map +1 -1
- package/lib/module/shared/components/screen-container/layers/backdrop.js +12 -8
- package/lib/module/shared/components/screen-container/layers/backdrop.js.map +1 -1
- package/lib/module/shared/components/screen-lifecycle/hooks/helpers/close-interception-rules.js +25 -0
- package/lib/module/shared/components/screen-lifecycle/hooks/helpers/close-interception-rules.js.map +1 -0
- package/lib/module/shared/components/screen-lifecycle/hooks/use-close-completion.js +21 -0
- package/lib/module/shared/components/screen-lifecycle/hooks/use-close-completion.js.map +1 -0
- package/lib/module/shared/components/screen-lifecycle/hooks/use-close-transition-intent.js +60 -85
- package/lib/module/shared/components/screen-lifecycle/hooks/use-close-transition-intent.js.map +1 -1
- package/lib/module/shared/components/screen-lifecycle/hooks/use-transition-start-controller.js +1 -5
- package/lib/module/shared/components/screen-lifecycle/hooks/use-transition-start-controller.js.map +1 -1
- package/lib/module/shared/components/screen-lifecycle/index.js +9 -6
- package/lib/module/shared/components/screen-lifecycle/index.js.map +1 -1
- package/lib/module/shared/hooks/navigation/use-navigation-helpers.js +29 -7
- package/lib/module/shared/hooks/navigation/use-navigation-helpers.js.map +1 -1
- package/lib/module/shared/providers/helpers/measured-bounds-writes.js +1 -2
- package/lib/module/shared/providers/helpers/measured-bounds-writes.js.map +1 -1
- package/lib/module/shared/providers/screen/gestures/hooks/use-screen-gesture-config.js +9 -2
- package/lib/module/shared/providers/screen/gestures/hooks/use-screen-gesture-config.js.map +1 -1
- package/lib/module/shared/providers/screen/gestures/pan/behavior/pan-lifecycle.js +4 -5
- package/lib/module/shared/providers/screen/gestures/pan/behavior/pan-lifecycle.js.map +1 -1
- package/lib/module/shared/providers/screen/gestures/pan/behavior/use-pan-behavior.js +2 -3
- package/lib/module/shared/providers/screen/gestures/pan/behavior/use-pan-behavior.js.map +1 -1
- package/lib/module/shared/providers/screen/gestures/pinch/behavior/pinch-lifecycle.js +4 -5
- package/lib/module/shared/providers/screen/gestures/pinch/behavior/pinch-lifecycle.js.map +1 -1
- package/lib/module/shared/providers/screen/gestures/pinch/behavior/use-pinch-behavior.js +2 -3
- package/lib/module/shared/providers/screen/gestures/pinch/behavior/use-pinch-behavior.js.map +1 -1
- package/lib/module/shared/providers/screen/gestures/shared/policy.js +9 -5
- package/lib/module/shared/providers/screen/gestures/shared/policy.js.map +1 -1
- package/lib/module/shared/providers/stack/blank-stack-state/blank-stack-controller.js +5 -1
- package/lib/module/shared/providers/stack/blank-stack-state/blank-stack-controller.js.map +1 -1
- package/lib/module/shared/stores/bounds/internals/links.js +1 -1
- package/lib/module/shared/stores/bounds/internals/links.js.map +1 -1
- package/lib/module/shared/stores/system.store.js +1 -2
- package/lib/module/shared/stores/system.store.js.map +1 -1
- package/lib/module/shared/utils/animation/animate-to-progress.js +0 -22
- package/lib/module/shared/utils/animation/animate-to-progress.js.map +1 -1
- package/lib/module/shared/utils/navigation/close-action-replay.js +16 -0
- package/lib/module/shared/utils/navigation/close-action-replay.js.map +1 -0
- package/lib/typescript/native-stack/views/NativeStackView.native.d.ts.map +1 -1
- package/lib/typescript/shared/components/boundary/components/boundary-lifecycle.d.ts +18 -0
- package/lib/typescript/shared/components/boundary/components/boundary-lifecycle.d.ts.map +1 -0
- package/lib/typescript/shared/components/boundary/hooks/lifecycles/use-initial-destination-measurement.d.ts +1 -2
- 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-refresh-boundary.d.ts.map +1 -1
- package/lib/typescript/shared/components/boundary/hooks/use-boundary-measurement.d.ts +3 -2
- package/lib/typescript/shared/components/boundary/hooks/use-boundary-measurement.d.ts.map +1 -1
- package/lib/typescript/shared/components/boundary/hooks/use-measurer.d.ts +3 -2
- package/lib/typescript/shared/components/boundary/hooks/use-measurer.d.ts.map +1 -1
- package/lib/typescript/shared/components/boundary/portal/components/boundary-portal/components/host.d.ts.map +1 -1
- package/lib/typescript/shared/components/boundary/portal/components/boundary-portal/components/portal-boundary-host.d.ts +5 -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/helpers/local-measurement.d.ts +4 -0
- package/lib/typescript/shared/components/boundary/portal/components/boundary-portal/helpers/local-measurement.d.ts.map +1 -0
- package/lib/typescript/shared/components/boundary/portal/components/boundary-portal/helpers/offset-style.d.ts +4 -17
- package/lib/typescript/shared/components/boundary/portal/components/boundary-portal/helpers/offset-style.d.ts.map +1 -1
- package/lib/typescript/shared/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.d.ts +3 -1
- 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 +5 -9
- 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 +2 -1
- 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/providers/boundary-root.provider.d.ts +2 -1
- package/lib/typescript/shared/components/boundary/providers/boundary-root.provider.d.ts.map +1 -1
- package/lib/typescript/shared/components/boundary/types.d.ts +6 -0
- package/lib/typescript/shared/components/boundary/types.d.ts.map +1 -1
- package/lib/typescript/shared/components/boundary/utils/refresh-signals.d.ts +1 -0
- package/lib/typescript/shared/components/boundary/utils/refresh-signals.d.ts.map +1 -1
- package/lib/typescript/shared/components/screen-container/layers/backdrop.d.ts.map +1 -1
- package/lib/typescript/shared/components/screen-lifecycle/hooks/helpers/close-interception-rules.d.ts +27 -0
- package/lib/typescript/shared/components/screen-lifecycle/hooks/helpers/close-interception-rules.d.ts.map +1 -0
- package/lib/typescript/shared/components/screen-lifecycle/hooks/use-close-completion.d.ts +7 -0
- package/lib/typescript/shared/components/screen-lifecycle/hooks/use-close-completion.d.ts.map +1 -0
- package/lib/typescript/shared/components/screen-lifecycle/hooks/use-close-transition-intent.d.ts +2 -7
- package/lib/typescript/shared/components/screen-lifecycle/hooks/use-close-transition-intent.d.ts.map +1 -1
- package/lib/typescript/shared/components/screen-lifecycle/hooks/use-transition-start-controller.d.ts +1 -3
- package/lib/typescript/shared/components/screen-lifecycle/hooks/use-transition-start-controller.d.ts.map +1 -1
- package/lib/typescript/shared/components/screen-lifecycle/index.d.ts.map +1 -1
- package/lib/typescript/shared/hooks/navigation/use-navigation-helpers.d.ts +1 -0
- package/lib/typescript/shared/hooks/navigation/use-navigation-helpers.d.ts.map +1 -1
- package/lib/typescript/shared/providers/screen/gestures/hooks/use-screen-gesture-config.d.ts.map +1 -1
- package/lib/typescript/shared/providers/screen/gestures/pan/behavior/pan-lifecycle.d.ts +1 -1
- package/lib/typescript/shared/providers/screen/gestures/pan/behavior/pan-lifecycle.d.ts.map +1 -1
- package/lib/typescript/shared/providers/screen/gestures/pan/behavior/use-pan-behavior.d.ts.map +1 -1
- package/lib/typescript/shared/providers/screen/gestures/pinch/behavior/pinch-lifecycle.d.ts +1 -1
- package/lib/typescript/shared/providers/screen/gestures/pinch/behavior/pinch-lifecycle.d.ts.map +1 -1
- package/lib/typescript/shared/providers/screen/gestures/pinch/behavior/use-pinch-behavior.d.ts.map +1 -1
- package/lib/typescript/shared/providers/screen/gestures/shared/policy.d.ts +2 -1
- package/lib/typescript/shared/providers/screen/gestures/shared/policy.d.ts.map +1 -1
- package/lib/typescript/shared/providers/screen/gestures/types.d.ts +2 -0
- package/lib/typescript/shared/providers/screen/gestures/types.d.ts.map +1 -1
- package/lib/typescript/shared/providers/stack/blank-stack-state/blank-stack-controller.d.ts.map +1 -1
- package/lib/typescript/shared/stores/system.store.d.ts +1 -2
- package/lib/typescript/shared/stores/system.store.d.ts.map +1 -1
- package/lib/typescript/shared/utils/animation/animate-to-progress.d.ts +2 -3
- package/lib/typescript/shared/utils/animation/animate-to-progress.d.ts.map +1 -1
- package/lib/typescript/shared/utils/navigation/close-action-replay.d.ts +4 -0
- package/lib/typescript/shared/utils/navigation/close-action-replay.d.ts.map +1 -0
- package/package.json +1 -1
- package/src/native-stack/views/NativeStackView.native.tsx +3 -1
- package/src/shared/components/boundary/components/boundary-lifecycle.tsx +53 -0
- package/src/shared/components/boundary/hooks/lifecycles/use-initial-destination-measurement.ts +0 -14
- package/src/shared/components/boundary/hooks/lifecycles/use-refresh-boundary.ts +13 -2
- package/src/shared/components/boundary/hooks/use-boundary-measurement.ts +7 -2
- package/src/shared/components/boundary/hooks/use-measurer.ts +11 -1
- package/src/shared/components/boundary/portal/components/boundary-portal/components/host.tsx +13 -11
- package/src/shared/components/boundary/portal/components/boundary-portal/components/portal-boundary-host.tsx +44 -55
- package/src/shared/components/boundary/portal/components/boundary-portal/helpers/local-measurement.ts +10 -0
- package/src/shared/components/boundary/portal/components/boundary-portal/helpers/offset-style.ts +11 -55
- package/src/shared/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.ts +20 -24
- package/src/shared/components/boundary/portal/components/boundary-portal/hooks/use-boundary-portal-attachment.ts +11 -0
- package/src/shared/components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.ts +20 -67
- package/src/shared/components/boundary/portal/components/boundary-portal/index.tsx +1 -0
- package/src/shared/components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.ts +3 -2
- package/src/shared/components/boundary/providers/boundary-root.provider.tsx +29 -20
- package/src/shared/components/boundary/types.ts +9 -0
- package/src/shared/components/boundary/utils/refresh-signals.ts +39 -6
- package/src/shared/components/screen-container/layers/backdrop.tsx +11 -7
- package/src/shared/components/screen-lifecycle/hooks/helpers/close-interception-rules.ts +64 -0
- package/src/shared/components/screen-lifecycle/hooks/use-close-completion.ts +28 -0
- package/src/shared/components/screen-lifecycle/hooks/use-close-transition-intent.ts +67 -108
- package/src/shared/components/screen-lifecycle/hooks/use-transition-start-controller.ts +0 -12
- package/src/shared/components/screen-lifecycle/index.tsx +8 -4
- package/src/shared/hooks/navigation/use-navigation-helpers.ts +39 -7
- package/src/shared/providers/helpers/measured-bounds-writes.ts +1 -1
- package/src/shared/providers/screen/gestures/hooks/use-screen-gesture-config.ts +9 -1
- package/src/shared/providers/screen/gestures/pan/behavior/pan-lifecycle.ts +4 -6
- package/src/shared/providers/screen/gestures/pan/behavior/use-pan-behavior.ts +1 -3
- package/src/shared/providers/screen/gestures/pinch/behavior/pinch-lifecycle.ts +4 -6
- package/src/shared/providers/screen/gestures/pinch/behavior/use-pinch-behavior.ts +2 -8
- package/src/shared/providers/screen/gestures/shared/policy.ts +17 -6
- package/src/shared/providers/screen/gestures/types.ts +2 -0
- package/src/shared/providers/stack/blank-stack-state/blank-stack-controller.ts +5 -1
- package/src/shared/stores/bounds/internals/links.ts +1 -1
- package/src/shared/stores/system.store.ts +1 -2
- package/src/shared/utils/animation/animate-to-progress.ts +1 -22
- package/src/shared/utils/navigation/close-action-replay.ts +25 -0
- package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/helpers/active-pair.js +0 -30
- package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/helpers/active-pair.js.map +0 -1
- package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/stores/host-bounds.store.js +0 -47
- package/lib/commonjs/shared/components/boundary/portal/components/boundary-portal/stores/host-bounds.store.js.map +0 -1
- package/lib/module/shared/components/boundary/portal/components/boundary-portal/helpers/active-pair.js +0 -25
- package/lib/module/shared/components/boundary/portal/components/boundary-portal/helpers/active-pair.js.map +0 -1
- package/lib/module/shared/components/boundary/portal/components/boundary-portal/stores/host-bounds.store.js +0 -40
- package/lib/module/shared/components/boundary/portal/components/boundary-portal/stores/host-bounds.store.js.map +0 -1
- package/lib/typescript/shared/components/boundary/portal/components/boundary-portal/helpers/active-pair.d.ts +0 -9
- package/lib/typescript/shared/components/boundary/portal/components/boundary-portal/helpers/active-pair.d.ts.map +0 -1
- package/lib/typescript/shared/components/boundary/portal/components/boundary-portal/stores/host-bounds.store.d.ts +0 -9
- package/lib/typescript/shared/components/boundary/portal/components/boundary-portal/stores/host-bounds.store.d.ts.map +0 -1
- package/src/shared/components/boundary/portal/components/boundary-portal/helpers/active-pair.ts +0 -36
- package/src/shared/components/boundary/portal/components/boundary-portal/stores/host-bounds.store.ts +0 -45
|
@@ -1,45 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import { getClampedScrollAxisDelta } from "../../../../../../stores/scroll.store";
|
|
4
|
-
import { getPortalHostBounds } from "../stores/host-bounds.store";
|
|
5
|
-
|
|
6
|
-
/**
|
|
7
|
-
* The two portal coordinate cases we support:
|
|
8
|
-
*
|
|
9
|
-
* - same-screen: source and host live on the same screen; re-base the stored
|
|
10
|
-
* host frame onto the source measurement's scroll snapshot.
|
|
11
|
-
* - cross-screen: source and host live on different screens; the host is the
|
|
12
|
-
* replacement coordinate space, so destination scroll is inherited naturally
|
|
13
|
-
* from host placement instead of manually propagated.
|
|
14
|
-
*/
|
|
15
|
-
|
|
16
3
|
export const resolvePortalOffsetStyle = ({
|
|
17
4
|
bounds,
|
|
18
|
-
|
|
19
|
-
placement
|
|
5
|
+
hostBounds
|
|
20
6
|
}) => {
|
|
21
7
|
"worklet";
|
|
22
8
|
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
// Cross-screen hosts are the chosen replacement coordinate space, so their
|
|
29
|
-
// destination scroll is represented by where the host itself is mounted.
|
|
30
|
-
const alignHostToBoundsScroll = placement === "same-screen";
|
|
31
|
-
const hostSnapshotDeltaX = alignHostToBoundsScroll ? getClampedScrollAxisDelta(boundsScrollSnapshot, hostBoundsScrollSnapshot, "horizontal") : 0;
|
|
32
|
-
const hostSnapshotDeltaY = alignHostToBoundsScroll ? getClampedScrollAxisDelta(boundsScrollSnapshot, hostBoundsScrollSnapshot, "vertical") : 0;
|
|
33
|
-
|
|
34
|
-
// Without registered host bounds the host frame is the origin, so the source
|
|
35
|
-
// page position becomes the offset directly.
|
|
36
|
-
const adjustedHostPageX = hostBounds ? hostBounds.pageX - hostSnapshotDeltaX : 0;
|
|
37
|
-
const adjustedHostPageY = hostBounds ? hostBounds.pageY - hostSnapshotDeltaY : 0;
|
|
9
|
+
// Both values are measured in page coordinates. Subtracting the host origin
|
|
10
|
+
// gives the boundary's local position inside that host, independent of which
|
|
11
|
+
// scroll container owns either view.
|
|
12
|
+
const hostPageX = hostBounds?.pageX ?? 0;
|
|
13
|
+
const hostPageY = hostBounds?.pageY ?? 0;
|
|
38
14
|
return {
|
|
39
15
|
transform: [{
|
|
40
|
-
translateY: bounds.pageY -
|
|
16
|
+
translateY: bounds.pageY - hostPageY
|
|
41
17
|
}, {
|
|
42
|
-
translateX: bounds.pageX -
|
|
18
|
+
translateX: bounds.pageX - hostPageX
|
|
43
19
|
}]
|
|
44
20
|
};
|
|
45
21
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["
|
|
1
|
+
{"version":3,"names":["resolvePortalOffsetStyle","bounds","hostBounds","hostPageX","pageX","hostPageY","pageY","transform","translateY","translateX"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/helpers/offset-style.ts"],"mappings":";;AAOA,OAAO,MAAMA,wBAAwB,GAAGA,CAAC;EACxCC,MAAM;EACNC;AAC+B,CAAC,KAAiB;EACjD,SAAS;;EACT;EACA;EACA;EACA,MAAMC,SAAS,GAAGD,UAAU,EAAEE,KAAK,IAAI,CAAC;EACxC,MAAMC,SAAS,GAAGH,UAAU,EAAEI,KAAK,IAAI,CAAC;EAExC,OAAO;IACNC,SAAS,EAAE,CACV;MAAEC,UAAU,EAAEP,MAAM,CAACK,KAAK,GAAGD;IAAU,CAAC,EACxC;MAAEI,UAAU,EAAER,MAAM,CAACG,KAAK,GAAGD;IAAU,CAAC;EAE1C,CAAC;AACF,CAAC","ignoreList":[]}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import { useCallback, useLayoutEffect,
|
|
3
|
+
import { useCallback, useLayoutEffect, useState } from "react";
|
|
4
4
|
import { runOnJS, useAnimatedReaction } from "react-native-reanimated";
|
|
5
5
|
import { getPairKeyForSource } from "../../../../../../stores/bounds/internals/links";
|
|
6
6
|
import { createBoundaryPortalHostName } from "../../../utils/naming";
|
|
@@ -9,51 +9,46 @@ export const useActivePortalBoundaryHost = ({
|
|
|
9
9
|
boundaryId,
|
|
10
10
|
currentScreenKey,
|
|
11
11
|
escapeHostKey,
|
|
12
|
+
localMeasurement,
|
|
12
13
|
portalHostName,
|
|
13
14
|
portalHostReady,
|
|
14
15
|
slotsMap
|
|
15
16
|
}) => {
|
|
16
|
-
const [
|
|
17
|
-
const
|
|
18
|
-
|
|
19
|
-
if (activePairKeyRef.current === pairKey) {
|
|
20
|
-
return;
|
|
21
|
-
}
|
|
22
|
-
activePairKeyRef.current = pairKey;
|
|
23
|
-
setActivePortal(pairKey ? {
|
|
24
|
-
pairKey
|
|
25
|
-
} : null);
|
|
17
|
+
const [activePairKey, setActivePairKey] = useState(null);
|
|
18
|
+
const updateActivePairKey = useCallback(pairKey => {
|
|
19
|
+
setActivePairKey(pairKey);
|
|
26
20
|
}, []);
|
|
27
21
|
useAnimatedReaction(() => {
|
|
28
22
|
"worklet";
|
|
29
23
|
|
|
30
|
-
const
|
|
31
|
-
|
|
24
|
+
const pairKey = getPairKeyForSource(boundaryId, currentScreenKey);
|
|
25
|
+
const measurement = localMeasurement.get();
|
|
26
|
+
if (!pairKey || measurement?.pairKey !== pairKey) {
|
|
32
27
|
return null;
|
|
33
28
|
}
|
|
34
|
-
return
|
|
29
|
+
return pairKey;
|
|
35
30
|
}, (pairKey, previousPairKey) => {
|
|
36
31
|
"worklet";
|
|
37
32
|
|
|
38
33
|
if (pairKey === previousPairKey) {
|
|
39
34
|
return;
|
|
40
35
|
}
|
|
41
|
-
runOnJS(
|
|
36
|
+
runOnJS(updateActivePairKey)(pairKey);
|
|
42
37
|
});
|
|
43
38
|
useLayoutEffect(() => {
|
|
44
|
-
if (!
|
|
39
|
+
if (!activePairKey || !escapeHostKey) {
|
|
45
40
|
portalHostName.set(null);
|
|
46
41
|
portalHostReady.set(false);
|
|
47
42
|
return;
|
|
48
43
|
}
|
|
49
|
-
const nextPortalHostName = createBoundaryPortalHostName(escapeHostKey, boundaryId,
|
|
44
|
+
const nextPortalHostName = createBoundaryPortalHostName(escapeHostKey, boundaryId, activePairKey);
|
|
50
45
|
mountPortalBoundaryHost({
|
|
51
46
|
boundaryId,
|
|
52
47
|
hostKey: escapeHostKey,
|
|
53
|
-
|
|
48
|
+
localMeasurement,
|
|
49
|
+
pairKey: activePairKey,
|
|
54
50
|
portalHostName: nextPortalHostName,
|
|
55
51
|
portalHostReady,
|
|
56
|
-
screenKey: currentScreenKey,
|
|
57
52
|
slotsMap
|
|
58
53
|
});
|
|
59
54
|
portalHostName.set(nextPortalHostName);
|
|
@@ -62,6 +57,6 @@ export const useActivePortalBoundaryHost = ({
|
|
|
62
57
|
portalHostReady.set(false);
|
|
63
58
|
unmountPortalBoundaryHostByName(nextPortalHostName);
|
|
64
59
|
};
|
|
65
|
-
}, [
|
|
60
|
+
}, [activePairKey, boundaryId, escapeHostKey, localMeasurement, portalHostName, portalHostReady, slotsMap]);
|
|
66
61
|
};
|
|
67
62
|
//# sourceMappingURL=use-active-portal-boundary-host.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useCallback","useLayoutEffect","
|
|
1
|
+
{"version":3,"names":["useCallback","useLayoutEffect","useState","runOnJS","useAnimatedReaction","getPairKeyForSource","createBoundaryPortalHostName","mountPortalBoundaryHost","unmountPortalBoundaryHostByName","useActivePortalBoundaryHost","boundaryId","currentScreenKey","escapeHostKey","localMeasurement","portalHostName","portalHostReady","slotsMap","activePairKey","setActivePairKey","updateActivePairKey","pairKey","measurement","get","previousPairKey","set","nextPortalHostName","hostKey"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/hooks/use-active-portal-boundary-host.ts"],"mappings":";;AAAA,SAASA,WAAW,EAAEC,eAAe,EAAEC,QAAQ,QAAQ,OAAO;AAC9D,SACCC,OAAO,EAEPC,mBAAmB,QACb,yBAAyB;AAChC,SAASC,mBAAmB,QAAQ,iDAAiD;AAIrF,SAASC,4BAA4B,QAAQ,uBAAuB;AACpE,SACCC,uBAAuB,EACvBC,+BAA+B,QACzB,sCAAsC;AAY7C,OAAO,MAAMC,2BAA2B,GAAGA,CAAC;EAC3CC,UAAU;EACVC,gBAAgB;EAChBC,aAAa;EACbC,gBAAgB;EAChBC,cAAc;EACdC,eAAe;EACfC;AACkC,CAAC,KAAK;EACxC,MAAM,CAACC,aAAa,EAAEC,gBAAgB,CAAC,GAAGhB,QAAQ,CACjD,IACD,CAAC;EAED,MAAMiB,mBAAmB,GAAGnB,WAAW,CAAEoB,OAA6B,IAAK;IAC1EF,gBAAgB,CAACE,OAAO,CAAC;EAC1B,CAAC,EAAE,EAAE,CAAC;EAENhB,mBAAmB,CAClB,MAAM;IACL,SAAS;;IACT,MAAMgB,OAAO,GAAGf,mBAAmB,CAACK,UAAU,EAAEC,gBAAgB,CAAC;IACjE,MAAMU,WAAW,GAAGR,gBAAgB,CAACS,GAAG,CAAC,CAAC;IAC1C,IAAI,CAACF,OAAO,IAAIC,WAAW,EAAED,OAAO,KAAKA,OAAO,EAAE;MACjD,OAAO,IAAI;IACZ;IAEA,OAAOA,OAAO;EACf,CAAC,EACD,CAACA,OAAO,EAAEG,eAAe,KAAK;IAC7B,SAAS;;IACT,IAAIH,OAAO,KAAKG,eAAe,EAAE;MAChC;IACD;IAEApB,OAAO,CAACgB,mBAAmB,CAAC,CAACC,OAAO,CAAC;EACtC,CACD,CAAC;EAEDnB,eAAe,CAAC,MAAM;IACrB,IAAI,CAACgB,aAAa,IAAI,CAACL,aAAa,EAAE;MACrCE,cAAc,CAACU,GAAG,CAAC,IAAI,CAAC;MACxBT,eAAe,CAACS,GAAG,CAAC,KAAK,CAAC;MAC1B;IACD;IAEA,MAAMC,kBAAkB,GAAGnB,4BAA4B,CACtDM,aAAa,EACbF,UAAU,EACVO,aACD,CAAC;IAEDV,uBAAuB,CAAC;MACvBG,UAAU;MACVgB,OAAO,EAAEd,aAAa;MACtBC,gBAAgB;MAChBO,OAAO,EAAEH,aAAa;MACtBH,cAAc,EAAEW,kBAAkB;MAClCV,eAAe;MACfC;IACD,CAAC,CAAC;IACFF,cAAc,CAACU,GAAG,CAACC,kBAAkB,CAAC;IAEtC,OAAO,MAAM;MACZX,cAAc,CAACU,GAAG,CAAC,IAAI,CAAC;MACxBT,eAAe,CAACS,GAAG,CAAC,KAAK,CAAC;MAC1BhB,+BAA+B,CAACiB,kBAAkB,CAAC;IACpD,CAAC;EACF,CAAC,EAAE,CACFR,aAAa,EACbP,UAAU,EACVE,aAAa,EACbC,gBAAgB,EAChBC,cAAc,EACdC,eAAe,EACfC,QAAQ,CACR,CAAC;AACH,CAAC","ignoreList":[]}
|
|
@@ -3,6 +3,7 @@
|
|
|
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 { useBoundaryRootStore } from "../../../../providers/boundary-root.provider";
|
|
6
7
|
import { PORTAL_HOST_NAME_RESET_VALUE } from "../../../utils/naming";
|
|
7
8
|
import { isTeleportEnabled } from "../../../utils/teleport-control";
|
|
8
9
|
import { useActiveHostKey } from "../stores/host-registry.store";
|
|
@@ -10,6 +11,12 @@ import { useActivePortalBoundaryHost } from "./use-active-portal-boundary-host";
|
|
|
10
11
|
export const useBoundaryPortalAttachment = ({
|
|
11
12
|
boundaryId
|
|
12
13
|
}) => {
|
|
14
|
+
const localMeasurement = useBoundaryRootStore(root => {
|
|
15
|
+
if (!root) {
|
|
16
|
+
throw new Error("Boundary portal attachment requires a boundary root.");
|
|
17
|
+
}
|
|
18
|
+
return root.localMeasurement;
|
|
19
|
+
});
|
|
13
20
|
const currentScreenKey = useDescriptorsStore(s => s.derivations.currentScreenKey);
|
|
14
21
|
const {
|
|
15
22
|
slotsMap
|
|
@@ -21,6 +28,7 @@ export const useBoundaryPortalAttachment = ({
|
|
|
21
28
|
boundaryId,
|
|
22
29
|
currentScreenKey,
|
|
23
30
|
escapeHostKey,
|
|
31
|
+
localMeasurement,
|
|
24
32
|
portalHostName,
|
|
25
33
|
portalHostReady,
|
|
26
34
|
slotsMap
|
|
@@ -1 +1 @@
|
|
|
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":["shared/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,
|
|
1
|
+
{"version":3,"names":["useAnimatedProps","useSharedValue","useDescriptorsStore","useScreenSlots","useBoundaryRootStore","PORTAL_HOST_NAME_RESET_VALUE","isTeleportEnabled","useActiveHostKey","useActivePortalBoundaryHost","useBoundaryPortalAttachment","boundaryId","localMeasurement","root","Error","currentScreenKey","s","derivations","slotsMap","portalHostName","portalHostReady","escapeHostKey","teleportProps","slot","get","pointerEvents","_pointerEvents","teleport","slotProps","props","shouldAttach","undefined","hostName"],"sourceRoot":"../../../../../../../../../src","sources":["shared/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,oBAAoB,QAAQ,8CAA8C;AACnF,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,GAAGP,oBAAoB,CAAEQ,IAAI,IAAK;IACvD,IAAI,CAACA,IAAI,EAAE;MACV,MAAM,IAAIC,KAAK,CAAC,sDAAsD,CAAC;IACxE;IAEA,OAAOD,IAAI,CAACD,gBAAgB;EAC7B,CAAC,CAAC;EACF,MAAMG,gBAAgB,GAAGZ,mBAAmB,CAC1Ca,CAAC,IAAKA,CAAC,CAACC,WAAW,CAACF,gBACtB,CAAC;EACD,MAAM;IAAEG;EAAS,CAAC,GAAGd,cAAc,CAAC,CAAC;EACrC,MAAMe,cAAc,GAAGjB,cAAc,CAAgB,IAAI,CAAC;EAC1D,MAAMkB,eAAe,GAAGlB,cAAc,CAAC,KAAK,CAAC;EAC7C,MAAMmB,aAAa,GAAGb,gBAAgB,CAACO,gBAAgB,CAAC;EAExDN,2BAA2B,CAAC;IAC3BE,UAAU;IACVI,gBAAgB;IAChBM,aAAa;IACbT,gBAAgB;IAChBO,cAAc;IACdC,eAAe;IACfF;EACD,CAAC,CAAC;EAEF,MAAMI,aAAa,GAAGrB,gBAAgB,CAAC,MAAM;IAC5C,SAAS;;IAET,MAAMsB,IAAI,GAAGL,QAAQ,CAACM,GAAG,CAAC,CAAC,CAACb,UAAU,CAAC;IACvC,MAAM;MACLc,aAAa,EAAEC,cAAc;MAC7BC,QAAQ;MACR,GAAGC;IACJ,CAAC,GAAGL,IAAI,EAAEM,KAAK,IAAI,CAAC,CAAC;IAErB,MAAMC,YAAY,GACjBP,IAAI,KAAKQ,SAAS,IAClBxB,iBAAiB,CAACoB,QAAQ,CAAC,IAC3BP,eAAe,CAACI,GAAG,CAAC,CAAC;IAEtB,MAAMQ,QAAQ,GAAGF,YAAY,GAC1BX,cAAc,CAACK,GAAG,CAAC,CAAC,GACpBlB,4BAA4B;IAE/B,OAAO;MACN,GAAGsB,SAAS;MACZI;IACD,CAAC;EACF,CAAC,CAAC;EAEF,OAAO;IAAEV;EAAc,CAAC;AACzB,CAAC","ignoreList":[]}
|
|
@@ -1,32 +1,21 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
|
-
import {
|
|
4
|
-
import { cancelAnimation, measure, runOnUI, useAnimatedReaction, useAnimatedRef, useSharedValue, withDelay, withTiming } from "react-native-reanimated";
|
|
5
|
-
import { ScrollStore } from "../../../../../../stores/scroll.store";
|
|
6
|
-
import { getVisibilityBlockOffset } from "../../../../../../utils/visibility-block-offset";
|
|
7
|
-
import { adjustedMeasuredBoundsForOverscrollDeltas, correctMeasuredBoundsForVisibilityGate } from "../../../../utils/measured-bounds";
|
|
8
|
-
import { clearPortalHostBounds, setPortalHostBounds } from "../stores/host-bounds.store";
|
|
3
|
+
import { cancelAnimation, measure, useAnimatedReaction, useAnimatedRef, useSharedValue, withDelay, withTiming } from "react-native-reanimated";
|
|
9
4
|
const HOST_MEASUREMENT_RETRY_DELAY_MS = 16;
|
|
10
5
|
export const useHostMeasurement = ({
|
|
11
|
-
|
|
12
|
-
enabled,
|
|
13
|
-
hostKey,
|
|
14
|
-
screenKey,
|
|
15
|
-
visibilityBlocked,
|
|
16
|
-
viewportHeight,
|
|
17
|
-
viewportWidth
|
|
6
|
+
measurementKey
|
|
18
7
|
}) => {
|
|
19
8
|
const hostRef = useAnimatedRef();
|
|
20
|
-
const
|
|
21
|
-
const
|
|
9
|
+
const hostBounds = useSharedValue(null);
|
|
10
|
+
const measuredKey = useSharedValue(null);
|
|
22
11
|
const retryToken = useSharedValue(0);
|
|
23
12
|
useAnimatedReaction(() => {
|
|
24
13
|
"worklet";
|
|
25
14
|
|
|
26
|
-
if (!
|
|
15
|
+
if (!measurementKey) {
|
|
27
16
|
return null;
|
|
28
17
|
}
|
|
29
|
-
return [
|
|
18
|
+
return [measurementKey, measuredKey.get(), retryToken.get()];
|
|
30
19
|
}, state => {
|
|
31
20
|
"worklet";
|
|
32
21
|
|
|
@@ -34,8 +23,8 @@ export const useHostMeasurement = ({
|
|
|
34
23
|
cancelAnimation(retryToken);
|
|
35
24
|
return;
|
|
36
25
|
}
|
|
37
|
-
const [
|
|
38
|
-
if (
|
|
26
|
+
const [requestedKey, completedKey] = state;
|
|
27
|
+
if (requestedKey === completedKey) {
|
|
39
28
|
return;
|
|
40
29
|
}
|
|
41
30
|
const measured = measure(hostRef);
|
|
@@ -47,44 +36,27 @@ export const useHostMeasurement = ({
|
|
|
47
36
|
return;
|
|
48
37
|
}
|
|
49
38
|
cancelAnimation(retryToken);
|
|
50
|
-
|
|
51
|
-
// A measurement taken mid rubber-band would bake the transient
|
|
52
|
-
// overscroll displacement into the host frame. Store the at-rest
|
|
53
|
-
// position instead; clamped scroll deltas share that basis.
|
|
54
|
-
const currentScroll = scrollMetadata.get();
|
|
55
|
-
const overscrollNormalized = capturesScroll ? adjustedMeasuredBoundsForOverscrollDeltas(measured, currentScroll) : measured;
|
|
56
|
-
const correctedMeasured = correctMeasuredBoundsForVisibilityGate({
|
|
57
|
-
measured: overscrollNormalized,
|
|
58
|
-
visibilityBlocked: visibilityBlocked.get(),
|
|
59
|
-
visibilityBlockOffset: getVisibilityBlockOffset(viewportHeight),
|
|
60
|
-
viewportWidth,
|
|
61
|
-
viewportHeight
|
|
62
|
-
});
|
|
63
|
-
if (correctedMeasured.width <= 0 || correctedMeasured.height <= 0) {
|
|
39
|
+
if (measured.width <= 0 || measured.height <= 0) {
|
|
64
40
|
cancelAnimation(retryToken);
|
|
65
41
|
retryToken.set(withDelay(HOST_MEASUREMENT_RETRY_DELAY_MS, withTiming(retryToken.get() + 1, {
|
|
66
42
|
duration: 0
|
|
67
43
|
})));
|
|
68
44
|
return;
|
|
69
45
|
}
|
|
70
|
-
|
|
71
|
-
x:
|
|
72
|
-
y:
|
|
73
|
-
width:
|
|
74
|
-
height:
|
|
75
|
-
pageX:
|
|
76
|
-
pageY:
|
|
77
|
-
scroll: capturesScroll ? currentScroll : null
|
|
46
|
+
hostBounds.set({
|
|
47
|
+
x: measured.x,
|
|
48
|
+
y: measured.y,
|
|
49
|
+
width: measured.width,
|
|
50
|
+
height: measured.height,
|
|
51
|
+
pageX: measured.pageX,
|
|
52
|
+
pageY: measured.pageY
|
|
78
53
|
});
|
|
79
|
-
|
|
54
|
+
measuredKey.set(requestedKey);
|
|
80
55
|
});
|
|
81
|
-
useLayoutEffect(() => {
|
|
82
|
-
return () => {
|
|
83
|
-
runOnUI(clearPortalHostBounds)(hostKey);
|
|
84
|
-
};
|
|
85
|
-
}, [hostKey]);
|
|
86
56
|
return {
|
|
87
|
-
|
|
57
|
+
hostBounds,
|
|
58
|
+
hostRef,
|
|
59
|
+
measuredKey
|
|
88
60
|
};
|
|
89
61
|
};
|
|
90
62
|
//# sourceMappingURL=use-host-measurement.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["
|
|
1
|
+
{"version":3,"names":["cancelAnimation","measure","useAnimatedReaction","useAnimatedRef","useSharedValue","withDelay","withTiming","HOST_MEASUREMENT_RETRY_DELAY_MS","useHostMeasurement","measurementKey","hostRef","hostBounds","measuredKey","retryToken","get","state","requestedKey","completedKey","measured","set","duration","width","height","x","y","pageX","pageY"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/hooks/use-host-measurement.ts"],"mappings":";;AACA,SACCA,eAAe,EAEfC,OAAO,EACPC,mBAAmB,EACnBC,cAAc,EACdC,cAAc,EACdC,SAAS,EACTC,UAAU,QACJ,yBAAyB;AAEhC,MAAMC,+BAA+B,GAAG,EAAE;AAM1C,OAAO,MAAMC,kBAAkB,GAAGA,CAAC;EAClCC;AACyB,CAAC,KAAK;EAC/B,MAAMC,OAAO,GAAGP,cAAc,CAAO,CAAC;EACtC,MAAMQ,UAAU,GAAGP,cAAc,CAA4B,IAAI,CAAC;EAClE,MAAMQ,WAAW,GAAGR,cAAc,CAAgB,IAAI,CAAC;EACvD,MAAMS,UAAU,GAAGT,cAAc,CAAC,CAAC,CAAC;EAEpCF,mBAAmB,CAClB,MAAM;IACL,SAAS;;IACT,IAAI,CAACO,cAAc,EAAE;MACpB,OAAO,IAAI;IACZ;IAEA,OAAO,CAACA,cAAc,EAAEG,WAAW,CAACE,GAAG,CAAC,CAAC,EAAED,UAAU,CAACC,GAAG,CAAC,CAAC,CAAC;EAC7D,CAAC,EACAC,KAAK,IAAK;IACV,SAAS;;IACT,IAAI,CAACA,KAAK,EAAE;MACXf,eAAe,CAACa,UAAU,CAAC;MAC3B;IACD;IAEA,MAAM,CAACG,YAAY,EAAEC,YAAY,CAAC,GAAGF,KAAK;IAC1C,IAAIC,YAAY,KAAKC,YAAY,EAAE;MAClC;IACD;IAEA,MAAMC,QAAQ,GAAGjB,OAAO,CAACS,OAAO,CAAC;IAEjC,IAAI,CAACQ,QAAQ,EAAE;MACdlB,eAAe,CAACa,UAAU,CAAC;MAC3BA,UAAU,CAACM,GAAG,CACbd,SAAS,CACRE,+BAA+B,EAC/BD,UAAU,CAACO,UAAU,CAACC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE;QAAEM,QAAQ,EAAE;MAAE,CAAC,CACjD,CACD,CAAC;MACD;IACD;IAEApB,eAAe,CAACa,UAAU,CAAC;IAE3B,IAAIK,QAAQ,CAACG,KAAK,IAAI,CAAC,IAAIH,QAAQ,CAACI,MAAM,IAAI,CAAC,EAAE;MAChDtB,eAAe,CAACa,UAAU,CAAC;MAC3BA,UAAU,CAACM,GAAG,CACbd,SAAS,CACRE,+BAA+B,EAC/BD,UAAU,CAACO,UAAU,CAACC,GAAG,CAAC,CAAC,GAAG,CAAC,EAAE;QAAEM,QAAQ,EAAE;MAAE,CAAC,CACjD,CACD,CAAC;MACD;IACD;IAEAT,UAAU,CAACQ,GAAG,CAAC;MACdI,CAAC,EAAEL,QAAQ,CAACK,CAAC;MACbC,CAAC,EAAEN,QAAQ,CAACM,CAAC;MACbH,KAAK,EAAEH,QAAQ,CAACG,KAAK;MACrBC,MAAM,EAAEJ,QAAQ,CAACI,MAAM;MACvBG,KAAK,EAAEP,QAAQ,CAACO,KAAK;MACrBC,KAAK,EAAER,QAAQ,CAACQ;IACjB,CAAC,CAAC;IACFd,WAAW,CAACO,GAAG,CAACH,YAAY,CAAC;EAC9B,CACD,CAAC;EAED,OAAO;IACNL,UAAU;IACVD,OAAO;IACPE;EACD,CAAC;AACF,CAAC","ignoreList":[]}
|
package/lib/module/shared/components/boundary/portal/components/boundary-portal/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["memo","Animated","runOnUI","logger","isTeleportAvailable","PORTAL_POINTER_EVENTS","NativePortal","TeleportPortal","useBoundaryPortalAttachment","usePlaceholderStyles","jsx","_jsx","AnimatedNativePortal","createAnimatedComponent","EnabledNativePortal","BoundaryPortal","boundaryId","children","enabled","placeholderRef","EnabledBoundaryPortal","__DEV__","warnOnce","teleportProps","handleOnLayout","placeholderStyle","View","ref","onLayout","nativeEvent","layout","style","pointerEvents","collapsable","animatedProps","name"],"sourceRoot":"../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/index.tsx"],"mappings":";;AAAA,SAGCA,IAAI,QAEE,OAAO;AAEd,OAAOC,QAAQ,IAAsBC,OAAO,QAAQ,yBAAyB;AAC7E,SAASC,MAAM,QAAQ,6BAA6B;AACpD,SACCC,mBAAmB,EACnBC,qBAAqB,EACrBC,YAAY,IAAIC,cAAc,QACxB,gBAAgB;AACvB,SAASC,2BAA2B,QAAQ,wCAAwC;AACpF,SAASC,oBAAoB,QAAQ,gCAAgC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAStE,MAAMC,oBAAoB,GAAGL,cAAc,GACxCN,QAAQ,CAACY,uBAAuB,CAChCN,cACD,CAAC,GACA,IAAI;AACP,MAAMO,mBAAmB,GAAGF,oBAE3B;AASD,OAAO,MAAMG,cAAc,gBAAGf,IAAI,CAAC,SAASe,cAAcA,CAAC;EAC1DC,UAAU;EACVC,QAAQ;EACRC,OAAO;EACPC;AACoB,CAAC,EAAE;EACvB,IAAI,CAACD,OAAO,IAAI,CAACd,mBAAmB,IAAI,CAACQ,oBAAoB,EAAE;IAC9D,OAAOK,QAAQ;EAChB;EAEA,oBACCN,IAAA,CAACS,qBAAqB;IACrBJ,UAAU,EAAEA,UAAW;IACvBG,cAAc,EAAEA,cAAe;IAAAF,QAAA,EAE9BA;EAAQ,CACa,CAAC;AAE1B,CAAC,CAAC;AAEF,MAAMG,qBAAqB,gBAAGpB,IAAI,CAAC,SAASoB,qBAAqBA,CAAC;EACjEJ,UAAU;EACVC,QAAQ;EACRE;AACqC,CAAC,EAAE;EACxC,IAAIE,OAAO,IAAI,CAACL,UAAU,EAAE;IAC3Bb,MAAM,CAACmB,QAAQ,CACd,mBAAmB,EACnB,iEACD,CAAC;EACF;EAEA,MAAM;IAAEC;EAAc,CAAC,GAAGf,2BAA2B,CAAC;IAAEQ;EAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"names":["memo","Animated","runOnUI","logger","isTeleportAvailable","PORTAL_POINTER_EVENTS","NativePortal","TeleportPortal","useBoundaryPortalAttachment","usePlaceholderStyles","jsx","_jsx","AnimatedNativePortal","createAnimatedComponent","EnabledNativePortal","BoundaryPortal","boundaryId","children","enabled","placeholderRef","EnabledBoundaryPortal","__DEV__","warnOnce","teleportProps","handleOnLayout","placeholderStyle","View","ref","onLayout","nativeEvent","layout","style","pointerEvents","collapsable","animatedProps","name"],"sourceRoot":"../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/index.tsx"],"mappings":";;AAAA,SAGCA,IAAI,QAEE,OAAO;AAEd,OAAOC,QAAQ,IAAsBC,OAAO,QAAQ,yBAAyB;AAC7E,SAASC,MAAM,QAAQ,6BAA6B;AACpD,SACCC,mBAAmB,EACnBC,qBAAqB,EACrBC,YAAY,IAAIC,cAAc,QACxB,gBAAgB;AACvB,SAASC,2BAA2B,QAAQ,wCAAwC;AACpF,SAASC,oBAAoB,QAAQ,gCAAgC;AAAC,SAAAC,GAAA,IAAAC,IAAA;AAStE,MAAMC,oBAAoB,GAAGL,cAAc,GACxCN,QAAQ,CAACY,uBAAuB,CAChCN,cACD,CAAC,GACA,IAAI;AACP,MAAMO,mBAAmB,GAAGF,oBAE3B;AASD,OAAO,MAAMG,cAAc,gBAAGf,IAAI,CAAC,SAASe,cAAcA,CAAC;EAC1DC,UAAU;EACVC,QAAQ;EACRC,OAAO;EACPC;AACoB,CAAC,EAAE;EACvB,IAAI,CAACD,OAAO,IAAI,CAACd,mBAAmB,IAAI,CAACQ,oBAAoB,EAAE;IAC9D,OAAOK,QAAQ;EAChB;EAEA,oBACCN,IAAA,CAACS,qBAAqB;IACrBJ,UAAU,EAAEA,UAAW;IACvBG,cAAc,EAAEA,cAAe;IAAAF,QAAA,EAE9BA;EAAQ,CACa,CAAC;AAE1B,CAAC,CAAC;AAEF,MAAMG,qBAAqB,gBAAGpB,IAAI,CAAC,SAASoB,qBAAqBA,CAAC;EACjEJ,UAAU;EACVC,QAAQ;EACRE;AACqC,CAAC,EAAE;EACxC,IAAIE,OAAO,IAAI,CAACL,UAAU,EAAE;IAC3Bb,MAAM,CAACmB,QAAQ,CACd,mBAAmB,EACnB,iEACD,CAAC;EACF;EAEA,MAAM;IAAEC;EAAc,CAAC,GAAGf,2BAA2B,CAAC;IAAEQ;EAAW,CAAC,CAAC;EAErE,MAAM;IAAEQ,cAAc;IAAEC;EAAiB,CAAC,GAAGhB,oBAAoB,CAAC,CAAC;EAEnE,oBACCE,IAAA,CAACV,QAAQ,CAACyB,IAAI;IACbC,GAAG,EAAER,cAAe;IACpBS,QAAQ,EAAEA,CAAC;MAAEC,WAAW,EAAE;QAAEC;MAAO;IAAE,CAAC,KACrC5B,OAAO,CAACsB,cAAc,CAAC,CAACM,MAAM,CAC9B;IACDC,KAAK,EAAEN,gBAAiB;IACxBO,aAAa,EAAE3B,qBAAsB;IACrC4B,WAAW,EAAE,KAAM;IAAAhB,QAAA,eAEnBN,IAAA,CAACG,mBAAmB;MACnBoB,aAAa,EAAEX,aAAc;MAC7BY,IAAI,EAAEnB,UAAW;MACjBgB,aAAa,EAAE3B,qBAAsB;MAAAY,QAAA,EAEpCA;IAAQ,CACW;EAAC,CACR,CAAC;AAElB,CAAC,CAAC","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.localMeasurement === b.localMeasurement && a.pairKey === b.pairKey && a.portalHostName === b.portalHostName && a.portalHostReady === b.portalHostReady && 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","pairKey","portalHostName","portalHostReady","
|
|
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","localMeasurement","pairKey","portalHostName","portalHostReady","slotsMap","mountPortalBoundaryHost","previous","get","set","unmountPortalBoundaryHostByName","delete","subscribe","add","useActivePortalBoundaryHosts"],"sourceRoot":"../../../../../../../../../src","sources":["shared/components/boundary/portal/components/boundary-portal/stores/portal-boundary-host.store.ts"],"mappings":";;AAAA,SAASA,oBAAoB,QAAQ,OAAO;AAmB5C,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,gBAAgB,KAAKF,CAAC,CAACE,gBAAgB,IACzCH,CAAC,CAACI,OAAO,KAAKH,CAAC,CAACG,OAAO,IACvBJ,CAAC,CAACK,cAAc,KAAKJ,CAAC,CAACI,cAAc,IACrCL,CAAC,CAACM,eAAe,KAAKL,CAAC,CAACK,eAAe,IACvCN,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,CAACa,cAAc,CAAC;EAC7D,IAAII,QAAQ,IAAIV,UAAU,CAACU,QAAQ,EAAEjB,IAAI,CAAC,EAAE;IAC3C;EACD;EAEAL,mBAAmB,CAACwB,GAAG,CAACnB,IAAI,CAACa,cAAc,EAAEb,IAAI,CAAC;EAClDK,IAAI,CAAC,CAAC;AACP,CAAC;AAED,OAAO,MAAMe,+BAA+B,GAC3CP,cAAyC,IACrC;EACJ,IAAI,CAACA,cAAc,IAAI,CAAClB,mBAAmB,CAAC0B,MAAM,CAACR,cAAc,CAAC,EAAE;IACnE;EACD;EAEAR,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":[]}
|
|
@@ -1,15 +1,16 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import { useImperativeHandle, useLayoutEffect, useMemo, useRef } from "react";
|
|
4
|
-
import { useAnimatedRef } from "react-native-reanimated";
|
|
4
|
+
import { useAnimatedRef, useSharedValue } from "react-native-reanimated";
|
|
5
5
|
import { useDescriptorsStore } from "../../../providers/screen/descriptors";
|
|
6
6
|
import { useComposedSlotStyles, useSlotStackingStyles } from "../../../providers/screen/styles";
|
|
7
7
|
import { useBlankStackStore } from "../../../providers/stack/blank-stack.provider";
|
|
8
8
|
import { createBoundTag } from "../../../stores/bounds/helpers/link-pairs.helpers";
|
|
9
9
|
import createProvider from "../../../utils/create-provider";
|
|
10
10
|
import { logger } from "../../../utils/logger";
|
|
11
|
-
import {
|
|
11
|
+
import { BoundaryLifecycle } from "../components/boundary-lifecycle";
|
|
12
12
|
import { resolveBoundaryPortal } from "../portal/utils/resolve-portal";
|
|
13
|
+
import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
|
|
13
14
|
// logger.warn prepends the library prefix.
|
|
14
15
|
const MULTIPLE_TARGETS_WARNING = "Multiple Boundary.Target elements were rendered under the same boundary root. The first target in render order will be measured.";
|
|
15
16
|
export const TARGET_OUTSIDE_ROOT_WARNING = "Boundary.Target must be rendered inside Transition.Boundary or a component created by createBoundaryComponent.";
|
|
@@ -38,7 +39,7 @@ export const {
|
|
|
38
39
|
escapeClipping
|
|
39
40
|
});
|
|
40
41
|
const currentScreenKey = useDescriptorsStore(s => s.derivations.currentScreenKey);
|
|
41
|
-
const isCurrentScreenClosing = useBlankStackStore(store => store?.scenesByKey[currentScreenKey]?.activity === "closing");
|
|
42
|
+
const isCurrentScreenClosing = useBlankStackStore(store => portalRuntime.handoff && store?.scenesByKey[currentScreenKey]?.activity === "closing");
|
|
42
43
|
const retainedBoundTagRef = useRef(requestedBoundTag);
|
|
43
44
|
const shouldRetainClosingBoundTag = portalRuntime.handoff && isCurrentScreenClosing;
|
|
44
45
|
|
|
@@ -49,8 +50,6 @@ export const {
|
|
|
49
50
|
retainedBoundTagRef.current = requestedBoundTag;
|
|
50
51
|
}
|
|
51
52
|
const boundTag = retainedBoundTagRef.current;
|
|
52
|
-
const hasConfiguredInterpolator = useDescriptorsStore(s => s.derivations.hasConfiguredInterpolator);
|
|
53
|
-
const runtimeEnabled = enabled && hasConfiguredInterpolator;
|
|
54
53
|
// Associated slot styles attach whenever the boundary is enabled,
|
|
55
54
|
// independent of whether an interpolator is configured for this transition.
|
|
56
55
|
const shouldAttachAssociatedStyles = enabled;
|
|
@@ -59,6 +58,7 @@ export const {
|
|
|
59
58
|
const associatedStackingStyles = useSlotStackingStyles(boundTag.tag);
|
|
60
59
|
const rootRef = useAnimatedRef();
|
|
61
60
|
const measurementRef = useAnimatedRef();
|
|
61
|
+
const localMeasurement = useSharedValue(null);
|
|
62
62
|
useLayoutEffect(() => {
|
|
63
63
|
if (__DEV__ && targetCount > 1) {
|
|
64
64
|
logger.warnOnce("boundary:multiple-targets", MULTIPLE_TARGETS_WARNING);
|
|
@@ -66,17 +66,6 @@ export const {
|
|
|
66
66
|
}, [targetCount]);
|
|
67
67
|
const measuredRef = hasTarget || shouldEscapeBoundaryRootToScreenHost ? measurementRef : rootRef;
|
|
68
68
|
useImperativeHandle(forwardedRef, () => rootRef.current, [rootRef]);
|
|
69
|
-
useBoundaryMeasurement({
|
|
70
|
-
boundTag,
|
|
71
|
-
enabled,
|
|
72
|
-
runtimeEnabled,
|
|
73
|
-
currentScreenKey,
|
|
74
|
-
measuredRef,
|
|
75
|
-
style: hasTarget ? targetStyle : style,
|
|
76
|
-
handoff: portalRuntime.handoff,
|
|
77
|
-
escapeClipping: portalRuntime.escapeClipping,
|
|
78
|
-
config
|
|
79
|
-
});
|
|
80
69
|
const shouldRenderBoundaryRootThroughPortal = shouldEscapeBoundaryRootToScreenHost && !hasTarget;
|
|
81
70
|
const handoffEnabled = enabled && portalRuntime.handoff;
|
|
82
71
|
// A nested active target takes the full associated style, so the root keeps
|
|
@@ -92,15 +81,28 @@ export const {
|
|
|
92
81
|
boundTag,
|
|
93
82
|
currentScreenKey,
|
|
94
83
|
handoffEnabled,
|
|
84
|
+
localMeasurement,
|
|
95
85
|
measurementRef,
|
|
96
86
|
portalRuntime,
|
|
97
87
|
ref: rootRef,
|
|
98
88
|
shouldRenderBoundaryRootThroughPortal,
|
|
99
89
|
shouldRenderHandoffHost: handoffEnabled && !hasTarget
|
|
100
|
-
}), [attachedStyle, boundTag, currentScreenKey, handoffEnabled, hasTarget, measurementRef, portalRuntime, rootRef, shouldRenderBoundaryRootThroughPortal]);
|
|
90
|
+
}), [attachedStyle, boundTag, currentScreenKey, handoffEnabled, hasTarget, localMeasurement, measurementRef, portalRuntime, rootRef, shouldRenderBoundaryRootThroughPortal]);
|
|
101
91
|
return {
|
|
102
92
|
value,
|
|
103
|
-
children:
|
|
93
|
+
children: /*#__PURE__*/_jsxs(_Fragment, {
|
|
94
|
+
children: [children(value), /*#__PURE__*/_jsx(BoundaryLifecycle, {
|
|
95
|
+
boundTag: boundTag,
|
|
96
|
+
config: config,
|
|
97
|
+
currentScreenKey: currentScreenKey,
|
|
98
|
+
enabled: enabled,
|
|
99
|
+
escapeClipping: portalRuntime.escapeClipping,
|
|
100
|
+
handoff: portalRuntime.handoff,
|
|
101
|
+
localMeasurement: localMeasurement,
|
|
102
|
+
measuredRef: measuredRef,
|
|
103
|
+
style: hasTarget ? targetStyle : style
|
|
104
|
+
})]
|
|
105
|
+
})
|
|
104
106
|
};
|
|
105
107
|
});
|
|
106
108
|
//# sourceMappingURL=boundary-root.provider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["useImperativeHandle","useLayoutEffect","useMemo","useRef","useAnimatedRef","useDescriptorsStore","useComposedSlotStyles","useSlotStackingStyles","useBlankStackStore","createBoundTag","createProvider","logger","
|
|
1
|
+
{"version":3,"names":["useImperativeHandle","useLayoutEffect","useMemo","useRef","useAnimatedRef","useSharedValue","useDescriptorsStore","useComposedSlotStyles","useSlotStackingStyles","useBlankStackStore","createBoundTag","createProvider","logger","BoundaryLifecycle","resolveBoundaryPortal","jsx","_jsx","Fragment","_Fragment","jsxs","_jsxs","MULTIPLE_TARGETS_WARNING","TARGET_OUTSIDE_ROOT_WARNING","BoundaryRootProvider","useBoundaryRootStore","guarded","children","config","enabled","escapeClipping","forwardedRef","group","handoff","hasTarget","id","style","targetCount","targetStyle","requestedBoundTag","String","portalRuntime","currentScreenKey","s","derivations","isCurrentScreenClosing","store","scenesByKey","activity","retainedBoundTagRef","shouldRetainClosingBoundTag","current","boundTag","shouldAttachAssociatedStyles","shouldEscapeBoundaryRootToScreenHost","associatedStyles","tag","associatedStackingStyles","rootRef","measurementRef","localMeasurement","__DEV__","warnOnce","measuredRef","shouldRenderBoundaryRootThroughPortal","handoffEnabled","attachedStyle","undefined","value","ref","shouldRenderHandoffHost"],"sourceRoot":"../../../../../../src","sources":["shared/components/boundary/providers/boundary-root.provider.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -23,11 +23,12 @@ export const getRefreshBoundarySignal = params => {
|
|
|
23
23
|
linkId,
|
|
24
24
|
group,
|
|
25
25
|
shouldRefresh,
|
|
26
|
+
settled = false,
|
|
26
27
|
closing,
|
|
27
28
|
linkState
|
|
28
29
|
} = params;
|
|
29
30
|
if (!enabled) return null;
|
|
30
|
-
if (!shouldRefresh) {
|
|
31
|
+
if (!shouldRefresh && (!group || !settled)) {
|
|
31
32
|
return null;
|
|
32
33
|
}
|
|
33
34
|
|
|
@@ -55,24 +56,37 @@ export const getRefreshBoundarySignal = params => {
|
|
|
55
56
|
// Source side:
|
|
56
57
|
// When the activeId changes, trigger a refresh to ensure the source bounds are captured.
|
|
57
58
|
if (sourcePairKey) {
|
|
58
|
-
const
|
|
59
|
+
const pair = linkState?.[sourcePairKey];
|
|
60
|
+
const groupState = pair?.groups?.[group];
|
|
61
|
+
const activeId = groupState?.activeId;
|
|
59
62
|
if (activeId !== linkId) {
|
|
60
63
|
return null;
|
|
61
64
|
}
|
|
62
|
-
|
|
65
|
+
|
|
66
|
+
// The opening member is captured by the initial handshake. A settled
|
|
67
|
+
// refresh is only needed after selection moves to another member.
|
|
68
|
+
if (!shouldRefresh && (groupState?.initialId === undefined || activeId === groupState.initialId || !!pair?.links?.[linkId]?.source)) {
|
|
69
|
+
return null;
|
|
70
|
+
}
|
|
71
|
+
return buildRefreshSignal("source", sourcePairKey, [group, linkId, shouldRefresh ? closing ? "closing" : "settled" : "retarget"].join("|"));
|
|
63
72
|
}
|
|
64
73
|
const refreshDestinationPairKey = destinationPairKey;
|
|
65
74
|
if (!refreshDestinationPairKey) return null;
|
|
66
75
|
|
|
67
76
|
// Destination side:
|
|
68
77
|
// When the activeId changes, trigger a refresh to ensure the destination bounds are captured.
|
|
69
|
-
const
|
|
78
|
+
const pair = linkState?.[refreshDestinationPairKey];
|
|
79
|
+
const groupState = pair?.groups?.[group];
|
|
80
|
+
const activeId = groupState?.activeId;
|
|
70
81
|
|
|
71
82
|
// Destination retargeting should only measure a concrete member that already
|
|
72
83
|
// participates in the pair. Missing members fall back to initialId at resolve.
|
|
73
84
|
if (activeId !== linkId) {
|
|
74
85
|
return null;
|
|
75
86
|
}
|
|
76
|
-
|
|
87
|
+
if (!shouldRefresh && (groupState?.initialId === undefined || activeId === groupState.initialId || !!pair?.links?.[linkId]?.destination)) {
|
|
88
|
+
return null;
|
|
89
|
+
}
|
|
90
|
+
return buildRefreshSignal("destination", refreshDestinationPairKey, [group, linkId, shouldRefresh ? closing ? "closing" : "settled" : "retarget"].join("|"));
|
|
77
91
|
};
|
|
78
92
|
//# sourceMappingURL=refresh-signals.js.map
|
|
@@ -1 +1 @@
|
|
|
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","
|
|
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","settled","closing","linkState","sourcePair","participates","links","sourceRequests","join","refreshDestinationPairKey","pair","groupState","groups","activeId","initialId","undefined","source","destination"],"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;AAED,OAAO,MAAMG,wBAAwB,GAAIC,MAWxC,IAAmC;EACnC,SAAS;;EACT,MAAM;IACLC,OAAO;IACPC,gBAAgB;IAChBC,aAAa;IACbC,kBAAkB;IAClBC,MAAM;IACNC,KAAK;IACLC,aAAa;IACbC,OAAO,GAAG,KAAK;IACfC,OAAO;IACPC;EACD,CAAC,GAAGV,MAAM;EAEV,IAAI,CAACC,OAAO,EAAE,OAAO,IAAI;EAEzB,IAAI,CAACM,aAAa,KAAK,CAACD,KAAK,IAAI,CAACE,OAAO,CAAC,EAAE;IAC3C,OAAO,IAAI;EACZ;;EAEA;EACA;EACA,IAAI,CAACF,KAAK,EAAE;IACX,IAAIH,aAAa,EAAE;MAClB,MAAMQ,UAAU,GAAGD,SAAS,GAAGP,aAAa,CAAC;MAC7C,MAAMS,YAAY,GACjB,CAAC,CAACD,UAAU,EAAEE,KAAK,GAAGR,MAAM,CAAC,IAAI,CAAC,CAACM,UAAU,EAAEG,cAAc,GAAGT,MAAM,CAAC;MAExE,IAAI,CAACO,YAAY,EAAE;QAClB,OAAO,IAAI;MACZ;MAEA,OAAOnB,kBAAkB,CACxB,QAAQ,EACRU,aAAa,EACb,CAACD,gBAAgB,EAAEO,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC,CAACM,IAAI,CAAC,GAAG,CAC7D,CAAC;IACF;IAEA,MAAMC,yBAAyB,GAAGZ,kBAAkB;IAEpD,IAAI,CAACY,yBAAyB,EAAE;MAC/B,OAAO,IAAI;IACZ;IAEA,IAAI,CAACN,SAAS,GAAGM,yBAAyB,CAAC,EAAEH,KAAK,GAAGR,MAAM,CAAC,EAAE;MAC7D,OAAO,IAAI;IACZ;IAEA,OAAOZ,kBAAkB,CACxB,aAAa,EACbuB,yBAAyB,EACzB,CAACd,gBAAgB,EAAEO,OAAO,GAAG,SAAS,GAAG,SAAS,CAAC,CAACM,IAAI,CAAC,GAAG,CAC7D,CAAC;EACF;;EAEA;EACA;EACA,IAAIZ,aAAa,EAAE;IAClB,MAAMc,IAAI,GAAGP,SAAS,GAAGP,aAAa,CAAC;IACvC,MAAMe,UAAU,GAAGD,IAAI,EAAEE,MAAM,GAAGb,KAAK,CAAC;IACxC,MAAMc,QAAQ,GAAGF,UAAU,EAAEE,QAAQ;IAErC,IAAIA,QAAQ,KAAKf,MAAM,EAAE;MACxB,OAAO,IAAI;IACZ;;IAEA;IACA;IACA,IACC,CAACE,aAAa,KACbW,UAAU,EAAEG,SAAS,KAAKC,SAAS,IACnCF,QAAQ,KAAKF,UAAU,CAACG,SAAS,IACjC,CAAC,CAACJ,IAAI,EAAEJ,KAAK,GAAGR,MAAM,CAAC,EAAEkB,MAAM,CAAC,EAChC;MACD,OAAO,IAAI;IACZ;IAEA,OAAO9B,kBAAkB,CACxB,QAAQ,EACRU,aAAa,EACb,CACCG,KAAK,EACLD,MAAM,EACNE,aAAa,GAAIE,OAAO,GAAG,SAAS,GAAG,SAAS,GAAI,UAAU,CAC9D,CAACM,IAAI,CAAC,GAAG,CACX,CAAC;EACF;EAEA,MAAMC,yBAAyB,GAAGZ,kBAAkB;EAEpD,IAAI,CAACY,yBAAyB,EAAE,OAAO,IAAI;;EAE3C;EACA;EACA,MAAMC,IAAI,GAAGP,SAAS,GAAGM,yBAAyB,CAAC;EACnD,MAAME,UAAU,GAAGD,IAAI,EAAEE,MAAM,GAAGb,KAAK,CAAC;EACxC,MAAMc,QAAQ,GAAGF,UAAU,EAAEE,QAAQ;;EAErC;EACA;EACA,IAAIA,QAAQ,KAAKf,MAAM,EAAE;IACxB,OAAO,IAAI;EACZ;EAEA,IACC,CAACE,aAAa,KACbW,UAAU,EAAEG,SAAS,KAAKC,SAAS,IACnCF,QAAQ,KAAKF,UAAU,CAACG,SAAS,IACjC,CAAC,CAACJ,IAAI,EAAEJ,KAAK,GAAGR,MAAM,CAAC,EAAEmB,WAAW,CAAC,EACrC;IACD,OAAO,IAAI;EACZ;EAEA,OAAO/B,kBAAkB,CACxB,aAAa,EACbuB,yBAAyB,EACzB,CACCV,KAAK,EACLD,MAAM,EACNE,aAAa,GAAIE,OAAO,GAAG,SAAS,GAAG,SAAS,GAAI,UAAU,CAC9D,CAACM,IAAI,CAAC,GAAG,CACX,CAAC;AACF,CAAC","ignoreList":[]}
|