TouchInstinct
/
LeadKit
302
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: code review notes

This commit is contained in:
Nikita Semenov 2023-01-30 11:42:06 +03:00
parent a67c42886d
commit f6e00bb53a
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -2,7 +2,7 @@
### 1.32.0
- **Added**: `BaseInitializableWebView`with navigation and error handling api.
- **Added**: `BaseInitializableWebView` with navigation and error handling api.
### 1.31.0

4
TIWebView/Sources/ErrorHandler/WebViewErrorHandler.swift
View File

@ -21,11 +21,11 @@
//
public protocol WebViewErrorHandler {
func didRecievedError(_ error: WebViewError)
func didReceiveError(_ error: WebViewError)
}
public extension WebViewErrorHandler {
func didRecievedError(_ error: WebViewError) {
func didReceiveError(_ error: WebViewError) {
// override in subclasses
}
}

8
TIWebView/Sources/NavigationHandler/BaseWebViewNavigator.swift
View File

@ -22,13 +22,13 @@
open class BaseWebViewNavigator: WebViewNavigator {
public var navigationMap: [NavigationPolicy]
public var navigationPolicyMap: [NavigationPolicy]
public init(navigationMap: [NavigationPolicy]) {
self.navigationMap = navigationMap
public init(navigationPolicyMap: [NavigationPolicy]) {
self.navigationPolicyMap = navigationPolicyMap
}
public convenience init() {
self.init(navigationMap: [])
self.init(navigationPolicyMap: [])
}
}

6
TIWebView/Sources/NavigationHandler/WebViewNavigator.swift
View File

@ -24,18 +24,18 @@ import Foundation
import enum WebKit.WKNavigationActionPolicy
public protocol WebViewNavigator {
var navigationMap: [NavigationPolicy] { get set }
var navigationPolicyMap: [NavigationPolicy] { get set }
func shouldNavigate(to url: URL) -> WKNavigationActionPolicy
}
public extension WebViewNavigator {
func shouldNavigate(to url: URL) -> WKNavigationActionPolicy {
guard !navigationMap.isEmpty else {
guard !navigationPolicyMap.isEmpty else {
return .cancel
}
let allowPolicy = navigationMap.filter { $0.policy(for: url) == .allow }
let allowPolicy = navigationPolicyMap.filter { $0.policy(for: url) == .allow }
return allowPolicy.isEmpty ? .cancel : .allow
}
}

2
TIWebView/Sources/Views/ViewModels/DefaultWebViewModel.swift
View File

@ -48,7 +48,7 @@ open class DefaultWebViewModel: NSObject, WebViewModel {
if message.name == WebViewErrorConstants.errorMessageName,
let error = parseError(message) {
errorHandler.didRecievedError(error)
errorHandler.didReceiveError(error)
}
}

2
TIWebView/Sources/Views/ViewModels/WebViewModel.swift
View File

@ -44,6 +44,6 @@ public extension WebViewModel {
func handleError(_ error: Error, url: URL?) {
let errorModel = WebViewLoadingError(sourceURL: url, innerError: error)
errorHandler.didRecievedError(errorModel)
errorHandler.didReceiveError(errorModel)
}
}