Skip to content

Commit 774ec74

Browse files
author
Harini Malothu
committed
Integrate RN 0.85.0-nightly-20260114-f15985f4f
1 parent 387cd8a commit 774ec74

67 files changed

Lines changed: 432 additions & 342 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎packages/@office-iss/react-native-win32-tester/overrides.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"excludePatterns": [
66
"src/js/examples-win32/**"
77
],
8-
"baseVersion": "0.84.0-nightly-20260107-58bc6c3e3",
8+
"baseVersion": "0.85.0-nightly-20260114-f15985f4f",
99
"overrides": [
1010
{
1111
"type": "patch",

‎packages/@office-iss/react-native-win32/.flowconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,4 +175,4 @@ untyped-import
175175
untyped-type-import
176176

177177
[version]
178-
^0.295.0
178+
^0.296.1

‎packages/@office-iss/react-native-win32/overrides.json‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
"**/__snapshots__/**",
88
"src-win/rntypes/**"
99
],
10-
"baseVersion": "0.84.0-nightly-20260107-58bc6c3e3",
10+
"baseVersion": "0.85.0-nightly-20260114-f15985f4f",
1111
"overrides": [
1212
{
1313
"type": "derived",
1414
"file": ".flowconfig",
1515
"baseFile": ".flowconfig",
16-
"baseHash": "49be0404a6bbdf103616a7506ad8a27874048119"
16+
"baseHash": "3e63114f0431abfd021daff6285787377f3f464f"
1717
},
1818
{
1919
"type": "derived",
@@ -66,7 +66,7 @@
6666
"type": "derived",
6767
"file": "src-win/Libraries/Components/Button.win32.js",
6868
"baseFile": "packages/react-native/Libraries/Components/Button.js",
69-
"baseHash": "ef86e2343f5213a5f230c63a1ddf12cbe6fa946c"
69+
"baseHash": "86868c251bb5f5f62af9562cd6513ca1d5ee172d"
7070
},
7171
{
7272
"type": "platform",
@@ -91,7 +91,7 @@
9191
"type": "patch",
9292
"file": "src-win/Libraries/Components/Pressable/Pressable.win32.js",
9393
"baseFile": "packages/react-native/Libraries/Components/Pressable/Pressable.js",
94-
"baseHash": "b8d87e48400468e702509ad24dab05f0a492aa19",
94+
"baseHash": "5ff66c1735078860d360204d9e4471c05cf0fb1e",
9595
"issue": 6240
9696
},
9797
{
@@ -114,13 +114,13 @@
114114
"type": "derived",
115115
"file": "src-win/Libraries/Components/TextInput/TextInput.flow.win32.js",
116116
"baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.flow.js",
117-
"baseHash": "e36bacf69caef9e59e1f62f9ee4335c6879ef0ed"
117+
"baseHash": "6ea370fcabb5bb0db9682ed28ed832d971937caa"
118118
},
119119
{
120120
"type": "derived",
121121
"file": "src-win/Libraries/Components/TextInput/TextInput.win32.js",
122122
"baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.js",
123-
"baseHash": "cc397bb3c850bb0a02f4b3134fdcbc2d9b597b80"
123+
"baseHash": "dd89cd7044a790007febaeb8ef6c40e4c9cbdf41"
124124
},
125125
{
126126
"type": "patch",
@@ -159,7 +159,7 @@
159159
"type": "derived",
160160
"file": "src-win/Libraries/Components/Touchable/TouchableNativeFeedback.win32.js",
161161
"baseFile": "packages/react-native/Libraries/Components/Touchable/TouchableNativeFeedback.js",
162-
"baseHash": "d48f21572fc72cf6d79df5aac775fb67d4f1abb4"
162+
"baseHash": "7adb86e9810269266c8d1f9d252dc541a7030b75"
163163
},
164164
{
165165
"type": "platform",
@@ -195,7 +195,7 @@
195195
"type": "derived",
196196
"file": "src-win/Libraries/Components/View/ViewAccessibility.win32.js",
197197
"baseFile": "packages/react-native/Libraries/Components/View/ViewAccessibility.js",
198-
"baseHash": "3cc8eebf202cb43189f4c2cb91db01b622572411"
198+
"baseHash": "a4e4e6f4bf2df4685da8fa72a0dc63aee8c4b5db"
199199
},
200200
{
201201
"type": "derived",
@@ -207,7 +207,7 @@
207207
"type": "patch",
208208
"file": "src-win/Libraries/Components/View/ViewPropTypes.win32.js",
209209
"baseFile": "packages/react-native/Libraries/Components/View/ViewPropTypes.js",
210-
"baseHash": "3f85fd36b8c098a91f965e9150e53d77ff3aa432",
210+
"baseHash": "138a0f01dfe3524a61cf585461867fd522e49964",
211211
"issue": 6240
212212
},
213213
{
@@ -296,32 +296,32 @@
296296
"type": "derived",
297297
"file": "src-win/Libraries/LogBox/UI/LogBoxInspectorCodeFrame.win32.js",
298298
"baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorCodeFrame.js",
299-
"baseHash": "9554eb5c48570b8a84a6fa77addccd816d0dbacf"
299+
"baseHash": "c53eedb18ebef127f2306a42708b032ce03307c5"
300300
},
301301
{
302302
"type": "patch",
303303
"file": "src-win/Libraries/LogBox/UI/LogBoxInspectorHeader.win32.js",
304304
"baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorHeader.js",
305-
"baseHash": "614a9137be35124ce4d555c3e766568a690a9937",
305+
"baseHash": "3d342d4c28ce5deafecf22682522fdb275ae41bf",
306306
"issue": 7952
307307
},
308308
{
309309
"type": "derived",
310310
"file": "src-win/Libraries/LogBox/UI/LogBoxInspectorReactFrames.win32.js",
311311
"baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorReactFrames.js",
312-
"baseHash": "cdf958aebabbe9067d34a2df3e6f2fe7ce09f51e"
312+
"baseHash": "47de16261eb2a5397b4bab247153fbcd8d7a3076"
313313
},
314314
{
315315
"type": "derived",
316316
"file": "src-win/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.win32.js",
317317
"baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorSourceMapStatus.js",
318-
"baseHash": "ccbfc8413dc7bd26eb7bc9726b273f1cf23b1c70"
318+
"baseHash": "cebcc81fbc845286a04ffa5c1585155b058fd0b0"
319319
},
320320
{
321321
"type": "derived",
322322
"file": "src-win/Libraries/LogBox/UI/LogBoxInspectorStackFrame.win32.js",
323323
"baseFile": "packages/react-native/Libraries/LogBox/UI/LogBoxInspectorStackFrame.js",
324-
"baseHash": "f91edc40bb2bb20bb94be69e6d8af2aa8d53ca8e",
324+
"baseHash": "b498a05f1276dca29f4e44d0eb5fd80bcc8a4222",
325325
"issue": 5885
326326
},
327327
{
@@ -371,7 +371,7 @@
371371
"type": "patch",
372372
"file": "src-win/Libraries/Pressability/Pressability.win32.js",
373373
"baseFile": "packages/react-native/Libraries/Pressability/Pressability.js",
374-
"baseHash": "10801e10120946aa4c721d13f3b8f455d0f43db8",
374+
"baseHash": "623bd2db2402499786aa79161ec7bfa10577a404",
375375
"issue": 6240
376376
},
377377
{
@@ -431,26 +431,26 @@
431431
"type": "derived",
432432
"file": "src-win/Libraries/Text/Text.win32.js",
433433
"baseFile": "packages/react-native/Libraries/Text/Text.js",
434-
"baseHash": "914f50544d09bc3bfe2ea3e34951e47e52d2dd87"
434+
"baseHash": "74cfb0cdb33d310206989381bccd0e00a7900078"
435435
},
436436
{
437437
"type": "derived",
438438
"file": "src-win/Libraries/Text/TextNativeComponent.win32.js",
439439
"baseFile": "packages/react-native/Libraries/Text/TextNativeComponent.js",
440-
"baseHash": "e1c95809fd0819c130f77dc2a61399b01b5dd687",
440+
"baseHash": "48d3dec45a0737147f7dbaa53b81bd4514ec3773",
441441
"issue": 7074
442442
},
443443
{
444444
"type": "derived",
445445
"file": "src-win/Libraries/Text/TextProps.win32.js",
446446
"baseFile": "packages/react-native/Libraries/Text/TextProps.js",
447-
"baseHash": "ddeedf097aec999824c4e9d246fdf6fefd61dc76"
447+
"baseHash": "7c4f916e4b08bcffaed10144506ff99b0781fc20"
448448
},
449449
{
450450
"type": "patch",
451451
"file": "src-win/Libraries/Types/CoreEventTypes.win32.js",
452452
"baseFile": "packages/react-native/Libraries/Types/CoreEventTypes.js",
453-
"baseHash": "5834bb306dcf85772546feae7af58a875196d309",
453+
"baseHash": "f28ed059b210c9552fde4b43521980ba02f18c33",
454454
"issue": 6240
455455
},
456456
{
@@ -464,7 +464,7 @@
464464
"type": "derived",
465465
"file": "src-win/Libraries/Utilities/Dimensions.win32.js",
466466
"baseFile": "packages/react-native/Libraries/Utilities/Dimensions.js",
467-
"baseHash": "58a45ebaadbfa79e4e1463738ff85d6dcf8348ea"
467+
"baseHash": "23420f7f7fe6d90fc8c9cc84aaf6424cbf12c0b2"
468468
},
469469
{
470470
"type": "platform",
@@ -503,7 +503,7 @@
503503
"type": "patch",
504504
"file": "src-win/src/private/animated/NativeAnimatedHelper.win32.js",
505505
"baseFile": "packages/react-native/src/private/animated/NativeAnimatedHelper.js",
506-
"baseHash": "90277c8c54231153433c8e5ef9d0478a41a9138c",
506+
"baseHash": "8d8ffd25d13e27e78900e3e90a686df9e2339159",
507507
"issue": 11041
508508
},
509509
{

‎packages/@office-iss/react-native-win32/src-win/Libraries/Components/Button.win32.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import View from './View/View';
2828
import invariant from 'invariant';
2929
import * as React from 'react';
3030

31-
export type ButtonProps = $ReadOnly<{
31+
export type ButtonProps = Readonly<{
3232
/**
3333
Text to display inside the button. On Android the given title will be
3434
converted to the uppercased form.

‎packages/@office-iss/react-native-win32/src-win/Libraries/Components/Pressable/Pressable.win32.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ import View from '../View/View';
3636

3737
export type {PressableAndroidRippleConfig};
3838

39-
export type PressableStateCallbackType = $ReadOnly<{
39+
export type PressableStateCallbackType = Readonly<{
4040
pressed: boolean,
4141
}>;
4242

43-
type PressableBaseProps = $ReadOnly<{
43+
type PressableBaseProps = Readonly<{
4444
/**
4545
* Whether a press gesture can be interrupted by a parent gesture such as a
4646
* scroll event. Defaults to true.
@@ -203,7 +203,7 @@ type PressableBaseProps = $ReadOnly<{
203203
unstable_pressDelay?: ?number,
204204
}>;
205205

206-
export type PressableProps = $ReadOnly<{
206+
export type PressableProps = Readonly<{
207207
// Pressability may override `onMouseEnter` and `onMouseLeave` to
208208
// implement `onHoverIn` and `onHoverOut` in a platform-agnostic way.
209209
// Hover events should be used instead of mouse events.

‎packages/@office-iss/react-native-win32/src-win/Libraries/Components/TextInput/TextInput.flow.win32.js‎

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import * as React from 'react';
2525
/**
2626
* @see TextInputProps.onChange
2727
*/
28-
type TextInputChangeEventData = $ReadOnly<{
28+
type TextInputChangeEventData = Readonly<{
2929
eventCount: number,
3030
target: number,
3131
text: string,
@@ -35,10 +35,10 @@ export type TextInputChangeEvent =
3535
NativeSyntheticEvent<TextInputChangeEventData>;
3636

3737
export type TextInputEvent = NativeSyntheticEvent<
38-
$ReadOnly<{
38+
Readonly<{
3939
eventCount: number,
4040
previousText: string,
41-
range: $ReadOnly<{
41+
range: Readonly<{
4242
start: number,
4343
end: number,
4444
}>,
@@ -47,9 +47,9 @@ export type TextInputEvent = NativeSyntheticEvent<
4747
}>,
4848
>;
4949

50-
type TextInputContentSizeChangeEventData = $ReadOnly<{
50+
type TextInputContentSizeChangeEventData = Readonly<{
5151
target: number,
52-
contentSize: $ReadOnly<{
52+
contentSize: Readonly<{
5353
width: number,
5454
height: number,
5555
}>,
@@ -73,17 +73,17 @@ export type TextInputBlurEvent = BlurEvent;
7373
*/
7474
export type TextInputFocusEvent = FocusEvent;
7575

76-
type TargetEvent = $ReadOnly<{
76+
type TargetEvent = Readonly<{
7777
target: number,
7878
...
7979
}>;
8080

81-
export type Selection = $ReadOnly<{
81+
export type Selection = Readonly<{
8282
start: number,
8383
end: number,
8484
}>;
8585

86-
type TextInputSelectionChangeEventData = $ReadOnly<{
86+
type TextInputSelectionChangeEventData = Readonly<{
8787
...TargetEvent,
8888
selection: Selection,
8989
...
@@ -95,7 +95,7 @@ type TextInputSelectionChangeEventData = $ReadOnly<{
9595
export type TextInputSelectionChangeEvent =
9696
NativeSyntheticEvent<TextInputSelectionChangeEventData>;
9797

98-
type TextInputKeyPressEventData = $ReadOnly<{
98+
type TextInputKeyPressEventData = Readonly<{
9999
...TargetEvent,
100100
key: string,
101101
target?: ?number,
@@ -109,7 +109,7 @@ type TextInputKeyPressEventData = $ReadOnly<{
109109
export type TextInputKeyPressEvent =
110110
NativeSyntheticEvent<TextInputKeyPressEventData>;
111111

112-
type TextInputEndEditingEventData = $ReadOnly<{
112+
type TextInputEndEditingEventData = Readonly<{
113113
...TargetEvent,
114114
eventCount: number,
115115
text: string,
@@ -122,7 +122,7 @@ type TextInputEndEditingEventData = $ReadOnly<{
122122
export type TextInputEndEditingEvent =
123123
NativeSyntheticEvent<TextInputEndEditingEventData>;
124124

125-
type TextInputSubmitEditingEventData = $ReadOnly<{
125+
type TextInputSubmitEditingEventData = Readonly<{
126126
...TargetEvent,
127127
eventCount: number,
128128
text: string,
@@ -266,7 +266,7 @@ export type EnterKeyHintTypeOptions =
266266

267267
type PasswordRules = string;
268268

269-
export type TextInputIOSProps = $ReadOnly<{
269+
export type TextInputIOSProps = Readonly<{
270270
/**
271271
* If true, the keyboard shortcuts (undo/redo and copy buttons) are disabled. The default value is false.
272272
* @platform ios
@@ -403,7 +403,7 @@ export type TextInputIOSProps = $ReadOnly<{
403403
smartInsertDelete?: ?boolean,
404404
}>;
405405

406-
export type TextInputAndroidProps = $ReadOnly<{
406+
export type TextInputAndroidProps = Readonly<{
407407
/**
408408
* When provided it will set the color of the cursor (or "caret") in the component.
409409
* Unlike the behavior of `selectionColor` the cursor color will be set independently
@@ -512,6 +512,9 @@ export type TextInputAndroidProps = $ReadOnly<{
512512
underlineColorAndroid?: ?ColorValue,
513513
}>;
514514

515+
<<<<<<< Upstream
516+
type TextInputBaseProps = Readonly<{
517+
=======
515518
// [Windows
516519

517520
type SubmitKeyEvent = $ReadOnly<{|
@@ -539,6 +542,7 @@ export type TextInputWindowsProps = $ReadOnly<{|
539542
// Windows]
540543

541544
type TextInputBaseProps = $ReadOnly<{
545+
>>>>>>> Override
542546
/**
543547
* When provided, the text input will only accept drag and drop events for the specified
544548
* types. If null or not provided, the text input will accept all types of drag and drop events.
@@ -979,7 +983,7 @@ type TextInputBaseProps = $ReadOnly<{
979983
* The start and end of the text input's selection. Set start and end to
980984
* the same value to position the cursor.
981985
*/
982-
selection?: ?$ReadOnly<{
986+
selection?: ?Readonly<{
983987
start: number,
984988
end?: ?number,
985989
}>,
@@ -1064,8 +1068,13 @@ type TextInputBaseProps = $ReadOnly<{
10641068
textAlign?: ?('left' | 'center' | 'right'),
10651069
}>;
10661070

1071+
<<<<<<< Upstream
1072+
export type TextInputProps = Readonly<{
1073+
...Omit<ViewProps, 'style' | 'experimental_accessibilityOrder'>,
1074+
=======
10671075
export type TextInputProps = $ReadOnly<{
10681076
...Omit<ViewProps, 'style'>,
1077+
>>>>>>> Override
10691078
...TextInputIOSProps,
10701079
...TextInputAndroidProps,
10711080
...TextInputBaseProps,
@@ -1201,8 +1210,8 @@ type InternalTextInput = component(
12011210
...TextInputProps
12021211
);
12031212

1204-
export type TextInputComponentStatics = $ReadOnly<{
1205-
State: $ReadOnly<{
1213+
export type TextInputComponentStatics = Readonly<{
1214+
State: Readonly<{
12061215
currentlyFocusedInput: () => ?HostInstance,
12071216
currentlyFocusedField: () => ?number,
12081217
focusTextInput: (textField: ?HostInstance) => void,

‎packages/@office-iss/react-native-win32/src-win/Libraries/Components/TextInput/TextInput.win32.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ export type {
133133
TextInputWindowsProps, // [Windows]
134134
};
135135

136-
type TextInputStateType = $ReadOnly<{
136+
type TextInputStateType = Readonly<{
137137
/**
138138
* @deprecated Use currentlyFocusedInput
139139
* Returns the ID of the currently focused text field, if one exists
@@ -1102,7 +1102,7 @@ TextInput.State = {
11021102
focusTextInput: TextInputState.focusTextInput,
11031103
};
11041104

1105-
export type TextInputComponentStatics = $ReadOnly<{
1105+
export type TextInputComponentStatics = Readonly<{
11061106
State: TextInputStateType,
11071107
}>;
11081108

0 commit comments

Comments
 (0)