From 3961432aab1298ba6f8b9ae7a065abd87ae7e0fa Mon Sep 17 00:00:00 2001 From: Dominik Titl <78549750+morning4coffe-dev@users.noreply.github.com> Date: Wed, 28 Aug 2024 15:24:47 +0200 Subject: [PATCH 1/2] docs: Specify macOS support for WebView2 Related discussion - https://github.com/unoplatform/uno/discussions/17990. Currently this is a bit confusing (cherry picked from commit ca34d552920ab4abab5ec6bd7a6d379a43d9a18d) # Conflicts: # doc/articles/controls/WebView.md --- doc/articles/controls/WebView.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/articles/controls/WebView.md b/doc/articles/controls/WebView.md index 40966a76d40c..9ea4caf5da38 100644 --- a/doc/articles/controls/WebView.md +++ b/doc/articles/controls/WebView.md @@ -2,7 +2,11 @@ > Uno Platform supports two `WebView` controls - a legacy `WebView` and a modernized `WebView2` control. For new development, we strongly recommend `WebView2` as it will get further improvements in the future. +<<<<<<< HEAD `WebView2` is currently supported on Windows, Android, iOS, and macOS. +======= +`WebView2` is currently supported on Windows, Android, iOS, macOS (Catalyst), and Skia WPF. +>>>>>>> ca34d55292 (docs: Specify macOS support for WebView2) ## Basic usage @@ -58,7 +62,7 @@ function postWebViewMessage(message){ // Android unoWebView.postMessage(JSON.stringify(message)); } else if (window.hasOwnProperty("webkit") && typeof webkit.messageHandlers !== undefined) { - // iOS and macOS + // iOS and macOS (Catalyst) webkit.messageHandlers.unoWebView.postMessage(JSON.stringify(message)); } } From e80ed416bf1aabdb4f2a4914c1d16167dfd45d5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Fri, 30 Aug 2024 10:24:12 -0400 Subject: [PATCH 2/2] chore: Adjust for backport --- doc/articles/controls/WebView.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/doc/articles/controls/WebView.md b/doc/articles/controls/WebView.md index 9ea4caf5da38..bd1cb7e09d8e 100644 --- a/doc/articles/controls/WebView.md +++ b/doc/articles/controls/WebView.md @@ -2,11 +2,7 @@ > Uno Platform supports two `WebView` controls - a legacy `WebView` and a modernized `WebView2` control. For new development, we strongly recommend `WebView2` as it will get further improvements in the future. -<<<<<<< HEAD -`WebView2` is currently supported on Windows, Android, iOS, and macOS. -======= `WebView2` is currently supported on Windows, Android, iOS, macOS (Catalyst), and Skia WPF. ->>>>>>> ca34d55292 (docs: Specify macOS support for WebView2) ## Basic usage