Merge pull request #19 from ammarahm-ed/leaf-node-measure-percentage

fix leaf measure function not taking nan dim into account
triniwiz · Feb 17, 2023 · 8952608 · 8952608
2 parents e6f8dd5 + 353c003
commit 8952608
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/...t/src-native/mason-android/masonkit/src/main/java/org/nativescript/mason/masonkit/View.kt b/...t/src-native/mason-android/masonkit/src/main/java/org/nativescript/mason/masonkit/View.kt
@@ -1932,8 +1932,8 @@ class View @JvmOverloads constructor(
           return@let
         }
 
-        if (widthIsNaN || width.equals(0.0f) && !widthIsZero) {
-          when (node.style.size.height) {
+        if (widthIsNaN || (width.equals(0.0f) && !widthIsZero)) {
+          when (node.style.size.width) {
             is Dimension.Points -> {
               retWidth = node.style.size.width.value
               if (!retWidth.isNaN()) widthIsNaN = false
@@ -1950,7 +1950,7 @@ class View @JvmOverloads constructor(
           }
         }
 
-        if (heightIsNaN || height.equals(0.0f) && !heightIsZero) {
+        if (heightIsNaN || (height.equals(0.0f) && !heightIsZero)) {
           when (node.style.size.height) {
             is Dimension.Points -> {
               retHeight = node.style.size.height.value