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 4/1 nightly RN build.",
"packageName": "@office-iss/react-native-win32",
"email": "igklemen@microsoft.com",
"dependentChangeType": "patch"
}
7 changes: 7 additions & 0 deletions change/node-rnw-rpc-c92c0604-9bde-41ca-950d-5ee18a05721f.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Integrate 4/1 nightly RN build.",
"packageName": "node-rnw-rpc",
"email": "igklemen@microsoft.com",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "Integrate 4/1 nightly RN build.",
"packageName": "react-native-windows",
"email": "igklemen@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-cfb5b5e20",
"baseVersion": "0.0.0-d04ec4dc6",
"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 @@ -15,7 +15,7 @@
},
"peerDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.86",
"react-native": "0.0.0-cfb5b5e20"
"react-native": "0.0.0-d04ec4dc6"
},
"devDependencies": {
"@office-iss/react-native-win32": "^0.0.0-canary.86",
Expand All @@ -24,7 +24,7 @@
"@types/node": "^14.14.22",
"eslint": "7.12.0",
"just-scripts": "^1.3.3",
"react-native": "0.0.0-cfb5b5e20",
"react-native": "0.0.0-d04ec4dc6",
"react-native-platform-override": "^1.4.13",
"typescript": "^3.8.3"
}
Expand Down
5 changes: 1 addition & 4 deletions packages/@office-iss/react-native-win32/.flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,6 @@ suppress_type=$FlowFixMeProps
suppress_type=$FlowFixMeState
suppress_type=$FlowFixMeEmpty

experimental.abstract_locations=true
experimental.new_signatures=true

[lints]
sketchy-null-number=warn
sketchy-null-mixed=warn
Expand All @@ -112,4 +109,4 @@ untyped-import
untyped-type-import

[version]
^0.146.0
^0.148.0
18 changes: 9 additions & 9 deletions packages/@office-iss/react-native-win32/overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,45 +3,45 @@
".flowconfig",
"src/**"
],
"baseVersion": "0.0.0-cfb5b5e20",
"baseVersion": "0.0.0-d04ec4dc6",
"overrides": [
{
"type": "derived",
"file": ".flowconfig",
"baseFile": ".flowconfig",
"baseHash": "718336b53dd84d09a5331cc4c6a3726114510030"
"baseHash": "7c2f3e8ecf80e5229d4e1fdad2b6ef324acae0c4"
},
{
"type": "derived",
"file": "src/index.win32.js",
"baseFile": "index.js",
"baseHash": "ca978f1d83fd841a2aa9f30f3bfabb620de21273"
"baseHash": "84a9a90c70deaf3e42a67c82beafb1240c41bc95"
},
{
"type": "patch",
"file": "src/Libraries/Alert/Alert.win32.js",
"baseFile": "Libraries/Alert/Alert.js",
"baseHash": "6ea428202edeea40370df390a6b8f7ab794270ac"
"baseHash": "99f0bc2c38daf35d5f08a0e0abeb5f21e583ce4e"
},
{
"type": "patch",
"file": "src/Libraries/BatchedBridge/MessageQueue.win32.js",
"baseFile": "Libraries/BatchedBridge/MessageQueue.js",
"baseHash": "85eea8e9510b516c12e19fcfedc4553b990feb11",
"baseHash": "c47cdef67892acc92ca1df8aceef6909db24a029",
"issue": 5807
},
{
"type": "copy",
"file": "src/Libraries/Components/AccessibilityInfo/AccessibilityInfo.win32.js",
"baseFile": "Libraries/Components/AccessibilityInfo/AccessibilityInfo.android.js",
"baseHash": "a1534c3bec8ef3537345310684e129e7819b769f",
"baseHash": "54cf7e87dff60489f95adef777d73427eab0c866",
"issue": 4578
},
{
"type": "copy",
"file": "src/Libraries/Components/AccessibilityInfo/legacySendAccessibilityEvent.win32.js",
"baseFile": "Libraries/Components/AccessibilityInfo/legacySendAccessibilityEvent.android.js",
"baseHash": "1255817acafffa2461805c76a10daafc233de377",
"baseHash": "154f615eba014a1df9ff2d54591219dbbc53f381",
"issue": 4578
},
{
Expand Down Expand Up @@ -152,7 +152,7 @@
"type": "derived",
"file": "src/Libraries/Components/TextInput/TextInput.win32.tsx",
"baseFile": "Libraries/Components/TextInput/TextInput.js",
"baseHash": "4f5fe56bdded55bbeee1b54356f82361bb1f8b02"
"baseHash": "506d84a349fef1ad532b7c02a1836fce7befa616"
},
{
"type": "patch",
Expand Down Expand Up @@ -233,7 +233,7 @@
"type": "derived",
"file": "src/Libraries/Image/Image.win32.js",
"baseFile": "Libraries/Image/Image.ios.js",
"baseHash": "9fb656bbb836310325789d897879f769124eb31c",
"baseHash": "bb70db26cb8d42b51037d43a6ab9eace183a0f71",
"issue": 4320
},
{
Expand Down
6 changes: 3 additions & 3 deletions packages/@office-iss/react-native-win32/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,19 +61,19 @@
"@types/react-native": "^0.63.46",
"babel-eslint": "^10.1.0",
"eslint": "7.12.0",
"flow-bin": "^0.146.0",
"flow-bin": "^0.148.0",
"jscodeshift": "^0.11.0",
"just-scripts": "^1.3.3",
"prettier": "1.19.1",
"react": "17.0.1",
"react-native": "0.0.0-cfb5b5e20",
"react-native": "0.0.0-d04ec4dc6",
"react-native-platform-override": "^1.4.13",
"react-shallow-renderer": "16.14.1",
"typescript": "^3.8.3"
},
"peerDependencies": {
"react": "17.0.1",
"react-native": "0.0.0-cfb5b5e20"
"react-native": "0.0.0-d04ec4dc6"
},
"beachball": {
"defaultNpmTag": "canary",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,9 @@ class MessageQueue {
this._lazyCallableModules[name] = () => module;
}

registerLazyCallableModule(name: string, factory: void => {...}) {
let module: {...};
let getValue: ?(void) => {...} = factory;
registerLazyCallableModule(name: string, factory: void => interface {}) {
let module: interface {};
let getValue: ?(void) => interface {} = factory;
this._lazyCallableModules[name] = () => {
if (getValue) {
module = getValue();
Expand Down Expand Up @@ -390,7 +390,7 @@ class MessageQueue {
// can be configured by the VM or any Inspector
__shouldPauseOnThrow(): boolean {
return (
// $FlowFixMe
// $FlowFixMe[cannot-resolve-name]
typeof DebuggerInternal !== 'undefined' &&
DebuggerInternal.shouldPauseOnThrow === true // eslint-disable-line no-undef
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ type AccessibilityEventDefinitions = {
change: [boolean],
};

type AccessibilityEventTypes = 'focus';
type AccessibilityEventTypes = 'focus' | 'click';

const _subscriptions = new Map();

Expand Down Expand Up @@ -162,7 +162,12 @@ const AccessibilityInfo = {
eventType: AccessibilityEventTypes,
) {
// route through React renderer to distinguish between Fabric and non-Fabric handles
sendAccessibilityEvent(handle, eventType);
// iOS only supports 'focus' event types
if (eventType === 'focus') {
sendAccessibilityEvent(handle, eventType);
} else if (eventType === 'click') {
// Do nothing!
}
},

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ function legacySendAccessibilityEvent(
UIManager.getConstants().AccessibilityEventTypes.typeViewFocused,
);
}
if (eventType === 'click') {
UIManager.sendAccessibilityEvent(
reactTag,
UIManager.getConstants().AccessibilityEventTypes.typeViewClicked,
);
}
}

module.exports = legacySendAccessibilityEvent;
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,10 @@ let Image = (props: ImagePropsType, forwardedRef) => {
let sources;
let style: ImageStyleProp;
if (Array.isArray(source)) {
// $FlowFixMe flattenStyle is not strong enough
style = flattenStyle([styles.base, props.style]) || {};
sources = source;
} else {
const {width, height, uri} = source;
// $FlowFixMe flattenStyle is not strong enough
style = flattenStyle([{width, height}, styles.base, props.style]) || {};
sources = [source];

Expand Down Expand Up @@ -209,9 +207,9 @@ Image.displayName = 'Image';
*
* See https://reactnative.dev/docs/image.html#getsize
*/
/* $FlowFixMe(>=0.89.0 site=react_native_ios_fb) This comment suppresses an
* error found when Flow v0.89 was deployed. To see the error, delete this
* comment and run Flow. */
/* $FlowFixMe[prop-missing] (>=0.89.0 site=react_native_ios_fb) This comment
* suppresses an error found when Flow v0.89 was deployed. To see the error,
* delete this comment and run Flow. */
Image.getSize = getSize;

/**
Expand All @@ -220,9 +218,9 @@ Image.getSize = getSize;
*
* See https://reactnative.dev/docs/image.html#getsizewithheaders
*/
/* $FlowFixMe(>=0.89.0 site=react_native_ios_fb) This comment suppresses an
* error found when Flow v0.89 was deployed. To see the error, delete this
* comment and run Flow. */
/* $FlowFixMe[prop-missing] (>=0.89.0 site=react_native_ios_fb) This comment
* suppresses an error found when Flow v0.89 was deployed. To see the error,
* delete this comment and run Flow. */
Image.getSizeWithHeaders = getSizeWithHeaders;

/**
Expand All @@ -231,9 +229,9 @@ Image.getSizeWithHeaders = getSizeWithHeaders;
*
* See https://reactnative.dev/docs/image.html#prefetch
*/
/* $FlowFixMe(>=0.89.0 site=react_native_ios_fb) This comment suppresses an
* error found when Flow v0.89 was deployed. To see the error, delete this
* comment and run Flow. */
/* $FlowFixMe[prop-missing] (>=0.89.0 site=react_native_ios_fb) This comment
* suppresses an error found when Flow v0.89 was deployed. To see the error,
* delete this comment and run Flow. */
Image.prefetch = prefetch;

/**
Expand All @@ -242,34 +240,31 @@ Image.prefetch = prefetch;
*
* See https://reactnative.dev/docs/image.html#prefetch
*/
/* $FlowFixMe(>=0.89.0 site=react_native_ios_fb) This comment suppresses an
* error found when Flow v0.89 was deployed. To see the error, delete this
* comment and run Flow. */
/* $FlowFixMe[prop-missing] (>=0.89.0 site=react_native_ios_fb) This comment
* suppresses an error found when Flow v0.89 was deployed. To see the error,
* delete this comment and run Flow. */
Image.prefetchWithMetadata = prefetchWithMetadata;

/**
* Performs cache interrogation.
*
* See https://reactnative.dev/docs/image.html#querycache
*/
/* $FlowFixMe(>=0.89.0 site=react_native_ios_fb) This comment suppresses an
* error found when Flow v0.89 was deployed. To see the error, delete this
* comment and run Flow. */
/* $FlowFixMe[prop-missing] (>=0.89.0 site=react_native_ios_fb) This comment
* suppresses an error found when Flow v0.89 was deployed. To see the error,
* delete this comment and run Flow. */
Image.queryCache = queryCache;

/**
* Resolves an asset reference into an object.
*
* See https://reactnative.dev/docs/image.html#resolveassetsource
*/
/* $FlowFixMe(>=0.89.0 site=react_native_ios_fb) This comment suppresses an
* error found when Flow v0.89 was deployed. To see the error, delete this
* comment and run Flow. */
/* $FlowFixMe[prop-missing] (>=0.89.0 site=react_native_ios_fb) This comment
* suppresses an error found when Flow v0.89 was deployed. To see the error,
* delete this comment and run Flow. */
Image.resolveAssetSource = resolveAssetSource;

/* $FlowFixMe(>=0.89.0 site=react_native_ios_fb) This comment suppresses an
* error found when Flow v0.89 was deployed. To see the error, delete this
* comment and run Flow. */
Image.propTypes = DeprecatedImagePropType;

const styles = StyleSheet.create({
Expand Down
Loading