mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix/webView_scrollView_contentsize_2' into 'release/8_0_0'

Browse Source 
fix

See merge request BPHV_MIPS/mvm_core_ui!572
This commit is contained in:
Hedden, Kyle Matthew 2020-08-25 19:41:36 -04:00
commit aed3f6b4cf
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
MVMCoreUI/Atomic/Atoms/Views/WebView.swift
View File

@ -129,30 +129,29 @@ extension WebView : WKUIDelegate {
return
}
/*
//TODO: Check and remove the comment
was using "document.readyState" to check the state,
while evaluateJavaScript "document.readyState",only works when webview contains userscrpt.otherwise, it would return WKErrorDomain Code=4 "A JavaScript exception occurred".
so webView.isLoading to check load finished state
*/
webView.evaluateJavaScript("document.readyState", completionHandler: { (complete, error) in
if complete == nil {
return
}
webView.evaluateJavaScript("document.body.scrollHeight", completionHandler: { [weak self] (result, error) in
guard let self = self else {
return
}
let scrollHeight = self.webView?.scrollView.contentSize.height ?? 44.0
if let height = result as? CGFloat,
height < scrollHeight {
self.webViewHeight?.constant = height
} else {
//if failed to get height from javascript, using scrollview.contensize's height
self.webViewHeight?.constant = scrollHeight
}
self.delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self)
})
})
if !webView.isLoading {
webView.evaluateJavaScript("document.body.scrollHeight", completionHandler: { [weak self] (result, error) in
guard let self = self else {
return
}
MVMCoreDispatchUtility.performBlock(onMainThread: { [weak self] in
guard let self = self else {
return
}
if let height = result as? CGFloat {
self.webViewHeight?.constant = height
} else {
//if failed to get height from javascript, using scrollview.contensize's height
self.webViewHeight?.constant = webView.scrollView.contentSize.height
}
self.delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self)
})
})
}
}