Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Port windowsbrush code into react-native-windows #3789

Merged
merged 21 commits into from
Dec 18, 2019

Conversation

kmelmon
Copy link
Contributor

@kmelmon kmelmon commented Dec 17, 2019

We currently have windowsbrush code in the Microsoft fork of react-native.

This change ports that code into react-native-windows as forked files, to help get us off the Microsoft fork.
Also added a test page to RNTester as there is currently no test code that uses windowsbrush.

Addresses #3788

Microsoft Reviewers: Open in CodeFlow

@kmelmon kmelmon requested a review from a team as a code owner December 17, 2019 03:08
@ghost ghost added the vnext label Dec 17, 2019
@kmelmon
Copy link
Contributor Author

kmelmon commented Dec 17, 2019

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@licanhua
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@@ -0,0 +1,395 @@
/**
* Copyright (c) Facebook, Inc. and its affiliates.
Copy link
Contributor

@licanhua licanhua Dec 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you need to update the Copyright to Microsoft? #Resolved

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We've been inconsistent about doing this across our forked files. I believe it's fine for us to change the copyright notice, as the LICENSE being pointed to states that portions of the code are based on Facebook's implementation. That's clearly the case here. Will update and file an issue to update the others.


In reply to: 359086803 [](ancestors = 359086803)


const requireNativeComponent = require('../../ReactNative/requireNativeComponent');

import type {ViewProps} from '../View/ViewPropTypes';
Copy link
Contributor

@licanhua licanhua Dec 17, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

./View/ViewPropTypes [](start = 31, length = 20)

I guess this file doesn't exist. we only have ViewWindows.tsx in view folder #Resolved

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We copy all the files from react-native into react-native-windows, so that file comes from react-native.

Copy link
Contributor

@licanhua licanhua left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

@kmelmon kmelmon merged commit d90b096 into microsoft:master Dec 18, 2019
ghost pushed a commit that referenced this pull request Jan 9, 2020
* GetFacebookReactInstance

* def

* ...

* Add __cdecl explicitly

* Update ReactUWP.vcxproj

* Update E2ETest to use ReactApplication (#3715)

* Update E2ETest to use ReactApplication

* Minor update

* Remove generating pch.pch

* Change files

* Shrink pch file size for Microsfot.ReactNative

* Revert "Remove generating pch.pch"

This reverts commit 39286c8.

* fix build

* Update Timeout

* applying package updates ***NO_CI***

* Update ParityStatus.md (#3555)

Documentation update based on #2852 completion

* Bump @microsoft/api-extractor from 7.6.1 to 7.7.0 (#3717)

Bumps [@microsoft/api-extractor](https://github.com/microsoft/rushstack) from 7.6.1 to 7.7.0.
- [Release notes](https://github.com/microsoft/rushstack/releases)
- [Commits](https://github.com/microsoft/rushstack/compare/@microsoft/api-extractor_v7.6.1...@microsoft/api-extractor_v7.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump @microsoft/api-documenter from 7.6.1 to 7.7.2 (#3724)

Bumps [@microsoft/api-documenter](https://github.com/microsoft/rushstack) from 7.6.1 to 7.7.2.
- [Release notes](https://github.com/microsoft/rushstack/releases)
- [Commits](https://github.com/microsoft/rushstack/compare/@microsoft/api-documenter_v7.6.1...@microsoft/api-documenter_v7.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Aligning Microsoft.Windows.CppWinRT Versions (#3733)

* Re-aligned SampleAppCPP project to match the others, #3728
* Updated all projects to 2.0.190730.2

* applying package updates ***NO_CI***

* Bump @types/react-native from 0.60.22 to 0.60.24 (#3740)

Bumps [@types/react-native](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-native) from 0.60.22 to 0.60.24.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-native)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump @types/node from 10.17.6 to 10.17.7 (#3741)

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 10.17.6 to 10.17.7.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Update CONTRIBUTING.md

update instructions on how to install submodules in the case where you started out working on vnext then switched to current.

* Use ReactNative.V8JSI.Windows.0.1.6 and ReactNative.Hermes.Windows.0.1.6 (#3729)

* unify hermes and v8jsi version

* Change files

* use HERMES_Package and V8_Package

* remove them from reactuwp project

* applying package updates ***NO_CI***

* Reduce build time on pipeline (#3734)

* reduce build time

* changes

* fix pipeline failure

* use Add-AppxPackage

* E2E test still use windows-2019 image

* force install vs dependencies on vs2019 image for E2E test

* parameters.forceVSDependencies

* add ../../.ado/variables/vs2017.yml

* Revert "add ../../.ado/variables/vs2017.yml"

This reverts commit b829251.

* revert and force

* Fix pipeline error

* Add react-native-win32 package (#3762)

* Add react-native-win32 package

* Publish packages using access public

* applying package updates ***NO_CI***

* Miscellaneous fixes in ETW tracing and Systrace (#3745)

* Miscellaneous fixes in ETW tracing and Systrace

* Miscellaneous fixes in ETW tracing and Systrace - Adding missing files

* Submitting the ETW schema resouce dll and the register script

* Change files

* applying package updates ***NO_CI***

* Strongly typed value serialization and deserialization using IJSValueReader, JSValue, and IJSValueWriter (#3760)

* Merged implementation of strongly typed value serialization and deserialization using IJSValueReader, JSValue, and IJSValueWriter

* Change files

* Updated CLI template for C++ native modules

* applying package updates ***NO_CI***

* Update to react-native@0.60.0-microsoft.31 (#3769)

* Update to react-native@0.60.0-microsoft.31

* Change files

* Change files

* applying package updates ***NO_CI***

* Fix toggle debugger setting issue with ReactApplication (#3767)

* Fix toggle debugger setting issue with ReactApplication

* applying package updates ***NO_CI***

* Delete .pch after build on pipeline (#3771)

* delete pch after build

* applying package updates ***NO_CI***

* Redirect build directory to C: on vs2017-win2016 build machine (#3768)

* init

* rollback language to default

* use False

* Fix by comment and enable SampleApp on pipeline

* update

* disable msbuild SampleApp

* Apply suggestions from code review

* applying package updates ***NO_CI***

* ignore Bundle folder in sampleapps (#3778)

* Add tree dump utility to E2E test framework and fix Image border issue (#3754)

Add TreeDump utility to E2E test framework and image border fix with TreeDump tests.

* applying package updates ***NO_CI***

* Update yarn.lock

* Change files

* Added new unit test projects to ReactWindows-Universal solution. (#3775)

* Added new unit test projects to ReactWindows-Universal solution.

* Made C# code compatible with C# 7.0

* Fixed some build breaks found by CI

* Trying to fix the Microsoft.ReactNative.Cxx.UnitTests build in CI loop

* Fixed Microsoft.ReactNative.Cxx.UnitTests project build break in CI and removed AMD64.

* Removed C# unit tests project

* applying package updates ***NO_CI***

* Update document for removing ReleaseBundle and DebugBundle (#3702)

* Update doc to removing DebugBundle and ReleaseBundle

* Change files

* applying package updates ***NO_CI***

* CLI reads name from app.json if it doesn't exist in package.json (#3781)

* read name from app.json

* Change files

* applying package updates ***NO_CI***

* Change CLI to add prompt if no --template parameter is supplied (#3784)

* merge

* add prompt

* Change files

* applying package updates ***NO_CI***

* Conditionally use BitmapImage (#3712)

* Use BitmapImage for cover, contain, and stretch resizeModes

* Fix comments

* timing issues

* wip

* Move 'center' resizeMode to BitmapImage

* code cleanup

* ReactImage->Source() refactor

* Clean up for PR

* Change files

* PR feedback

* only create ImageBrush and BitmapImage is needed

* Remove memory stream cache + flicker workaround

* don't cache availablesize + formatting

* SizeChanged event handler

* Fix dynamic resizeMode switch edge case

* Fix merge conflict + add inline data to image playground

* fix playground buildci

* applying package updates ***NO_CI***

* Bump rnpm-plugin-windows from 0.3.8 to 0.4.0 (#3800)

Bumps [rnpm-plugin-windows](https://github.com/ReactWindows/react-native-windows) from 0.3.8 to 0.4.0.
- [Release notes](https://github.com/ReactWindows/react-native-windows/releases)
- [Commits](rnpm-plugin-windows_v0.3.8...rnpm-plugin-windows_v0.4.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump pretty-format from 24.8.0 to 24.9.0 (#3764)

Bumps [pretty-format](https://github.com/facebook/jest/tree/HEAD/packages/pretty-format) from 24.8.0 to 24.9.0.
- [Release notes](https://github.com/facebook/jest/releases)
- [Changelog](https://github.com/facebook/jest/blob/master/CHANGELOG.md)
- [Commits](https://github.com/facebook/jest/commits/v24.9.0/packages/pretty-format)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump stacktrace-parser from 0.1.6 to 0.1.8 (#3765)

Bumps [stacktrace-parser](https://github.com/errwischt/stacktrace-parser) from 0.1.6 to 0.1.8.
- [Release notes](https://github.com/errwischt/stacktrace-parser/releases)
- [Commits](https://github.com/errwischt/stacktrace-parser/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Bump @types/react-native from 0.60.24 to 0.60.25 (#3757)

Bumps [@types/react-native](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-native) from 0.60.24 to 0.60.25.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-native)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Port windowsbrush code into react-native-windows (#3789)

* merge

* move windowsBrush stuff over from fork

* added RNTester page

* Change files

* CR comments

* applying package updates ***NO_CI***

* Make sure that C# and C++ SampleApp projects identifiers have proper CS and Cpp suffixes to avoid name collisions. (#3802)

* Removed Bridge sub-namespace in favor of Microsoft.ReactNative (#3804)

* Removed Bridge sub-namespace in favor of Microsoft.ReactNative

* Change files

* Fixed E2ETest build break

* applying package updates ***NO_CI***

* fixing case issues (#3806)

* Bump @react-native-community/cli from 2.9.0 to 2.10.0 (#3663)

Bumps [@react-native-community/cli](https://github.com/react-native-community/react-native-cli) from 2.9.0 to 2.10.0.
- [Release notes](https://github.com/react-native-community/react-native-cli/releases)
- [Commits](react-native-community/cli@v2.9.0...v2.10.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* reduce build flavors for RNWUniversalPR  (#3773)

* reduce build flavours

* reenable DesktopPR

* \\

* Update .ado/windows-vs-pr.yml

* Bunch of style properties fixes and TreeDump utility updates (#3793)

* Support CornerRadius for TextInput

* Fix cornerRadius issue for TextInput and some updates to TreeDump, plus new test for control style.

* applying package updates ***NO_CI***

* Get flow clean, and turn on flow-check during build (#3730)

* Get flow check working

* Get flow clean, and turn on flow check during build

* Change files

* fix

* Move RNTester files to matching location from RN\rntester

* PR feedback

* fix

* applying package updates ***NO_CI***

* SourceCode module should provide scriptURL when running livereload without webdebugger (#3803)

* Minor fixups after initial rn-win32 checkin

* Provide source uri in SourceCode module when using livereload

* Provide source uri in SourceCode module when using livereload

* Change files

* build fix

* fix build

* fix build

* applying package updates ***NO_CI***

* Remove remaining need for fork of RN for win32 JS (#3811)

* Remove remaining need for fork of RN for win32 JS

* Change files

* Build fix

* Change files

* applying package updates ***NO_CI***

* Export ability to query names of loaded native modules (master branch) (#3813)

* Export ability to query native module names

This is needed for testability (intenral CR using it out now). It's not ideal to add more exports, but we will always have to have some between instance interfaces.

* Change files

* Fix x86 mangeled name

* applying package updates ***NO_CI***

* Changed Microsoft.ReactNative to be independent from ReactUWP (#3809)

* Changed Microsoft.ReactNative to be independent from ReactUWP

* Removed ReactUWP project from the ReactUWPTestApp to reduce compiled code size.

* Removed commented code from pch.h

* Moved WindowsBrushExample.windows.tsx to fix RNTester bundle building

* Updated TreeDumps to fix test cases.

* An attempt to fix E2ETest

* Changed ViewPanel naemspace in the E2ETest tree dumps

* Changed namespace for ViewPanel in other E2ETest tree dumps

* applying package updates ***NO_CI***

* Allow UAP SDK to be in other folder other than ProgramFiles (#3815)

* check UAP in SDK10 installation folder

* applying package updates ***NO_CI***

* Add InjectBundleContent target (#3821)

* add InjectBundleContent target

* Change files

* format

* applying package updates ***NO_CI***

* Bump @types/react-native from 0.60.25 to 0.60.28 (#3831)

Bumps [@types/react-native](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/react-native) from 0.60.25 to 0.60.28.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/react-native)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* [Security] Bump handlebars from 4.1.2 to 4.5.3 (#3818)

Bumps [handlebars](https://github.com/wycats/handlebars.js) from 4.1.2 to 4.5.3. **This update includes a security fix.**
- [Release notes](https://github.com/wycats/handlebars.js/releases)
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md)
- [Commits](handlebars-lang/handlebars.js@v4.1.2...v4.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* Call StartAnimation on m_scaleCombined for ScaleX / ScaleY animations (#3829)

* Call StartAnimatiom on m_scaleCombined for ScaleX / ScaleY animations

There was a copy-paste error previously that started m_translationCombined instead.

* Change files

* applying package updates ***NO_CI***

* Remove remaining need for fork of RN for win32 JS (#3834)

* Remove remaining need for fork of RN for win32 JS

* Change files

* Build fix

* Change files

* Enable flow type checking in win32

* Fix build

* applying package updates ***NO_CI***

* Rename GetFacebookReactInstance

* Fix code review comment

* Update TurboModuleUtils.cpp

* Fix lint errors

Co-authored-by: Di Da <dida@microsoft.com>
Co-authored-by: rnbot <53619745+rnbot@users.noreply.github.com>
Co-authored-by: Harini Kannan <harinik@microsoft.com>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Jon Thysell <thysell@gmail.com>
Co-authored-by: kmelmon <33470154+kmelmon@users.noreply.github.com>
Co-authored-by: Canhua Li <canli@microsoft.com>
Co-authored-by: Andrew Coates <30809111+acoates-ms@users.noreply.github.com>
Co-authored-by: Anandraj <mganandraj@outlook.com>
Co-authored-by: Vladimir Morozov <vmoroz@users.noreply.github.com>
Co-authored-by: Marlene Cota <marlenecota@gmail.com>
Co-authored-by: Mike Kaufman <mike-kaufman@users.noreply.github.com>
Co-authored-by: Nick Gerleman <nick@nickgerleman.com>
Co-authored-by: Tom Shea <tom@shea.at>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants