react-native-screens 5.0.0-alpha.1 → 5.0.0-alpha.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/README.md +1 -2
- package/RNScreens.podspec +2 -6
- package/android/build.gradle +26 -1
- package/android/src/fabric/java/com/swmansion/rnscreens/NativeProxy.kt +5 -0
- package/android/src/main/java/com/swmansion/rnscreens/RNScreensPackage.kt +2 -2
- package/android/src/main/java/com/swmansion/rnscreens/legacy/Screen.kt +22 -6
- package/android/src/main/java/com/swmansion/rnscreens/legacy/ScreenStackFragment.kt +39 -10
- package/android/src/main/java/com/swmansion/rnscreens/legacy/ScreenViewManager.kt +5 -0
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetAppearanceCoordinator.kt → native/coordinator/FormSheetAppearanceCoordinator.kt} +2 -1
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetBehaviorController.kt → native/coordinator/FormSheetBehaviorController.kt} +25 -1
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetDimensionsCoordinator.kt → native/coordinator/FormSheetDimensionsCoordinator.kt} +4 -1
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/native/coordinator/FormSheetNativeDismissCoordinator.kt +50 -0
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetContainer.kt → native/core/FormSheetContainer.kt} +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetDialog.kt → native/core/FormSheetDialog.kt} +24 -1
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetDialogManager.kt → native/core/FormSheetDialogManager.kt} +25 -1
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetContentSizeChangeDelegate.kt → native/interfaces/FormSheetContentSizeChangeDelegate.kt} +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetContentSizeChangeProvider.kt → native/interfaces/FormSheetContentSizeChangeProvider.kt} +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetDialogEventEmitter.kt → native/interfaces/FormSheetDialogEventEmitter.kt} +3 -1
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetConfig.kt → native/model/FormSheetConfig.kt} +5 -1
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetDetents.kt → native/model/FormSheetDetents.kt} +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetAnimatorFactory.kt → native/presentation/FormSheetAnimatorFactory.kt} +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetPresentationManager.kt → native/presentation/FormSheetPresentationManager.kt} +3 -12
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetPresentationState.kt → native/presentation/FormSheetPresentationState.kt} +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetContentWrapper.kt → react/contentwrapper/FormSheetContentWrapper.kt} +3 -1
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetContentWrapperViewManager.kt → react/contentwrapper/FormSheetContentWrapperViewManager.kt} +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetDetentChangedEvent.kt → react/event/FormSheetDetentChangedEvent.kt} +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetDidAppearEvent.kt → react/event/FormSheetDidAppearEvent.kt} +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetDidDisappearEvent.kt → react/event/FormSheetDidDisappearEvent.kt} +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetNativeDismissEvent.kt → react/event/FormSheetNativeDismissEvent.kt} +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/react/event/FormSheetNativeDismissPreventedEvent.kt +29 -0
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetSyncFlushEvent.kt → react/event/FormSheetSyncFlushEvent.kt} +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetWillAppearEvent.kt → react/event/FormSheetWillAppearEvent.kt} +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetWillDisappearEvent.kt → react/event/FormSheetWillDisappearEvent.kt} +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetContentView.kt → react/host/FormSheetContentView.kt} +3 -1
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetHost.kt → react/host/FormSheetHost.kt} +6 -1
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetHostEventEmitter.kt → react/host/FormSheetHostEventEmitter.kt} +16 -1
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/{FormSheetHostViewManager.kt → react/host/FormSheetHostViewManager.kt} +11 -2
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/StackHeaderApplicator.kt +30 -418
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/StackHeaderCoordinatorLayout.kt +36 -113
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/StackHeaderFrameSynchronizer.kt +63 -0
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/{StackHeaderAppBarLayout.kt → appbar/StackHeaderAppBarLayout.kt} +1 -6
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/{StackHeaderAppBarLayoutBehavior.kt → appbar/StackHeaderAppBarLayoutBehavior.kt} +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/{StackHeaderScrollingViewBehavior.kt → appbar/StackHeaderScrollingViewBehavior.kt} +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/config/StackHeaderConfig.kt +28 -6
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/config/StackHeaderConfigViewManager.kt +8 -1
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/config/StackHeaderConfigurationObserver.kt +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/config/StackHeaderConfigurationProviding.kt +2 -1
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/config/StackHeaderInvalidationFlags.kt +2 -1
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/toolbar/StackHeaderToolbarMenuApplicator.kt +448 -0
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/toolbar/StackHeaderToolbarMenuMapper.kt +17 -3
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/toolbar/StackHeaderToolbarMenuSelectionController.kt +83 -0
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/toolbar/{StackHeaderToolbarMenuConfig.kt → model/StackHeaderToolbarMenuConfig.kt} +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/toolbar/{StackHeaderToolbarMenuElementConfig.kt → model/StackHeaderToolbarMenuElementConfig.kt} +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/toolbar/{StackHeaderToolbarMenuGroupConfig.kt → model/StackHeaderToolbarMenuGroupConfig.kt} +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/toolbar/{StackHeaderToolbarMenuGroupMetadata.kt → model/StackHeaderToolbarMenuGroupMetadata.kt} +5 -1
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/toolbar/{StackHeaderToolbarMenuItemConfig.kt → model/StackHeaderToolbarMenuItemConfig.kt} +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/toolbar/{StackHeaderToolbarMenuItemDefaults.kt → model/StackHeaderToolbarMenuItemDefaults.kt} +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/toolbar/{StackHeaderToolbarMenuItemIconSource.kt → model/StackHeaderToolbarMenuItemIconSource.kt} +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/toolbar/{StackHeaderToolbarMenuItemShowAsAction.kt → model/StackHeaderToolbarMenuItemShowAsAction.kt} +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/toolbar/{StackHeaderToolbarMenuItemType.kt → model/StackHeaderToolbarMenuItemType.kt} +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/toolbar/{StackHeaderToolbarFieldUpdate.kt → update/StackHeaderToolbarFieldUpdate.kt} +1 -1
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/toolbar/{StackHeaderToolbarMenuElementOptions.kt → update/StackHeaderToolbarMenuElementOptions.kt} +2 -1
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/toolbar/update/StackHeaderToolbarMenuElementRawUpdate.kt +13 -0
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/toolbar/update/StackHeaderToolbarMenuElementUpdate.kt +10 -0
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/toolbar/update/StackHeaderToolbarMenuIconResolver.kt +17 -0
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/toolbar/{StackHeaderToolbarMenuUpdateQueue.kt → update/StackHeaderToolbarMenuUpdateQueue.kt} +1 -43
- package/android/src/main/java/com/swmansion/rnscreens/stack/header/toolbar/update/StackHeaderToolbarMenuUpdateQueueDelegate.kt +9 -0
- package/android/src/main/java/com/swmansion/rnscreens/stack/screen/StackScreen.kt +1 -0
- package/common/cpp/react/renderer/components/rnscreens/legacy/RNSScreenShadowNode.cpp +10 -5
- package/ios/RNSEnums.h +0 -2
- package/ios/RNSOrientationProviding.h +0 -2
- package/ios/RNSReactMountingTransactionObserving.h +15 -0
- package/ios/legacy/RNSBarButtonItem.mm +12 -5
- package/ios/legacy/RNSScreen.h +8 -1
- package/ios/legacy/RNSScreen.mm +39 -17
- package/ios/legacy/RNSScreenContentWrapper.mm +9 -0
- package/ios/legacy/RNSScreenFooter.mm +2 -0
- package/ios/legacy/RNSScreenStack.mm +9 -4
- package/ios/modals/form-sheet/RNSFormSheetContentWrapperComponentView.mm +9 -0
- package/ios/scroll-to-top-guard/RNSScrollToTopGuard.h +17 -0
- package/ios/scroll-to-top-guard/RNSScrollToTopGuard.mm +57 -0
- package/ios/scroll-to-top-guard/RNSScrollToTopGuardGestureRecognizer.h +28 -0
- package/ios/scroll-to-top-guard/RNSScrollToTopGuardGestureRecognizer.mm +64 -0
- package/ios/split/RNSSplitAppearanceApplicator.h +36 -0
- package/ios/split/RNSSplitAppearanceApplicator.mm +185 -0
- package/ios/split/RNSSplitAppearanceCoordinator.h +26 -0
- package/ios/split/RNSSplitAppearanceCoordinator.mm +27 -0
- package/ios/split/RNSSplitAppearanceUpdateFlags.h +14 -0
- package/ios/split/RNSSplitHostComponentView.mm +1 -1
- package/ios/split/RNSSplitHostController.h +86 -0
- package/ios/split/RNSSplitHostController.mm +560 -0
- package/ios/split/RNSSplitNavigationController.h +31 -0
- package/ios/split/RNSSplitNavigationController.mm +44 -0
- package/ios/split/RNSSplitNavigationControllerFrameObserver.h +32 -0
- package/ios/split/RNSSplitNavigationControllerFrameObserver.mm +80 -0
- package/ios/split/RNSSplitNavigationControllerFrameOriginChangeDelegate.h +15 -0
- package/ios/split/RNSSplitScreenComponentView.mm +8 -9
- package/ios/split/RNSSplitScreenController.h +45 -0
- package/ios/split/RNSSplitScreenController.mm +130 -0
- package/ios/stack/header/RNSStackHeaderConfigComponentView.h +1 -0
- package/ios/stack/header/RNSStackHeaderConfigComponentView.mm +47 -9
- package/ios/stack/header/RNSStackHeaderConfigDataProviding.h +3 -0
- package/ios/stack/header/RNSStackHeaderMenuCoordinator.h +9 -0
- package/ios/stack/header/RNSStackHeaderMenuCoordinator.mm +15 -0
- package/ios/stack/header/RNSStackHeaderMenuFinder.h +18 -3
- package/ios/stack/header/RNSStackHeaderMenuFinder.mm +21 -3
- package/ios/stack/host/RNSStackHostComponentView.mm +3 -1
- package/ios/stack/host/RNSStackNavigationController.mm +1 -1
- package/ios/stack/screen/RNSStackScreenComponentView.mm +0 -2
- package/ios/stack/screen/RNSStackScreenHeaderCoordinator.h +6 -1
- package/ios/stack/screen/RNSStackScreenHeaderCoordinator.mm +61 -12
- package/ios/tabs/bottom-accessory/RNSTabsBottomAccessoryComponentView.mm +3 -0
- package/ios/tabs/bottom-accessory/RNSTabsBottomAccessoryContentComponentView.mm +4 -1
- package/ios/tabs/host/RNSTabBarController.h +5 -12
- package/ios/tabs/host/RNSTabBarController.mm +1 -1
- package/lib/commonjs/components/scroll-to-top-guard/ScrollToTopGuard.ios.js +25 -0
- package/lib/commonjs/components/scroll-to-top-guard/ScrollToTopGuard.ios.js.map +1 -0
- package/lib/commonjs/components/scroll-to-top-guard/ScrollToTopGuard.js +24 -0
- package/lib/commonjs/components/scroll-to-top-guard/ScrollToTopGuard.js.map +1 -0
- package/lib/commonjs/components/scroll-to-top-guard/index.js +13 -0
- package/lib/commonjs/components/scroll-to-top-guard/index.js.map +1 -0
- package/lib/commonjs/components/stack/header/StackHeaderConfig.ios.js +11 -12
- package/lib/commonjs/components/stack/header/StackHeaderConfig.ios.js.map +1 -1
- package/lib/commonjs/components/stack/header/ios/StackHeaderItem.ios.js +1 -22
- package/lib/commonjs/components/stack/header/ios/StackHeaderItem.ios.js.map +1 -1
- package/lib/commonjs/components/stack/header/ios/iconUtils.ios.js +33 -2
- package/lib/commonjs/components/stack/header/ios/iconUtils.ios.js.map +1 -1
- package/lib/commonjs/components/stack/header/utils.js +6 -9
- package/lib/commonjs/components/stack/header/utils.js.map +1 -1
- package/lib/commonjs/experimental/index.js +11 -0
- package/lib/commonjs/experimental/index.js.map +1 -1
- package/lib/commonjs/fabric/ScrollViewMarkerNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/legacy/FullWindowOverlayNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/legacy/ModalScreenNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/legacy/ScreenContainerNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/legacy/ScreenFooterNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/legacy/ScreenNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/legacy/ScreenStackHeaderConfigNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/legacy/ScreenStackHeaderSubviewNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/legacy/ScreenStackNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/legacy/SearchBarNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/modals/form-sheet/FormSheetHostNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/safe-area/SafeAreaViewNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/scroll-to-top-guard/ScrollToTopGuardNativeComponent.js +12 -0
- package/lib/commonjs/fabric/scroll-to-top-guard/ScrollToTopGuardNativeComponent.js.map +1 -0
- package/lib/commonjs/fabric/split/SplitHostNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/split/SplitScreenNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/stack/StackHeaderConfigAndroidNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/stack/StackHeaderConfigIOSNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/stack/StackHeaderItemIOSNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/stack/StackHeaderItemSpacerIOSNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/stack/StackHeaderSubviewAndroidNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/stack/StackHostNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/stack/StackScreenNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/tabs/TabsBottomAccessoryContentNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/tabs/TabsBottomAccessoryNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/tabs/TabsHostAndroidNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/tabs/TabsHostIOSNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/tabs/TabsScreenAndroidNativeComponent.js.map +1 -1
- package/lib/commonjs/fabric/tabs/TabsScreenIOSNativeComponent.js.map +1 -1
- package/lib/commonjs/flags.js +22 -1
- package/lib/commonjs/flags.js.map +1 -1
- package/lib/commonjs/legacy/components/Screen.js +6 -1
- package/lib/commonjs/legacy/components/Screen.js.map +1 -1
- package/lib/commonjs/legacy/components/ScreenStackHeaderConfig.js +5 -0
- package/lib/commonjs/legacy/components/ScreenStackHeaderConfig.js.map +1 -1
- package/lib/commonjs/legacy/components/ScreenStackItem.js.map +1 -1
- package/lib/commonjs/legacy/components/SearchBar.js +16 -16
- package/lib/commonjs/legacy/components/SearchBar.js.map +1 -1
- package/lib/commonjs/legacy/components/helpers/prepareHeaderBarButtonItems.js +3 -0
- package/lib/commonjs/legacy/components/helpers/prepareHeaderBarButtonItems.js.map +1 -1
- package/lib/commonjs/legacy/gesture-handler/fabricUtils.js.map +1 -1
- package/lib/commonjs/legacy/useTransitionProgress.js.map +1 -1
- package/lib/module/components/scroll-to-top-guard/ScrollToTopGuard.ios.js +20 -0
- package/lib/module/components/scroll-to-top-guard/ScrollToTopGuard.ios.js.map +1 -0
- package/lib/module/components/scroll-to-top-guard/ScrollToTopGuard.js +18 -0
- package/lib/module/components/scroll-to-top-guard/ScrollToTopGuard.js.map +1 -0
- package/lib/module/components/scroll-to-top-guard/index.js +2 -0
- package/lib/module/components/scroll-to-top-guard/index.js.map +1 -0
- package/lib/module/components/stack/header/StackHeaderConfig.ios.js +14 -15
- package/lib/module/components/stack/header/StackHeaderConfig.ios.js.map +1 -1
- package/lib/module/components/stack/header/ios/StackHeaderItem.ios.js +1 -22
- package/lib/module/components/stack/header/ios/StackHeaderItem.ios.js.map +1 -1
- package/lib/module/components/stack/header/ios/iconUtils.ios.js +31 -2
- package/lib/module/components/stack/header/ios/iconUtils.ios.js.map +1 -1
- package/lib/module/components/stack/header/utils.js +5 -8
- package/lib/module/components/stack/header/utils.js.map +1 -1
- package/lib/module/experimental/index.js +1 -0
- package/lib/module/experimental/index.js.map +1 -1
- package/lib/module/fabric/ScrollViewMarkerNativeComponent.js.map +1 -1
- package/lib/module/fabric/legacy/FullWindowOverlayNativeComponent.js.map +1 -1
- package/lib/module/fabric/legacy/ModalScreenNativeComponent.js.map +1 -1
- package/lib/module/fabric/legacy/ScreenContainerNativeComponent.js.map +1 -1
- package/lib/module/fabric/legacy/ScreenFooterNativeComponent.js.map +1 -1
- package/lib/module/fabric/legacy/ScreenNativeComponent.js.map +1 -1
- package/lib/module/fabric/legacy/ScreenStackHeaderConfigNativeComponent.js.map +1 -1
- package/lib/module/fabric/legacy/ScreenStackHeaderSubviewNativeComponent.js.map +1 -1
- package/lib/module/fabric/legacy/ScreenStackNativeComponent.js.map +1 -1
- package/lib/module/fabric/legacy/SearchBarNativeComponent.js.map +1 -1
- package/lib/module/fabric/modals/form-sheet/FormSheetHostNativeComponent.js.map +1 -1
- package/lib/module/fabric/safe-area/SafeAreaViewNativeComponent.js.map +1 -1
- package/lib/module/fabric/scroll-to-top-guard/ScrollToTopGuardNativeComponent.js +7 -0
- package/lib/module/fabric/scroll-to-top-guard/ScrollToTopGuardNativeComponent.js.map +1 -0
- package/lib/module/fabric/split/SplitHostNativeComponent.js.map +1 -1
- package/lib/module/fabric/split/SplitScreenNativeComponent.js.map +1 -1
- package/lib/module/fabric/stack/StackHeaderConfigAndroidNativeComponent.js.map +1 -1
- package/lib/module/fabric/stack/StackHeaderConfigIOSNativeComponent.js.map +1 -1
- package/lib/module/fabric/stack/StackHeaderItemIOSNativeComponent.js.map +1 -1
- package/lib/module/fabric/stack/StackHeaderItemSpacerIOSNativeComponent.js.map +1 -1
- package/lib/module/fabric/stack/StackHeaderSubviewAndroidNativeComponent.js.map +1 -1
- package/lib/module/fabric/stack/StackHostNativeComponent.js.map +1 -1
- package/lib/module/fabric/stack/StackScreenNativeComponent.js.map +1 -1
- package/lib/module/fabric/tabs/TabsBottomAccessoryContentNativeComponent.js.map +1 -1
- package/lib/module/fabric/tabs/TabsBottomAccessoryNativeComponent.js.map +1 -1
- package/lib/module/fabric/tabs/TabsHostAndroidNativeComponent.js.map +1 -1
- package/lib/module/fabric/tabs/TabsHostIOSNativeComponent.js.map +1 -1
- package/lib/module/fabric/tabs/TabsScreenAndroidNativeComponent.js.map +1 -1
- package/lib/module/fabric/tabs/TabsScreenIOSNativeComponent.js.map +1 -1
- package/lib/module/flags.js +22 -1
- package/lib/module/flags.js.map +1 -1
- package/lib/module/legacy/components/Screen.js +6 -1
- package/lib/module/legacy/components/Screen.js.map +1 -1
- package/lib/module/legacy/components/ScreenStackHeaderConfig.js +5 -0
- package/lib/module/legacy/components/ScreenStackHeaderConfig.js.map +1 -1
- package/lib/module/legacy/components/ScreenStackItem.js.map +1 -1
- package/lib/module/legacy/components/SearchBar.js +17 -17
- package/lib/module/legacy/components/SearchBar.js.map +1 -1
- package/lib/module/legacy/components/helpers/prepareHeaderBarButtonItems.js +4 -0
- package/lib/module/legacy/components/helpers/prepareHeaderBarButtonItems.js.map +1 -1
- package/lib/module/legacy/gesture-handler/fabricUtils.js.map +1 -1
- package/lib/module/legacy/useTransitionProgress.js.map +1 -1
- package/lib/module/private/hooks/useRenderDebugInfo.js.map +1 -1
- package/lib/typescript/components/modals/form-sheet/FormSheet.types.d.ts +2 -2
- package/lib/typescript/components/safe-area/SafeAreaView.web.d.ts +5 -2
- package/lib/typescript/components/safe-area/SafeAreaView.web.d.ts.map +1 -1
- package/lib/typescript/components/scroll-to-top-guard/ScrollToTopGuard.d.ts +15 -0
- package/lib/typescript/components/scroll-to-top-guard/ScrollToTopGuard.d.ts.map +1 -0
- package/lib/typescript/components/scroll-to-top-guard/ScrollToTopGuard.ios.d.ts +12 -0
- package/lib/typescript/components/scroll-to-top-guard/ScrollToTopGuard.ios.d.ts.map +1 -0
- package/lib/typescript/components/scroll-to-top-guard/index.d.ts +2 -0
- package/lib/typescript/components/scroll-to-top-guard/index.d.ts.map +1 -0
- package/lib/typescript/components/stack/header/StackHeaderConfig.android.types.d.ts +24 -0
- package/lib/typescript/components/stack/header/StackHeaderConfig.android.types.d.ts.map +1 -1
- package/lib/typescript/components/stack/header/StackHeaderConfig.ios.d.ts.map +1 -1
- package/lib/typescript/components/stack/header/StackHeaderConfig.ios.types.d.ts +13 -0
- package/lib/typescript/components/stack/header/StackHeaderConfig.ios.types.d.ts.map +1 -1
- package/lib/typescript/components/stack/header/StackHeaderConfig.web.d.ts +5 -2
- package/lib/typescript/components/stack/header/StackHeaderConfig.web.d.ts.map +1 -1
- package/lib/typescript/components/stack/header/ios/StackHeaderItem.ios.d.ts.map +1 -1
- package/lib/typescript/components/stack/header/ios/iconUtils.ios.d.ts +3 -0
- package/lib/typescript/components/stack/header/ios/iconUtils.ios.d.ts.map +1 -1
- package/lib/typescript/components/stack/header/utils.d.ts +1 -2
- package/lib/typescript/components/stack/header/utils.d.ts.map +1 -1
- package/lib/typescript/components/stack/host/StackHost.types.d.ts +2 -2
- package/lib/typescript/components/stack/host/StackHost.types.d.ts.map +1 -1
- package/lib/typescript/components/stack/host/StackHost.web.d.ts +6 -2
- package/lib/typescript/components/stack/host/StackHost.web.d.ts.map +1 -1
- package/lib/typescript/components/stack/screen/StackScreen.web.d.ts +5 -2
- package/lib/typescript/components/stack/screen/StackScreen.web.d.ts.map +1 -1
- package/lib/typescript/components/tabs/host/TabsHost.web.d.ts +5 -2
- package/lib/typescript/components/tabs/host/TabsHost.web.d.ts.map +1 -1
- package/lib/typescript/components/tabs/screen/TabsScreen.types.d.ts +7 -3
- package/lib/typescript/components/tabs/screen/TabsScreen.types.d.ts.map +1 -1
- package/lib/typescript/components/tabs/screen/TabsScreen.web.d.ts +5 -2
- package/lib/typescript/components/tabs/screen/TabsScreen.web.d.ts.map +1 -1
- package/lib/typescript/experimental/index.d.ts +1 -0
- package/lib/typescript/experimental/index.d.ts.map +1 -1
- package/lib/typescript/fabric/NativeScreensModule.d.ts +1 -1
- package/lib/typescript/fabric/ScrollViewMarkerNativeComponent.d.ts +2 -2
- package/lib/typescript/fabric/ScrollViewMarkerNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/legacy/FullWindowOverlayNativeComponent.d.ts +2 -2
- package/lib/typescript/fabric/legacy/FullWindowOverlayNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/legacy/ModalScreenNativeComponent.d.ts +3 -2
- package/lib/typescript/fabric/legacy/ModalScreenNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/legacy/ScreenContainerNativeComponent.d.ts +2 -2
- package/lib/typescript/fabric/legacy/ScreenContainerNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/legacy/ScreenContentWrapperNativeComponent.d.ts +2 -2
- package/lib/typescript/fabric/legacy/ScreenContentWrapperNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/legacy/ScreenFooterNativeComponent.d.ts +2 -2
- package/lib/typescript/fabric/legacy/ScreenFooterNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/legacy/ScreenNativeComponent.d.ts +3 -2
- package/lib/typescript/fabric/legacy/ScreenNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/legacy/ScreenNavigationContainerNativeComponent.d.ts +2 -2
- package/lib/typescript/fabric/legacy/ScreenNavigationContainerNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/legacy/ScreenStackHeaderConfigNativeComponent.d.ts +3 -3
- package/lib/typescript/fabric/legacy/ScreenStackHeaderConfigNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/legacy/ScreenStackHeaderSubviewNativeComponent.d.ts +2 -2
- package/lib/typescript/fabric/legacy/ScreenStackHeaderSubviewNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/legacy/ScreenStackNativeComponent.d.ts +2 -2
- package/lib/typescript/fabric/legacy/ScreenStackNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/legacy/SearchBarNativeComponent.d.ts +6 -6
- package/lib/typescript/fabric/legacy/SearchBarNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/modals/form-sheet/FormSheetContentWrapperNativeComponent.d.ts +2 -2
- package/lib/typescript/fabric/modals/form-sheet/FormSheetContentWrapperNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/modals/form-sheet/FormSheetHostNativeComponent.d.ts +2 -2
- package/lib/typescript/fabric/modals/form-sheet/FormSheetHostNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/safe-area/SafeAreaViewNativeComponent.d.ts +2 -2
- package/lib/typescript/fabric/safe-area/SafeAreaViewNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/scroll-to-top-guard/ScrollToTopGuardNativeComponent.d.ts +6 -0
- package/lib/typescript/fabric/scroll-to-top-guard/ScrollToTopGuardNativeComponent.d.ts.map +1 -0
- package/lib/typescript/fabric/split/SplitHostNativeComponent.d.ts +1 -1
- package/lib/typescript/fabric/split/SplitHostNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/split/SplitScreenNativeComponent.d.ts +2 -2
- package/lib/typescript/fabric/split/SplitScreenNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/stack/StackHeaderConfigAndroidNativeComponent.d.ts +1 -0
- package/lib/typescript/fabric/stack/StackHeaderConfigAndroidNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/stack/StackHeaderConfigIOSNativeComponent.d.ts +2 -1
- package/lib/typescript/fabric/stack/StackHeaderConfigIOSNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/stack/StackHeaderItemIOSNativeComponent.d.ts +2 -2
- package/lib/typescript/fabric/stack/StackHeaderItemIOSNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/stack/StackHeaderItemSpacerIOSNativeComponent.d.ts +2 -2
- package/lib/typescript/fabric/stack/StackHeaderItemSpacerIOSNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/stack/StackHeaderSubviewAndroidNativeComponent.d.ts +2 -2
- package/lib/typescript/fabric/stack/StackHeaderSubviewAndroidNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/stack/StackHostNativeComponent.d.ts +2 -2
- package/lib/typescript/fabric/stack/StackHostNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/stack/StackScreenNativeComponent.d.ts +2 -2
- package/lib/typescript/fabric/stack/StackScreenNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/tabs/TabsBottomAccessoryContentNativeComponent.d.ts +2 -2
- package/lib/typescript/fabric/tabs/TabsBottomAccessoryContentNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/tabs/TabsBottomAccessoryNativeComponent.d.ts +2 -2
- package/lib/typescript/fabric/tabs/TabsBottomAccessoryNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/tabs/TabsHostAndroidNativeComponent.d.ts +2 -2
- package/lib/typescript/fabric/tabs/TabsHostAndroidNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/tabs/TabsHostIOSNativeComponent.d.ts +2 -2
- package/lib/typescript/fabric/tabs/TabsHostIOSNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/tabs/TabsScreenAndroidNativeComponent.d.ts +2 -2
- package/lib/typescript/fabric/tabs/TabsScreenAndroidNativeComponent.d.ts.map +1 -1
- package/lib/typescript/fabric/tabs/TabsScreenIOSNativeComponent.d.ts +2 -2
- package/lib/typescript/fabric/tabs/TabsScreenIOSNativeComponent.d.ts.map +1 -1
- package/lib/typescript/flags.d.ts +13 -0
- package/lib/typescript/flags.d.ts.map +1 -1
- package/lib/typescript/legacy/TransitionProgressContext.d.ts +1 -1
- package/lib/typescript/legacy/TransitionProgressContext.d.ts.map +1 -1
- package/lib/typescript/legacy/components/Screen.d.ts +5 -3
- package/lib/typescript/legacy/components/Screen.d.ts.map +1 -1
- package/lib/typescript/legacy/components/Screen.web.d.ts +10 -2
- package/lib/typescript/legacy/components/Screen.web.d.ts.map +1 -1
- package/lib/typescript/legacy/components/ScreenContainer.web.d.ts +5 -2
- package/lib/typescript/legacy/components/ScreenContainer.web.d.ts.map +1 -1
- package/lib/typescript/legacy/components/ScreenContentWrapper.web.d.ts +5 -2
- package/lib/typescript/legacy/components/ScreenContentWrapper.web.d.ts.map +1 -1
- package/lib/typescript/legacy/components/ScreenContentWrapper.windows.d.ts +5 -2
- package/lib/typescript/legacy/components/ScreenContentWrapper.windows.d.ts.map +1 -1
- package/lib/typescript/legacy/components/ScreenFooter.web.d.ts +10 -3
- package/lib/typescript/legacy/components/ScreenFooter.web.d.ts.map +1 -1
- package/lib/typescript/legacy/components/ScreenFooter.windows.d.ts +10 -3
- package/lib/typescript/legacy/components/ScreenFooter.windows.d.ts.map +1 -1
- package/lib/typescript/legacy/components/ScreenStack.web.d.ts +5 -2
- package/lib/typescript/legacy/components/ScreenStack.web.d.ts.map +1 -1
- package/lib/typescript/legacy/components/ScreenStackHeaderConfig.d.ts +3 -1
- package/lib/typescript/legacy/components/ScreenStackHeaderConfig.d.ts.map +1 -1
- package/lib/typescript/legacy/components/ScreenStackItem.d.ts +3 -2
- package/lib/typescript/legacy/components/ScreenStackItem.d.ts.map +1 -1
- package/lib/typescript/legacy/components/SearchBar.d.ts +3 -3
- package/lib/typescript/legacy/components/SearchBar.d.ts.map +1 -1
- package/lib/typescript/legacy/components/SearchBar.web.d.ts +5 -2
- package/lib/typescript/legacy/components/SearchBar.web.d.ts.map +1 -1
- package/lib/typescript/legacy/components/helpers/prepareHeaderBarButtonItems.d.ts +15 -12
- package/lib/typescript/legacy/components/helpers/prepareHeaderBarButtonItems.d.ts.map +1 -1
- package/lib/typescript/legacy/gesture-handler/fabricUtils.d.ts +3 -2
- package/lib/typescript/legacy/gesture-handler/fabricUtils.d.ts.map +1 -1
- package/lib/typescript/legacy/types.d.ts +25 -5
- package/lib/typescript/legacy/types.d.ts.map +1 -1
- package/lib/typescript/legacy/useTransitionProgress.d.ts +2 -5
- package/lib/typescript/legacy/useTransitionProgress.d.ts.map +1 -1
- package/lib/typescript/private/hooks/useRenderDebugInfo.d.ts +2 -2
- package/lib/typescript/private/hooks/useRenderDebugInfo.d.ts.map +1 -1
- package/package.json +17 -17
- package/src/components/modals/form-sheet/FormSheet.types.ts +2 -2
- package/src/components/scroll-to-top-guard/ScrollToTopGuard.ios.tsx +17 -0
- package/src/components/scroll-to-top-guard/ScrollToTopGuard.tsx +18 -0
- package/src/components/scroll-to-top-guard/index.ts +1 -0
- package/src/components/stack/header/StackHeaderConfig.android.types.ts +24 -0
- package/src/components/stack/header/StackHeaderConfig.ios.tsx +32 -22
- package/src/components/stack/header/StackHeaderConfig.ios.types.ts +13 -0
- package/src/components/stack/header/ios/StackHeaderItem.ios.tsx +1 -23
- package/src/components/stack/header/ios/iconUtils.ios.ts +38 -2
- package/src/components/stack/header/utils.ts +6 -11
- package/src/components/stack/host/StackHost.types.ts +2 -4
- package/src/components/tabs/screen/TabsScreen.types.ts +7 -3
- package/src/experimental/index.ts +1 -0
- package/src/fabric/ScrollViewMarkerNativeComponent.ts +8 -2
- package/src/fabric/legacy/FullWindowOverlayNativeComponent.ts +6 -2
- package/src/fabric/legacy/ModalScreenNativeComponent.ts +8 -2
- package/src/fabric/legacy/ScreenContainerNativeComponent.ts +5 -2
- package/src/fabric/legacy/ScreenContentWrapperNativeComponent.ts +2 -2
- package/src/fabric/legacy/ScreenFooterNativeComponent.ts +5 -2
- package/src/fabric/legacy/ScreenNativeComponent.ts +8 -2
- package/src/fabric/legacy/ScreenNavigationContainerNativeComponent.ts +2 -2
- package/src/fabric/legacy/ScreenStackHeaderConfigNativeComponent.ts +8 -3
- package/src/fabric/legacy/ScreenStackHeaderSubviewNativeComponent.ts +6 -2
- package/src/fabric/legacy/ScreenStackNativeComponent.ts +10 -2
- package/src/fabric/legacy/SearchBarNativeComponent.ts +10 -7
- package/src/fabric/modals/form-sheet/FormSheetContentWrapperNativeComponent.ts +2 -2
- package/src/fabric/modals/form-sheet/FormSheetHostNativeComponent.ts +7 -2
- package/src/fabric/safe-area/SafeAreaViewNativeComponent.ts +6 -2
- package/src/fabric/scroll-to-top-guard/ScrollToTopGuardNativeComponent.ts +10 -0
- package/src/fabric/split/SplitHostNativeComponent.ts +5 -2
- package/src/fabric/split/SplitScreenNativeComponent.ts +6 -2
- package/src/fabric/stack/StackHeaderConfigAndroidNativeComponent.ts +3 -1
- package/src/fabric/stack/StackHeaderConfigIOSNativeComponent.ts +7 -2
- package/src/fabric/stack/StackHeaderItemIOSNativeComponent.ts +2 -1
- package/src/fabric/stack/StackHeaderItemSpacerIOSNativeComponent.ts +6 -2
- package/src/fabric/stack/StackHeaderSubviewAndroidNativeComponent.ts +6 -2
- package/src/fabric/stack/StackHostNativeComponent.ts +5 -2
- package/src/fabric/stack/StackScreenNativeComponent.ts +6 -2
- package/src/fabric/tabs/TabsBottomAccessoryContentNativeComponent.ts +6 -2
- package/src/fabric/tabs/TabsBottomAccessoryNativeComponent.ts +6 -2
- package/src/fabric/tabs/TabsHostAndroidNativeComponent.ts +7 -2
- package/src/fabric/tabs/TabsHostIOSNativeComponent.ts +7 -2
- package/src/fabric/tabs/TabsScreenAndroidNativeComponent.ts +2 -1
- package/src/fabric/tabs/TabsScreenIOSNativeComponent.ts +2 -1
- package/src/flags.ts +26 -0
- package/src/legacy/TransitionProgressContext.tsx +1 -1
- package/src/legacy/components/Screen.tsx +14 -6
- package/src/legacy/components/ScreenStackHeaderConfig.tsx +7 -1
- package/src/legacy/components/ScreenStackItem.tsx +3 -4
- package/src/legacy/components/SearchBar.tsx +34 -44
- package/src/legacy/components/helpers/prepareHeaderBarButtonItems.ts +7 -1
- package/src/legacy/gesture-handler/fabricUtils.ts +5 -2
- package/src/legacy/types.ts +28 -5
- package/src/legacy/useTransitionProgress.tsx +4 -2
- package/src/private/hooks/useRenderDebugInfo.tsx +2 -2
- package/android/src/main/java/com/swmansion/rnscreens/modals/formsheet/FormSheetNativeDismissCoordinator.kt +0 -25
- package/ios/ReactMountingTransactionObserving.swift +0 -7
- package/ios/bridging/Swift-Bridging.h +0 -7
- package/ios/orientation/RNSOrientationProviding.swift +0 -6
- package/ios/orientation/RNSOrientationSwift.swift +0 -14
- package/ios/split/RNSSplitAppearanceApplicator.swift +0 -199
- package/ios/split/RNSSplitAppearanceCoordinator.swift +0 -26
- package/ios/split/RNSSplitAppearanceUpdateFlags.swift +0 -11
- package/ios/split/RNSSplitHostController.swift +0 -570
- package/ios/split/RNSSplitNavigationController.swift +0 -46
- package/ios/split/RNSSplitScreenController.swift +0 -133
- package/ios/utils/RNSLog.swift +0 -6
|
@@ -0,0 +1,560 @@
|
|
|
1
|
+
#import "RNSSplitHostController.h"
|
|
2
|
+
|
|
3
|
+
#import <React/RCTAssert.h>
|
|
4
|
+
#import "RNSDefines.h"
|
|
5
|
+
#import "RNSSplitAppearanceApplicator.h"
|
|
6
|
+
#import "RNSSplitAppearanceCoordinator.h"
|
|
7
|
+
#import "RNSSplitHostComponentView.h"
|
|
8
|
+
#import "RNSSplitNavigationController.h"
|
|
9
|
+
#import "RNSSplitNavigationControllerFrameOriginChangeDelegate.h"
|
|
10
|
+
#import "RNSSplitScreenComponentView.h"
|
|
11
|
+
#import "RNSSplitScreenController.h"
|
|
12
|
+
|
|
13
|
+
static const NSInteger minNumberOfColumns = 2;
|
|
14
|
+
static const NSInteger maxNumberOfColumns = 3;
|
|
15
|
+
static const NSInteger maxNumberOfInspectors = 1;
|
|
16
|
+
|
|
17
|
+
@interface RNSSplitHostController () <UISplitViewControllerDelegate,
|
|
18
|
+
RNSSplitNavigationControllerFrameOriginChangeDelegate>
|
|
19
|
+
@end
|
|
20
|
+
|
|
21
|
+
@implementation RNSSplitHostController {
|
|
22
|
+
BOOL _needsChildViewControllersUpdate;
|
|
23
|
+
|
|
24
|
+
RNSSplitAppearanceCoordinator *_splitAppearanceCoordinator;
|
|
25
|
+
RNSSplitAppearanceApplicator *_splitAppearanceApplicator;
|
|
26
|
+
|
|
27
|
+
RNSSplitHostComponentView *_splitHostComponentView;
|
|
28
|
+
|
|
29
|
+
/**
|
|
30
|
+
* This variable is keeping the value of how many columns were set in the initial render. It's used for validation,
|
|
31
|
+
* because Split doesn't support changing number of columns dynamically.
|
|
32
|
+
*/
|
|
33
|
+
NSInteger _fixedColumnsCount;
|
|
34
|
+
|
|
35
|
+
/**
|
|
36
|
+
* Tracks currently visible columns of the UISplitViewController.
|
|
37
|
+
*
|
|
38
|
+
* This set is kept in sync via `UISplitViewControllerDelegate` methods (`willShow` / `willHide`)
|
|
39
|
+
* to reflect which columns are currently rendered in the UI.
|
|
40
|
+
* It ensures that only visible columns are considered (e.g. for accessing topViewController),
|
|
41
|
+
* avoiding crashes when certain columns are collapsed or hidden.
|
|
42
|
+
*/
|
|
43
|
+
NSMutableSet<NSNumber *> *_visibleColumns;
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
- (instancetype)initWithSplitHostComponentView:(RNSSplitHostComponentView *)splitHostComponentView
|
|
47
|
+
numberOfColumns:(NSInteger)numberOfColumns
|
|
48
|
+
{
|
|
49
|
+
if (self = [super initWithStyle:[RNSSplitHostController styleByNumberOfColumns:numberOfColumns]]) {
|
|
50
|
+
_splitHostComponentView = splitHostComponentView;
|
|
51
|
+
_splitAppearanceCoordinator = [RNSSplitAppearanceCoordinator new];
|
|
52
|
+
_splitAppearanceApplicator = [RNSSplitAppearanceApplicator new];
|
|
53
|
+
_fixedColumnsCount = numberOfColumns;
|
|
54
|
+
_needsChildViewControllersUpdate = NO;
|
|
55
|
+
_visibleColumns = [NSMutableSet set];
|
|
56
|
+
|
|
57
|
+
self.delegate = self;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
return self;
|
|
61
|
+
}
|
|
62
|
+
|
|
63
|
+
- (RNSSplitHostComponentEventEmitter *)reactEventEmitter
|
|
64
|
+
{
|
|
65
|
+
return [_splitHostComponentView reactEventEmitter];
|
|
66
|
+
}
|
|
67
|
+
|
|
68
|
+
#pragma mark - Signals
|
|
69
|
+
|
|
70
|
+
- (void)setNeedsUpdateOfChildViewControllers
|
|
71
|
+
{
|
|
72
|
+
_needsChildViewControllersUpdate = YES;
|
|
73
|
+
}
|
|
74
|
+
|
|
75
|
+
- (void)setNeedsAppearanceUpdate
|
|
76
|
+
{
|
|
77
|
+
[_splitAppearanceCoordinator needs:RNSSplitAppearanceUpdateFlagsGeneralUpdate];
|
|
78
|
+
}
|
|
79
|
+
|
|
80
|
+
- (void)setNeedsSecondaryScreenNavBarUpdate
|
|
81
|
+
{
|
|
82
|
+
// We noticed a bug on the pure-native component, which is blocking dynamic updates for showsSecondaryOnlyButton.
|
|
83
|
+
// Toggling this flag doesn't refresh the component and is updated after triggerig some other interaction, like
|
|
84
|
+
// changing layout.
|
|
85
|
+
// We noticed that we can forcefully refresh navigation bar from UINavigationController level by toggling
|
|
86
|
+
// setNavigationBarHidden.
|
|
87
|
+
// After some testing, it looks well and I haven't noticed any flicker - missing button is appearing naturally.
|
|
88
|
+
// Please note that this is a hack rather than a solution so feel free to remove this code in case of any problems and
|
|
89
|
+
// treat the bug with toggling button as a platform's issue.
|
|
90
|
+
[_splitAppearanceCoordinator needs:RNSSplitAppearanceUpdateFlagsSecondaryScreenNavBarUpdate];
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
- (void)setNeedsDisplayModeUpdate
|
|
94
|
+
{
|
|
95
|
+
[_splitAppearanceCoordinator needs:RNSSplitAppearanceUpdateFlagsDisplayModeUpdate];
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
- (void)setNeedsOrientationUpdate
|
|
99
|
+
{
|
|
100
|
+
[_splitAppearanceCoordinator needs:RNSSplitAppearanceUpdateFlagsOrientationUpdate];
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
#pragma mark - Updating
|
|
104
|
+
|
|
105
|
+
- (void)updateChildViewControllersIfNeeded
|
|
106
|
+
{
|
|
107
|
+
if (_needsChildViewControllersUpdate) {
|
|
108
|
+
[self updateChildViewControllers];
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
|
|
112
|
+
- (void)updateChildViewControllers
|
|
113
|
+
{
|
|
114
|
+
RCTAssert(_needsChildViewControllersUpdate,
|
|
115
|
+
@"[RNScreens] Child view controller must be invalidated when update is forced!");
|
|
116
|
+
|
|
117
|
+
NSArray<RNSSplitScreenComponentView *> *currentColumns = [self filterSubviewsOfType:RNSSplitScreenColumnTypeColumn
|
|
118
|
+
in:self.splitReactSubviews];
|
|
119
|
+
NSArray<RNSSplitScreenComponentView *> *currentInspectors =
|
|
120
|
+
[self filterSubviewsOfType:RNSSplitScreenColumnTypeInspector in:self.splitReactSubviews];
|
|
121
|
+
|
|
122
|
+
[self validateColumns:currentColumns];
|
|
123
|
+
[self validateInspectors:currentInspectors];
|
|
124
|
+
|
|
125
|
+
NSMutableArray<RNSSplitNavigationController *> *currentViewControllers =
|
|
126
|
+
[NSMutableArray arrayWithCapacity:currentColumns.count];
|
|
127
|
+
for (RNSSplitScreenComponentView *column in currentColumns) {
|
|
128
|
+
[currentViewControllers addObject:[[RNSSplitNavigationController alloc] initWithRootViewController:column.controller
|
|
129
|
+
frameOriginChangeDelegate:self]];
|
|
130
|
+
}
|
|
131
|
+
|
|
132
|
+
self.viewControllers = currentViewControllers;
|
|
133
|
+
|
|
134
|
+
#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
|
|
135
|
+
if (@available(iOS 26.0, *)) {
|
|
136
|
+
[self maybeSetupInspector:currentInspectors];
|
|
137
|
+
}
|
|
138
|
+
#endif
|
|
139
|
+
|
|
140
|
+
_needsChildViewControllersUpdate = NO;
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
- (void)updateSplitAppearanceIfNeeded
|
|
144
|
+
{
|
|
145
|
+
[_splitAppearanceApplicator updateAppearanceIfNeeded:_splitHostComponentView
|
|
146
|
+
splitHostController:self
|
|
147
|
+
appearanceCoordinator:_splitAppearanceCoordinator];
|
|
148
|
+
}
|
|
149
|
+
|
|
150
|
+
- (void)refreshSecondaryNavBar
|
|
151
|
+
{
|
|
152
|
+
UIViewController *secondaryViewController = [self viewControllerForColumn:UISplitViewControllerColumnSecondary];
|
|
153
|
+
RCTAssert(secondaryViewController != nil,
|
|
154
|
+
@"[RNScreens] Failed to refresh secondary nav bar. Secondary view controller is nil.");
|
|
155
|
+
RCTAssert([secondaryViewController isKindOfClass:UINavigationController.class],
|
|
156
|
+
@"[RNScreens] Expected UINavigationController but got %@",
|
|
157
|
+
NSStringFromClass(secondaryViewController.class));
|
|
158
|
+
UINavigationController *navigationController = (UINavigationController *)secondaryViewController;
|
|
159
|
+
|
|
160
|
+
/** The assumption is that it should come in a single batch and it won't cause any delays in rendering the content. */
|
|
161
|
+
[navigationController setNavigationBarHidden:YES animated:NO];
|
|
162
|
+
[navigationController setNavigationBarHidden:NO animated:NO];
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
#pragma mark - Helpers
|
|
166
|
+
|
|
167
|
+
/**
|
|
168
|
+
* @brief Gets the appropriate style for a specified number of columns.
|
|
169
|
+
*
|
|
170
|
+
* This utility maps a given number of columns to the corresponding UISplitViewController.Style.
|
|
171
|
+
*
|
|
172
|
+
* @param numberOfColumns The number of columns for the SplitView.
|
|
173
|
+
* @return A UISplitViewController.Style corresponding to the provided column count.
|
|
174
|
+
*/
|
|
175
|
+
+ (UISplitViewControllerStyle)styleByNumberOfColumns:(NSInteger)numberOfColumns
|
|
176
|
+
{
|
|
177
|
+
switch (numberOfColumns) {
|
|
178
|
+
case 2:
|
|
179
|
+
return UISplitViewControllerStyleDoubleColumn;
|
|
180
|
+
case 3:
|
|
181
|
+
return UISplitViewControllerStyleTripleColumn;
|
|
182
|
+
default:
|
|
183
|
+
return UISplitViewControllerStyleUnspecified;
|
|
184
|
+
}
|
|
185
|
+
}
|
|
186
|
+
|
|
187
|
+
/**
|
|
188
|
+
* @brief Filters the given subviews array by a specific column type.
|
|
189
|
+
*
|
|
190
|
+
* Iterates over the provided subviews array and returns only the elements that match
|
|
191
|
+
* the specified RNSSplitScreenColumnType (e.g., .column, .inspector).
|
|
192
|
+
*
|
|
193
|
+
* @param type The target RNSSplitScreenColumnType to filter for.
|
|
194
|
+
* @param subviews The array of RNSSplitScreenComponentView elements to filter.
|
|
195
|
+
* @return A filtered array of RNSSplitScreenComponentView objects with the specified column type.
|
|
196
|
+
*/
|
|
197
|
+
- (NSArray<RNSSplitScreenComponentView *> *)filterSubviewsOfType:(RNSSplitScreenColumnType)type
|
|
198
|
+
in:(NSArray<RNSSplitScreenComponentView *> *)subviews
|
|
199
|
+
{
|
|
200
|
+
NSMutableArray<RNSSplitScreenComponentView *> *filteredSubviews = [NSMutableArray array];
|
|
201
|
+
for (RNSSplitScreenComponentView *subview in subviews) {
|
|
202
|
+
if (subview.columnType == type) {
|
|
203
|
+
[filteredSubviews addObject:subview];
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
|
|
207
|
+
return filteredSubviews;
|
|
208
|
+
}
|
|
209
|
+
|
|
210
|
+
#pragma mark - Public setters
|
|
211
|
+
|
|
212
|
+
- (void)toggleSplitViewInspector:(BOOL)showInspector
|
|
213
|
+
{
|
|
214
|
+
#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
|
|
215
|
+
if (@available(iOS 26.0, *)) {
|
|
216
|
+
if (showInspector) {
|
|
217
|
+
[self maybeShowInspector];
|
|
218
|
+
} else {
|
|
219
|
+
[self maybeHideInspector];
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
#endif
|
|
223
|
+
}
|
|
224
|
+
|
|
225
|
+
- (void)showColumnNamed:(NSString *)columnName
|
|
226
|
+
{
|
|
227
|
+
NSNumber *column = [self splitViewColumnFromString:columnName];
|
|
228
|
+
RCTAssert(column != nil, @"[RNScreens] Unknown column name: %@", columnName);
|
|
229
|
+
if (column == nil) {
|
|
230
|
+
return;
|
|
231
|
+
}
|
|
232
|
+
|
|
233
|
+
[self showColumn:(UISplitViewControllerColumn)column.integerValue];
|
|
234
|
+
}
|
|
235
|
+
|
|
236
|
+
/**
|
|
237
|
+
* @brief Maps a string column name to its corresponding `UISplitViewController.Column` value.
|
|
238
|
+
*
|
|
239
|
+
* @param name The column name string: `"primary"`, `"supplementary"`, or `"secondary"`.
|
|
240
|
+
* @return The corresponding `UISplitViewController.Column`, or `nil` if the name is not recognized.
|
|
241
|
+
*/
|
|
242
|
+
- (nullable NSNumber *)splitViewColumnFromString:(NSString *)name
|
|
243
|
+
{
|
|
244
|
+
if ([name isEqualToString:@"primary"]) {
|
|
245
|
+
return @(UISplitViewControllerColumnPrimary);
|
|
246
|
+
}
|
|
247
|
+
if ([name isEqualToString:@"supplementary"]) {
|
|
248
|
+
return @(UISplitViewControllerColumnSupplementary);
|
|
249
|
+
}
|
|
250
|
+
if ([name isEqualToString:@"secondary"]) {
|
|
251
|
+
return @(UISplitViewControllerColumnSecondary);
|
|
252
|
+
}
|
|
253
|
+
|
|
254
|
+
return nil;
|
|
255
|
+
}
|
|
256
|
+
|
|
257
|
+
#pragma mark - RNSReactMountingTransactionObserving
|
|
258
|
+
|
|
259
|
+
/** @brief Called before mounting transaction. */
|
|
260
|
+
- (void)reactMountingTransactionWillMount
|
|
261
|
+
{
|
|
262
|
+
// noop
|
|
263
|
+
}
|
|
264
|
+
|
|
265
|
+
/**
|
|
266
|
+
* @brief Called after mounting transaction.
|
|
267
|
+
*
|
|
268
|
+
* Updates children and the appearance, checks if the hierarchy is valid after applying updates.
|
|
269
|
+
*/
|
|
270
|
+
- (void)reactMountingTransactionDidMount
|
|
271
|
+
{
|
|
272
|
+
[self updateChildViewControllersIfNeeded];
|
|
273
|
+
[self updateSplitAppearanceIfNeeded];
|
|
274
|
+
[self validateSplitViewHierarchy];
|
|
275
|
+
}
|
|
276
|
+
|
|
277
|
+
#pragma mark - RNSOrientationProviding
|
|
278
|
+
|
|
279
|
+
- (RNSOrientation)evaluateOrientation
|
|
280
|
+
{
|
|
281
|
+
return _splitHostComponentView.orientation;
|
|
282
|
+
}
|
|
283
|
+
|
|
284
|
+
#pragma mark - Validators
|
|
285
|
+
|
|
286
|
+
/** @brief Validates that child structure meets required constraints defined for columns and the inspector. */
|
|
287
|
+
- (void)validateSplitViewHierarchy
|
|
288
|
+
{
|
|
289
|
+
NSArray<RNSSplitScreenComponentView *> *columns = [self filterSubviewsOfType:RNSSplitScreenColumnTypeColumn
|
|
290
|
+
in:self.splitReactSubviews];
|
|
291
|
+
NSArray<RNSSplitScreenComponentView *> *inspectors = [self filterSubviewsOfType:RNSSplitScreenColumnTypeInspector
|
|
292
|
+
in:self.splitReactSubviews];
|
|
293
|
+
|
|
294
|
+
[self validateColumns:columns];
|
|
295
|
+
[self validateInspectors:inspectors];
|
|
296
|
+
}
|
|
297
|
+
|
|
298
|
+
/** @brief Ensures that number of columns is valid and hasn't changed dynamically. */
|
|
299
|
+
- (void)validateColumns:(NSArray<RNSSplitScreenComponentView *> *)columns
|
|
300
|
+
{
|
|
301
|
+
RCTAssert((NSInteger)columns.count >= minNumberOfColumns && (NSInteger)columns.count <= maxNumberOfColumns,
|
|
302
|
+
@"[RNScreens] Split can only have from %ld to %ld columns",
|
|
303
|
+
(long)minNumberOfColumns,
|
|
304
|
+
(long)maxNumberOfColumns);
|
|
305
|
+
|
|
306
|
+
RCTAssert((NSInteger)columns.count == _fixedColumnsCount,
|
|
307
|
+
@"[RNScreens] Split number of columns shouldn't change dynamically");
|
|
308
|
+
}
|
|
309
|
+
|
|
310
|
+
/** @brief Ensures that at most one inspector is present. */
|
|
311
|
+
- (void)validateInspectors:(NSArray<RNSSplitScreenComponentView *> *)inspectors
|
|
312
|
+
{
|
|
313
|
+
RCTAssert((NSInteger)inspectors.count <= maxNumberOfInspectors,
|
|
314
|
+
@"[RNScreens] Split can only have %ld inspector",
|
|
315
|
+
(long)maxNumberOfInspectors);
|
|
316
|
+
}
|
|
317
|
+
|
|
318
|
+
/**
|
|
319
|
+
* @brief Gets the children RNSSplitScreenController instances.
|
|
320
|
+
*
|
|
321
|
+
* Accesses Split controllers associated with presented columns. It asserts that each view controller is a navigation
|
|
322
|
+
* controller and its topViewController is of type RNSSplitScreenController.
|
|
323
|
+
*
|
|
324
|
+
* @return An array of RNSSplitScreenController corresponding to current split view columns.
|
|
325
|
+
*/
|
|
326
|
+
- (NSArray<RNSSplitScreenController *> *)splitScreenControllers
|
|
327
|
+
{
|
|
328
|
+
NSMutableArray<RNSSplitScreenController *> *splitScreenControllers =
|
|
329
|
+
[NSMutableArray arrayWithCapacity:_visibleColumns.count];
|
|
330
|
+
|
|
331
|
+
for (NSNumber *columnNumber in _visibleColumns) {
|
|
332
|
+
UISplitViewControllerColumn column = (UISplitViewControllerColumn)columnNumber.integerValue;
|
|
333
|
+
UIViewController *viewController = [self viewControllerForColumn:column];
|
|
334
|
+
RCTAssert(viewController != nil, @"[RNScreens] viewController for column %ld is nil.", (long)column);
|
|
335
|
+
|
|
336
|
+
RNSSplitNavigationController *splitNavigationController =
|
|
337
|
+
[viewController isKindOfClass:RNSSplitNavigationController.class]
|
|
338
|
+
? (RNSSplitNavigationController *)viewController
|
|
339
|
+
: nil;
|
|
340
|
+
RCTAssert(splitNavigationController != nil,
|
|
341
|
+
@"[RNScreens] Expected RNSSplitNavigationController but got %@",
|
|
342
|
+
NSStringFromClass(viewController.class));
|
|
343
|
+
|
|
344
|
+
UIViewController *maybeSplitScreenController = splitNavigationController.topViewController;
|
|
345
|
+
RCTAssert(
|
|
346
|
+
maybeSplitScreenController != nil, @"[RNScreens] RNSSplitScreenController is nil for column %ld", (long)column);
|
|
347
|
+
RCTAssert([maybeSplitScreenController isKindOfClass:RNSSplitScreenController.class],
|
|
348
|
+
@"[RNScreens] Expected RNSSplitScreenController but got %@",
|
|
349
|
+
NSStringFromClass(maybeSplitScreenController.class));
|
|
350
|
+
|
|
351
|
+
if ([maybeSplitScreenController isKindOfClass:RNSSplitScreenController.class]) {
|
|
352
|
+
[splitScreenControllers addObject:(RNSSplitScreenController *)maybeSplitScreenController];
|
|
353
|
+
}
|
|
354
|
+
}
|
|
355
|
+
|
|
356
|
+
return splitScreenControllers;
|
|
357
|
+
}
|
|
358
|
+
|
|
359
|
+
/**
|
|
360
|
+
* @brief Gets all React subviews of type RNSSplitScreenComponentView.
|
|
361
|
+
*
|
|
362
|
+
* Accesses all the subviews from the reactSubviews collection. It asserts that each one is a
|
|
363
|
+
* RNSSplitScreenComponentView.
|
|
364
|
+
*
|
|
365
|
+
* @return An array of RNSSplitScreenComponentView subviews which are children of the host component view.
|
|
366
|
+
*/
|
|
367
|
+
- (NSArray<RNSSplitScreenComponentView *> *)splitReactSubviews
|
|
368
|
+
{
|
|
369
|
+
NSArray<RNSSplitScreenComponentView *> *reactSubviews = [_splitHostComponentView reactSubviews];
|
|
370
|
+
NSMutableArray<RNSSplitScreenComponentView *> *splitReactSubviews =
|
|
371
|
+
[NSMutableArray arrayWithCapacity:reactSubviews.count];
|
|
372
|
+
|
|
373
|
+
for (RNSSplitScreenComponentView *subview in reactSubviews) {
|
|
374
|
+
RCTAssert([subview isKindOfClass:RNSSplitScreenComponentView.class],
|
|
375
|
+
@"[RNScreens] Expected RNSSplitScreenComponentView but got %@",
|
|
376
|
+
NSStringFromClass(subview.class));
|
|
377
|
+
|
|
378
|
+
if ([subview isKindOfClass:RNSSplitScreenComponentView.class]) {
|
|
379
|
+
[splitReactSubviews addObject:subview];
|
|
380
|
+
}
|
|
381
|
+
}
|
|
382
|
+
|
|
383
|
+
return splitReactSubviews;
|
|
384
|
+
}
|
|
385
|
+
|
|
386
|
+
#pragma mark - RNSSplitNavigationControllerFrameOriginChangeDelegate
|
|
387
|
+
|
|
388
|
+
/**
|
|
389
|
+
* @brief Notifies that an origin of parent RNSSplitNavigationController frame has changed.
|
|
390
|
+
*
|
|
391
|
+
* It iterates over children controllers and notifies them for the layout update.
|
|
392
|
+
*
|
|
393
|
+
* @param splitNavCtrl The navigation controller whose frame origin changed.
|
|
394
|
+
*/
|
|
395
|
+
- (void)splitNavigationControllerFrameOriginDidChange:(RNSSplitNavigationController *)splitNavCtrl
|
|
396
|
+
{
|
|
397
|
+
for (RNSSplitScreenController *controller in self.splitScreenControllers) {
|
|
398
|
+
[controller columnPositioningDidChangeInSplitViewController:self];
|
|
399
|
+
}
|
|
400
|
+
}
|
|
401
|
+
|
|
402
|
+
#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
|
|
403
|
+
|
|
404
|
+
/**
|
|
405
|
+
* @brief Sets up the inspector column if available.
|
|
406
|
+
* @remarks Inspector columns is available only on iOS 26 or higher.
|
|
407
|
+
*
|
|
408
|
+
* Attaches a view controller for the inspector column.
|
|
409
|
+
*
|
|
410
|
+
* @param inspectors An array of inspector-type RNSSplitScreenComponentView subviews.
|
|
411
|
+
*/
|
|
412
|
+
- (void)maybeSetupInspector:(NSArray<RNSSplitScreenComponentView *> *)inspectors
|
|
413
|
+
{
|
|
414
|
+
#if !TARGET_OS_TV
|
|
415
|
+
if (@available(iOS 26.0, *)) {
|
|
416
|
+
RNSSplitScreenComponentView *inspector = inspectors.firstObject;
|
|
417
|
+
if (inspector != nil) {
|
|
418
|
+
RNSSplitNavigationController *inspectorViewController =
|
|
419
|
+
[[RNSSplitNavigationController alloc] initWithRootViewController:inspector.controller];
|
|
420
|
+
[self setViewController:inspectorViewController forColumn:UISplitViewControllerColumnInspector];
|
|
421
|
+
}
|
|
422
|
+
}
|
|
423
|
+
#endif
|
|
424
|
+
}
|
|
425
|
+
|
|
426
|
+
/**
|
|
427
|
+
* @brief Shows the inspector column when available.
|
|
428
|
+
* @remarks Inspector columns is available only on iOS 26 or higher.
|
|
429
|
+
*
|
|
430
|
+
* Uses the UISplitViewController's new API introduced in iOS 26 to show the inspector column.
|
|
431
|
+
*/
|
|
432
|
+
- (void)maybeShowInspector
|
|
433
|
+
{
|
|
434
|
+
#if !TARGET_OS_TV
|
|
435
|
+
if (@available(iOS 26.0, *)) {
|
|
436
|
+
[self showColumn:UISplitViewControllerColumnInspector];
|
|
437
|
+
}
|
|
438
|
+
#endif
|
|
439
|
+
}
|
|
440
|
+
|
|
441
|
+
/**
|
|
442
|
+
* @brief Hides the inspector column when available.
|
|
443
|
+
* @remarks Inspector columns is available only on iOS 26 or higher.
|
|
444
|
+
*
|
|
445
|
+
* Uses the UISplitViewController's new API introduced in iOS 26 to hide the inspector column.
|
|
446
|
+
*/
|
|
447
|
+
- (void)maybeHideInspector
|
|
448
|
+
{
|
|
449
|
+
#if !TARGET_OS_TV
|
|
450
|
+
if (@available(iOS 26.0, *)) {
|
|
451
|
+
[self hideColumn:UISplitViewControllerColumnInspector];
|
|
452
|
+
}
|
|
453
|
+
#endif
|
|
454
|
+
}
|
|
455
|
+
|
|
456
|
+
#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
|
|
457
|
+
|
|
458
|
+
#pragma mark - UISplitViewControllerDelegate
|
|
459
|
+
|
|
460
|
+
- (void)splitViewController:(UISplitViewController *)svc willShowColumn:(UISplitViewControllerColumn)column
|
|
461
|
+
{
|
|
462
|
+
[_visibleColumns addObject:@(column)];
|
|
463
|
+
}
|
|
464
|
+
|
|
465
|
+
- (void)splitViewController:(UISplitViewController *)svc willHideColumn:(UISplitViewControllerColumn)column
|
|
466
|
+
{
|
|
467
|
+
[_visibleColumns removeObject:@(column)];
|
|
468
|
+
}
|
|
469
|
+
|
|
470
|
+
- (void)splitViewControllerDidCollapse:(UISplitViewController *)svc
|
|
471
|
+
{
|
|
472
|
+
[[self reactEventEmitter] emitOnCollapse];
|
|
473
|
+
}
|
|
474
|
+
|
|
475
|
+
- (void)splitViewControllerDidExpand:(UISplitViewController *)svc
|
|
476
|
+
{
|
|
477
|
+
[[self reactEventEmitter] emitOnExpand];
|
|
478
|
+
}
|
|
479
|
+
|
|
480
|
+
#if RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
|
|
481
|
+
|
|
482
|
+
/**
|
|
483
|
+
* @brief Called after a column in the split view controller has been hidden from the interface.
|
|
484
|
+
*
|
|
485
|
+
* Currently emits onHideInspector event for the inspector if applicable.
|
|
486
|
+
*
|
|
487
|
+
* @param svc The split view controller that just hid the column.
|
|
488
|
+
* @param column The column that was hidden.
|
|
489
|
+
*/
|
|
490
|
+
- (void)splitViewController:(UISplitViewController *)svc didHideColumn:(UISplitViewControllerColumn)column
|
|
491
|
+
{
|
|
492
|
+
#if !TARGET_OS_TV
|
|
493
|
+
if (@available(iOS 26.0, *)) {
|
|
494
|
+
// TODO: we may consider removing this logic, because it could be handled by onViewDidDisappear on the column level
|
|
495
|
+
// On the other hand, maybe dedicated event related to the inspector would be a better approach.
|
|
496
|
+
// For now I am leaving it, but feel free to drop this method if there's any reason that `onDidDisappear` works
|
|
497
|
+
// better.
|
|
498
|
+
|
|
499
|
+
if (column != UISplitViewControllerColumnInspector) {
|
|
500
|
+
return;
|
|
501
|
+
}
|
|
502
|
+
|
|
503
|
+
// `didHide` for modal is called on finger down for dismiss, what is problematic, because we can cancel dismissing
|
|
504
|
+
// modal.
|
|
505
|
+
// In this scenario, the modal inspector might receive an invalid state and will deviate from the JS value.
|
|
506
|
+
// Therefore, for event emissions, we need to ensure that the view was detached from the view hierarchy, by checking
|
|
507
|
+
// its window.
|
|
508
|
+
UIViewController *inspectorViewController = [self viewControllerForColumn:UISplitViewControllerColumnInspector];
|
|
509
|
+
if (inspectorViewController != nil) {
|
|
510
|
+
if (inspectorViewController.view.window == nil) {
|
|
511
|
+
[[self reactEventEmitter] emitOnHideInspector];
|
|
512
|
+
}
|
|
513
|
+
}
|
|
514
|
+
}
|
|
515
|
+
#endif
|
|
516
|
+
}
|
|
517
|
+
|
|
518
|
+
#endif // RNS_IPHONE_OS_VERSION_AVAILABLE(26_0)
|
|
519
|
+
|
|
520
|
+
- (void)splitViewController:(UISplitViewController *)svc
|
|
521
|
+
willChangeToDisplayMode:(UISplitViewControllerDisplayMode)displayMode
|
|
522
|
+
{
|
|
523
|
+
if (self.displayMode != displayMode) {
|
|
524
|
+
[[self reactEventEmitter] emitOnDisplayModeWillChangeFrom:self.displayMode to:displayMode];
|
|
525
|
+
}
|
|
526
|
+
|
|
527
|
+
__weak auto weakSelf = self;
|
|
528
|
+
void (^notifyColumnPositioningDidChange)(void) = ^{
|
|
529
|
+
auto strongSelf = weakSelf;
|
|
530
|
+
if (strongSelf == nil) {
|
|
531
|
+
return;
|
|
532
|
+
}
|
|
533
|
+
|
|
534
|
+
for (RNSSplitScreenController *controller in [strongSelf splitScreenControllers]) {
|
|
535
|
+
[controller columnPositioningDidChangeInSplitViewController:strongSelf];
|
|
536
|
+
}
|
|
537
|
+
};
|
|
538
|
+
|
|
539
|
+
id<UIViewControllerTransitionCoordinator> coordinator = svc.transitionCoordinator;
|
|
540
|
+
if (coordinator != nil) {
|
|
541
|
+
[coordinator animateAlongsideTransition:nil
|
|
542
|
+
completion:^(id<UIViewControllerTransitionCoordinatorContext> context) {
|
|
543
|
+
notifyColumnPositioningDidChange();
|
|
544
|
+
}];
|
|
545
|
+
} else {
|
|
546
|
+
notifyColumnPositioningDidChange();
|
|
547
|
+
}
|
|
548
|
+
}
|
|
549
|
+
|
|
550
|
+
- (UISplitViewControllerColumn)splitViewController:(UISplitViewController *)svc
|
|
551
|
+
topColumnForCollapsingToProposedTopColumn:(UISplitViewControllerColumn)proposedTopColumn
|
|
552
|
+
{
|
|
553
|
+
if (_splitHostComponentView.hasCustomTopColumnForCollapsing) {
|
|
554
|
+
return _splitHostComponentView.topColumnForCollapsingColumn;
|
|
555
|
+
}
|
|
556
|
+
|
|
557
|
+
return proposedTopColumn;
|
|
558
|
+
}
|
|
559
|
+
|
|
560
|
+
@end
|
|
@@ -0,0 +1,31 @@
|
|
|
1
|
+
#pragma once
|
|
2
|
+
|
|
3
|
+
#import <UIKit/UIKit.h>
|
|
4
|
+
|
|
5
|
+
NS_ASSUME_NONNULL_BEGIN
|
|
6
|
+
|
|
7
|
+
@protocol RNSSplitNavigationControllerFrameOriginChangeDelegate;
|
|
8
|
+
|
|
9
|
+
/**
|
|
10
|
+
* @class RNSSplitNavigationController
|
|
11
|
+
* @brief A subclass of UINavigationController, creates a view that wraps view associated with
|
|
12
|
+
* RNSSplitScreenController.
|
|
13
|
+
*
|
|
14
|
+
* UISplitViewController resizes column views natively - on display mode change or column resize, so
|
|
15
|
+
* these updates should be passed to React to allow syncing the ShadowTree layout of SplitViewScreen
|
|
16
|
+
* subtree. This controller observes its own view's frame via KVO and notifies `viewFrameOriginChangeDelegate`
|
|
17
|
+
* whenever the frame origin changes.
|
|
18
|
+
*/
|
|
19
|
+
@interface RNSSplitNavigationController : UINavigationController
|
|
20
|
+
|
|
21
|
+
/**
|
|
22
|
+
* Initializes the controller with a delegate notified whenever the origin of this controller's
|
|
23
|
+
* view frame changes.
|
|
24
|
+
*/
|
|
25
|
+
- (instancetype)initWithRootViewController:(UIViewController *)rootViewController
|
|
26
|
+
frameOriginChangeDelegate:
|
|
27
|
+
(nullable id<RNSSplitNavigationControllerFrameOriginChangeDelegate>)frameOriginChangeDelegate;
|
|
28
|
+
|
|
29
|
+
@end
|
|
30
|
+
|
|
31
|
+
NS_ASSUME_NONNULL_END
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
#import "RNSSplitNavigationController.h"
|
|
2
|
+
#import "RNSSplitNavigationControllerFrameObserver.h"
|
|
3
|
+
#import "RNSSplitNavigationControllerFrameOriginChangeDelegate.h"
|
|
4
|
+
|
|
5
|
+
@implementation RNSSplitNavigationController {
|
|
6
|
+
RNSSplitNavigationControllerFrameObserver *_frameObserver;
|
|
7
|
+
id<RNSSplitNavigationControllerFrameOriginChangeDelegate> __weak _frameOriginChangeDelegate;
|
|
8
|
+
}
|
|
9
|
+
|
|
10
|
+
- (instancetype)initWithRootViewController:(UIViewController *)rootViewController
|
|
11
|
+
frameOriginChangeDelegate:
|
|
12
|
+
(id<RNSSplitNavigationControllerFrameOriginChangeDelegate>)frameOriginChangeDelegate
|
|
13
|
+
{
|
|
14
|
+
if (self = [super initWithRootViewController:rootViewController]) {
|
|
15
|
+
_frameOriginChangeDelegate = frameOriginChangeDelegate;
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
return self;
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
/**
|
|
22
|
+
* @brief Called after the view controller’s view has been loaded.
|
|
23
|
+
*
|
|
24
|
+
* Sets up a frame-origin Key-Value Observer to monitor view position changes and propagate them via delegate to
|
|
25
|
+
* RNSSplitHostController.
|
|
26
|
+
*/
|
|
27
|
+
- (void)viewDidLoad
|
|
28
|
+
{
|
|
29
|
+
[super viewDidLoad];
|
|
30
|
+
|
|
31
|
+
if (_frameObserver == nil) {
|
|
32
|
+
_frameObserver = [[RNSSplitNavigationControllerFrameObserver alloc]
|
|
33
|
+
initWithSplitNavigationController:self
|
|
34
|
+
delegate:_frameOriginChangeDelegate];
|
|
35
|
+
}
|
|
36
|
+
[_frameObserver registerForViewFrameChanges];
|
|
37
|
+
}
|
|
38
|
+
|
|
39
|
+
- (void)dealloc
|
|
40
|
+
{
|
|
41
|
+
[_frameObserver unregisterForViewFrameChanges];
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
@end
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
#pragma once
|
|
2
|
+
|
|
3
|
+
#import <UIKit/UIKit.h>
|
|
4
|
+
#import "RNSSplitNavigationController.h"
|
|
5
|
+
|
|
6
|
+
NS_ASSUME_NONNULL_BEGIN
|
|
7
|
+
|
|
8
|
+
@protocol RNSSplitNavigationControllerFrameOriginChangeDelegate;
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* @class RNSSplitNavigationControllerFrameObserver
|
|
12
|
+
* @brief Class responsible for observing frame origin changes of RNSSplitNavigationController's view.
|
|
13
|
+
*/
|
|
14
|
+
@interface RNSSplitNavigationControllerFrameObserver : NSObject
|
|
15
|
+
|
|
16
|
+
- (instancetype)initWithSplitNavigationController:(RNSSplitNavigationController *)navigationController
|
|
17
|
+
delegate:(nullable id<RNSSplitNavigationControllerFrameOriginChangeDelegate>)
|
|
18
|
+
frameOriginChangeDelegate;
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* Registers KVO for the frame of navigation controller's view.
|
|
22
|
+
* It must be called after the navigation controller's view is loaded.
|
|
23
|
+
*/
|
|
24
|
+
- (void)registerForViewFrameChanges;
|
|
25
|
+
/**
|
|
26
|
+
* Removes the KVO registration set up by `registerForViewFrameChanges`.
|
|
27
|
+
*/
|
|
28
|
+
- (void)unregisterForViewFrameChanges;
|
|
29
|
+
|
|
30
|
+
@end
|
|
31
|
+
|
|
32
|
+
NS_ASSUME_NONNULL_END
|