react-native-tvos 0.71.7-0rc0 → 0.71.8-0rc0

package/Libraries/Components/Touchable/TVTouchable.js

@@ -29,13 +29,18 @@ type TVTouchableConfig = $ReadOnly<{|
 |}>;
 
 export default class TVTouchable {
-  _tvEventHandler: TVEventHandler;
+  _tvEventHandler: TVEventHandler = null;
+  _enabled: boolean = false;
 
   constructor(component: any, config: TVTouchableConfig) {
     invariant(Platform.isTV, 'TVTouchable: Requires `Platform.isTV`.');
     this._tvEventHandler = new TVEventHandler();
+    const _tvtouchable = this;
     this._tvEventHandler.enable(component, (_, tvData) => {
       tvData.dispatchConfig = {};
+      if (!_tvtouchable._enabled) {
+        return;
+      }
       if (ReactNative.findNodeHandle(component) === tvData.tag) {
         if (tvData.eventType === 'focus') {
           config.onFocus(tvData);
@@ -52,9 +57,12 @@ export default class TVTouchable {
         }
       }
     });
+    this._enabled = true;
   }
 
   destroy(): void {
+    this._enabled = false;
     this._tvEventHandler.disable();
+    this._tvEventHandler = null;
   }
 }

package/Libraries/Components/Touchable/Touchable.js

@@ -13,6 +13,7 @@ import type {ColorValue} from '../../StyleSheet/StyleSheet';
 import type {PressEvent} from '../../Types/CoreEventTypes';
 import type {TouchableType} from './Touchable.flow';
 
+import ReactNative from '../../Renderer/shims/ReactNative';
 import {PressabilityDebugView} from '../../Pressability/PressabilityDebug';
 import UIManager from '../../ReactNative/UIManager';
 import Platform from '../../Utilities/Platform';

package/Libraries/Core/ReactNativeVersion.js

@@ -12,6 +12,6 @@
 exports.version = {
   major: 0,
   minor: 71,
-  patch: 7,
+  patch: 8,
   prerelease: '0rc0',
 };

package/Libraries/Text/TextInput/RCTBackedTextInputDelegateAdapter.m

@@ -256,21 +256,21 @@ static void *TextFieldSelectionObservingContext = &TextFieldSelectionObservingCo
 
 - (void)textViewDidChange:(__unused UITextView *)textView
 {
-  if (_ignoreNextTextInputCall && [_lastStringStateWasUpdatedWith isEqual:_backedTextInputView.attributedText]) {
+  if (_ignoreNextTextInputCall) {
     _ignoreNextTextInputCall = NO;
     return;
   }
-  _lastStringStateWasUpdatedWith = _backedTextInputView.attributedText;
   _textDidChangeIsComing = NO;
   [_backedTextInputView.textInputDelegate textInputDidChange];
 }
 
 - (void)textViewDidChangeSelection:(__unused UITextView *)textView
 {
-  if (![_lastStringStateWasUpdatedWith isEqual:_backedTextInputView.attributedText]) {
+  if (_lastStringStateWasUpdatedWith && ![_lastStringStateWasUpdatedWith isEqual:_backedTextInputView.attributedText]) {
     [self textViewDidChange:_backedTextInputView];
     _ignoreNextTextInputCall = YES;
   }
+  _lastStringStateWasUpdatedWith = _backedTextInputView.attributedText;
   [self textViewProbablyDidChangeSelection];
 }
 

package/Libraries/Utilities/Platform.ios.js

@@ -58,6 +58,11 @@ const Platform = {
     return this.constants.interfaceIdiom === 'tv';
   },
   // $FlowFixMe[unsafe-getters-setters]
+  get isTVOS(): boolean {
+    // $FlowFixMe[object-this-reference]
+    return this.constants.interfaceIdiom === 'tv';
+  },
+  // $FlowFixMe[unsafe-getters-setters]
   get isTesting(): boolean {
     if (__DEV__) {
       // $FlowFixMe[object-this-reference]

package/React/Base/RCTVersion.m

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

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.71.7-0rc0
+VERSION_NAME=0.71.8-0rc0
 
 # 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", 71,
-      "patch", 7,
+      "patch", 8,
       "prerelease", "0rc0");
 }

package/ReactCommon/cxxreact/ReactNativeVersion.h

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.71.7-0rc0",
+  "version": "0.71.8-0rc0",
   "bin": "./cli.js",
   "description": "A framework for building native apps using React",
   "license": "MIT",
@@ -73,6 +73,7 @@
     "!template/package-lock.json",
     "!template/yarn.lock",
     "third-party-podspecs",
+    "tvos-types.d.ts",
     "types"
   ],
   "scripts": {
@@ -140,7 +141,7 @@
     "pretty-format": "^26.5.2",
     "promise": "^8.3.0",
     "react-devtools-core": "^4.26.1",
-    "react-native-gradle-plugin": "^0.71.17",
+    "react-native-gradle-plugin": "^0.71.18",
     "react-refresh": "^0.4.0",
     "react-shallow-renderer": "^16.15.0",
     "regenerator-runtime": "^0.13.2",
@@ -195,7 +196,7 @@
     "mkdirp": "^0.5.1",
     "mock-fs": "^5.1.4",
     "prettier": "^2.4.1",
-    "react-native-core": "npm:react-native@0.71.7",
+    "react-native-core": "npm:react-native@0.71.8",
     "shelljs": "^0.8.5",
     "signedsource": "^1.0.0",
     "typescript": "4.1.3",

package/template/android/app/build.gradle

@@ -156,7 +156,7 @@ dependencies {
     // in gradle.properties for now
     // We also use the io.github.react-native-tvos group for the react-android and hermes-android dependencies
 
-    implementation("io.github.react-native-tvos:react-android:${REACT_NATIVE_TV_VERSION_STRING}")
+    implementation("io.github.react-native-tvos:react-android")
 
     implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.0.0")
 
@@ -167,7 +167,7 @@ dependencies {
 
     debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
     if (hermesEnabled.toBoolean()) {
-        implementation("io.github.react-native-tvos:hermes-android:${REACT_NATIVE_TV_VERSION_STRING}")
+        implementation("io.github.react-native-tvos:hermes-android")
     } else {
         implementation jscFlavor
     }

package/template/android/gradle.properties

@@ -42,7 +42,3 @@ newArchEnabled=false
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.
 hermesEnabled=true
-
-# react-native-gradle-plugin does not yet set the version automatically
-# for the TV repo, so we set the version here
-REACT_NATIVE_TV_VERSION_STRING=0.71.7-0rc0

package/template/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "react": "18.2.0",
-    "react-native": "npm:react-native-tvos@0.71.7-0rc0"
+    "react-native": "npm:react-native-tvos@0.71.8-0rc0"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

package/tvos-types.d.ts

@@ -0,0 +1,6 @@
+/**
+ * Beginning in 0.71, it is no longer necessary to import this file
+ * in React Native TV apps using Typescript.
+ *
+ * TV types are now found in `./types/public/ReactNativeTVTypes.d.ts`
+ */

package/types/index.d.ts

@@ -157,6 +157,8 @@ export * from './public/Insets';
 export * from './public/ReactNativeRenderer';
 export * from './public/ReactNativeTypes';
 
+export * from './public/ReactNativeTVTypes';
+
 import type {ErrorUtils} from '../Libraries/vendor/core/ErrorUtils';
 
 declare global {

package/types/public/ReactNativeTVTypes.d.ts

@@ -0,0 +1,192 @@
+import React from 'react';
+import { ViewProps, ScrollViewProps } from 'react-native';
+
+declare module 'react-native' {
+  interface ViewProps {
+  /**
+   * TV next focus down (see documentation for the View component).
+   */
+  nextFocusDown?: number,
+
+  /**
+   * TV next focus forward (see documentation for the View component).
+   * 
+   * @platform android
+   */
+  nextFocusForward?: number,
+
+  /**
+   * TV next focus left (see documentation for the View component).
+   */
+  nextFocusLeft?: number,
+
+  /**
+   * TV next focus right (see documentation for the View component).
+   */
+  nextFocusRight?: number,
+
+  /**
+   * TV next focus up (see documentation for the View component).
+   */
+  nextFocusUp?: number,
+  }
+
+  interface View {
+    requestTVFocus(): void;
+  }
+
+  export const useTVEventHandler: (handleEvent: (event: HWEvent) => void) => void;
+
+  export const TVEventControl: {
+    enableTVMenuKey(): void;
+    disableTVMenuKey(): void;
+    enableTVPanGesture(): void;
+    disableTVPanGesture(): void;
+    enableGestureHandlersCancelTouches(): void;
+    disableGestureHandlersCancelTouches(): void;
+  };
+
+  export type HWEvent = {
+    eventType: 'up' | 'down' | 'right' | 'left' | 'longUp' | 'longDown' | 'longRight' | 'longLeft' | 'blur' | 'focus' | 'pan' | string;
+    eventKeyAction?: -1 | 1 | 0 | number;
+    tag?: number;
+    body?: {
+      state: "Began" | "Changed" | "Ended",
+      x: number,
+      y: number,
+      velocityx: number,
+      velocityy: number
+    } 
+  };
+
+  export class TVEventHandler {
+    enable<T extends React.Component<unknown>>(
+      component?: T,
+      callback?: (component: T, data: HWEvent) => void
+    ): void;
+    disable(): void;
+  }
+
+  export interface FocusGuideProps extends ViewProps {
+     /**
+     * If the view should be "visible". display "flex" if visible, otherwise "none".
+     * Defaults to true
+     */
+    enabled?: boolean;
+    /**
+     * Array of `Component`s to register as destinations with `UIFocusGuide`
+     */
+    destinations?: (null | number | React.Component<any, any> | React.ComponentClass<any>)[];
+    /**
+     * If true, `TVFocusGuide` will automatically manage focus for you.
+     * It will redirect the focus to the first focusable child on the first visit.
+     * It also remembers the last focused child and redirects the focus
+     * to it on the subsequent visits.
+     * 
+     * `destinations` prop takes precedence over this prop when used together.
+     *
+     * @default false
+     */
+    autoFocus?: boolean;
+    /**
+     * Enables focus trapping for the focus guide (see README).
+     */
+    trapFocusUp?: boolean;
+    /**
+     * Enables focus trapping for the focus guide (see README).
+     */
+    trapFocusDown?: boolean;
+    /**
+     * Enables focus trapping for the focus guide (see README).
+     */
+    trapFocusLeft?: boolean;
+    /**
+     * Enables focus trapping for the focus guide (see README).
+     */
+    trapFocusRight?: boolean;
+    /**
+     * @deprecated Don't use it, no longer necessary.
+     */
+    safePadding?: 'both' | 'vertical' | 'horizontal' | null;
+  }
+
+  export type FocusGuideMethods = {
+    setDestinations: (
+      destinations: (React.ElementRef<HostComponent<unknown>> | null | undefined)[],
+    ) => void;
+  }
+
+  /**
+   * This component provides support for Apple's `UIFocusGuide` API,
+   * to help ensure that focusable controls can be navigated to,
+   * even if they are not directly in line with other controls on both tvOS and Android.
+   * An example is provided in `RNTester` that shows different ways of using this component.
+   * https://github.com/react-native-tvos/react-native-tvos/blob/tvos-v0.69.8/packages/rn-tester/js/examples/TVFocusGuide/TVFocusGuideAutoFocusExample.js
+   */
+  export const TVFocusGuideView: React.ForwardRefExoticComponent<FocusGuideProps & React.RefAttributes<View & FocusGuideMethods>>;
+  export interface TVTextScrollViewProps extends ScrollViewProps {
+    /**
+     * The duration of the scroll animation when a swipe is detected.
+     * Default value is 0.3 s
+     */
+    scrollDuration?: number;
+    /**
+     * Scrolling distance when a swipe is detected
+     * Default value is half the visible height (vertical scroller)
+     * or width (horizontal scroller)
+     */
+    pageSize?: number;
+    /**
+     * If true, will scroll to start when focus moves out past the beginning
+     * of the scroller
+     * Defaults to true
+     */
+    snapToStart?: boolean;
+    /**
+     * If true, will scroll to end when focus moves out past the end of the
+     * scroller
+     * Defaults to true
+     */
+    snapToEnd?: boolean;
+    /**
+     * Called when the scroller comes into focus (e.g. for highlighting)
+     */
+    onFocus?(evt: HWEvent): void;
+    /**
+     * Called when the scroller goes out of focus
+     */
+    onBlur?(evt: HWEvent): void;
+  }
+
+  export class TVTextScrollView extends React.Component<TVTextScrollViewProps> {}
+  
+  export interface PressableStateCallbackType {
+    readonly focused: boolean;
+  }
+
+  export interface TouchableWithoutFeedbackPropsIOS {
+    /**
+     * *(Apple TV only)* TV preferred focus (see documentation for the View component).
+     *
+     * @platform ios
+     */
+    hasTVPreferredFocus?: boolean;
+
+    /**
+     * *(Apple TV only)* Object with properties to control Apple TV parallax effects.
+     *
+     * enabled: If true, parallax effects are enabled.  Defaults to true.
+     * shiftDistanceX: Defaults to 2.0.
+     * shiftDistanceY: Defaults to 2.0.
+     * tiltAngle: Defaults to 0.05.
+     * magnification: Defaults to 1.0.
+     * pressMagnification: Defaults to 1.0.
+     * pressDuration: Defaults to 0.3.
+     * pressDelay: Defaults to 0.0.
+     *
+     * @platform ios
+     */
+    tvParallaxProperties?: TVParallaxProperties;
+  }
+
+}