react-native-tvos 0.74.0-0rc3 → 0.74.2-0

package/types/public/ReactNativeTVTypes.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import type { View, ScrollViewProps, HostComponent, TVParallaxProperties } from 'react-native';
+import type { View, ScrollViewProps, HostComponent, TVParallaxProperties, EventSubscription } from 'react-native';
 
 declare module 'react-native' {
   interface ViewProps {
@@ -54,18 +54,14 @@ declare module 'react-native' {
       state: 'Began' | 'Changed' | 'Ended',
       x: number,
       y: number,
-      velocityx: number,
-      velocityy: number
+      velocityX: number,
+      velocityY: number
     } | undefined
   };
 
-  export class TVEventHandler {
-    enable<T extends React.Component<unknown>>(
-      component?: T,
-      callback?: (component: T, data: HWEvent) => void
-    ): void;
-    disable(): void;
-  }
+  export const TVEventHandler:  {
+    addListener: (listener: (event: HWEvent) => void) => EventSubscription | undefined
+  };
 
   export interface FocusGuideProps extends ViewProps {
      /**

package/Libraries/React-Native

@@ -1,214 +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.
- *
- * @flow strict-local
- * @format
- * @oncall react_native
- */
-
-import type {
-  ReactDevToolsAgent,
-  ReactDevToolsGlobalHook,
-} from '../Types/ReactDevToolsTypes';
-import type {Props} from './AppContainer';
-
-import ReactNativeStyleAttributes from '../Components/View/ReactNativeStyleAttributes';
-import View from '../Components/View/View';
-import Platform from '../Utilities/Platform';
-// import DebuggingOverlay from '../Debugging/DebuggingOverlay';
-// import useSubscribeToDebuggingOverlayRegistry from '../Debugging/useSubscribeToDebuggingOverlayRegistry';
-import RCTDeviceEventEmitter from '../EventEmitter/RCTDeviceEventEmitter';
-import LogBoxNotificationContainer from '../LogBox/LogBoxNotificationContainer';
-import StyleSheet from '../StyleSheet/StyleSheet';
-import {RootTagContext, createRootTag} from './RootTag';
-import * as React from 'react';
-
-const {useEffect, useState, useCallback} = React;
-
-const reactDevToolsHook: ReactDevToolsGlobalHook =
-  window.__REACT_DEVTOOLS_GLOBAL_HOOK__;
-
-// Required for React DevTools to view / edit React Native styles in Flipper.
-// Flipper doesn't inject these values when initializing DevTools.
-if (reactDevToolsHook) {
-  reactDevToolsHook.resolveRNStyle = require('../StyleSheet/flattenStyle');
-  reactDevToolsHook.nativeStyleEditorValidAttributes = Object.keys(
-    ReactNativeStyleAttributes,
-  );
-}
-
-type InspectorDeferredProps = {
-  inspectedViewRef: InspectedViewRef,
-  onInspectedViewRerenderRequest: () => void,
-  reactDevToolsAgent?: ReactDevToolsAgent,
-};
-
-const InspectorDeferred = ({
-  inspectedViewRef,
-  onInspectedViewRerenderRequest,
-  reactDevToolsAgent,
-}: InspectorDeferredProps) => {
-  // D39382967 adds a require cycle: InitializeCore -> AppContainer -> Inspector -> InspectorPanel -> ScrollView -> InitializeCore
-  // We can't remove it yet, fallback to dynamic require for now. This is the only reason why this logic is in a separate function.
-  const Inspector = require('../Inspector/Inspector');
-
-  return (
-    <Inspector
-      inspectedViewRef={inspectedViewRef}
-      onRequestRerenderApp={onInspectedViewRerenderRequest}
-      reactDevToolsAgent={reactDevToolsAgent}
-    />
-  );
-};
-
-type ReactDevToolsOverlayDeferredProps = {
-  inspectedViewRef: InspectedViewRef,
-  reactDevToolsAgent: ReactDevToolsAgent,
-};
-
-const ReactDevToolsOverlayDeferred = ({
-  inspectedViewRef,
-  reactDevToolsAgent,
-}: ReactDevToolsOverlayDeferredProps) => {
-  const ReactDevToolsOverlay =
-    require('../Inspector/ReactDevToolsOverlay').default;
-
-  return (
-    <ReactDevToolsOverlay
-      inspectedViewRef={inspectedViewRef}
-      reactDevToolsAgent={reactDevToolsAgent}
-    />
-  );
-};
-
-const AppContainer = ({
-  children,
-  fabric,
-  initialProps,
-  internal_excludeInspector = false,
-  internal_excludeLogBox = false,
-  rootTag,
-  showArchitectureIndicator,
-  WrapperComponent,
-}: Props): React.Node => {
-  const appContainerRootViewRef: AppContainerRootViewRef = React.useRef(null);
-  const innerViewRef: InspectedViewRef = React.useRef(null);
-  const debuggingOverlayRef: DebuggingOverlayRef = React.useRef(null);
-
-/*
-  useSubscribeToDebuggingOverlayRegistry(
-    appContainerRootViewRef,
-    debuggingOverlayRef,
-  );
- */
-
-  const [key, setKey] = useState(0);
-  const [shouldRenderInspector, setShouldRenderInspector] = useState(false);
-  const [reactDevToolsAgent, setReactDevToolsAgent] =
-    useState<ReactDevToolsAgent | void>(reactDevToolsHook?.reactDevtoolsAgent);
-
-  useEffect(() => {
-    let inspectorSubscription = null;
-    if (!internal_excludeInspector) {
-      inspectorSubscription = RCTDeviceEventEmitter.addListener(
-        'toggleElementInspector',
-        () => setShouldRenderInspector(value => !value),
-      );
-    }
-
-    let reactDevToolsAgentListener = null;
-    // If this is first render, subscribe to the event from React DevTools hook
-    if (reactDevToolsHook != null && reactDevToolsAgent == null) {
-      reactDevToolsAgentListener = setReactDevToolsAgent;
-      reactDevToolsHook.on?.('react-devtools', reactDevToolsAgentListener);
-    }
-
-    return () => {
-      inspectorSubscription?.remove();
-
-      if (
-        reactDevToolsHook?.off != null &&
-        reactDevToolsAgentListener != null
-      ) {
-        reactDevToolsHook.off('react-devtools', reactDevToolsAgentListener);
-      }
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  let innerView: React.Node = (
-    <View
-      collapsable={reactDevToolsAgent == null && !shouldRenderInspector}
-      pointerEvents="box-none"
-      key={key}
-      style={styles.container}
-      ref={innerViewRef}>
-      {children}
-    </View>
-  );
-
-  if (WrapperComponent != null) {
-    innerView = (
-      <WrapperComponent
-        initialProps={initialProps}
-        fabric={fabric === true}
-        showArchitectureIndicator={showArchitectureIndicator === true}>
-        {innerView}
-      </WrapperComponent>
-    );
-  }
-
-  const onInspectedViewRerenderRequest = useCallback(
-    () => setKey(k => k + 1),
-    [],
-  );
-
-  return (
-    <RootTagContext.Provider value={createRootTag(rootTag)}>
-      <View
-        ref={appContainerRootViewRef}
-        style={styles.container}
-        pointerEvents="box-none">
-        {innerView}
-
-        {/* <DebuggingOverlay ref={debuggingOverlayRef} /> */}
-
-        {reactDevToolsAgent != null && (
-          <ReactDevToolsOverlayDeferred
-            inspectedViewRef={innerViewRef}
-            reactDevToolsAgent={reactDevToolsAgent}
-          />
-        )}
-
-        {shouldRenderInspector && (
-          <InspectorDeferred
-            inspectedViewRef={innerViewRef}
-            onInspectedViewRerenderRequest={onInspectedViewRerenderRequest}
-            reactDevToolsAgent={reactDevToolsAgent}
-          />
-        )}
-
-        {!internal_excludeLogBox && <LogBoxNotificationContainer />}
-      </View>
-    </RootTagContext.Provider>
-  );
-};
-
-const styles = StyleSheet.create({
-  container: {flex: 1},
-});
-
-export type AppContainerRootViewRef = React.RefObject<React.ElementRef<
-  typeof View,
-> | null>;
-export type InspectedViewRef = React.RefObject<React.ElementRef<
-  typeof View,
-> | null>;
-export type DebuggingOverlayRef = React.RefObject<React.ElementRef<
-  typeof DebuggingOverlay,
-> | null>;
-
-export default AppContainer;

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. */
-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);
-  }
-}