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

Merge branch 'develop' into feature/addingActionAttributeFor_radioButton

Browse Source 
* develop:
  cleanup
  remove code
  fix
  fix
  fiix
  fix
  webView.scrollView.contentSize
This commit is contained in:
Damodaram 2020-09-15 11:09:32 +05:30
commit afe5e1185c
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,7 +128,9 @@ extension WebView : WKUIDelegate {
if !dynamicHeight { if !dynamicHeight {
return return
} }
/* 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". /*
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 so webView.isLoading to check load finished state
*/ */
if !webView.isLoading { if !webView.isLoading {
@ -136,14 +138,18 @@ extension WebView : WKUIDelegate {
guard let self = self else { guard let self = self else {
return return
} }
if let height = result as? CGFloat { MVMCoreDispatchUtility.performBlock(onMainThread: { [weak self] in
self.webViewHeight?.constant = height guard let self = self else {
} else { return
//if failed to get height from javascript, using scrollview.contensize's height }
let scrollHeight = self.webView?.scrollView.contentSize.height if let height = result as? CGFloat {
self.webViewHeight?.constant = scrollHeight ?? 44 self.webViewHeight?.constant = height
} } else {
self.delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self) //if failed to get height from javascript, using scrollview.contensize's height
self.webViewHeight?.constant = webView.scrollView.contentSize.height
}
self.delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self)
})
}) })
} }
} }