expo-modules-core 1.2.7 → 1.3.0

package/android-annotation-processor/build.gradle

@@ -0,0 +1,51 @@
+apply plugin: 'java-library'
+apply plugin: 'org.jetbrains.kotlin.jvm'
+apply plugin: 'kotlin'
+
+group = 'host.exp.exponent'
+version = '1.1.1'
+
+buildscript {
+  def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
+  if (expoModulesCorePlugin.exists()) {
+    apply from: expoModulesCorePlugin
+    applyKotlinExpoModulesCorePlugin()
+  }
+
+  // Simple helper that allows the root project to override versions declared by this library.
+  ext.safeExtGet = { prop, fallback ->
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+  }
+
+  // Ensures backward compatibility
+  ext.getKotlinVersion = {
+    if (ext.has("kotlinVersion")) {
+      ext.kotlinVersion()
+    } else {
+      ext.safeExtGet("kotlinVersion", "1.6.10")
+    }
+  }
+
+  repositories {
+    mavenCentral()
+  }
+
+  dependencies {
+    classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
+  }
+}
+
+java {
+  sourceCompatibility = JavaVersion.VERSION_1_8
+  targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+dependencies {
+  implementation project(':expo-modules-core$android-annotation')
+  implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
+
+  implementation "com.google.devtools.ksp:symbol-processing-api:${kspVersion()}"
+
+  implementation 'com.squareup:kotlinpoet:1.12.0'
+  implementation 'com.squareup:kotlinpoet-ksp:1.12.0'
+}

package/android-annotation-processor/src/main/java/expo/modules/annotationprocessor/ExpoSymbolProcessor.kt

@@ -0,0 +1,175 @@
+package expo.modules.annotationprocessor
+
+import com.google.devtools.ksp.getVisibility
+import com.google.devtools.ksp.processing.CodeGenerator
+import com.google.devtools.ksp.processing.Dependencies
+import com.google.devtools.ksp.processing.KSPLogger
+import com.google.devtools.ksp.processing.Resolver
+import com.google.devtools.ksp.processing.SymbolProcessor
+import com.google.devtools.ksp.symbol.FunctionKind
+import com.google.devtools.ksp.symbol.KSAnnotated
+import com.google.devtools.ksp.symbol.KSFunctionDeclaration
+import com.google.devtools.ksp.symbol.KSType
+import com.google.devtools.ksp.symbol.KSVisitorVoid
+import com.google.devtools.ksp.symbol.Visibility
+import com.squareup.kotlinpoet.ClassName
+import com.squareup.kotlinpoet.FileSpec
+import com.squareup.kotlinpoet.FunSpec
+import com.squareup.kotlinpoet.ParameterizedTypeName.Companion.parameterizedBy
+import com.squareup.kotlinpoet.TypeSpec
+import com.squareup.kotlinpoet.ksp.toClassName
+import expo.modules.annotation.Config
+import expo.modules.annotation.ConverterBinder
+import java.io.OutputStreamWriter
+import java.nio.charset.StandardCharsets
+
+class ExpoSymbolProcessor(
+  private val codeGenerator: CodeGenerator,
+  private val logger: KSPLogger,
+) : SymbolProcessor {
+  override fun process(resolver: Resolver): List<KSAnnotated> {
+    val symbols = resolver
+      .getSymbolsWithAnnotation(ConverterBinder::class.java.name)
+      .filterIsInstance<KSFunctionDeclaration>()
+
+    if (symbols.iterator().hasNext().not()) {
+      return emptyList()
+    }
+
+    symbols.forEach { symbol ->
+      val clazz = symbol.annotations.find {
+        it.shortName.asString() == ConverterBinder::class.java.simpleName
+      }!!.arguments[0].value as KSType
+
+      val parsedClazz = if (clazz.toString() == "Void") {
+        null
+      } else {
+        clazz.toClassName()
+      }
+
+      symbol.accept(ConverterBinderVisitor(parsedClazz, codeGenerator, logger), Unit)
+    }
+
+    return emptyList()
+  }
+}
+
+class ConverterBinderVisitor(
+  private val clazz: ClassName?,
+  private val codeGenerator: CodeGenerator,
+  private val logger: KSPLogger,
+) : KSVisitorVoid() {
+
+  override fun visitFunctionDeclaration(function: KSFunctionDeclaration, data: Unit) {
+    if (function.functionKind != FunctionKind.TOP_LEVEL ||
+      function.getVisibility() != Visibility.PUBLIC
+    ) {
+      logger.error("ConverterBinder has to be a public top-level function", function)
+      return
+    }
+
+    val resolvedType = resolveConverterType(function) ?: return
+    val shouldReceiveType = shouldReceiveType(function) ?: return
+
+    val packageName = "${Config.packageNamePrefix}${resolvedType.packageName}"
+    val className = "${resolvedType.simpleName}${Config.classNameSuffix}"
+
+    val content = generateConverterProvider(
+      packageName,
+      className,
+      function,
+      resolvedType,
+      shouldReceiveType
+    )
+
+    logger.info("Generating: $packageName.$className")
+
+    val file = codeGenerator.createNewFile(
+      createFileDependencies(function),
+      packageName,
+      className
+    )
+    OutputStreamWriter(file, StandardCharsets.UTF_8).use {
+      content.writeTo(it)
+    }
+  }
+
+  private fun shouldReceiveType(function: KSFunctionDeclaration): Boolean? {
+    val argsNumber = function.parameters.size
+    if (argsNumber != 0 && argsNumber != 1) {
+      logger.error("ConverterBinder cannot receive more then one argument", function)
+      return null
+    }
+
+    return function.parameters.firstOrNull()?.type?.toString() == "KType"
+  }
+
+  private fun createFileDependencies(function: KSFunctionDeclaration): Dependencies {
+    val containingFile = function.containingFile
+    return if (containingFile == null) {
+      Dependencies(false)
+    } else {
+      Dependencies(false, containingFile)
+    }
+  }
+
+  private fun resolveConverterType(function: KSFunctionDeclaration): ClassName? {
+    if (clazz != null) {
+      return clazz
+    }
+
+    val returnType = function.returnType?.resolve()
+    if (returnType == null) {
+      logger.error("Cannot resolve return type", function)
+      return null
+    }
+
+    if (returnType.arguments.size != 1) {
+      logger.error("Incorrect return type", function)
+      return null
+    }
+
+    val type = returnType.arguments.first().type?.resolve()
+    if (type == null) {
+      logger.error("Cannot resolve converter inner type", function)
+      return null
+    }
+
+    return type.toClassName()
+  }
+
+  private fun generateConverterProvider(
+    packageName: String,
+    className: String,
+    function: KSFunctionDeclaration,
+    forType: ClassName,
+    receivesType: Boolean
+  ): FileSpec {
+    val typeConverter = ClassName("expo.modules.kotlin.types", "TypeConverter")
+      .parameterizedBy(forType)
+    val kType = ClassName("kotlin.reflect", "KType")
+
+    return FileSpec
+      .builder(packageName, className)
+      .addType(
+        TypeSpec
+          .classBuilder(className)
+          .addFunction(
+            FunSpec
+              .builder(Config.converterProviderFunctionName)
+              .addParameter("type", kType)
+              .returns(typeConverter)
+              .apply {
+                if (receivesType) {
+                  addStatement("return ${function.packageName.asString()}.${function.simpleName.asString()}(type)")
+                } else {
+                  addStatement("return ${function.packageName.asString()}.${function.simpleName.asString()}()")
+                }
+              }
+              .build()
+          )
+          .build()
+      )
+      .build()
+  }
+}

package/android-annotation-processor/src/main/java/expo/modules/annotationprocessor/ExpoSymbolProcessorProvider.kt

@@ -0,0 +1,10 @@
+package expo.modules.annotationprocessor
+
+import com.google.devtools.ksp.processing.SymbolProcessor
+import com.google.devtools.ksp.processing.SymbolProcessorEnvironment
+import com.google.devtools.ksp.processing.SymbolProcessorProvider
+
+class ExpoSymbolProcessorProvider : SymbolProcessorProvider {
+  override fun create(environment: SymbolProcessorEnvironment): SymbolProcessor =
+    ExpoSymbolProcessor(environment.codeGenerator, environment.logger)
+}

package/android-annotation-processor/src/main/resources/META-INF/services/com.google.devtools.ksp.processing.SymbolProcessorProvider

@@ -0,0 +1 @@
+expo.modules.annotationprocessor.ExpoSymbolProcessorProvider

package/build/NativeViewManagerAdapter.native.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NativeViewManagerAdapter.native.d.ts","sourceRoot":"","sources":["../src/NativeViewManagerAdapter.native.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAqC1B;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CA0BpF"}
+{"version":3,"file":"NativeViewManagerAdapter.native.d.ts","sourceRoot":"","sources":["../src/NativeViewManagerAdapter.native.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAmC1B;;GAEG;AACH,wBAAgB,wBAAwB,CAAC,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAiDpF"}

package/build/NativeViewManagerAdapter.native.js

@@ -1,5 +1,14 @@
 import React from 'react';
-import { NativeModules, requireNativeComponent } from 'react-native';
+import { findNodeHandle, NativeModules, requireNativeComponent } from 'react-native';
+import { requireNativeModule } from './requireNativeModule';
+// To make the transition from React Native's `requireNativeComponent` to Expo's
+// `requireNativeViewManager` as easy as possible, `requireNativeViewManager` is a drop-in
+// replacement for `requireNativeComponent`.
+//
+// For each view manager, we create a wrapper component that accepts all of the props available to
+// the author of the universal module. This wrapper component splits the props into two sets: props
+// passed to React Native's View (ex: style, testID) and custom view props, which are passed to the
+// adapter view component in a prop called `proxiedProperties`.
 /**
  * A map that caches registered native components.
  */
@@ -32,29 +41,33 @@ export function requireNativeViewManager(viewName) {
     // manager
     const reactNativeViewName = `ViewManagerAdapter_${viewName}`;
     const ReactNativeComponent = requireCachedNativeComponent(reactNativeViewName);
-    const proxiedPropsNames = viewManagerConfig?.propsNames ?? [];
-    // Define a component for universal-module authors to access their native view manager
-    const NativeComponentAdapter = React.forwardRef((props, ref) => {
-        const nativeProps = omit(props, proxiedPropsNames);
-        const proxiedProps = pick(props, proxiedPropsNames);
-        return React.createElement(ReactNativeComponent, { ...nativeProps, proxiedProperties: proxiedProps, ref: ref });
-    });
-    NativeComponentAdapter.displayName = `Adapter<${viewName}>`;
-    return NativeComponentAdapter;
-}
-function omit(props, propNames) {
-    const copied = { ...props };
-    for (const propName of propNames) {
-        delete copied[propName];
+    class NativeComponent extends React.PureComponent {
+        static displayName = viewName;
+        // This will be accessed from native when the prototype functions are called,
+        // in order to find the associated native view.
+        nativeTag = null;
+        componentDidMount() {
+            this.nativeTag = findNodeHandle(this);
+        }
+        render() {
+            return React.createElement(ReactNativeComponent, { ...this.props });
+        }
     }
-    return copied;
-}
-function pick(props, propNames) {
-    return propNames.reduce((prev, curr) => {
-        if (curr in props) {
-            prev[curr] = props[curr];
+    try {
+        const nativeModule = requireNativeModule(viewName);
+        const nativeViewPrototype = nativeModule.ViewPrototype;
+        if (nativeViewPrototype) {
+            // Assign native view functions to the component prototype so they can be accessed from the ref.
+            Object.assign(NativeComponent.prototype, nativeViewPrototype);
         }
-        return prev;
-    }, {});
+    }
+    catch {
+        // `requireNativeModule` may throw an error when the native module cannot be found.
+        // In some tests we don't mock the entire modules, but we do want to mock native views. For now,
+        // until we still have to support the legacy modules proxy and don't have better ways to mock,
+        // let's just gracefully skip assigning the prototype functions.
+        // See: https://github.com/expo/expo/blob/main/packages/expo-modules-core/src/__tests__/NativeViewManagerAdapter-test.native.tsx
+    }
+    return NativeComponent;
 }
 //# sourceMappingURL=NativeViewManagerAdapter.native.js.map

package/build/NativeViewManagerAdapter.native.js.map

@@ -1 +1 @@
-{"version":3,"file":"NativeViewManagerAdapter.native.js","sourceRoot":"","sources":["../src/NativeViewManagerAdapter.native.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,aAAa,EAAE,sBAAsB,EAAiB,MAAM,cAAc,CAAC;AAepF;;GAEG;AACH,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAA8B,CAAC;AAEpE;;;;GAIG;AACH,SAAS,4BAA4B,CAAQ,QAAgB;IAC3D,MAAM,qBAAqB,GAAG,qBAAqB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAElE,IAAI,CAAC,qBAAqB,EAAE;QAC1B,MAAM,eAAe,GAAG,sBAAsB,CAAQ,QAAQ,CAAC,CAAC;QAChE,qBAAqB,CAAC,GAAG,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;QACrD,OAAO,eAAe,CAAC;KACxB;IACD,OAAO,qBAAqB,CAAC;AAC/B,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,wBAAwB,CAAI,QAAgB;IAC1D,MAAM,EAAE,oBAAoB,EAAE,GAAG,aAAa,CAAC,oBAAoB,CAAC;IACpE,MAAM,iBAAiB,GAAG,oBAAoB,EAAE,CAAC,QAAQ,CAAC,CAAC;IAE3D,IAAI,OAAO,IAAI,CAAC,iBAAiB,EAAE;QACjC,MAAM,wBAAwB,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9E,OAAO,CAAC,IAAI,CACV,6CAA6C,QAAQ,8IAA8I,wBAAwB,IAAI,CAChO,CAAC;KACH;IAED,+FAA+F;IAC/F,UAAU;IACV,MAAM,mBAAmB,GAAG,sBAAsB,QAAQ,EAAE,CAAC;IAC7D,MAAM,oBAAoB,GACxB,4BAA4B,CAA2B,mBAAmB,CAAC,CAAC;IAC9E,MAAM,iBAAiB,GAAG,iBAAiB,EAAE,UAAU,IAAI,EAAE,CAAC;IAE9D,sFAAsF;IACtF,MAAM,sBAAsB,GAAG,KAAK,CAAC,UAAU,CAAM,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;QAClE,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;QACnD,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;QACpD,OAAO,oBAAC,oBAAoB,OAAK,WAAW,EAAE,iBAAiB,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,GAAI,CAAC;IAC9F,CAAC,CAA2B,CAAC;IAC7B,sBAAsB,CAAC,WAAW,GAAG,WAAW,QAAQ,GAAG,CAAC;IAC5D,OAAO,sBAAsB,CAAC;AAChC,CAAC;AAED,SAAS,IAAI,CAAC,KAA0B,EAAE,SAAmB;IAC3D,MAAM,MAAM,GAAG,EAAE,GAAG,KAAK,EAAE,CAAC;IAC5B,KAAK,MAAM,QAAQ,IAAI,SAAS,EAAE;QAChC,OAAO,MAAM,CAAC,QAAQ,CAAC,CAAC;KACzB;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,IAAI,CAAC,KAA0B,EAAE,SAAmB;IAC3D,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE;QACrC,IAAI,IAAI,IAAI,KAAK,EAAE;YACjB,IAAI,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;SAC1B;QACD,OAAO,IAAI,CAAC;IACd,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC","sourcesContent":["import React from 'react';\nimport { NativeModules, requireNativeComponent, HostComponent } from 'react-native';\n\n// To make the transition from React Native's `requireNativeComponent` to Expo's\n// `requireNativeViewManager` as easy as possible, `requireNativeViewManager` is a drop-in\n// replacement for `requireNativeComponent`.\n//\n// For each view manager, we create a wrapper component that accepts all of the props available to\n// the author of the universal module. This wrapper component splits the props into two sets: props\n// passed to React Native's View (ex: style, testID) and custom view props, which are passed to the\n// adapter view component in a prop called `proxiedProperties`.\n\ntype NativeExpoComponentProps = {\n  proxiedProperties: object;\n};\n\n/**\n * A map that caches registered native components.\n */\nconst nativeComponentsCache = new Map<string, HostComponent<any>>();\n\n/**\n * Requires a React Native component from cache if possible. This prevents\n * \"Tried to register two views with the same name\" errors on fast refresh, but\n * also when there are multiple versions of the same package with native component.\n */\nfunction requireCachedNativeComponent<Props>(viewName: string): HostComponent<Props> {\n  const cachedNativeComponent = nativeComponentsCache.get(viewName);\n\n  if (!cachedNativeComponent) {\n    const nativeComponent = requireNativeComponent<Props>(viewName);\n    nativeComponentsCache.set(viewName, nativeComponent);\n    return nativeComponent;\n  }\n  return cachedNativeComponent;\n}\n\n/**\n * A drop-in replacement for `requireNativeComponent`.\n */\nexport function requireNativeViewManager<P>(viewName: string): React.ComponentType<P> {\n  const { viewManagersMetadata } = NativeModules.NativeUnimoduleProxy;\n  const viewManagerConfig = viewManagersMetadata?.[viewName];\n\n  if (__DEV__ && !viewManagerConfig) {\n    const exportedViewManagerNames = Object.keys(viewManagersMetadata).join(', ');\n    console.warn(\n      `The native view manager required by name (${viewName}) from NativeViewManagerAdapter isn't exported by expo-modules-core. Views of this type may not render correctly. Exported view managers: [${exportedViewManagerNames}].`\n    );\n  }\n\n  // Set up the React Native native component, which is an adapter to the universal module's view\n  // manager\n  const reactNativeViewName = `ViewManagerAdapter_${viewName}`;\n  const ReactNativeComponent =\n    requireCachedNativeComponent<NativeExpoComponentProps>(reactNativeViewName);\n  const proxiedPropsNames = viewManagerConfig?.propsNames ?? [];\n\n  // Define a component for universal-module authors to access their native view manager\n  const NativeComponentAdapter = React.forwardRef<any>((props, ref) => {\n    const nativeProps = omit(props, proxiedPropsNames);\n    const proxiedProps = pick(props, proxiedPropsNames);\n    return <ReactNativeComponent {...nativeProps} proxiedProperties={proxiedProps} ref={ref} />;\n  }) as React.ComponentType<P>;\n  NativeComponentAdapter.displayName = `Adapter<${viewName}>`;\n  return NativeComponentAdapter;\n}\n\nfunction omit(props: Record<string, any>, propNames: string[]) {\n  const copied = { ...props };\n  for (const propName of propNames) {\n    delete copied[propName];\n  }\n  return copied;\n}\n\nfunction pick(props: Record<string, any>, propNames: string[]) {\n  return propNames.reduce((prev, curr) => {\n    if (curr in props) {\n      prev[curr] = props[curr];\n    }\n    return prev;\n  }, {});\n}\n"]}
+{"version":3,"file":"NativeViewManagerAdapter.native.js","sourceRoot":"","sources":["../src/NativeViewManagerAdapter.native.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,sBAAsB,EAAiB,MAAM,cAAc,CAAC;AAEpG,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAE5D,gFAAgF;AAChF,0FAA0F;AAC1F,4CAA4C;AAC5C,EAAE;AACF,kGAAkG;AAClG,mGAAmG;AACnG,mGAAmG;AACnG,+DAA+D;AAE/D;;GAEG;AACH,MAAM,qBAAqB,GAAG,IAAI,GAAG,EAA8B,CAAC;AAEpE;;;;GAIG;AACH,SAAS,4BAA4B,CAAQ,QAAgB;IAC3D,MAAM,qBAAqB,GAAG,qBAAqB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAElE,IAAI,CAAC,qBAAqB,EAAE;QAC1B,MAAM,eAAe,GAAG,sBAAsB,CAAQ,QAAQ,CAAC,CAAC;QAChE,qBAAqB,CAAC,GAAG,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;QACrD,OAAO,eAAe,CAAC;KACxB;IACD,OAAO,qBAAqB,CAAC;AAC/B,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,wBAAwB,CAAI,QAAgB;IAC1D,MAAM,EAAE,oBAAoB,EAAE,GAAG,aAAa,CAAC,oBAAoB,CAAC;IACpE,MAAM,iBAAiB,GAAG,oBAAoB,EAAE,CAAC,QAAQ,CAAC,CAAC;IAE3D,IAAI,OAAO,IAAI,CAAC,iBAAiB,EAAE;QACjC,MAAM,wBAAwB,GAAG,MAAM,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC9E,OAAO,CAAC,IAAI,CACV,6CAA6C,QAAQ,8IAA8I,wBAAwB,IAAI,CAChO,CAAC;KACH;IAED,+FAA+F;IAC/F,UAAU;IACV,MAAM,mBAAmB,GAAG,sBAAsB,QAAQ,EAAE,CAAC;IAC7D,MAAM,oBAAoB,GAAG,4BAA4B,CAAC,mBAAmB,CAAC,CAAC;IAE/E,MAAM,eAAgB,SAAQ,KAAK,CAAC,aAAgB;QAClD,MAAM,CAAC,WAAW,GAAG,QAAQ,CAAC;QAE9B,6EAA6E;QAC7E,+CAA+C;QAC/C,SAAS,GAAkB,IAAI,CAAC;QAEhC,iBAAiB;YACf,IAAI,CAAC,SAAS,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;QACxC,CAAC;QAED,MAAM;YACJ,OAAO,oBAAC,oBAAoB,OAAK,IAAI,CAAC,KAAK,GAAI,CAAC;QAClD,CAAC;;IAGH,IAAI;QACF,MAAM,YAAY,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QACnD,MAAM,mBAAmB,GAAG,YAAY,CAAC,aAAa,CAAC;QAEvD,IAAI,mBAAmB,EAAE;YACvB,gGAAgG;YAChG,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;SAC/D;KACF;IAAC,MAAM;QACN,mFAAmF;QACnF,gGAAgG;QAChG,8FAA8F;QAC9F,gEAAgE;QAChE,gIAAgI;KACjI;IAED,OAAO,eAAe,CAAC;AACzB,CAAC","sourcesContent":["import React from 'react';\nimport { findNodeHandle, NativeModules, requireNativeComponent, HostComponent } from 'react-native';\n\nimport { requireNativeModule } from './requireNativeModule';\n\n// To make the transition from React Native's `requireNativeComponent` to Expo's\n// `requireNativeViewManager` as easy as possible, `requireNativeViewManager` is a drop-in\n// replacement for `requireNativeComponent`.\n//\n// For each view manager, we create a wrapper component that accepts all of the props available to\n// the author of the universal module. This wrapper component splits the props into two sets: props\n// passed to React Native's View (ex: style, testID) and custom view props, which are passed to the\n// adapter view component in a prop called `proxiedProperties`.\n\n/**\n * A map that caches registered native components.\n */\nconst nativeComponentsCache = new Map<string, HostComponent<any>>();\n\n/**\n * Requires a React Native component from cache if possible. This prevents\n * \"Tried to register two views with the same name\" errors on fast refresh, but\n * also when there are multiple versions of the same package with native component.\n */\nfunction requireCachedNativeComponent<Props>(viewName: string): HostComponent<Props> {\n  const cachedNativeComponent = nativeComponentsCache.get(viewName);\n\n  if (!cachedNativeComponent) {\n    const nativeComponent = requireNativeComponent<Props>(viewName);\n    nativeComponentsCache.set(viewName, nativeComponent);\n    return nativeComponent;\n  }\n  return cachedNativeComponent;\n}\n\n/**\n * A drop-in replacement for `requireNativeComponent`.\n */\nexport function requireNativeViewManager<P>(viewName: string): React.ComponentType<P> {\n  const { viewManagersMetadata } = NativeModules.NativeUnimoduleProxy;\n  const viewManagerConfig = viewManagersMetadata?.[viewName];\n\n  if (__DEV__ && !viewManagerConfig) {\n    const exportedViewManagerNames = Object.keys(viewManagersMetadata).join(', ');\n    console.warn(\n      `The native view manager required by name (${viewName}) from NativeViewManagerAdapter isn't exported by expo-modules-core. Views of this type may not render correctly. Exported view managers: [${exportedViewManagerNames}].`\n    );\n  }\n\n  // Set up the React Native native component, which is an adapter to the universal module's view\n  // manager\n  const reactNativeViewName = `ViewManagerAdapter_${viewName}`;\n  const ReactNativeComponent = requireCachedNativeComponent(reactNativeViewName);\n\n  class NativeComponent extends React.PureComponent<P> {\n    static displayName = viewName;\n\n    // This will be accessed from native when the prototype functions are called,\n    // in order to find the associated native view.\n    nativeTag: number | null = null;\n\n    componentDidMount(): void {\n      this.nativeTag = findNodeHandle(this);\n    }\n\n    render(): React.ReactNode {\n      return <ReactNativeComponent {...this.props} />;\n    }\n  }\n\n  try {\n    const nativeModule = requireNativeModule(viewName);\n    const nativeViewPrototype = nativeModule.ViewPrototype;\n\n    if (nativeViewPrototype) {\n      // Assign native view functions to the component prototype so they can be accessed from the ref.\n      Object.assign(NativeComponent.prototype, nativeViewPrototype);\n    }\n  } catch {\n    // `requireNativeModule` may throw an error when the native module cannot be found.\n    // In some tests we don't mock the entire modules, but we do want to mock native views. For now,\n    // until we still have to support the legacy modules proxy and don't have better ways to mock,\n    // let's just gracefully skip assigning the prototype functions.\n    // See: https://github.com/expo/expo/blob/main/packages/expo-modules-core/src/__tests__/NativeViewManagerAdapter-test.native.tsx\n  }\n\n  return NativeComponent;\n}\n"]}

package/build/requireNativeModule.js

@@ -9,8 +9,8 @@ import NativeModulesProxy from './NativeModulesProxy';
  * @throws Error when there is no native module with given name.
  */
 export function requireNativeModule(moduleName) {
-    const nativeModule = global.expo?.modules?.[moduleName] ??
-        global.ExpoModules?.[moduleName] ??
+    const nativeModule = globalThis.expo?.modules?.[moduleName] ??
+        globalThis.ExpoModules?.[moduleName] ??
         NativeModulesProxy[moduleName];
     if (!nativeModule) {
         throw new Error(`Cannot find native module '${moduleName}'`);

package/build/requireNativeModule.js.map

@@ -1 +1 @@
-{"version":3,"file":"requireNativeModule.js","sourceRoot":"","sources":["../src/requireNativeModule.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AAyBtD;;;;;;;;GAQG;AACH,MAAM,UAAU,mBAAmB,CAAmB,UAAkB;IACtE,MAAM,YAAY,GAChB,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,UAAU,CAAC;QAClC,MAAM,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC;QAChC,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAEjC,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,8BAA8B,UAAU,GAAG,CAAC,CAAC;KAC9D;IACD,OAAO,YAAY,CAAC;AACtB,CAAC","sourcesContent":["import NativeModulesProxy from './NativeModulesProxy';\n\ntype ExpoObject = {\n  modules:\n    | undefined\n    | {\n        [key: string]: any;\n      };\n};\n\ndeclare global {\n  // eslint-disable-next-line no-var\n  var expo: ExpoObject | undefined;\n\n  /**\n   * @deprecated `global.ExpoModules` is deprecated, use `global.expo.modules` instead.\n   */\n  // eslint-disable-next-line no-var\n  var ExpoModules:\n    | undefined\n    | {\n        [key: string]: any;\n      };\n}\n\n/**\n * Imports the native module registered with given name. In the first place it tries to load\n * the module installed through the JSI host object and then falls back to the bridge proxy module.\n * Notice that the modules loaded from the proxy may not support some features like synchronous functions.\n *\n * @param moduleName Name of the requested native module.\n * @returns Object representing the native module.\n * @throws Error when there is no native module with given name.\n */\nexport function requireNativeModule<ModuleType = any>(moduleName: string): ModuleType {\n  const nativeModule: ModuleType =\n    global.expo?.modules?.[moduleName] ??\n    global.ExpoModules?.[moduleName] ??\n    NativeModulesProxy[moduleName];\n\n  if (!nativeModule) {\n    throw new Error(`Cannot find native module '${moduleName}'`);\n  }\n  return nativeModule;\n}\n"]}
+{"version":3,"file":"requireNativeModule.js","sourceRoot":"","sources":["../src/requireNativeModule.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,MAAM,sBAAsB,CAAC;AAyBtD;;;;;;;;GAQG;AACH,MAAM,UAAU,mBAAmB,CAAmB,UAAkB;IACtE,MAAM,YAAY,GAChB,UAAU,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,UAAU,CAAC;QACtC,UAAU,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC;QACpC,kBAAkB,CAAC,UAAU,CAAC,CAAC;IAEjC,IAAI,CAAC,YAAY,EAAE;QACjB,MAAM,IAAI,KAAK,CAAC,8BAA8B,UAAU,GAAG,CAAC,CAAC;KAC9D;IACD,OAAO,YAAY,CAAC;AACtB,CAAC","sourcesContent":["import NativeModulesProxy from './NativeModulesProxy';\n\ntype ExpoObject = {\n  modules:\n    | undefined\n    | {\n        [key: string]: any;\n      };\n};\n\ndeclare global {\n  // eslint-disable-next-line no-var\n  var expo: ExpoObject | undefined;\n\n  /**\n   * @deprecated `global.ExpoModules` is deprecated, use `global.expo.modules` instead.\n   */\n  // eslint-disable-next-line no-var\n  var ExpoModules:\n    | undefined\n    | {\n        [key: string]: any;\n      };\n}\n\n/**\n * Imports the native module registered with given name. In the first place it tries to load\n * the module installed through the JSI host object and then falls back to the bridge proxy module.\n * Notice that the modules loaded from the proxy may not support some features like synchronous functions.\n *\n * @param moduleName Name of the requested native module.\n * @returns Object representing the native module.\n * @throws Error when there is no native module with given name.\n */\nexport function requireNativeModule<ModuleType = any>(moduleName: string): ModuleType {\n  const nativeModule: ModuleType =\n    globalThis.expo?.modules?.[moduleName] ??\n    globalThis.ExpoModules?.[moduleName] ??\n    NativeModulesProxy[moduleName];\n\n  if (!nativeModule) {\n    throw new Error(`Cannot find native module '${moduleName}'`);\n  }\n  return nativeModule;\n}\n"]}

package/common/cpp/fabric/ExpoViewProps.cpp

@@ -7,12 +7,27 @@ namespace react = facebook::react;
 
 namespace expo {
 
+/**
+ Borrows the props map from the source props and applies the update given in the raw props.
+ */
+std::unordered_map<std::string, folly::dynamic> propsMapFromProps(const ExpoViewProps &sourceProps, const react::RawProps &rawProps) {
+  // Move the contents of the source props map – the source props instance will not be used anymore.
+  std::unordered_map<std::string, folly::dynamic> propsMap = std::move(sourceProps.propsMap);
+
+  // Iterate over values in the raw props object.
+  // Note that it contains only updated props.
+  rawProps.iterateOverValues([&propsMap](react::RawPropsPropNameHash hash, const char *name, const react::RawValue &value) {
+    std::string propName(name);
+    propsMap[propName] = (folly::dynamic)value;
+  });
+
+  return propsMap;
+}
+
 ExpoViewProps::ExpoViewProps(const react::PropsParserContext &context,
                              const ExpoViewProps &sourceProps,
                              const react::RawProps &rawProps)
                              : ViewProps(context, sourceProps, rawProps),
-                               proxiedProperties(
-                                 facebook::react::convertRawProp(context, rawProps, "proxiedProperties", sourceProps.proxiedProperties, {})) {
-}
+                               propsMap(propsMapFromProps(sourceProps, rawProps)) {}
 
 } // namespace expo

package/common/cpp/fabric/ExpoViewProps.h

@@ -19,7 +19,10 @@ public:
 
 #pragma mark - Props
 
-  const folly::dynamic proxiedProperties;
+  /**
+   A map with props stored as `folly::dynamic` objects.
+   */
+  std::unordered_map<std::string, folly::dynamic> propsMap;
 };
 
 } // namespace expo

package/ios/Fabric/ExpoFabricView.swift

@@ -21,13 +21,6 @@ public class ExpoFabricView: ExpoFabricViewObjC {
     return appContext?.moduleRegistry.get(moduleHolderForName: moduleName)
   }
 
-  /**
-   The view manager of the associated legacy module.
-   Not available if the module is registered in the new module registry.
-   */
-  lazy var legacyViewManager = appContext?.legacyModuleRegistry?.getAllViewManagers()
-                                 .filter { $0.viewName() == moduleName }
-                                 .first
 
   /**
    A dictionary of prop objects that contain prop setters.
@@ -52,7 +45,7 @@ public class ExpoFabricView: ExpoFabricViewObjC {
   // MARK: - ExpoFabricViewInterface
 
   public override func updateProps(_ props: [String: Any]) {
-    guard let view = contentView, let propsDict = viewManagerPropDict else {
+    guard let view = contentView, let context = appContext, let propsDict = viewManagerPropDict else {
       return
     }
     for (key, prop) in propsDict {
@@ -61,7 +54,7 @@ public class ExpoFabricView: ExpoFabricViewObjC {
       // TODO: @tsapeta: Figure out better way to rethrow errors from here.
       // Adding `throws` keyword to the function results in different
       // method signature in Objective-C. Maybe just call `RCTLogError`?
-      try? prop.set(value: Conversions.fromNSObject(newValue), onView: view)
+      try? prop.set(value: Conversions.fromNSObject(newValue), onView: view, appContext: context)
     }
   }
 
@@ -75,6 +68,13 @@ public class ExpoFabricView: ExpoFabricViewObjC {
     viewManager.callLifecycleMethods(withType: .didUpdateProps, forView: view)
   }
 
+  /**
+   Returns a bool value whether the view supports prop with the given name.
+   */
+  public override func supportsProp(withName name: String) -> Bool {
+    return viewManagerPropDict?.index(forKey: name) != nil
+  }
+
   /**
    The function that is called by Fabric when the view is unmounted and is being enqueued for recycling.
    It can also be called on app reload, so be careful to wipe out any dependencies specific to the currently running AppContext.
@@ -110,7 +110,7 @@ public class ExpoFabricView: ExpoFabricViewObjC {
     guard let appContext = appContext else {
       fatalError(Exceptions.AppContextLost().reason)
     }
-    guard let view = moduleHolder?.definition.viewManager?.createView(appContext: appContext) ?? legacyViewManager?.view() else {
+    guard let view = moduleHolder?.definition.viewManager?.createView(appContext: appContext) else {
       fatalError("Cannot create a view from module '\(moduleName)'")
     }
     // Setting the content view automatically adds the view as a subview.

package/ios/Fabric/ExpoFabricViewObjC.h

@@ -37,6 +37,8 @@
 
 - (void)viewDidUpdateProps;
 
+- (BOOL)supportsPropWithName:(nonnull NSString *)name;
+
 - (void)prepareForRecycle;
 
 #pragma mark - Methods injected to the class in runtime

package/ios/Fabric/ExpoFabricViewObjC.mm

@@ -140,9 +140,18 @@ static std::unordered_map<std::string, ExpoViewComponentDescriptor::Flavor> _com
 - (void)updateProps:(const facebook::react::Props::Shared &)props oldProps:(const facebook::react::Props::Shared &)oldProps
 {
   const auto &newViewProps = *std::static_pointer_cast<ExpoViewProps const>(props);
-  NSDictionary<NSString *, id> *proxiedProperties = convertFollyDynamicToId(newViewProps.proxiedProperties);
+  NSMutableDictionary<NSString *, id> *propsMap = [[NSMutableDictionary alloc] init];
 
-  [self updateProps:proxiedProperties];
+  for (const auto &item : newViewProps.propsMap) {
+    NSString *propName = [NSString stringWithUTF8String:item.first.c_str()];
+
+    // Ignore props inherited from the base view and Yoga.
+    if ([self supportsPropWithName:propName]) {
+      propsMap[propName] = convertFollyDynamicToId(item.second);
+    }
+  }
+
+  [self updateProps:propsMap];
   [super updateProps:props oldProps:oldProps];
   [self viewDidUpdateProps];
 }
@@ -174,6 +183,12 @@ static std::unordered_map<std::string, ExpoViewComponentDescriptor::Flavor> _com
   // Implemented in `ExpoFabricView.swift`
 }
 
+- (BOOL)supportsPropWithName:(nonnull NSString *)name
+{
+  // Implemented in `ExpoFabricView.swift`
+  return NO;
+}
+
 #pragma mark - Methods to override in the subclass
 
 - (nullable EXAppContext *)__injectedAppContext

package/ios/JSI/EXJSIInstaller.mm

@@ -35,7 +35,7 @@ static NSString *modulesHostObjectLegacyPropertyName = @"ExpoModules";
 
 + (BOOL)installExpoModulesHostObject:(nonnull EXAppContext *)appContext
 {
-  EXJavaScriptRuntime *runtime = [appContext runtime];
+  EXJavaScriptRuntime *runtime = [appContext _runtime];
 
   // The runtime may be unavailable, e.g. remote debugger is enabled or it hasn't been set yet.
   if (!runtime) {

package/ios/JSI/EXJSIUtils.h

@@ -26,6 +26,11 @@ using ClassConstructor = std::function<void(jsi::Runtime &runtime, const jsi::Va
 
 std::shared_ptr<jsi::Function> createClass(jsi::Runtime &runtime, const char *name, ClassConstructor constructor);
 
+/**
+ Creates a new object, using the provided object as the prototype.
+ */
+std::shared_ptr<jsi::Object> createObjectWithPrototype(jsi::Runtime &runtime, std::shared_ptr<jsi::Object> prototype);
+
 #pragma mark - Weak objects
 
 /**

package/ios/JSI/EXJSIUtils.mm

@@ -115,6 +115,23 @@ std::shared_ptr<jsi::Function> createClass(jsi::Runtime &runtime, const char *na
   return std::make_shared<jsi::Function>(klass.asFunction(runtime));
 }
 
+std::shared_ptr<jsi::Object> createObjectWithPrototype(jsi::Runtime &runtime, std::shared_ptr<jsi::Object> prototype) {
+  // Get the "Object" class.
+  jsi::Object objectClass = runtime
+    .global()
+    .getPropertyAsObject(runtime, "Object");
+
+  // Call "Object.create(prototype)" to create an object with the given prototype without calling the constructor.
+  jsi::Object object = objectClass
+    .getPropertyAsFunction(runtime, "create")
+    .callWithThis(runtime, objectClass, {
+      jsi::Value(runtime, *prototype)
+    })
+    .asObject(runtime);
+
+  return std::make_shared<jsi::Object>(std::move(object));
+}
+
 #pragma mark - Weak objects
 
 bool isWeakRefSupported(jsi::Runtime &runtime) {

package/ios/JSI/EXJavaScriptRuntime.h

@@ -103,6 +103,11 @@ typedef void (^ClassConstructorBlock)(EXJavaScriptObject * _Nonnull thisValue, N
 - (nonnull EXJavaScriptObject *)createClass:(nonnull NSString *)name
                                 constructor:(nonnull ClassConstructorBlock)constructor;
 
+/**
+ Creates a new object, using the provided object as the prototype.
+ */
+- (nullable EXJavaScriptObject *)createObjectWithPrototype:(nonnull EXJavaScriptObject *)prototype;
+
 #pragma mark - Script evaluation
 
 /**

package/ios/JSI/EXJavaScriptRuntime.mm

@@ -160,6 +160,12 @@ static NSString *mainObjectPropertyName = @"expo";
   return [[EXJavaScriptObject alloc] initWith:klass runtime:self];
 }
 
+- (nullable EXJavaScriptObject *)createObjectWithPrototype:(nonnull EXJavaScriptObject *)prototype
+{
+  std::shared_ptr<jsi::Object> object = expo::createObjectWithPrototype(*_runtime, [prototype getShared]);
+  return object ? [[EXJavaScriptObject alloc] initWith:object runtime:self] : nil;
+}
+
 #pragma mark - Script evaluation
 
 - (nonnull EXJavaScriptValue *)evaluateScript:(nonnull NSString *)scriptSource

package/ios/JSI/EXJavaScriptValue.h

@@ -9,6 +9,7 @@ namespace jsi = facebook::jsi;
 #endif // __cplusplus
 
 @class EXJavaScriptRuntime;
+@class EXRawJavaScriptFunction;
 @class EXJavaScriptTypedArray;
 
 /**
@@ -49,6 +50,7 @@ NS_SWIFT_NAME(JavaScriptValue)
 - (nonnull NSArray<EXJavaScriptValue *> *)getArray;
 - (nonnull NSDictionary<NSString *, id> *)getDictionary;
 - (nonnull EXJavaScriptObject *)getObject;
+- (nonnull EXRawJavaScriptFunction *)getFunction;
 - (nullable EXJavaScriptTypedArray *)getTypedArray;
 
 #pragma mark - Helpers

package/ios/JSI/EXJavaScriptValue.mm

@@ -3,6 +3,7 @@
 #import <ExpoModulesCore/EXJSIConversions.h>
 #import <ExpoModulesCore/EXJavaScriptValue.h>
 #import <ExpoModulesCore/EXJavaScriptRuntime.h>
+#import <ExpoModulesCore/EXRawJavaScriptFunction.h>
 #import <ExpoModulesCore/EXJavaScriptTypedArray.h>
 #import <ExpoModulesCore/TypedArray.h>
 
@@ -142,6 +143,13 @@
   return [[EXJavaScriptObject alloc] initWith:objectPtr runtime:_runtime];
 }
 
+- (nonnull EXRawJavaScriptFunction *)getFunction
+{
+  jsi::Runtime *runtime = [_runtime get];
+  std::shared_ptr<jsi::Function> functionPtr = std::make_shared<jsi::Function>(_value->asObject(*runtime).asFunction(*runtime));
+  return [[EXRawJavaScriptFunction alloc] initWith:functionPtr runtime:_runtime];
+}
+
 - (nullable EXJavaScriptTypedArray *)getTypedArray
 {
   if (![self isTypedArray]) {