@uniformdev/canvas 20.13.2 → 20.14.0

package/dist/index.d.mts

@@ -12106,13 +12106,19 @@ interface EvaluateNodeTreeVisibilityOptions extends Pick<EvaluateNodeVisibilityO
      * When false, indeterminate criteria will fail the summary result, and the node will be hidden
      */
     showIndeterminate?: boolean;
+    /**
+     * When evaluating visibility of a root node, this controls what happens when the node is found to be invisible.
+     * When 'throw' (default), an error is thrown.
+     * When 'ignore', the node is left intact. False is still returned.
+     */
+    rootNodeInvisibleHandling?: 'throw' | 'ignore';
 }
 /**
  * Function to call to evaluate visibility rules when traversing the node tree with walkNodeTree.
  *
  * If the function returns false, that means the current node is removed and you should stop any other code handling.
  */
-declare function evaluateWalkTreeNodeVisibility({ rules, showIndeterminate, context, }: EvaluateNodeTreeVisibilityOptions): boolean | undefined;
+declare function evaluateWalkTreeNodeVisibility({ rules, showIndeterminate, rootNodeInvisibleHandling, context, }: EvaluateNodeTreeVisibilityOptions): boolean | undefined;
 
 interface EvaluateWalkTreePropertyCriteriaOptions extends Pick<EvaluatePropertyCriteriaOptions, 'rules' | 'keepIndeterminate'> {
     node: ComponentInstance;

package/dist/index.d.ts

@@ -12106,13 +12106,19 @@ interface EvaluateNodeTreeVisibilityOptions extends Pick<EvaluateNodeVisibilityO
      * When false, indeterminate criteria will fail the summary result, and the node will be hidden
      */
     showIndeterminate?: boolean;
+    /**
+     * When evaluating visibility of a root node, this controls what happens when the node is found to be invisible.
+     * When 'throw' (default), an error is thrown.
+     * When 'ignore', the node is left intact. False is still returned.
+     */
+    rootNodeInvisibleHandling?: 'throw' | 'ignore';
 }
 /**
  * Function to call to evaluate visibility rules when traversing the node tree with walkNodeTree.
  *
  * If the function returns false, that means the current node is removed and you should stop any other code handling.
  */
-declare function evaluateWalkTreeNodeVisibility({ rules, showIndeterminate, context, }: EvaluateNodeTreeVisibilityOptions): boolean | undefined;
+declare function evaluateWalkTreeNodeVisibility({ rules, showIndeterminate, rootNodeInvisibleHandling, context, }: EvaluateNodeTreeVisibilityOptions): boolean | undefined;
 
 interface EvaluateWalkTreePropertyCriteriaOptions extends Pick<EvaluatePropertyCriteriaOptions, 'rules' | 'keepIndeterminate'> {
     node: ComponentInstance;

package/dist/index.esm.js

@@ -2092,15 +2092,19 @@ function evaluateNodeVisibility({
 function evaluateWalkTreeNodeVisibility({
   rules,
   showIndeterminate,
+  rootNodeInvisibleHandling = "throw",
   context
 }) {
-  const { type, node, actions } = context;
+  const { type, node, actions, ancestorsAndSelf } = context;
   if (type !== "component") {
     return;
   }
   const result = evaluateNodeVisibility({ node, rules, simplifyCriteria: true });
   if (result === null && !showIndeterminate || result === false) {
-    actions.remove();
+    if (ancestorsAndSelf.length === 1 && rootNodeInvisibleHandling === "ignore") {
+    } else {
+      actions.remove();
+    }
     return false;
   }
   return true;
@@ -2336,25 +2340,24 @@ function extractLocales({ component }) {
 function localize(options) {
   const nodes = options.nodes;
   const locale = options.locale;
-  const isUsingModernOptions = typeof locale === "string";
-  const vizControlLocaleRule = isUsingModernOptions ? createLocaleVisibilityRule(locale) : {};
+  if (!locale) {
+    return;
+  }
+  const vizControlLocaleRule = createLocaleVisibilityRule(locale);
   walkNodeTree(nodes, (context) => {
     const { type, node, actions } = context;
     if (type !== "component") {
-      if (isUsingModernOptions) {
-        localizeProperties(node, locale, vizControlLocaleRule);
-      }
+      localizeProperties(node, locale, vizControlLocaleRule);
       return;
     }
-    if (isUsingModernOptions) {
-      const result = evaluateWalkTreeNodeVisibility({
-        context,
-        rules: vizControlLocaleRule,
-        showIndeterminate: true
-      });
-      if (!result) {
-        return;
-      }
+    const result = evaluateWalkTreeNodeVisibility({
+      context,
+      rules: vizControlLocaleRule,
+      showIndeterminate: true,
+      rootNodeInvisibleHandling: "ignore"
+    });
+    if (!result) {
+      return;
     }
     if (node.type === CANVAS_LOCALIZATION_TYPE) {
       const locales = extractLocales({ component: node });
@@ -2365,9 +2368,7 @@ function localize(options) {
       if (replaceComponent == null ? void 0 : replaceComponent.length) {
         replaceComponent.forEach((component) => {
           removeLocaleProperty(component);
-          if (isUsingModernOptions) {
-            localizeProperties(component, locale, vizControlLocaleRule);
-          }
+          localizeProperties(component, locale, vizControlLocaleRule);
         });
         const [first, ...rest] = replaceComponent;
         actions.replace(first);
@@ -2377,7 +2378,7 @@ function localize(options) {
       } else {
         actions.remove();
       }
-    } else if (isUsingModernOptions) {
+    } else {
       localizeProperties(node, locale, vizControlLocaleRule);
     }
   });

package/dist/index.js

@@ -2255,15 +2255,19 @@ function evaluateNodeVisibility({
 function evaluateWalkTreeNodeVisibility({
   rules,
   showIndeterminate,
+  rootNodeInvisibleHandling = "throw",
   context
 }) {
-  const { type, node, actions } = context;
+  const { type, node, actions, ancestorsAndSelf } = context;
   if (type !== "component") {
     return;
   }
   const result = evaluateNodeVisibility({ node, rules, simplifyCriteria: true });
   if (result === null && !showIndeterminate || result === false) {
-    actions.remove();
+    if (ancestorsAndSelf.length === 1 && rootNodeInvisibleHandling === "ignore") {
+    } else {
+      actions.remove();
+    }
     return false;
   }
   return true;
@@ -2499,25 +2503,24 @@ function extractLocales({ component }) {
 function localize(options) {
   const nodes = options.nodes;
   const locale = options.locale;
-  const isUsingModernOptions = typeof locale === "string";
-  const vizControlLocaleRule = isUsingModernOptions ? createLocaleVisibilityRule(locale) : {};
+  if (!locale) {
+    return;
+  }
+  const vizControlLocaleRule = createLocaleVisibilityRule(locale);
   walkNodeTree(nodes, (context) => {
     const { type, node, actions } = context;
     if (type !== "component") {
-      if (isUsingModernOptions) {
-        localizeProperties(node, locale, vizControlLocaleRule);
-      }
+      localizeProperties(node, locale, vizControlLocaleRule);
       return;
     }
-    if (isUsingModernOptions) {
-      const result = evaluateWalkTreeNodeVisibility({
-        context,
-        rules: vizControlLocaleRule,
-        showIndeterminate: true
-      });
-      if (!result) {
-        return;
-      }
+    const result = evaluateWalkTreeNodeVisibility({
+      context,
+      rules: vizControlLocaleRule,
+      showIndeterminate: true,
+      rootNodeInvisibleHandling: "ignore"
+    });
+    if (!result) {
+      return;
     }
     if (node.type === CANVAS_LOCALIZATION_TYPE) {
       const locales = extractLocales({ component: node });
@@ -2528,9 +2531,7 @@ function localize(options) {
       if (replaceComponent == null ? void 0 : replaceComponent.length) {
         replaceComponent.forEach((component) => {
           removeLocaleProperty(component);
-          if (isUsingModernOptions) {
-            localizeProperties(component, locale, vizControlLocaleRule);
-          }
+          localizeProperties(component, locale, vizControlLocaleRule);
         });
         const [first, ...rest] = replaceComponent;
         actions.replace(first);
@@ -2540,7 +2541,7 @@ function localize(options) {
       } else {
         actions.remove();
       }
-    } else if (isUsingModernOptions) {
+    } else {
       localizeProperties(node, locale, vizControlLocaleRule);
     }
   });

package/dist/index.mjs

@@ -2092,15 +2092,19 @@ function evaluateNodeVisibility({
 function evaluateWalkTreeNodeVisibility({
   rules,
   showIndeterminate,
+  rootNodeInvisibleHandling = "throw",
   context
 }) {
-  const { type, node, actions } = context;
+  const { type, node, actions, ancestorsAndSelf } = context;
   if (type !== "component") {
     return;
   }
   const result = evaluateNodeVisibility({ node, rules, simplifyCriteria: true });
   if (result === null && !showIndeterminate || result === false) {
-    actions.remove();
+    if (ancestorsAndSelf.length === 1 && rootNodeInvisibleHandling === "ignore") {
+    } else {
+      actions.remove();
+    }
     return false;
   }
   return true;
@@ -2336,25 +2340,24 @@ function extractLocales({ component }) {
 function localize(options) {
   const nodes = options.nodes;
   const locale = options.locale;
-  const isUsingModernOptions = typeof locale === "string";
-  const vizControlLocaleRule = isUsingModernOptions ? createLocaleVisibilityRule(locale) : {};
+  if (!locale) {
+    return;
+  }
+  const vizControlLocaleRule = createLocaleVisibilityRule(locale);
   walkNodeTree(nodes, (context) => {
     const { type, node, actions } = context;
     if (type !== "component") {
-      if (isUsingModernOptions) {
-        localizeProperties(node, locale, vizControlLocaleRule);
-      }
+      localizeProperties(node, locale, vizControlLocaleRule);
       return;
     }
-    if (isUsingModernOptions) {
-      const result = evaluateWalkTreeNodeVisibility({
-        context,
-        rules: vizControlLocaleRule,
-        showIndeterminate: true
-      });
-      if (!result) {
-        return;
-      }
+    const result = evaluateWalkTreeNodeVisibility({
+      context,
+      rules: vizControlLocaleRule,
+      showIndeterminate: true,
+      rootNodeInvisibleHandling: "ignore"
+    });
+    if (!result) {
+      return;
     }
     if (node.type === CANVAS_LOCALIZATION_TYPE) {
       const locales = extractLocales({ component: node });
@@ -2365,9 +2368,7 @@ function localize(options) {
       if (replaceComponent == null ? void 0 : replaceComponent.length) {
         replaceComponent.forEach((component) => {
           removeLocaleProperty(component);
-          if (isUsingModernOptions) {
-            localizeProperties(component, locale, vizControlLocaleRule);
-          }
+          localizeProperties(component, locale, vizControlLocaleRule);
         });
         const [first, ...rest] = replaceComponent;
         actions.replace(first);
@@ -2377,7 +2378,7 @@ function localize(options) {
       } else {
         actions.remove();
       }
-    } else if (isUsingModernOptions) {
+    } else {
       localizeProperties(node, locale, vizControlLocaleRule);
     }
   });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/canvas",
-  "version": "20.13.2",
+  "version": "20.14.0",
   "description": "Common functionality and types for Uniform Canvas",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -38,9 +38,9 @@
     "p-throttle": "5.0.0"
   },
   "dependencies": {
-    "@uniformdev/assets": "20.13.2",
-    "@uniformdev/context": "20.13.2",
-    "@uniformdev/richtext": "20.13.2",
+    "@uniformdev/assets": "20.14.0",
+    "@uniformdev/context": "20.14.0",
+    "@uniformdev/richtext": "20.14.0",
     "immer": "10.1.1"
   },
   "files": [
@@ -49,5 +49,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a9f1943df4e10e77972224d0e2d679e4fcda25c6"
+  "gitHead": "958a8fe27da8ec9191a1a09f289f6f7418dd16d6"
 }