expo-dev-menu 2.2.0 → 3.0.0

package/build/DevMenu.d.ts

@@ -1,4 +1,6 @@
 import { ExpoDevMenuItem } from './ExpoDevMenu.types';
 export declare function openMenu(): void;
+export declare function hideMenu(): void;
+export declare function closeMenu(): void;
 export declare function registerDevMenuItems(items: ExpoDevMenuItem[]): Promise<any>;
 //# sourceMappingURL=DevMenu.d.ts.map

package/build/DevMenu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DevMenu.d.ts","sourceRoot":"","sources":["../src/DevMenu.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,wBAAgB,QAAQ,IAAI,IAAI,CAE/B;AAqBD,wBAAsB,oBAAoB,CAAC,KAAK,EAAE,eAAe,EAAE,gBAelE"}
+{"version":3,"file":"DevMenu.d.ts","sourceRoot":"","sources":["../src/DevMenu.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,wBAAgB,QAAQ,IAAI,IAAI,CAE/B;AAED,wBAAgB,QAAQ,IAAI,IAAI,CAE/B;AAED,wBAAgB,SAAS,IAAI,IAAI,CAEhC;AAqBD,wBAAsB,oBAAoB,CAAC,KAAK,EAAE,eAAe,EAAE,gBAelE"}

package/build/DevMenu.js

@@ -3,6 +3,12 @@ import ExpoDevMenu from './ExpoDevMenu';
 export function openMenu() {
     ExpoDevMenu.openMenu();
 }
+export function hideMenu() {
+    ExpoDevMenu.hideMenu();
+}
+export function closeMenu() {
+    ExpoDevMenu.closeMenu();
+}
 let hasRegisteredCallbackListener = false;
 function registerCallbackListener() {
     if (!hasRegisteredCallbackListener) {
@@ -26,7 +32,7 @@ export async function registerDevMenuItems(items) {
     const callbackNames = [];
     items.forEach((item) => {
         handlers.set(item.name, item.callback);
-        callbackNames.push(item.name);
+        callbackNames.push({ name: item.name, shouldCollapse: item.shouldCollapse });
     });
     return await ExpoDevMenu.addDevMenuCallbacks(callbackNames);
 }

package/build/DevMenu.js.map

@@ -1 +1 @@
-{"version":3,"file":"DevMenu.js","sourceRoot":"","sources":["../src/DevMenu.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAElD,OAAO,WAAW,MAAM,eAAe,CAAC;AAGxC,MAAM,UAAU,QAAQ;IACtB,WAAW,CAAC,QAAQ,EAAE,CAAC;AACzB,CAAC;AAED,IAAI,6BAA6B,GAAG,KAAK,CAAC;AAE1C,SAAS,wBAAwB;IAC/B,IAAI,CAAC,6BAA6B,EAAE;QAClC,kBAAkB,CAAC,WAAW,CAAC,yBAAyB,EAAE,CAAC,IAAY,EAAE,EAAE;YACzE,6BAA6B,GAAG,IAAI,CAAC;YACrC,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAEnC,IAAI,OAAO,IAAI,IAAI,EAAE;gBACnB,OAAO,EAAE,CAAC;aACX;QACH,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AAED,wBAAwB,EAAE,CAAC;AAE3B,IAAI,QAAQ,GAAG,IAAI,GAAG,EAAsB,CAAC;AAE7C,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,KAAwB;IACjE,IAAI,CAAC,OAAO,EAAE;QACZ,oBAAoB;QACpB,OAAO;KACR;IAED,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;IACrB,MAAM,aAAa,GAAa,EAAE,CAAC;IAEnC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACvC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,WAAW,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC;AAC9D,CAAC","sourcesContent":["import { DeviceEventEmitter } from 'react-native';\n\nimport ExpoDevMenu from './ExpoDevMenu';\nimport { ExpoDevMenuItem } from './ExpoDevMenu.types';\n\nexport function openMenu(): void {\n  ExpoDevMenu.openMenu();\n}\n\nlet hasRegisteredCallbackListener = false;\n\nfunction registerCallbackListener() {\n  if (!hasRegisteredCallbackListener) {\n    DeviceEventEmitter.addListener('registeredCallbackFired', (name: string) => {\n      hasRegisteredCallbackListener = true;\n      const handler = handlers.get(name);\n\n      if (handler != null) {\n        handler();\n      }\n    });\n  }\n}\n\nregisterCallbackListener();\n\nlet handlers = new Map<string, () => void>();\n\nexport async function registerDevMenuItems(items: ExpoDevMenuItem[]) {\n  if (!__DEV__) {\n    // resolve undefined\n    return;\n  }\n\n  handlers = new Map();\n  const callbackNames: string[] = [];\n\n  items.forEach((item) => {\n    handlers.set(item.name, item.callback);\n    callbackNames.push(item.name);\n  });\n\n  return await ExpoDevMenu.addDevMenuCallbacks(callbackNames);\n}\n"]}
+{"version":3,"file":"DevMenu.js","sourceRoot":"","sources":["../src/DevMenu.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAElD,OAAO,WAAW,MAAM,eAAe,CAAC;AAGxC,MAAM,UAAU,QAAQ;IACtB,WAAW,CAAC,QAAQ,EAAE,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,QAAQ;IACtB,WAAW,CAAC,QAAQ,EAAE,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,SAAS;IACvB,WAAW,CAAC,SAAS,EAAE,CAAC;AAC1B,CAAC;AAED,IAAI,6BAA6B,GAAG,KAAK,CAAC;AAE1C,SAAS,wBAAwB;IAC/B,IAAI,CAAC,6BAA6B,EAAE;QAClC,kBAAkB,CAAC,WAAW,CAAC,yBAAyB,EAAE,CAAC,IAAY,EAAE,EAAE;YACzE,6BAA6B,GAAG,IAAI,CAAC;YACrC,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAEnC,IAAI,OAAO,IAAI,IAAI,EAAE;gBACnB,OAAO,EAAE,CAAC;aACX;QACH,CAAC,CAAC,CAAC;KACJ;AACH,CAAC;AAED,wBAAwB,EAAE,CAAC;AAE3B,IAAI,QAAQ,GAAG,IAAI,GAAG,EAAsB,CAAC;AAE7C,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,KAAwB;IACjE,IAAI,CAAC,OAAO,EAAE;QACZ,oBAAoB;QACpB,OAAO;KACR;IAED,QAAQ,GAAG,IAAI,GAAG,EAAE,CAAC;IACrB,MAAM,aAAa,GAAiD,EAAE,CAAC;IAEvE,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACrB,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QACvC,aAAa,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,cAAc,EAAE,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;IAC/E,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,WAAW,CAAC,mBAAmB,CAAC,aAAa,CAAC,CAAC;AAC9D,CAAC","sourcesContent":["import { DeviceEventEmitter } from 'react-native';\n\nimport ExpoDevMenu from './ExpoDevMenu';\nimport { ExpoDevMenuItem } from './ExpoDevMenu.types';\n\nexport function openMenu(): void {\n  ExpoDevMenu.openMenu();\n}\n\nexport function hideMenu(): void {\n  ExpoDevMenu.hideMenu();\n}\n\nexport function closeMenu(): void {\n  ExpoDevMenu.closeMenu();\n}\n\nlet hasRegisteredCallbackListener = false;\n\nfunction registerCallbackListener() {\n  if (!hasRegisteredCallbackListener) {\n    DeviceEventEmitter.addListener('registeredCallbackFired', (name: string) => {\n      hasRegisteredCallbackListener = true;\n      const handler = handlers.get(name);\n\n      if (handler != null) {\n        handler();\n      }\n    });\n  }\n}\n\nregisterCallbackListener();\n\nlet handlers = new Map<string, () => void>();\n\nexport async function registerDevMenuItems(items: ExpoDevMenuItem[]) {\n  if (!__DEV__) {\n    // resolve undefined\n    return;\n  }\n\n  handlers = new Map();\n  const callbackNames: { name: string; shouldCollapse?: boolean }[] = [];\n\n  items.forEach((item) => {\n    handlers.set(item.name, item.callback);\n    callbackNames.push({ name: item.name, shouldCollapse: item.shouldCollapse });\n  });\n\n  return await ExpoDevMenu.addDevMenuCallbacks(callbackNames);\n}\n"]}

package/build/ExpoDevMenu.types.d.ts

@@ -1,9 +1,15 @@
 export type ExpoDevMenuItem = {
     name: string;
     callback: () => void;
+    shouldCollapse?: boolean;
 };
 export type ExpoDevMenu = {
     openMenu(): any;
-    addDevMenuCallbacks(names: string[]): any;
+    closeMenu(): any;
+    hideMenu(): any;
+    addDevMenuCallbacks(callbacks: {
+        name: string;
+        shouldCollapse?: boolean;
+    }[]): any;
 };
 //# sourceMappingURL=ExpoDevMenu.types.d.ts.map

package/build/ExpoDevMenu.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoDevMenu.types.d.ts","sourceRoot":"","sources":["../src/ExpoDevMenu.types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,IAAI,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,QAAG;IACX,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAE;CACtC,CAAC"}
+{"version":3,"file":"ExpoDevMenu.types.d.ts","sourceRoot":"","sources":["../src/ExpoDevMenu.types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,QAAQ,QAAG;IACX,SAAS,QAAG;IACZ,QAAQ,QAAG;IACX,mBAAmB,CAAC,SAAS,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,cAAc,CAAC,EAAE,OAAO,CAAA;KAAE,EAAE,OAAE;CAC9E,CAAC"}

package/build/ExpoDevMenu.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoDevMenu.types.js","sourceRoot":"","sources":["../src/ExpoDevMenu.types.ts"],"names":[],"mappings":"","sourcesContent":["export type ExpoDevMenuItem = {\n  name: string;\n  callback: () => void;\n};\n\nexport type ExpoDevMenu = {\n  openMenu();\n  addDevMenuCallbacks(names: string[]);\n};\n"]}
+{"version":3,"file":"ExpoDevMenu.types.js","sourceRoot":"","sources":["../src/ExpoDevMenu.types.ts"],"names":[],"mappings":"","sourcesContent":["export type ExpoDevMenuItem = {\n  name: string;\n  callback: () => void;\n  shouldCollapse?: boolean;\n};\n\nexport type ExpoDevMenu = {\n  openMenu();\n  closeMenu();\n  hideMenu();\n  addDevMenuCallbacks(callbacks: { name: string; shouldCollapse?: boolean }[]);\n};\n"]}

package/build/ExpoDevMenu.web.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoDevMenu.web.d.ts","sourceRoot":"","sources":["../src/ExpoDevMenu.web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;;AAGlD,wBAOiB"}
+{"version":3,"file":"ExpoDevMenu.web.d.ts","sourceRoot":"","sources":["../src/ExpoDevMenu.web.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;;AAGlD,wBAaiB"}

package/build/ExpoDevMenu.web.js

@@ -3,6 +3,12 @@ export default {
     openMenu() {
         throw new WebUnsupportedError();
     },
+    closeMenu() {
+        throw new WebUnsupportedError();
+    },
+    hideMenu() {
+        throw new WebUnsupportedError();
+    },
     addDevMenuCallbacks() {
         throw new WebUnsupportedError();
     },

package/build/ExpoDevMenu.web.js.map

@@ -1 +1 @@
-{"version":3,"file":"ExpoDevMenu.web.js","sourceRoot":"","sources":["../src/ExpoDevMenu.web.ts"],"names":[],"mappings":"AACA,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AAExD,eAAe;IACb,QAAQ;QACN,MAAM,IAAI,mBAAmB,EAAE,CAAC;IAClC,CAAC;IACD,mBAAmB;QACjB,MAAM,IAAI,mBAAmB,EAAE,CAAC;IAClC,CAAC;CACa,CAAC","sourcesContent":["import { ExpoDevMenu } from './ExpoDevMenu.types';\nimport WebUnsupportedError from './WebUnsupportedError';\n\nexport default {\n  openMenu() {\n    throw new WebUnsupportedError();\n  },\n  addDevMenuCallbacks() {\n    throw new WebUnsupportedError();\n  },\n} as ExpoDevMenu;\n"]}
+{"version":3,"file":"ExpoDevMenu.web.js","sourceRoot":"","sources":["../src/ExpoDevMenu.web.ts"],"names":[],"mappings":"AACA,OAAO,mBAAmB,MAAM,uBAAuB,CAAC;AAExD,eAAe;IACb,QAAQ;QACN,MAAM,IAAI,mBAAmB,EAAE,CAAC;IAClC,CAAC;IACD,SAAS;QACP,MAAM,IAAI,mBAAmB,EAAE,CAAC;IAClC,CAAC;IACD,QAAQ;QACN,MAAM,IAAI,mBAAmB,EAAE,CAAC;IAClC,CAAC;IACD,mBAAmB;QACjB,MAAM,IAAI,mBAAmB,EAAE,CAAC;IAClC,CAAC;CACa,CAAC","sourcesContent":["import { ExpoDevMenu } from './ExpoDevMenu.types';\nimport WebUnsupportedError from './WebUnsupportedError';\n\nexport default {\n  openMenu() {\n    throw new WebUnsupportedError();\n  },\n  closeMenu() {\n    throw new WebUnsupportedError();\n  },\n  hideMenu() {\n    throw new WebUnsupportedError();\n  },\n  addDevMenuCallbacks() {\n    throw new WebUnsupportedError();\n  },\n} as ExpoDevMenu;\n"]}

package/expo-dev-menu.podspec

@@ -1,41 +1,9 @@
 require 'json'
-require_relative './scripts/reanimated_utils'
-
-# reanimated 2
-
-config = find_config()
-reactVersion = '0.0.0'
-
-begin
-  reactVersion = `node --print "require('react-native/package.json').version"`
-rescue
-  reactVersion = '0.66.0'
-end
-
-if ENV["REACT_NATIVE_OVERRIDE_VERSION"]
-  reactVersion = ENV["REACT_NATIVE_OVERRIDE_VERSION"]
-end
-
-splitedReactVersion = reactVersion.split('.')
-rnVersion = splitedReactVersion[1]
-rnPatchVersion = splitedReactVersion[2]
-
-folly_prefix = ""
-if rnVersion.to_i >= 64
-  folly_prefix = "RCT-"
-end
-
-folly_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -DRNVERSION=' + rnVersion + ' -DRNPATCHVERSION=' + rnPatchVersion
-folly_compiler_flags = folly_flags + ' ' + '-Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.04.26.00'
-boost_compiler_flags = '-Wno-documentation'
-
-
-require_relative 'TargetValidator'
-# end reanimated 2
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
+folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
+
 Pod::Spec.new do |s|
   s.name           = 'expo-dev-menu'
   s.version        = package['version']
@@ -65,81 +33,32 @@ Pod::Spec.new do |s|
     "HEADER_SEARCH_PATHS" => "\"${PODS_CONFIGURATION_BUILD_DIR}/expo-dev-menu/Swift Compatibility Header\"",
   }
 
-  # Swift/Objective-C compatibility
-  s.pod_target_xcconfig = { "DEFINES_MODULE" => "YES" }
-
-  s.subspec 'GestureHandler' do |handler|
-    if File.exist?("vendored/react-native-gesture-handler/DevMenuRNGestureHandler.xcframework") && Gem::Version.new(Pod::VERSION) >= Gem::Version.new('1.10.0')
-      handler.source_files = "vendored/react-native-gesture-handler/**/*.{h}"
-      handler.vendored_frameworks = "vendored/react-native-gesture-handler/DevMenuRNGestureHandler.xcframework"
-      handler.private_header_files = 'vendored/react-native-gesture-handler/**/*.h'
-    else
-      handler.source_files = 'vendored/react-native-gesture-handler/**/*.{h,m}'
-      handler.private_header_files = 'vendored/react-native-gesture-handler/**/*.h'
+  header_search_paths = [
+    '"$(PODS_ROOT)/boost"',
+    '"${PODS_ROOT}/Headers/Private/React-Core"',
+    '"$(PODS_CONFIGURATION_BUILD_DIR)/ExpoModulesCore/Swift Compatibility Header"',
+    '"$(PODS_CONFIGURATION_BUILD_DIR)/expo-dev-menu-interface/Swift Compatibility Header"',
+  ]
+  s.pod_target_xcconfig = {
+    'DEFINES_MODULE' => 'YES',
+    'CLANG_CXX_LANGUAGE_STANDARD' => 'c++17',
+    'HEADER_SEARCH_PATHS' => header_search_paths.join(' '),
+  }
 
-      handler.compiler_flags = '-w -Xanalyzer -analyzer-disable-all-checks'
-    end
-  end
+  s.subspec 'SafeAreaView' do |safearea|
+    safearea.dependency 'ExpoModulesCore'
 
-  s.subspec 'Reanimated' do |reanimated|
-    reanimated.compiler_flags = folly_compiler_flags + ' ' + boost_compiler_flags + ' -w -Xanalyzer -analyzer-disable-all-checks -x objective-c++'
-    reanimated.private_header_files = 'vendored/react-native-reanimated/**/*.h'
-    reanimated.source_files = 'vendored/react-native-reanimated/**/*.{h,m,mm,cpp}'
-    reanimated.preserve_paths = 'vendored/react-native-reanimated/Common/cpp/hidden_headers/**'
-    reanimated.pod_target_xcconfig = {
-      "USE_HEADERMAP" => "YES",
-      "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_TARGET_SRCROOT)\" \"$(PODS_ROOT)/#{folly_prefix}Folly\" \"$(PODS_ROOT)/boost\"  \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/Headers/Private/React-Core\" ",
-      'CLANG_CXX_LIBRARY' => 'libc++',
-      "CLANG_CXX_LANGUAGE_STANDARD" => "c++17"
-    }
-    reanimated.xcconfig = {
-      "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/boost-for-react-native\" \"$(PODS_ROOT)/glog\" \"$(PODS_ROOT)/#{folly_prefix}Folly\" \"${PODS_ROOT}/Headers/Public/React-hermes\" \"${PODS_ROOT}/Headers/Public/hermes-engine\" \"$(PODS_ROOT)/#{config[:react_native_common_dir]}\"",
-                                 "OTHER_CFLAGS" => "$(inherited)" + " " + folly_flags
+    # Swift/Objective-C compatibility
+    safearea.pod_target_xcconfig = {
+      'DEFINES_MODULE' => 'YES',
+      'SWIFT_COMPILATION_MODE' => 'wholemodule'
     }
-
-    reanimated.dependency 'FBLazyVector'
-    reanimated.dependency 'FBReactNativeSpec'
-    reanimated.dependency 'RCTRequired'
-    reanimated.dependency 'RCTTypeSafety'
-    reanimated.dependency 'React-Core'
-    reanimated.dependency 'React-CoreModules'
-    reanimated.dependency 'React-Core/DevSupport'
-    reanimated.dependency 'React-RCTActionSheet'
-    reanimated.dependency 'React-RCTNetwork'
-    reanimated.dependency 'React-RCTAnimation'
-    reanimated.dependency 'React-RCTLinking'
-    reanimated.dependency 'React-RCTBlob'
-    reanimated.dependency 'React-RCTSettings'
-    reanimated.dependency 'React-RCTText'
-    reanimated.dependency 'React-RCTVibration'
-    reanimated.dependency 'React-RCTImage'
-    reanimated.dependency 'React-Core/RCTWebSocket'
-    reanimated.dependency 'React-cxxreact'
-    reanimated.dependency 'React-jsi'
-    reanimated.dependency 'React-jsiexecutor'
-    reanimated.dependency 'React-jsinspector'
-    reanimated.dependency 'ReactCommon/turbomodule/core'
-    reanimated.dependency 'Yoga'
-    reanimated.dependency 'DoubleConversion'
-    reanimated.dependency 'glog'
-
-    if reactVersion.match(/^0.62/)
-      reanimated.dependency 'ReactCommon/callinvoker'
-    else
-      reanimated.dependency 'React-callinvoker'
-    end
-
-    reanimated.dependency "#{folly_prefix}Folly"
-  end
-
-
-  s.subspec 'SafeAreaView' do |safearea|
     if File.exist?("vendored/react-native-safe-area-context/dev-menu-react-native-safe-area-context.xcframework") && Gem::Version.new(Pod::VERSION) >= Gem::Version.new('1.10.0')
       safearea.source_files = "vendored/react-native-safe-area-context/**/*.{h}"
       safearea.vendored_frameworks = "vendored/react-native-safe-area-context/dev-menu-react-native-safe-area-context.xcframework"
       safearea.private_header_files = 'vendored/react-native-safe-area-context/**/*.h'
     else
-      safearea.source_files = 'vendored/react-native-safe-area-context/**/*.{h,m}'
+      safearea.source_files = 'vendored/react-native-safe-area-context/**/*.{h,m,swift}'
       safearea.private_header_files = 'vendored/react-native-safe-area-context/**/*.h'
 
       safearea.compiler_flags = '-w -Xanalyzer -analyzer-disable-all-checks'
@@ -147,8 +66,6 @@ Pod::Spec.new do |s|
   end
 
   s.subspec 'Vendored' do |vendored|
-    vendored.dependency "expo-dev-menu/GestureHandler"
-    vendored.dependency "expo-dev-menu/Reanimated"
     vendored.dependency "expo-dev-menu/SafeAreaView"
   end
 
@@ -156,6 +73,7 @@ Pod::Spec.new do |s|
     s.source_files   = 'ios/**/*.{h,m,mm,swift}'
     s.preserve_paths = 'ios/**/*.{h,m,mm,swift}'
     s.exclude_files  = 'ios/*Tests/**/*', 'vendored/**/*'
+    s.compiler_flags = folly_compiler_flags
 
     main.dependency 'React-Core'
     main.dependency "EXManifests"

package/expo-module.config.json

@@ -4,6 +4,12 @@
   "ios": {
     "podspecPath": "expo-dev-menu.podspec",
     "swiftModuleName": "EXDevMenu",
+    "modules": [
+      "DevMenuModule",
+      "DevMenuInternalModule",
+      "DevMenuPreferences",
+      "RNCSafeAreaProviderManager"
+    ],
     "reactDelegateHandlers": ["ExpoDevMenuReactDelegateHandler"],
     "debugOnly": true
   }

package/ios/DevMenuAppInstance.swift

@@ -3,7 +3,7 @@
 import React
 
 @objc
-class DevMenuAppInstance: DevMenuBaseAppInstance, RCTBridgeDelegate {
+class DevMenuAppInstance: DevMenuRCTCxxBridgeDelegate, RCTBridgeDelegate {
   static private var CloseEventName = "closeDevMenu"
   static private var OpenEventName = "openDevMenu"
 
@@ -33,7 +33,7 @@ class DevMenuAppInstance: DevMenuBaseAppInstance, RCTBridgeDelegate {
   public func sendCloseEvent() {
     bridge?.enqueueJSCall("RCTDeviceEventEmitter.emit", args: [DevMenuAppInstance.CloseEventName])
   }
-  
+
   public func sendOpenEvent() {
     bridge?.enqueueJSCall("RCTDeviceEventEmitter.emit", args: [DevMenuAppInstance.OpenEventName])
   }
@@ -43,16 +43,18 @@ class DevMenuAppInstance: DevMenuBaseAppInstance, RCTBridgeDelegate {
   func sourceURL(for bridge: RCTBridge!) -> URL! {
     #if DEBUG
     if let packagerHost = jsPackagerHost() {
-      return RCTBundleURLProvider.jsBundleURL(forBundleRoot: "index", packagerHost: packagerHost, enableDev: true, enableMinification: false)
+      return RCTBundleURLProvider.jsBundleURL(
+        forBundleRoot: "index",
+        packagerHost: packagerHost,
+        enableDev: true,
+        enableMinification: false)
     }
     #endif
     return jsSourceUrl()
   }
 
   func extraModules(for bridge: RCTBridge!) -> [RCTBridgeModule]! {
-    var modules: [RCTBridgeModule] = [DevMenuInternalModule(manager: manager)]
-    modules.append(contentsOf: DevMenuVendoredModulesUtils.vendoredModules(bridge, addReanimated2: true))
-    modules.append(DevMenuLoadingView.init())
+    var modules: [RCTBridgeModule] = [DevMenuLoadingView.init()]
     modules.append(DevMenuRCTDevSettings.init())
     return modules
   }

package/ios/DevMenuManager.swift

@@ -52,15 +52,31 @@ private let extensionToDevMenuDataSourcesMap = NSMapTable<DevMenuExtensionProtoc
  */
 @objc
 open class DevMenuManager: NSObject {
+  public class Callback {
+    let name: String
+    let shouldCollapse: Bool
+
+    init(name: String, shouldCollapse: Bool) {
+      self.name = name
+      self.shouldCollapse = shouldCollapse
+    }
+  }
+
   var packagerConnectionHandler: DevMenuPackagerConnectionHandler?
   lazy var extensionSettings: DevMenuExtensionSettingsProtocol = DevMenuExtensionDefaultSettings(manager: self)
   var canLaunchDevMenuOnStart = true
-  
+
+  static public var wasInitilized = false
+
   /**
    Shared singleton instance.
    */
   @objc
-  static public let shared = DevMenuManager()
+  static public let shared: DevMenuManager = {
+    wasInitilized = true
+    return DevMenuManager()
+  }()
+
   /**
    The window that controls and displays the dev menu view.
    */
@@ -79,14 +95,14 @@ open class DevMenuManager: NSObject {
   @available(*, deprecated, message: "Manual setup of DevMenuManager in AppDelegate is deprecated in favor of automatic setup with Expo Modules")
   @objc
   public static func configure(withBridge bridge: AnyObject) { }
-  
+
   @objc
   public var currentBridge: RCTBridge? {
     didSet {
       guard self.canLaunchDevMenuOnStart && (DevMenuPreferences.showsAtLaunch || self.shouldShowOnboarding()), let bridge = currentBridge else {
         return
       }
-      
+
       if bridge.isLoading {
         NotificationCenter.default.addObserver(self, selector: #selector(DevMenuManager.autoLaunch), name: DevMenuViewController.ContentDidAppearNotification, object: nil)
       } else {
@@ -95,13 +111,10 @@ open class DevMenuManager: NSObject {
     }
   }
   @objc
-  public var currentManifest: EXManifestsManifestBehavior?
-  
+  public var currentManifest: Manifest?
+
   @objc
   public var currentManifestURL: URL?
-  
-  
-
 
   @objc
   public func autoLaunch(_ shouldRemoveObserver: Bool = true) {
@@ -152,7 +165,13 @@ open class DevMenuManager: NSObject {
   @discardableResult
   public func closeMenu() -> Bool {
     if isVisible {
-      appInstance.sendCloseEvent()
+      if Thread.isMainThread {
+        window?.closeBottomSheet()
+      } else {
+        DispatchQueue.main.async { [self] in
+          window?.closeBottomSheet()
+        }
+      }
       return true
     }
 
@@ -300,7 +319,7 @@ open class DevMenuManager: NSObject {
     if isVisible == visible {
       return false
     }
-    
+
     return true
   }
 
@@ -386,17 +405,17 @@ open class DevMenuManager: NSObject {
     }
     return true
   }
-  
+
   @objc
   public func getAppInfo() -> [AnyHashable: Any] {
     return EXDevMenuAppInfo.getAppInfo()
   }
-  
+
   @objc
   public func getDevSettings() -> [AnyHashable: Any] {
     return EXDevMenuDevSettings.getDevSettings()
   }
-  
+
   private static var fontsWereLoaded = false
 
   @objc
@@ -417,7 +436,7 @@ open class DevMenuManager: NSObject {
       "Inter-ExtraLight",
       "Inter-Thin"
     ]
-    
+
     for font in fonts {
       let path = DevMenuUtils.resourcesBundle()?.path(forResource: font, ofType: "otf")
       let data = FileManager.default.contents(atPath: path!)
@@ -427,11 +446,9 @@ open class DevMenuManager: NSObject {
       CTFontManagerRegisterGraphicsFont(font!, &error)
     }
   }
-  
+
   // captures any callbacks that are registered via the `registerDevMenuItems` module method
   // it is set and unset by the public facing `DevMenuModule`
   // when the DevMenuModule instance is unloaded (e.g between app loads) the callback list is reset to an empty array
-  @objc
-  public var registeredCallbacks: [String] = []
-
+  public var registeredCallbacks: [Callback] = []
 }

package/ios/DevMenuRCTBridge.h

@@ -16,4 +16,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @end
 
+@interface DevMenuRCTCxxBridgeDelegate : NSObject
+
+@end
+
 NS_ASSUME_NONNULL_END

package/ios/{DevMenuRCTBridge.m → DevMenuRCTBridge.mm}

@@ -1,6 +1,19 @@
 // Copyright 2015-present 650 Industries. All rights reserved.
 
 #import <EXDevMenu/DevMenuRCTBridge.h>
+
+// The search path for the Swift generated headers are different
+// between use_frameworks and non_use_frameworks mode.
+#if __has_include(<EXDevMenuInterface/EXDevMenuInterface-Swift.h>)
+#import <EXDevMenuInterface/EXDevMenuInterface-Swift.h>
+#else
+#import <EXDevMenuInterface-Swift.h>
+#endif
+#if __has_include(<ExpoModulesCore/ExpoModulesCore-Swift.h>)
+#import <ExpoModulesCore/ExpoModulesCore-Swift.h>
+#else
+#import <ExpoModulesCore-Swift.h>
+#endif
 #if __has_include(<EXDevMenu/EXDevMenu-Swift.h>)
 #import <EXDevMenu/EXDevMenu-Swift.h>
 #else
@@ -12,8 +25,11 @@
 #import <React/RCTDevSettings.h>
 #import <React/RCTBridge+Private.h>
 #import <React/RCTDevMenu.h>
-
-@import EXDevMenuInterface;
+#import <React/RCTCxxBridgeDelegate.h>
+#import <React/RCTJSIExecutorRuntimeInstaller.h>
+#if __has_include(<reacthermes/HermesExecutorFactory.h>)
+#import <reacthermes/HermesExecutorFactory.h>
+#endif
 
 @implementation DevMenuRCTCxxBridge
 
@@ -46,14 +62,14 @@
 
 - (NSArray<Class> *)filterModuleList:(NSArray<Class> *)modules
 {
-  NSArray<NSString *> *allowedModules = @[@"RCT"];
+  NSArray<NSString *> *allowedModules = @[@"RCT", @"ExpoBridgeModule", @"EXNativeModulesProxy", @"EXReactNativeEventEmitter"];
   NSArray<Class> *filteredModuleList = [modules filteredArrayUsingPredicate:[NSPredicate predicateWithBlock:^BOOL(id  _Nullable clazz, NSDictionary<NSString *,id> * _Nullable bindings) {
     NSString* clazzName = NSStringFromClass(clazz);
-      
+
     if ([clazz conformsToProtocol:@protocol(EXDevExtensionProtocol)]) {
       return true;
     }
-    
+
     for (NSString *allowedModule in allowedModules) {
       if ([clazzName hasPrefix:allowedModule]) {
         return true;
@@ -61,7 +77,7 @@
     }
     return false;
   }]];
-  
+
   return filteredModuleList;
 }
 
@@ -89,3 +105,26 @@
 #pragma clang diagnostic pop
 
 @end
+
+@interface DevMenuRCTCxxBridgeDelegate () <RCTCxxBridgeDelegate>
+
+@end
+
+@implementation DevMenuRCTCxxBridgeDelegate
+
+- (std::unique_ptr<facebook::react::JSExecutorFactory>)jsExecutorFactoryForBridge:(RCTBridge *)bridge
+{
+#if __has_include(<reacthermes/HermesExecutorFactory.h>)
+  // Disable Hermes debugger to prevent Hermes debugger uses dev-menu
+  // as inspecting target.
+  auto installBindings = facebook::react::RCTJSIExecutorRuntimeInstaller(nullptr);
+  auto *hermesExecutorFactory = new facebook::react::HermesExecutorFactory(installBindings);
+  hermesExecutorFactory->setEnableDebugger(false);
+  std::unique_ptr<facebook::react::JSExecutorFactory> jsExecutorFactory(hermesExecutorFactory);
+  return std::move(jsExecutorFactory);
+#else
+  return nullptr;
+#endif
+}
+
+@end

package/ios/DevMenuViewController.swift

@@ -70,7 +70,7 @@ class DevMenuViewController: UIViewController {
       "menuPreferences": DevMenuPreferences.serialize(),
       "uuid": UUID.init().uuidString,
       "isDevice": !isSimulator,
-      "registeredCallbacks": manager.registeredCallbacks
+      "registeredCallbacks": manager.registeredCallbacks.map { $0.name }
     ]
   }