Merge main to develop

bpmn-io · Feb 16, 2024 · 682de1a · 682de1a
2 parents 1cd29d8 + 87a000d
commit 682de1a
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/packages/form-js-viewer/src/render/components/form-fields/parts/SimpleSelect.js b/packages/form-js-viewer/src/render/components/form-fields/parts/SimpleSelect.js
@@ -56,7 +56,13 @@ export function SimpleSelect(props) {
   }, [ disabled, isDropdownExpanded, loadState, readonly, value ]);
 
   const onMouseDown = useCallback((e) => {
+
     const input = inputRef.current;
+
+    if (disabled || !input) {
+      return;
+    }
+
     setIsDropdownExpanded(!isDropdownExpanded);
 
     if (isDropdownExpanded) {
@@ -66,7 +72,7 @@ export function SimpleSelect(props) {
     }
 
     e.preventDefault();
-  }, [ isDropdownExpanded ]);
+  }, [ disabled, isDropdownExpanded ]);
 
   const initialFocusIndex = useMemo(() => value && findIndex(options, (o) => o.value === value) || 0, [ options, value ]);