@bpmn-io/form-js-viewer 1.7.1 → 1.7.2

package/dist/index.cjs

@@ -792,20 +792,59 @@ function useCondition(condition) {
   }, [conditionChecker, condition, expressionContextInfo]);
 }
 
-// parses the options data from the provided form field and form data
-function getOptionsData(formField, formData) {
+/**
+ * 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;
 }
 
-// transforms the provided options into a normalized format, trimming invalid options
+/**
+ * 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.
@@ -856,21 +895,6 @@ function _isAllowedValue(value) {
   }
   return _isAllowedPrimitive(value);
 }
-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
-  };
-}
 
 /**
  * Evaluate a string reactively based on the expressionLanguage and form data.
@@ -891,29 +915,19 @@ function useExpressionEvaluation(value) {
   }, [expressionLanguage, expressionContextInfo, value]);
 }
 
-function usePrevious(value, defaultValue = null) {
-  const ref = hooks.useRef(defaultValue);
-  hooks.useEffect(() => ref.current = value, [value]);
-  return ref.current;
-}
-
 /**
  * A custom hook to manage state changes with deep comparison.
  *
- * @param {any} value - The current value to manage.
- * @param {any} defaultValue - The initial default value for the state.
- * @returns {any} - Returns the current state.
+ * @template T
+ * @param {T} value - The current value to manage.
+ * @returns {T} - Returns the current state.
  */
-function useDeepCompareState(value, defaultValue) {
-  const [state, setState] = hooks.useState(defaultValue);
-  const previous = usePrevious(value, defaultValue);
-  const changed = !isEqual(previous, value);
-  hooks.useEffect(() => {
-    if (changed) {
-      setState(value);
-    }
-  }, [changed, value]);
-  return state;
+function useDeepCompareMemoize(value) {
+  const ref = hooks.useRef();
+  if (!isEqual(value, ref.current)) {
+    ref.current = value;
+  }
+  return ref.current;
 }
 
 /**
@@ -943,15 +957,10 @@ function useOptionsAsync(field) {
     valuesKey: optionsKey,
     values: staticOptions
   } = field;
-  const [optionsGetter, setOptionsGetter] = hooks.useState({
-    options: [],
-    error: undefined,
-    loadState: LOAD_STATES.LOADING
-  });
   const initialData = useService('form')._getState().initialData;
   const expressionEvaluation = useExpressionEvaluation(optionsExpression);
-  const evaluatedOptions = useDeepCompareState(expressionEvaluation || [], []);
-  hooks.useEffect(() => {
+  const evaluatedOptions = useDeepCompareMemoize(expressionEvaluation || []);
+  const optionsGetter = hooks.useMemo(() => {
     let options = [];
 
     // dynamic options
@@ -966,18 +975,16 @@ function useOptionsAsync(field) {
       options = Array.isArray(staticOptions) ? staticOptions : [];
 
       // expression
-    } else if (optionsExpression) {
-      if (evaluatedOptions && Array.isArray(evaluatedOptions)) {
-        options = evaluatedOptions;
-      }
+    } else if (optionsExpression && evaluatedOptions && Array.isArray(evaluatedOptions)) {
+      options = evaluatedOptions;
+
+      // error case
     } else {
-      setOptionsGetter(buildErrorState('No options source defined in the form definition'));
-      return;
+      return buildErrorState('No options source defined in the form definition');
     }
 
     // normalize data to support primitives and partially defined objects
-    options = normalizeOptionsData(options);
-    setOptionsGetter(buildLoadedState(options));
+    return buildLoadedState(normalizeOptionsData(options));
   }, [optionsKey, staticOptions, initialData, optionsExpression, evaluatedOptions]);
   return optionsGetter;
 }
@@ -1022,14 +1029,14 @@ const getDOMPurifyConfig = sanitizeStyleTags => {
   };
 };
 
-/**
- * A custom hook to build up security attributes from form configuration.
- *
- * @param {Object} security - The security configuration.
- * @returns {Array} - Returns a tuple with sandbox and allow attributes.
+/**
+ * A custom hook to build up security attributes from form configuration.
+ *
+ * @param {Object} security - The security configuration.
+ * @returns {Array} - Returns a tuple with sandbox and allow attributes.
  */
 function useSecurityAttributesMap(security) {
-  const securityMemoized = useDeepCompareState(security);
+  const securityMemoized = useDeepCompareMemoize(security);
   const sandbox = hooks.useMemo(() => SECURITY_ATTRIBUTES_DEFINITIONS.filter(({
     attribute
   }) => attribute === SANDBOX_ATTRIBUTE).filter(({
@@ -1201,6 +1208,12 @@ function useReadonly(formField, properties = {}) {
   return readonly || false;
 }
 
+function usePrevious(value, defaultValue = null) {
+  const ref = hooks.useRef(defaultValue);
+  hooks.useEffect(() => ref.current = value, [value]);
+  return ref.current;
+}
+
 function useFlushDebounce(func) {
   const timeoutRef = hooks.useRef(null);
   const lastArgsRef = hooks.useRef(null);
@@ -1465,8 +1478,16 @@ function sanitizeSingleSelectValue(options) {
     data,
     value
   } = options;
+  const {
+    valuesExpression: optionsExpression
+  } = formField;
   try {
-    const validValues = normalizeOptionsData(getOptionsData(formField, data)).map(v => v.value);
+    // if options are expression evaluated, we don't need to sanitize the value against the options
+    // and defer to the field's internal validation
+    if (optionsExpression) {
+      return value;
+    }
+    const validValues = normalizeOptionsData(getSimpleOptionsData(formField, data)).map(v => v.value);
     return hasEqualValue(value, validValues) ? value : null;
   } catch (error) {
     // use default value in case of formatting error
@@ -1480,8 +1501,16 @@ function sanitizeMultiSelectValue(options) {
     data,
     value
   } = options;
+  const {
+    valuesExpression: optionsExpression
+  } = formField;
   try {
-    const validValues = normalizeOptionsData(getOptionsData(formField, data)).map(v => v.value);
+    // if options are expression evaluated, we don't need to sanitize the values against the options
+    // and defer to the field's internal validation
+    if (optionsExpression) {
+      return value;
+    }
+    const validValues = normalizeOptionsData(getSimpleOptionsData(formField, data)).map(v => v.value);
     return value.filter(v => hasEqualValue(v, validValues));
   } catch (error) {
     // use default value in case of formatting error
@@ -1569,7 +1598,7 @@ function useCleanupMultiSelectValue(props) {
     onChange,
     values
   } = props;
-  const memoizedValues = useDeepCompareState(values, []);
+  const memoizedValues = useDeepCompareMemoize(values || []);
 
   // ensures that the values are always a subset of the possible options
   hooks.useEffect(() => {
@@ -2257,7 +2286,7 @@ function Datepicker(props) {
   const [forceFocusCalendar, setForceFocusCalendar] = hooks.useState(false);
 
   // ensures we render based on date value instead of reference
-  const date = useDeepCompareState(dateObject, null);
+  const date = useDeepCompareMemoize(dateObject);
 
   // shorts the date value back to the source
   hooks.useEffect(() => {
@@ -3693,8 +3722,8 @@ function Numberfield(props) {
             'fjs-readonly': readonly
           }),
           children: [jsxRuntime.jsx("button", {
-            class: "fjs-number-arrow-up",
             type: "button",
+            class: "fjs-number-arrow-up",
             "aria-label": "Increment",
             onClick: () => increment(),
             tabIndex: -1,
@@ -3702,8 +3731,8 @@ function Numberfield(props) {
           }), jsxRuntime.jsx("div", {
             class: "fjs-number-arrow-separator"
           }), jsxRuntime.jsx("button", {
-            class: "fjs-number-arrow-down",
             type: "button",
+            class: "fjs-number-arrow-down",
             "aria-label": "Decrement",
             onClick: () => decrement(),
             tabIndex: -1,
@@ -4374,7 +4403,7 @@ function Taglist(props) {
   } = useOptionsAsync(field);
 
   // ensures we render based on array content instead of reference
-  const values = useDeepCompareState(value || [], []);
+  const values = useDeepCompareMemoize(value || []);
   useCleanupMultiSelectValue({
     field,
     loadState,
@@ -6688,18 +6717,18 @@ class RepeatRenderManager {
         'fjs-remove-allowed': repeaterField.allowAddRemove
       }),
       children: [showAdd ? jsxRuntime.jsx("button", {
+        type: "button",
         readOnly: readonly,
         disabled: disabled || readonly,
         class: "fjs-repeat-render-add",
-        type: "button",
         ref: addButtonRef,
         onClick: onAddItem,
         children: jsxRuntime.jsxs(jsxRuntime.Fragment, {
           children: [jsxRuntime.jsx(AddSvg, {}), " ", 'Add new']
         })
       }) : null, collapseEnabled ? jsxRuntime.jsx("button", {
-        class: "fjs-repeat-render-collapse",
         type: "button",
+        class: "fjs-repeat-render-collapse",
         onClick: toggle,
         children: isCollapsed ? jsxRuntime.jsxs(jsxRuntime.Fragment, {
           children: [jsxRuntime.jsx(ExpandSvg, {}), " ", `Expand all (${values.length})`]
@@ -6773,8 +6802,8 @@ const RepetitionScaffold = props => {
         })
       })
     }), jsxRuntime.jsx("button", {
-      class: "fjs-repeat-row-remove",
       type: "button",
+      class: "fjs-repeat-row-remove",
       "aria-label": `Remove list item ${index + 1}`,
       onClick: () => onDeleteItem(index),
       children: jsxRuntime.jsx("div", {