expo-modules-core 58.0.13 → 58.0.14

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## 58.0.14
+
+### Patch Changes
+
+- [Android] Fixed a data race on the Fabric view state-prop map when Expo registers its view components while React Native builds a component descriptor registry on another thread. ([#51044](https://github.com/expo/expo/pull/51044) by [@hirvesh](https://github.com/hirvesh))
+- [Internal] Import `LogBox`, `DevSettings`, and `NativeComponentRegistry` from the `react-native` public API. ([#50862](https://github.com/expo/expo/pull/50862) by [@huntie](https://github.com/huntie))
+
 ## 58.0.13
 
 ### Patch Changes

package/android/build.gradle

@@ -46,7 +46,7 @@ if (shouldIncludeCompose) {
 }
 
 group = 'host.exp.exponent'
-version = '58.0.13'
+version = '58.0.14'
 
 def isExpoModulesCoreTests = {
   Gradle gradle = getGradle()
@@ -175,7 +175,7 @@ android {
   defaultConfig {
     consumerProguardFiles 'proguard-rules.pro'
     versionCode 1
-    versionName "58.0.13"
+    versionName "58.0.14"
     buildConfigField "String", "EXPO_MODULES_CORE_VERSION", "\"${versionName}\""
     buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", "true"
 

package/android/prebuilt/metadata.json

@@ -1,6 +1,6 @@
 {
     "reactNativeVersion": "0.88.0",
-    "sourceHash": "6f9421c9afcc3239b0995cea1757806a",
+    "sourceHash": "cfbedf19c9c9a434a2d9cd5dc4c91880",
     "variants": [
         "debug",
         "release"
@@ -16,5 +16,5 @@
         "libexpo-modules-jsi.so"
     ],
     "stripped": true,
-    "createdAt": "2026-10-05T21:13:27.466871505Z"
+    "createdAt": "2026-10-06T16:00:54.933258624Z"
 }

package/android/src/main/cpp/fabric/ExpoComponentDescriptorFactory.cpp

@@ -8,6 +8,7 @@ namespace react = facebook::react;
 namespace expo {
 
 StatePropMapType statePropMap = {};
+std::shared_mutex statePropMapMutex;
 
 react::ComponentDescriptor::Unique concreteExpoComponentDescriptorConstructor(
   const react::ComponentDescriptorParameters &parameters
@@ -17,6 +18,7 @@ react::ComponentDescriptor::Unique concreteExpoComponentDescriptorConstructor(
     react::RawPropsParser(/*useRawPropsJsiValue=*/true)
   );
 
+  std::shared_lock lock(statePropMapMutex);
   if (statePropMap.contains(std::static_pointer_cast<std::string const>(parameters.flavor))) {
     descriptor->setStateProps(
       statePropMap.at(

package/android/src/main/cpp/fabric/ExpoComponentDescriptorFactory.h

@@ -5,6 +5,8 @@
 #include <react/renderer/core/ComponentDescriptor.h>
 #include "../types/FrontendConverter.h"
 
+#include <shared_mutex>
+
 namespace react = facebook::react;
 
 namespace expo {
@@ -16,6 +18,10 @@ using StatePropMapType = std::unordered_map<
 
 extern StatePropMapType statePropMap;
 
+// Guards `statePropMap`. It is written when Expo registers its view components and read
+// when React Native builds a component descriptor registry, and these can run on different threads.
+extern std::shared_mutex statePropMapMutex;
+
 react::ComponentDescriptor::Unique concreteExpoComponentDescriptorConstructor(
   const react::ComponentDescriptorParameters &parameters
 );

package/android/src/main/cpp/fabric/FabricComponentsRegistry.cpp

@@ -58,10 +58,14 @@ void FabricComponentsRegistry::registerComponentsRegistry(
       propMap.emplace(propName, converter);
     }
 
-    statePropMap.insert_or_assign(
-      flavor,
-      propMap
-    );
+    {
+      // Released before `add` below, which constructs descriptors that take the shared lock.
+      std::unique_lock lock(statePropMapMutex);
+      statePropMap.insert_or_assign(
+        flavor,
+        propMap
+      );
+    }
 
     providerRegistry->add(react::ComponentDescriptorProvider{
       reinterpret_cast<react::ComponentHandle>(componentName),

package/build/NativeViewManagerAdapter.native.d.ts

@@ -2,4 +2,4 @@ import { type ComponentType } from 'react';
 /**
  * A drop-in replacement for `requireNativeComponent`.
  */
-export declare function requireNativeViewManager<P>(moduleName: string, viewName?: string): ComponentType<P>;
+export declare function requireNativeViewManager<P extends object>(moduleName: string, viewName?: string): ComponentType<P>;

package/build/NativeViewManagerAdapter.native.js

@@ -1,10 +1,8 @@
 // Copyright © 2024 650 Industries.
-/// <reference path="ts-declarations/NativeComponentRegistry.d.ts" />
 'use client';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { createRef, PureComponent } from 'react';
-import { findNodeHandle } from 'react-native';
-import { get as componentRegistryGet } from 'react-native/Libraries/NativeComponent/NativeComponentRegistry';
+import { findNodeHandle, NativeComponentRegistry } from 'react-native';
 import { SharedObject } from './SharedObject';
 import { requireNativeModule } from './requireNativeModule';
 // To make the transition from React Native's `requireNativeComponent` to Expo's
@@ -24,7 +22,7 @@ import { requireNativeModule } from './requireNativeModule';
     const appIdentifier = globalThis.expo?.['__expo_app_identifier__'] ?? '';
     const viewNameSuffix = appIdentifier ? `_${appIdentifier}` : '';
     const nativeViewName = viewName ? `ViewManagerAdapter_${moduleName}_${viewName}${viewNameSuffix}` : `ViewManagerAdapter_${moduleName}${viewNameSuffix}`;
-    return componentRegistryGet(nativeViewName, ()=>{
+    return NativeComponentRegistry.get(nativeViewName, ()=>{
         const expoViewConfig = globalThis.expo?.getViewConfig(moduleName, viewName);
         if (!expoViewConfig) {
             console.warn('Unable to get the view config for %s from module %s', viewName ?? 'default view', moduleName);

package/build/NativeViewManagerAdapter.native.js.map

@@ -1 +1 @@
-{"version":3,"sources":["NativeViewManagerAdapter.native.tsx"],"sourcesContent":[null],"names":["createRef","PureComponent","findNodeHandle","get","componentRegistryGet","SharedObject","requireNativeModule","nativeComponentsCache","Map","requireNativeComponent","moduleName","viewName","appIdentifier","globalThis","expo","viewNameSuffix","nativeViewName","expoViewConfig","getViewConfig","console","warn","uiViewClassName","directEventTypes","validAttributes","addAttributeProcessing","processPropValue","value","sharedObjectId","__expo_shared_object_id__","descriptor","process","attributes","key","Object","keys","requireCachedNativeComponent","cacheKey","cachedNativeComponent","nativeComponent","set","mapAriaProps","props","accessibilityState","accessibilityValue","ariaBusy","ariaChecked","ariaDisabled","ariaExpanded","ariaHidden","ariaLabel","ariaLabelledBy","ariaLive","ariaSelected","ariaValueMax","ariaValueMin","ariaValueNow","ariaValueText","id","tabIndex","resolvedProps","undefined","accessibilityLabelledBy","split","accessibilityLabel","accessibilityLiveRegion","accessibilityElementsHidden","importantForAccessibility","nativeID","focusable","busy","checked","disabled","expanded","selected","max","min","now","text","requireNativeViewManager","ReactNativeComponent","NativeComponent","displayName","nativeRef","nativeTag","componentDidMount","current","getNativeRef","render","ref","nativeModule","nativeViewPrototype","ViewPrototypes","assign","prototype"],"mappings":"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"}
+{"version":3,"sources":["NativeViewManagerAdapter.native.tsx"],"sourcesContent":[null],"names":["createRef","PureComponent","findNodeHandle","NativeComponentRegistry","SharedObject","requireNativeModule","nativeComponentsCache","Map","requireNativeComponent","moduleName","viewName","appIdentifier","globalThis","expo","viewNameSuffix","nativeViewName","get","expoViewConfig","getViewConfig","console","warn","uiViewClassName","directEventTypes","validAttributes","addAttributeProcessing","processPropValue","value","sharedObjectId","__expo_shared_object_id__","descriptor","process","attributes","key","Object","keys","requireCachedNativeComponent","cacheKey","cachedNativeComponent","nativeComponent","set","mapAriaProps","props","accessibilityState","accessibilityValue","ariaBusy","ariaChecked","ariaDisabled","ariaExpanded","ariaHidden","ariaLabel","ariaLabelledBy","ariaLive","ariaSelected","ariaValueMax","ariaValueMin","ariaValueNow","ariaValueText","id","tabIndex","resolvedProps","undefined","accessibilityLabelledBy","split","accessibilityLabel","accessibilityLiveRegion","accessibilityElementsHidden","importantForAccessibility","nativeID","focusable","busy","checked","disabled","expanded","selected","max","min","now","text","requireNativeViewManager","ReactNativeComponent","NativeComponent","displayName","nativeRef","nativeTag","componentDidMount","current","getNativeRef","render","ref","nativeModule","nativeViewPrototype","ViewPrototypes","assign","prototype"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-modules-core",
-  "version": "58.0.13",
+  "version": "58.0.14",
   "description": "The core of Expo Modules architecture",
   "keywords": [
     "expo",
@@ -73,7 +73,7 @@
     "@types/invariant": "^2.2.33",
     "@types/react": "~19.3.0",
     "@types/react-dom": "^19.1.7",
-    "expo-module-scripts": "56.0.7",
+    "expo-module-scripts": "56.0.8",
     "react-dom": "19.3.0"
   },
   "peerDependencies": {

package/src/NativeViewManagerAdapter.native.tsx

@@ -1,12 +1,14 @@
 // Copyright © 2024 650 Industries.
 
-/// <reference path="ts-declarations/NativeComponentRegistry.d.ts" />
-
 'use client';
 
 import { type Component, type ComponentType, createRef, PureComponent } from 'react';
-import { type ReactNativeElement, findNodeHandle, type HostComponent } from 'react-native';
-import { get as componentRegistryGet } from 'react-native/Libraries/NativeComponent/NativeComponentRegistry';
+import {
+  type ReactNativeElement,
+  findNodeHandle,
+  type HostComponent,
+  NativeComponentRegistry,
+} from 'react-native';
 
 import { SharedObject } from './SharedObject';
 import { requireNativeModule } from './requireNativeModule';
@@ -44,7 +46,7 @@ declare namespace globalThis {
 /**
  * Requires a React Native component using the static view config from an Expo module.
  */
-function requireNativeComponent<Props>(
+function requireNativeComponent<Props extends object>(
   moduleName: string,
   viewName?: string
 ): HostComponent<Props> {
@@ -55,7 +57,7 @@ function requireNativeComponent<Props>(
     ? `ViewManagerAdapter_${moduleName}_${viewName}${viewNameSuffix}`
     : `ViewManagerAdapter_${moduleName}${viewNameSuffix}`;
 
-  return componentRegistryGet<Props>(nativeViewName, () => {
+  return NativeComponentRegistry.get<Props>(nativeViewName, () => {
     const expoViewConfig = globalThis.expo?.getViewConfig(moduleName, viewName);
 
     if (!expoViewConfig) {
@@ -113,7 +115,7 @@ function addAttributeProcessing(validAttributes: Record<string, any>): Record<st
  * "Tried to register two views with the same name" errors on fast refresh, but
  * also when there are multiple versions of the same package with native component.
  */
-function requireCachedNativeComponent<Props>(
+function requireCachedNativeComponent<Props extends object>(
   moduleName: string,
   viewName?: string
 ): HostComponent<Props> {
@@ -211,7 +213,7 @@ function mapAriaProps(props: Record<string, any>): Record<string, any> {
 /**
  * A drop-in replacement for `requireNativeComponent`.
  */
-export function requireNativeViewManager<P>(
+export function requireNativeViewManager<P extends object>(
   moduleName: string,
   viewName?: string
 ): ComponentType<P> {

package/build/ts-declarations/NativeComponentRegistry.d.ts

@@ -1,12 +0,0 @@
-declare module 'react-native/Libraries/NativeComponent/NativeComponentRegistry' {
-  import type { HostComponent } from 'react-native';
-
-  export function get<Props>(
-    name: string,
-    register: () => {
-      uiViewClassName: string;
-      validAttributes?: Record<string, any>;
-      directEventTypes?: Record<string, { registrationName: string }>;
-    }
-  ): HostComponent<Props>;
-}

package/src/ts-declarations/NativeComponentRegistry.d.ts

@@ -1,12 +0,0 @@
-declare module 'react-native/Libraries/NativeComponent/NativeComponentRegistry' {
-  import type { HostComponent } from 'react-native';
-
-  export function get<Props>(
-    name: string,
-    register: () => {
-      uiViewClassName: string;
-      validAttributes?: Record<string, any>;
-      directEventTypes?: Record<string, { registrationName: string }>;
-    }
-  ): HostComponent<Props>;
-}