react-native-tvos 0.68.2-1 → 0.68.2-4

package/android/com/facebook/react/react-native/maven-metadata.xml

@@ -3,11 +3,11 @@
   <groupId>com.facebook.react</groupId>
   <artifactId>react-native</artifactId>
   <versioning>
-    <latest>0.68.2-1</latest>
-    <release>0.68.2-1</release>
+    <latest>0.68.2-4</latest>
+    <release>0.68.2-4</release>
     <versions>
-      <version>0.68.2-1</version>
+      <version>0.68.2-4</version>
     </versions>
-    <lastUpdated>20220601233843</lastUpdated>
+    <lastUpdated>20220804185319</lastUpdated>
   </versioning>
 </metadata>

package/android/com/facebook/react/react-native/maven-metadata.xml.md5

@@ -1 +1 @@
-f1e6eac9f689f69334dcef5716223ae3
+abb0f353e7edd3f10d7ecc130596228c

package/android/com/facebook/react/react-native/maven-metadata.xml.sha1

@@ -1 +1 @@
-09947555b34be8d51ab0e004d9cb30cd637c3693
+0680027a6faa91ebe38e67e4bc57a7b8aae659f9

package/android/com/facebook/react/react-native/maven-metadata.xml.sha256

@@ -1 +1 @@
-59b1d38f1f7862fb32a50d32ab21d9d8afdbb3c0de2abee6643322e5849c1526
+48408ffd7ec27f2852d15be0f721c38a182cdf1fac576196ef20996824af5e30

package/android/com/facebook/react/react-native/maven-metadata.xml.sha512

@@ -1 +1 @@
-1af6405e8c27e3b7971074dda12a55a07a0395128f6d57e65d8101a6eb859ba460113fea9c00a86e43ed0a8904b0b18f062742971d995d42b6a09ca41b21f233
+556dd4ba67b2e436c2e07e67bdbfc6087554ca42998f2582c21f18eb6c579fe77a78a07b6bb41e4467ab40894974d76ec8d3c210b38830ccf2b8fff4a3b9b43f

package/index.js

@@ -81,14 +81,14 @@ import typeof Systrace from './Libraries/Performance/Systrace';
 import typeof ToastAndroid from './Libraries/Components/ToastAndroid/ToastAndroid';
 import typeof * as TurboModuleRegistry from './Libraries/TurboModule/TurboModuleRegistry';
 import typeof TabBarIOS from './Libraries/Components/TabBarIOS/TabBarIOS';
-import typeof TVEventHandler from './Libraries/Components/AppleTV/TVEventHandler';
-import typeof TVFocusGuideView from './Libraries/Components/AppleTV/TVFocusGuideView';
-import typeof TVEventControl from './Libraries/Components/AppleTV/TVEventControl';
-import typeof TVTextScrollView from './Libraries/Components/AppleTV/TVTextScrollView';
+import typeof TVEventHandler from './Libraries/Components/TV/TVEventHandler';
+import typeof TVFocusGuideView from './Libraries/Components/TV/TVFocusGuideView';
+import typeof TVEventControl from './Libraries/Components/TV/TVEventControl';
+import typeof TVTextScrollView from './Libraries/Components/TV/TVTextScrollView';
 import typeof UIManager from './Libraries/ReactNative/UIManager';
 import typeof useColorScheme from './Libraries/Utilities/useColorScheme';
 import typeof useWindowDimensions from './Libraries/Utilities/useWindowDimensions';
-import typeof useTVEventHandler from './Libraries/Components/AppleTV/useTVEventHandler';
+import typeof useTVEventHandler from './Libraries/Components/TV/useTVEventHandler';
 import typeof UTFSequence from './Libraries/UTFSequence';
 import typeof Vibration from './Libraries/Vibration/Vibration';
 import typeof YellowBox from './Libraries/YellowBox/YellowBoxDeprecated';
@@ -404,23 +404,23 @@ module.exports = {
     return require('./Libraries/TurboModule/TurboModuleRegistry');
   },
   get TVEventControl(): TVEventControl {
-    return require('./Libraries/Components/AppleTV/TVEventControl');
+    return require('./Libraries/Components/TV/TVEventControl');
   },
   get TVEventHandler(): TVEventHandler {
-    return require('./Libraries/Components/AppleTV/TVEventHandler');
+    return require('./Libraries/Components/TV/TVEventHandler');
   },
   get TVFocusGuideView(): TVFocusGuideView {
-    return require('./Libraries/Components/AppleTV/TVFocusGuideView');
+    return require('./Libraries/Components/TV/TVFocusGuideView');
   },
   get TVMenuControl(): TVMenuControl {
     warnOnce(
       'TVMenuControl-moved',
       'TVMenuControl has been moved to TVEventControl, and now supports enabling/disabling both menu key events and pan gesture events.'
     );
-    return require('./Libraries/Components/AppleTV/TVEventControl');
+    return require('./Libraries/Components/TV/TVEventControl');
   },
   get TVTextScrollView(): TVTextScrollView {
-    return require('./Libraries/Components/AppleTV/TVTextScrollView');
+    return require('./Libraries/Components/TV/TVTextScrollView');
   },
   get UIManager(): UIManager {
     return require('./Libraries/ReactNative/UIManager');
@@ -439,7 +439,7 @@ module.exports = {
     return require('./Libraries/Utilities/useWindowDimensions').default;
   },
   get useTVEventHandler(): useTVEventHandler {
-    return require('./Libraries/Components/AppleTV/useTVEventHandler');
+    return require('./Libraries/Components/TV/useTVEventHandler');
   },
   get UTFSequence(): UTFSequence {
     return require('./Libraries/UTFSequence');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.68.2-1",
+  "version": "0.68.2-4",
   "bin": "./cli.js",
   "description": "A framework for building native apps using React",
   "license": "MIT",

package/scripts/react_native_pods.rb

@@ -198,7 +198,8 @@ def exclude_architectures(installer)
     .push(installer.pods_project)
 
   # Hermes does not support `i386` architecture
-  excluded_archs_default = has_pod(installer, 'hermes-engine') ? "i386" : ""
+  # Also exclude this arch when building on M1 machines
+  excluded_archs_default = (running_on_m1(installer) || has_pod(installer, 'hermes-engine')) ? "i386" : ""
 
   projects.each do |project|
     project.build_configurations.each do |config|
@@ -209,6 +210,10 @@ def exclude_architectures(installer)
   end
 end
 
+def running_on_m1(installer)
+  return `/usr/sbin/sysctl -n hw.optional.arm64 2>&1`.to_i == 1
+end
+
 def fix_library_search_paths(installer)
   def fix_config(config)
     lib_search_paths = config.build_settings["LIBRARY_SEARCH_PATHS"]

package/template/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "react": "17.0.2",
-    "react-native": "npm:react-native-tvos@0.68.2-1"
+    "react-native": "npm:react-native-tvos@0.68.2-4"
   },
   "devDependencies": {
     "@babel/core": "^7.12.9",

package/tvos-types.d.ts

@@ -66,6 +66,10 @@ declare module 'react-native' {
      * Array of `Component`s to register as destinations with `UIFocusGuide`
      */
     destinations?: (null | number | React.Component<any, any> | React.ComponentClass<any>)[];
+    /**
+     * How the TVFocusGuideView content safe padding should be applied. "null" to disable it.
+     */
+    safePadding?: 'both' | 'vertical' | 'horizontal' | null;
   }
 
   /**

package/Libraries/Components/AppleTV/TVFocusGuideView.js

@@ -1,79 +0,0 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- *
- * @flow
- * @format
- */
-
-const React = require('react');
-const ReactNative = require('react-native');
-import ReactNativeShims from '../../Renderer/shims/ReactNative';
-const Platform = require('../../Utilities/Platform');
-import {Commands} from '../../Components/View/ViewNativeComponent';
-import type {ViewProps} from '../View/ViewPropTypes';
-
-type FocusGuideProps = $ReadOnly<{
-  ...ViewProps,
-
-  /**
-   * The views the focus should go to
-   */
-  destinations: ?(Object[]),
-}>;
-
-const TVFocusGuideView = (props: FocusGuideProps) => {
-  const focusGuideRef = React.useRef(null);
-
-  React.useEffect(() => {
-    const nativeDestinations = (props.destinations || [])
-                                 .map(d => ReactNative.findNodeHandle(d))
-                                 .filter(c => c !== 0 && c !== null && c !== undefined);
-    const hostComponentRef = ReactNativeShims.findHostInstance_DEPRECATED(focusGuideRef?.current);
-    hostComponentRef && Commands.setDestinations(hostComponentRef, nativeDestinations);
-  }, [props.destinations]);
-
-  return (
-    // Container view must have nonzero size
-    <ReactNative.View style={[{minHeight: 1, minWidth: 1}, props.style]}>
-      {
-          /**
-           * The client specified layout(using 'style' prop) should be applied the container view ReactNative.View.
-           * And the focusGuide's layout shoule be overrided to wrap it fully inside the container view.
-           * For example, if the client specifies 'marginLeft' property in the style prop, 
-           * then the TVFocusGuideView will apply the 'marginLeft' for both the parentView and the focusGuideView.
-           * and so, the left margin is getting added twice and UI becomes incorrect. 
-           * The same is applicable for other layout properties.
-           */
-      }
-      {Platform.isTVOS ? (
-        <ReactNative.View
-          style={[props.style, styles.focusGuideLayout]}
-          ref={focusGuideRef}
-        >
-          {props.children}
-        </ReactNative.View>
-      ) : (
-          props.children
-      )}
-    </ReactNative.View>
-  );
-
-};
-
-const styles = ReactNative.StyleSheet.create({
-  focusGuideLayout: {
-    left: 0,
-    top: 0,
-    right: 0,
-    bottom: 0,
-    marginLeft: 0,
-    marginTop: 0,
-    marginRight: 0,
-    marginBottom: 0,
-  },
-});
-
-module.exports = TVFocusGuideView;

package/android/com/facebook/react/react-native/0.68.2-1/react-native-0.68.2-1-sources.jar.md5

@@ -1 +0,0 @@
-57099b9ecfedec8304818338a299101f

package/android/com/facebook/react/react-native/0.68.2-1/react-native-0.68.2-1-sources.jar.sha1

@@ -1 +0,0 @@
-44bed2c3038c58e469b5695694cc95bfbd2bc1d2

package/android/com/facebook/react/react-native/0.68.2-1/react-native-0.68.2-1-sources.jar.sha256

@@ -1 +0,0 @@
-c7b7c55711ec7ae31c6a61537240d7031c6c699887de4f4d1524604a4998a190

package/android/com/facebook/react/react-native/0.68.2-1/react-native-0.68.2-1-sources.jar.sha512

@@ -1 +0,0 @@
-2501d5e45fd65fe3f12357122b6da57767924f409f9c16412dc2847c0515e0f57448334f1b1ec0e8f543da2ddf14f14ea83434f8013c5d1bf4eeb3783636bdfa

package/android/com/facebook/react/react-native/0.68.2-1/react-native-0.68.2-1.aar.md5

@@ -1 +0,0 @@
-dff581d81a597312cf1c16730d137bb9

package/android/com/facebook/react/react-native/0.68.2-1/react-native-0.68.2-1.aar.sha1

@@ -1 +0,0 @@
-3f08f6b86adb963e3efe72786f2c8660535261d4

package/android/com/facebook/react/react-native/0.68.2-1/react-native-0.68.2-1.aar.sha256

@@ -1 +0,0 @@
-7d3a36321a4d7b5516578d5befa3025a2b27ae06c4fc25cc1327d065ea94e124

package/android/com/facebook/react/react-native/0.68.2-1/react-native-0.68.2-1.aar.sha512

@@ -1 +0,0 @@
-0a010823f5151ec11a66955ba2de7d3d18962d3a5b787d7c2ac43e7d12b700d49ea67feb141d63b6cbcd63a9c64bd6793fed44a67b47fdce02014a849b9affa0

package/android/com/facebook/react/react-native/0.68.2-1/react-native-0.68.2-1.module.md5

@@ -1 +0,0 @@
-ef391ddace9f87b2da253b7fe7e9b552

package/android/com/facebook/react/react-native/0.68.2-1/react-native-0.68.2-1.module.sha1

@@ -1 +0,0 @@
-8e5e83fef141437f481eff06625d14650f7ecbb8

package/android/com/facebook/react/react-native/0.68.2-1/react-native-0.68.2-1.module.sha256

@@ -1 +0,0 @@
-e6adfecbde7989c3a9b26bd7e11517edfe88a74f03e509e1cfbb7b2b3de07d4d

package/android/com/facebook/react/react-native/0.68.2-1/react-native-0.68.2-1.module.sha512

@@ -1 +0,0 @@
-8ae314898288cb0e030e425d736b7c82a0378f0b0fb14ba2e9ab709422bdf106bef8c393a93480a213770db4cf5a6a8c66399420b47c13f4b3a1c912d0888097

package/android/com/facebook/react/react-native/0.68.2-1/react-native-0.68.2-1.pom.md5

@@ -1 +0,0 @@
-8d15219474f383cd992bac74a1a917db

package/android/com/facebook/react/react-native/0.68.2-1/react-native-0.68.2-1.pom.sha1

@@ -1 +0,0 @@
-9e026422df7dcc3f49bbcc38c69c651b901bd767

package/android/com/facebook/react/react-native/0.68.2-1/react-native-0.68.2-1.pom.sha256

@@ -1 +0,0 @@
-26ca38f377b476f3318b67a9cc61be26dba20c6aa2ff03ea05b997908b3e3a73

package/android/com/facebook/react/react-native/0.68.2-1/react-native-0.68.2-1.pom.sha512

@@ -1 +0,0 @@
-b7e36f75e20de3d3e9ec6728d2d102790ca3bab9f45e4e8614f4c675408bf5eb770e7dc27b886ce04928eb17f54c1e33815b1875a7abbc227281dc59f0df0604