fix: do not create a simple label in datetime components

Closes #1268
bpmn-io · Oct 4, 2024 · 9cb6c1a · 9cb6c1a
1 parent a86d4f4
commit 9cb6c1a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/packages/form-js-editor/src/features/properties-panel/PropertiesPanelHeaderProvider.js b/packages/form-js-editor/src/features/properties-panel/PropertiesPanelHeaderProvider.js
@@ -13,6 +13,9 @@ export function getPropertiesPanelHeaderProvider(options = {}) {
       if (headerlessTypes.includes(type)) {
         return '';
       }
+      if (type === 'datetime') {
+        return field.dateLabel || field.timeLabel;
+      }
       if (type === 'text') {
         return textToLabel(field.text);
       }

diff --git a/packages/form-js-editor/test/spec/core/FieldFactory.spec.js b/packages/form-js-editor/test/spec/core/FieldFactory.spec.js
@@ -120,7 +120,6 @@ describe('core/FieldFactory', function () {
       'Date time',
       testCreate({
         type: 'datetime',
-        label: 'Date time',
         keyed: true,
         defaults: {
           subtype: 'date',

diff --git a/packages/form-js-viewer/src/core/FieldFactory.js b/packages/form-js-viewer/src/core/FieldFactory.js
@@ -60,15 +60,12 @@ export class FieldFactory {
       throw new Error(`binding path '${[...parentPath, ...path.split('.')].join('.')}' is already claimed`);
     }
 
-    const labelAttrs =
-      applyDefaults && config.label
-        ? {
-            label: config.label,
-          }
-        : {};
+    // currently using a hard coded solution while we evaluate refactoring
+    // cf. https://github.com/bpmn-io/form-js/issues/1291
+    const shouldApplyLabel = applyDefaults && !(config.type === 'datetime') && config.label;
 
     const field = config.create({
-      ...labelAttrs,
+      ...(shouldApplyLabel ? { label: config.label } : {}),
       ...attrs,
     });
 

diff --git a/packages/form-js-viewer/test/spec/render/components/form-fields/Datetime.spec.js b/packages/form-js-viewer/test/spec/render/components/form-fields/Datetime.spec.js
@@ -891,7 +891,6 @@ describe('Datetime', function () {
     // assume
     const { config } = Datetime;
     expect(config.type).to.eql('datetime');
-    expect(config.label).to.eql('Date time');
     expect(config.group).to.eql('basic-input');
     expect(config.keyed).to.be.true;