@bpmn-io/form-js-editor 1.14.0 → 1.15.0

package/dist/assets/form-js-editor.css

@@ -2303,6 +2303,10 @@ textarea.bio-properties-panel-input {
   padding-left: 4px;
 }
 
+.bio-properties-panel-feel-popup .bio-properties-panel-input {
+  border: none;
+}
+
 .bio-properties-panel-feel-popup .cm-gutters {
   background-color: var(--feel-popup-gutters-background-color);
   border: none;

package/dist/assets/properties-panel.css

@@ -1502,6 +1502,10 @@ textarea.bio-properties-panel-input {
   padding-left: 4px;
 }
 
+.bio-properties-panel-feel-popup .bio-properties-panel-input {
+  border: none;
+}
+
 .bio-properties-panel-feel-popup .cm-gutters {
   background-color: var(--feel-popup-gutters-background-color);
   border: none;

package/dist/index.cjs

@@ -5598,7 +5598,7 @@ function TooltipWrapper(props) {
   return jsxRuntime.jsx(Tooltip, {
     ...props,
     value: value,
-    forId: prefixId$9(forId)
+    forId: `bio-properties-panel-${forId}`
   });
 }
 function Tooltip(props) {
@@ -5609,71 +5609,52 @@ function Tooltip(props) {
     direction = 'right',
     position
   } = props;
-  const [visible, setShow] = hooks.useState(false);
-  const [focusedViaKeyboard, setFocusedViaKeyboard] = hooks.useState(false);
+  const [visible, setVisible] = hooks.useState(false);
+
+  // Tooltip will be shown after SHOW_DELAY ms from hovering over the source element.
+  const SHOW_DELAY = 200;
   let timeout = null;
   const wrapperRef = hooks.useRef(null);
   const tooltipRef = hooks.useRef(null);
-  const showTooltip = async event => {
-    const show = () => setShow(true);
-    if (!visible && !timeout) {
-      if (event instanceof MouseEvent) {
-        timeout = setTimeout(show, 200);
-      } else {
-        show();
-        setFocusedViaKeyboard(true);
-      }
+  const show = (_, delay) => {
+    if (visible) return;
+    if (delay) {
+      timeout = setTimeout(() => {
+        setVisible(true);
+      }, SHOW_DELAY);
+    } else {
+      setVisible(true);
     }
   };
-  const hideTooltip = () => {
-    setShow(false);
-    setFocusedViaKeyboard(false);
-  };
-  const hideTooltipViaEscape = e => {
-    e.code === 'Escape' && hideTooltip();
+  const hide = () => {
+    clearTimeout(timeout);
+    setVisible(false);
   };
-  const isTooltipHovered = ({
-    x,
-    y
+  const handleMouseLeave = ({
+    relatedTarget
   }) => {
-    const tooltip = tooltipRef.current;
-    const wrapper = wrapperRef.current;
-    return tooltip && (inBounds(x, y, wrapper.getBoundingClientRect()) || inBounds(x, y, tooltip.getBoundingClientRect()));
+    // Don't hide the tooltip when moving mouse between the wrapper and the tooltip.
+    if (relatedTarget === wrapperRef.current || relatedTarget === tooltipRef.current || relatedTarget?.parentElement === tooltipRef.current) {
+      return;
+    }
+    hide();
   };
-  hooks.useEffect(() => {
+  const handleFocusOut = e => {
     const {
-      current
-    } = wrapperRef;
-    if (!current) {
+      target
+    } = e;
+
+    // Don't hide the tooltip if the wrapper or the tooltip itself is clicked.
+    const isHovered = target.matches(':hover') || tooltipRef.current?.matches(':hover');
+    if (target === wrapperRef.current && isHovered) {
+      e.stopPropagation();
       return;
     }
-    const hideHoveredTooltip = e => {
-      const isFocused = document.activeElement === wrapperRef.current || document.activeElement.closest('.bio-properties-panel-tooltip');
-      if (visible && !isTooltipHovered({
-        x: e.x,
-        y: e.y
-      }) && !(isFocused && focusedViaKeyboard)) {
-        hideTooltip();
-      }
-    };
-    const hideFocusedTooltip = e => {
-      const {
-        relatedTarget
-      } = e;
-      const isTooltipChild = el => !!el.closest('.bio-properties-panel-tooltip');
-      if (visible && !isHovered(wrapperRef.current) && relatedTarget && !isTooltipChild(relatedTarget)) {
-        hideTooltip();
-      }
-    };
-    document.addEventListener('wheel', hideHoveredTooltip);
-    document.addEventListener('focusout', hideFocusedTooltip);
-    document.addEventListener('mousemove', hideHoveredTooltip);
-    return () => {
-      document.removeEventListener('wheel', hideHoveredTooltip);
-      document.removeEventListener('mousemove', hideHoveredTooltip);
-      document.removeEventListener('focusout', hideFocusedTooltip);
-    };
-  }, [wrapperRef.current, visible, focusedViaKeyboard]);
+    hide();
+  };
+  const hideTooltipViaEscape = e => {
+    e.code === 'Escape' && hide();
+  };
   const renderTooltip = () => {
     return jsxRuntime.jsxs("div", {
       class: `bio-properties-panel-tooltip ${direction}`,
@@ -5683,6 +5664,7 @@ function Tooltip(props) {
       style: position || getTooltipPosition(wrapperRef.current),
       ref: tooltipRef,
       onClick: e => e.stopPropagation(),
+      onMouseLeave: handleMouseLeave,
       children: [jsxRuntime.jsx("div", {
         class: "bio-properties-panel-tooltip-content",
         children: value
@@ -5695,39 +5677,23 @@ function Tooltip(props) {
     class: "bio-properties-panel-tooltip-wrapper",
     tabIndex: "0",
     ref: wrapperRef,
-    onMouseEnter: showTooltip,
-    onMouseLeave: () => {
-      clearTimeout(timeout);
-      timeout = null;
-    },
-    onFocus: showTooltip,
+    onMouseEnter: e => show(e, true),
+    onMouseLeave: handleMouseLeave,
+    onFocus: show,
+    onBlur: handleFocusOut,
     onKeyDown: hideTooltipViaEscape,
     children: [props.children, visible ? parent ? React.createPortal(renderTooltip(), parent.current) : renderTooltip() : null]
   });
 }
 
 // helper
-function inBounds(x, y, bounds) {
-  const {
-    top,
-    right,
-    bottom,
-    left
-  } = bounds;
-  return x >= left && x <= right && y >= top && y <= bottom;
-}
+
 function getTooltipPosition(refElement) {
   const refPosition = refElement.getBoundingClientRect();
   const right = `calc(100% - ${refPosition.x}px)`;
   const top = `${refPosition.top - 10}px`;
   return `right: ${right}; top: ${top};`;
 }
-function isHovered(element) {
-  return element.matches(':hover');
-}
-function prefixId$9(id) {
-  return `bio-properties-panel-${id}`;
-}
 
 /**
  * Accesses the global DescriptionContext and returns a description for a given id and element.
@@ -7250,6 +7216,7 @@ function FeelTextfieldComponent(props) {
     label,
     hostLanguage,
     onInput,
+    onBlur,
     onError,
     placeholder,
     feel,
@@ -7315,6 +7282,12 @@ function FeelTextfieldComponent(props) {
       setFocus(-1);
     }
   };
+  const handleOnBlur = e => {
+    if (onBlur) {
+      onBlur(e);
+    }
+    setLocalValue(e.target.value.trim());
+  };
   const handleLint = useStaticCallback((lint = []) => {
     const syntaxError = lint.some(report => report.type === 'Syntax Error');
     if (syntaxError) {
@@ -7436,6 +7409,7 @@ function FeelTextfieldComponent(props) {
         ...props,
         popupOpen: popuOpen,
         onInput: handleLocalInput,
+        onBlur: handleOnBlur,
         contentAttributes: {
           'id': prefixId$5(id),
           'aria-label': label
@@ -8734,6 +8708,12 @@ function TextArea(props) {
     autoResize && resizeToContents(e.target);
     setLocalValue(e.target.value);
   };
+  const handleOnBlur = e => {
+    if (onBlur) {
+      onBlur(e);
+    }
+    setLocalValue(e.target.value.trim());
+  };
   hooks.useLayoutEffect(() => {
     autoResize && resizeToContents(ref.current);
   }, []);
@@ -8765,7 +8745,7 @@ function TextArea(props) {
       class: classnames('bio-properties-panel-input', monospace ? 'bio-properties-panel-input-monospace' : '', autoResize ? 'auto-resize' : ''),
       onInput: handleInput,
       onFocus: onFocus,
-      onBlur: onBlur,
+      onBlur: handleOnBlur,
       placeholder: placeholder,
       rows: rows,
       value: localValue,
@@ -8883,6 +8863,12 @@ function Textfield(props) {
   const handleInputCallback = hooks.useMemo(() => {
     return debounce(target => onInput(target.value.length ? target.value : undefined));
   }, [onInput, debounce]);
+  const handleOnBlur = e => {
+    if (onBlur) {
+      onBlur(e);
+    }
+    setLocalValue(e.target.value.trim());
+  };
   const handleInput = e => {
     handleInputCallback(e.target);
     setLocalValue(e.target.value);
@@ -8915,7 +8901,7 @@ function Textfield(props) {
       class: "bio-properties-panel-input",
       onInput: handleInput,
       onFocus: onFocus,
-      onBlur: onBlur,
+      onBlur: handleOnBlur,
       placeholder: placeholder,
       value: localValue
     })]
@@ -9448,7 +9434,7 @@ function Columns(props) {
     editField,
     id
   } = props;
-  const debounce = useService('debounce');
+  useService('debounce');
   const formLayoutValidator = useService('formLayoutValidator');
   const validate = hooks.useCallback(value => {
     return formLayoutValidator.validateField(field, value ? parseInt(value) : null);
@@ -9474,7 +9460,6 @@ function Columns(props) {
     ...asArray(16).filter(i => i >= MIN_COLUMNS).map(asOption)];
   };
   return SelectEntry({
-    debounce,
     element: field,
     id,
     label: 'Columns',
@@ -10550,7 +10535,7 @@ function Height(props) {
     id,
     getValue,
     setValue,
-    validate: validate$a
+    validate: validate$9
   });
 }
 
@@ -10560,7 +10545,7 @@ function Height(props) {
  * @param {number|void} value
  * @returns {string|null}
  */
-const validate$a = value => {
+const validate$9 = value => {
   if (typeof value !== 'number') {
     return 'A number is required.';
   }
@@ -10624,7 +10609,7 @@ function Url(props) {
     setValue,
     singleLine: true,
     tooltip: getTooltip$1(),
-    validate: validate$9,
+    validate: validate$8,
     variables
   });
 }
@@ -10652,7 +10637,7 @@ function getTooltip$1() {
  * @param {string|void} value
  * @returns {string|null}
  */
-const validate$9 = value => {
+const validate$8 = value => {
   if (!value || value.startsWith('=')) {
     return;
   }
@@ -10743,7 +10728,7 @@ function Text(props) {
   };
   return FeelTemplatingEntry({
     debounce,
-    description: description$4,
+    description: description$3,
     element: field,
     getValue,
     id,
@@ -10753,7 +10738,7 @@ function Text(props) {
     variables
   });
 }
-const description$4 = jsxRuntime.jsxs(jsxRuntime.Fragment, {
+const description$3 = jsxRuntime.jsxs(jsxRuntime.Fragment, {
   children: ["Supports markdown and templating.", ' ', jsxRuntime.jsx("a", {
     href: "https://docs.camunda.io/docs/components/modeler/forms/form-element-library/forms-element-library-text/",
     target: "_blank",
@@ -10796,13 +10781,13 @@ function Content(props) {
   };
   return FeelTemplatingEntry({
     debounce,
-    description: description$3,
+    description: description$2,
     element: field,
     getValue,
     id,
     label: 'Content',
     hostLanguage: 'html',
-    validate: validate$8,
+    validate: validate$7,
     setValue,
     variables
   });
@@ -10810,7 +10795,7 @@ function Content(props) {
 
 // helpers //////////
 
-const description$3 = jsxRuntime.jsxs(jsxRuntime.Fragment, {
+const description$2 = jsxRuntime.jsxs(jsxRuntime.Fragment, {
   children: ["Supports HTML, styling, and templating. Styles are automatically scoped to the HTML component.", ' ', jsxRuntime.jsx("a", {
     href: "https://docs.camunda.io/docs/components/modeler/forms/form-element-library/forms-element-library-html/",
     target: "_blank",
@@ -10823,7 +10808,7 @@ const description$3 = jsxRuntime.jsxs(jsxRuntime.Fragment, {
  * @param {string|void} value
  * @returns {string|null}
  */
-const validate$8 = value => {
+const validate$7 = value => {
   // allow empty state
   if (typeof value !== 'string' || value === '') {
     return null;
@@ -11662,7 +11647,7 @@ function InputValuesKey(props) {
     id,
     label: 'Input values key',
     setValue,
-    validate: validate$7
+    validate: validate$6
   });
 }
 
@@ -11672,7 +11657,7 @@ function InputValuesKey(props) {
  * @param {string|void} value
  * @returns {string|null}
  */
-const validate$7 = value => {
+const validate$6 = value => {
   if (typeof value !== 'string' || value.length === 0) {
     return 'Must not be empty.';
   }
@@ -11698,7 +11683,14 @@ function StaticOptionsSourceEntry(props) {
     editField(field, formJsViewer.OPTIONS_SOURCES_PATHS[formJsViewer.OPTIONS_SOURCES.STATIC], arrayAdd(values, values.length, entry));
   };
   const removeEntry = entry => {
-    editField(field, formJsViewer.OPTIONS_SOURCES_PATHS[formJsViewer.OPTIONS_SOURCES.STATIC], minDash.without(values, entry));
+    if (field.defaultValue === entry.value) {
+      editField(field, {
+        values: minDash.without(values, entry),
+        defaultValue: undefined
+      });
+    } else {
+      editField(field, formJsViewer.OPTIONS_SOURCES_PATHS[formJsViewer.OPTIONS_SOURCES.STATIC], minDash.without(values, entry));
+    }
   };
   const validateFactory = (key, getValue) => {
     return value => {
@@ -11954,7 +11946,6 @@ function RepeatableEntry(props) {
       path: ['nonCollapsedItems'],
       label: 'Number of non-collapsing items',
       min: 1,
-      defaultValue: 5,
       props
     });
     entries.push(nonCollapseItemsEntry);
@@ -12115,7 +12106,7 @@ function Source(props) {
     setValue,
     singleLine: true,
     variables,
-    validate: validate$6
+    validate: validate$5
   });
 }
 
@@ -12125,7 +12116,7 @@ function Source(props) {
  * @param {string|void} value
  * @returns {string|null}
  */
-const validate$6 = value => {
+const validate$5 = value => {
   if (!minDash.isString(value) || value.length === 0) {
     return 'Must not be empty.';
   }
@@ -12229,7 +12220,7 @@ function RowCount(props) {
     id,
     getValue,
     setValue,
-    validate: validate$5
+    validate: validate$4
   });
 }
 
@@ -12239,7 +12230,7 @@ function RowCount(props) {
  * @param {string|void} value
  * @returns {string|null}
  */
-const validate$5 = value => {
+const validate$4 = value => {
   if (minDash.isNil(value)) {
     return null;
   }
@@ -12413,7 +12404,7 @@ function ColumnsExpression(props) {
     setValue,
     singleLine: true,
     variables,
-    validate: validate$4
+    validate: validate$3
   });
 }
 
@@ -12423,7 +12414,7 @@ function ColumnsExpression(props) {
  * @param {string|void} value
  * @returns {string|null}
  */
-const validate$4 = value => {
+const validate$3 = value => {
   if (!minDash.isString(value) || value.length === 0 || value === '=') {
     return 'Must not be empty.';
   }
@@ -12521,7 +12512,7 @@ function Key(props) {
     id,
     label: 'Key',
     setValue,
-    validate: validate$3
+    validate: validate$2
   });
 }
 
@@ -12531,7 +12522,7 @@ function Key(props) {
  * @param {string|void} value
  * @returns {string|null}
  */
-function validate$3(value) {
+function validate$2(value) {
   if (!minDash.isString(value) || value.length === 0) {
     return 'Must not be empty.';
   }
@@ -12669,13 +12660,13 @@ function Accept(props) {
     singleLine: true,
     setValue,
     variables,
-    description: description$2
+    description: description$1
   });
 }
 
 // helpers //////////
 
-const description$2 = jsxRuntime.jsxs(jsxRuntime.Fragment, {
+const description$1 = jsxRuntime.jsxs(jsxRuntime.Fragment, {
   children: ["A comma-separated list of", ' ', jsxRuntime.jsx("a", {
     href: "https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/file#unique_file_type_specifiers",
     target: "_blank",
@@ -12796,85 +12787,6 @@ function DocumentsDataSource(props) {
     setValue,
     variables,
     tooltip,
-    validate: validate$2
-  });
-}
-
-// helpers //////////
-
-/**
- * @param {string|undefined} value
- * @returns {string|null}
- */
-const validate$2 = value => {
-  if (typeof value !== 'string' || value.length === 0) {
-    return 'The document data source is required.';
-  }
-};
-
-function EndpointKeyEntry(props) {
-  const {
-    editField,
-    field
-  } = props;
-  const entries = [];
-  entries.push({
-    id: 'endpointKey',
-    component: EndpointKey,
-    editField: editField,
-    field: field,
-    isEdited: isEdited$6,
-    isDefaultVisible: field => field.type === 'documentPreview'
-  });
-  return entries;
-}
-function EndpointKey(props) {
-  const {
-    editField,
-    field,
-    id
-  } = props;
-  const debounce = useService('debounce');
-  const variables = useVariables().map(name => ({
-    name
-  }));
-  const path = ['endpointKey'];
-  const getValue = () => {
-    return minDash.get(field, path, '');
-  };
-  const setValue = value => {
-    return editField(field, path, value);
-  };
-  const tooltip = jsxRuntime.jsxs("div", {
-    children: [jsxRuntime.jsx("p", {
-      children: "Enter a context key that generates a string with the API endpoint to download a document."
-    }), jsxRuntime.jsxs("p", {
-      children: ["The string must contain ", jsxRuntime.jsx("code", {
-        children: '{ documentId }'
-      }), ", which will be replaced with the document ID from the document\u2018s reference."]
-    }), jsxRuntime.jsx("p", {
-      children: "If you\u2018re using the Camunda Tasklist, this variable is automatically added to the context for you."
-    }), jsxRuntime.jsxs("p", {
-      children: ["For more details, see the", ' ', jsxRuntime.jsx("a", {
-        href: "https://docs.camunda.io/docs/next/components/modeler/forms/form-element-library/forms-element-library-document-preview/",
-        rel: "noopener noreferrer",
-        target: "_blank",
-        children: "Camunda documentation"
-      })]
-    })]
-  });
-  return FeelTemplatingEntry({
-    debounce,
-    element: field,
-    getValue,
-    id,
-    label: 'Document URL',
-    feel: 'required',
-    singleLine: true,
-    setValue,
-    variables,
-    description: description$1,
-    tooltip,
     validate: validate$1
   });
 }
@@ -12887,12 +12799,9 @@ function EndpointKey(props) {
  */
 const validate$1 = value => {
   if (typeof value !== 'string' || value.length === 0) {
-    return 'The document reference is required.';
+    return 'The document data source is required.';
   }
 };
-const description$1 = jsxRuntime.jsx(jsxRuntime.Fragment, {
-  children: "Define an API URL for downloading a document"
-});
 
 function MaxHeightEntry(props) {
   const {
@@ -12996,13 +12905,9 @@ function GeneralGroup(field, editField, getService) {
     editField
   }), ...TextEntry({
     field,
-    editField,
-    getService
-  }), ...HtmlEntry({
+    editField}), ...HtmlEntry({
     field,
-    editField,
-    getService
-  }), ...IFrameUrlEntry({
+    editField}), ...IFrameUrlEntry({
     field,
     editField
   }), ...IFrameHeightEntry({
@@ -13324,12 +13229,11 @@ function ValidationType(props) {
     id,
     onChange
   } = props;
-  const debounce = useService('debounce');
+  useService('debounce');
   const setValue = validationType => {
     onChange('validationType')(validationType || undefined);
   };
   return SelectEntry({
-    debounce,
     element: field,
     getValue: getValue('validationType'),
     id,
@@ -13679,21 +13583,6 @@ const TOOLTIP_TEXT = `"List of items" defines a constant, predefined set of form
 "Expression" defines options that are populated from a FEEL expression.
 `;
 
-function DownloadSettings(field, editField) {
-  const entries = [...EndpointKeyEntry({
-    field,
-    editField
-  })];
-  if (!entries.length) {
-    return null;
-  }
-  return {
-    id: 'downloadSettings',
-    label: 'Download settings',
-    entries
-  };
-}
-
 class PropertiesProvider {
   constructor(propertiesPanel, injector) {
     this._injector = injector;
@@ -13729,7 +13618,7 @@ class PropertiesProvider {
         return groups;
       }
       const getService = (type, strict = true) => this._injector.get(type, strict);
-      groups = [...groups, GeneralGroup(field, editField, getService), DownloadSettings(field, editField), ...OptionsGroups(field, editField, getService), ...TableHeaderGroups(field, editField), SecurityAttributesGroup(field, editField), ConditionGroup(field, editField), LayoutGroup(field, editField), AppearanceGroup(field, editField), SerializationGroup(field, editField), ConstraintsGroup(field, editField), ValidationGroup(field, editField), CustomPropertiesGroup(field, editField)].filter(group => group != null);
+      groups = [...groups, GeneralGroup(field, editField, getService), ...OptionsGroups(field, editField, getService), ...TableHeaderGroups(field, editField), SecurityAttributesGroup(field, editField), ConditionGroup(field, editField), LayoutGroup(field, editField), AppearanceGroup(field, editField), SerializationGroup(field, editField), ConstraintsGroup(field, editField), ValidationGroup(field, editField), CustomPropertiesGroup(field, editField)].filter(group => group != null);
       this._filterVisibleEntries(groups, field, getService);
 
       // contract: if a group has no entries or items, it should not be displayed at all