Support WebViewControl functionality for 17692 #2219

rjmurillo · 2018-06-07T22:03:44Z

Issue: #2180

PR Type

What kind of change does this PR introduce?

Feature

What is the current behavior?

Missing new functionality introduced in Windows SDK update. See #2180

What is the new behavior?

WebViewControl
- Event for GotFocus
- Event for LostFocus
- Add method to execute script on page load
- New arguments for NewWindowRequested event
  - TargetWebViewControl
  - GetDeferral
Process Options
- Get/Set Partition
- Get/Set UserAgent
Process
- Get Partition
- Get UserAgent

PR Checklist

Please check if your PR fulfills the following requirements:

Tested code with current supported SDKs
Docs have been added/updated which fit documentation template. (for bug fixes / features)
Sample in sample app has been added / updated (for bug fixes / features)
- Icon has been created (if new sample) following the Thumbnail Style Guide and templates
Tests for the changes have been added (for bug fixes / features) (if applicable)
Header has been added to all new source files (run build/UpdateHeaders.bat)
Contains NO breaking changes

Other information

Note: this requires #2220 or similar to be able to install the required SDK update
Resolves #2180

Minimum version updated to April 2018 Update, the first generally available OS version with metadata contract 6 and the WebViewControl APIs necessary. The target version has been updated to latest Insider version 17677, the minimum version required to support new WebView features, such as Partition.

The reference now prefers the latest version of the SDK if it exists, then moves to the minimum version. If neither SDK are available, the reference is unresolved.

The property was introduced in a later version of the SDK. The value is gated on a check on `ApiInformation.IsPropertyPresent` to verify the property is available on the type. If the property is not present, the wrapper type holds on to the value and it is simply dropped when creating the WinRT type with the process options.

Master changed folder structure. Move file for new structure

This reverts commit 740fc50.

Underlying events from WebViewControl for GotFocus and LostFocus raise the respective events in WinForms and WPF.

skendrot · 2018-06-12T14:52:35Z

Microsoft.Toolkit.Win32/Microsoft.Toolkit.Win32.UI.Controls/IWebView2.cs

+namespace Microsoft.Toolkit.Win32.UI.Controls
+{
+    /// <inheritdoc />
+    public interface IWebView2 : IWebView


Can we just break the original? I doubt anyone would be implementing their own

This would be released with 3.1, which according to semver would not permit such a breaking change. On 4.0 it could be merged to create that single interface.

I understand it's a breaking change, but I can't imagine anyone is implementing it. I'm ok with merging them in 4.0. Should be added to the breaking changes issue

I've added it to #2178

Since our next release is 4.0, does it make sense now to introduce the breaking change?

@nmetulev I've merged the interfaces in 5168765

skendrot · 2018-06-12T14:53:40Z

Microsoft.Toolkit.Win32/Microsoft.Toolkit.Win32.UI.Controls/Interop/WinRT/WebViewControlHost.cs

@@ -678,8 +682,19 @@ private void OnFrameNavigationStarting(WebViewControlNavigationStartingEventArgs
            }
        }

+        private void OnGotFocus(object args)


why is this not protected virtual?

Never mind. Class is sealed

skendrot · 2018-06-12T14:53:49Z

Microsoft.Toolkit.Win32/Microsoft.Toolkit.Win32.UI.Controls/Interop/WinRT/WebViewControlHost.cs

@@ -691,6 +706,17 @@ private void OnLongRunningScriptDetected(WebViewControlLongRunningScriptDetected

        private void OnLongRunningScriptDetected(IWebViewControl sender, Windows.Web.UI.WebViewControlLongRunningScriptDetectedEventArgs args) => OnLongRunningScriptDetected(args);

+        private void OnLostFocus(object args)


why is this not protected virtual

Never mind. Class is sealed

rjmurillo · 2018-06-12T17:44:50Z

Note: this requires #2220 or similar to be able to install the required SDK update

Add UserAgent introduced in 17686

Since WebViewControlProcessOptions is used directly, use check prior to invocation to ensure property on type exists to avoid runtime error on downlevel clients. Downlevel clients will receive an empty string if property not present.

The types should have been sealed with initial release.

- Need documentation for how to use AddPreLoadedScript. - API appears to be non-functional at this point in time.

nmetulev · 2018-07-09T01:24:44Z

Should we review and merge this on a separate branch for now and setup up a custom VM for building? /cc @onovotny

clairernovotny · 2018-07-09T01:29:02Z

No opinion about a separate branch, but we'll hopefully have progress on getting the hosted agents working shortly.

Updating to 17704 as installed by CommunityToolkit#2220

Includes information about the PR/CI YAML files as well as installing on own development machine by manually invoking the PowerShell file.

Since the SDK will undergo a major version, combine interfaces

michael-hawker · 2018-07-12T22:40:31Z

...oft.Toolkit.Win32/Microsoft.Toolkit.Win32.UI.Controls/Interop/WinRT/WebViewControlProcess.cs

@@ -60,12 +61,50 @@ private WebViewControlProcess(Windows.Web.UI.Interop.WebViewControlProcess proce
        /// <value><c>true</c> if this instance can access the private network; otherwise, <c>false</c>.</value>
        public bool IsPrivateNetworkClientServerCapabilityEnabled => _process.IsPrivateNetworkClientServerCapabilityEnabled;

+        /// <summary>
+        /// Gets a value indicating the partition of the web view.


Should we mention the version here that this is valid on? (same below?)

That's tricky to know what version it is valid with--the API is versioned at a different cadence than the OS, it just so happens we "snap" and that's what's out there. We handle support by asking the universal contract if a type, property, method, event (etc.) is available, so we don't care what version. Right now the API is visible in insiders fast, insiders slow(ish), and other RS5 builds.

michael-hawker · 2018-07-12T22:43:43Z

...lkit.Win32/Microsoft.Toolkit.Win32.UI.Controls/Interop/WinRT/WebViewControlProcessOptions.cs

-                retval.EnterpriseId = EnterpriseId;
+                if (!string.IsNullOrEmpty(options?.Partition))
+                {
+                    retval.Partition = options?.Partition;


This is safe now as it's checked so '?' is redundant? (same below)

Fixed in 0091a1f

Per code review feedback, the result of the expression is already checked for null, so the check in the assignment is redundant.

# Conflicts: # Microsoft.Toolkit.Win32/Tests/UnitTests.WebView.WinForms/UnitTests.WebView.WinForms.csproj

rjmurillo added 8 commits May 31, 2018 09:35

Change the order of the SDK reference

740fc50

The reference now prefers the latest version of the SDK if it exists, then moves to the minimum version. If neither SDK are available, the reference is unresolved.

Merge branch 'master' into rjmurillo/WebView/CommunityToolkit#2180

f7e79b1

Merge branch 'master' into rjmurillo/WebView/CommunityToolkit#2180

440b979

Move IWebView2.cs

e1ade52

Master changed folder structure. Move file for new structure

Revert "Change the order of the SDK reference"

cb14811

This reverts commit 740fc50.

Wire up events for Got/Lost focus

af12052

Underlying events from WebViewControl for GotFocus and LostFocus raise the respective events in WinForms and WPF.

rjmurillo added feature 💡 controls 🎛️ win 3️⃣2️⃣ WebView 🖥️ WPF and WinForms WebView labels Jun 7, 2018

rjmurillo self-assigned this Jun 7, 2018

rjmurillo requested a review from nmetulev June 7, 2018 22:03

rjmurillo changed the title ~~Rjmurillo/web view/#2180~~ Support WebViewControl functionality for 17677 Jun 7, 2018

Merge branch 'master' into rjmurillo/WebView/CommunityToolkit#2180

f520230

rjmurillo added this to the 3.1 milestone Jun 7, 2018

rjmurillo and others added 2 commits June 11, 2018 11:41

Merge branch 'master' into rjmurillo/WebView/CommunityToolkit#2180

98dc0ef

Merge branch 'master' into rjmurillo/WebView/CommunityToolkit#2180

4aa7f66

skendrot reviewed Jun 12, 2018

View reviewed changes

nmetulev mentioned this pull request Jun 12, 2018

5.0 Breaking changes #2178

Closed

5 tasks

rjmurillo added 3 commits June 14, 2018 14:56

Add support for 17686

32cc4f8

Add UserAgent introduced in 17686

Use ApiInformation.IsPropertyPresent for partition

f36259b

Since WebViewControlProcessOptions is used directly, use check prior to invocation to ensure property on type exists to avoid runtime error on downlevel clients. Downlevel clients will receive an empty string if property not present.

Mark remaining WinRT types as sealed

29bf1ea

The types should have been sealed with initial release.

rjmurillo changed the title ~~Support WebViewControl functionality for 17677~~ Support WebViewControl functionality for 17686 Jun 14, 2018

Merge branch 'master' into rjmurillo/WebView/CommunityToolkit#2180

4abaae9

rjmurillo force-pushed the rjmurillo/WebView/#2180 branch from ce0a0a6 to 771e70c Compare June 22, 2018 22:23

rjmurillo changed the title ~~Support WebViewControl functionality for 17686~~ Support WebViewControl functionality for 17692 Jun 26, 2018

Add AddPreLoadedScript(string) to WebView

4d4bbeb

- Need documentation for how to use AddPreLoadedScript. - API appears to be non-functional at this point in time.

rjmurillo force-pushed the rjmurillo/WebView/#2180 branch from 58fbc76 to 4d4bbeb Compare June 26, 2018 20:30

Merge branch 'master' into rjmurillo/WebView/CommunityToolkit#2180

86c956c

Merge branch 'master' into rjmurillo/WebView/CommunityToolkit#2180

3870154

rjmurillo mentioned this pull request Jul 10, 2018

Add script for installing Windows SDK from ISO #2220

Merged

7 tasks

rjmurillo and others added 2 commits July 10, 2018 14:13

Update Target platform version

08182c4

Updating to 17704 as installed by CommunityToolkit#2220

Merge branch 'master' into rjmurillo/WebView/CommunityToolkit#2180

7d93609

nmetulev modified the milestones: 3.1, 4.0 Jul 11, 2018

rjmurillo and others added 3 commits July 12, 2018 09:02

Add note for how to install/update SDK version

de30ec6

Includes information about the PR/CI YAML files as well as installing on own development machine by manually invoking the PowerShell file.

Merge branch 'master' into rjmurillo/WebView/CommunityToolkit#2180

7a8df14

Combine IWebView2 and IWebView

5168765

Since the SDK will undergo a major version, combine interfaces

rjmurillo added this to the 4.0 milestone Jul 12, 2018

nmetulev approved these changes Jul 12, 2018

View reviewed changes

michael-hawker approved these changes Jul 12, 2018

View reviewed changes

rjmurillo added 2 commits July 12, 2018 16:11

Remove redundant null check on argument conversion

0091a1f

Per code review feedback, the result of the expression is already checked for null, so the check in the assignment is redundant.

Merge branch 'master' into rjmurillo/WebView/CommunityToolkit#2180

cbedc69

# Conflicts: # Microsoft.Toolkit.Win32/Tests/UnitTests.WebView.WinForms/UnitTests.WebView.WinForms.csproj

nmetulev merged commit 41b96ba into CommunityToolkit:master Jul 13, 2018

rjmurillo deleted the rjmurillo/WebView/#2180 branch July 16, 2018 20:52

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Support WebViewControl functionality for 17692 #2219

Support WebViewControl functionality for 17692 #2219

rjmurillo commented Jun 7, 2018 •

edited

Loading

skendrot Jun 12, 2018

rjmurillo Jun 12, 2018

skendrot Jun 12, 2018

rjmurillo Jun 12, 2018

nmetulev Jul 12, 2018

rjmurillo Jul 12, 2018

skendrot Jun 12, 2018

skendrot Jun 12, 2018

skendrot Jun 12, 2018

skendrot Jun 12, 2018

rjmurillo commented Jun 12, 2018

nmetulev commented Jul 9, 2018

clairernovotny commented Jul 9, 2018

michael-hawker Jul 12, 2018

rjmurillo Jul 12, 2018

michael-hawker Jul 12, 2018

rjmurillo Jul 12, 2018

		@@ -691,6 +706,17 @@ private void OnLongRunningScriptDetected(WebViewControlLongRunningScriptDetected

		private void OnLongRunningScriptDetected(IWebViewControl sender, Windows.Web.UI.WebViewControlLongRunningScriptDetectedEventArgs args) => OnLongRunningScriptDetected(args);

		private void OnLostFocus(object args)

Support WebViewControl functionality for 17692 #2219

Support WebViewControl functionality for 17692 #2219

Conversation

rjmurillo commented Jun 7, 2018 • edited Loading

PR Type

What is the current behavior?

What is the new behavior?

PR Checklist

Other information

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rjmurillo commented Jun 12, 2018

nmetulev commented Jul 9, 2018

clairernovotny commented Jul 9, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rjmurillo commented Jun 7, 2018 •

edited

Loading