@bpmn-io/form-js-viewer 1.21.0 → 1.21.1

package/dist/index.cjs

@@ -640,6 +640,110 @@ function prefixId(id, formId, indexes) {
   return result;
 }
 
+/**
+ * Returns the options data for the provided if they can be simply determined, ignoring expression defined options.
+ *
+ * @param {object} formField
+ * @param {object} formData
+ */
+function getSimpleOptionsData(formField, formData) {
+  const {
+    valuesExpression: optionsExpression,
+    valuesKey: optionsKey,
+    values: staticOptions
+  } = formField;
+  if (optionsExpression) {
+    return null;
+  }
+  return optionsKey ? minDash.get(formData, [optionsKey]) : staticOptions;
+}
+
+/**
+ * Normalizes the provided options data to a format that can be used by the select components.
+ * If the options data is not valid, it is filtered out.
+ *
+ * @param {any[]} optionsData
+ *
+ * @returns {object[]}
+ */
+function normalizeOptionsData(optionsData) {
+  return optionsData.filter(_isAllowedValue).map(_normalizeOption).filter(o => !minDash.isNil(o));
+}
+
+/**
+ * Creates an options object with default values if no options are provided.
+ *
+ * @param {object} options
+ *
+ * @returns {object}
+ */
+function createEmptyOptions(options = {}) {
+  const defaults = {};
+
+  // provide default options if valuesKey and valuesExpression are not set
+  if (!options.valuesKey && !options.valuesExpression) {
+    defaults.values = [{
+      label: 'Value',
+      value: 'value'
+    }];
+  }
+  return {
+    ...defaults,
+    ...options
+  };
+}
+
+/**
+ * Converts the provided option to a normalized format.
+ * If the option is not valid, null is returned.
+ *
+ * @param {object} option
+ * @param {string} option.label
+ * @param {*} option.value
+ *
+ * @returns
+ */
+function _normalizeOption(option) {
+  // (1) simple primitive case, use it as both label and value
+  if (_isAllowedPrimitive(option)) {
+    return {
+      value: option,
+      label: `${option}`
+    };
+  }
+  if (minDash.isObject(option)) {
+    const isValidLabel = _isValidLabel(option.label);
+
+    // (2) no label provided, but value is a simple primitive, use it as label and value
+    if (!isValidLabel && _isAllowedPrimitive(option.value)) {
+      return {
+        value: option.value,
+        label: `${option.value}`
+      };
+    }
+
+    // (3) both label and value are provided, use them as is
+    if (isValidLabel && _isAllowedValue(option.value)) {
+      return option;
+    }
+  }
+  return null;
+}
+function _isAllowedPrimitive(value) {
+  const isAllowedPrimitiveType = ['number', 'string', 'boolean'].includes(typeof value);
+  const isValid = value || value === 0 || value === false;
+  return isAllowedPrimitiveType && isValid;
+}
+function _isValidLabel(label) {
+  return label && minDash.isString(label);
+}
+function _isAllowedValue(value) {
+  if (minDash.isObject(value)) {
+    return Object.keys(value).length > 0;
+  }
+  return _isAllowedPrimitive(value);
+}
+
 const FormRenderContext = preact.createContext({
   Empty: props => {
     return null;
@@ -680,7 +784,8 @@ const FormRenderContext = preact.createContext({
   },
   hoverInfo: {
     cleanup: () => {}
-  }
+  },
+  applyVisibilityConditions: true
 });
 
 const LocalExpressionContext = preact.createContext({
@@ -813,134 +918,6 @@ function runUnaryTestEvaluation(expressionLanguage, value, expressionContextInfo
   return expressionLanguage.evaluateUnaryTest(value, buildExpressionContext(expressionContextInfo));
 }
 
-/**
- * Evaluate a unary test expression reactively. Returns null for invalid/missing expressions.
- * The function is memoized to minimize re-renders.
- *
- * @param {string | undefined} value - A unary test expression to evaluate.
- * @returns {boolean | null} - Evaluated result, or null if expression is invalid/missing.
- */
-function useUnaryTestEvaluation(value) {
-  const expressionLanguage = useService('expressionLanguage');
-  const expressionContextInfo = hooks.useContext(LocalExpressionContext);
-  return hooks.useMemo(() => runUnaryTestEvaluation(expressionLanguage, value, expressionContextInfo), [expressionLanguage, expressionContextInfo, value]);
-}
-
-/**
- * Evaluate if condition is met reactively based on the expression language and form data.
- *
- * @param {string | undefined} condition
- *
- * @returns {boolean | null} true if condition is met, false if not, null if no condition or expression language
- */
-function useCondition(condition) {
-  return useUnaryTestEvaluation(condition);
-}
-
-/**
- * Returns the options data for the provided if they can be simply determined, ignoring expression defined options.
- *
- * @param {object} formField
- * @param {object} formData
- */
-function getSimpleOptionsData(formField, formData) {
-  const {
-    valuesExpression: optionsExpression,
-    valuesKey: optionsKey,
-    values: staticOptions
-  } = formField;
-  if (optionsExpression) {
-    return null;
-  }
-  return optionsKey ? minDash.get(formData, [optionsKey]) : staticOptions;
-}
-
-/**
- * Normalizes the provided options data to a format that can be used by the select components.
- * If the options data is not valid, it is filtered out.
- *
- * @param {any[]} optionsData
- *
- * @returns {object[]}
- */
-function normalizeOptionsData(optionsData) {
-  return optionsData.filter(_isAllowedValue).map(_normalizeOption).filter(o => !minDash.isNil(o));
-}
-
-/**
- * Creates an options object with default values if no options are provided.
- *
- * @param {object} options
- *
- * @returns {object}
- */
-function createEmptyOptions(options = {}) {
-  const defaults = {};
-
-  // provide default options if valuesKey and valuesExpression are not set
-  if (!options.valuesKey && !options.valuesExpression) {
-    defaults.values = [{
-      label: 'Value',
-      value: 'value'
-    }];
-  }
-  return {
-    ...defaults,
-    ...options
-  };
-}
-
-/**
- * Converts the provided option to a normalized format.
- * If the option is not valid, null is returned.
- *
- * @param {object} option
- * @param {string} option.label
- * @param {*} option.value
- *
- * @returns
- */
-function _normalizeOption(option) {
-  // (1) simple primitive case, use it as both label and value
-  if (_isAllowedPrimitive(option)) {
-    return {
-      value: option,
-      label: `${option}`
-    };
-  }
-  if (minDash.isObject(option)) {
-    const isValidLabel = _isValidLabel(option.label);
-
-    // (2) no label provided, but value is a simple primitive, use it as label and value
-    if (!isValidLabel && _isAllowedPrimitive(option.value)) {
-      return {
-        value: option.value,
-        label: `${option.value}`
-      };
-    }
-
-    // (3) both label and value are provided, use them as is
-    if (isValidLabel && _isAllowedValue(option.value)) {
-      return option;
-    }
-  }
-  return null;
-}
-function _isAllowedPrimitive(value) {
-  const isAllowedPrimitiveType = ['number', 'string', 'boolean'].includes(typeof value);
-  const isValid = value || value === 0 || value === false;
-  return isAllowedPrimitiveType && isValid;
-}
-function _isValidLabel(label) {
-  return label && minDash.isString(label);
-}
-function _isAllowedValue(value) {
-  if (minDash.isObject(value)) {
-    return Object.keys(value).length > 0;
-  }
-  return _isAllowedPrimitive(value);
-}
-
 /**
  * If the value is a valid expression, it is evaluated and returned. Otherwise, it is returned as-is.
  * The function is memoized to minimize re-renders.
@@ -1272,6 +1249,19 @@ function useBooleanExpressionEvaluation(value) {
   }, [expressionLanguage, expressionContextInfo, value]);
 }
 
+/**
+ * Evaluate a unary test expression reactively. Returns null for invalid/missing expressions.
+ * The function is memoized to minimize re-renders.
+ *
+ * @param {string | undefined} value - A unary test expression to evaluate.
+ * @returns {boolean | null} - Evaluated result, or null if expression is invalid/missing.
+ */
+function useUnaryTestEvaluation(value) {
+  const expressionLanguage = useService('expressionLanguage');
+  const expressionContextInfo = hooks.useContext(LocalExpressionContext);
+  return hooks.useMemo(() => runUnaryTestEvaluation(expressionLanguage, value, expressionContextInfo), [expressionLanguage, expressionContextInfo, value]);
+}
+
 /**
  * Returns the conditionally filtered data of a form reactively.
  * Memoised to minimize re-renders
@@ -2083,7 +2073,8 @@ function FormField(props) {
   const {
     Element,
     Hidden,
-    Column
+    Column,
+    applyVisibilityConditions
   } = hooks.useContext(FormRenderContext);
   const {
     formId
@@ -2107,7 +2098,8 @@ function FormField(props) {
 
   // add precedence: global readonly > form field disabled
   const disabled = !properties.readOnly && (properties.disabled || field.disabled || false);
-  const hidden = useCondition(field.conditional && field.conditional.hide || null);
+  const conditionResult = useUnaryTestEvaluation(field.conditional && field.conditional.hide || null);
+  const hidden = applyVisibilityConditions ? conditionResult : null;
   const instanceId = hooks.useMemo(() => {
     if (!formFieldInstanceRegistry) {
       return null;