@movable/studio-framework 3.5.1 → 3.6.1-canary.0

package/dist/index.es.js

@@ -2691,11 +2691,62 @@ class StudioFramework {
       conditionalDynamicProperty
     } = model;
     if (!conditionalDynamicProperty) return [true, null];
+    return this.resolveCondition(conditionalDynamicProperty);
+  }
+
+  async resolveCondition(expression) {
+    if ('operator' in expression) {
+      const {
+        operator,
+        operands
+      } = expression;
+
+      if (!operands?.length) {
+        return [false, new Error(`Missing operands for logical operation: ${operator}`)];
+      }
+
+      switch (operator) {
+        case 'AND':
+          {
+            for (const operand of operands) {
+              const [result, error] = await this.evaluateOperand(operand);
+              if (error) return [false, error];
+              if (!result) return [false, null]; // Short-circuit AND on first false
+            }
+
+            return [true, null]; // All conditions were true
+          }
+
+        case 'OR':
+          {
+            for (const operand of operands) {
+              const [result, error] = await this.evaluateOperand(operand);
+              if (error) return [false, error];
+              if (result) return [true, null]; // Short-circuit OR on first true
+            }
+
+            return [false, null]; // No conditions were true
+          }
+
+        default:
+          return [false, new Error(`Unsupported operator: ${operator}`)];
+      }
+    } // Simple dynamic property case
+
+
+    return this.evaluateOperand(expression);
+  }
+
+  async evaluateOperand(operand) {
+    if ('operator' in operand) {
+      return this.resolveCondition(operand);
+    }
+
     const {
       propertyGroupKey = '',
       propertyPath = '',
       context = {}
-    } = conditionalDynamicProperty;
+    } = operand;
     return this.getPropertyTuple(propertyGroupKey, propertyPath, context);
   }
 
@@ -3070,6 +3121,12 @@ class StudioFramework {
     CD.resume();
   }
 
+  logCurrentCanvas(currentCanvas) {
+    if (window.MICapture?.setCanvasKey) {
+      window.MICapture.setCanvasKey(currentCanvas.name);
+    }
+  }
+
   async render(targetElement) {
     if (window.MICapture?.isPreview) console.log('Preview Render');
     let currentCanvas;
@@ -3077,6 +3134,7 @@ class StudioFramework {
     try {
       CD.pause();
       currentCanvas = await this.getCurrentCanvas();
+      this.logCurrentCanvas(currentCanvas);
       const clickthroughURL = await this.handleClickthrough(currentCanvas);
       const canvasTags = currentCanvas?.tags || [];
       const tags = await this.getCurrentTags(canvasTags, currentCanvas);

package/dist/index.js

@@ -2701,11 +2701,62 @@ class StudioFramework {
       conditionalDynamicProperty
     } = model;
     if (!conditionalDynamicProperty) return [true, null];
+    return this.resolveCondition(conditionalDynamicProperty);
+  }
+
+  async resolveCondition(expression) {
+    if ('operator' in expression) {
+      const {
+        operator,
+        operands
+      } = expression;
+
+      if (!operands?.length) {
+        return [false, new Error(`Missing operands for logical operation: ${operator}`)];
+      }
+
+      switch (operator) {
+        case 'AND':
+          {
+            for (const operand of operands) {
+              const [result, error] = await this.evaluateOperand(operand);
+              if (error) return [false, error];
+              if (!result) return [false, null]; // Short-circuit AND on first false
+            }
+
+            return [true, null]; // All conditions were true
+          }
+
+        case 'OR':
+          {
+            for (const operand of operands) {
+              const [result, error] = await this.evaluateOperand(operand);
+              if (error) return [false, error];
+              if (result) return [true, null]; // Short-circuit OR on first true
+            }
+
+            return [false, null]; // No conditions were true
+          }
+
+        default:
+          return [false, new Error(`Unsupported operator: ${operator}`)];
+      }
+    } // Simple dynamic property case
+
+
+    return this.evaluateOperand(expression);
+  }
+
+  async evaluateOperand(operand) {
+    if ('operator' in operand) {
+      return this.resolveCondition(operand);
+    }
+
     const {
       propertyGroupKey = '',
       propertyPath = '',
       context = {}
-    } = conditionalDynamicProperty;
+    } = operand;
     return this.getPropertyTuple(propertyGroupKey, propertyPath, context);
   }
 
@@ -3080,6 +3131,12 @@ class StudioFramework {
     CD__default['default'].resume();
   }
 
+  logCurrentCanvas(currentCanvas) {
+    if (window.MICapture?.setCanvasKey) {
+      window.MICapture.setCanvasKey(currentCanvas.name);
+    }
+  }
+
   async render(targetElement) {
     if (window.MICapture?.isPreview) console.log('Preview Render');
     let currentCanvas;
@@ -3087,6 +3144,7 @@ class StudioFramework {
     try {
       CD__default['default'].pause();
       currentCanvas = await this.getCurrentCanvas();
+      this.logCurrentCanvas(currentCanvas);
       const clickthroughURL = await this.handleClickthrough(currentCanvas);
       const canvasTags = currentCanvas?.tags || [];
       const tags = await this.getCurrentTags(canvasTags, currentCanvas);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@movable/studio-framework",
-  "version": "3.5.1",
+  "version": "3.6.1-canary.0",
   "description": "A Component library for reactive Studio apps.",
   "author": "Movable Ink",
   "repository": "movableink/studio-framework",
@@ -31,8 +31,8 @@
     "@babel/preset-react": "^7.14.5",
     "@babel/preset-typescript": "^7.13.0",
     "@movable/eslint-config-react": "^1.0.1",
-    "@movable/framework-types": "^3.5.1",
-    "@movable/studio-framework-test-helpers": "^3.5.1",
+    "@movable/framework-types": "^3.6.1-canary.0",
+    "@movable/studio-framework-test-helpers": "^3.6.1-canary.0",
     "@types/qunit": "^2.11.1",
     "@types/qunit-dom": "^0.7.0",
     "@types/react": "^17.0.6",
@@ -66,5 +66,5 @@
   "volta": {
     "extends": "../../package.json"
   },
-  "gitHead": "09927de527457346727a532da4ce3bb6ebaf9fa8"
+  "gitHead": "47c70c8a89abd3cdb3086a30c11b7033c4ba671f"
 }