Skip to content

Add pull-to-refresh to in-app browser #112

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

Open
mcintyre94 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add pull-to-refresh to in-app browser #112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 16 additions & 1 deletion Wisp/Views/WebView/WebViewPage.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ final class WebViewState {

func goBack() { webView?.goBack() }
func goForward() { webView?.goForward() }
func reload() { webView?.reload() }
}

struct WebViewPage: UIViewRepresentable {
Expand Down Expand Up @@ -111,6 +112,11 @@ struct WebViewPage: UIViewRepresentable {
let webView = WKWebView(frame: .zero, configuration: config)
webView.navigationDelegate = context.coordinator
webView.allowsBackForwardNavigationGestures = true

let refreshControl = UIRefreshControl()
refreshControl.addTarget(context.coordinator, action: #selector(Coordinator.handleRefresh(_:)), for: .valueChanged)
webView.scrollView.refreshControl = refreshControl

context.coordinator.observe(webView)
state.webView = webView
webView.load(context.coordinator.authorizedRequest(for: initialURL))
Expand Down Expand Up @@ -274,6 +280,10 @@ struct WebViewPage: UIViewRepresentable {
self.authToken = authToken
}

@objc func handleRefresh(_ sender: UIRefreshControl) {
state.reload()
}

func authorizedRequest(for url: URL) -> URLRequest {
var request = URLRequest(url: url)
if let token = authToken, url.host()?.hasSuffix(".sprites.app") == true {
Expand All @@ -291,7 +301,12 @@ struct WebViewPage: UIViewRepresentable {
Task { @MainActor in self?.state.canGoForward = webView.canGoForward }
},
webView.observe(\.isLoading) { [weak self] webView, _ in
Task { @MainActor in self?.state.isLoading = webView.isLoading }
Task { @MainActor in
self?.state.isLoading = webView.isLoading
if !webView.isLoading {
webView.scrollView.refreshControl?.endRefreshing()
}
}
},
webView.observe(\.url) { [weak self] webView, _ in
Task { @MainActor in self?.state.currentURL = webView.url }
Expand Down
Loading