react-native-tvos 0.72.5-0 → 0.72.6-0

package/Libraries/Core/ReactNativeVersion.js

@@ -12,6 +12,6 @@
 exports.version = {
   major: 0,
   minor: 72,
-  patch: 5,
+  patch: 6,
   prerelease: '0',
 };

package/Libraries/vendor/emitter/EventEmitter.js

@@ -109,7 +109,9 @@ export default class EventEmitter<TEventToArgsMap: {...}>
       Registration<$ElementType<TEventToArgsMap, TEvent>>,
     > = this._registry[eventType];
     if (registrations != null) {
-      for (const registration of [...registrations]) {
+      // Copy `registrations` to take a snapshot when we invoke `emit`, in case
+      // registrations are added or removed when listeners are invoked.
+      for (const registration of Array.from(registrations)) {
         registration.listener.apply(registration.context, args);
       }
     }

package/React/Base/RCTVersion.m

@@ -23,7 +23,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
     __rnVersion = @{
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(72),
-                  RCTVersionPatch: @(5),
+                  RCTVersionPatch: @(6),
                   RCTVersionPrerelease: @"0",
                   };
   });

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.72.5-0
+VERSION_NAME=0.72.6-0
 
 # GROUP=com.facebook.react
 # Group for the TV repo

package/ReactAndroid/src/main/java/com/facebook/react/modules/systeminfo/ReactNativeVersion.java

@@ -17,6 +17,6 @@ public class ReactNativeVersion {
   public static final Map<String, Object> VERSION = MapBuilder.<String, Object>of(
       "major", 0,
       "minor", 72,
-      "patch", 5,
+      "patch", 6,
       "prerelease", "0");
 }

package/ReactAndroid/src/main/java/com/facebook/react/shell/MainReactPackage.java

@@ -25,6 +25,7 @@ import com.facebook.react.modules.blob.BlobModule;
 import com.facebook.react.modules.blob.FileReaderModule;
 import com.facebook.react.modules.camera.ImageStoreManager;
 import com.facebook.react.modules.clipboard.ClipboardModule;
+import com.facebook.react.modules.devloading.DevLoadingModule;
 import com.facebook.react.modules.devtoolssettings.DevToolsSettingsManagerModule;
 import com.facebook.react.modules.dialog.DialogModule;
 import com.facebook.react.modules.fresco.FrescoModule;
@@ -72,6 +73,7 @@ import javax.inject.Provider;
       AppearanceModule.class,
       AppStateModule.class,
       BlobModule.class,
+      DevLoadingModule.class,
       FileReaderModule.class,
       ClipboardModule.class,
       DialogModule.class,
@@ -113,6 +115,8 @@ public class MainReactPackage extends TurboReactPackage implements ViewManagerOn
         return new AppStateModule(context);
       case BlobModule.NAME:
         return new BlobModule(context);
+      case DevLoadingModule.NAME:
+        return new DevLoadingModule(context);
       case FileReaderModule.NAME:
         return new FileReaderModule(context);
       case ClipboardModule.NAME:
@@ -371,6 +375,7 @@ public class MainReactPackage extends TurboReactPackage implements ViewManagerOn
             AppearanceModule.class,
             AppStateModule.class,
             BlobModule.class,
+            DevLoadingModule.class,
             FileReaderModule.class,
             ClipboardModule.class,
             DialogModule.class,

package/ReactCommon/cxxreact/ReactNativeVersion.h

@@ -17,7 +17,7 @@ namespace facebook::react {
 constexpr struct {
   int32_t Major = 0;
   int32_t Minor = 72;
-  int32_t Patch = 5;
+  int32_t Patch = 6;
   std::string_view Prerelease = "0";
 } ReactNativeVersion;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.72.5-0",
+  "version": "0.72.6-0",
   "bin": "./cli.js",
   "description": "A framework for building native apps using React",
   "license": "MIT",
@@ -92,7 +92,7 @@
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "base64-js": "^1.1.2",
-    "deprecated-react-native-prop-types": "4.1.0",
+    "deprecated-react-native-prop-types": "^4.2.3",
     "event-target-shim": "^5.0.1",
     "flow-enums-runtime": "^0.0.5",
     "invariant": "^2.2.4",

package/scripts/cocoapods/utils.rb

@@ -141,7 +141,7 @@ class ReactNativePodsUtils
                 if self.is_using_xcode15_or_greter(:xcodebuild_manager => xcodebuild_manager)
                     self.add_value_to_setting_if_missing(config, other_ld_flags_key, xcode15_compatibility_flags)
                 else
-                    self.remove_value_to_setting_if_present(config, other_ld_flags_key, xcode15_compatibility_flags)
+                    self.remove_value_from_setting_if_present(config, other_ld_flags_key, xcode15_compatibility_flags)
                 end
             end
             project.save()
@@ -300,20 +300,26 @@ class ReactNativePodsUtils
 
     def self.add_value_to_setting_if_missing(config, setting_name, value)
         old_config = config.build_settings[setting_name]
-        if !old_config.include?(value)
-            config.build_settings[setting_name] << value
+        if old_config.is_a?(Array)
+            old_config = old_config.join(" ")
+        end
+
+        trimmed_value = value.strip()
+        if !old_config.include?(trimmed_value)
+            config.build_settings[setting_name] = "#{old_config.strip()} #{trimmed_value}".strip()
         end
     end
 
-    def self.remove_value_to_setting_if_present(config, setting_name, value)
+    def self.remove_value_from_setting_if_present(config, setting_name, value)
         old_config = config.build_settings[setting_name]
-        if old_config.include?(value)
-            # Old config can be either an Array or a String
-            if old_config.is_a?(Array)
-                old_config = old_config.join(" ")
-            end
-            new_config = old_config.gsub(value,  "")
-            config.build_settings[setting_name] = new_config
+        if old_config.is_a?(Array)
+            old_config = old_config.join(" ")
+        end
+
+        trimmed_value = value.strip()
+        if old_config.include?(trimmed_value)
+            new_config = old_config.gsub(trimmed_value,  "")
+            config.build_settings[setting_name] = new_config.strip()
         end
     end
 

package/template/Gemfile

@@ -3,4 +3,5 @@ source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
 
-gem 'cocoapods', '~> 1.12'
+gem 'cocoapods', '~> 1.13'
+gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'

package/template/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "expo": "^49.0.7",
     "react": "18.2.0",
-    "react-native": "npm:react-native-tvos@0.72.5-0"
+    "react-native": "npm:react-native-tvos@0.72.6-0"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

package/React/Fabric/RCTThirdPartyFabricComponentsProvider.h

@@ -1,29 +0,0 @@
-
-/*
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * @generated by GenerateRCTThirdPartyFabricComponentsProviderH
- */
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wreturn-type-c-linkage"
-
-#import <React/RCTComponentViewProtocol.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-Class<RCTComponentViewProtocol> RCTThirdPartyFabricComponentsProvider(const char *name);
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#pragma GCC diagnostic pop
-

package/React/Fabric/RCTThirdPartyFabricComponentsProvider.mm

@@ -1,29 +0,0 @@
-
-/**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * @generated by GenerateRCTThirdPartyFabricComponentsProviderCpp
- */
-
-// OSS-compatibility layer
-
-#import "RCTThirdPartyFabricComponentsProvider.h"
-
-#import <string>
-#import <unordered_map>
-
-Class<RCTComponentViewProtocol> RCTThirdPartyFabricComponentsProvider(const char *name) {
-  static std::unordered_map<std::string, Class (*)(void)> sFabricComponentsClassMap = {
-
-  };
-
-  auto p = sFabricComponentsClassMap.find(name);
-  if (p != sFabricComponentsClassMap.end()) {
-    auto classFunc = p->second;
-    return classFunc();
-  }
-  return nil;
-}

package/ReactAndroid/src/main/java/com/facebook/react/ReactAndroidHWInputDeviceHelper.java

@@ -1,98 +0,0 @@
-/*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.react;
-
-import android.view.KeyEvent;
-import android.view.View;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
-import com.facebook.react.common.MapBuilder;
-import java.util.Map;
-
-/** Responsible for dispatching events specific for hardware inputs. */
-public class ReactAndroidHWInputDeviceHelper {
-
-  /**
-   * Contains a mapping between handled KeyEvents and the corresponding navigation event that should
-   * be fired when the KeyEvent is received.
-   */
-  private static final Map<Integer, String> KEY_EVENTS_ACTIONS =
-      MapBuilder.<Integer, String>builder()
-          .put(KeyEvent.KEYCODE_DPAD_CENTER, "select")
-          .put(KeyEvent.KEYCODE_ENTER, "select")
-          .put(KeyEvent.KEYCODE_SPACE, "select")
-          .put(KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE, "playPause")
-          .put(KeyEvent.KEYCODE_MEDIA_REWIND, "rewind")
-          .put(KeyEvent.KEYCODE_MEDIA_FAST_FORWARD, "fastForward")
-          .put(KeyEvent.KEYCODE_MEDIA_STOP, "stop")
-          .put(KeyEvent.KEYCODE_MEDIA_NEXT, "next")
-          .put(KeyEvent.KEYCODE_MEDIA_PREVIOUS, "previous")
-          .put(KeyEvent.KEYCODE_DPAD_UP, "up")
-          .put(KeyEvent.KEYCODE_DPAD_RIGHT, "right")
-          .put(KeyEvent.KEYCODE_DPAD_DOWN, "down")
-          .put(KeyEvent.KEYCODE_DPAD_LEFT, "left")
-          .put(KeyEvent.KEYCODE_INFO, "info")
-          .put(KeyEvent.KEYCODE_MENU, "menu")
-          .build();
-
-  /**
-   * We keep a reference to the last focused view id so that we can send it as a target for key
-   * events and be able to send a blur event when focus changes.
-   */
-  private int mLastFocusedViewId = View.NO_ID;
-
-  private final ReactRootView mReactRootView;
-
-  ReactAndroidHWInputDeviceHelper(ReactRootView mReactRootView) {
-    this.mReactRootView = mReactRootView;
-  }
-
-  /** Called from {@link ReactRootView}. This is the main place the key events are handled. */
-  public void handleKeyEvent(KeyEvent ev) {
-    int eventKeyCode = ev.getKeyCode();
-    int eventKeyAction = ev.getAction();
-    if ((eventKeyAction == KeyEvent.ACTION_UP || eventKeyAction == KeyEvent.ACTION_DOWN)
-        && KEY_EVENTS_ACTIONS.containsKey(eventKeyCode)) {
-      dispatchEvent(KEY_EVENTS_ACTIONS.get(eventKeyCode), mLastFocusedViewId, eventKeyAction);
-    }
-  }
-
-  /** Called from {@link ReactRootView} when focused view changes. */
-  public void onFocusChanged(View newFocusedView) {
-    if (mLastFocusedViewId == newFocusedView.getId()) {
-      return;
-    }
-    if (mLastFocusedViewId != View.NO_ID) {
-      dispatchEvent("blur", mLastFocusedViewId);
-    }
-    mLastFocusedViewId = newFocusedView.getId();
-    dispatchEvent("focus", newFocusedView.getId());
-  }
-
-  /** Called from {@link ReactRootView} when the whole view hierarchy looses focus. */
-  public void clearFocus() {
-    if (mLastFocusedViewId != View.NO_ID) {
-      dispatchEvent("blur", mLastFocusedViewId);
-    }
-    mLastFocusedViewId = View.NO_ID;
-  }
-
-  private void dispatchEvent(String eventType, int targetViewId) {
-    dispatchEvent(eventType, targetViewId, -1);
-  }
-
-  private void dispatchEvent(String eventType, int targetViewId, int eventKeyAction) {
-    WritableMap event = new WritableNativeMap();
-    event.putString("eventType", eventType);
-    event.putInt("eventKeyAction", eventKeyAction);
-    if (targetViewId != View.NO_ID) {
-      event.putInt("tag", targetViewId);
-    }
-    mReactRootView.sendEvent("onHWKeyEvent", event);
-  }
-}

package/ReactCommon/react/renderer/components/rncore/ComponentDescriptors.h

@@ -1,29 +0,0 @@
-
-/**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * @generated by codegen project: GenerateComponentDescriptorH.js
- */
-
-#pragma once
-
-#include <react/renderer/components/rncore/ShadowNodes.h>
-#include <react/renderer/core/ConcreteComponentDescriptor.h>
-
-namespace facebook {
-namespace react {
-
-using AndroidHorizontalScrollContentViewComponentDescriptor = ConcreteComponentDescriptor<AndroidHorizontalScrollContentViewShadowNode>;
-using AndroidSwipeRefreshLayoutComponentDescriptor = ConcreteComponentDescriptor<AndroidSwipeRefreshLayoutShadowNode>;
-using PullToRefreshViewComponentDescriptor = ConcreteComponentDescriptor<PullToRefreshViewShadowNode>;
-using AndroidDrawerLayoutComponentDescriptor = ConcreteComponentDescriptor<AndroidDrawerLayoutShadowNode>;
-using ActivityIndicatorViewComponentDescriptor = ConcreteComponentDescriptor<ActivityIndicatorViewShadowNode>;
-using UnimplementedNativeViewComponentDescriptor = ConcreteComponentDescriptor<UnimplementedNativeViewShadowNode>;
-using SwitchComponentDescriptor = ConcreteComponentDescriptor<SwitchShadowNode>;
-using TraceUpdateOverlayComponentDescriptor = ConcreteComponentDescriptor<TraceUpdateOverlayShadowNode>;
-
-} // namespace react
-} // namespace facebook

package/ReactCommon/react/renderer/components/rncore/EventEmitters.cpp

@@ -1,111 +0,0 @@
-
-/**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * @generated by codegen project: GenerateEventEmitterCpp.js
- */
-
-#include <react/renderer/components/rncore/EventEmitters.h>
-
-namespace facebook {
-namespace react {
-
-
-
-
-void AndroidSwipeRefreshLayoutEventEmitter::onRefresh(OnRefresh event) const {
-  dispatchEvent("refresh", [](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    
-    return payload;
-  });
-}
-void PullToRefreshViewEventEmitter::onRefresh(OnRefresh event) const {
-  dispatchEvent("refresh", [](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    
-    return payload;
-  });
-}
-
-void AndroidDrawerLayoutEventEmitter::onDrawerSlide(OnDrawerSlide event) const {
-  dispatchEvent("drawerSlide", [event=std::move(event)](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    payload.setProperty(runtime, "offset", event.offset);
-    return payload;
-  });
-}
-void AndroidDrawerLayoutEventEmitter::onDrawerStateChanged(OnDrawerStateChanged event) const {
-  dispatchEvent("drawerStateChanged", [event=std::move(event)](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    payload.setProperty(runtime, "drawerState", event.drawerState);
-    return payload;
-  });
-}
-void AndroidDrawerLayoutEventEmitter::onDrawerOpen(OnDrawerOpen event) const {
-  dispatchEvent("drawerOpen", [](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    
-    return payload;
-  });
-}
-void AndroidDrawerLayoutEventEmitter::onDrawerClose(OnDrawerClose event) const {
-  dispatchEvent("drawerClose", [](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    
-    return payload;
-  });
-}
-
-
-void SwitchEventEmitter::onChange(OnChange event) const {
-  dispatchEvent("change", [event=std::move(event)](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    payload.setProperty(runtime, "value", event.value);
-payload.setProperty(runtime, "target", event.target);
-    return payload;
-  });
-}
-void AndroidSwitchEventEmitter::onChange(OnChange event) const {
-  dispatchEvent("change", [event=std::move(event)](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    payload.setProperty(runtime, "value", event.value);
-payload.setProperty(runtime, "target", event.target);
-    return payload;
-  });
-}
-
-void ModalHostViewEventEmitter::onRequestClose(OnRequestClose event) const {
-  dispatchEvent("requestClose", [](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    
-    return payload;
-  });
-}
-void ModalHostViewEventEmitter::onShow(OnShow event) const {
-  dispatchEvent("show", [](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    
-    return payload;
-  });
-}
-void ModalHostViewEventEmitter::onDismiss(OnDismiss event) const {
-  dispatchEvent("dismiss", [](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    
-    return payload;
-  });
-}
-void ModalHostViewEventEmitter::onOrientationChange(OnOrientationChange event) const {
-  dispatchEvent("orientationChange", [event=std::move(event)](jsi::Runtime &runtime) {
-    auto payload = jsi::Object(runtime);
-    payload.setProperty(runtime, "orientation", toString(event.orientation));
-    return payload;
-  });
-}
-
-} // namespace react
-} // namespace facebook

package/ReactCommon/react/renderer/components/rncore/EventEmitters.h

@@ -1,186 +0,0 @@
-
-/**
- * This code was generated by [react-native-codegen](https://www.npmjs.com/package/react-native-codegen).
- *
- * Do not edit this file as changes may cause incorrect behavior and will be lost
- * once the code is regenerated.
- *
- * @generated by codegen project: GenerateEventEmitterH.js
- */
-#pragma once
-
-#include <react/renderer/components/view/ViewEventEmitter.h>
-#include <jsi/jsi.h>
-
-namespace facebook {
-namespace react {
-
-class JSI_EXPORT SafeAreaViewEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  
-
-  
-};
-class JSI_EXPORT AndroidHorizontalScrollContentViewEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  
-
-  
-};
-class JSI_EXPORT AndroidProgressBarEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  
-
-  
-};
-class JSI_EXPORT AndroidSwipeRefreshLayoutEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  struct OnRefresh {
-      
-    };
-
-  void onRefresh(OnRefresh value) const;
-};
-class JSI_EXPORT PullToRefreshViewEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  struct OnRefresh {
-      
-    };
-
-  void onRefresh(OnRefresh value) const;
-};
-class JSI_EXPORT InputAccessoryEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  
-
-  
-};
-class JSI_EXPORT AndroidDrawerLayoutEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  struct OnDrawerSlide {
-      Float offset;
-    };
-
-  struct OnDrawerStateChanged {
-      int drawerState;
-    };
-
-  struct OnDrawerOpen {
-      
-    };
-
-  struct OnDrawerClose {
-      
-    };
-
-  void onDrawerSlide(OnDrawerSlide value) const;
-
-  void onDrawerStateChanged(OnDrawerStateChanged value) const;
-
-  void onDrawerOpen(OnDrawerOpen value) const;
-
-  void onDrawerClose(OnDrawerClose value) const;
-};
-class JSI_EXPORT ActivityIndicatorViewEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  
-
-  
-};
-class JSI_EXPORT UnimplementedNativeViewEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  
-
-  
-};
-class JSI_EXPORT SwitchEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  struct OnChange {
-      bool value;
-    int target;
-    };
-
-  void onChange(OnChange value) const;
-};
-class JSI_EXPORT AndroidSwitchEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  struct OnChange {
-      bool value;
-    int target;
-    };
-
-  void onChange(OnChange value) const;
-};
-class JSI_EXPORT TraceUpdateOverlayEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  
-
-  
-};
-class JSI_EXPORT ModalHostViewEventEmitter : public ViewEventEmitter {
- public:
-  using ViewEventEmitter::ViewEventEmitter;
-
-  struct OnRequestClose {
-      
-    };
-
-  struct OnShow {
-      
-    };
-
-  struct OnDismiss {
-      
-    };
-
-  enum class OnOrientationChangeOrientation {
-    Portrait,
-    Landscape
-  };
-
-  static char const *toString(const OnOrientationChangeOrientation value) {
-    switch (value) {
-      case OnOrientationChangeOrientation::Portrait: return "portrait";
-      case OnOrientationChangeOrientation::Landscape: return "landscape";
-    }
-  }
-
-  struct OnOrientationChange {
-      OnOrientationChangeOrientation orientation;
-    };
-
-  void onRequestClose(OnRequestClose value) const;
-
-  void onShow(OnShow value) const;
-
-  void onDismiss(OnDismiss value) const;
-
-  void onOrientationChange(OnOrientationChange value) const;
-};
-
-} // namespace react
-} // namespace facebook