Allow custom objects to declare multi-line text properties (#7436)

Author: D8H

Core/GDCore/Extensions/Metadata/ValueTypeMetadata.cpp

@@ -101,7 +101,7 @@ const gd::String &ValueTypeMetadata::ConvertPropertyTypeToValueType(
   } else if (propertyType == "KeyboardKey") {
     return keyboardKeyValueType;
   }
-  // For "String", "Resource" or default
+  // For "String", "Resource", "MultilineString" or default
   return stringValueType;
 };
 

Extensions/BBText/JsExtension.js

@@ -54,7 +54,7 @@ module.exports = {
       objectProperties
         .getOrCreate('text')
         .setValue(objectContent.text)
-        .setType('textarea')
+        .setType('multilinestring')
         .setLabel(_('BBCode text'));
 
       objectProperties

Extensions/BitmapText/JsExtension.js

@@ -54,7 +54,7 @@ module.exports = {
       objectProperties
         .getOrCreate('text')
         .setValue(objectContent.text)
-        .setType('textarea')
+        .setType('multilinestring')
         .setLabel(_('Text'));
 
       objectProperties

Extensions/Firebase/JsExtension.js

@@ -37,7 +37,7 @@ module.exports = {
     extension
       .registerProperty('FirebaseConfig')
       .setLabel(_('Firebase configuration string'))
-      .setType('textarea');
+      .setType('multilinestring');
 
     /* ====== ANALYTICS ====== */
     extension

Extensions/TextObject/TextObject.cpp

@@ -119,7 +119,7 @@ std::map<gd::String, gd::PropertyDescriptor> TextObject::GetProperties() const {
 
   objectProperties["text"]
       .SetValue(text)
-      .SetType("textarea")
+      .SetType("multilinestring")
       .SetLabel(_("Text"));
 
   objectProperties["characterSize"]

GDevelop.js/TestUtils/TestExtensions.js

@@ -97,7 +97,7 @@ module.exports = {
         objectProperties
           .getOrCreate('text')
           .setValue(objectContent.text)
-          .setType('textarea')
+          .setType('multilinestring')
           .setLabel('Text');
 
         return objectProperties;

newIDE/app/src/CompactPropertiesEditor/PropertiesMapToCompactSchema.js

@@ -219,10 +219,10 @@ const createField = (
       getDescription,
       hasImpactOnAllOtherFields: property.hasImpactOnOtherProperties(),
     };
-  } else if (valueType === 'textarea') {
+  } else if (valueType === 'multilinestring') {
     return {
       name,
-      valueType: 'textarea',
+      valueType: 'multilinestring',
       getValue: (instance: Instance): string => {
         return getProperties(instance)
           .get(name)

newIDE/app/src/CompactPropertiesEditor/index.js

@@ -110,7 +110,7 @@ export type PrimitiveValueField =
       ...ValueFieldCommonProperties,
     |}
   | {|
-      valueType: 'textarea',
+      valueType: 'multilinestring',
       getValue: Instance => string,
       setValue: (instance: Instance, newValue: string) => void,
       ...ValueFieldCommonProperties,
@@ -554,7 +554,7 @@ const CompactPropertiesEditor = ({
             {field.renderIcon(value)}
           </IconButton>
         );
-      } else if (field.valueType === 'textarea') {
+      } else if (field.valueType === 'multilinestring') {
         const { setValue } = field;
         return (
           <CompactTextAreaField

newIDE/app/src/EventsBasedBehaviorEditor/EventsBasedBehaviorPropertiesEditor.js

@@ -754,6 +754,11 @@ export default function EventsBasedBehaviorPropertiesEditor({
                                           value="KeyboardKey"
                                           label={t`Keyboard key (text)`}
                                         />
+                                        <SelectOption
+                                          key="property-type-text-area"
+                                          value="MultilineString"
+                                          label={t`Multiline text`}
+                                        />
                                         <SelectOption
                                           key="property-type-resource"
                                           value="Resource"
@@ -820,8 +825,9 @@ export default function EventsBasedBehaviorPropertiesEditor({
                                         property.getType() === 'Number' ||
                                         property.getType() ===
                                           'ObjectAnimationName' ||
+                                        property.getType() === 'KeyboardKey' ||
                                         property.getType() ===
-                                          'KeyboardKey') && (
+                                          'MultilineString') && (
                                         <SemiControlledTextField
                                           commitOnBlur
                                           floatingLabelText={
@@ -839,6 +845,10 @@ export default function EventsBasedBehaviorPropertiesEditor({
                                             onPropertiesUpdated &&
                                               onPropertiesUpdated();
                                           }}
+                                          multiline={
+                                            property.getType() ===
+                                            'MultilineString'
+                                          }
                                           fullWidth
                                         />
                                       )}

newIDE/app/src/EventsBasedObjectEditor/EventsBasedObjectPropertiesEditor.js

@@ -734,6 +734,11 @@ export default function EventsBasedObjectPropertiesEditor({
                                           value="LeaderboardId"
                                           label={t`Leaderboard (text)`}
                                         />
+                                        <SelectOption
+                                          key="property-type-text-area"
+                                          value="MultilineString"
+                                          label={t`Multiline text`}
+                                        />
                                         <SelectOption
                                           key="property-type-resource"
                                           value="Resource"
@@ -786,7 +791,9 @@ export default function EventsBasedObjectPropertiesEditor({
                                         </SelectField>
                                       )}
                                       {(property.getType() === 'String' ||
-                                        property.getType() === 'Number') && (
+                                        property.getType() === 'Number' ||
+                                        property.getType() ===
+                                          'MultilineString') && (
                                         <SemiControlledTextField
                                           commitOnBlur
                                           floatingLabelText={
@@ -804,6 +811,10 @@ export default function EventsBasedObjectPropertiesEditor({
                                             onPropertiesUpdated &&
                                               onPropertiesUpdated();
                                           }}
+                                          multiline={
+                                            property.getType() ===
+                                            'MultilineString'
+                                          }
                                           fullWidth
                                         />
                                       )}

newIDE/app/src/PropertiesEditor/PropertiesMapToSchema.js

@@ -206,10 +206,10 @@ const createField = (
       getLabel,
       getDescription,
     };
-  } else if (valueType === 'textarea') {
+  } else if (valueType === 'multilinestring') {
     return {
       name,
-      valueType: 'textarea',
+      valueType: 'multilinestring',
       getValue: (instance: Instance): string => {
         return getProperties(instance)
           .get(name)

newIDE/app/src/PropertiesEditor/index.js

@@ -289,7 +289,7 @@ const PropertiesEditor = ({
             />
           </Column>
         );
-      } else if (field.valueType === 'textarea') {
+      } else if (field.valueType === 'multilinestring') {
         const { setValue } = field;
         return (
           <SemiControlledTextField

newIDE/app/src/fixtures/TestExtensions.js

@@ -300,7 +300,7 @@ export const makeTestExtensions = (gd: libGDevelop) => {
       objectProperties
         .getOrCreate('text')
         .setValue(objectContent.text)
-        .setType('textarea')
+        .setType('multilinestring')
         .setLabel('Text');
 
       return objectProperties;