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": "integration 8/26/22",
"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": "minor",
"comment": "integration 8/26/22",
"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": "integration 8/26/22",
"packageName": "@react-native-windows/virtualized-list",
"email": "tatianakapos@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "integration 8/26/22",
"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.0.0-20220812-2104-23429330a",
"baseVersion": "0.0.0-20220826-2018-9ac437f25",
"overrides": [
{
"type": "patch",
Expand Down
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 @@ -18,7 +18,7 @@
"peerDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.163",
"react": "18.0.0",
"react-native": "0.0.0-20220812-2104-23429330a"
"react-native": "0.0.0-20220826-2018-9ac437f25"
},
"devDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.163",
Expand All @@ -29,7 +29,7 @@
"@types/node": "^14.14.22",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.0.0-20220812-2104-23429330a",
"react-native": "0.0.0-20220826-2018-9ac437f25",
"react-native-platform-override": "^1.7.1",
"typescript": "^4.4.4"
},
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 @@ -124,4 +124,4 @@ untyped-import
untyped-type-import

[version]
^0.184.0
^0.185.1
16 changes: 8 additions & 8 deletions packages/@office-iss/react-native-win32/overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
"**/__snapshots__/**",
"src/rntypes/**"
],
"baseVersion": "0.0.0-20220812-2104-23429330a",
"baseVersion": "0.0.0-20220826-2018-9ac437f25",
"overrides": [
{
"type": "derived",
"file": ".flowconfig",
"baseFile": ".flowconfig",
"baseHash": "e7e5f1d81cb946157ecfb9392585958b5fac442d"
"baseHash": "96ff12c38ea31691ca99dd8848e38217ffbd1417"
},
{
"type": "derived",
Expand All @@ -31,7 +31,7 @@
"type": "patch",
"file": "src/Libraries/Components/AccessibilityInfo/AccessibilityInfo.win32.js",
"baseFile": "Libraries/Components/AccessibilityInfo/AccessibilityInfo.js",
"baseHash": "318fa0b04d231c747d95bc4fb34a9a4152009786",
"baseHash": "86911d26a839aa1ebe91b6abc0fe910e09ba62e5",
"issue": 4578
},
{
Expand All @@ -53,7 +53,7 @@
"type": "copy",
"file": "src/Libraries/Components/DatePicker/DatePickerIOS.win32.js",
"baseFile": "Libraries/Components/DatePicker/DatePickerIOS.android.js",
"baseHash": "3c5bb9a7284f3a0a19d309bdf54701b865f9c56b",
"baseHash": "d4d3f2157abce118c9b9ad63ab2cad0cfa1979a0",
"issue": 4378
},
{
Expand Down Expand Up @@ -117,7 +117,7 @@
"type": "derived",
"file": "src/Libraries/Components/TextInput/TextInput.win32.tsx",
"baseFile": "Libraries/Components/TextInput/TextInput.js",
"baseHash": "44fadc4a6bc51291e44f6bb8d7f38563e63bcbff"
"baseHash": "9cff22dbd054762b03f9e40ce45b03cca67a62f5"
},
{
"type": "patch",
Expand Down Expand Up @@ -183,7 +183,7 @@
"type": "patch",
"file": "src/Libraries/Components/View/ViewPropTypes.win32.js",
"baseFile": "Libraries/Components/View/ViewPropTypes.js",
"baseHash": "52170daa86f15afc549b4f284371e4c4154aa3dd",
"baseHash": "40cda23c445a8edaa16e6d7b924963da70bc374c",
"issue": 6240
},
{
Expand Down Expand Up @@ -259,7 +259,7 @@
"type": "patch",
"file": "src/Libraries/Inspector/Inspector.win32.js",
"baseFile": "Libraries/Inspector/Inspector.js",
"baseHash": "a335353c8e7299f8de2601104e2056eeb16ea041"
"baseHash": "f3f862f878ce5252067ecb9f86b3a6057493b8dc"
},
{
"type": "patch",
Expand Down Expand Up @@ -429,7 +429,7 @@
"type": "patch",
"file": "src/Libraries/StyleSheet/StyleSheet.win32.js",
"baseFile": "Libraries/StyleSheet/StyleSheet.js",
"baseHash": "975f5840fa52fd7e66e136d0ff1ae805be119419"
"baseHash": "3e851444e5a21392bcd1a84418729feedd25a527"
},
{
"type": "derived",
Expand Down
18 changes: 9 additions & 9 deletions packages/@office-iss/react-native-win32/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
"dependencies": {
"@babel/runtime": "^7.0.0",
"@jest/create-cache-key-function": "^27.0.1",
"@react-native-community/cli": "^9.0.0-alpha.11",
"@react-native-community/cli-platform-android": "^9.0.0-alpha.10",
"@react-native-community/cli-platform-ios": "^9.0.0-alpha.10",
"@react-native-community/cli": "^9.0.0",
"@react-native-community/cli-platform-android": "^9.0.0",
"@react-native-community/cli-platform-ios": "^9.0.0",
"@react-native-windows/virtualized-list": "0.0.0-canary.52",
"@react-native/assets": "1.0.0",
"@react-native/normalize-color": "2.0.0",
Expand All @@ -37,9 +37,9 @@
"invariant": "^2.2.4",
"jsc-android": "^250230.2.1",
"memoize-one": "^5.0.0",
"metro-react-native-babel-transformer": "0.72.0",
"metro-runtime": "0.72.0",
"metro-source-map": "0.72.0",
"metro-react-native-babel-transformer": "0.72.1",
"metro-runtime": "0.72.1",
"metro-source-map": "0.72.1",
"mkdirp": "^0.5.1",
"nullthrows": "^1.1.1",
"pretty-format": "^26.5.2",
Expand Down Expand Up @@ -71,19 +71,19 @@
"@types/react": "^18.0.0",
"@types/react-native": "^0.66.17",
"eslint": "^8.19.0",
"flow-bin": "^0.184.0",
"flow-bin": "^0.185.1",
"jscodeshift": "^0.13.1",
"just-scripts": "^1.3.3",
"prettier": "^2.4.1",
"react": "18.2.0",
"react-native": "0.0.0-20220812-2104-23429330a",
"react-native": "0.0.0-20220826-2018-9ac437f25",
"react-native-platform-override": "^1.7.1",
"react-shallow-renderer": "16.14.1",
"typescript": "^4.4.4"
},
"peerDependencies": {
"react": "18.2.0",
"react-native": "0.0.0-20220812-2104-23429330a"
"react-native": "0.0.0-20220826-2018-9ac437f25"
},
"beachball": {
"defaultNpmTag": "canary",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import NativeAccessibilityInfo from './NativeAccessibilityInfo';
import NativeAccessibilityManagerIOS from './NativeAccessibilityManager';
import legacySendAccessibilityEvent from './legacySendAccessibilityEvent';
import type {ElementRef} from 'react';
import type {AccessibilityInfo as AccessibilityInfoType} from './AccessibilityInfo.flow';

// Events that are only supported on Android.
type AccessibilityEventDefinitionsAndroid = {
Expand Down Expand Up @@ -79,7 +80,7 @@ const EventNames: Map<
*
* See https://reactnative.dev/docs/accessibilityinfo
*/
const AccessibilityInfo = {
const AccessibilityInfo: AccessibilityInfoType = {
/**
* Query whether bold text is currently enabled.
*
Expand Down Expand Up @@ -184,6 +185,34 @@ const AccessibilityInfo = {
});
},

/**
* Query whether reduce motion and prefer cross-fade transitions settings are currently enabled.
*
* Returns a promise which resolves to a boolean.
* The result is `true` when prefer cross-fade transitions is enabled and `false` otherwise.
*
* See https://reactnative.dev/docs/accessibilityinfo#prefersCrossFadeTransitions
*/
prefersCrossFadeTransitions(): Promise<boolean> {
return new Promise((resolve, reject) => {
if (Platform.OS === 'android') {
return Promise.resolve(false);
} else {
if (
NativeAccessibilityManagerIOS?.getCurrentPrefersCrossFadeTransitionsState !=
null
) {
NativeAccessibilityManagerIOS.getCurrentPrefersCrossFadeTransitionsState(
resolve,
reject,
);
} else {
reject(null);
}
}
});
},

/**
* Query whether reduced transparency is currently enabled.
*
Expand Down Expand Up @@ -301,6 +330,7 @@ const AccessibilityInfo = {
*/
addEventListener<K: $Keys<AccessibilityEventDefinitions>>(
eventName: K,
// $FlowIssue[incompatible-type] - Flow bug with unions and generics (T128099423)
handler: (...$ElementType<AccessibilityEventDefinitions, K>) => void,
): EventSubscription {
const deviceEventName = EventNames.get(eventName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import * as React from 'react';
import StyleSheet from '../../StyleSheet/StyleSheet';
import Text from '../../Text/Text';
import View from '../View/View';
import type {DatePickerIOSType} from './DatePickerIOS.flow';

class DummyDatePickerIOS extends React.Component {
render() {
Expand Down Expand Up @@ -42,4 +43,4 @@ const styles = StyleSheet.create({
},
});

module.exports = DummyDatePickerIOS;
module.exports = (DummyDatePickerIOS: DatePickerIOSType);
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ type PointerEventProps = $ReadOnly<{|
onPointerDownCapture?: ?(e: PointerEvent) => void,
onPointerUp?: ?(e: PointerEvent) => void,
onPointerUpCapture?: ?(e: PointerEvent) => void,
onPointerOver?: ?(e: PointerEvent) => void,
onPointerOverCapture?: ?(e: PointerEvent) => void,
onPointerOut?: ?(e: PointerEvent) => void,
onPointerOutCapture?: ?(e: PointerEvent) => void,
|}>;

type FocusEventProps = $ReadOnly<{|
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,54 +146,16 @@ class Inspector extends React.Component<
}

_attachToDevtools = (agent: Object) => {
agent.addListener('hideNativeHighlight', this._onAgentHideNativeHighlight);
agent.addListener('showNativeHighlight', this._onAgentShowNativeHighlight);
agent.addListener('shutdown', this._onAgentShutdown);

this.setState({
devtoolsAgent: agent,
});
};

_onAgentHideNativeHighlight = () => {
if (this.state.inspected === null) {
return;
}
// we wait to actually hide in order to avoid flicker
this._hideTimeoutID = setTimeout(() => {
this.setState({
inspected: null,
});
}, 100);
};

_onAgentShowNativeHighlight = (node: any) => {
clearTimeout(this._hideTimeoutID);

// Shape of `node` is different in Fabric.
const component = node.canonical ?? node;

component.measure((x, y, width, height, left, top) => {
this.setState({
hierarchy: [],
inspected: {
frame: {left, top, width, height},
},
});
});
};

_onAgentShutdown = () => {
const agent = this.state.devtoolsAgent;
if (agent != null) {
agent.removeListener(
'hideNativeHighlight',
this._onAgentHideNativeHighlight,
);
agent.removeListener(
'showNativeHighlight',
this._onAgentShowNativeHighlight,
);
agent.removeListener('shutdown', this._onAgentShutdown);

this.setState({devtoolsAgent: null});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,12 @@ module.exports = {
return;
}

if (__DEV__ && typeof value.process === 'function') {
if (
__DEV__ &&
typeof value.process === 'function' &&
typeof ReactNativeStyleAttributes[property]?.process === 'function' &&
value.process !== ReactNativeStyleAttributes[property]?.process
) {
console.warn(`Overwriting ${property} style attribute preprocessor`);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"just-scripts": "^1.3.2",
"prettier": "^2.4.1",
"react": "18.2.0",
"react-native": "0.0.0-20220812-2104-23429330a",
"react-native": "0.0.0-20220826-2018-9ac437f25",
"react-native-windows": "^0.0.0-canary.565",
"typescript": "^4.4.4"
},
Expand All @@ -42,4 +42,4 @@
"engines": {
"node": ">= 14"
}
}
}
4 changes: 2 additions & 2 deletions packages/@react-native-windows/tester/overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"excludePatterns": [
"src/js/examples-win/**"
],
"baseVersion": "0.0.0-20220812-2104-23429330a",
"baseVersion": "0.0.0-20220826-2018-9ac437f25",
"overrides": [
{
"type": "patch",
Expand All @@ -25,7 +25,7 @@
"type": "patch",
"file": "src/js/examples/TextInput/TextInputExample.windows.js",
"baseFile": "packages/rn-tester/js/examples/TextInput/TextInputExample.android.js",
"baseHash": "75b31e8bd6e2f4eeb8f0fd4f9b35085350cfe364",
"baseHash": "332de8eb4961a98492b88178b0e21fab52cd5155",
"issue": 5688
},
{
Expand Down
6 changes: 3 additions & 3 deletions packages/@react-native-windows/tester/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"peerDependencies": {
"@react-native-picker/picker": "2.2.0",
"react": "18.0.0",
"react-native": "0.0.0-20220812-2104-23429330a",
"react-native": "0.0.0-20220826-2018-9ac437f25",
"react-native-windows": "^0.0.0-canary.565",
"react-native-xaml": "^0.0.50"
},
Expand All @@ -30,12 +30,12 @@
"@types/node": "^14.14.22",
"eslint": "^8.19.0",
"just-scripts": "^1.3.3",
"react-native": "0.0.0-20220812-2104-23429330a",
"react-native": "0.0.0-20220826-2018-9ac437f25",
"react-native-platform-override": "^1.7.1",
"react-native-windows": "^0.0.0-canary.565",
"typescript": "^4.4.4"
},
"engines": {
"node": ">= 14"
}
}
}
Loading