Merge commit '73ad6514cc91d3df6b9c39713860ca71e8479ef3' into realize-last-focused

Author: NickGerleman

.circleci/config.yml

@@ -417,7 +417,7 @@ jobs:
       - with_brew_cache_span:
           steps:
             - brew_install:
-                package: cmake ninja
+                package: cmake
 
       - run:
           name: Setup the CocoaPods environment
@@ -455,8 +455,8 @@ jobs:
       - run:
           name: Run Ruby Tests
           command: |
-            cd scripts/cocoapods
-            sh run_tests.sh
+            cd scripts
+            sh run_ruby_tests.sh
       - run_yarn
       - run: |
           cd packages/rn-tester
@@ -474,7 +474,7 @@ jobs:
       - with_brew_cache_span:
           steps:
             - brew_install:
-                package: watchman cmake ninja
+                package: watchman cmake
             - run:
                 name: "Brew: Tap wix/brew"
                 command: brew tap wix/brew >/dev/null
@@ -745,7 +745,7 @@ jobs:
       - with_brew_cache_span:
           steps:
             - brew_install:
-                package: cmake ninja
+                package: cmake
 
       - run:
           name: Install CocoaPods dependencies
@@ -987,17 +987,19 @@ jobs:
     environment:
       - HERMES_WS_DIR: *hermes_workspace_root
     steps:
+      - checkout
       - *attach_hermes_workspace
       - restore_cache:
           key: v1-hermes-{{ .Environment.CIRCLE_JOB }}-{{ checksum "/tmp/hermes/hermesversion" }}
       - run:
           name: Set up workspace
           command: |
             mkdir -p /tmp/hermes/osx-bin
+            cp ~/react-native/sdks/hermes-engine/utils/* "$HERMES_WS_DIR/hermes/utils/."
       - run:
           name: Install dependencies
           command: |
-            brew install cmake ninja
+            brew install cmake
       - run:
           name: Build HermesC for macOS
           command: |

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## v0.68.2
+
+### Changed
+
+- Bump used version of react-native-codegen to 0.0.17 ([dfda480a98](https://github.com/facebook/react-native/commit/dfda480a9888d95c542cea40f25e8e783565c1db) by [@cortinico](https://github.com/cortinico))
+- Bump react-native-codegen to 0.0.17 ([a5ddc2e165](https://github.com/facebook/react-native/commit/a5ddc2e16523ea336ffbecf7acfd4820469a29e7) by [@cortinico](https://github.com/cortinico))
+
+### Fixed
+
+#### Android specific
+
+- Working around Long paths limitation on Windows ([62ef6f5fa1](https://github.com/facebook/react-native/commit/62ef6f5fa1ecb918bde130a6024b65afcd34c7e3) by [@mganandraj](https://github.com/mganandraj))
+
 ## v0.68.1
 
 ### Changed

Libraries/Components/ScrollView/ScrollView.js

@@ -190,12 +190,6 @@ type IOSProps = $ReadOnly<{|
    * @platform ios
    */
   contentInset?: ?EdgeInsetsProp,
-  /**
-   * Used to manually set the starting scroll offset.
-   * The default value is `{x: 0, y: 0}`.
-   * @platform ios
-   */
-  contentOffset?: ?PointProp,
   /**
    * When true, the scroll view bounces when it reaches the end of the
    * content if the content is larger then the scroll view along the axis of
@@ -457,6 +451,11 @@ export type Props = $ReadOnly<{|
    * ```
    */
   contentContainerStyle?: ?ViewStyleProp,
+  /**
+   * Used to manually set the starting scroll offset.
+   * The default value is `{x: 0, y: 0}`.
+   */
+  contentOffset?: ?PointProp,
   /**
    * When true, the scroll view stops on the next index (in relation to scroll
    * position at release) regardless of how fast the gesture is. This can be

Libraries/Components/TextInput/TextInput.js

@@ -392,6 +392,14 @@ type AndroidProps = $ReadOnly<{|
     | 'off'
   ),
 
+  /**
+   * When provided it will set the color of the cursor (or "caret") in the component.
+   * Unlike the behavior of `selectionColor` the cursor color will be set independently
+   * from the color of the text selection box.
+   * @platform android
+   */
+  cursorColor?: ?ColorValue,
+
   /**
    * When `false`, if there is a small amount of space available around a text input
    * (e.g. landscape orientation on a phone), the OS may choose to have the user edit

Libraries/Lists/VirtualizeUtils.js

@@ -25,7 +25,7 @@ export function elementsThatOverlapOffsets(
     offset: number,
     ...
   },
-  zoomScale: number,
+  zoomScale: number = 1,
 ): Array<number> {
   const out = [];
   let outLength = 0;
@@ -115,7 +115,7 @@ export function computeWindowedRenderLimits(
   if (itemCount === 0) {
     return prev;
   }
-  const {offset, velocity, visibleLength, zoomScale} = scrollMetrics;
+  const {offset, velocity, visibleLength, zoomScale = 1} = scrollMetrics;
 
   // Start with visible area, then compute maximum overscan region by expanding from there, biased
   // in the direction of scroll. Total overscan area is capped, which should cap memory consumption

Libraries/Lists/VirtualizedList.js

@@ -842,6 +842,7 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     this._updateViewableItems(data);
 
     const {contentLength, offset, visibleLength} = this._scrollMetrics;
+    const distanceFromEnd = contentLength - visibleLength - offset;
 
     // Wait until the scroll view metrics have been set up. And until then,
     // we will trust the initialNumToRender suggestion
@@ -851,7 +852,6 @@ class VirtualizedList extends React.PureComponent<Props, State> {
 
     let newCellsAroundViewport: {first: number, last: number};
     if (this._isVirtualizationDisabled()) {
-      const distanceFromEnd = contentLength - visibleLength - offset;
       const renderAhead =
         distanceFromEnd < onEndReachedThreshold * visibleLength
           ? maxToRenderPerBatchOrDefault(props.maxToRenderPerBatch)
@@ -866,9 +866,20 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       };
     } else {
       // If we have a non-zero initialScrollIndex and run this before we've scrolled,
-      // wait until we've scrolled the view to the right place. And until then,
+      // we'll wipe out the initialNumToRender rendered elements starting at initialScrollIndex.
+      // So let's wait until we've scrolled the view to the right place. And until then,
       // we will trust the initialScrollIndex suggestion.
-      if (this.props.initialScrollIndex && !this._hasDoneInitialScroll) {
+
+      // Thus, we want to recalculate the windowed render limits if any of the following hold:
+      // - initialScrollIndex is undefined or is 0
+      // - initialScrollIndex > 0 AND scrolling is complete
+      // - initialScrollIndex > 0 AND the end of the list is visible (this handles the case
+      //   where the list is shorter than the visible area)
+      if (
+        this.props.initialScrollIndex &&
+        !this._scrollMetrics.offset &&
+        Math.abs(distanceFromEnd) >= Number.EPSILON
+      ) {
         return cellsAroundViewport;
       }
 
@@ -1381,7 +1392,8 @@ class VirtualizedList extends React.PureComponent<Props, State> {
     },
   } = {};
   _footerLength = 0;
-  _hasDoneInitialScroll = false;
+  // Used for preventing scrollToIndex from being called multiple times for initialScrollIndex
+  _hasTriggeredInitialScrollToIndex = false;
   _hasInteracted = false;
   _hasMore = false;
   _hasWarned: {[string]: boolean} = {};
@@ -1736,15 +1748,15 @@ class VirtualizedList extends React.PureComponent<Props, State> {
       height > 0 &&
       this.props.initialScrollIndex != null &&
       this.props.initialScrollIndex > 0 &&
-      !this._hasDoneInitialScroll
+      !this._hasTriggeredInitialScrollToIndex
     ) {
       if (this.props.contentOffset == null) {
         this.scrollToIndex({
           animated: false,
           index: this.props.initialScrollIndex,
         });
       }
-      this._hasDoneInitialScroll = true;
+      this._hasTriggeredInitialScrollToIndex = true;
     }
     if (this.props.onContentSizeChange) {
       this.props.onContentSizeChange(width, height);

Libraries/Lists/__tests__/VirtualizedList-test.js

@@ -885,6 +885,7 @@ it('adjusts render area with non-zero initialScrollIndex', () => {
       viewport: {width: 10, height: 50},
       content: {width: 10, height: 200},
     });
+    simulateScroll(component, {x: 0, y: 10}); // simulate scroll offset for initialScrollIndex
 
     performAllBatches();
   });
@@ -914,8 +915,8 @@ it('renders new items when data is updated with non-zero initialScrollIndex', ()
 
   ReactTestRenderer.act(() => {
     simulateLayout(component, {
-      viewport: {width: 10, height: 50},
-      content: {width: 10, height: 200},
+      viewport: {width: 10, height: 20},
+      content: {width: 10, height: 20},
     });
     performAllBatches();
   });

React-Core.podspec

@@ -47,7 +47,7 @@ Pod::Spec.new do |s|
   s.compiler_flags         = folly_compiler_flags + ' ' + boost_compiler_flags
   s.header_dir             = "React"
   s.framework              = "JavaScriptCore"
-  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-hermes\" \"${PODS_ROOT}/Headers/Public/hermes-engine\" \"${PODS_ROOT}/Headers/Public/FlipperKit\" \"$(PODS_ROOT)/Headers/Public/ReactCommon\" \"$(PODS_ROOT)/Headers/Public/React-RCTFabric\"", "DEFINES_MODULE" => "YES" }
+  s.pod_target_xcconfig    = { "HEADER_SEARCH_PATHS" => "\"$(PODS_TARGET_SRCROOT)/ReactCommon\" \"$(PODS_ROOT)/boost\" \"$(PODS_ROOT)/DoubleConversion\" \"$(PODS_ROOT)/RCT-Folly\" \"${PODS_ROOT}/Headers/Public/React-hermes\" \"${PODS_ROOT}/Headers/Public/hermes-engine\" \"${PODS_ROOT}/Headers/Public/FlipperKit\" \"$(PODS_ROOT)/Headers/Public/ReactCommon\" \"$(PODS_ROOT)/Headers/Public/React-RCTFabric\"", "DEFINES_MODULE" => "YES", "GCC_PREPROCESSOR_DEFINITIONS" => "RCT_METRO_PORT=${RCT_METRO_PORT}" }
   s.user_target_xcconfig   = { "HEADER_SEARCH_PATHS" => "\"$(PODS_ROOT)/Headers/Private/React-Core\""}
   s.default_subspec        = "Default"
 

React/CoreModules/RCTLogBox.mm

@@ -57,16 +57,16 @@ - (void)setSurfacePresenter:(id<RCTSurfacePresenterStub>)surfacePresenter
       if (strongSelf->_bridgelessSurfacePresenter) {
         strongSelf->_view = [[RCTLogBoxView alloc] initWithWindow:RCTKeyWindow()
                                                  surfacePresenter:strongSelf->_bridgelessSurfacePresenter];
+        [strongSelf->_view show];
       } else if (strongSelf->_bridge && strongSelf->_bridge.valid) {
         if (strongSelf->_bridge.surfacePresenter) {
           strongSelf->_view = [[RCTLogBoxView alloc] initWithWindow:RCTKeyWindow()
                                                    surfacePresenter:strongSelf->_bridge.surfacePresenter];
         } else {
           strongSelf->_view = [[RCTLogBoxView alloc] initWithWindow:RCTKeyWindow() bridge:strongSelf->_bridge];
         }
+        [strongSelf->_view show];
       }
-
-      [strongSelf->_view show];
     });
   }
 }

React/Fabric/RCTSurfaceTouchHandler.mm

@@ -221,6 +221,17 @@ static BOOL AnyTouchesChanged(NSSet<UITouch *> *touches)
   return NO;
 }
 
+static BOOL IsViewListeningToEvent(UIView *view, ViewEvents::Offset eventType)
+{
+  if ([view.class conformsToProtocol:@protocol(RCTComponentViewProtocol)]) {
+    auto props = ((id<RCTComponentViewProtocol>)view).props;
+    if (SharedViewProps viewProps = std::dynamic_pointer_cast<ViewProps const>(props)) {
+      return viewProps->events[eventType];
+    }
+  }
+  return NO;
+}
+
 /**
  * Surprisingly, `__unsafe_unretained id` pointers are not regular pointers
  * and `std::hash<>` cannot hash them.
@@ -558,28 +569,60 @@ - (void)hovering:(UIHoverGestureRecognizer *)recognizer API_AVAILABLE(ios(13.0))
   NSTimeInterval timestamp = CACurrentMediaTime();
 
   // Entering
-  // root -> child
+
+  // We only want to emit events to JS if there is a view that is currently listening to said event
+  // so we only send those event to the JS side if the element which has been entered is itself listening,
+  // or if one of its parents is listening in case those listeners care about the capturing phase. Adding the ability
+  // for native to distingusih between capturing listeners and not could be an optimization to futher reduce the number
+  // of events we send to JS
+  BOOL hasParentEnterListener = NO;
+
   for (UIView *componentView in [eventPathViews reverseObjectEnumerator]) {
-    if (![_currentlyHoveredViews containsObject:componentView]) {
+    BOOL shouldEmitEvent =
+        hasParentEnterListener || IsViewListeningToEvent(componentView, ViewEvents::Offset::PointerEnter2);
+
+    if (shouldEmitEvent && ![_currentlyHoveredViews containsObject:componentView]) {
       SharedTouchEventEmitter eventEmitter =
           GetTouchEmitterFromView(componentView, [recognizer locationInView:componentView]);
       if (eventEmitter != nil) {
         PointerEvent event = CreatePointerEventFromIncompleteHoverData(componentView, clientLocation, timestamp);
         eventEmitter->onPointerEnter2(event);
       }
     }
+
+    if (shouldEmitEvent && !hasParentEnterListener) {
+      hasParentEnterListener = YES;
+    }
   }
 
   // Leaving
-  // child -> root
-  for (UIView *componentView in _currentlyHoveredViews) {
-    if (![eventPathViews containsObject:componentView]) {
-      SharedTouchEventEmitter eventEmitter =
-          GetTouchEmitterFromView(componentView, [recognizer locationInView:componentView]);
-      if (eventEmitter != nil) {
-        PointerEvent event = CreatePointerEventFromIncompleteHoverData(componentView, clientLocation, timestamp);
-        eventEmitter->onPointerLeave2(event);
-      }
+
+  // pointerleave events need to be emited from the deepest target to the root but
+  // we also need to efficiently keep track of if a view has a parent which is listening to the leave events,
+  // so we first iterate from the root to the target, collecting the views which need events fired for, of which
+  // we reverse iterate (now from target to root), actually emitting the events.
+  NSMutableOrderedSet *viewsToEmitLeaveEventsTo = [NSMutableOrderedSet orderedSet];
+
+  BOOL hasParentLeaveListener = NO;
+  for (UIView *componentView in [_currentlyHoveredViews reverseObjectEnumerator]) {
+    BOOL shouldEmitEvent =
+        hasParentLeaveListener || IsViewListeningToEvent(componentView, ViewEvents::Offset::PointerLeave2);
+
+    if (shouldEmitEvent && ![eventPathViews containsObject:componentView]) {
+      [viewsToEmitLeaveEventsTo addObject:componentView];
+    }
+
+    if (shouldEmitEvent && !hasParentLeaveListener) {
+      hasParentLeaveListener = YES;
+    }
+  }
+
+  for (UIView *componentView in [viewsToEmitLeaveEventsTo reverseObjectEnumerator]) {
+    SharedTouchEventEmitter eventEmitter =
+        GetTouchEmitterFromView(componentView, [recognizer locationInView:componentView]);
+    if (eventEmitter != nil) {
+      PointerEvent event = CreatePointerEventFromIncompleteHoverData(componentView, clientLocation, timestamp);
+      eventEmitter->onPointerLeave2(event);
     }
   }