@bpmn-io/properties-panel 3.29.0 → 3.29.1

package/dist/index.js

@@ -429,7 +429,7 @@ function useDebounce(callback, debounceFn) {
   // make sure previous call is not stalled
   hooks.useEffect(() => {
     return () => {
-      debouncedCallback.flush?.();
+      debouncedCallback.cancel?.();
     };
   }, [debouncedCallback]);
   return debouncedCallback;
@@ -2164,50 +2164,6 @@ function prefixId$6(id) {
   return `bio-properties-panel-${id}`;
 }
 
-function TextInput({
-  debounce,
-  element,
-  id,
-  getValue,
-  onBlur,
-  setValue,
-  validate,
-  Component,
-  ...props
-}) {
-  const modelValue = getValue(element);
-  const setModelValue = hooks.useCallback((newValue, error) => {
-    if (minDash.isFunction(validate)) {
-      error = validate(newValue) || null;
-    }
-    setValue(newValue, error);
-  }, [setValue, validate]);
-  const debouncedSetValue = useDebounce(setModelValue, debounce);
-  const handleInput = hooks.useCallback(newValue => {
-    if (newValue !== modelValue) {
-      debouncedSetValue(newValue);
-    }
-  }, [modelValue, debouncedSetValue]);
-  const handleBlur = hooks.useCallback(value => {
-    const newValue = value.trim?.() || value;
-    if (newValue !== modelValue) {
-      setModelValue(newValue);
-    }
-    if (minDash.isFunction(onBlur)) {
-      onBlur(newValue);
-    }
-  }, [modelValue, setModelValue]);
-  return jsxRuntime.jsx(Component, {
-    ...props,
-    debounce: debounce,
-    element: element,
-    id: id,
-    onInput: handleInput,
-    onBlur: handleBlur,
-    value: modelValue
-  });
-}
-
 const noop$2 = () => {};
 
 /**
@@ -2236,6 +2192,7 @@ const noop$2 = () => {};
  */
 function FeelTextfield(props) {
   const {
+    debounce,
     id,
     element,
     label,
@@ -2270,11 +2227,16 @@ function FeelTextfield(props) {
     const position = hasFocus ? document.activeElement.selectionStart : Infinity;
     _setFocus(position + offset);
   };
+
+  /**
+   * @type { import('min-dash').DebouncedFunction }
+   */
+  const handleInputCallback = useDebounce(onInput, debounce);
   const handleInput = newValue => {
     // we don't commit empty FEEL expressions,
     // but instead serialize them as <undefined>
     const newModelValue = newValue === '' || newValue === '=' ? undefined : newValue;
-    onInput(newModelValue);
+    handleInputCallback(newModelValue);
   };
   const handleFeelToggle = useStaticCallback(() => {
     if (feel === 'required') {
@@ -2302,8 +2264,14 @@ function FeelTextfield(props) {
       setFocus(-1);
     }
   };
-  const handleOnBlur = () => {
-    onBlur?.(localValue);
+  const handleOnBlur = e => {
+    const trimmedValue = e.target.value.trim();
+
+    // trim and commit on blur
+    onInput(trimmedValue);
+    if (onBlur) {
+      onBlur(e);
+    }
   };
   const handleLint = useStaticCallback((lint = []) => {
     const syntaxError = lint.some(report => report.type === 'Syntax Error');
@@ -2700,28 +2668,46 @@ function FeelEntry(props) {
     placeholder,
     tooltip
   } = props;
+  const [validationError, setValidationError] = hooks.useState(null);
   const [localError, setLocalError] = hooks.useState(null);
-  const value = getValue(element);
-  const validationError = validate?.(value) || null;
+  let value = getValue(element);
+  hooks.useEffect(() => {
+    if (minDash.isFunction(validate)) {
+      const newValidationError = validate(value) || null;
+      setValidationError(newValidationError);
+    }
+  }, [value, validate]);
+  const onInput = useStaticCallback(newValue => {
+    const value = getValue(element);
+    let newValidationError = null;
+    if (minDash.isFunction(validate)) {
+      newValidationError = validate(newValue) || null;
+    }
+
+    // don't create multiple commandStack entries for the same value
+    if (newValue !== value) {
+      setValue(newValue, newValidationError);
+    }
+    setValidationError(newValidationError);
+  });
+  const onError = hooks.useCallback(err => {
+    setLocalError(err);
+  }, []);
   const temporaryError = useError(id);
   const error = temporaryError || localError || validationError;
   return jsxRuntime.jsxs("div", {
     class: classnames(props.class, 'bio-properties-panel-entry', error ? 'has-error' : ''),
     "data-entry-id": id,
-    children: [preact.createElement(TextInput, {
+    children: [preact.createElement(FeelTextfield, {
       ...props,
-      Component: FeelTextfield,
-      element: element,
-      getValue: getValue,
       debounce: debounce,
-      setValue: setValue,
-      validate: validate,
       disabled: disabled,
       feel: feel,
       id: id,
       key: element,
       label: label,
-      onError: setLocalError,
+      onInput: onInput,
+      onError: onError,
       onFocus: onFocus,
       onBlur: onBlur,
       placeholder: placeholder,
@@ -3469,8 +3455,14 @@ function TextArea(props) {
     setLocalValue(e.target.value);
     handleInput(e.target.value);
   };
-  const handleOnBlur = () => {
-    onBlur?.(localValue);
+  const handleOnBlur = e => {
+    const trimmedValue = e.target.value.trim();
+
+    // trim and commit on blur
+    onInput(trimmedValue);
+    if (onBlur) {
+      onBlur(e);
+    }
   };
   hooks.useLayoutEffect(() => {
     autoResize && resizeToContents(ref.current);
@@ -3548,21 +3540,35 @@ function TextAreaEntry(props) {
     autoResize,
     tooltip
   } = props;
-  const value = getValue(element);
   const globalError = useError(id);
-  const localError = validate?.(value) || null;
+  const [localError, setLocalError] = hooks.useState(null);
+  let value = getValue(element);
+  hooks.useEffect(() => {
+    if (minDash.isFunction(validate)) {
+      const newValidationError = validate(value) || null;
+      setLocalError(newValidationError);
+    }
+  }, [value, validate]);
+  const onInput = useStaticCallback(newValue => {
+    const value = getValue(element);
+    let newValidationError = null;
+    if (minDash.isFunction(validate)) {
+      newValidationError = validate(newValue) || null;
+    }
+    if (newValue !== value) {
+      setValue(newValue, newValidationError);
+    }
+    setLocalError(newValidationError);
+  });
   const error = globalError || localError;
   return jsxRuntime.jsxs("div", {
     class: classnames('bio-properties-panel-entry', error ? 'has-error' : ''),
     "data-entry-id": id,
-    children: [jsxRuntime.jsx(TextInput, {
-      Component: TextArea,
-      getValue: getValue,
-      setValue: setValue,
-      validate: validate,
+    children: [jsxRuntime.jsx(TextArea, {
       id: id,
       label: label,
       value: value,
+      onInput: onInput,
       onFocus: onFocus,
       onBlur: onBlur,
       rows: rows,
@@ -3595,6 +3601,7 @@ function prefixId$2(id) {
 
 function Textfield(props) {
   const {
+    debounce,
     disabled = false,
     id,
     label,
@@ -3607,12 +3614,23 @@ function Textfield(props) {
   } = props;
   const [localValue, setLocalValue] = hooks.useState(value || '');
   const ref = useShowEntryEvent(id);
-  const handleOnBlur = () => {
-    onBlur?.(localValue);
+
+  /**
+   * @type { import('min-dash').DebouncedFunction }
+   */
+  const handleInputCallback = useDebounce(onInput, debounce);
+  const handleOnBlur = e => {
+    const trimmedValue = e.target.value.trim();
+
+    // trim and commit on blur
+    onInput(trimmedValue);
+    if (onBlur) {
+      onBlur(e);
+    }
   };
   const handleInput = newValue => {
     const newModelValue = newValue === '' ? undefined : newValue;
-    onInput(newModelValue);
+    handleInputCallback(newModelValue);
   };
   const handleLocalInput = e => {
     if (e.target.value === localValue) {
@@ -3687,25 +3705,39 @@ function TextfieldEntry(props) {
     placeholder,
     tooltip
   } = props;
-  const value = getValue(element);
   const globalError = useError(id);
-  const localError = validate?.(value) || null;
+  const [localError, setLocalError] = hooks.useState(null);
+  let value = getValue(element);
+  hooks.useEffect(() => {
+    if (minDash.isFunction(validate)) {
+      const newValidationError = validate(value) || null;
+      setLocalError(newValidationError);
+    }
+  }, [value, validate]);
+  const onInput = useStaticCallback(newValue => {
+    const value = getValue(element);
+    let newValidationError = null;
+    if (minDash.isFunction(validate)) {
+      newValidationError = validate(newValue) || null;
+    }
+    if (newValue !== value) {
+      setValue(newValue, newValidationError);
+    }
+    setLocalError(newValidationError);
+  });
   const error = globalError || localError;
   return jsxRuntime.jsxs("div", {
     class: classnames('bio-properties-panel-entry', error ? 'has-error' : ''),
     "data-entry-id": id,
-    children: [jsxRuntime.jsx(TextInput, {
-      Component: Textfield,
+    children: [jsxRuntime.jsx(Textfield, {
       debounce: debounce,
       disabled: disabled,
-      getValue: getValue,
       id: id,
       label: label,
+      onInput: onInput,
       onFocus: onFocus,
       onBlur: onBlur,
       placeholder: placeholder,
-      setValue: setValue,
-      validate: validate,
       value: value,
       tooltip: tooltip,
       element: element