diff --git a/MVMCoreUI/Atomic/Atoms/Views/WebView.swift b/MVMCoreUI/Atomic/Atoms/Views/WebView.swift index 159d758d..b1696a1d 100644 --- a/MVMCoreUI/Atomic/Atoms/Views/WebView.swift +++ b/MVMCoreUI/Atomic/Atoms/Views/WebView.swift @@ -132,16 +132,17 @@ extension WebView : WKUIDelegate { so webView.isLoading to check load finished state */ if !webView.isLoading { - webView.evaluateJavaScript("webView.scrollView.contentSize", completionHandler: { [weak self] (result, error) in + webView.evaluateJavaScript("document.body.scrollHeight", completionHandler: { [weak self] (result, error) in guard let self = self else { return } - if let height = result as? CGFloat { + 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 - let scrollHeight = self.webView?.scrollView.contentSize.height - self.webViewHeight?.constant = scrollHeight ?? 44 + self.webViewHeight?.constant = scrollHeight } self.delegateObject?.moleculeDelegate?.moleculeLayoutUpdated(self) })