Lookup and FileUploader: custom class added via inputWrapper should not remove default class (T1319976) (#32304)

Author: Zedwag

packages/devextreme/js/__internal/ui/file_uploader/file_uploader.ts

@@ -1101,11 +1101,11 @@ class FileUploader extends Editor<FileUploaderProperties> {
       .addClass(FILEUPLOADER_INPUT_CONTAINER_CLASS)
       .appendTo(this._$inputWrapper);
 
+    this._renderInput();
+
     this._$fileInput
       .addClass(FILEUPLOADER_INPUT_CLASS);
 
-    this._renderInput();
-
     const labelId = `dx-fileuploader-input-label-${new Guid()}`;
 
     this._$inputLabel

packages/devextreme/js/__internal/ui/m_lookup.ts

@@ -301,8 +301,10 @@ class Lookup extends DropDownList<LookupProperties> {
   }
 
   _renderInput() {
-    this._$field = $('<div>').addClass(LOOKUP_FIELD_CLASS);
-    this._applyInputAttributes(this.option('inputAttr'));
+    const { inputAttr } = this.option();
+    this._$field = $('<div>');
+    this._applyInputAttributes(inputAttr);
+    this._$field.addClass(LOOKUP_FIELD_CLASS);
 
     const $arrow = $('<div>').addClass(LOOKUP_ARROW_CLASS);
 

packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/fileUploader.markup.tests.js

@@ -189,6 +189,18 @@ QUnit.module('fileUploader markup', () => {
         assert.strictEqual($fileInput.attr('autocomplete'), 'on', '"autocomplete" attribute has the same value');
     });
 
+    QUnit.test('Default input class should not be removed when a custom class added via inputAttr', function(assert) {
+        const $fileUploader = $('#fileuploader').dxFileUploader({
+            uploadMode: 'useButtons',
+            inputAttr: {
+                class: 'custom',
+            }
+        });
+
+        const $field = $fileUploader.find(`.${FILEUPLOADER_INPUT_CONTAINER_CLASS}`).find('input');
+
+        assert.strictEqual($field.attr('class'), `custom ${FILEUPLOADER_INPUT_CLASS}`, 'custom class is added and default class remains');
+    });
 });
 
 QUnit.module('multiple option', () => {

packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/lookup.tests.js

@@ -2078,6 +2078,16 @@ QUnit.module('options', {
         assert.strictEqual($field.attr('custom'), undefined, 'custom attribute is set correctly');
     });
 
+    QUnit.test('Default input class should not be removed when a custom class added via inputAttr (T1319976)', function(assert) {
+        const lookup = $('#lookup').dxLookup({
+            inputAttr: { class: 'custom' },
+        }).dxLookup('instance');
+
+        const $field = $(lookup.field());
+
+        assert.strictEqual($field.attr('class'), `custom ${LOOKUP_FIELD_CLASS}`, 'custom class is added and default class remains');
+    });
+
     QUnit.test('Displayed text should be correct when items have nested items field and grouping is disabled (T1292151)', function(assert) {
         const $lookup = $('#lookup').dxLookup({
             items: [