Merge pull request #20 from openkraken/feat/rem-em

Feat: support rem em unit
openkraken · Sep 24, 2021 · 3bcaebb · 3bcaebb
2 parents 3a351a1 + 50d3cae
commit 3bcaebb
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 15 deletions.
diff --git a/packages/kraken_webview/CHANGELOG.md b/packages/kraken_webview/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.7.0
+
+* Support rem and em unit.
+
 ## 0.5.3
 
 * upgrade kraken to 0.7.3+1

diff --git a/packages/kraken_webview/README.md b/packages/kraken_webview/README.md
@@ -29,20 +29,20 @@ document.body.appendChild(iframe);
 ```
 
 ## Contribute
-Install kraken-nbpt
+Install kraken-npbt
 
 ```
-npm install kraken-nbpt -g
+npm install kraken-npbt -g
 ```
 
 Generate build project files:
 
 ```
-kraken-nbpt configure
+kraken-npbt configure
 ```
 
 Build native dynamic library
 
 ```
-kraken-nbpt build
+kraken-npbt build
 ```
diff --git a/packages/kraken_webview/android/jniLibs/arm64-v8a/libkraken_webview_jsc.so b/packages/kraken_webview/android/jniLibs/arm64-v8a/libkraken_webview_jsc.so
diff --git a/packages/kraken_webview/android/jniLibs/armeabi-v7a/libkraken_webview_jsc.so b/packages/kraken_webview/android/jniLibs/armeabi-v7a/libkraken_webview_jsc.so
diff --git a/packages/kraken_webview/ios/libkraken_webview_jsc.dylib b/packages/kraken_webview/ios/libkraken_webview_jsc.dylib
diff --git a/packages/kraken_webview/lib/iframe_element.dart b/packages/kraken_webview/lib/iframe_element.dart
@@ -475,11 +475,8 @@ abstract class WebViewElement extends Element {
         assert(initialMediaPlaybackPolicy != null),
         super(targetId, nativePtr, elementManager,
             tagName: tagName, defaultStyle: _defaultStyle, isIntrinsicBox: true, repaintSelf: true) {
-    double viewportWidth = elementManager.viewportWidth;
-    double viewportHeight = elementManager.viewportHeight;
-    Size viewportSize = Size(viewportWidth, viewportHeight);
-    _width = CSSLength.toDisplayPortValue(ELEMENT_DEFAULT_WIDTH, viewportSize);
-    _height = CSSLength.toDisplayPortValue(ELEMENT_DEFAULT_HEIGHT, viewportSize);
+    _width = CSSLength.toDisplayPortValue(ELEMENT_DEFAULT_WIDTH, viewportSize: viewportSize);
+    _height = CSSLength.toDisplayPortValue(ELEMENT_DEFAULT_HEIGHT, viewportSize: viewportSize);
   }
 
   @override
@@ -539,13 +536,23 @@ abstract class WebViewElement extends Element {
   }
 
   void _stylePropertyChanged(String property, String? prev, String present) {
-    double viewportWidth = elementManager.viewportWidth;
-    double viewportHeight = elementManager.viewportHeight;
-    Size viewportSize = Size(viewportWidth, viewportHeight);
+    RenderStyle renderStyle = renderBoxModel!.renderStyle;
+    double rootFontSize = renderBoxModel!.elementDelegate.getRootElementFontSize();
+    double fontSize = renderStyle.fontSize;
     if (property == WIDTH) {
-      width = CSSLength.toDisplayPortValue(present, viewportSize);
+      width = CSSLength.toDisplayPortValue(
+        present,
+        viewportSize: viewportSize,
+        rootFontSize: rootFontSize,
+        fontSize: fontSize
+      );
     } else if (property == HEIGHT) {
-      height = CSSLength.toDisplayPortValue(present, viewportSize);
+      height = CSSLength.toDisplayPortValue(
+        present,
+        viewportSize: viewportSize,
+        rootFontSize: rootFontSize,
+        fontSize: fontSize
+      );
     }
   }
 

diff --git a/packages/kraken_webview/macos/libkraken_webview_jsc.dylib b/packages/kraken_webview/macos/libkraken_webview_jsc.dylib
diff --git a/packages/kraken_webview/pubspec.yaml b/packages/kraken_webview/pubspec.yaml
@@ -1,6 +1,6 @@
 name: kraken_webview
 description: kraken `<iframe />` tags support.
-version: 0.6.0
+version: 0.7.0
 author: openkraken.com
 homepage: https://openkraken.com/