💫 Update: RNIComputable

dominicstop · Apr 28, 2023 · 56ae8ae · 56ae8ae
1 parent 0872abb
commit 56ae8ae
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 27 deletions.
diff --git a/ios/src_library/React Native/RNIComputable/RNIComputableSizeEvaluator.swift b/ios/src_library/React Native/RNIComputable/RNIComputableSizeEvaluator.swift
@@ -22,6 +22,9 @@ public class RNIComputableSizeEvaluator {
   ) -> CGSize? {
     let computedSize: CGSize? = {
       switch self.computableSize.mode {
+        case .unspecified:
+          return nil;
+
         case .current:
           return currentSize;
 

diff --git a/ios/src_library/React Native/RNIComputable/RNIComputableSizeMode.swift b/ios/src_library/React Native/RNIComputable/RNIComputableSizeMode.swift
@@ -8,6 +8,7 @@
 import Foundation
 
 public enum RNIComputableSizeMode {
+  case unspecified;
   case current;
   case stretch;
   case constant(constantWidth: Double, constantHeight: Double);

diff --git a/ios/src_library/React Native/RNIComputable/RNIComputableValueEvaluator.swift b/ios/src_library/React Native/RNIComputable/RNIComputableValueEvaluator.swift
@@ -77,15 +77,7 @@ class RNIComputableValueEvaluator {
     }
   };
 
-  public var jsString: String = "" {
-    willSet {
-      self.initializeJSContextIfNeeded();
-      self.jsContext?.setObject(
-        newValue,
-        forKeyedSubscript: JSObjectKeys.valueFunction.string
-      );
-    }
-  };
+  public var jsString: String = "";
 
   // MARK: - Properties - Computed
   // ------------------------------
@@ -95,7 +87,22 @@ class RNIComputableValueEvaluator {
     self.initializeJSContextIfNeeded();
 
     let result = jsContext.evaluateScript(
-      "valueFunction(getEnvObject())"
+      "(\(self.jsString))(\(JSObjectKeys.getEnvObject)()"
+      //"JSON.stringify(\(JSObjectKeys.getEnvObject)())"
+    );
+
+    jsContext.exceptionHandler = { context, exception in
+      print(
+          "RNIComputableValueEvaluator - computedValue"
+        + " - exceptionHandler "
+        + " - arg exception: \(exception.debugDescription)"
+      );
+    };
+
+    print(
+        "RNIComputableValueEvaluator - computedValue"
+      + " - jsString: \(self.jsString)"
+      + " - result: \(result)"
     );
 
     return result;
@@ -161,6 +168,16 @@ class RNIComputableValueEvaluator {
       ]
     };
 
+    let getEnvObject: @convention(block)
+      () -> [AnyHashable: Any] = { [unowned self] in
+
+      return [
+        JSObjectKeys.getView: getView,
+        JSObjectKeys.getWindowSize: getWindowSize,
+        JSObjectKeys.getScreenSize: getScreenSize,
+      ];
+    };
+
     jsContext.setObject(
       getView,
       forKeyedSubscript: JSObjectKeys.getView.string
@@ -176,15 +193,10 @@ class RNIComputableValueEvaluator {
       forKeyedSubscript: JSObjectKeys.getScreenSize.string
     );
 
-    jsContext.evaluateScript("""
-      function \(JSObjectKeys.getEnvObject)(){
-        \(JSObjectKeys.getView),
-        getWindowSize: null,
-        getScreenSize: null,
-        
-        \(JSObjectKeys.parentView),
-      };
-    """);
+    jsContext.setObject(
+      getEnvObject,
+      forKeyedSubscript: JSObjectKeys.getEnvObject.string
+    );
   };
 
   // MARK: - Functions - Called from JS-Side

diff --git a/ios/src_library/React Native/RNIComputable/RNIViewMetadata.swift b/ios/src_library/React Native/RNIComputable/RNIViewMetadata.swift
@@ -16,9 +16,13 @@ public final class RNIViewMetadata: RNIDictionarySynthesizable {
   public let nativeID: String?;
 
   public let parentView: RNIViewMetadata?;
-  public let subviews: [RNIViewMetadata];
+  public let subviews: [RNIViewMetadata]?;
 
-  public required init(fromView view: UIView){
+  public required init(
+    fromView view: UIView,
+    setParentView: Bool = true,
+    setSubViews: Bool = true
+  ){
     self.tag = view.tag;
 
     self.reactTag = {
@@ -32,12 +36,27 @@ public final class RNIViewMetadata: RNIDictionarySynthesizable {
     }();
 
     self.parentView = {
-      guard let parentView = view.superview else { return nil };
-      return  Self.init(fromView: parentView);
+      guard setParentView,
+            let parentView = view.superview
+      else { return nil };
+
+      return Self.init(
+        fromView: parentView,
+        setParentView: false,
+        setSubViews: false
+      );
     }();
 
-    self.subviews = view.subviews.map {
-      return Self.init(fromView: $0);
-    };
+    self.subviews = {
+      guard setSubViews else { return nil };
+
+      return view.subviews.map {
+        return Self.init(
+          fromView: $0,
+          setParentView: false,
+          setSubViews: false
+        );
+      };
+    }();
   };
 };
diff --git a/src/types/RNIComputable/RNIComputableValue.ts b/src/types/RNIComputable/RNIComputableValue.ts
@@ -45,6 +45,6 @@ export type RNIComputableValueNative = {
 };
 
 export type RNIComputableValue<FunctionArgs, FunctionReturn> = {
-  valueFunction: (args: FunctionArgs) => FunctionReturn;
+  valueFunction: string | ((args: FunctionArgs) => FunctionReturn);
   extraData?: object;
 };