react-native 0.68.1 → 0.69.0-rc.1

package/Libraries/Text/Text.js

@@ -48,11 +48,20 @@ const Text: React.AbstractComponent<
 
   const [isHighlighted, setHighlighted] = useState(false);
 
+  const _disabled =
+    restProps.disabled != null
+      ? restProps.disabled
+      : props.accessibilityState?.disabled;
+  const _accessibilityState =
+    _disabled !== props.accessibilityState?.disabled
+      ? {...props.accessibilityState, disabled: _disabled}
+      : props.accessibilityState;
+
   const isPressable =
     (onPress != null ||
       onLongPress != null ||
       onStartShouldSetResponder != null) &&
-    restProps.disabled !== true;
+    _disabled !== true;
 
   const initialized = useLazyInitialization(isPressable);
   const config = useMemo(
@@ -120,6 +129,7 @@ const Text: React.AbstractComponent<
                 onResponderTerminate(event);
               }
             },
+            onClick: eventHandlers.onClick,
             onResponderTerminationRequest:
               eventHandlers.onResponderTerminationRequest,
             onStartShouldSetResponder: eventHandlers.onStartShouldSetResponder,
@@ -174,7 +184,9 @@ const Text: React.AbstractComponent<
       <NativeText
         {...restProps}
         {...eventHandlersForText}
+        disabled={_disabled}
         accessible={accessible !== false}
+        accessibilityState={_accessibilityState}
         allowFontScaling={allowFontScaling !== false}
         ellipsizeMode={ellipsizeMode ?? 'tail'}
         isHighlighted={isHighlighted}
@@ -189,12 +201,6 @@ const Text: React.AbstractComponent<
 
 Text.displayName = 'Text';
 
-/**
- * Switch to `deprecated-react-native-prop-types` for compatibility with future
- * releases. This is deprecated and will be removed in the future.
- */
-Text.propTypes = require('deprecated-react-native-prop-types').TextPropTypes;
-
 /**
  * Returns false until the first time `newValue` is true, after which this will
  * always return true. This is necessary to lazily initialize `Pressability` so

package/Libraries/Text/TextNativeComponent.js

@@ -14,11 +14,13 @@ import {type HostComponent} from '../Renderer/shims/ReactNativeTypes';
 import createReactNativeComponentClass from '../Renderer/shims/createReactNativeComponentClass';
 import {type ProcessedColorValue} from '../StyleSheet/processColor';
 import {type TextProps} from './TextProps';
+import {type PressEvent} from '../Types/CoreEventTypes';
 
 type NativeTextProps = $ReadOnly<{
   ...TextProps,
   isHighlighted?: ?boolean,
   selectionColor?: ?ProcessedColorValue,
+  onClick?: ?(event: PressEvent) => mixed,
   // This is only needed for platforms that optimize text hit testing, e.g.,
   // react-native-windows. It can be used to only hit test virtual text spans
   // that have pressable events attached to them.

package/Libraries/Text/TextProps.js

@@ -12,6 +12,7 @@
 
 import type {
   LayoutEvent,
+  PointerEvent,
   PressEvent,
   TextLayoutEvent,
 } from '../Types/CoreEventTypes';
@@ -31,10 +32,18 @@ export type PressRetentionOffset = $ReadOnly<{|
   right: number,
 |}>;
 
+type PointerEventProps = $ReadOnly<{|
+  onPointerEnter?: (event: PointerEvent) => void,
+  onPointerLeave?: (event: PointerEvent) => void,
+  onPointerMove?: (event: PointerEvent) => void,
+|}>;
+
 /**
  * @see https://reactnative.dev/docs/text#reference
  */
 export type TextProps = $ReadOnly<{|
+  ...PointerEventProps,
+
   /**
    * Indicates whether the view is an accessibility element.
    *
@@ -44,6 +53,7 @@ export type TextProps = $ReadOnly<{|
   accessibilityActions?: ?$ReadOnlyArray<AccessibilityActionInfo>,
   onAccessibilityAction?: ?(event: AccessibilityActionEvent) => mixed,
   accessibilityHint?: ?Stringish,
+  accessibilityLanguage?: ?Stringish,
   accessibilityLabel?: ?Stringish,
   accessibilityRole?: ?AccessibilityRole,
   accessibilityState?: ?AccessibilityState,

package/Libraries/TypeSafety/RCTConvertHelpers.h

@@ -5,12 +5,13 @@
  * LICENSE file in the root directory of this source tree.
  */
 
+#import <optional>
+
 #import <vector>
 
 #import <Foundation/Foundation.h>
 
 #import <FBLazyVector/FBLazyVector.h>
-#import <folly/Optional.h>
 
 namespace facebook {
 namespace react {
@@ -35,22 +36,22 @@ NSArray *RCTConvertVecToArray(const ContainerT &vec)
 }
 
 template<typename ContainerT>
-NSArray *RCTConvertOptionalVecToArray(const folly::Optional<ContainerT> &vec, id (^convertor)(typename ContainerT::value_type element))
+NSArray *RCTConvertOptionalVecToArray(const std::optional<ContainerT> &vec, id (^convertor)(typename ContainerT::value_type element))
 {
-  return vec.hasValue() ? RCTConvertVecToArray(vec.value(), convertor) : nil;
+  return vec.has_value() ? RCTConvertVecToArray(vec.value(), convertor) : nil;
 }
 
 template<typename ContainerT>
-NSArray *RCTConvertOptionalVecToArray(const folly::Optional<ContainerT> &vec)
+NSArray *RCTConvertOptionalVecToArray(const std::optional<ContainerT> &vec)
 {
-  return vec.hasValue() ? RCTConvertVecToArray(vec.value(), ^id(typename ContainerT::value_type element) { return element; }) : nil;
+  return vec.has_value() ? RCTConvertVecToArray(vec.value(), ^id(typename ContainerT::value_type element) { return element; }) : nil;
 }
 
 bool RCTBridgingToBool(id value);
-folly::Optional<bool> RCTBridgingToOptionalBool(id value);
+std::optional<bool> RCTBridgingToOptionalBool(id value);
 NSString *RCTBridgingToString(id value);
 NSString *RCTBridgingToOptionalString(id value);
-folly::Optional<double> RCTBridgingToOptionalDouble(id value);
+std::optional<double> RCTBridgingToOptionalDouble(id value);
 double RCTBridgingToDouble(id value);
 NSArray *RCTBridgingToArray(id value);
 
@@ -64,10 +65,10 @@ facebook::react::LazyVector<T> RCTBridgingToVec(id value, T (^ctor)(id element))
 }
 
 template<typename T>
-folly::Optional<facebook::react::LazyVector<T>> RCTBridgingToOptionalVec(id value, T (^ctor)(id element))
+std::optional<facebook::react::LazyVector<T>> RCTBridgingToOptionalVec(id value, T (^ctor)(id element))
 {
   if (value == nil || value == (id)kCFNull) {
-    return folly::none;
+    return std::nullopt;
   } else {
     return RCTBridgingToVec(value, ctor);
   }

package/Libraries/TypeSafety/RCTConvertHelpers.mm

@@ -14,7 +14,7 @@ bool RCTBridgingToBool(id value)
   return [RCTConvert BOOL:value] ? true : false;
 }
 
-folly::Optional<bool> RCTBridgingToOptionalBool(id value)
+std::optional<bool> RCTBridgingToOptionalBool(id value)
 {
   if (!RCTNilIfNull(value)) {
     return {};
@@ -33,7 +33,7 @@ NSString *RCTBridgingToOptionalString(id value)
 }
 
 
-folly::Optional<double> RCTBridgingToOptionalDouble(id value)
+std::optional<double> RCTBridgingToOptionalDouble(id value)
 {
   if (!RCTNilIfNull(value)) {
     return {};

package/Libraries/TypeSafety/RCTTypeSafety.podspec

@@ -16,9 +16,6 @@ else
   source[:tag] = "v#{version}"
 end
 
-folly_compiler_flags = '-DFOLLY_NO_CONFIG -DFOLLY_MOBILE=1 -DFOLLY_USE_LIBCPP=1 -Wno-comma -Wno-shorten-64-to-32'
-folly_version = '2021.06.28.00-v2'
-
 Pod::Spec.new do |s|
   s.name                   = "RCTTypeSafety"
   s.version                = version
@@ -26,19 +23,17 @@ Pod::Spec.new do |s|
   s.homepage               = "https://reactnative.dev/"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "11.0" }
-  s.compiler_flags         = folly_compiler_flags
+  s.platforms              = { :ios => "12.4" }
   s.source                 = source
   s.source_files           = "**/*.{c,h,m,mm,cpp}"
   s.header_dir             = "RCTTypeSafety"
   s.pod_target_xcconfig    = {
                                "USE_HEADERMAP" => "YES",
-                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
-                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/Libraries/TypeSafety\" \"$(PODS_ROOT)/RCT-Folly\""
+                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
+                               "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/Libraries/TypeSafety\""
                              }
 
   s.dependency "FBLazyVector", version
-  s.dependency "RCT-Folly", folly_version
   s.dependency "RCTRequired", version
   s.dependency "React-Core", version
 end

package/Libraries/Types/CoreEventTypes.js

@@ -11,7 +11,7 @@
 import * as React from 'react';
 import type {HostComponent} from '../Renderer/shims/ReactNativeTypes';
 
-export type SyntheticEvent<T> = $ReadOnly<{|
+export type SyntheticEvent<+T> = $ReadOnly<{|
   bubbles: ?boolean,
   cancelable: ?boolean,
   currentTarget: number | React.ElementRef<HostComponent<mixed>>,
@@ -83,6 +83,18 @@ export type TextLayoutEvent = SyntheticEvent<
   |}>,
 >;
 
+export type PointerEvent = ResponderSyntheticEvent<
+  $ReadOnly<{|
+    pointerId: number,
+    pressure: number,
+    pointerType: string,
+    clientX: number,
+    clientY: number,
+    target: ?number,
+    timestamp: number,
+  |}>,
+>;
+
 export type PressEvent = ResponderSyntheticEvent<
   $ReadOnly<{|
     changedTouches: $ReadOnlyArray<$PropertyType<PressEvent, 'nativeEvent'>>,

package/Libraries/Utilities/Appearance.js

@@ -91,12 +91,4 @@ module.exports = {
   addChangeListener(listener: AppearanceListener): EventSubscription {
     return eventEmitter.addListener('change', listener);
   },
-
-  /**
-   * @deprecated Use `remove` on the EventSubscription from `addEventListener`.
-   */
-  removeChangeListener(listener: AppearanceListener): void {
-    // NOTE: This will report a deprecation notice via `console.error`.
-    eventEmitter.removeListener('change', listener);
-  },
 };

package/Libraries/Utilities/HMRClient.js

@@ -292,7 +292,7 @@ function registerBundleEntryPoints(client) {
 
 function flushEarlyLogs(client) {
   try {
-    pendingLogs.forEach(([level: LogLevel, data: Array<mixed>]) => {
+    pendingLogs.forEach(([level, data]) => {
       HMRClient.log(level, data);
     });
   } finally {

package/Libraries/Utilities/ReactNativeTestTools.js

@@ -17,6 +17,7 @@ const ShallowRenderer = require('react-shallow-renderer');
 /* $FlowFixMe[not-a-function] (>=0.125.1 site=react_native_fb) This comment
  * suppresses an error found when Flow v0.125.1 was deployed. To see the error,
  * delete this comment and run Flow. */
+// $FlowFixMe[invalid-constructor]
 const shallowRenderer = new ShallowRenderer();
 
 import type {ReactTestRenderer as ReactTestRendererType} from 'react-test-renderer';

package/Libraries/Utilities/codegenNativeComponent.js

@@ -24,21 +24,36 @@ type Options = $ReadOnly<{|
 
 export type NativeComponentType<T> = HostComponent<T>;
 
+// If this function runs then that means the view configs were not
+// generated at build time using `GenerateViewConfigJs.js`. Thus
+// we need to `requireNativeComponent` to get the view configs from view managers.
+// `requireNativeComponent` is not available in Bridgeless mode.
+// e.g. This function runs at runtime if `codegenNativeComponent` was not called
+// from a file suffixed with NativeComponent.js.
 function codegenNativeComponent<Props>(
   componentName: string,
   options?: Options,
 ): NativeComponentType<Props> {
+  const errorMessage =
+    "Native Component '" +
+    componentName +
+    "' that calls codegenNativeComponent was not code generated at build time. Please check its definition.";
+  if (global.RN$Bridgeless === true) {
+    console.error(errorMessage);
+  } else {
+    console.warn(errorMessage);
+  }
   let componentNameInUse =
     options && options.paperComponentName != null
       ? options.paperComponentName
       : componentName;
 
   if (options != null && options.paperComponentNameDeprecated != null) {
-    if (UIManager.getViewManagerConfig(componentName)) {
+    if (UIManager.hasViewManagerConfig(componentName)) {
       componentNameInUse = componentName;
     } else if (
       options.paperComponentNameDeprecated != null &&
-      UIManager.getViewManagerConfig(options.paperComponentNameDeprecated)
+      UIManager.hasViewManagerConfig(options.paperComponentNameDeprecated)
     ) {
       componentNameInUse = options.paperComponentNameDeprecated;
     } else {
@@ -50,10 +65,6 @@ function codegenNativeComponent<Props>(
     }
   }
 
-  // If this function is run at runtime then that means the view configs were not
-  // generated with the view config babel plugin, so we need to require the native component.
-  //
-  // This will be useful during migration, but eventually this will error.
   return (requireNativeComponent<Props>(
     componentNameInUse,
   ): HostComponent<Props>);

package/Libraries/Utilities/stringifySafe.js

@@ -43,7 +43,10 @@ export function createStringifySafeWithLimits(limits: {|
       return value;
     }
 
-    let retval = value;
+    let retval:
+      | string
+      | {+[string]: mixed}
+      | $TEMPORARY$object<{'...(truncated keys)...': number}> = value;
     if (Array.isArray(value)) {
       if (stack.length >= maxDepth) {
         retval = `[ ... array with ${value.length} values ... ]`;

package/Libraries/Utilities/useColorScheme.js

@@ -8,24 +8,18 @@
  * @flow strict-local
  */
 
-import {useMemo} from 'react';
-import {useSubscription} from 'use-subscription';
+'use strict';
+
+import {useSyncExternalStore} from 'use-sync-external-store/shim';
 import Appearance from './Appearance';
 import type {ColorSchemeName} from './NativeAppearance';
 
 export default function useColorScheme(): ?ColorSchemeName {
-  const subscription = useMemo(
-    () => ({
-      getCurrentValue: () => Appearance.getColorScheme(),
-      subscribe: callback => {
-        const appearanceSubscription = Appearance.addChangeListener(callback);
-        return () => {
-          appearanceSubscription.remove();
-        };
-      },
-    }),
-    [],
+  return useSyncExternalStore(
+    callback => {
+      const appearanceSubscription = Appearance.addChangeListener(callback);
+      return () => appearanceSubscription.remove();
+    },
+    () => Appearance.getColorScheme(),
   );
-
-  return useSubscription(subscription);
 }

package/Libraries/Utilities/verifyComponentAttributeEquivalence.js

@@ -8,7 +8,7 @@
  * @flow
  */
 
-import ReactNativeViewViewConfig from '../Components/View/ReactNativeViewViewConfig';
+import PlatformBaseViewConfig from '../NativeComponent/PlatformBaseViewConfig';
 import {type ViewConfig} from '../Renderer/shims/ReactNativeTypes';
 
 const IGNORED_KEYS = ['transform', 'hitSlop'];
@@ -62,7 +62,7 @@ export default function verifyComponentAttributeEquivalence(
 
 // Return the different key-value pairs of the right object, by iterating through the keys in the left object
 // Note it won't return a difference where a key is missing in the left but exists the right.
-export function lefthandObjectDiff(leftObj: Object, rightObj: Object): Object {
+function lefthandObjectDiff(leftObj: Object, rightObj: Object): Object {
   const differentKeys = {};
 
   function compare(leftItem: any, rightItem: any, key: string) {
@@ -109,7 +109,7 @@ export function getConfigWithoutViewProps(
   }
 
   return Object.keys(viewConfig[propName])
-    .filter(prop => !ReactNativeViewViewConfig[propName][prop])
+    .filter(prop => !PlatformBaseViewConfig[propName][prop])
     .reduce((obj, prop) => {
       obj[prop] = viewConfig[propName][prop];
       return obj;

package/Libraries/Vibration/React-RCTVibration.podspec

@@ -27,7 +27,7 @@ Pod::Spec.new do |s|
   s.documentation_url      = "https://reactnative.dev/docs/vibration"
   s.license                = package["license"]
   s.author                 = "Facebook, Inc. and its affiliates"
-  s.platforms              = { :ios => "11.0" }
+  s.platforms              = { :ios => "12.4" }
   s.compiler_flags         = folly_compiler_flags + ' -Wno-nullability-completeness'
   s.source                 = source
   s.source_files           = "*.{m,mm}"
@@ -35,7 +35,7 @@ Pod::Spec.new do |s|
   s.header_dir             = "RCTVibration"
   s.pod_target_xcconfig    = {
                                "USE_HEADERMAP" => "YES",
-                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++14",
+                               "CLANG_CXX_LANGUAGE_STANDARD" => "c++17",
                                "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-Codegen/react/renderer/components\" \"${PODS_CONFIGURATION_BUILD_DIR}/React-Codegen/React_Codegen.framework/Headers\""
                              }
   s.frameworks             = "AudioToolbox"

package/Libraries/WebSocket/WebSocket.js

@@ -230,7 +230,7 @@ class WebSocket extends (EventTarget(...WEBSOCKET_EVENTS): any) {
         if (ev.id !== this._socketId) {
           return;
         }
-        let data = ev.data;
+        let data: Blob | BlobData | ArrayBuffer | string = ev.data;
         switch (ev.type) {
           case 'binary':
             data = base64.toByteArray(ev.data).buffer;

package/Libraries/vendor/emitter/_EmitterSubscription.js

@@ -13,7 +13,7 @@
 import type EventEmitter from './EventEmitter';
 import _EventSubscription from './_EventSubscription';
 import type EventSubscriptionVendor from './_EventSubscriptionVendor';
-import {type EventSubscription} from './EventSubscription';
+import type {EventSubscription} from './EventSubscription';
 
 /**
  * EmitterSubscription represents a subscription with listener and context data.

package/Libraries/vendor/emitter/_EventEmitter.js

@@ -12,7 +12,7 @@
 const invariant = require('invariant');
 
 import EmitterSubscription from './_EmitterSubscription';
-import {type EventSubscription} from './EventSubscription';
+import type {EventSubscription} from './EventSubscription';
 import EventSubscriptionVendor from './_EventSubscriptionVendor';
 
 const sparseFilterPredicate = () => true;

package/Libraries/vendor/emitter/_EventSubscription.js

@@ -10,7 +10,7 @@
 
 'use strict';
 
-import {type EventSubscription} from './EventSubscription';
+import type {EventSubscription} from './EventSubscription';
 import type EventSubscriptionVendor from './_EventSubscriptionVendor';
 
 /**

package/React/Base/RCTAssert.h

@@ -74,6 +74,11 @@ RCT_EXTERN NSString *const RCTObjCStackTraceKey;
  */
 RCT_EXTERN NSString *const RCTFatalExceptionName;
 
+/**
+ * Stringified JSON object containing extra data to attach to the error from JavaScript.
+ */
+RCT_EXTERN NSString *const RCTJSExtraDataKey;
+
 /**
  * A block signature to be used for custom assertion handling.
  */
@@ -170,20 +175,36 @@ RCT_EXTERN NSString *RCTFormatStackTrace(NSArray<NSDictionary<NSString *, id> *>
 
 #endif
 
-/**
- * Controls for ensuring the new architecture runtime assumption holds.
- * Note: this is work in progress.
- */
-
-// Enable reporting of any violation related to the new React Native architecture.
-// If RCT_NEW_ARCHITECTURE is defined, it is already enabled by default, otherwise, no violation will be
-// reported until enabled.
-// Note: enabling this at runtime is not early enough to report issues within ObjC class +load execution.
-__attribute__((used)) RCT_EXTERN void RCTEnableNewArchitectureViolationReporting(BOOL enabled);
+// MARK: - New Architecture Validation
 
-// When reporting is enabled, trigger an assertion.
-__attribute__((used)) RCT_EXTERN void RCTEnforceNotAllowedForNewArchitecture(id context, NSString *extra);
+typedef enum {
+  RCTNotAllowedValidationDisabled = 0,
+  RCTNotAllowedInAppWideFabric = 1,
+  RCTNotAllowedInBridgeless = 2,
+} RCTNotAllowedValidation;
 
-// When reporting is enabled, warn about the violation. Use this to prepare a specific callsite
-// for stricter enforcement. When ready, switch it to use the variant above.
-__attribute__((used)) RCT_EXTERN void RCTWarnNotAllowedForNewArchitecture(id context, NSString *extra);
+/**
+ * Ensure runtime assumptions holds for the new architecture by reporting when assumptions are violated.
+ * Note: this is work in progress.
+ *
+ * When type is RCTNotAllowedInAppWideFabric, validate Fabric assumptions in Bridge or Bridgeless mode.
+ * i.e. Report legacy pre-Fabric call sites that should not be used while Fabric is enabled on all surfaces.
+ *
+ * When type is RCTNotAllowedInBridgeless, validate Bridgeless assumptions, in Bridgeless mode only.
+ * i.e. Report Bridge call sites that should not be used while Bridgeless mode is enabled.
+ *
+ * Note: enabling this at runtime is not early enough to report issues within ObjC class +load execution.
+ */
+__attribute__((used)) RCT_EXTERN void RCTNewArchitectureValidationSetEnabled(RCTNotAllowedValidation type);
+
+// When new architecture validation reporting is enabled, trigger an assertion and crash.
+__attribute__((used)) RCT_EXTERN void
+RCTEnforceNewArchitectureValidation(RCTNotAllowedValidation type, id context, NSString *extra);
+// When new architecture validation reporting is enabled, trigger an error but do not crash.
+// When ready, switch to stricter variant above.
+__attribute__((used)) RCT_EXTERN void
+RCTErrorNewArchitectureValidation(RCTNotAllowedValidation type, id context, NSString *extra);
+// When new architecture validation reporting is enabled, log an message.
+// When ready, switch to stricter variant above.
+__attribute__((used)) RCT_EXTERN void
+RCTLogNewArchitectureValidation(RCTNotAllowedValidation type, id context, NSString *extra);

package/React/Base/RCTAssert.m

@@ -14,6 +14,7 @@ NSString *const RCTJSRawStackTraceKey = @"RCTJSRawStackTraceKey";
 NSString *const RCTObjCStackTraceKey = @"RCTObjCStackTraceKey";
 NSString *const RCTFatalExceptionName = @"RCTFatalException";
 NSString *const RCTUntruncatedMessageKey = @"RCTUntruncatedMessageKey";
+NSString *const RCTJSExtraDataKey = @"RCTJSExtraDataKey";
 
 static NSString *const RCTAssertFunctionStack = @"RCTAssertFunctionStack";
 
@@ -231,54 +232,99 @@ RCTFatalExceptionHandler RCTGetFatalExceptionHandler(void)
   return RCTCurrentFatalExceptionHandler;
 }
 
-// -------------------------
-// New architecture section
-// -------------------------
+// MARK: - New Architecture Validation - Enable Reporting
 
 #if RCT_NEW_ARCHITECTURE
-static BOOL newArchitectureViolationReporting = YES;
+static RCTNotAllowedValidation validationReportingEnabled = RCTNotAllowedInBridgeless;
 #else
-static BOOL newArchitectureViolationReporting = NO;
+static RCTNotAllowedValidation validationReportingEnabled = RCTNotAllowedValidationDisabled;
 #endif
 
-void RCTEnableNewArchitectureViolationReporting(BOOL enabled)
+__attribute__((used)) RCT_EXTERN void RCTNewArchitectureValidationSetEnabled(RCTNotAllowedValidation type)
 {
 #if RCT_NEW_ARCHITECTURE
   // Cannot disable the reporting in this mode.
 #else
-  newArchitectureViolationReporting = enabled;
+  validationReportingEnabled = type;
 #endif
 }
 
-static NSString *getNewArchitectureViolationMessage(id context, NSString *extra)
+// MARK: - New Architecture Validation - Private
+
+static BOOL shouldEnforceValidation(RCTNotAllowedValidation type)
+{
+  switch (type) {
+    case RCTNotAllowedInAppWideFabric:
+      return validationReportingEnabled == RCTNotAllowedInBridgeless ||
+          validationReportingEnabled == RCTNotAllowedInAppWideFabric;
+    case RCTNotAllowedInBridgeless:
+      return validationReportingEnabled == RCTNotAllowedInBridgeless;
+    case RCTNotAllowedValidationDisabled:
+      return NO;
+  }
+  return NO;
+}
+
+static NSString *stringDescribingContext(id context)
 {
-  NSString *tag = @"uncategorized";
   if ([context isKindOfClass:NSString.class]) {
-    tag = context;
+    return context;
   } else if (context) {
     Class klass = [context class];
     if (klass) {
-      tag = NSStringFromClass(klass);
+      return NSStringFromClass(klass);
     }
   }
-  NSString *errorMessage = extra ?: @"Unexpectedly reached this code path.";
-  return [NSString stringWithFormat:@"[ReactNative Architecture][%@] %@", tag, errorMessage];
+  return @"uncategorized";
+}
+
+static NSString *validationMessage(RCTNotAllowedValidation type, id context, NSString *extra)
+{
+  NSString *notAllowedType;
+  switch (type) {
+    case RCTNotAllowedValidationDisabled:
+      RCTAssert(0, @"RCTNotAllowedValidationDisabled not a validation type.");
+      break;
+    case RCTNotAllowedInAppWideFabric:
+      notAllowedType = @"Fabric";
+      break;
+    case RCTNotAllowedInBridgeless:
+      notAllowedType = @"Bridgeless";
+      break;
+  }
+
+  return
+      [NSString stringWithFormat:@"[ReactNative Architecture][NotAllowedIn%@] Unexpectedly reached code path in %@. %@",
+                                 notAllowedType,
+                                 stringDescribingContext(context),
+                                 extra ?: @""];
+}
+
+// MARK: - New Architecture Validation - Public
+
+void RCTEnforceNewArchitectureValidation(RCTNotAllowedValidation type, id context, NSString *extra)
+{
+  if (!shouldEnforceValidation(type)) {
+    return;
+  }
+
+  RCTAssert(0, @"%@", validationMessage(type, context, extra));
 }
 
-void RCTEnforceNotAllowedForNewArchitecture(id context, NSString *extra)
+void RCTErrorNewArchitectureValidation(RCTNotAllowedValidation type, id context, NSString *extra)
 {
-  if (!newArchitectureViolationReporting) {
+  if (!shouldEnforceValidation(type)) {
     return;
   }
 
-  RCTAssert(0, @"%@", getNewArchitectureViolationMessage(context, extra));
+  RCTLogError(@"%@", validationMessage(type, context, extra));
 }
 
-void RCTWarnNotAllowedForNewArchitecture(id context, NSString *extra)
+void RCTLogNewArchitectureValidation(RCTNotAllowedValidation type, id context, NSString *extra)
 {
-  if (!newArchitectureViolationReporting) {
+  if (!shouldEnforceValidation(type)) {
     return;
   }
 
-  RCTLogWarn(@"%@", getNewArchitectureViolationMessage(context, extra));
+  RCTLogInfo(@"%@", validationMessage(type, context, extra));
 }