react-native-screens 4.24.0 → 4.25.0-beta.2

package/android/src/paper/java/com/swmansion/rnscreens/FabricEnabledViewGroup.kt

@@ -1,19 +0,0 @@
-package com.swmansion.rnscreens
-
-import android.view.ViewGroup
-import com.facebook.react.bridge.ReactContext
-import com.facebook.react.uimanager.StateWrapper
-
-abstract class FabricEnabledViewGroup(
-    context: ReactContext?,
-) : ViewGroup(context) {
-    fun setStateWrapper(wrapper: StateWrapper?) = Unit
-
-    protected fun updateScreenSizeFabric(
-        width: Int,
-        height: Int,
-        headerHeight: Int,
-    ) {
-        // do nothing
-    }
-}

package/android/src/paper/java/com/swmansion/rnscreens/NativeProxy.kt

@@ -1,23 +0,0 @@
-package com.swmansion.rnscreens
-
-import com.facebook.react.fabric.FabricUIManager
-
-class NativeProxy {
-    // do nothing on Paper
-    fun nativeAddMutationsListener(fabricUIManager: FabricUIManager) = Unit
-
-    fun cleanupExpiredMountingCoordinators() = Unit
-
-    fun invalidateNative() = Unit
-
-    companion object {
-        fun addScreenToMap(
-            tag: Int,
-            view: Screen,
-        ) = Unit
-
-        fun removeScreenFromMap(tag: Int) = Unit
-
-        fun clearMapOnInvalidate() = Unit
-    }
-}

package/android/src/paper/java/com/swmansion/rnscreens/NativeScreensModuleSpec.java

@@ -1,35 +0,0 @@
-
-/**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * @generated by codegen project: GenerateModuleJavaSpec.js
- *
- * @nolint
- */
-
-package com.swmansion.rnscreens;
-
-import com.facebook.proguard.annotations.DoNotStrip;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.turbomodule.core.interfaces.TurboModule;
-import javax.annotation.Nonnull;
-
-public abstract class NativeScreensModuleSpec extends ReactContextBaseJavaModule implements TurboModule {
-  public static final String NAME = "RNSModule";
-
-  public NativeScreensModuleSpec(ReactApplicationContext reactContext) {
-    super(reactContext);
-  }
-
-  @Override
-  public @Nonnull String getName() {
-    return NAME;
-  }
-
-
-}

package/common/cpp/react/renderer/components/rnscreens/RNSSplitViewScreenComponentDescriptor.h

@@ -1,40 +0,0 @@
-#pragma once
-
-#ifdef ANDROID
-#include <fbjni/fbjni.h>
-#endif // ANDROID
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-#include "RNSSplitViewScreenShadowNode.h"
-
-namespace facebook::react {
-
-class RNSSplitViewScreenComponentDescriptor final
-    : public ConcreteComponentDescriptor<RNSSplitViewScreenShadowNode> {
- public:
-  using ConcreteComponentDescriptor::ConcreteComponentDescriptor;
-
-  void adopt(ShadowNode &shadowNode) const override {
-    react_native_assert(
-        dynamic_cast<RNSSplitViewScreenShadowNode *>(&shadowNode));
-    auto &splitViewScreenShadowNode =
-        static_cast<RNSSplitViewScreenShadowNode &>(shadowNode);
-
-    react_native_assert(
-        dynamic_cast<YogaLayoutableShadowNode *>(&splitViewScreenShadowNode));
-    auto &layoutableShadowNode =
-        static_cast<YogaLayoutableShadowNode &>(splitViewScreenShadowNode);
-
-    auto state = std::static_pointer_cast<
-        const RNSSplitViewScreenShadowNode::ConcreteState>(
-        shadowNode.getState());
-    auto stateData = state->getData();
-
-    if (stateData.frameSize.width != 0 && stateData.frameSize.height != 0) {
-      layoutableShadowNode.setSize(stateData.frameSize);
-    }
-
-    ConcreteComponentDescriptor::adopt(shadowNode);
-  }
-};
-
-} // namespace facebook::react

package/common/cpp/react/renderer/components/rnscreens/RNSSplitViewScreenShadowNode.cpp

@@ -1,13 +0,0 @@
-#include "RNSSplitViewScreenShadowNode.h"
-
-namespace facebook::react {
-
-extern const char RNSSplitViewScreenComponentName[] = "RNSSplitViewScreen";
-
-Point RNSSplitViewScreenShadowNode::getContentOriginOffset(
-    bool /*includeTransform*/) const {
-  auto stateData = getStateData();
-  return stateData.contentOffset;
-}
-
-} // namespace facebook::react

package/ios/RNSInvalidatedComponentsRegistry.h

@@ -1,15 +0,0 @@
-#pragma once
-
-#ifdef RCT_NEW_ARCH_ENABLED
-
-#import <UIKit/UIKit.h>
-#import "RNSViewControllerInvalidating.h"
-
-@interface RNSInvalidatedComponentsRegistry : NSObject
-
-- (void)pushForInvalidation:(UIView<RNSViewControllerInvalidating> *)view;
-- (void)flushInvalidViews;
-
-@end
-
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNSInvalidatedComponentsRegistry.mm

@@ -1,34 +0,0 @@
-#ifdef RCT_NEW_ARCH_ENABLED
-
-#import "RNSInvalidatedComponentsRegistry.h"
-
-@interface RNSInvalidatedComponentsRegistry ()
-@property (nonatomic, strong) NSMutableSet<UIView<RNSViewControllerInvalidating> *> *invalidViews;
-@end
-
-@implementation RNSInvalidatedComponentsRegistry
-
-- (instancetype)init
-{
-  if (self = [super init]) {
-    _invalidViews = [NSMutableSet set];
-  }
-  return self;
-}
-
-- (void)pushForInvalidation:(UIView<RNSViewControllerInvalidating> *)view
-{
-  [_invalidViews addObject:view];
-}
-
-- (void)flushInvalidViews
-{
-  for (id<RNSViewControllerInvalidating> view in _invalidViews) {
-    [view invalidateController];
-  }
-  [_invalidViews removeAllObjects];
-}
-
-@end
-
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNSViewControllerInvalidating.h

@@ -1,15 +0,0 @@
-#pragma once
-
-#ifdef RCT_NEW_ARCH_ENABLED
-
-#include <react/renderer/mounting/ShadowViewMutation.h>
-
-@protocol RNSViewControllerInvalidating
-
-- (void)invalidateController;
-
-- (BOOL)shouldInvalidateOnMutation:(const facebook::react::ShadowViewMutation &)mutation;
-
-@end
-
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNSViewControllerInvalidator.h

@@ -1,17 +0,0 @@
-#pragma once
-
-#ifdef RCT_NEW_ARCH_ENABLED
-
-#import <UIKit/UIKit.h>
-
-#import "RNSInvalidatedComponentsRegistry.h"
-#import "RNSViewControllerInvalidating.h"
-
-@interface RNSViewControllerInvalidator : NSObject
-
-+ (void)invalidateViewIfDetached:(UIView<RNSViewControllerInvalidating> *_Nonnull)view
-                     forRegistry:(RNSInvalidatedComponentsRegistry *_Nonnull)registry;
-
-@end
-
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/RNSViewControllerInvalidator.mm

@@ -1,23 +0,0 @@
-#ifdef RCT_NEW_ARCH_ENABLED
-
-#import "RNSViewControllerInvalidator.h"
-
-#import <React/RCTAssert.h>
-#import "RNSInvalidatedComponentsRegistry.h"
-#import "RNSViewControllerInvalidating.h"
-
-@implementation RNSViewControllerInvalidator
-
-+ (void)invalidateViewIfDetached:(UIView<RNSViewControllerInvalidating> *_Nonnull)view
-                     forRegistry:(RNSInvalidatedComponentsRegistry *_Nonnull)registry
-{
-  if (view.window == nil) {
-    [view invalidateController];
-  } else {
-    [registry pushForInvalidation:view];
-  }
-}
-
-@end
-
-#endif // RCT_NEW_ARCH_ENABLED

package/ios/gamma/split-view/RNSSplitViewAppearanceApplicator.swift

@@ -1,194 +0,0 @@
-///
-/// @brief - Class responsible for applying all upcoming updates to SplitView.
-///
-/// This class is synchronizing UISplitViewController configuration props which are affecting the SplitView appearance with props passed to RNSSplitViewHostComponentView from the ElementTree.
-///
-class RNSSplitViewAppearanceApplicator {
-  ///
-  /// @brief Function responsible for applying all updates to SplitView in correct order
-  ///
-  /// It requests calling proper callbacks with batched SplitView updates on the AppearanceCoordinator object
-  ///
-  /// @param splitView The view representing JS component which is sending updates.
-  /// @param splitViewController The controller associated with the SplitView component which receives updates and manages the native layer.
-  /// @param appearanceCoordinator The coordinator which is checking whether the update needs to be applied and if so, it executes the callback passed by this class.
-  ///
-  public func updateAppearanceIfNeeded(
-    _ splitView: RNSSplitViewHostComponentView,
-    _ splitViewController: RNSSplitViewHostController,
-    _ appearanceCoordinator: RNSSplitViewAppearanceCoordinator
-  ) {
-    appearanceCoordinator.updateIfNeeded(.generalUpdate) { [weak self] in
-      guard let self = self
-      else {
-        return
-      }
-
-      self.updateSplitViewConfiguration(for: splitView, withController: splitViewController)
-    }
-
-    appearanceCoordinator.updateIfNeeded(.secondaryScreenNavBarUpdate) { [weak self] in
-      guard let self = self
-      else {
-        return
-      }
-
-      splitViewController.refreshSecondaryNavBar()
-    }
-
-    appearanceCoordinator.updateIfNeeded(.displayModeUpdate) { [weak self] in
-      guard let self = self
-      else {
-        return
-      }
-
-      self.updateSplitViewDisplayMode(for: splitView, withController: splitViewController)
-    }
-
-    appearanceCoordinator.updateIfNeeded(.orientationUpdate) { [] in
-      RNSScreenWindowTraits.enforceDesiredDeviceOrientation()
-    }
-  }
-
-  ///
-  /// @brief Function that applies all basic updates.
-  ///
-  /// It calls all setters on RNSSplitViewHostController that doesn't require any custom logic and conditions to be met.
-  ///
-  /// @param splitView The view representing JS component which is sending updates.
-  /// @param splitViewController The controller associated with the SplitView component which receives updates and manages the native layer.
-  ///
-  private func updateSplitViewConfiguration(
-    for splitView: RNSSplitViewHostComponentView,
-    withController splitViewController: RNSSplitViewHostController
-  ) {
-    // Step 1 - general settings
-    splitViewController.displayModeButtonVisibility = splitView.displayModeButtonVisibility
-    splitViewController.preferredSplitBehavior = splitView.preferredSplitBehavior
-    #if !os(tvOS)
-      splitViewController.primaryBackgroundStyle = splitView.primaryBackgroundStyle
-    #endif
-    splitViewController.presentsWithGesture = splitView.presentsWithGesture
-    splitViewController.primaryEdge = splitView.primaryEdge
-    splitViewController.showsSecondaryOnlyButton = splitView.showSecondaryToggleButton
-
-    // Step 2.1 - validating column constraints
-    validateColumnConstraints(
-      minWidth: splitView.minimumPrimaryColumnWidth,
-      maxWidth: splitView.maximumPrimaryColumnWidth)
-
-    validateColumnConstraints(
-      minWidth: splitView.minimumSupplementaryColumnWidth,
-      maxWidth: splitView.maximumSupplementaryColumnWidth)
-
-    #if compiler(>=6.2) && !os(tvOS)
-      if #available(iOS 26.0, *) {
-        validateColumnConstraints(
-          minWidth: splitView.minimumInspectorColumnWidth,
-          maxWidth: splitView.maximumInspectorColumnWidth)
-      }
-    #endif
-
-    // Step 2.2 - applying updates to columns
-    if splitView.minimumPrimaryColumnWidth >= 0 {
-      splitViewController.minimumPrimaryColumnWidth = splitView.minimumPrimaryColumnWidth
-    }
-
-    if splitView.maximumPrimaryColumnWidth >= 0 {
-      splitViewController.maximumPrimaryColumnWidth = splitView.maximumPrimaryColumnWidth
-    }
-
-    if splitView.preferredPrimaryColumnWidthOrFraction >= 0
-      && splitView.preferredPrimaryColumnWidthOrFraction < 1
-    {
-      splitViewController.preferredPrimaryColumnWidthFraction =
-        splitView.preferredPrimaryColumnWidthOrFraction
-    } else if splitView.preferredPrimaryColumnWidthOrFraction >= 1 {
-      splitViewController.preferredPrimaryColumnWidth =
-        splitView.preferredPrimaryColumnWidthOrFraction
-    }
-
-    if splitView.minimumSupplementaryColumnWidth >= 0 {
-      splitViewController.minimumSupplementaryColumnWidth =
-        splitView.minimumSupplementaryColumnWidth
-    }
-
-    if splitView.maximumSupplementaryColumnWidth >= 0 {
-      splitViewController.maximumSupplementaryColumnWidth =
-        splitView.maximumSupplementaryColumnWidth
-    }
-
-    if splitView.preferredSupplementaryColumnWidthOrFraction >= 0
-      && splitView.preferredSupplementaryColumnWidthOrFraction < 1
-    {
-      splitViewController.preferredSupplementaryColumnWidthFraction =
-        splitView.preferredSupplementaryColumnWidthOrFraction
-    } else if splitView.preferredSupplementaryColumnWidthOrFraction >= 1 {
-      splitViewController.preferredSupplementaryColumnWidth =
-        splitView.preferredSupplementaryColumnWidthOrFraction
-    }
-
-    #if compiler(>=6.2) && !os(tvOS)
-      if #available(iOS 26.0, *) {
-        if splitView.minimumSecondaryColumnWidth >= 0 {
-          splitViewController.minimumSecondaryColumnWidth = splitView.minimumSecondaryColumnWidth
-        }
-
-        if splitView.preferredSecondaryColumnWidthOrFraction >= 0
-          && splitView.preferredSecondaryColumnWidthOrFraction < 1
-        {
-          splitViewController.preferredSecondaryColumnWidthFraction =
-            splitView.preferredSecondaryColumnWidthOrFraction
-        } else if splitView.preferredSecondaryColumnWidthOrFraction >= 1 {
-          splitViewController.preferredSecondaryColumnWidth =
-            splitView.preferredSecondaryColumnWidthOrFraction
-        }
-
-        if splitView.minimumInspectorColumnWidth >= 0 {
-          splitViewController.minimumInspectorColumnWidth = splitView.minimumInspectorColumnWidth
-        }
-
-        if splitView.maximumInspectorColumnWidth >= 0 {
-          splitViewController.maximumInspectorColumnWidth = splitView.maximumInspectorColumnWidth
-        }
-
-        if splitView.preferredInspectorColumnWidthOrFraction >= 0
-          && splitView.preferredInspectorColumnWidthOrFraction < 1
-        {
-          splitViewController.preferredInspectorColumnWidthFraction =
-            splitView.preferredInspectorColumnWidthOrFraction
-        } else if splitView.preferredInspectorColumnWidthOrFraction >= 1 {
-          splitViewController.preferredInspectorColumnWidth =
-            splitView.preferredInspectorColumnWidthOrFraction
-        }
-      }
-    #endif
-
-    // Step 2.3 - manipulating with inspector column
-    splitViewController.toggleSplitViewInspector(splitView.showInspector)
-  }
-
-  ///
-  /// @brief Function that updates `preferredDisplayMode` property on SplitView.
-  ///
-  /// `preferredDisplayMode` needs to have a dedicated flag to prevent updates from the JS, when other props updates the appearance.
-  /// It is crucial in the case, when `preferredDisplayMode` has changed due to some transition that was executed natively, e. g. after showing/hiding a column by a swipe.
-  /// In that case, any prop update incoming, would reset `preferredDisplayMode` to the state from JS, what doesn't look good.
-  ///
-  /// @param splitView The view representing JS component which is sending updates.
-  /// @param splitViewController The controller associated with the SplitView component which receives updates and manages the native layer.
-  ///
-  func updateSplitViewDisplayMode(
-    for splitView: RNSSplitViewHostComponentView,
-    withController splitViewController: RNSSplitViewHostController
-  ) {
-    splitViewController.preferredDisplayMode = splitView.preferredDisplayMode
-  }
-
-  func validateColumnConstraints(minWidth: CGFloat, maxWidth: CGFloat) {
-    assert(
-      minWidth <= maxWidth,
-      "[RNScreens] SplitView column constraints are invalid: minWidth \(minWidth) cannot be greater than maxWidth \(maxWidth)"
-    )
-  }
-}

package/ios/gamma/split-view/RNSSplitViewAppearanceCoordinator.swift

@@ -1,26 +0,0 @@
-///
-/// @brief - A class that is responsible for coordinating SplitViewHost appearance updates.
-///
-/// It collects flags for SplitView appearance update actions and invalidates them.
-/// It's also responsible for executing callbacks when the action is requested.
-///
-final class RNSSplitViewAppearanceCoordinator {
-  var updateFlags: RNSSplitViewAppearanceUpdateFlags = []
-
-  public func needs(_ updateFlag: RNSSplitViewAppearanceUpdateFlags) {
-    updateFlags.insert(updateFlag)
-  }
-
-  public func updateIfNeeded(
-    _ updateFlag: RNSSplitViewAppearanceUpdateFlags, _ updateCallback: () -> Void
-  ) {
-    if isNeeded(updateFlag) {
-      updateFlags.remove(updateFlag)
-      updateCallback()
-    }
-  }
-
-  func isNeeded(_ updateFlag: RNSSplitViewAppearanceUpdateFlags) -> Bool {
-    updateFlags.contains(updateFlag)
-  }
-}

package/ios/gamma/split-view/RNSSplitViewAppearanceUpdateFlags.swift

@@ -1,11 +0,0 @@
-///
-/// @brief - A collection of flags, which can be invalidated on RNSSplitViewHostController to apply proper updates to SplitView
-///
-struct RNSSplitViewAppearanceUpdateFlags: OptionSet {
-  let rawValue: UInt8
-
-  static let generalUpdate = RNSSplitViewAppearanceUpdateFlags(rawValue: 1 << 0)
-  static let secondaryScreenNavBarUpdate = RNSSplitViewAppearanceUpdateFlags(rawValue: 1 << 1)
-  static let displayModeUpdate = RNSSplitViewAppearanceUpdateFlags(rawValue: 1 << 2)
-  static let orientationUpdate = RNSSplitViewAppearanceUpdateFlags(rawValue: 1 << 3)
-}

package/ios/gamma/split-view/RNSSplitViewHostComponentViewManager.mm

@@ -1,7 +0,0 @@
-#import "RNSSplitViewHostComponentViewManager.h"
-
-@implementation RNSSplitViewHostComponentViewManager
-
-RCT_EXPORT_MODULE(RNSSplitViewHostComponentViewManager)
-
-@end

package/ios/gamma/split-view/RNSSplitViewScreenComponentViewManager.mm

@@ -1,7 +0,0 @@
-#import "RNSSplitViewScreenComponentViewManager.h"
-
-@implementation RNSSplitViewScreenComponentViewManager
-
-RCT_EXPORT_MODULE(RNSSplitViewScreenComponentViewManager)
-
-@end

package/ios/gamma/split-view/RNSSplitViewScreenController.swift

@@ -1,133 +0,0 @@
-import Foundation
-import UIKit
-
-/// @class RNSSplitViewScreenController
-/// @brief A UIViewController subclass that manages a SplitView column in a UISplitViewController.
-///
-/// Associated with a RNSSplitViewScreenComponentView, it handles layout synchronization with the
-/// Shadow Tree, emits React lifecycle events, and interacts with the SplitViewHost hierarchy.
-@objc
-public class RNSSplitViewScreenController: UIViewController {
-  let splitViewScreenComponentView: RNSSplitViewScreenComponentView
-
-  private var shadowStateProxy: RNSSplitViewScreenShadowStateProxy {
-    return splitViewScreenComponentView.shadowStateProxy()
-  }
-
-  private var reactEventEmitter: RNSSplitViewScreenComponentEventEmitter {
-    return splitViewScreenComponentView.reactEventEmitter()
-  }
-
-  @objc public required init(splitViewScreenComponentView: RNSSplitViewScreenComponentView) {
-    self.splitViewScreenComponentView = splitViewScreenComponentView
-    super.init(nibName: nil, bundle: nil)
-  }
-
-  required init?(coder aDecoder: NSCoder) {
-    return nil
-  }
-
-  ///
-  /// @brief Searching for the SplitViewHost controller
-  ///
-  /// It checks whether the parent controller is our host controller.
-  /// If we're outside the structure, e. g. for inspector represented as a modal,
-  /// we're searching for that controller using a reference that Screen keeps for Host component view.
-  ///
-  /// @return If found - a RNSSplitViewHostController instance, otherwise nil.
-  ///
-  func findSplitViewHostController() -> RNSSplitViewHostController? {
-    if let splitViewHostController = self.splitViewController as? RNSSplitViewHostController {
-      return splitViewHostController
-    }
-
-    if let splitViewHost = self.splitViewScreenComponentView.splitViewHost {
-      return splitViewHost.splitViewHostController
-    }
-
-    return nil
-  }
-
-  ///
-  /// @brief Determines if this controller is nested inside a SplitViewHost hierarchy.
-  ///
-  /// Used to differentiate between screens embedded in the native host and modal presentations.
-  ///
-  /// @return true if inside RNSSplitViewHostController, false otherwise.
-  ///
-  @objc
-  public func isInSplitViewHostSubtree() -> Bool {
-    return self.splitViewController is RNSSplitViewHostController
-  }
-
-  // MARK: Signals
-
-  @objc
-  public func setNeedsLifecycleStateUpdate() {
-    findSplitViewHostController()?.setNeedsUpdateOfChildViewControllers()
-  }
-
-  // MARK: Layout
-
-  @objc
-  public override func viewDidLayoutSubviews() {
-    super.viewDidLayoutSubviews()
-
-    updateShadowTreeState()
-  }
-
-  ///
-  /// @brief Handles frame layout changes and updates Shadow Tree accordingly.
-  ///
-  /// Requests for the ShadowNode updates through the shadow state proxy.
-  /// Differentiates cases when we're in the Host hierarchy to calculate frame relatively
-  /// to the Host view from the modal case where we're passing absolute layout metrics to the ShadowNode.
-  ///
-  private func updateShadowTreeState() {
-    // For modals, which are presented outside the SplitViewHost subtree (and RN hierarchy),
-    // we're attaching our touch handler and we don't need to apply any offset corrections,
-    // because it's positioned relatively to our RNSSplitViewScreenComponentView
-    if !isInSplitViewHostSubtree() {
-      shadowStateProxy.updateShadowState(ofComponent: splitViewScreenComponentView)
-      return
-    }
-
-    let ancestorView = findSplitViewHostController()?.view
-    assert(
-      ancestorView != nil,
-      "[RNScreens] Expected to find RNSSplitViewHost component for RNSSplitViewScreen component"
-    )
-
-    shadowStateProxy.updateShadowState(
-      ofComponent: splitViewScreenComponentView, inContextOfAncestorView: ancestorView)
-  }
-
-  ///
-  /// @brief Request ShadowNode state update when the SplitView screen frame origin has changed.
-  ///
-  /// @param splitViewController The UISplitViewController whose layout positioning changed, represented by RNSSplitViewHostController.
-  ///
-  func columnPositioningDidChangeIn(splitViewController: UISplitViewController) {
-    shadowStateProxy.updateShadowState(
-      ofComponent: splitViewScreenComponentView, inContextOfAncestorView: splitViewController.view
-    )
-  }
-
-  // MARK: Events
-
-  public override func viewWillAppear(_ animated: Bool) {
-    reactEventEmitter.emitOnWillAppear()
-  }
-
-  public override func viewDidAppear(_ animated: Bool) {
-    reactEventEmitter.emitOnDidAppear()
-  }
-
-  public override func viewWillDisappear(_ animated: Bool) {
-    reactEventEmitter.emitOnWillDisappear()
-  }
-
-  public override func viewDidDisappear(_ animated: Bool) {
-    reactEventEmitter.emitOnDidDisappear()
-  }
-}