react-native-security-suite 0.9.1 → 0.9.3

package/android/src/main/java/com/securitysuite/SecureView.java

@@ -3,7 +3,6 @@ package com.securitysuite;
 import android.content.Context;
 import android.view.View;
 import android.widget.FrameLayout;
-
 import com.facebook.react.uimanager.ThemedReactContext;
 import com.facebook.react.uimanager.UIManagerModule;
 
@@ -22,28 +21,37 @@ public class SecureView extends FrameLayout {
 
   private final Runnable measureAndLayout = () -> {
     measure(
-      MeasureSpec.makeMeasureSpec(getWidth(), MeasureSpec.EXACTLY),
-      MeasureSpec.makeMeasureSpec(getHeight(), MeasureSpec.EXACTLY));
+            MeasureSpec.makeMeasureSpec(getWidth(), MeasureSpec.EXACTLY),
+            MeasureSpec.makeMeasureSpec(getHeight(), MeasureSpec.EXACTLY));
     layout(getLeft(), getTop(), getRight(), getBottom());
   };
 
   @Override
   protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+    int parentWidth = MeasureSpec.getSize(widthMeasureSpec);
+    int parentHeight = MeasureSpec.getSize(heightMeasureSpec);
+
     int maxWidth = 0;
     int maxHeight = 0;
 
     for (int i = 0; i < getChildCount(); i++) {
       View child = getChildAt(i);
       if (child.getVisibility() != GONE) {
-        child.measure(widthMeasureSpec, MeasureSpec.UNSPECIFIED);
+        child.measure(
+                MeasureSpec.makeMeasureSpec(parentWidth, MeasureSpec.AT_MOST),
+                MeasureSpec.makeMeasureSpec(parentHeight, MeasureSpec.AT_MOST));
 
         maxWidth = Math.max(maxWidth, child.getMeasuredWidth());
         maxHeight = Math.max(maxHeight, child.getMeasuredHeight());
       }
     }
 
-    int finalWidth = Math.max(maxWidth, getSuggestedMinimumWidth());
-    int finalHeight = Math.max(maxHeight, getSuggestedMinimumHeight());
+    final int finalWidth = Math.max(maxWidth, getSuggestedMinimumWidth()) > 0
+            ? Math.max(maxWidth, getSuggestedMinimumWidth())
+            : 100;
+    final int finalHeight = Math.max(maxHeight, getSuggestedMinimumHeight()) > 0
+            ? Math.max(maxHeight, getSuggestedMinimumHeight())
+            : 100;
 
     setMeasuredDimension(finalWidth, finalHeight);
 
@@ -51,14 +59,19 @@ public class SecureView extends FrameLayout {
     UIManagerModule uiManagerModule = reactContext.getNativeModule(UIManagerModule.class);
 
     if (uiManagerModule != null) {
-      reactContext.runOnNativeModulesQueueThread(() -> uiManagerModule.updateNodeSize(getId(), finalWidth, finalHeight));
+      reactContext.runOnNativeModulesQueueThread(() ->
+              uiManagerModule.updateNodeSize(getId(), finalWidth, finalHeight)
+      );
     }
   }
 
-
   public void setContentView(View view) {
+    if (contentView != null) {
+      removeView(contentView);
+    }
     contentView = view;
     addView(contentView);
+    requestLayout();
   }
 
   public View getContentView() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-security-suite",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "description": "Security solution for React Native",
   "source": "./src/index.tsx",
   "main": "./lib/commonjs/index.js",