expo-dev-menu 2.2.0 → 3.0.0

package/ios/DevMenuWindow.swift

@@ -2,25 +2,118 @@
 
 import UIKit
 
-class DevMenuWindow: UIWindow {
+private func firstSubview<T: UIView>(_ rootView: UIView, ofType type: T.Type) -> T? {
+  var resultView: T?
+  for view in rootView.subviews {
+    if let view = view as? T {
+      resultView = view
+      break
+    }
+
+    if let foundView = firstSubview(view, ofType: T.self) {
+      resultView = foundView
+      break
+    }
+  }
+  return resultView
+}
+
+class DevMenuWindow: UIWindow, OverlayContainerViewControllerDelegate {
   private let manager: DevMenuManager
 
+  private let bottomSheetController: OverlayContainerViewController
+  private let devMenuViewController: DevMenuViewController
+
   init(manager: DevMenuManager) {
     self.manager = manager
+    bottomSheetController = OverlayContainerViewController(style: .flexibleHeight)
+    devMenuViewController = DevMenuViewController(manager: manager)
 
     super.init(frame: UIScreen.main.bounds)
-    self.rootViewController = DevMenuViewController(manager: manager)
-    self.backgroundColor = UIColor.clear
+
+    bottomSheetController.delegate = self
+    bottomSheetController.viewControllers = [devMenuViewController]
+
+    self.rootViewController = bottomSheetController
+    self.backgroundColor = UIColor(white: 0, alpha: 0.4)
     self.bounds = UIScreen.main.bounds
     self.windowLevel = .statusBar
     self.isHidden = true
   }
 
+  @available(*, unavailable)
   required init?(coder: NSCoder) {
     fatalError("init(coder:) has not been implemented")
   }
 
   override func becomeKey() {
-    (rootViewController as? DevMenuViewController)?.updateProps()
+    // We set up the background of the RN root view to mask all artifacts caused by Yoga when the bottom sheet is dragged.
+    devMenuViewController.view.backgroundColor = UIColor(red: 0.97, green: 0.97, blue: 0.98, alpha: 1)
+
+    devMenuViewController.updateProps()
+    bottomSheetController.moveOverlay(toNotchAt: OverlayNotch.open.rawValue, animated: true)
+
+    setDrivingScrollView()
+  }
+
+  // In order to create a smooth interplay between a mobile bottom sheet and scrolling through its contents,
+  // the 'drivingScrollView' property must be established. However, it may not be immediately accessible
+  // when the menu is first opened. As a result, we schedule a task that periodically verifies the availability of the scroll view.
+  // TODO(@lukmccall): find a better way how to detect if the scroll view is available.
+  private func setDrivingScrollView() {
+    let scrollView = firstSubview(devMenuViewController.view, ofType: UIScrollView.self)
+    if scrollView == nil {
+      DispatchQueue.main.async {
+        self.setDrivingScrollView()
+      }
+    } else {
+      bottomSheetController.drivingScrollView = scrollView
+    }
+  }
+
+  override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+    let view = super.hitTest(point, with: event)
+    if view == self {
+      bottomSheetController.moveOverlay(toNotchAt: OverlayNotch.hidden.rawValue, animated: true)
+    }
+
+    return view == self ? nil : view
+  }
+
+  enum OverlayNotch: Int, CaseIterable {
+    case hidden, open, fullscreen
+  }
+
+  func numberOfNotches(in containerViewController: OverlayContainerViewController) -> Int {
+    return OverlayNotch.allCases.count
+  }
+
+  func overlayContainerViewController(
+    _ containerViewController: OverlayContainerViewController,
+    heightForNotchAt index: Int,
+    availableSpace: CGFloat
+  ) -> CGFloat {
+    switch OverlayNotch.allCases[index] {
+    case .fullscreen:
+      return availableSpace - 45
+    case .open:
+      return availableSpace * 0.6
+    case .hidden:
+      return 0
+    }
+  }
+
+  func overlayContainerViewController(
+    _ containerViewController: OverlayContainerViewController,
+    didMoveOverlay overlayViewController: UIViewController,
+    toNotchAt index: Int
+  ) {
+    if index == OverlayNotch.hidden.rawValue {
+      manager.hideMenu()
+    }
+  }
+
+  func closeBottomSheet() {
+    bottomSheetController.moveOverlay(toNotchAt: OverlayNotch.hidden.rawValue, animated: true)
   }
 }

package/ios/EXDevMenuAppInfo.m

@@ -1,31 +1,33 @@
 // Copyright 2015-present 650 Industries. All rights reserved.
 #import "EXDevMenuAppInfo.h"
+#import <React/RCTBridge+Private.h>
 #if __has_include(<EXDevMenu/EXDevMenu-Swift.h>)
 #import <EXDevMenu/EXDevMenu-Swift.h>
 #else
 #import <EXDevMenu-Swift.h>
 #endif
-#import <EXManifests/EXManifestsManifestFactory.h>
+
+@import EXManifests;
 
 @implementation EXDevMenuAppInfo
 
 +(NSDictionary *)getAppInfo
 {
   NSMutableDictionary *appInfo = [NSMutableDictionary new];
-  
+
   NSString *appIcon = [EXDevMenuAppInfo getAppIcon];
   NSString *runtimeVersion = [EXDevMenuAppInfo getUpdatesConfigForKey:@"EXUpdatesRuntimeVersion"];
   NSString *sdkVersion = [EXDevMenuAppInfo getUpdatesConfigForKey:@"EXUpdatesSDKVersion"];
   NSString *appVersion = [EXDevMenuAppInfo getFormattedAppVersion];
   NSString *appName = [[NSBundle mainBundle] objectForInfoDictionaryKey: @"CFBundleDisplayName"] ?: [[NSBundle mainBundle] objectForInfoDictionaryKey: @"CFBundleExecutable"];
-  
+
   DevMenuManager *manager = [DevMenuManager shared];
-  
+
   if (manager.currentManifest != nil) {
     appName = [manager.currentManifest name];
     appVersion = [manager.currentManifest version];
   }
-  
+
   NSString *engine;
   NSString *bridgeDescription = [[[manager currentBridge] batchedBridge] bridgeDescription];
   if ([bridgeDescription containsString:@"Hermes"]) {
@@ -35,7 +37,7 @@
   } else {
     engine = @"JSC";
   }
-  
+
   NSString *hostUrl = [manager.currentManifestURL absoluteString] ?: @"";
 
   appInfo[@"appName"] = appName;
@@ -53,13 +55,13 @@
 {
   NSString *appIcon = @"";
   NSString *appIconName = [[[[[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleIcons"] objectForKey:@"CFBundlePrimaryIcon"] objectForKey:@"CFBundleIconFiles"]  lastObject];
-  
+
   if (appIconName != nil) {
     NSString *resourcePath = [[NSBundle mainBundle] resourcePath];
     NSString *appIconPath = [[resourcePath stringByAppendingString:appIconName] stringByAppendingString:@".png"];
     appIcon = [@"file://" stringByAppendingString:appIconPath];
   }
-  
+
   return appIcon;
 }
 
@@ -67,10 +69,10 @@
 {
   NSString *value = @"";
   NSString *path = [[NSBundle mainBundle] pathForResource:@"Expo" ofType:@"plist"];
-  
+
   if (path != nil) {
     NSDictionary *expoConfig = [NSDictionary dictionaryWithContentsOfFile:path];
-    
+
     if (expoConfig != nil) {
       value = [expoConfig objectForKey:key] ?: @"";
     }

package/ios/Headers/EXDevMenu-Bridging-Header.h

@@ -22,5 +22,4 @@
 
 // Private
 #import "RCTPerfMonitor+Private.h"
-#import "DevMenuBaseAppInstance.h"
 #import "EXDevMenuAppInfo.h"

package/ios/Modules/DevMenuInternalModule.swift

@@ -1,110 +1,84 @@
 // Copyright 2015-present 650 Industries. All rights reserved.
 
+import ExpoModulesCore
 import SafariServices
 import React
 
-@objc(DevMenuInternalModule)
-public class DevMenuInternalModule: NSObject, RCTBridgeModule {
-  public static func moduleName() -> String! {
-    return "ExpoDevMenuInternal"
-  }
-
-  // Module DevMenuInternalModule requires main queue setup since it overrides `constantsToExport`.
-  public static func requiresMainQueueSetup() -> Bool {
-    return true
-  }
-
-  let manager: DevMenuManager
-
-  public override init() {
-    self.manager = DevMenuManager.shared
-  }
-
-  init(manager: DevMenuManager) {
-    self.manager = manager
-  }
-
-  // MARK: JavaScript API
-  @objc
-  public func constantsToExport() -> [AnyHashable: Any] {
-#if targetEnvironment(simulator)
-    let doesDeviceSupportKeyCommands = true
-#else
-    let doesDeviceSupportKeyCommands = false
-#endif
-    return [
-      "doesDeviceSupportKeyCommands": doesDeviceSupportKeyCommands,
-    ]
-  }
-
-  @objc
-  func fetchDataSourceAsync(_ dataSourceId: String?, resolve: @escaping RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
-    guard let dataSourceId = dataSourceId else {
-      return reject("ERR_DEVMENU_DATA_SOURCE_FAILED", "DataSource ID not provided.", nil)
+public class DevMenuInternalModule: Module {
+  public func definition() -> ModuleDefinition {
+    Name("ExpoDevMenuInternal")
+
+    // MARK: JavaScript API
+    Constants {
+      #if targetEnvironment(simulator)
+      let doesDeviceSupportKeyCommands = true
+      #else
+      let doesDeviceSupportKeyCommands = false
+      #endif
+      return [
+        "doesDeviceSupportKeyCommands": doesDeviceSupportKeyCommands
+      ]
     }
 
-    for dataSource in manager.devMenuDataSources {
-      if dataSource.id == dataSourceId {
+    AsyncFunction("fetchDataSourceAsync") { (dataSourceId: String, promise: Promise) in
+      for dataSource in DevMenuManager.shared.devMenuDataSources where dataSource.id == dataSourceId {
         dataSource.fetchData { data in
-          resolve(data.map { $0.serialize() })
+          promise.resolve(data.map { $0.serialize() })
         }
         return
       }
+
+      throw Exception(name: "ERR_DEVMENU_DATA_SOURCE_FAILED", description: "DataSource \(dataSourceId) not found.")
     }
 
-    return reject("ERR_DEVMENU_DATA_SOURCE_FAILED", "DataSource \(dataSourceId) not founded.", nil)
-  }
+    AsyncFunction("dispatchCallableAsync") { (callableId: String, args: [String: Any]?) in
+      DevMenuManager.shared.dispatchCallable(withId: callableId, args: args)
+    }
 
-  @objc
-  func dispatchCallableAsync(_ callableId: String?, args: [String: Any]?, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
-    guard let callableId = callableId else {
-      return reject("ERR_DEVMENU_ACTION_FAILED", "Callable ID not provided.", nil)
+    AsyncFunction("loadFontsAsync") {
+      DevMenuManager.shared.loadFonts()
     }
-    manager.dispatchCallable(withId: callableId, args: args)
-    resolve(nil)
-  }
-  
-  @objc
-  func loadFontsAsync(_ resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
-    manager.loadFonts()
-    resolve(nil)
-  }
 
-  @objc
-  func hideMenu() {
-    manager.hideMenu()
-  }
+    AsyncFunction("hideMenu") {
+      DevMenuManager.shared.hideMenu()
+    }
 
-  @objc
-  func setOnboardingFinished(_ finished: Bool) {
-    DevMenuPreferences.isOnboardingFinished = finished
-  }
+    AsyncFunction("closeMenu") {
+      DevMenuManager.shared.closeMenu()
+    }
 
-  @objc
-  func openDevMenuFromReactNative() {
-    guard let rctDevMenu = manager.currentBridge?.devMenu else {
-      return
+    AsyncFunction("setOnboardingFinished") { (finished: Bool) in
+      DevMenuPreferences.isOnboardingFinished = finished
     }
 
-    DispatchQueue.main.async {
-      rctDevMenu.show()
+    AsyncFunction("openDevMenuFromReactNative") {
+      guard let rctDevMenu = DevMenuManager.shared.currentBridge?.devMenu else {
+        return
+      }
+
+      DispatchQueue.main.async {
+        rctDevMenu.show()
+      }
     }
-  }
 
-  @objc
-  func onScreenChangeAsync(_ currentScreen: String?, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
-    manager.setCurrentScreen(currentScreen)
-    resolve(nil)
-  }
-  
-  @objc
-  func fireCallback(_ name: String, resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
-    
-    if (!manager.registeredCallbacks.contains(name)) {
-      return reject("ERR_DEVMENU_ACTION_FAILED", "\(name) is not a registered callback", nil)
+    AsyncFunction("onScreenChangeAsync") { (currentScreen: String?) in
+      DevMenuManager.shared.setCurrentScreen(currentScreen)
+    }
+
+    AsyncFunction("fireCallback") { (name: String) in
+      guard let callback = DevMenuManager.shared.registeredCallbacks.first(where: { $0.name == name }) else {
+        throw Exception(name: "ERR_DEVMENU_ACTION_FAILED", description: "\(name) is not a registered callback")
+      }
+
+      DevMenuManager.shared.sendEventToDelegateBridge("registeredCallbackFired", data: name)
+      if callback.shouldCollapse {
+        DevMenuManager.shared.closeMenu()
+      }
+    }
+
+    AsyncFunction("copyToClipboardAsync") { (content: String) in
+      let clipboard = UIPasteboard.general
+      clipboard.string = content as String
     }
-    manager.sendEventToDelegateBridge("registeredCallbackFired", data: name)
-    
-    return resolve(nil)
   }
 }

package/ios/Modules/DevMenuModule.swift

@@ -1,22 +1,41 @@
 // Copyright 2015-present 650 Industries. All rights reserved.
+import ExpoModulesCore
 
-@objc(DevMenuModule)
-open class DevMenuModule: NSObject {
-  deinit {
-    // cleanup registered callbacks when the bridge is deallocated to prevent these leaking into other (potentially unrelated) bridges
-    DevMenuManager.shared.registeredCallbacks = []
-  }
-  
-  // MARK: JavaScript API
+open class DevMenuModule: Module {
+  public func definition() -> ModuleDefinition {
+    Name("ExpoDevMenu")
+
+    // MARK: JavaScript API
+    AsyncFunction("openMenu") {
+      DevMenuManager.shared.openMenu()
+    }
+
+    AsyncFunction("closeMenu") {
+      DevMenuManager.shared.closeMenu()
+    }
 
-  @objc
-  func openMenu() {
-    DevMenuManager.shared.openMenu()
+    AsyncFunction("hideMenu") {
+      DevMenuManager.shared.hideMenu()
+    }
+
+    AsyncFunction("addDevMenuCallbacks") { (callbacks: [[String: Any]]) in
+      callbacks.forEach { callback in
+        guard let name = callback["name"] as? String else {
+          return
+        }
+
+        let shouldCollapse = callback["shouldCollapse"] as? Bool ?? true
+        DevMenuManager.shared.registeredCallbacks.append(
+          DevMenuManager.Callback(name: name, shouldCollapse: shouldCollapse)
+        )
+      }
+    }
   }
 
-  @objc
-  func addDevMenuCallbacks(_ names: [String], resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
-    DevMenuManager.shared.registeredCallbacks = names
-    return resolve(nil)
+  deinit {
+    // cleanup registered callbacks when the bridge is deallocated to prevent these leaking into other (potentially unrelated) bridges
+    if DevMenuManager.wasInitilized {
+      DevMenuManager.shared.registeredCallbacks = []
+    }
   }
 }

package/ios/Modules/DevMenuPreferences.swift

@@ -1,4 +1,5 @@
 // Copyright 2015-present 650 Industries. All rights reserved.
+import ExpoModulesCore
 
 let motionGestureEnabledKey = "EXDevMenuMotionGestureEnabled"
 let touchGestureEnabledKey = "EXDevMenuTouchGestureEnabled"
@@ -6,8 +7,19 @@ let keyCommandsEnabledKey = "EXDevMenuKeyCommandsEnabled"
 let showsAtLaunchKey = "EXDevMenuShowsAtLaunch"
 let isOnboardingFinishedKey = "EXDevMenuIsOnboardingFinished"
 
-@objc(DevMenuPreferences)
-public class DevMenuPreferences: NSObject, RCTBridgeModule {
+public class DevMenuPreferences: Module {
+  public func definition() -> ModuleDefinition {
+    Name("DevMenuPreferences")
+
+    AsyncFunction("getPreferencesAsync") {
+      return DevMenuPreferences.serialize()
+    }
+
+    AsyncFunction("setPreferencesAsync") { (settings: [String: Any]) in
+      DevMenuPreferences.setSettings(settings)
+    }
+  }
+
   /**
    Initializes dev menu preferences by registering user defaults
    and applying some preferences to static classes like interceptors.
@@ -108,7 +120,7 @@ public class DevMenuPreferences: NSObject, RCTBridgeModule {
       "isOnboardingFinished": DevMenuPreferences.isOnboardingFinished
     ]
   }
-  
+
   static func setSettings(_ settings: [String: Any]) {
     if let motionGestureEnabled = settings["motionGestureEnabled"] as? Bool {
       DevMenuPreferences.motionGestureEnabled = motionGestureEnabled
@@ -123,31 +135,8 @@ public class DevMenuPreferences: NSObject, RCTBridgeModule {
       DevMenuPreferences.showsAtLaunch = showsAtLaunch
     }
   }
-  
-  // MARK - RCTBridgeModule
-  
-  public static func moduleName() -> String! {
-    return "DevMenuPreferences"
-  }
-  
-  public static func requiresMainQueueSetup() -> Bool {
-    return true
-  }
-
-  @objc
-  func getPreferencesAsync(_ resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
-    resolve(DevMenuPreferences.serialize())
-  }
-
-  @objc
-  func setPreferencesAsync(_ settings: [String: Any], resolve: RCTPromiseResolveBlock, reject: RCTPromiseRejectBlock) {
-    DevMenuPreferences.setSettings(settings)
-    resolve(nil)
-  }
 }
 
-
-
 private func boolForKey(_ key: String) -> Bool {
   return UserDefaults.standard.bool(forKey: key)
 }

package/ios/OverlayContainer/Internal/ConcreteOverlayContainerContextTargetNotchPolicy.swift

@@ -0,0 +1,25 @@
+//  Copyright (c) 2018, Applidium. All rights reserved
+//  ConcreteOverlayContainerContextTargetNotchPolicy.swift
+//  OverlayContainer
+//
+//  Created by Gaétan Zanella on 28/11/2018.
+//
+
+import UIKit
+
+struct ConcreteOverlayContainerContextTargetNotchPolicy: OverlayContainerContextTargetNotchPolicy {
+    let isDragging: Bool
+    let overlayViewController: UIViewController
+    let overlayTranslationHeight: CGFloat
+    let velocity: CGPoint
+    let notchHeightByIndex: [Int: CGFloat]
+    let reachableIndexes: [Int]
+
+    var notchIndexes: Range<Int> {
+        0..<notchHeightByIndex.count
+    }
+
+    func height(forNotchAt index: Int) -> CGFloat {
+        return notchHeightByIndex[index] ?? 0
+    }
+}

package/ios/OverlayContainer/Internal/ConcreteOverlayContainerContextTransitioning.swift

@@ -0,0 +1,36 @@
+//  Copyright (c) 2018, Applidium. All rights reserved
+//  ConcreteOverlayContainerContextTransitioning.swift
+//  OverlayContainer
+//
+//  Created by Gaétan Zanella on 28/11/2018.
+//
+
+import UIKit
+
+struct ConcreteOverlayContainerContextTransitioning:
+    OverlayContainerContextTransitioning,
+    OverlayContainerTransitionCoordinatorContext {
+
+    let isDragging: Bool
+    let isCancelled: Bool
+    let isAnimated: Bool
+    let overlayViewController: UIViewController
+    let overlayTranslationHeight: CGFloat
+    let velocity: CGPoint
+    let targetNotchIndex: Int
+    let targetTranslationHeight: CGFloat
+    let notchHeightByIndex: [Int: CGFloat]
+    let reachableIndexes: [Int]
+
+    var notchIndexes: Range<Int> {
+        return 0..<notchHeightByIndex.count
+    }
+
+    func height(forNotchAt index: Int) -> CGFloat {
+        return notchHeightByIndex[index] ?? 0
+    }
+
+    var targetNotchHeight: CGFloat {
+        return targetTranslationHeight
+    }
+}

package/ios/OverlayContainer/Internal/ConcreteOverlayContainerDimissingPolicyContext.swift

@@ -0,0 +1,41 @@
+//  Copyright (c) 2018, Applidium. All rights reserved
+//  ConcreteOverlayContainerDimissingPolicyContext.swift
+//  OverlayContainer
+//
+//  Created by Gaétan Zanella on 07/04/2020.
+//
+
+import UIKit
+
+struct ConcreteOverlayContainerDismissalPolicyContext: OverlayContainerSheetDismissalPolicyContext {
+
+    var isDragging: Bool {
+        context.isDragging
+    }
+
+    var targetTranslationHeight: CGFloat {
+        context.targetTranslationHeight
+    }
+
+    var velocity: CGPoint {
+        context.velocity
+    }
+
+    var overlayTranslationHeight: CGFloat {
+        context.overlayTranslationHeight
+    }
+
+    var notchIndexes: Range<Int> {
+        context.notchIndexes
+    }
+
+    var reachableIndexes: [Int] {
+        context.reachableIndexes
+    }
+
+    func height(forNotchAt index: Int) -> CGFloat {
+        context.height(forNotchAt: index)
+    }
+
+    let context: OverlayContainerTransitionCoordinatorContext
+}

package/ios/OverlayContainer/Internal/ConcreteOverlayTranslationParameters.swift

@@ -0,0 +1,14 @@
+//  Copyright (c) 2018, Applidium. All rights reserved
+//  ConcreteOverlayTranslationParameters.swift
+//  OverlayContainer
+//
+//  Created by Gaétan Zanella on 28/11/2018.
+//
+
+import UIKit
+
+struct ConcreteOverlayTranslationParameters: OverlayTranslationParameters {
+    let minimumHeight: CGFloat
+    let maximumHeight: CGFloat
+    let translation: CGFloat
+}