react-native 0.73.9 → 0.73.10

package/Libraries/Components/Keyboard/KeyboardAvoidingView.js

@@ -9,6 +9,7 @@
  */
 
 import type {ViewStyleProp} from '../../StyleSheet/StyleSheet';
+import type {DimensionsPayload} from '../../Utilities/NativeDeviceInfo';
 import type {
   ViewLayout,
   ViewLayoutEvent,
@@ -18,6 +19,7 @@ import type {KeyboardEvent, KeyboardMetrics} from './Keyboard';
 
 import LayoutAnimation from '../../LayoutAnimation/LayoutAnimation';
 import StyleSheet from '../../StyleSheet/StyleSheet';
+import Dimensions from '../../Utilities/Dimensions';
 import Platform from '../../Utilities/Platform';
 import {type EventSubscription} from '../../vendor/emitter/EventEmitter';
 import AccessibilityInfo from '../AccessibilityInfo/AccessibilityInfo';
@@ -66,6 +68,7 @@ class KeyboardAvoidingView extends React.Component<Props, State> {
   viewRef: {current: React.ElementRef<typeof View> | null, ...};
   _initialFrameHeight: number = 0;
   _bottom: number = 0;
+  _windowWidth: number = Dimensions.get('window').width;
 
   constructor(props: Props) {
     super(props);
@@ -130,6 +133,10 @@ class KeyboardAvoidingView extends React.Component<Props, State> {
     }
   };
 
+  _onDimensionsChange = ({window}: DimensionsPayload) => {
+    this._windowWidth = window?.width ?? 0;
+  };
+
   // Avoid unnecessary renders if the KeyboardAvoidingView is disabled.
   _setBottom = (value: number) => {
     const enabled = this.props.enabled ?? true;
@@ -145,6 +152,15 @@ class KeyboardAvoidingView extends React.Component<Props, State> {
       return;
     }
 
+    if (
+      Platform.OS === 'ios' &&
+      this._windowWidth !== this._keyboardEvent.endCoordinates.width
+    ) {
+      // The keyboard is not the standard bottom-of-the-screen keyboard. For example, floating keyboard on iPadOS.
+      this._setBottom(0);
+      return;
+    }
+
     const {duration, easing, endCoordinates} = this._keyboardEvent;
     const height = await this._relativeKeyboardHeight(endCoordinates);
 
@@ -178,6 +194,7 @@ class KeyboardAvoidingView extends React.Component<Props, State> {
     if (Platform.OS === 'ios') {
       this._subscriptions = [
         Keyboard.addListener('keyboardWillChangeFrame', this._onKeyboardChange),
+        Dimensions.addEventListener('change', this._onDimensionsChange),
       ];
     } else {
       this._subscriptions = [

package/Libraries/Core/ReactNativeVersion.js

@@ -12,6 +12,6 @@
 exports.version = {
   major: 0,
   minor: 73,
-  patch: 9,
+  patch: 10,
   prerelease: null,
 };

package/Libraries/StyleSheet/StyleSheetTypes.d.ts

@@ -179,21 +179,23 @@ type MaximumOneOf<T, K extends keyof T = keyof T> = K extends keyof T
 
 export interface TransformsStyle {
   transform?:
-    | MaximumOneOf<
-        PerpectiveTransform &
-          RotateTransform &
-          RotateXTransform &
-          RotateYTransform &
-          RotateZTransform &
-          ScaleTransform &
-          ScaleXTransform &
-          ScaleYTransform &
-          TranslateXTransform &
-          TranslateYTransform &
-          SkewXTransform &
-          SkewYTransform &
-          MatrixTransform
-      >[]
+    | Readonly<
+        MaximumOneOf<
+          PerpectiveTransform &
+            RotateTransform &
+            RotateXTransform &
+            RotateYTransform &
+            RotateZTransform &
+            ScaleTransform &
+            ScaleXTransform &
+            ScaleYTransform &
+            TranslateXTransform &
+            TranslateYTransform &
+            SkewXTransform &
+            SkewYTransform &
+            MatrixTransform
+        >[]
+      >
     | string
     | undefined;
   transformOrigin?: Array<string | number> | string | undefined;

package/Libraries/Text/TextInput/RCTBaseTextInputView.mm

@@ -493,8 +493,6 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame)
     }
   }
 
-  NSString *previousText = [backedTextInputView.attributedText.string copy] ?: @"";
-
   if (range.location + range.length > backedTextInputView.attributedText.string.length) {
     _predictedText = backedTextInputView.attributedText.string;
   } else if (text != nil) {
@@ -502,17 +500,6 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithFrame : (CGRect)frame)
                                                                                         withString:text];
   }
 
-  if (_onTextInput) {
-    _onTextInput(@{
-      // We copy the string here because if it's a mutable string it may get released before we stop using it on a
-      // different thread, causing a crash.
-      @"text" : [text copy],
-      @"previousText" : previousText,
-      @"range" : @{@"start" : @(range.location), @"end" : @(range.location + range.length)},
-      @"eventCount" : @(_nativeEventCount),
-    });
-  }
-
   return text; // Accepting the change.
 }
 

package/React/Base/RCTVersion.m

@@ -23,7 +23,7 @@ NSDictionary* RCTGetReactNativeVersion(void)
     __rnVersion = @{
                   RCTVersionMajor: @(0),
                   RCTVersionMinor: @(73),
-                  RCTVersionPatch: @(9),
+                  RCTVersionPatch: @(10),
                   RCTVersionPrerelease: [NSNull null],
                   };
   });

package/React/Views/RCTModalHostView.m

@@ -119,6 +119,7 @@ RCT_NOT_IMPLEMENTED(-(instancetype)initWithCoder : coder)
   if (_isPresented) {
     [_delegate dismissModalHostView:self withViewController:_modalViewController animated:[self hasAnimationType]];
     _isPresented = NO;
+    [self setVisible:NO];
   }
 }
 

package/ReactAndroid/gradle.properties

@@ -1,4 +1,4 @@
-VERSION_NAME=0.73.9
+VERSION_NAME=0.73.10
 react.internal.publishingGroup=com.facebook.react
 
 android.useAndroidX=true

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", 73,
-      "patch", 9,
+      "patch", 10,
       "prerelease", null);
 }

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactEditText.java

@@ -119,6 +119,7 @@ public class ReactEditText extends AppCompatEditText {
   private int mFontWeight = UNSET;
   private int mFontStyle = UNSET;
   private boolean mAutoFocus = false;
+  private boolean mContextMenuHidden = false;
   private boolean mDidAttachToWindow = false;
   private @Nullable String mPlaceholder = null;
 
@@ -192,6 +193,9 @@ public class ReactEditText extends AppCompatEditText {
            */
           @Override
           public boolean onCreateActionMode(ActionMode mode, Menu menu) {
+            if (mContextMenuHidden) {
+              return false;
+            }
             menu.removeItem(android.R.id.pasteAsPlainText);
             return true;
           }
@@ -1139,6 +1143,10 @@ public class ReactEditText extends AppCompatEditText {
     mAutoFocus = autoFocus;
   }
 
+  public void setContextMenuHidden(boolean contextMenuHidden) {
+    mContextMenuHidden = contextMenuHidden;
+  }
+
   protected void applyTextAttributes() {
     // In general, the `getEffective*` functions return `Float.NaN` if the
     // property hasn't been set.

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputKeyPressEvent.java

@@ -14,7 +14,7 @@ import com.facebook.react.uimanager.common.ViewUtil;
 import com.facebook.react.uimanager.events.Event;
 
 /** Event emitted by EditText native view when key pressed */
-public class ReactTextInputKeyPressEvent extends Event<ReactTextInputEvent> {
+public class ReactTextInputKeyPressEvent extends Event<ReactTextInputKeyPressEvent> {
 
   public static final String EVENT_NAME = "topKeyPress";
 

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputManager.java

@@ -904,14 +904,15 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
   }
 
   @ReactPropGroup(
-      names = {
-        ViewProps.BORDER_RADIUS,
-        ViewProps.BORDER_TOP_LEFT_RADIUS,
-        ViewProps.BORDER_TOP_RIGHT_RADIUS,
-        ViewProps.BORDER_BOTTOM_RIGHT_RADIUS,
-        ViewProps.BORDER_BOTTOM_LEFT_RADIUS
-      },
-      defaultFloat = YogaConstants.UNDEFINED)
+    names = {
+      ViewProps.BORDER_RADIUS,
+      ViewProps.BORDER_TOP_LEFT_RADIUS,
+      ViewProps.BORDER_TOP_RIGHT_RADIUS,
+      ViewProps.BORDER_BOTTOM_RIGHT_RADIUS,
+      ViewProps.BORDER_BOTTOM_LEFT_RADIUS
+    },
+    defaultFloat = YogaConstants.UNDEFINED
+  )
   public void setBorderRadius(ReactEditText view, int index, float borderRadius) {
     if (!YogaConstants.isUndefined(borderRadius)) {
       borderRadius = PixelUtil.toPixelFromDIP(borderRadius);
@@ -954,14 +955,15 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
   }
 
   @ReactPropGroup(
-      names = {
-        ViewProps.BORDER_WIDTH,
-        ViewProps.BORDER_LEFT_WIDTH,
-        ViewProps.BORDER_RIGHT_WIDTH,
-        ViewProps.BORDER_TOP_WIDTH,
-        ViewProps.BORDER_BOTTOM_WIDTH,
-      },
-      defaultFloat = YogaConstants.UNDEFINED)
+    names = {
+      ViewProps.BORDER_WIDTH,
+      ViewProps.BORDER_LEFT_WIDTH,
+      ViewProps.BORDER_RIGHT_WIDTH,
+      ViewProps.BORDER_TOP_WIDTH,
+      ViewProps.BORDER_BOTTOM_WIDTH,
+    },
+    defaultFloat = YogaConstants.UNDEFINED
+  )
   public void setBorderWidth(ReactEditText view, int index, float width) {
     if (!YogaConstants.isUndefined(width)) {
       width = PixelUtil.toPixelFromDIP(width);
@@ -970,14 +972,15 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
   }
 
   @ReactPropGroup(
-      names = {
-        "borderColor",
-        "borderLeftColor",
-        "borderRightColor",
-        "borderTopColor",
-        "borderBottomColor"
-      },
-      customType = "Color")
+    names = {
+      "borderColor",
+      "borderLeftColor",
+      "borderRightColor",
+      "borderTopColor",
+      "borderBottomColor"
+    },
+    customType = "Color"
+  )
   public void setBorderColor(ReactEditText view, int index, Integer color) {
     float rgbComponent =
         color == null ? YogaConstants.UNDEFINED : (float) ((int) color & 0x00FFFFFF);
@@ -1062,17 +1065,12 @@ public class ReactTextInputManager extends BaseViewManager<ReactEditText, Layout
       }
 
       // The event that contains the event counter and updates it must be sent first.
-      // TODO: t7936714 merge these events
       mEventDispatcher.dispatchEvent(
           new ReactTextChangedEvent(
               mSurfaceId,
               mEditText.getId(),
               s.toString(),
               mEditText.incrementAndGetEventCounter()));
-
-      mEventDispatcher.dispatchEvent(
-          new ReactTextInputEvent(
-              mSurfaceId, mEditText.getId(), newText, oldText, start, start + before));
     }
 
     @Override

package/ReactCommon/cxxreact/ReactNativeVersion.h

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

package/ReactCommon/react/renderer/animations/LayoutAnimationKeyFrameManager.cpp

@@ -834,10 +834,7 @@ LayoutAnimationKeyFrameManager::pullTransaction(
           finalConflictingMutations.end(),
           &shouldFirstComeBeforeSecondMutation);
 
-      std::stable_sort(
-          immediateMutations.begin(),
-          immediateMutations.end(),
-          &shouldFirstComeBeforeSecondRemovesOnly);
+      handleShouldFirstComeBeforeSecondRemovesOnly(immediateMutations);
 
       animation.keyFrames = keyFramesToAnimate;
       inflightAnimations_.push_back(std::move(animation));

package/ReactCommon/react/renderer/animations/utils.h

@@ -24,6 +24,40 @@ static inline bool shouldFirstComeBeforeSecondRemovesOnly(
       (lhs.index > rhs.index);
 }
 
+static inline void handleShouldFirstComeBeforeSecondRemovesOnly(
+    ShadowViewMutation::List& list) noexcept {
+  std::unordered_map<std::string, std::vector<ShadowViewMutation>>
+      removeMutationsByTag;
+  ShadowViewMutation::List finalList;
+  for (auto& mutation : list) {
+    if (mutation.type == ShadowViewMutation::Type::Remove) {
+      auto key = std::to_string(mutation.parentShadowView.tag);
+      removeMutationsByTag[key].push_back(mutation);
+    } else {
+      finalList.push_back(mutation);
+    }
+  }
+
+  if (removeMutationsByTag.size() == 0) {
+    return;
+  }
+
+  for (auto& mutationsPair : removeMutationsByTag) {
+    if (mutationsPair.second.size() > 1) {
+      std::stable_sort(
+          mutationsPair.second.begin(),
+          mutationsPair.second.end(),
+          &shouldFirstComeBeforeSecondRemovesOnly);
+    }
+    finalList.insert(
+        finalList.begin(),
+        mutationsPair.second.begin(),
+        mutationsPair.second.end());
+  }
+
+  list = finalList;
+}
+
 static inline bool shouldFirstComeBeforeSecondMutation(
     const ShadowViewMutation& lhs,
     const ShadowViewMutation& rhs) noexcept {
@@ -55,6 +89,17 @@ static inline bool shouldFirstComeBeforeSecondMutation(
         lhs.type == ShadowViewMutation::Type::Insert) {
       return false;
     }
+
+    // Remove comes before Update
+    if (lhs.type == ShadowViewMutation::Type::Remove &&
+        rhs.type == ShadowViewMutation::Type::Update) {
+      return true;
+    }
+    if (rhs.type == ShadowViewMutation::Type::Remove &&
+        lhs.type == ShadowViewMutation::Type::Update) {
+      return false;
+    }
+
   } else {
     // Make sure that removes on the same level are sorted - highest indices
     // must come first.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.73.9",
+  "version": "0.73.10",
   "description": "A framework for building native apps using React",
   "license": "MIT",
   "repository": {
@@ -99,7 +99,7 @@
     "@react-native/assets-registry": "0.73.1",
     "@react-native/community-cli-plugin": "0.73.18",
     "@react-native/codegen": "0.73.3",
-    "@react-native/gradle-plugin": "0.73.4",
+    "@react-native/gradle-plugin": "0.73.5",
     "@react-native/js-polyfills": "0.73.1",
     "@react-native/normalize-colors": "0.73.2",
     "@react-native/virtualized-lists": "0.73.4",

package/scripts/cocoapods/utils.rb

@@ -249,7 +249,11 @@ class ReactNativePodsUtils
         end
 
         if !file_manager.exist?("#{file_path}.local")
-            node_binary = `command -v node`
+            # When installing pods with a yarn alias, yarn creates a fake yarn and node executables
+            # in a temporary folder.
+            # Using `node --print "process.argv[0]";` we are able to retrieve the actual path from which node is running.
+            # see https://github.com/facebook/react-native/issues/43285 for more info
+            node_binary = `node --print "process.argv[0]";`
             system("echo 'export NODE_BINARY=#{node_binary}' > #{file_path}.local")
         end
     end

package/template/package.json

@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "react": "18.2.0",
-    "react-native": "0.73.9"
+    "react-native": "0.73.10"
   },
   "devDependencies": {
     "@babel/core": "^7.20.0",

package/ReactAndroid/src/main/java/com/facebook/react/views/textinput/ReactTextInputEvent.java

@@ -1,70 +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.views.textinput;
-
-import androidx.annotation.Nullable;
-import com.facebook.react.bridge.Arguments;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.uimanager.common.ViewUtil;
-import com.facebook.react.uimanager.events.Event;
-
-/**
- * Event emitted by EditText native view when text changes. VisibleForTesting from {@link
- * TextInputEventsTestCase}.
- */
-public class ReactTextInputEvent extends Event<ReactTextInputEvent> {
-
-  public static final String EVENT_NAME = "topTextInput";
-
-  private String mText;
-  private String mPreviousText;
-  private int mRangeStart;
-  private int mRangeEnd;
-
-  @Deprecated
-  public ReactTextInputEvent(
-      int viewId, String text, String previousText, int rangeStart, int rangeEnd) {
-    this(ViewUtil.NO_SURFACE_ID, viewId, text, previousText, rangeStart, rangeEnd);
-  }
-
-  public ReactTextInputEvent(
-      int surfaceId, int viewId, String text, String previousText, int rangeStart, int rangeEnd) {
-    super(surfaceId, viewId);
-    mText = text;
-    mPreviousText = previousText;
-    mRangeStart = rangeStart;
-    mRangeEnd = rangeEnd;
-  }
-
-  @Override
-  public String getEventName() {
-    return EVENT_NAME;
-  }
-
-  @Override
-  public boolean canCoalesce() {
-    // We don't want to miss any textinput event, as event data is incremental.
-    return false;
-  }
-
-  @Nullable
-  @Override
-  protected WritableMap getEventData() {
-    WritableMap eventData = Arguments.createMap();
-    WritableMap range = Arguments.createMap();
-    range.putDouble("start", mRangeStart);
-    range.putDouble("end", mRangeEnd);
-
-    eventData.putString("text", mText);
-    eventData.putString("previousText", mPreviousText);
-    eventData.putMap("range", range);
-
-    eventData.putInt("target", getViewTag());
-    return eventData;
-  }
-}