@office-iss/react-native-win32 0.0.0-canary.250 → 0.0.0-canary.251

package/CHANGELOG.json

@@ -2,7 +2,46 @@
   "name": "@office-iss/react-native-win32",
   "entries": [
     {
-      "date": "Sat, 01 Jun 2024 05:19:18 GMT",
+      "date": "Tue, 04 Jun 2024 05:16:14 GMT",
+      "version": "0.0.0-canary.251",
+      "tag": "@office-iss/react-native-win32_v0.0.0-canary.251",
+      "comments": {
+        "prerelease": [
+          {
+            "author": "34109996+chiaramooney@users.noreply.github.com",
+            "package": "@office-iss/react-native-win32",
+            "commit": "1d9616305b90f5165ab84bfb04072add2bd30b34",
+            "comment": "Integrate 5/25"
+          },
+          {
+            "author": "beachball",
+            "package": "@office-iss/react-native-win32",
+            "comment": "Bump @rnw-scripts/eslint-config to v1.2.21",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@office-iss/react-native-win32",
+            "comment": "Bump @rnw-scripts/jest-out-of-tree-snapshot-resolver to v1.1.25",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@office-iss/react-native-win32",
+            "comment": "Bump @rnw-scripts/just-task to v2.3.37",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@office-iss/react-native-win32",
+            "comment": "Bump react-native-platform-override to v1.9.38",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Sat, 01 Jun 2024 05:21:30 GMT",
       "version": "0.0.0-canary.250",
       "tag": "@office-iss/react-native-win32_v0.0.0-canary.250",
       "comments": {

package/CHANGELOG.md

@@ -1,21 +1,33 @@
 # Change Log - @office-iss/react-native-win32
 
-This log was last generated on Sat, 01 Jun 2024 05:19:18 GMT and should not be manually modified.
+This log was last generated on Tue, 04 Jun 2024 05:16:14 GMT and should not be manually modified.
 
 <!-- Start content -->
 
-## 0.0.0-canary.250
+## 0.0.0-canary.251
 
-Sat, 01 Jun 2024 05:19:18 GMT
+Tue, 04 Jun 2024 05:16:14 GMT
 
 ### Changes
 
-- Integrate 5/14 (34109996+chiaramooney@users.noreply.github.com)
-- Bump @rnw-scripts/eslint-config to v1.2.20
-- Bump @rnw-scripts/jest-out-of-tree-snapshot-resolver to v1.1.24
-- Bump @rnw-scripts/just-task to v2.3.36
-- Bump react-native-platform-override to v1.9.37
+- Integrate 5/25 (34109996+chiaramooney@users.noreply.github.com)
+- Bump @rnw-scripts/eslint-config to v1.2.21
+- Bump @rnw-scripts/jest-out-of-tree-snapshot-resolver to v1.1.25
+- Bump @rnw-scripts/just-task to v2.3.37
+- Bump react-native-platform-override to v1.9.38
 
+## 0.0.0-canary.250
+
+Sat, 01 Jun 2024 05:21:30 GMT
+
+### Changes
+
+- Integrate 5/14 (34109996+chiaramooney@users.noreply.github.com)
+- Bump @rnw-scripts/eslint-config to v1.2.20
+- Bump @rnw-scripts/jest-out-of-tree-snapshot-resolver to v1.1.24
+- Bump @rnw-scripts/just-task to v2.3.36
+- Bump react-native-platform-override to v1.9.37
+
 ## 0.0.0-canary.249
 
 Thu, 30 May 2024 05:18:25 GMT

package/Libraries/Components/Pressable/Pressable.js

@@ -195,13 +195,16 @@ type Props = $ReadOnly<{|
   'aria-label'?: ?string,
 |}>;
 
+type Instance = React.ElementRef<typeof View>;
+
 /**
  * Component used to build display components that should respond to whether the
  * component is currently pressed or not.
  */
-/* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
- * LTI update could not be added via codemod */
-function Pressable(props: Props, forwardedRef): React.Node {
+function Pressable(
+  props: Props,
+  forwardedRef: React.RefSetter<Instance>,
+): React.Node {
   const {
     accessible,
     accessibilityState,
@@ -235,13 +238,16 @@ function Pressable(props: Props, forwardedRef): React.Node {
     ...restProps
   } = props;
 
-  const viewRef = useRef<React.ElementRef<typeof View> | null>(null);
+  const viewRef = useRef<Instance | null>(null);
   const mergedRef = useMergeRefs(forwardedRef, viewRef);
 
   const android_rippleConfig = useAndroidRippleForView(android_ripple, viewRef);
 
   const [pressed, setPressed] = usePressState(testOnly_pressed === true);
 
+  const shouldUpdatePressed =
+    typeof children === 'function' || typeof style === 'function';
+
   let _accessibilityState = {
     busy: ariaBusy ?? accessibilityState?.busy,
     checked: ariaChecked ?? accessibilityState?.checked,
@@ -297,7 +303,7 @@ function Pressable(props: Props, forwardedRef): React.Node {
         if (android_rippleConfig != null) {
           android_rippleConfig.onPressIn(event);
         }
-        setPressed(true);
+        shouldUpdatePressed && setPressed(true);
         if (onPressIn != null) {
           onPressIn(event);
         }
@@ -307,7 +313,7 @@ function Pressable(props: Props, forwardedRef): React.Node {
         if (android_rippleConfig != null) {
           android_rippleConfig.onPressOut(event);
         }
-        setPressed(false);
+        shouldUpdatePressed && setPressed(false);
         if (onPressOut != null) {
           onPressOut(event);
         }
@@ -330,6 +336,7 @@ function Pressable(props: Props, forwardedRef): React.Node {
       onPressOut,
       pressRetentionOffset,
       setPressed,
+      shouldUpdatePressed,
       unstable_pressDelay,
     ],
   );

package/Libraries/Components/Pressable/Pressable.win32.js

@@ -242,13 +242,16 @@ type Props = $ReadOnly<{|
   'aria-label'?: ?string,
 |}>;
 
+type Instance = React.ElementRef<typeof View>;
+
 /**
  * Component used to build display components that should respond to whether the
  * component is currently pressed or not.
  */
-/* $FlowFixMe[missing-local-annot] The type annotation(s) required by Flow's
- * LTI update could not be added via codemod */
-function Pressable(props: Props, forwardedRef): React.Node {
+function Pressable(
+  props: Props,
+  forwardedRef: React.RefSetter<Instance>,
+): React.Node {
   const {
     accessible,
     accessibilityState,
@@ -290,13 +293,16 @@ function Pressable(props: Props, forwardedRef): React.Node {
     ...restProps
   } = props;
 
-  const viewRef = useRef<React.ElementRef<typeof View> | null>(null);
+  const viewRef = useRef<Instance | null>(null);
   const mergedRef = useMergeRefs(forwardedRef, viewRef);
 
   const android_rippleConfig = useAndroidRippleForView(android_ripple, viewRef);
 
   const [pressed, setPressed] = usePressState(testOnly_pressed === true);
 
+  const shouldUpdatePressed =
+    typeof children === 'function' || typeof style === 'function';
+
   let _accessibilityState = {
     busy: ariaBusy ?? accessibilityState?.busy,
     checked: ariaChecked ?? accessibilityState?.checked,
@@ -354,7 +360,7 @@ function Pressable(props: Props, forwardedRef): React.Node {
         if (android_rippleConfig != null) {
           android_rippleConfig.onPressIn(event);
         }
-        setPressed(true);
+        shouldUpdatePressed && setPressed(true);
         if (onPressIn != null) {
           onPressIn(event);
         }
@@ -364,7 +370,7 @@ function Pressable(props: Props, forwardedRef): React.Node {
         if (android_rippleConfig != null) {
           android_rippleConfig.onPressOut(event);
         }
-        setPressed(false);
+        shouldUpdatePressed && setPressed(false);
         if (onPressOut != null) {
           onPressOut(event);
         }
@@ -399,6 +405,7 @@ function Pressable(props: Props, forwardedRef): React.Node {
       // Windows]
       pressRetentionOffset,
       setPressed,
+      shouldUpdatePressed,
       unstable_pressDelay,
     ],
   );

package/Libraries/Components/ScrollView/ScrollView.js

@@ -963,9 +963,13 @@ class ScrollView extends React.Component<Props, State> {
     let subscription: ?EventSubscription;
 
     this.setState(
-      ({onScrollEmitter}) => ({
-        onScrollEmitter: onScrollEmitter ?? new EventEmitter(),
-      }),
+      ({onScrollEmitter}) => {
+        if (onScrollEmitter) {
+          return null;
+        } else {
+          return {onScrollEmitter: new EventEmitter()};
+        }
+      },
       () => {
         // If `subscription` is null, that means it was removed before we got
         // here so do nothing.

package/Libraries/Core/ReactNativeVersion.js

@@ -17,7 +17,7 @@ const version: $ReadOnly<{
   major: 0,
   minor: 75,
   patch: 0,
-  prerelease: 'nightly-20240518-93c079b92',
+  prerelease: 'nightly-20240525-840c31c3a',
 };
 
 module.exports = {version};

package/Libraries/Inspector/ElementProperties.js

@@ -71,7 +71,7 @@ class ElementProperties extends React.Component<Props> {
             <View style={styles.col}>
               <StyleInspector style={style} />
             </View>
-            {<BoxInspector style={style} frame={this.props.frame} />}
+            <BoxInspector style={style} frame={this.props.frame} />
           </View>
         </View>
       </TouchableWithoutFeedback>

package/Libraries/JSInspector/NetworkAgent.js

@@ -232,7 +232,7 @@ class Interceptor {
     const event: LoadingFinishedEvent = {
       requestId: String(id),
       timestamp: JSInspector.getTimestamp(),
-      encodedDataLength: encodedDataLength,
+      encodedDataLength,
     };
     this._agent.sendEvent('loadingFinished', event);
   }

package/overrides.json

@@ -7,7 +7,7 @@
     "**/__snapshots__/**",
     "src-win/rntypes/**"
   ],
-  "baseVersion": "0.75.0-nightly-20240518-93c079b92",
+  "baseVersion": "0.75.0-nightly-20240525-840c31c3a",
   "overrides": [
     {
       "type": "derived",
@@ -92,7 +92,7 @@
       "type": "patch",
       "file": "src-win/Libraries/Components/Pressable/Pressable.win32.js",
       "baseFile": "packages/react-native/Libraries/Components/Pressable/Pressable.js",
-      "baseHash": "63cc0b16c930ef07a0570d1b8e4abc51a77d06dc",
+      "baseHash": "77ec40a2f6a75280b170fe839813d8712c90fbfb",
       "issue": 6240
     },
     {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@office-iss/react-native-win32",
-  "version": "0.0.0-canary.250",
+  "version": "0.0.0-canary.251",
   "description": "Implementation of react native on top of Office's Win32 platform.",
   "repository": {
     "type": "git",
@@ -30,13 +30,13 @@
     "@react-native-community/cli-platform-android": "14.0.0-alpha.2",
     "@react-native-community/cli-platform-ios": "14.0.0-alpha.2",
     "@react-native/assets": "1.0.0",
-    "@react-native/assets-registry": "0.75.0-nightly-20240518-93c079b92",
-    "@react-native/codegen": "0.75.0-nightly-20240518-93c079b92",
-    "@react-native/community-cli-plugin": "0.75.0-nightly-20240518-93c079b92",
-    "@react-native/gradle-plugin": "0.75.0-nightly-20240518-93c079b92",
-    "@react-native/js-polyfills": "0.75.0-nightly-20240518-93c079b92",
-    "@react-native/normalize-colors": "0.75.0-nightly-20240518-93c079b92",
-    "@react-native/virtualized-lists": "0.75.0-nightly-20240518-93c079b92",
+    "@react-native/assets-registry": "0.75.0-nightly-20240522-95de14dc5",
+    "@react-native/codegen": "0.75.0-nightly-20240522-95de14dc5",
+    "@react-native/community-cli-plugin": "0.75.0-nightly-20240522-95de14dc5",
+    "@react-native/gradle-plugin": "0.75.0-nightly-20240522-95de14dc5",
+    "@react-native/js-polyfills": "0.75.0-nightly-20240522-95de14dc5",
+    "@react-native/normalize-colors": "0.75.0-nightly-20240522-95de14dc5",
+    "@react-native/virtualized-lists": "0.75.0-nightly-20240522-95de14dc5",
     "abort-controller": "^3.0.0",
     "anser": "^1.4.9",
     "ansi-regex": "^5.0.0",
@@ -70,11 +70,11 @@
   "devDependencies": {
     "@babel/core": "^7.20.0",
     "@babel/eslint-parser": "^7.20.0",
-    "@react-native/metro-config": "0.75.0-nightly-20240518-93c079b92",
+    "@react-native/metro-config": "0.75.0-nightly-20240522-95de14dc5",
     "@rnw-scripts/babel-react-native-config": "0.0.0",
-    "@rnw-scripts/eslint-config": "1.2.20",
-    "@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.1.24",
-    "@rnw-scripts/just-task": "2.3.36",
+    "@rnw-scripts/eslint-config": "1.2.21",
+    "@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.1.25",
+    "@rnw-scripts/just-task": "2.3.37",
     "@rnw-scripts/metro-dev-config": "0.0.0",
     "@rnx-kit/jest-preset": "^0.1.0",
     "@types/node": "^18.0.0",
@@ -86,14 +86,14 @@
     "just-scripts": "^1.3.3",
     "prettier": "2.8.8",
     "react": "18.3.1",
-    "react-native": "0.75.0-nightly-20240518-93c079b92",
-    "react-native-platform-override": "^1.9.37",
+    "react-native": "0.75.0-nightly-20240525-840c31c3a",
+    "react-native-platform-override": "^1.9.38",
     "typescript": "5.0.4"
   },
   "peerDependencies": {
     "@types/react": "^18.2.6",
     "react": "^18.2.0",
-    "react-native": "0.75.0-nightly-20240518-93c079b92"
+    "react-native": "0.75.0-nightly-20240522-95de14dc5"
   },
   "beachball": {
     "defaultNpmTag": "canary",

package/src/private/featureflags/ReactNativeFeatureFlags.js

@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  *
- * @generated SignedSource<<20c3c50d2124fbfc7bbe434c940ce3bf>>
+ * @generated SignedSource<<63e7a8952026600cb58367e9c70fb68d>>
  * @flow strict-local
  */
 
@@ -170,7 +170,7 @@ export const lazyAnimationCallbacks: Getter<boolean> = createNativeFlagGetter('l
 /**
  * When enabled, ParagraphShadowNode will no longer call measure twice.
  */
-export const preventDoubleTextMeasure: Getter<boolean> = createNativeFlagGetter('preventDoubleTextMeasure', false);
+export const preventDoubleTextMeasure: Getter<boolean> = createNativeFlagGetter('preventDoubleTextMeasure', true);
 /**
  * Propagate layout direction to Android views.
  */