Hide required behavior properties in the object editor (#6889)

4ian · Aug 28, 2024 · d4bd5fc · d4bd5fc
1 parent c7fcf48
commit d4bd5fc
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/newIDE/app/src/EventsBasedBehaviorEditor/EventsBasedBehaviorPropertiesEditor.js b/newIDE/app/src/EventsBasedBehaviorEditor/EventsBasedBehaviorPropertiesEditor.js
@@ -539,6 +539,10 @@ export default function EventsBasedBehaviorPropertiesEditor({
                                     >
                                       <SelectField
                                         margin="none"
+                                        disabled={
+                                          property.getType() === 'Behavior' &&
+                                          !property.isHidden()
+                                        }
                                         value={
                                           property.isHidden()
                                             ? 'Hidden'

diff --git a/newIDE/app/src/PropertiesEditor/PropertiesMapToSchema.js b/newIDE/app/src/PropertiesEditor/PropertiesMapToSchema.js
@@ -126,6 +126,7 @@ const createField = (
       property.getExtraInfo().size() > 0 ? property.getExtraInfo().at(0) : '';
     return {
       name,
+      isHiddenWhenThereOnlyOneChoice: true,
       valueType: 'string',
       getChoices: () => {
         return !object || behaviorType === ''

diff --git a/newIDE/app/src/PropertiesEditor/index.js b/newIDE/app/src/PropertiesEditor/index.js
@@ -70,6 +70,7 @@ export type PrimitiveValueField =
         label: string,
         labelIsUserDefined?: boolean,
       |}>,
+      isHiddenWhenThereOnlyOneChoice?: boolean,
       ...ValueFieldCommonProperties,
     |}
   | {|
@@ -450,16 +451,19 @@ const PropertiesEditor = ({
     (field: ValueField) => {
       if (!field.getChoices || !field.getValue) return;
 
-      const children = field
-        .getChoices()
-        .map(({ value, label, labelIsUserDefined }) => (
-          <SelectOption
-            key={value}
-            value={value}
-            label={label}
-            shouldNotTranslate={labelIsUserDefined}
-          />
-        ));
+      const choices = field.getChoices();
+      if (choices.length < 2 && field.isHiddenWhenThereOnlyOneChoice) {
+        return;
+      }
+
+      const children = choices.map(({ value, label, labelIsUserDefined }) => (
+        <SelectOption
+          key={value}
+          value={value}
+          label={label}
+          shouldNotTranslate={labelIsUserDefined}
+        />
+      ));
 
       if (field.valueType === 'number') {
         const { setValue } = field;