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.

Sign up for GitHub

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

Jump to bottom

refactor(macos): migrate to objc2 #1316

Merged
merged 45 commits into from
Oct 11, 2024
Merged

refactor(macos): migrate to objc2 #1316

merged 45 commits into from
Oct 11, 2024

Conversation

pewsheen
Copy link
Contributor

@pewsheen pewsheen commented Jul 10, 2024 •
edited
Loading

Issue: #1239

Roadmap

  • Remove objc dependency
  • Merge dev branch
  • Declare Custom Class
    • WryWebView
    • {}URLSchemeHandler (We need to create it dynamically)
    • WebViewDelegate -> WryWebViewDelegate
    • DocumentTitleChangedDelegate
    • WryNavigationDelegate
    • WryDownloadDelegate
    • WebViewUIDelegate -> WryWebViewUIDelegate
    • WryWebViewParent
  • Test Functionality
  • Update Tauri to use wry with objc2 pewsheen/refactor/wry-objc2

Functionality Test:

  • Window (single webview)
  • Window (multiple webviews)
  • Window iOS
  • PerformKeyEquivalent (menu shortcut)
  • Picture in picture
  • Fullscreen (feature = fullscreen)
  • Document title changed handler
  • Navigation Policy (download handler?)
  • [mac] Reparent
  • UIDelegate
    • File upload
    • Media capture permission
  • [ios] setAllowsInlineMediaPlayback (not merged yet, in dev)
  • [mac] Synthetic mouse event
  • [mac] Tab focuses links
  • with_*
    • [mac] with_back_forward_navigation_gestures
    • with_transparent
    • with_visible
    • with_autoplay (false is not working, dev as well)
    • with_initialization_script
    • with_custom_protocol
    • with_asynchronous_custom_protocol
    • with_ipc_handler
    • [mac] with_drag_drop_handler
    • with_url_and_headers
    • with_url
    • with_headers
    • with_html
    • with_user_agent
    • with_devtools
    • with_navigation_handler
    • with_download_started_handler
    • with_download_completed_handler
    • with_new_window_req_handler
    • [mac] with_accept_first_mouse
    • with_document_title_changed_handler
    • with_incognito
    • with_on_page_load_handler
    • with_proxy_config (feature = mac-proxy)
    • with_bounds (child webview)
  • pub fn
    • [mac] print
    • url
    • load_url
    • load_url_with_headers
    • eval
    • clear_all_browsing_data
    • [mac] open_devtools
    • [mac] close_devtools
    • [mac] is_devtools_open
    • zoom
    • bounds
    • [mac] set_bounds (child webview)
    • set_visible
    • focus
    • url_from_webview
    • platform_webview_version

Issues

if catch_unwind(|| {
  config_unwind_safe.setURLSchemeHandler_forURLScheme(
    Some(&*(handler_unwind_safe.cast::<ProtocolObject<dyn WKURLSchemeHandler>>())),
    &NSString::from_str(&name),
  );
})

pewsheen and others added 18 commits March 28, 2024 01:27
@pewsheen
migrate drag & drop
0da1952
@amrbashir @pewsheen
refactor: migrate to dpi crate (#1202)
73f0541 
* refactor: migrate to `dpi` crate

closes #1172

* macOS

* linux

* fix doctests

* imports

* more doctests

* fix android and ios

* Update examples/winit.rs

Co-authored-by: Jason Tsai <jason@pews.dev>

* Update src/webview2/mod.rs

---------

Co-authored-by: Jason Tsai <jason@pews.dev>
@amrbashir @pewsheen
fix(windows): avoid double-free the controller (#1206)
93f608f
@FabianLars @pewsheen
fix(linux): Disable deprecated applicationCache web api. (#1207)
990759f 
fixes tauri-apps/tauri#9300
ref WebKit/WebKit#23382
@thewh1teagle @pewsheen
fix(wkwebview): menu shortcuts (#1208)
7c2cbcd 
* fix(wkwebview): menu shortcuts

* Update wkwebview.md
@github-actions @amrbashir @pewsheen
Apply Version Updates From Current Changes (#1203)
97ad528 
Co-authored-by: amrbashir <amrbashir@users.noreply.github.com>
@pewsheen
migrate to objc2
4f445fa
@pewsheen
fix(macos): response body being double freed
1bcbde0
@pewsheen
fix(macos): eval callback NSStrgin convertion error
ec9f3c3
@pewsheen
chore: remove objc dependency
8dbd6cf
@pewsheen
refactor(macos): migrate WebViewDelegate
cf2ac97
@pewsheen
refactor(macos): migrate proxy to objc2
2e5d9fe
@pewsheen
refactor(macos): migrate document title change observer to objc2
f4309e7
@pewsheen
refactor(macos): move drag&drop handler to delegate
b4e51ed
@pewsheen
refactor(macos): move ipc_handler into WryWebViewDelegate
be6d74e
@pewsheen
refactor(macos): migrate download handler
e62e116
@pewsheen
Merge branch 'dev' into refactor/migrate-to-objc2
986cecd
@pewsheen
fix(macos): prevent unsafe async custom protocol panic
2fb6be9
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jul 10, 2024 •
edited
Loading

Package Changes Through faef2eb

There are 1 changes which include wry with minor

Planned Package Versions

The following package releases are the planned based on the context of changes in this pull request.

package current next
wry 0.45.0 0.46.0

Add another change file through the GitHub UI by following this link.

Read about change files or the docs at github.com/jbolda/covector

@pewsheen pewsheen force-pushed the refactor/migrate-to-objc2 branch 3 times, most recently from 17287ab to fdd1534 Compare July 10, 2024 10:41
@pewsheen pewsheen mentioned this pull request Jul 10, 2024
Open
@renovate @pewsheen
chore(deps): update rust crate tao to 0.29 (#1343)
7674bf3 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
madsmtm
madsmtm reviewed Sep 8, 2024
View reviewed changes
Cargo.toml Outdated Show resolved Hide resolved
@pewsheen
Copy link
Contributor Author

pewsheen commented Sep 8, 2024 •
edited
Loading

Note: iOS can now be built and run on the iOS simulator from Tauri (it requires some modification in Tauri to use objc2). It's still WIP for testing some functionalities and organizing the code.

https://github.com/pewsheen/tauri/tree/refactor/wry-objc2

@pewsheen pewsheen marked this pull request as ready for review October 7, 2024 03:52
@pewsheen pewsheen requested a review from a team as a code owner October 7, 2024 03:52
@pewsheen
Copy link
Contributor Author

pewsheen commented Oct 7, 2024

I think the review will take a long time, and this PR is about 90% complete, so it might be worth starting the review and having some feedback earlier.

madsmtm
madsmtm reviewed Oct 7, 2024
View reviewed changes
src/wkwebview/mod.rs Outdated Show resolved Hide resolved
@lucasfernog lucasfernog merged commit 0abc221 into dev Oct 11, 2024
14 checks passed
@lucasfernog lucasfernog deleted the refactor/migrate-to-objc2 branch October 11, 2024 19:11
@github-actions github-actions bot mentioned this pull request Oct 11, 2024
Merged
amrbashir
amrbashir reviewed Oct 14, 2024
View reviewed changes
src/wkwebview/mod.rs
let app: id = msg_send![app_class, sharedApplication];
let _: () = msg_send![app, activateIgnoringOtherApps: YES];
let app = NSApplication::sharedApplication(mtm);
NSApplication::activate(&app);
Copy link
Member

Choose a reason for hiding this comment

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

this change seems to be panicing, see tauri-apps/tauri#11340

cc @lucasfernog @pewsheen @madsmtm

Copy link
Contributor Author

Choose a reason for hiding this comment

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

https://developer.apple.com/documentation/appkit/nsapplication/activationoptions/1525559-activateignoringotherapps

https://developer.apple.com/documentation/appkit/nsapplication/4168336-activate

It seems Activate was added after 14.0, and activateignoringotherapps is deprecated after 14.0

Copy link
Member

Choose a reason for hiding this comment

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

nice finding @pewsheen, so I guess we need to gate that behind a version check

Copy link
Member

Choose a reason for hiding this comment

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

can't test but here is the PR, #1389 thanks @pewsheen

amrbashir added a commit that referenced this pull request Oct 14, 2024
@amrbashir
fix: use activateIgnoringOtherApps on older macOS versions
357b927 
closes tauri-apps/tauri#11340

ref: #1316 (comment)
@amrbashir amrbashir mentioned this pull request Oct 14, 2024
Merged
lucasfernog added a commit that referenced this pull request Oct 14, 2024
@amrbashir @lucasfernog
fix: use activateIgnoringOtherApps on older macOS versions (#1389)
33c0193 
* fix: use `activateIgnoringOtherApps` on older macOS versions

closes tauri-apps/tauri#11340

ref: #1316 (comment)

* clippy

---------

Co-authored-by: Lucas Nogueira <lucas@tauri.app>
@chrox chrox mentioned this pull request Oct 15, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@madsmtm madsmtm madsmtm approved these changes

@amrbashir amrbashir amrbashir left review comments

@lucasfernog lucasfernog lucasfernog approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@pewsheen @madsmtm @lucasfernog @amrbashir @FabianLars @thewh1teagle