Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
5303919
Allow Override Tooling to Use Nightly Builds
NickGerleman May 27, 2020
c2450cd
Change files
NickGerleman May 27, 2020
688cdd5
Reduce unneeded fetches
NickGerleman May 27, 2020
63abd19
Begin integration of 3/22 Nightly Build
NickGerleman May 27, 2020
084ea64
Change files
NickGerleman May 27, 2020
1317b41
New Specs
NickGerleman May 27, 2020
5d51479
Do auto upgrades (limited success here)
NickGerleman May 27, 2020
4220391
Begin Manual Merging + NativeOrDynamicColor Deletion
NickGerleman May 27, 2020
aa3843c
More merges
NickGerleman May 27, 2020
5e9936d
native fixes
acoates-ms Jun 9, 2020
08af31a
Get RNTester booting
acoates-ms Jun 9, 2020
3216c7c
Merge remote-tracking branch 'upstream/master' into nightly-integration
acoates-ms Jun 9, 2020
dc76ea7
RNTester mostly works now
acoates-ms Jun 10, 2020
8b7a3b0
Fix redbox when clicking on text
acoates-ms Jun 10, 2020
05c2182
Add Prerelease Segment to PlatformConstants
NickGerleman Jun 10, 2020
42ef75c
Merge branch 'master' of https://github.com/microsoft/react-native-wi…
NickGerleman Jun 10, 2020
daf0917
Win32 Fixes
NickGerleman Jun 10, 2020
c15281e
Fix PlatformColor
acoates-ms Jun 11, 2020
627a9a7
Merge branch 'nightly-integration' of https://github.com/NickGerleman…
acoates-ms Jun 11, 2020
02efbaa
lint fix
acoates-ms Jun 11, 2020
124dbf7
make vnext flow clean
acoates-ms Jun 12, 2020
0bca154
Remove hackage to support Rex 0.60
NickGerleman Jun 17, 2020
cc947d7
Merge remote-tracking branch 'origin' into nightly-integration
NickGerleman Jun 17, 2020
47efa00
Remove already commtited changefile
NickGerleman Jun 17, 2020
eb93bd1
Remove forked code for removed Yellowbox
NickGerleman Jun 17, 2020
e55df1d
More Win32 Fixes
NickGerleman Jun 17, 2020
753ecd1
Change files
NickGerleman Jun 17, 2020
0b458b4
Update flowconfigs
NickGerleman Jun 17, 2020
f656425
flowconfig fixes and cleanup
NickGerleman Jun 17, 2020
585bbba
yarn format
NickGerleman Jun 17, 2020
fd62297
Get vnext passing override validation
NickGerleman Jun 17, 2020
979917b
Get react-native-win32 flow clean + merged
NickGerleman Jun 17, 2020
28bb979
Merge remote-tracking branch 'upstream/master' into nightly-integration
acoates-ms Jun 23, 2020
3979ac4
Add a bunch more test pages to win32 RNTester
acoates-ms Jun 23, 2020
3858209
Add PlatformColorValueTypes.windesktop.js
JunielKatarn Jun 24, 2020
b956ca4
Update Shared filters
JunielKatarn Jun 24, 2020
2f1d42f
Patch Libraries/Utilities/HMRClient.js
JunielKatarn Jun 24, 2020
9b01dcf
Merge pull request #1 from jurocha-ms/v63deskit
NickGerleman Jun 25, 2020
f8ac84d
Merge branch 'master' of https://github.com/microsoft/react-native-wi…
NickGerleman Jun 25, 2020
8bd55d1
Override Validation Fixes
NickGerleman Jun 25, 2020
1a30fb3
Fix lint errors for windesktop stubs
NickGerleman Jun 25, 2020
37533b4
Update ImageViewManager With New Prop Name for ImageLoadEvent
NickGerleman Jun 25, 2020
b120770
Fix Peer Dependencies
NickGerleman Jun 25, 2020
723c25c
The Generator Should Only Install the RN Peer Dep if It Isn't Satisfied
NickGerleman Jun 25, 2020
b4d5ca4
We probably want a fixed peer dep
NickGerleman Jun 25, 2020
080b7ba
Keep react-native-dom in sync for react-native-win32
NickGerleman Jun 25, 2020
bee6557
Dedupe Lockfile
NickGerleman Jun 25, 2020
f77dc8e
Testing (Does normal Yarn have different lockfile behavior?)
NickGerleman Jun 25, 2020
fa24a56
Go back to midgard-yarn but make sure to pass --frozen-lockfile
NickGerleman Jun 25, 2020
38f0eda
Fix name
NickGerleman Jun 25, 2020
e3b5aa8
Expose the native win32 gradient color type as a strongly typed method.
acoates-ms Jun 25, 2020
ce8ff42
Register new overrides
NickGerleman Jun 26, 2020
3f40c32
Bring Back Style Validation Fix to Fix Flatlist Examples
NickGerleman Jun 26, 2020
ae0182a
Implement ExceptionsManager.reportException
acoates-ms Jun 26, 2020
895accb
Merge remote-tracking branch 'upstream/master' into nightly-integration
acoates-ms Jun 26, 2020
37cdd4a
yarn api
acoates-ms Jun 26, 2020
e01ae48
Fix win32 flow-check
acoates-ms Jun 26, 2020
dafd8cd
Merge remote-tracking branch 'upstream/master' into nightly-integration
acoates-ms Jun 26, 2020
1a7e032
Merge remote-tracking branch 'upstream/master' into nightly-integration
acoates-ms Jun 26, 2020
546f054
realign package versions
acoates-ms Jun 26, 2020
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
2 changes: 1 addition & 1 deletion .ado/windows-vs-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ variables:
- template: variables/release.yml
- template: variables/vs2019.yml
- name: reactNativeVersion
value: 0.62.2
value: 0.0.0-56cf99a96

jobs:
- job: Setup
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "prerelease",
"comment": "Upgrade React Native to 3/22 Nightly Build",
"packageName": "@office-iss/react-native-win32",
"email": "ngerlem@microsoft.com",
"dependentChangeType": "patch",
"date": "2020-05-27T20:40:04.020Z"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "patch",
"comment": "Upgrade React Native to 3/22 Nightly Build",
"packageName": "react-native-platform-override",
"email": "ngerlem@microsoft.com",
"dependentChangeType": "patch",
"date": "2020-06-17T12:20:16.533Z"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "prerelease",
"comment": "Upgrade React Native to 3/22 Nightly Build",
"packageName": "react-native-windows",
"email": "ngerlem@microsoft.com",
"dependentChangeType": "patch",
"date": "2020-05-27T20:40:42.294Z"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "patch",
"comment": "Upgrade React Native to 3/22 Nightly Build",
"packageName": "react-native-windows-codegen",
"email": "ngerlem@microsoft.com",
"dependentChangeType": "patch",
"date": "2020-05-27T20:40:29.506Z"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "patch",
"comment": "Upgrade React Native to 3/22 Nightly Build",
"packageName": "react-native-windows-init",
"email": "ngerlem@microsoft.com",
"dependentChangeType": "patch",
"date": "2020-05-27T20:40:39.226Z"
}
1 change: 1 addition & 0 deletions docs/api/react-native-windows.datepicker.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
```typescript
export declare class DatePicker extends React.Component<IDatePickerProps>
```
<b>Extends:</b> React.Component&lt;[IDatePickerProps](./react-native-windows.idatepickerprops.md)<!-- -->&gt;

## Constructors

Expand Down
1 change: 1 addition & 0 deletions docs/api/react-native-windows.flyout.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ This is a controlled component that requires an `onDismiss` callback that update
```typescript
export declare class Flyout extends React.Component<IFlyoutProps, IFlyoutTargetState>
```
<b>Extends:</b> React.Component&lt;[IFlyoutProps](./react-native-windows.iflyoutprops.md)<!-- -->, [IFlyoutTargetState](./react-native-windows.iflyouttargetstate.md)<!-- -->&gt;

## Constructors

Expand Down
1 change: 1 addition & 0 deletions docs/api/react-native-windows.glyph.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ This control is used to render Glyphs from a Font file, which might be used simi
```typescript
export declare class Glyph extends React.PureComponent<GlyphProps>
```
<b>Extends:</b> React.PureComponent&lt;GlyphProps&gt;

## Methods

Expand Down
1 change: 1 addition & 0 deletions docs/api/react-native-windows.idatepickerprops.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
```typescript
export interface IDatePickerProps extends ViewProps
```
<b>Extends:</b> ViewProps

## Properties

Expand Down
1 change: 1 addition & 0 deletions docs/api/react-native-windows.iflyoutprops.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
```typescript
export interface IFlyoutProps extends ViewProps
```
<b>Extends:</b> ViewProps

## Properties

Expand Down
1 change: 1 addition & 0 deletions docs/api/react-native-windows.ipopupprops.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
```typescript
export interface IPopupProps extends ViewProps
```
<b>Extends:</b> ViewProps

## Properties

Expand Down
1 change: 1 addition & 0 deletions docs/api/react-native-windows.iviewwindowsprops.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
```typescript
export interface IViewWindowsProps extends IKeyboardProps, ViewProps
```
<b>Extends:</b> [IKeyboardProps](./react-native-windows.ikeyboardprops.md)<!-- -->, ViewProps

## Remarks

Expand Down
1 change: 1 addition & 0 deletions docs/api/react-native-windows.picker.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ when using editable=true, onValueChange can be called with a selectedValue of nu
```typescript
export declare class Picker extends React.Component<IPickerProps, State>
```
<b>Extends:</b> React.Component&lt;IPickerProps, State&gt;

## Constructors

Expand Down
1 change: 1 addition & 0 deletions docs/api/react-native-windows.popup.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ This is a controlled component that requires an `onDismiss` callback that update
```typescript
export declare class Popup extends React.Component<IPopupProps, IPopupTargetState>
```
<b>Extends:</b> React.Component&lt;[IPopupProps](./react-native-windows.ipopupprops.md)<!-- -->, [IPopupTargetState](./react-native-windows.ipopuptargetstate.md)<!-- -->&gt;

## Constructors

Expand Down
5 changes: 3 additions & 2 deletions packages/E2ETest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
},
"dependencies": {
"prompt-sync": "^4.2.0",
"react": "16.11.0",
"react-native": "0.62.2",
"react": "16.13.0",
"react-native": "0.0.0-56cf99a96",
"react-native-windows": "0.0.0-canary.103"
},
"devDependencies": {
Expand All @@ -42,6 +42,7 @@
"@wdio/local-runner": "5.12.1",
"@wdio/sync": "5.12.1",
"appium": "1.14.1",
"eslint": "5.1.0",
"just-scripts": "^0.36.1",
"metro-react-native-babel-preset": "^0.56.0",
"prettier": "^1.18.2",
Expand Down
5 changes: 3 additions & 2 deletions packages/microsoft-reactnative-sampleapps/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,16 @@
"windows": "react-native run-windows"
},
"dependencies": {
"react": "16.11.0",
"react-native": "0.62.2",
"react": "16.13.0",
"react-native": "0.0.0-56cf99a96",
"react-native-windows": "0.0.0-canary.103"
},
"devDependencies": {
"@babel/core": "^7.8.4",
"@babel/runtime": "^7.8.4",
"@types/react": "16.9.0",
"@types/react-native": "^0.62.10",
"eslint": "5.1.0",
"just-scripts": "^0.36.1",
"metro-react-native-babel-preset": "^0.56.0",
"react-native-windows-codegen": "0.0.6",
Expand Down
9 changes: 5 additions & 4 deletions packages/playground/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,19 @@
"windows": "react-native run-windows"
},
"dependencies": {
"react": "16.11.0",
"react-native": "0.62.2",
"react": "16.13.0",
"react-native": "0.0.0-56cf99a96",
"react-native-windows": "0.0.0-canary.103"
},
"devDependencies": {
"@babel/core": "^7.8.4",
"@babel/runtime": "^7.8.4",
"@react-native-community/eslint-config": "^1.1.0",
"@types/react": "16.9.0",
"@types/react-native": "^0.62.10",
"eslint": "5.1.0",
"just-scripts": "^0.36.1",
"metro-react-native-babel-preset": "^0.56.0",
"react-test-renderer": "16.9.0",
"@react-native-community/eslint-config": "^1.0.0"
"react-test-renderer": "16.9.0"
}
}
1 change: 1 addition & 0 deletions packages/react-native-platform-override/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"@types/yargs": "^15.0.3",
"babel-jest": "^24.9.0",
"diff-match-patch": "^1.0.4",
"eslint": "5.1.0",
"fp-ts": "^2.5.0",
"jest": "^24.9.0",
"just-scripts": "^0.36.1",
Expand Down
44 changes: 6 additions & 38 deletions packages/react-native-win32/.flowconfig
Original file line number Diff line number Diff line change
Expand Up @@ -9,53 +9,25 @@
; Ideally we'd delete the base versions of files that had .win32 overrides as part of the
; initRNLibraries build step
<PROJECT_ROOT>/Libraries/Alert/Alert.js
<PROJECT_ROOT>/Libraries/Animated/src/nodes/AnimatedInterpolation.js
<PROJECT_ROOT>/Libraries/Components/AccessibilityInfo/NativeAccessibilityInfo.js
<PROJECT_ROOT>/Libraries/Components/Picker/Picker.js
<PROJECT_ROOT>/Libraries/Components/SafeAreaView/SafeAreaView.js
<PROJECT_ROOT>/Libraries/Components/StatusBar/NativeStatusBarManagerAndroid.js
<PROJECT_ROOT>/Libraries/Components/TextInput/TextInput.js
<PROJECT_ROOT>/Libraries/Components/TextInput/TextInputState.js
<PROJECT_ROOT>/Libraries/Components/Touchable/TouchableBounce.js
<PROJECT_ROOT>/Libraries/Components/Touchable/TouchableHighlight.js
<PROJECT_ROOT>/Libraries/Components/Touchable/TouchableNativeFeedback.js
<PROJECT_ROOT>/Libraries/Components/Touchable/TouchableOpacity.js
<PROJECT_ROOT>/Libraries/Components/Touchable/TouchableWithoutFeedback.js
<PROJECT_ROOT>/Libraries/Components/View/ReactNativeViewAttributes.js
<PROJECT_ROOT>/Libraries/Components/View/ReactNativeViewViewConfig.js
<PROJECT_ROOT>/Libraries/Core/setUpReactDevTools.js
<PROJECT_ROOT>/Libraries/Image/Image.js
<PROJECT_ROOT>/Libraries/Image/ImageViewNativeComponent.js
<PROJECT_ROOT>/Libraries/Inspector/Inspector.js
<PROJECT_ROOT>/Libraries/Inspector/InspectorOverlay.js
<PROJECT_ROOT>/Libraries/Network/RCTNetworking.js
<PROJECT_ROOT>/Libraries/Pressability/PressabilityDebug.js
<PROJECT_ROOT>/Libraries/ReactNative/getNativeComponentAttributes.js
<PROJECT_ROOT>/Libraries/StyleSheet/normalizeColor.js
<PROJECT_ROOT>/Libraries/StyleSheet/normalizeColorObject.js
<PROJECT_ROOT>/Libraries/StyleSheet/processColor.js
<PROJECT_ROOT>/Libraries/StyleSheet/processColorArray.js
<PROJECT_ROOT>/Libraries/StyleSheet/StyleSheet.js
<PROJECT_ROOT>/Libraries/Utilities/DeviceInfo.js
<PROJECT_ROOT>/Libraries/Utilities/Dimensions.js
<PROJECT_ROOT>/Libraries/YellowBox/UI/YellowBoxInspectorHeader.js
<PROJECT_ROOT>/Libraries/YellowBox/UI/YellowBoxInspectorSourceMapStatus.js
<PROJECT_ROOT>/Libraries/YellowBox/UI/YellowBoxList.js
<PROJECT_ROOT>/RNTester/js/components/FlatListExample.js
<PROJECT_ROOT>/RNTester/js/components/ListExampleShared.js
<PROJECT_ROOT>/RNTester/js/components/RNTesterExampleFilter.js

; Schema files are used for turbo-module code generation, but are not bundled.
; We don't yet have the react-native-codegen package they rely on, so supress
; checks for now.
<PROJECT_ROOT>/Libraries/Components/ActivityIndicator/ActivityIndicatorSchema.js
<PROJECT_ROOT>/Libraries/Components/RefreshControl/AndroidSwipeRefreshLayoutSchema.js
<PROJECT_ROOT>/Libraries/Components/RefreshControl/PullToRefreshViewSchema.js
<PROJECT_ROOT>/Libraries/Components/Slider/SliderSchema.js
<PROJECT_ROOT>/Libraries/Components/Switch/SwitchSchema.js
<PROJECT_ROOT>/Libraries/Components/UnimplementedViews/UnimplementedNativeViewSchema.js
<PROJECT_ROOT>/Libraries/Modal/ModalSchema.js

; Ignore react-native files in node_modules since they are copied into project root
.*/node_modules/react-native/.*

Expand All @@ -78,8 +50,6 @@
; require from fbjs/lib instead: require('fbjs/lib/warning')
.*/node_modules/warning/.*

; Flow doesn't support platforms
.*/Libraries/Utilities/HMRLoadingView.js

; Ignore the src folder - flow files are combined with ones from react-native into the root Libraries folder
.*/react-native-win32/src/.*
Expand All @@ -90,10 +60,6 @@
; Should work out how to do this properly
.*/react-native-win32/Libraries/Image/resolveAssetSource.win32.js

; A couple files using dynamic colors, but cannot be ignored
<PROJECT_ROOT>/Libraries/ActionSheetIOS/ActionSheetIOS.js
<PROJECT_ROOT>/Libraries/Share/Share.js

[include]
; Need to include hoisted modules
../../node_modules/
Expand All @@ -108,15 +74,17 @@ emoji=true
esproposal.optional_chaining=enable
esproposal.nullish_coalescing=enable

exact_by_default=true

module.file_ext=.js
module.file_ext=.json
module.file_ext=.win32.js

munge_underscores=true

module.name_mapper='^react-native$' -> '<PROJECT_ROOT>/index.js'
module.name_mapper='^react-native/\(.*\)$' -> '<PROJECT_ROOT>/\1'
module.name_mapper='^@?[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> '<PROJECT_ROOT>/Libraries/Image/RelativeImageStub'
module.name_mapper='react-native$' -> '<PROJECT_ROOT>/index.js'
module.name_mapper='react-native/\(.*\)' -> '<PROJECT_ROOT>/\1'

suppress_type=$FlowIssue
suppress_type=$FlowFixMe
Expand All @@ -142,10 +110,10 @@ untyped-type-import=warn
nonstrict-import=warn
deprecated-type=warn
unsafe-getters-setters=warn
inexact-spread=warn
unnecessary-invariant=warn
signature-verification-failure=warn
deprecated-utility=error
unsafe-addition=error

[strict]
deprecated-type
Expand All @@ -157,4 +125,4 @@ untyped-import
untyped-type-import

[version]
^0.113.0
^0.120.0
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ React-native <Button> control with additional Win32-specific functionality.
```typescript
export declare class ButtonWin32 extends React.Component<IButtonWin32Props, IButtonWin32State>
```
<b>Extends:</b> React.Component&lt;[IButtonWin32Props](./react-native-win32.ibuttonwin32props.md)<!-- -->, IButtonWin32State&gt;

## Constructors

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [@office-iss/react-native-win32](./react-native-win32.md) &gt; [ColorGradientWin32](./react-native-win32.colorgradientwin32.md)

## ColorGradientWin32 variable

Creates a color value that renders using a grandient brush. This can be used to provide a value to most components that take a standard color value.

<b>Signature:</b>

```typescript
ColorGradientWin32 : (
gradientColor: GradientColorValueWin32
) => any
```
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [@office-iss/react-native-win32](./react-native-win32.md) &gt; [GradientColorStop](./react-native-win32.gradientcolorstop.md)

## GradientColorStop type

A color stop within a gradient. The values can either be other color values such as 'red', or a value thats already gone through processColor Note: Currently we only support color stops from 0 to 1. (Where 0 is the gradient start, 1 is gradient end)

<b>Signature:</b>

```typescript
export type GradientColorStop = {
color: string /*ColorValue*/ | number /*ProcessedColorValue*/,
offset: 0 | 1,
};
```
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<!-- Do not edit this file. It is automatically generated by API Documenter. -->

[Home](./index.md) &gt; [@office-iss/react-native-win32](./react-native-win32.md) &gt; [GradientColorValueWin32](./react-native-win32.gradientcolorvaluewin32.md)

## GradientColorValueWin32 type

Specifies the direction the gradient is in, and a list of color stops for the gradient. Note: Currently we only support 2 color stops

<b>Signature:</b>

```typescript
export type GradientColorValueWin32 = {
gradientDirection: 'ToBottom' | 'ToTop' | 'ToRight' | 'ToLeft',
colorStops: GradientColorStop[]
};
```
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
```typescript
export interface IButtonWin32Props extends RN.ButtonProps
```
<b>Extends:</b> RN.ButtonProps

## Properties

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@
```typescript
export interface IButtonWin32Style extends Omit<RN.TextStyle, ButtonWin32OmitStyles>
```
<b>Extends:</b> Omit&lt;RN.TextStyle, [ButtonWin32OmitStyles](./react-native-win32.buttonwin32omitstyles.md)<!-- -->&gt;

Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
```typescript
export interface IPersonaCoinProps extends ViewProps
```
<b>Extends:</b> ViewProps

## Properties

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ More fully defines an event by augmenting touchHistory
```typescript
export interface IResponderSyntheticEvent<T> extends NativeSyntheticEvent<T>
```
<b>Extends:</b> NativeSyntheticEvent&lt;T&gt;

## Properties

Expand Down
Loading