fix: hide readonly option when disabled is active

Closes #1063
bpmn-io · Feb 21, 2024 · e152d61 · e152d61
1 parent f6ffe25
commit e152d61
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/packages/form-js-editor/src/features/properties-panel/entries/DisabledEntry.js b/packages/form-js-editor/src/features/properties-panel/entries/DisabledEntry.js
@@ -47,7 +47,7 @@ function Disabled(props) {
     getValue,
     id,
     label: 'Disabled',
-    tooltip: 'Field cannot be edited by the end-user, and the data is not submitted.',
+    tooltip: 'Field cannot be edited by the end-user, and the data is not submitted. Takes precedence over read only.',
     inline: true,
     setValue
   });

diff --git a/packages/form-js-editor/src/features/properties-panel/entries/ReadonlyEntry.js b/packages/form-js-editor/src/features/properties-panel/entries/ReadonlyEntry.js
@@ -13,16 +13,22 @@ export function ReadonlyEntry(props) {
     field
   } = props;
 
+  const {
+    disabled
+  } = field;
+
   const entries = [];
 
-  entries.push({
-    id: 'readonly',
-    component: Readonly,
-    editField: editField,
-    field: field,
-    isEdited: isFeelEntryEdited,
-    isDefaultVisible: (field) => INPUTS.includes(field.type)
-  });
+  if (!disabled) {
+    entries.push({
+      id: 'readonly',
+      component: Readonly,
+      editField: editField,
+      field: field,
+      isEdited: isFeelEntryEdited,
+      isDefaultVisible: (field) => INPUTS.includes(field.type)
+    });
+  }
 
   return entries;
 }