react-native-tvos 0.76.1-0 → 0.76.2-0

package/ReactCommon/react/renderer/textlayoutmanager/platform/ios/react/renderer/textlayoutmanager/RCTAttributedTextUtils.mm

@@ -35,6 +35,24 @@ using namespace facebook::react;
   _weakEventEmitter.reset();
 }
 
+- (BOOL)isEqual:(id)object
+{
+  // We consider the underlying EventEmitter as the identity
+  if (![object isKindOfClass:[self class]]) {
+    return NO;
+  }
+
+  auto thisEventEmitter = [self eventEmitter];
+  auto otherEventEmitter = [((RCTWeakEventEmitterWrapper *)object) eventEmitter];
+  return thisEventEmitter == otherEventEmitter;
+}
+
+- (NSUInteger)hash
+{
+  // We consider the underlying EventEmitter as the identity
+  return (NSUInteger)_weakEventEmitter.lock().get();
+}
+
 @end
 
 inline static UIFontWeight RCTUIFontWeightFromInteger(NSInteger fontWeight)
@@ -182,7 +200,8 @@ inline static UIColor *RCTEffectiveBackgroundColorFromTextAttributes(const TextA
   return effectiveBackgroundColor ?: [UIColor clearColor];
 }
 
-NSDictionary<NSAttributedStringKey, id> *RCTNSTextAttributesFromTextAttributes(const TextAttributes &textAttributes)
+NSMutableDictionary<NSAttributedStringKey, id> *RCTNSTextAttributesFromTextAttributes(
+    const TextAttributes &textAttributes)
 {
   NSMutableDictionary<NSAttributedStringKey, id> *attributes = [NSMutableDictionary dictionaryWithCapacity:10];
 
@@ -306,7 +325,7 @@ NSDictionary<NSAttributedStringKey, id> *RCTNSTextAttributesFromTextAttributes(c
     attributes[RCTTextAttributesAccessibilityRoleAttributeName] = [NSString stringWithUTF8String:roleStr.c_str()];
   }
 
-  return [attributes copy];
+  return attributes;
 }
 
 void RCTApplyBaselineOffset(NSMutableAttributedString *attributedText)
@@ -470,3 +489,147 @@ NSString *RCTNSStringFromStringApplyingTextTransform(NSString *string, TextTrans
       return string;
   }
 }
+
+static BOOL RCTIsParagraphStyleEffectivelySame(
+    NSParagraphStyle *style1,
+    NSParagraphStyle *style2,
+    const TextAttributes &baseTextAttributes)
+{
+  if (style1 == nil || style2 == nil) {
+    return style1 == nil && style2 == nil;
+  }
+
+  // The NSParagraphStyle included as part of typingAttributes may eventually resolve "natural" directions to
+  // physical direction, so we should compare resolved directions
+  auto naturalAlignment =
+      baseTextAttributes.layoutDirection.value_or(LayoutDirection::LeftToRight) == LayoutDirection::LeftToRight
+      ? NSTextAlignmentLeft
+      : NSTextAlignmentRight;
+
+  NSWritingDirection naturalBaseWritingDirection = baseTextAttributes.baseWritingDirection.has_value()
+      ? RCTNSWritingDirectionFromWritingDirection(baseTextAttributes.baseWritingDirection.value())
+      : [NSParagraphStyle defaultWritingDirectionForLanguage:nil];
+
+  if (style1.alignment == NSTextAlignmentNatural || style1.baseWritingDirection == NSWritingDirectionNatural) {
+    NSMutableParagraphStyle *mutableStyle1 = [style1 mutableCopy];
+    style1 = mutableStyle1;
+
+    if (mutableStyle1.alignment == NSTextAlignmentNatural) {
+      mutableStyle1.alignment = naturalAlignment;
+    }
+
+    if (mutableStyle1.baseWritingDirection == NSWritingDirectionNatural) {
+      mutableStyle1.baseWritingDirection = naturalBaseWritingDirection;
+    }
+  }
+
+  if (style2.alignment == NSTextAlignmentNatural || style2.baseWritingDirection == NSWritingDirectionNatural) {
+    NSMutableParagraphStyle *mutableStyle2 = [style2 mutableCopy];
+    style2 = mutableStyle2;
+
+    if (mutableStyle2.alignment == NSTextAlignmentNatural) {
+      mutableStyle2.alignment = naturalAlignment;
+    }
+
+    if (mutableStyle2.baseWritingDirection == NSWritingDirectionNatural) {
+      mutableStyle2.baseWritingDirection = naturalBaseWritingDirection;
+    }
+  }
+
+  return [style1 isEqual:style2];
+}
+
+static BOOL RCTIsAttributeEffectivelySame(
+    NSAttributedStringKey attributeKey,
+    NSDictionary<NSAttributedStringKey, id> *attributes1,
+    NSDictionary<NSAttributedStringKey, id> *attributes2,
+    NSDictionary<NSAttributedStringKey, id> *insensitiveAttributes,
+    const TextAttributes &baseTextAttributes)
+{
+  id attribute1 = attributes1[attributeKey] ?: insensitiveAttributes[attributeKey];
+  id attribute2 = attributes2[attributeKey] ?: insensitiveAttributes[attributeKey];
+
+  // Normalize attributes which can inexact but still effectively the same
+  if ([attributeKey isEqualToString:NSParagraphStyleAttributeName]) {
+    return RCTIsParagraphStyleEffectivelySame(attribute1, attribute2, baseTextAttributes);
+  }
+
+  // Otherwise rely on built-in comparison
+  return [attribute1 isEqual:attribute2];
+}
+
+BOOL RCTIsAttributedStringEffectivelySame(
+    NSAttributedString *text1,
+    NSAttributedString *text2,
+    NSDictionary<NSAttributedStringKey, id> *insensitiveAttributes,
+    const TextAttributes &baseTextAttributes)
+{
+  if (![text1.string isEqualToString:text2.string]) {
+    return NO;
+  }
+
+  // We check that for every fragment in the old string
+  // 1. The new string's fragment overlapping the first spans the same characters
+  // 2. The attributes of each matching fragment are the same, ignoring those which match insensitive attibutes
+  __block BOOL areAttributesSame = YES;
+  [text1 enumerateAttributesInRange:NSMakeRange(0, text1.length)
+                            options:0
+                         usingBlock:^(
+                             NSDictionary<NSAttributedStringKey, id> *text1Attributes,
+                             NSRange text1Range,
+                             BOOL *text1Stop) {
+                           [text2 enumerateAttributesInRange:text1Range
+                                                     options:0
+                                                  usingBlock:^(
+                                                      NSDictionary<NSAttributedStringKey, id> *text2Attributes,
+                                                      NSRange text2Range,
+                                                      BOOL *text2Stop) {
+                                                    if (!NSEqualRanges(text1Range, text2Range)) {
+                                                      areAttributesSame = NO;
+                                                      *text1Stop = YES;
+                                                      *text2Stop = YES;
+                                                      return;
+                                                    }
+
+                                                    // Compare every attribute in text1 to the corresponding attribute
+                                                    // in text2, or the set of insensitive attributes if not present
+                                                    for (NSAttributedStringKey key in text1Attributes) {
+                                                      if (!RCTIsAttributeEffectivelySame(
+                                                              key,
+                                                              text1Attributes,
+                                                              text2Attributes,
+                                                              insensitiveAttributes,
+                                                              baseTextAttributes)) {
+                                                        areAttributesSame = NO;
+                                                        *text1Stop = YES;
+                                                        *text2Stop = YES;
+                                                        return;
+                                                      }
+                                                    }
+
+                                                    for (NSAttributedStringKey key in text2Attributes) {
+                                                      // We have already compared this attribute if it is present in
+                                                      // both
+                                                      if (text1Attributes[key] != nil) {
+                                                        continue;
+                                                      }
+
+                                                      // But we still need to compare attributes if it is only present
+                                                      // in text 2, to compare against insensitive attributes
+                                                      if (!RCTIsAttributeEffectivelySame(
+                                                              key,
+                                                              text1Attributes,
+                                                              text2Attributes,
+                                                              insensitiveAttributes,
+                                                              baseTextAttributes)) {
+                                                        areAttributesSame = NO;
+                                                        *text1Stop = YES;
+                                                        *text2Stop = YES;
+                                                        return;
+                                                      }
+                                                    }
+                                                  }];
+                         }];
+
+  return areAttributesSame;
+}

package/cli.js

@@ -204,7 +204,7 @@ async function main() {
 
     const proc = spawn(
       'npx',
-      ['@react-native-community/cli', ...process.argv.slice(2)],
+      ['@react-native-community/cli@latest', ...process.argv.slice(2)],
       {
         stdio: 'inherit',
       },

package/index.js

@@ -89,7 +89,6 @@ import typeof DevSettings from './Libraries/Utilities/DevSettings';
 import typeof Dimensions from './Libraries/Utilities/Dimensions';
 import typeof PixelRatio from './Libraries/Utilities/PixelRatio';
 import typeof Platform from './Libraries/Utilities/Platform';
-// import typeof TabBarIOS from './Libraries/Components/TabBarIOS/TabBarIOS';
 import typeof TVEventHandler from './Libraries/Components/TV/TVEventHandler';
 import typeof TVFocusGuideView from './Libraries/Components/TV/TVFocusGuideView';
 import typeof TVEventControl from './Libraries/Components/TV/TVEventControl';
@@ -176,9 +175,6 @@ module.exports = {
   get Switch(): Switch {
     return require('./Libraries/Components/Switch/Switch').default;
   },
-  get TabBarIOS(): any {
-    return require('./Libraries/Components/TabBarIOS/TabBarIOS');
-  },
   get Text(): Text {
     return require('./Libraries/Text/Text');
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-tvos",
-  "version": "0.76.1-0",
+  "version": "0.76.2-0",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -110,13 +110,13 @@
   },
   "dependencies": {
     "@jest/create-cache-key-function": "^29.6.3",
-    "@react-native/assets-registry": "0.76.1",
-    "@react-native/codegen": "0.76.1",
-    "@react-native/community-cli-plugin": "0.76.1",
-    "@react-native/gradle-plugin": "0.76.1",
-    "@react-native/js-polyfills": "0.76.1",
-    "@react-native/normalize-colors": "0.76.1",
-    "@react-native-tvos/virtualized-lists": "0.76.1-0",
+    "@react-native/assets-registry": "0.76.2",
+    "@react-native/codegen": "0.76.2",
+    "@react-native/community-cli-plugin": "0.76.2",
+    "@react-native/gradle-plugin": "0.76.2",
+    "@react-native/js-polyfills": "0.76.2",
+    "@react-native/normalize-colors": "0.76.2",
+    "@react-native-tvos/virtualized-lists": "0.76.2-0",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",

package/scripts/codegen/generate-artifacts-executor.js

@@ -493,7 +493,7 @@ function rootCodegenTargetNeedsThirdPartyComponentProvider(pkgJson, platform) {
 function dependencyNeedsThirdPartyComponentProvider(
   schemaInfo,
   platform,
-  appCondegenConfigSpec,
+  appCodegenConfigSpec,
 ) {
   // Filter the react native core library out.
   // In the future, core library and third party library should
@@ -504,7 +504,7 @@ function dependencyNeedsThirdPartyComponentProvider(
   // the symbols defined in the app.
   return (
     !isReactNativeCoreLibrary(schemaInfo.library.config.name, platform) &&
-    schemaInfo.library.config.name !== appCondegenConfigSpec
+    schemaInfo.library.config.name !== appCodegenConfigSpec
   );
 }
 
@@ -720,7 +720,7 @@ function execute(projectRoot, targetPlatform, baseOutputPath) {
           dependencyNeedsThirdPartyComponentProvider(
             schemaInfo,
             platform,
-            pkgJson.codegenConfig?.appCondegenConfigSpec,
+            pkgJson.codegenConfig?.name,
           ),
         );
         const schemas = filteredSchemas.map(schemaInfo => schemaInfo.schema);

package/sdks/.hermesversion

@@ -1 +1 @@
-hermes-2024-09-09-RNv0.76.0-db6d12e202e15f7a446d8848d6ca8f7abb3cfb32
+hermes-2024-11-12-RNv0.76.2-5b4aa20c719830dcf5684832b89a6edb95ac3d64

package/types/modules/Codegen.d.ts

@@ -41,6 +41,7 @@ declare module 'react-native/Libraries/Utilities/codegenNativeComponent' {
 
 declare module 'react-native/Libraries/Types/CodegenTypes' {
   import type {NativeSyntheticEvent} from 'react-native';
+  import type {EventSubscription} from 'react-native/Libraries/vendor/emitter/EventEmitter';
 
   // Event types
   // We're not using the PaperName, it is only used to codegen view config settings
@@ -59,6 +60,7 @@ declare module 'react-native/Libraries/Types/CodegenTypes' {
   export type Float = number;
   export type Int32 = number;
   export type UnsafeObject = object;
+  export type UnsafeMixed = unknown;
 
   type DefaultTypes = number | boolean | string | ReadonlyArray<string>;
   // Default handling, ignore the unused value
@@ -71,4 +73,8 @@ declare module 'react-native/Libraries/Types/CodegenTypes' {
     Type extends DefaultTypes,
     Value extends Type | string | undefined | null,
   > = Type | undefined | null;
+
+  export type EventEmitter<T> = (
+    handler: (arg: T) => void | Promise<void>,
+  ) => EventSubscription;
 }

package/types/public/ReactNativeTVTypes.d.ts

@@ -100,7 +100,7 @@ declare module 'react-native' {
     pressDuration?: number | undefined,
 
     /**
-     * Defaults to 0.3
+     * @deprecated No longer used
      */
     pressDelay?: number | undefined,
   };
@@ -166,7 +166,7 @@ declare module 'react-native' {
    * 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 {
+  export interface TVTextScrollViewProps extends Omit<ScrollViewProps, 'onFocus' | 'onBlur'> {
     /**
      * The duration of the scroll animation when a swipe is detected.
      * Default value is 0.3 s

package/Libraries/Components/TabBarIOS/RCTTabBarItemNativeComponent.js

@@ -1,99 +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.
- *
- * @format
- * @noflow
- */
-
-'use strict';
-
-const requireNativeComponent = require('../../ReactNative/requireNativeComponent').default;
-
-import type {ViewProps} from '../View/ViewPropTypes';
-import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
-import type {SyntheticEvent} from '../../Types/CoreEventTypes';
-import type {ImageSource} from '../../Image/ImageSource';
-
-type TabBarItemEvent = SyntheticEvent<null>;
-
-export type NativeProps = $ReadOnly< {|
-  ...ViewProps,
-
-  /**
-   * Little red bubble that sits at the top right of the icon.
-   */
-  badge?: ?(string | number),
-
-  /**
-   * Background color for the badge. Available since iOS 10.
-   */
-  badgeColor?: ColorValue,
-
-  /**
-   * Items comes with a few predefined system icons. Note that if you are
-   * using them, the title and selectedIcon will be overridden with the
-   * system ones.
-   */
-  systemIcon?: ?(
-    | 'bookmarks'
-    | 'contacts'
-    | 'downloads'
-    | 'favorites'
-    | 'featured'
-    | 'history'
-    | 'more'
-    | 'most-recent'
-    | 'most-viewed'
-    | 'recents'
-    | 'search'
-    | 'top-rated'
-  ),
-
-  /**
-   * A custom icon for the tab. It is ignored when a system icon is defined.
-   */
-  icon?: ?ImageSource,
-
-  /**
-   * A custom icon when the tab is selected. It is ignored when a system
-   * icon is defined. If left empty, the icon will be tinted in blue.
-   */
-  selectedIcon?: ?ImageSource,
-
-  /**
-   * Callback when this tab is being selected, you should change the state of your
-   * component to set selected={true}.
-   */
-  onPress?: ?(event: TabBarItemEvent) => mixed,
-
-  /**
-   * If set to true it renders the image as original,
-   * it defaults to being displayed as a template
-   */
-  renderAsOriginal?: ?boolean,
-
-  /**
-   * It specifies whether the children are visible or not. If you see a
-   * blank content, you probably forgot to add a selected one.
-   */
-  selected?: ?boolean,
-
-  /**
-   * Text that appears under the icon. It is ignored when a system icon
-   * is defined.
-   */
-  title?: ?string,
-
-  /**
-   * *(Apple TV only)* When set to true, this view will be focusable
-   * and navigable using the Apple TV remote.
-   *
-   * @platform ios
-   */
-  isTVSelectable?: ?boolean,
-|} >;
-
-module.exports = requireNativeComponent('RCTTabBarItem');

package/Libraries/Components/TabBarIOS/RCTTabBarNativeComponent.js

@@ -1,32 +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.
- *
- * @format
- * @noflow
- */
-
-'use strict';
-
-const requireNativeComponent =
-  require('../../ReactNative/requireNativeComponent').default;
-
-import type {ViewProps} from '../View/ViewPropTypes';
-import type {ColorValue} from '../../StyleSheet/StyleSheetTypes';
-
-type NativeProps = $ReadOnly<{|
-  ...ViewProps,
-  unselectedTintColor?: ColorValue,
-  tintColor?: ColorValue,
-  unselectedItemTintColor?: ColorValue,
-  barTintColor?: ColorValue,
-  barStyle?: ?('default' | 'black'),
-  translucent?: ?boolean,
-  itemPositioning?: ?('fill' | 'center' | 'auto'),
-|}>;
-
-// type RCTTabBarNativeType = Class<NativeComponent<NativeProps>>;
-
-module.exports = (requireNativeComponent<NativeProps>('RCTTabBar'): any);

package/Libraries/Components/TabBarIOS/TabBarIOS.ios.js

@@ -1,59 +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.
- *
- * @format
- * @noflow
- */
-
-'use strict';
-
-import type {TabBarIOSProps} from './TabBarIOSProps';
-
-const StyleSheet = require('../../StyleSheet/StyleSheet');
-const RCTTabBar = require('./RCTTabBarNativeComponent');
-const TabBarItemIOS = require('./TabBarItemIOS');
-const React = require('react');
-
-let showedDeprecationWarning = true;
-
-class TabBarIOS extends React.Component<TabBarIOSProps> {
-  static Item: React.Node = TabBarItemIOS;
-
-  componentDidMount() {
-    if (!showedDeprecationWarning) {
-      console.warn(
-        'TabBarIOS and TabBarItemIOS are deprecated and will be removed in a future release. ' +
-          'Please use react-native-tab-view instead.',
-      );
-
-      showedDeprecationWarning = true;
-    }
-  }
-
-  render(): React.Node {
-    return (
-      <RCTTabBar
-        style={[styles.tabGroup, this.props.style]}
-        unselectedTintColor={this.props.unselectedTintColor}
-        unselectedItemTintColor={this.props.unselectedItemTintColor}
-        tintColor={this.props.tintColor}
-        barTintColor={this.props.barTintColor}
-        barStyle={this.props.barStyle}
-        itemPositioning={this.props.itemPositioning}
-        translucent={this.props.translucent !== false}>
-        {this.props.children}
-      </RCTTabBar>
-    );
-  }
-}
-
-const styles = StyleSheet.create({
-  tabGroup: {
-    flex: 1,
-  },
-});
-
-module.exports = TabBarIOS;

package/Libraries/Components/TabBarIOS/TabBarIOS.js

@@ -1,52 +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.
- *
- * @format
- * @flow
- */
-
-'use strict';
-
-import type {TabBarIOSProps} from './TabBarIOSProps';
-
-import React from 'react';
-
-const StyleSheet = require('../../StyleSheet/StyleSheet');
-const View = require('../View/View');
-const TabBarItemIOS = require('./TabBarItemIOS');
-
-let showedDeprecationWarning = false;
-
-class TabBarIOS extends React.Component<TabBarIOSProps> {
-  static Item: any = TabBarItemIOS;
-
-  componentDidMount() {
-    if (!showedDeprecationWarning) {
-      console.warn(
-        'TabBarIOS and TabBarItemIOS are deprecated and will be removed in a future release. ' +
-          'Please use react-native-tab-view instead.',
-      );
-
-      showedDeprecationWarning = true;
-    }
-  }
-
-  render(): React.Node {
-    return (
-      <View style={[this.props.style, styles.tabGroup]}>
-        {this.props.children}
-      </View>
-    );
-  }
-}
-
-const styles = StyleSheet.create({
-  tabGroup: {
-    flex: 1,
-  },
-});
-
-module.exports = TabBarIOS;

package/Libraries/Components/TabBarIOS/TabBarIOSProps.js

@@ -1,52 +0,0 @@
-/*
- * @flow
- */
-
-import type { ViewProps } from '../View/ViewPropTypes';
-
-export type TabBarIOSProps = $ReadOnly<{|
-  ...ViewProps,
-
-  /**
-   * Color of text on unselected tabs
-   */
-  unselectedTintColor?: string,
-
-  /**
-   * Color of the currently selected tab icon
-   */
-  tintColor?: string,
-
-  /**
-   * Color of unselected tab icons. Available since iOS 10.
-   */
-  unselectedItemTintColor?: string,
-
-  /**
-   * Background color of the tab bar
-   */
-  barTintColor?: string,
-
-  /**
-   * The style of the tab bar. Supported values are 'default', 'black'.
-   * Use 'black' instead of setting `barTintColor` to black. This produces
-   * a tab bar with the native iOS style with higher translucency.
-   */
-  barStyle?: ?('default' | 'black'),
-
-  /**
-   * A Boolean value that indicates whether the tab bar is translucent
-   */
-  translucent?: ?boolean,
-
-  /**
-   * Specifies tab bar item positioning. Available values are:
-   * - fill - distributes items across the entire width of the tab bar
-   * - center - centers item in the available tab bar space
-   * - auto (default) - distributes items dynamically according to the
-   * user interface idiom. In a horizontally compact environment (e.g. iPhone 5)
-   * this value defaults to `fill`, in a horizontally regular one (e.g. iPad)
-   * it defaults to center.
-   */
-  itemPositioning?: ?('fill' | 'center' | 'auto'),
-|}>;