Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integrate 0.76.0-nightly-20240816-17017d2b8",
"packageName": "@office-iss/react-native-win32",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "patch",
"comment": "integrate 0.76.0-nightly-20240816-17017d2b8",
"packageName": "@react-native-windows/automation-channel",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integrate 0.76.0-nightly-20240816-17017d2b8",
"packageName": "react-native-windows",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"excludePatterns": [
"src/js/examples-win32/**"
],
"baseVersion": "0.76.0-nightly-20240719-6d56cea28",
"baseVersion": "0.76.0-nightly-20240816-17017d2b8",
"overrides": [
{
"type": "patch",
Expand All @@ -17,7 +17,7 @@
"type": "patch",
"file": "src/js/components/RNTesterExampleFilter.win32.js",
"baseFile": "packages/rn-tester/js/components/RNTesterExampleFilter.js",
"baseHash": "749b9de3afedb843fe9fe8c63c2e910b9f4e4c29"
"baseHash": "2b12495e7371031510b53ebcccdad627363c36ad"
},
{
"type": "platform",
Expand All @@ -42,7 +42,7 @@
"type": "derived",
"file": "src/js/utils/RNTesterList.win32.js",
"baseFile": "packages/rn-tester/js/utils/RNTesterList.android.js",
"baseHash": "587e2db8c14caac51f04005c129479d606e896a7"
"baseHash": "b40cdc34295381fbd40d38ade093cc0d198edd13"
}
]
}
4 changes: 2 additions & 2 deletions packages/@office-iss/react-native-win32-tester/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"peerDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.259",
"react": "18.0.0",
"react-native": "0.76.0-nightly-20240719-6d56cea28"
"react-native": "0.76.0-nightly-20240816-17017d2b8"
},
"devDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.259",
Expand All @@ -30,7 +30,7 @@
"@types/node": "^18.0.0",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.76.0-nightly-20240719-6d56cea28",
"react-native": "0.76.0-nightly-20240816-17017d2b8",
"react-native-platform-override": "^1.9.45",
"typescript": "5.0.4"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ class RNTesterExampleFilter<T> extends React.Component<Props<T>, State> {
}
}

_renderTextInput(): ?React.Element<any> {
_renderTextInput(): ?React.MixedElement {
if (this.props.disableSearch) {
return null;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,11 @@ const APIs: Array<RNTesterModuleInfo> = ([
module: require('../examples/Filter/FilterExample'),
},
/*
{
key: 'LinearGradient',
category: 'UI',
module: require('../examples/LinearGradient/LinearGradientExample'),
},
{
key: 'MixBlendModeExample',
category: 'UI',
Expand Down
2 changes: 1 addition & 1 deletion packages/@office-iss/react-native-win32/.flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -159,4 +159,4 @@ untyped-import
untyped-type-import

[version]
^0.241.0
^0.243.0
24 changes: 12 additions & 12 deletions packages/@office-iss/react-native-win32/overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@
"**/__snapshots__/**",
"src-win/rntypes/**"
],
"baseVersion": "0.76.0-nightly-20240719-6d56cea28",
"baseVersion": "0.76.0-nightly-20240816-17017d2b8",
"overrides": [
{
"type": "derived",
"file": ".flowconfig",
"baseFile": ".flowconfig",
"baseHash": "83d25eb077cc8d865039ec211f3fedeac9e57d39"
"baseHash": "3d94d14740956b3455abfbdff5e043212d04974b"
},
{
"type": "derived",
"file": "src-win/index.win32.js",
"baseFile": "packages/react-native/index.js",
"baseHash": "2690130ef7a40e3fb37fc465979e69b1036cdae8"
"baseHash": "dc1e45b643d33d868da60fa27da2cbda0231b7f3"
},
{
"type": "platform",
Expand Down Expand Up @@ -116,7 +116,7 @@
"type": "derived",
"file": "src-win/Libraries/Components/TextInput/TextInput.win32.js",
"baseFile": "packages/react-native/Libraries/Components/TextInput/TextInput.js",
"baseHash": "2cc1ee09c4a71e79656db18576b4983cfca153ed"
"baseHash": "259941a60002c5a2a4166a39404d099f0472941e"
},
{
"type": "patch",
Expand Down Expand Up @@ -174,7 +174,7 @@
"type": "patch",
"file": "src-win/Libraries/Components/View/ReactNativeViewAttributes.win32.js",
"baseFile": "packages/react-native/Libraries/Components/View/ReactNativeViewAttributes.js",
"baseHash": "8fc645a55ff86ceeac9c45f09d232586589ee7dc"
"baseHash": "4279b8fc936dbb03599892069fb7e3ceeb86b846"
},
{
"type": "patch",
Expand All @@ -186,7 +186,7 @@
"type": "derived",
"file": "src-win/Libraries/Components/View/ViewAccessibility.d.ts",
"baseFile": "packages/react-native/Libraries/Components/View/ViewAccessibility.d.ts",
"baseHash": "eafbdb8db89b98aafd23514173360e07a942d205"
"baseHash": "d97e29f01e57cc2b0de209a03f8584b984cfe190"
},
{
"type": "derived",
Expand All @@ -204,7 +204,7 @@
"type": "patch",
"file": "src-win/Libraries/Components/View/ViewPropTypes.win32.js",
"baseFile": "packages/react-native/Libraries/Components/View/ViewPropTypes.js",
"baseHash": "50bd550ba0710173ca3533b7b103075ecdda6b56",
"baseHash": "a742b26e4c96fdefb07779e40bc58cd1cc872675",
"issue": 6240
},
{
Expand Down Expand Up @@ -245,7 +245,7 @@
"type": "derived",
"file": "src-win/Libraries/Image/Image.win32.js",
"baseFile": "packages/react-native/Libraries/Image/Image.ios.js",
"baseHash": "f3298e1dac3f1cd3d277b15b916753535b677f04",
"baseHash": "e5cd104f5060ad354072889937ea92d508a32490",
"issue": 4320
},
{
Expand Down Expand Up @@ -344,7 +344,7 @@
"type": "derived",
"file": "src-win/Libraries/NativeComponent/BaseViewConfig.win32.js",
"baseFile": "packages/react-native/Libraries/NativeComponent/BaseViewConfig.ios.js",
"baseHash": "86178b8f2e04b5df9e4c8dc8ca412c22231e6673"
"baseHash": "91e7e2aacf6c1559247dccad0c581fde64202bf3"
},
{
"type": "copy",
Expand Down Expand Up @@ -427,7 +427,7 @@
"type": "patch",
"file": "src-win/Libraries/StyleSheet/StyleSheet.win32.js",
"baseFile": "packages/react-native/Libraries/StyleSheet/StyleSheet.js",
"baseHash": "5c01bd55040fb9d31534bd27b98fe9c3671994c0"
"baseHash": "acf84f21e80cce08afd0a56a2f79690641c7228e"
},
{
"type": "derived",
Expand All @@ -439,13 +439,13 @@
"type": "derived",
"file": "src-win/Libraries/Text/Text.win32.js",
"baseFile": "packages/react-native/Libraries/Text/Text.js",
"baseHash": "fa9abb0db816a992824228c520fc0381bf2a1f63"
"baseHash": "8ad2e56ba09c1b5428d50cfd71972c60502ed2e2"
},
{
"type": "derived",
"file": "src-win/Libraries/Text/TextNativeComponent.win32.js",
"baseFile": "packages/react-native/Libraries/Text/TextNativeComponent.js",
"baseHash": "1b2e6301edc13f3a91e47b9befe8a47a12e6ad39",
"baseHash": "dcb764530f8a6529152d9791597865034e2c36ae",
"issue": 7074
},
{
Expand Down
24 changes: 12 additions & 12 deletions packages/@office-iss/react-native-win32/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@
"dependencies": {
"@babel/runtime": "^7.0.0",
"@jest/create-cache-key-function": "^29.6.3",
"@react-native-community/cli": "14.0.0-alpha.11",
"@react-native-community/cli-platform-android": "14.0.0-alpha.11",
"@react-native-community/cli-platform-ios": "14.0.0-alpha.11",
"@react-native-community/cli": "14.0.0",
"@react-native-community/cli-platform-android": "14.0.0",
"@react-native-community/cli-platform-ios": "14.0.0",
"@react-native/assets": "1.0.0",
"@react-native/assets-registry": "0.76.0-nightly-20240719-6d56cea28",
"@react-native/codegen": "0.76.0-nightly-20240719-6d56cea28",
"@react-native/community-cli-plugin": "0.76.0-nightly-20240719-6d56cea28",
"@react-native/gradle-plugin": "0.76.0-nightly-20240719-6d56cea28",
"@react-native/js-polyfills": "0.76.0-nightly-20240719-6d56cea28",
"@react-native/normalize-colors": "0.76.0-nightly-20240719-6d56cea28",
"@react-native/virtualized-lists": "0.76.0-nightly-20240719-6d56cea28",
"@react-native/assets-registry": "0.76.0-nightly-20240816-17017d2b8",
"@react-native/codegen": "0.76.0-nightly-20240816-17017d2b8",
"@react-native/community-cli-plugin": "0.76.0-nightly-20240816-17017d2b8",
"@react-native/gradle-plugin": "0.76.0-nightly-20240816-17017d2b8",
"@react-native/js-polyfills": "0.76.0-nightly-20240816-17017d2b8",
"@react-native/normalize-colors": "0.76.0-nightly-20240816-17017d2b8",
"@react-native/virtualized-lists": "0.76.0-nightly-20240816-17017d2b8",
"abort-controller": "^3.0.0",
"anser": "^1.4.9",
"ansi-regex": "^5.0.0",
Expand Down Expand Up @@ -87,14 +87,14 @@
"just-scripts": "^1.3.3",
"prettier": "2.8.8",
"react": "19.0.0-rc-fb9a90fa48-20240614",
"react-native": "0.76.0-nightly-20240719-6d56cea28",
"react-native": "0.76.0-nightly-20240816-17017d2b8",
"react-native-platform-override": "^1.9.45",
"typescript": "5.0.4"
},
"peerDependencies": {
"@types/react": "^18.2.6",
"react": "^19.0.0-rc-fb9a90fa48-20240614",
"react-native": "0.76.0-nightly-20240719-6d56cea28"
"react-native": "0.76.0-nightly-20240816-17017d2b8"
},
"beachball": {
"defaultNpmTag": "canary",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
*/

import type {HostComponent} from '../../Renderer/shims/ReactNativeTypes';
import type {____TextStyle_Internal as TextStyleInternal} from '../../StyleSheet/StyleSheetTypes';
import type {
PressEvent,
ScrollEvent,
Expand Down Expand Up @@ -1641,10 +1642,18 @@ function InternalTextInput(props: Props): React.Node {
};
}

let style = flattenStyle<TextStyleProp>(props.style);
if (typeof style?.fontWeight === 'number') {
// $FlowFixMe
style = [style, {fontWeight: style.fontWeight.toString()}];
// Keep the original (potentially nested) style when possible, as React can diff these more efficiently
let _style = props.style;
const flattenedStyle = flattenStyle<TextStyleProp>(props.style);
if (typeof flattenedStyle?.fontWeight === 'number') {
_style = [
_style,
{
fontWeight:
// $FlowFixMe[incompatible-cast]
(flattenedStyle.fontWeight.toString(): TextStyleInternal['fontWeight']),
},
];
}

if (Platform.OS === 'ios') {
Expand All @@ -1655,10 +1664,10 @@ function InternalTextInput(props: Props): React.Node {

const useMultilineDefaultStyle =
props.multiline === true &&
(style == null ||
(style.padding == null &&
style.paddingVertical == null &&
style.paddingTop == null));
(flattenedStyle == null ||
(flattenedStyle.padding == null &&
flattenedStyle.paddingVertical == null &&
flattenedStyle.paddingTop == null));

textInput = (
<RCTTextInputView
Expand Down Expand Up @@ -1686,7 +1695,7 @@ function InternalTextInput(props: Props): React.Node {
selectionColor={selectionColor}
style={StyleSheet.compose(
useMultilineDefaultStyle ? styles.multilineDefault : null,
style,
_style,
)}
text={text}
/>
Expand Down Expand Up @@ -1754,7 +1763,7 @@ function InternalTextInput(props: Props): React.Node {
onScroll={_onScroll}
onSelectionChange={_onSelectionChange}
placeholder={placeholder}
style={style}
style={_style}
text={text}
textBreakStrategy={props.textBreakStrategy}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ const UIView = {
accessibilityValue: true,
accessibilityHint: true,
accessibilityLanguage: true,
accessibilityShowsLargeContentViewer: true,
accessibilityLargeContentTitle: true,
importantForAccessibility: true,
nativeID: true,
testID: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -366,6 +366,21 @@ export interface AccessibilityPropsIOS {
* @platform ios
*/
accessibilityLanguage?: string | undefined;

/**
* A Boolean value that indicates whether or not to show the item in the large content viewer.
* Available on iOS 13.0+
* https://reactnative.dev/docs/accessibility#accessibilityshowslargecontentviewer
* @platform ios
*/
accessibilityShowsLargeContentViewer?: boolean | undefined;

/**
* When `accessibilityShowsLargeContentViewer` is set, this string will be used as title for the large content viewer.
* https://reactnative.dev/docs/accessibility#accessibilitylargecontenttitle
* @platform ios
*/
accessibilityLargeContentTitle?: string | undefined;
}

// [Win32]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,20 @@ type IOSViewProps = $ReadOnly<{|
*/
accessibilityViewIsModal?: ?boolean,

/**
* @platform ios
*
* See https://reactnative.dev/docs/view#accessibilityshowslargecontentviewer
*/
accessibilityShowsLargeContentViewer?: ?boolean,

/**
* @platform ios
*
* See https://reactnative.dev/docs/view#accessibilitylargecontenttitle
*/
accessibilityLargeContentTitle?: ?string,

/**
* The aria-modal attribute indicates content contained within a modal with aria-modal="true"
* should be accessible to the user.
Expand Down
Loading