react-native-tvos 0.85.2-0 → 0.85.3-1

package/Libraries/Components/ScrollView/ScrollView.d.ts

@@ -515,7 +515,7 @@ export interface ScrollViewPropsIOS {
    *      - `start` (the default) will align the snap at the left (horizontal) or top (vertical)
    *      - `center` will align the snap in the center
    *      - `end` will align the snap at the right (horizontal) or bottom (vertical)
-   *      - `item` will align the snap according to the value of `scrollSnapAlign` for individual items in the scroll view (TV platforms only).
+   *      - `item` will align the snap according to each item's own `scrollSnapAlign` or `scrollSnapOffset` prop (TV platforms only).
    */
   snapToAlignment?: 'start' | 'center' | 'end' | 'item' | undefined;
 

package/Libraries/Components/ScrollView/ScrollView.js

@@ -620,7 +620,7 @@ type ScrollViewBaseProps = Readonly<{
    *   - `'start'` (the default) will align the snap at the left (horizontal) or top (vertical)
    *   - `'center'` will align the snap in the center
    *   - `'end'` will align the snap at the right (horizontal) or bottom (vertical)
-   *   - `'item'` will align the snap according to the value of `scrollSnapAlign` for individual items in the scroll view (TV platforms only).
+   *   - `'item'` will align the snap according to each item's own `scrollSnapAlign` or `scrollSnapOffset` prop (TV platforms only).
    */
   snapToAlignment?: ?('start' | 'center' | 'end' | 'item'),
   /**

package/Libraries/Components/TV/TVViewPropTypes.js

@@ -131,4 +131,13 @@ export type TVViewProps = $ReadOnly<{|
    */
   scrollSnapAlign?: ?('start' | 'center' | 'end'),
 
+  /**
+   * Per-item scroll snap offset in dp/pt. When set on a View inside a
+   * ScrollView with `snapToAlignment="item"`, the focus engine lands the
+   * View's top at viewport y = scrollSnapOffset. Standalone alternative to
+   * `scrollSnapAlign` — set one or the other; if both are set on the same
+   * View, `scrollSnapOffset` takes precedence.
+   */
+  scrollSnapOffset?: ?number,
+
 |}>;

package/Libraries/Components/View/View.js

@@ -153,9 +153,13 @@ component View(
     delete processedProps.isTVSelectable;
   }
 
-  // Views with scrollSnapAlign must not be flattened by Fabric, otherwise
-  // the prop never reaches the native view and scroll snapping breaks.
-  if (processedProps.scrollSnapAlign != null) {
+  // Views with scrollSnapAlign or scrollSnapOffset must not be flattened by
+  // Fabric, otherwise the prop never reaches the native view and scroll
+  // snapping breaks.
+  if (
+    processedProps.scrollSnapAlign != null ||
+    processedProps.scrollSnapOffset != null
+  ) { 
     processedProps.collapsable = false;
   }
 

package/Libraries/Core/ReactNativeVersion.js

@@ -28,8 +28,8 @@
 export default class ReactNativeVersion {
   static major: number = 0;
   static minor: number = 85;
-  static patch: number = 2;
-  static prerelease: string | null = '0';
+  static patch: number = 3;
+  static prerelease: string | null = '1';
 
   static getVersionString(): string {
     return `${this.major}.${this.minor}.${this.patch}${this.prerelease != null ? `-${this.prerelease}` : ''}`;

package/Libraries/NativeComponent/TVViewConfig.js

@@ -26,5 +26,6 @@ export const validAttributesForTVProps = {
   trapFocusDown: true,
   trapFocusUp: true,
   scrollSnapAlign: true,
+  scrollSnapOffset: true,
 };
 

package/Libraries/Utilities/HMRClient.js

@@ -212,6 +212,7 @@ Error: ${e.message}`;
     });
 
     let pendingUpdatesCount = 0;
+    let lastMarkerChangeId: string | null = null;
     client.on('update-start', ({isInitialUpdate}) => {
       pendingUpdatesCount++;
       currentCompileErrorMessage = null;
@@ -229,10 +230,15 @@ Error: ${e.message}`;
       }
     });
 
-    client.on('update-done', () => {
+    client.on('update-done', body => {
       pendingUpdatesCount--;
       if (pendingUpdatesCount === 0) {
         DevLoadingView.hide();
+        const changeId = body?.changeId;
+        if (changeId != null && changeId !== lastMarkerChangeId) {
+          lastMarkerChangeId = changeId;
+          emitFastRefreshCompleteEvents();
+        }
       }
     });
 
@@ -379,4 +385,25 @@ function showCompileError() {
   throw error;
 }
 
+function emitFastRefreshCompleteEvents() {
+  // Add marker entry in performance timeline
+  performance.mark('Fast Refresh - Update done', {
+    detail: {
+      devtools: {
+        dataType: 'marker',
+        color: 'primary',
+        tooltipText: 'Fast Refresh \u269b',
+      },
+    },
+  });
+
+  // Notify CDP clients via internal binding
+  if (
+    // $FlowFixMe[prop-missing] - Injected by RuntimeTarget
+    typeof globalThis.__notifyFastRefreshComplete === 'function'
+  ) {
+    globalThis.__notifyFastRefreshComplete();
+  }
+}
+
 export default HMRClient;

package/README.md

@@ -272,6 +272,7 @@ class Game2048 extends React.Component {
   | Prop (View) | Value | Description |
   |---|---|---|
   | scrollSnapAlign | `'start'` \| `'center'` \| `'end'` | Controls where this item snaps inside its parent ScrollView. Only used when the parent has `snapToAlignment="item"`. |
+  | scrollSnapOffset | `number` | Per-item pixel offset (in dp/pt). When set, the focus engine lands this item's leading edge at `scrollSnapOffset` from the viewport origin. Standalone alternative to `scrollSnapAlign` — takes precedence if both are set on the same item. Only used when the parent has `snapToAlignment="item"`. |
 
   ```jsx
   <ScrollView
@@ -291,6 +292,16 @@ class Game2048 extends React.Component {
   </ScrollView>
   ```
 
+  `scrollSnapOffset` is useful when different items in the same ScrollView need to land at different positions — e.g. a hero row peeking 27dp from the top while poster rows peek 550dp:
+
+  ```jsx
+  <ScrollView snapToAlignment="item">
+    <View scrollSnapOffset={27}><Hero /></View>
+    <View scrollSnapOffset={100}><Featured /></View>
+    <View scrollSnapOffset={550}><PosterRow /></View>
+  </ScrollView>
+  ```
+
   - _ScrollView animation control_: The `scrollAnimationEnabled` prop allows disabling scroll animations when focus changes on TV. When set to `false`, the scroll view jumps instantly to the focused item instead of animating. This only affects TV platforms and has no effect on mobile.
 
   | Prop (ScrollView) | Value | Description |
@@ -307,7 +318,8 @@ class Game2048 extends React.Component {
 
   - _Interaction with existing ScrollView props_: The TV scroll props build on top of existing React Native ScrollView behavior. Here is how they interact:
 
-    - `snapToAlignment="item"` does not require `snapToInterval` to be set. It works as a standalone snapping mode where each child's `scrollSnapAlign` determines the snap position. If `snapToInterval` is also set, the interval is applied as an additional constraint after the item offset is computed.
+    - `snapToAlignment="item"` does not require `snapToInterval` to be set. It works as a standalone snapping mode where each child's `scrollSnapAlign` or `scrollSnapOffset` determines the snap position. If `snapToInterval` is also set, the interval is applied as an additional constraint after the item offset is computed.
+    - `scrollSnapOffset` ignores `snapToItemPadding`. The padding is a global value applied to `scrollSnapAlign` cases; `scrollSnapOffset` is itself a per-item pixel offset that fully specifies where the item lands.
     - `snapToAlignment="item"` should not be combined with `pagingEnabled`. Both attempt to control scroll positioning independently, which leads to unpredictable behavior. Use one or the other.
     - `snapToStart` and `snapToEnd` work independently of `snapToAlignment="item"`. They control edge behavior during swipe/drag momentum (whether the scroll view snaps to the first or last position), but do not affect focus driven item snapping.
     - `scrollAnimationEnabled={false}` disables all scroll animations, including programmatic `scrollTo({animated: true})` calls. When disabled, all scrolling is instant.

package/React/Base/RCTVersion.m

@@ -23,8 +23,8 @@ NSDictionary* RCTGetReactNativeVersion(void)
     __rnVersion = @{
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(85),
-                  RCTVersionPatch: @(2),
-                  RCTVersionPrerelease: @"0",
+                  RCTVersionPatch: @(3),
+                  RCTVersionPrerelease: @"1",
                   };
   });
   return __rnVersion;

package/React/CoreModules/RCTJscSafeUrl+Internal.h

@@ -0,0 +1,23 @@
+/*
+ * 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.
+ */
+
+#import <Foundation/Foundation.h>
+
+/**
+ * Converts between standard URLs and JSC-safe URLs.
+ *
+ * JSC (JavaScriptCore) strips query strings from source URLs in stack traces
+ * as of iOS 16.4. Metro works around this by encoding the query string into
+ * the URL path. These methods convert between the two formats.
+ */
+@interface RCTJscSafeUrl : NSObject
+
++ (nonnull NSString *)normalUrlFromJscSafeUrl:(nonnull NSString *)url;
++ (nonnull NSString *)jscSafeUrlFromNormalUrl:(nonnull NSString *)url;
++ (BOOL)isJscSafeUrl:(nonnull NSString *)url;
+
+@end

package/React/CoreModules/RCTJscSafeUrl.mm

@@ -0,0 +1,38 @@
+/*
+ * 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.
+ */
+
+#import "RCTJscSafeUrl+Internal.h"
+
+#import <React/RCTDefines.h>
+#import <react/debug/redbox/JscSafeUrl.h>
+
+#if RCT_DEV_MENU
+
+using facebook::react::unstable_redbox::isJscSafeUrl;
+using facebook::react::unstable_redbox::toJscSafeUrl;
+using facebook::react::unstable_redbox::toNormalUrl;
+
+@implementation RCTJscSafeUrl
+
++ (NSString *)normalUrlFromJscSafeUrl:(NSString *)url
+{
+  return [NSString stringWithUTF8String:toNormalUrl(url.UTF8String).c_str()];
+}
+
++ (NSString *)jscSafeUrlFromNormalUrl:(NSString *)url
+{
+  return [NSString stringWithUTF8String:toJscSafeUrl(url.UTF8String).c_str()];
+}
+
++ (BOOL)isJscSafeUrl:(NSString *)url
+{
+  return isJscSafeUrl(url.UTF8String);
+}
+
+@end
+
+#endif

package/React/CoreModules/RCTRedBox+Internal.h

@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+#import <React/RCTDefines.h>
+#import <UIKit/UIKit.h>
+
+#if RCT_DEV_MENU
+
+@class RCTJSStackFrame;
+
+@protocol RCTRedBoxControllerActionDelegate <NSObject>
+
+- (void)redBoxController:(UIViewController *)redBoxController openStackFrameInEditor:(RCTJSStackFrame *)stackFrame;
+- (void)reloadFromRedBoxController:(UIViewController *)redBoxController;
+- (void)loadExtraDataViewController;
+
+@end
+
+@protocol RCTRedBoxControlling <NSObject>
+
+@property (nonatomic, weak) id<RCTRedBoxControllerActionDelegate> actionDelegate;
+
+- (void)showErrorMessage:(NSString *)message
+               withStack:(NSArray<RCTJSStackFrame *> *)stack
+                isUpdate:(BOOL)isUpdate
+             errorCookie:(int)errorCookie;
+
+- (void)dismiss;
+
+@end
+
+@protocol RCTRedBox2Controlling <RCTRedBoxControlling>
+
+@property (nonatomic, strong, nullable) NSURL *bundleURL;
+
+@end
+
+#endif