@office-iss/react-native-win32 0.74.2 → 0.74.4

package/CHANGELOG.json

@@ -2,7 +2,37 @@
   "name": "@office-iss/react-native-win32",
   "entries": [
     {
-      "date": "Mon, 06 May 2024 15:16:39 GMT",
+      "date": "Wed, 10 Jul 2024 21:00:05 GMT",
+      "version": "0.74.4",
+      "tag": "@office-iss/react-native-win32_v0.74.4",
+      "comments": {
+        "patch": [
+          {
+            "author": "1422161+marlenecota@users.noreply.github.com",
+            "package": "@office-iss/react-native-win32",
+            "commit": "d3c8e762a7b2be2c699d7a2c14e4da06501c352f",
+            "comment": "Integrate 0.74.3"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 20 May 2024 15:16:05 GMT",
+      "version": "0.74.3",
+      "tag": "@office-iss/react-native-win32_v0.74.3",
+      "comments": {
+        "patch": [
+          {
+            "author": "nate@bracy.dev",
+            "package": "@office-iss/react-native-win32",
+            "commit": "481f89da064d5a33f4b5b79088dc760bd49f6dd2",
+            "comment": "fix(TextInput/isFocused): correctly handle null focused input"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Mon, 06 May 2024 15:17:11 GMT",
       "version": "0.74.2",
       "tag": "@office-iss/react-native-win32_v0.74.2",
       "comments": {

package/CHANGELOG.md

@@ -1,17 +1,33 @@
 # Change Log - @office-iss/react-native-win32
 
-This log was last generated on Mon, 06 May 2024 15:16:39 GMT and should not be manually modified.
+This log was last generated on Wed, 10 Jul 2024 21:00:05 GMT and should not be manually modified.
 
 <!-- Start content -->
 
-## 0.74.2
+## 0.74.4
 
-Mon, 06 May 2024 15:16:39 GMT
+Wed, 10 Jul 2024 21:00:05 GMT
 
 ### Patches
 
-- Integrate 0.74.1 (30809111+acoates-ms@users.noreply.github.com)
+- Integrate 0.74.3 (1422161+marlenecota@users.noreply.github.com)
 
+## 0.74.3
+
+Mon, 20 May 2024 15:16:05 GMT
+
+### Patches
+
+- fix(TextInput/isFocused): correctly handle null focused input (nate@bracy.dev)
+
+## 0.74.2
+
+Mon, 06 May 2024 15:17:11 GMT
+
+### Patches
+
+- Integrate 0.74.1 (30809111+acoates-ms@users.noreply.github.com)
+
 ## 0.74.1
 
 Wed, 01 May 2024 20:37:36 GMT

package/Libraries/Components/TextInput/TextInput.js

@@ -1135,12 +1135,14 @@ function InternalTextInput(props: Props): React.Node {
         };
 
   const [mostRecentEventCount, setMostRecentEventCount] = useState<number>(0);
-
   const [lastNativeText, setLastNativeText] = useState<?Stringish>(props.value);
   const [lastNativeSelectionState, setLastNativeSelection] = useState<{|
-    selection: ?Selection,
+    selection: Selection,
     mostRecentEventCount: number,
-  |}>({selection, mostRecentEventCount});
+  |}>({
+    selection: {start: -1, end: -1},
+    mostRecentEventCount: mostRecentEventCount,
+  });
 
   const lastNativeSelection = lastNativeSelectionState.selection;
 
@@ -1498,6 +1500,7 @@ function InternalTextInput(props: Props): React.Node {
         onSelectionChange={_onSelectionChange}
         onSelectionChangeShouldSetResponder={emptyFunctionThatReturnsTrue}
         selection={selection}
+        selectionColor={selectionColor}
         style={StyleSheet.compose(
           useMultilineDefaultStyle ? styles.multilineDefault : null,
           style,

package/Libraries/Components/TextInput/TextInput.win32.js

@@ -1180,12 +1180,14 @@ function InternalTextInput(props: Props): React.Node {
         };
 
   const [mostRecentEventCount, setMostRecentEventCount] = useState<number>(0);
-
   const [lastNativeText, setLastNativeText] = useState<?Stringish>(props.value);
   const [lastNativeSelectionState, setLastNativeSelection] = useState<{|
-    selection: ?Selection,
+    selection: Selection,
     mostRecentEventCount: number,
-  |}>({selection, mostRecentEventCount});
+  |}>({
+    selection: {start: -1, end: -1},
+    mostRecentEventCount: mostRecentEventCount,
+  });
 
   const lastNativeSelection = lastNativeSelectionState.selection;
 
@@ -1314,9 +1316,13 @@ function InternalTextInput(props: Props): React.Node {
               );
             }
           },
-          // TODO: Fix this returning true on null === null, when no input is focused
           isFocused(): boolean {
-            return TextInputState.currentlyFocusedInput() === inputRef.current;
+            const currentlyFocusedInput =
+              TextInputState.currentlyFocusedInput();
+            return (
+              currentlyFocusedInput !== null &&
+              currentlyFocusedInput === inputRef.current
+            );
           },
           getNativeRef(): ?React.ElementRef<HostComponent<mixed>> {
             return inputRef.current;
@@ -1612,6 +1618,7 @@ function InternalTextInput(props: Props): React.Node {
         onSelectionChange={_onSelectionChange}
         onSelectionChangeShouldSetResponder={emptyFunctionThatReturnsTrue}
         selection={selection}
+        selectionColor={selectionColor}
         style={StyleSheet.compose(
           useMultilineDefaultStyle ? styles.multilineDefault : null,
           style,

package/Libraries/Core/ReactNativeVersion.js

@@ -16,7 +16,7 @@ const version: $ReadOnly<{
 }> = {
   major: 0,
   minor: 74,
-  patch: 1,
+  patch: 3,
   prerelease: null,
 };
 

package/overrides.json

@@ -7,7 +7,7 @@
     "**/__snapshots__/**",
     "src-win/rntypes/**"
   ],
-  "baseVersion": "0.74.1",
+  "baseVersion": "0.74.3",
   "overrides": [
     {
       "type": "derived",
@@ -122,7 +122,7 @@
       "type": "derived",
       "file": "src-win/Libraries/Components/TextInput/TextInput.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.js",
-      "baseHash": "0119ddc412dcbacf1074b1d6b13628667578a270"
+      "baseHash": "3676702ffe4830f11e49c67067d7fe18d9c731cb"
     },
     {
       "type": "patch",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@office-iss/react-native-win32",
-  "version": "0.74.2",
+  "version": "0.74.4",
   "description": "Implementation of react native on top of Office's Win32 platform.",
   "repository": {
     "type": "git",
@@ -26,17 +26,17 @@
   "dependencies": {
     "@babel/runtime": "^7.0.0",
     "@jest/create-cache-key-function": "^29.6.3",
-    "@react-native-community/cli": "13.6.6",
-    "@react-native-community/cli-platform-android": "13.6.6",
-    "@react-native-community/cli-platform-ios": "13.6.6",
+    "@react-native-community/cli": "13.6.9",
+    "@react-native-community/cli-platform-android": "13.6.9",
+    "@react-native-community/cli-platform-ios": "13.6.9",
     "@react-native/assets": "1.0.0",
-    "@react-native/assets-registry": "0.74.83",
-    "@react-native/codegen": "0.74.83",
-    "@react-native/community-cli-plugin": "0.74.83",
-    "@react-native/gradle-plugin": "0.74.83",
-    "@react-native/js-polyfills": "0.74.83",
-    "@react-native/normalize-colors": "0.74.83",
-    "@react-native/virtualized-lists": "0.74.83",
+    "@react-native/assets-registry": "0.74.85",
+    "@react-native/codegen": "0.74.85",
+    "@react-native/community-cli-plugin": "0.74.85",
+    "@react-native/gradle-plugin": "0.74.85",
+    "@react-native/js-polyfills": "0.74.85",
+    "@react-native/normalize-colors": "0.74.85",
+    "@react-native/virtualized-lists": "0.74.85",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
@@ -69,7 +69,7 @@
   "devDependencies": {
     "@babel/core": "^7.20.0",
     "@babel/eslint-parser": "^7.20.0",
-    "@react-native/metro-config": "0.74.83",
+    "@react-native/metro-config": "0.74.85",
     "@rnw-scripts/babel-react-native-config": "0.0.0",
     "@rnw-scripts/eslint-config": "1.2.9",
     "@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.1.13",
@@ -85,7 +85,7 @@
     "just-scripts": "^1.3.3",
     "prettier": "2.8.8",
     "react": "18.2.0",
-    "react-native": "0.74.1",
+    "react-native": "0.74.3",
     "react-native-platform-override": "^1.9.25",
     "typescript": "5.0.4"
   },