Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
56 changes: 56 additions & 0 deletions src/webkit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,13 @@
using UIFindInteraction = Foundation.NSObject;
using UIViewController = AppKit.NSViewController;
using IUIEditMenuInteractionAnimating = Foundation.NSObject;
using UIConversationContext = Foundation.NSObject;
using UIInputSuggestion = Foundation.NSObject;
#else
#if __MACCATALYST__
using AppKit;
using UIConversationContext = Foundation.NSObject;
using UIInputSuggestion = Foundation.NSObject;
#else
using NSDraggingInfo = Foundation.NSObject;
using INSDraggingInfo = Foundation.NSObject;
Expand Down Expand Up @@ -5188,6 +5192,11 @@ interface WKHttpCookieStore {
[Export ("getCookiePolicy:")]
[Async]
void GetCookiePolicy (Action<WKCookiePolicy> completionHandler);

[Mac (26, 0), iOS (26, 0), MacCatalyst (26, 0)]
[Async]
[Export ("setCookies:completionHandler:")]
void SetCookies (NSHttpCookie [] cookies, [NullAllowed] Action completionHandler);
}

interface IWKHttpCookieStoreObserver { }
Expand Down Expand Up @@ -5731,6 +5740,10 @@ interface WKWebsiteDataType {
[iOS (17, 0), Mac (14, 0), MacCatalyst (17, 0)]
[Field ("WKWebsiteDataTypeHashSalt")]
NSString HashSalt { get; }

[Mac (26, 0), iOS (26, 0), MacCatalyst (26, 0)]
[Field ("WKWebsiteDataTypeScreenTime")]
NSString TypeScreenTime { get; }
}

[NoiOS, NoMacCatalyst, Mac (14, 0)]
Expand Down Expand Up @@ -5845,6 +5858,16 @@ interface WKWebsiteDataStore : NSSecureCoding {
[iOS (17, 0), Mac (14, 0), MacCatalyst (17, 0)]
[Export ("proxyConfigurations", ArgumentSemantic.Copy), NullAllowed]
NWProxyConfig [] ProxyConfigurations { get; set; }

[Async]
[Mac (26, 0), iOS (26, 0), MacCatalyst (26, 0)]
[Export ("fetchDataOfTypes:completionHandler:")]
void FetchData (NSSet<NSString> dataTypes, Action<NSData, NSError> completionHandler);

[Async]
[Mac (26, 0), iOS (26, 0), MacCatalyst (26, 0)]
[Export ("restoreData:completionHandler:")]
void RestoreData (NSData data, Action<NSError> completionHandler);
}

[iOS (18, 4), NoTV]
Expand Down Expand Up @@ -6023,6 +6046,10 @@ void RunJavaScriptTextInputPanel (WKWebView webView, string prompt, [NullAllowed
[NoMac, iOS (16, 4), MacCatalyst (16, 4)]
[Export ("webView:willDismissEditMenuWithAnimator:")]
void WillDismissEditMenu (WKWebView webView, IUIEditMenuInteractionAnimating animator);

[NoMacCatalyst, iOS (26, 0), NoMac]
[Export ("webView:insertInputSuggestion:")]
void InsertInputSuggestion (WKWebView webView, UIInputSuggestion inputSuggestion);
}

/// <summary>Interface representing the required methods (if any) of the protocol <see cref="WebKit.WKUIDelegate" />.</summary>
Expand Down Expand Up @@ -6596,6 +6623,24 @@ interface WKWebView
[Mac (15, 0), iOS (18, 2), MacCatalyst (18, 0)]
[Export ("writingToolsActive")]
bool WritingToolsActive { [Bind ("isWritingToolsActive")] get; }

[NoMacCatalyst, iOS (26, 0), NoMac]
[Export ("conversationContext", ArgumentSemantic.Strong)]
UIConversationContext ConversationContext { get; set; }

[Mac (26, 0), iOS (26, 0), MacCatalyst (26, 0)]
[Async]
[Export ("fetchDataOfTypes:completionHandler:")]
void FetchData (WKWebViewDataType dataTypes, Action<NSData, NSError> completionHandler);

[Mac (26, 0), iOS (26, 0), MacCatalyst (26, 0)]
[Async]
[Export ("restoreData:completionHandler:")]
void RestoreData (NSData data, Action<NSError> completionHandler);

[Mac (26, 0), iOS (26, 0), MacCatalyst (26, 0)]
[Export ("isBlockedByScreenTime")]
bool IsBlockedByScreenTime { get; }
}

/// <param name="result">The result of a successful evaluation. <see langword="null" /> if error occurred.</param>
Expand Down Expand Up @@ -6735,6 +6780,10 @@ interface WKWebViewConfiguration : NSCopying, NSSecureCoding {
[iOS (18, 4), MacCatalyst (18, 4), Mac (15, 4), NoTV]
[Export ("webExtensionController", ArgumentSemantic.Strong), NullAllowed]
WKWebExtensionController WebExtensionController { get; set; }

[Mac (26, 0), iOS (26, 0), MacCatalyst (26, 0)]
[Export ("showsSystemScreenTimeBlockingView")]
bool ShowsSystemScreenTimeBlockingView { get; set; }
}

/// <summary>A pool of content processes.</summary>
Expand Down Expand Up @@ -8285,4 +8334,11 @@ enum WKWebExtensionPermission {
[Field ("WKWebExtensionPermissionWebRequest")]
WebRequest = 1 << 15,
}

[Flags]
[Mac (26, 0), iOS (26, 0), MacCatalyst (26, 0)]
[Native]
public enum WKWebViewDataType : ulong {
SessionStorage = 1uL << 0,
}
}
10 changes: 0 additions & 10 deletions tests/xtro-sharpie/api-annotations-dotnet/MacCatalyst-WebKit.todo

This file was deleted.

13 changes: 0 additions & 13 deletions tests/xtro-sharpie/api-annotations-dotnet/iOS-WebKit.todo

This file was deleted.

10 changes: 0 additions & 10 deletions tests/xtro-sharpie/api-annotations-dotnet/macOS-WebKit.todo

This file was deleted.

Loading