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

11.18.1 discord 1 merge master new arch #27

Draft
wants to merge 105 commits into
base: 11.18.1-discord-1
Choose a base branch
from

Conversation

donaldchen
Copy link

@donaldchen donaldchen commented Jul 26, 2023

This PR merges the new-arch changes from master into 11.18.1-discord-1.

I did one round of resolving conflicts, but I need to test this, still.

asklar and others added 30 commits April 26, 2022 12:19
## [11.18.2](react-native-webview/react-native-webview@v11.18.1...v11.18.2) (2022-04-27)

### Bug Fixes

* **windows:** update Getting Started information for Windows ([92ba4fa](react-native-webview@92ba4fa))
# [11.19.0](react-native-webview/react-native-webview@v11.18.2...v11.19.0) (2022-05-19)

### Features

* **android:** Adding downloadMessage as a prop for localization ([react-native-webview#2489](react-native-webview#2489)) ([c3f73fe](react-native-webview@c3f73fe))
* feat: improve dummy WebView

* Update WebView.tsx

Co-authored-by: Thibault Malbranche <malbranche.thibault@gmail.com>
…native-webview#2531)

* Revert "fix(windows): don't build WebView2 unless on WinUI 3 (react-native-webview#2517)"

This reverts commit 0571062.

* just remove the USE_WINUI3 check
…genNativeCommands (react-native-webview#2508)

* wip

* wip

* Update RNCWebViewManager.java

* Shared stuff with iOS

* bump stuff

* wip

* fix(windows): don't build WebView2 unless on WinUI 3 (react-native-webview#2518)

Co-authored-by: Tommy Nguyen <4123478+tido64@users.noreply.github.com>

* wip

* Revert 2517 tido/fix webview2 build (react-native-webview#2532)

* Revert "fix(windows): don't build WebView2 unless on WinUI 3 (react-native-webview#2517)"

This reverts commit 0571062.

* just remove the USE_WINUI3 check

Co-authored-by: Tommy Nguyen <4123478+tido64@users.noreply.github.com>

* Create ExperimentalFeatures.props

Co-authored-by: Tommy Nguyen <4123478+tido64@users.noreply.github.com>
Co-authored-by: Jamon Holmgren <jamonholmgren@gmail.com>
…bview#2537)

* Implement PostMessage / OnMessage

* Fix Stop Loading

* Address Feedback

* Address Feedback
Co-authored-by: Chiara Mooney <34109996+chiaramooney@users.noreply.github.com>
* fix: add properties for ios WKWebView configuration

* Update WebView.ios.tsx

* Update WebView.macos.tsx

Co-authored-by: Thibault Malbranche <malbranche.thibault@gmail.com>
vahagnni and others added 19 commits June 1, 2023 22:57
…ve-webview#2897)

* [windows] Support headers and cookies in source prop

* minor fixes
## [12.2.1](react-native-webview/react-native-webview@v12.2.0...v12.2.1) (2023-06-10)

### Bug Fixes

* Revert "Missing android.support.FILE_PROVIDER_PATHS meta-data on some OEMs ([react-native-webview#2952](react-native-webview#2952))" ([e17a79b](react-native-webview@e17a79b))
…iew#2993)

* Update RNCWebView.java

* Update RNCWebView.java

* wip

* wip

* fix build on latest xcode

* add example + fix a few things

* Update RNCWebViewImpl.m

* fix macOS build
* feat: add webviewDebuggingEnabled prop & Android implementation

fix: use static RNCWebView.setWebContentsDebuggingEnabled

* feat: add iOS webviewDebuggingEnabled prop

* chore: remove "link generted with jump2header" comments

* chore: add missing props-index links in Reference.md

* feat: add webviewDebuggingEnabled reference docs

* fix: surround inspectable code blocks with compiler preprocessor to include only on appropriate versions


---------

Co-authored-by: Tom Bury <tom.bury@twipemobile.com>
)

BREAKING CHANGE: This affects an existing loading behavior so we marked it as breaking, just in case

Co-authored-by: Peter Lazar <peter.lazar@limehome.de>
Co-authored-by: Thibault Malbranche <thibault@brigad.co>
# [13.0.0](react-native-webview/react-native-webview@v12.4.0...v13.0.0) (2023-06-10)

### Features

* Allow webview to load in background tab ([react-native-webview#2930](react-native-webview#2930)) ([40c9807](react-native-webview@40c9807))

### BREAKING CHANGES

* This affects an existing loading behavior so we marked it as breaking, just in case

Co-authored-by: Peter Lazar <peter.lazar@limehome.de>
Co-authored-by: Thibault Malbranche <thibault@brigad.co>
…e-webview#2801) (react-native-webview#2994)

* feat: fraudulentWebsiteWarningEnabled
* chore: test new arch on CI

# Conflicts:
#	docs/Reference.md

* fix: missing type

* feat: add ios13 check

* Update src/WebViewTypes.ts

Co-authored-by: Caleb Clarke <TheAlmightyBob@users.noreply.github.com>

* Update docs/Reference.md

Co-authored-by: Caleb Clarke <TheAlmightyBob@users.noreply.github.com>

* implem adaptation

* Update ios-ci.yml

* Update ios-ci.yml

* Update android-ci.yml

* Update ios-ci.yml

* fix android new arch

* Update ios-ci.yml

---------

Co-authored-by: sunnylqm <sunnylqm@gmail.com>
Co-authored-by: Caleb Clarke <TheAlmightyBob@users.noreply.github.com>
…webview#2954)

Co-authored-by: Thibault Malbranche <thibault@brigad.co>
});

export default codegenNativeComponent<NativeProps>(
'RNCWebView'
Copy link
Author

Choose a reason for hiding this comment

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

On iOS, the parent component is RNCWebView, and its child is WKWebView. On Android, it used to be just one RNCWebView which extended the native Android WebView. Now, the parent component is RNCWebViewContainer, and its child is the old RNCWebView.

@joemun , do you know if it's okay for this to say RNCWebView even though the native component is RNCWebViewContainer on Android:

Copy link

@joemun joemun Jul 27, 2023

Choose a reason for hiding this comment

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

This value needs to match the name specified in the view manager (RNCWebViewModuleImpl.NAME).

On iOS, it needs to match the exported name (ie. RCT_EXPORT_MODULE in RNCWebViewManager.mm), which also appears to be good.

Copy link
Author

Choose a reason for hiding this comment

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

Thanks!

This value needs to match the name specified in the view manager (RNCWebViewModuleImpl.NAME)

To clarify, can the name say RNCWebView on Android in the view manager even if the native component that maps 1:1 to the react component is actually named RNCWebViewContainer? Also, I'm assuming that on Android and iOS, the name (in the view manager on Android and the exported name from RCT_EXPORT_MODULE in RNCWebViewManager.mm) have to be the same. Is that correct?

Copy link

Choose a reason for hiding this comment

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

On the TSX side, it's referencing the RNCWebView native component, which returns an instance of the RNCWebViewContainer. So I think this is fine. The name here is supposed to align with the view manager.

https://github.com/discord/react-native-webview/pull/27/files#diff-8576be466ba1cccbe7c11ba839c58655910cfcea677ad1de381d2a5194089ad8R16

Copy link

Choose a reason for hiding this comment

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

Also, I'm assuming that on Android and iOS, the name (in the view manager on Android and the exported name from RCT_EXPORT_MODULE in RNCWebViewManager.mm) have to be the same. Is that correct?

Yep

Copy link

Hello 👋, this PR has been opened for more than 2 months with no activity on it. If you think this is a mistake please comment and ping a maintainer to get this merged ASAP! Thanks for contributing! You have 7 days until this gets closed automatically

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet