From d99ccd9b28b038d4b878d52525dba07dbf1e7324 Mon Sep 17 00:00:00 2001 From: Raushen Date: Wed, 4 Nov 2026 17:36:34 +0200 Subject: [PATCH] =?UTF-8?q?FileUploader=20=E2=80=94=20Label=20does=20not?= =?UTF-8?q?=20span=20its=20container=20horizontally=20and=20gets=20cut=20o?= =?UTF-8?q?ff=20(T1337565)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ng-label-rtl-false (fluent.blue.light).png | Bin 0 -> 11428 bytes ...ong-label-rtl-true (fluent.blue.light).png | Bin 0 -> 11085 bytes .../tests/editors/fileUploader/index.ts | 16 ++++++++++ .../htmlEditor/dialogs/addImage/common.ts | 28 ++++++++++++++++++ ...ile-uploader-label (fluent.blue.light).png | Bin 0 -> 17224 bytes .../scss/widgets/base/_fileUploader.scss | 28 ++---------------- .../widgets/fluent/htmlEditor/_index.scss | 5 ++-- .../ui.file_manager.file_uploader.ts | 2 +- .../ui/file_uploader/file_uploader.ts | 19 +++++------- .../fileUploader.tests.js | 22 ++++++++++++++ 10 files changed, 79 insertions(+), 41 deletions(-) create mode 100644 e2e/testcafe-devextreme/tests/editors/fileUploader/etalons/fileuploader-long-label-rtl-false (fluent.blue.light).png create mode 100644 e2e/testcafe-devextreme/tests/editors/fileUploader/etalons/fileuploader-long-label-rtl-true (fluent.blue.light).png create mode 100644 e2e/testcafe-devextreme/tests/editors/htmlEditor/dialogs/addImage/etalons/htmleditor-add-image-long-file-uploader-label (fluent.blue.light).png diff --git a/e2e/testcafe-devextreme/tests/editors/fileUploader/etalons/fileuploader-long-label-rtl-false (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/editors/fileUploader/etalons/fileuploader-long-label-rtl-false (fluent.blue.light).png new file mode 100644 index 0000000000000000000000000000000000000000..41be533c9a162747fdc7624257720df07ff73303 GIT binary patch literal 11428 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 literal 0 HcmV?d00001 diff --git a/e2e/testcafe-devextreme/tests/editors/fileUploader/etalons/fileuploader-long-label-rtl-true (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/editors/fileUploader/etalons/fileuploader-long-label-rtl-true (fluent.blue.light).png new file mode 100644 index 0000000000000000000000000000000000000000..7f2a1b4743d1208ada1b4537e9c42877a243eee2 GIT binary patch literal 11085 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 literal 0 HcmV?d00001 diff --git a/e2e/testcafe-devextreme/tests/editors/fileUploader/index.ts b/e2e/testcafe-devextreme/tests/editors/fileUploader/index.ts index e02a277e8061..8d3379593107 100644 --- a/e2e/testcafe-devextreme/tests/editors/fileUploader/index.ts +++ b/e2e/testcafe-devextreme/tests/editors/fileUploader/index.ts @@ -5,6 +5,7 @@ import { createWidget } from '../../../helpers/createWidget'; import url from '../../../helpers/getPageUrl'; const TEST_FILE = './images/test-image-1.png'; +const LONG_LABEL_TEXT = 'Drag a file from your computer and drop it here, or click the button to choose one'; fixture`FileUploader - file list visibility` .page(url(__dirname, '../../container.html')); @@ -25,3 +26,18 @@ fixture`FileUploader - file list visibility` await t.expect(compareResults.isValid()).ok(compareResults.errorMessages()); }).before(async () => createWidget('dxFileUploader', { showFileList })); }); + +fixture`FileUploader - label` + .page(url(__dirname, '../../container.html')); + +[false, true].forEach((rtlEnabled) => { + test(`FileUploader label should not be cut while there is free space, rtlEnabled: ${rtlEnabled} (T1337565)`, async (t) => { + const { takeScreenshot, compareResults } = createScreenshotsComparer(t); + + await testScreenshot(t, takeScreenshot, `fileuploader-long-label-rtl-${rtlEnabled}.png`, { + element: '#container', + }); + + await t.expect(compareResults.isValid()).ok(compareResults.errorMessages()); + }).before(async () => createWidget('dxFileUploader', { labelText: LONG_LABEL_TEXT, rtlEnabled })); +}); diff --git a/e2e/testcafe-devextreme/tests/editors/htmlEditor/dialogs/addImage/common.ts b/e2e/testcafe-devextreme/tests/editors/htmlEditor/dialogs/addImage/common.ts index 94d4623ce7b3..9837508b3c6f 100644 --- a/e2e/testcafe-devextreme/tests/editors/htmlEditor/dialogs/addImage/common.ts +++ b/e2e/testcafe-devextreme/tests/editors/htmlEditor/dialogs/addImage/common.ts @@ -11,6 +11,7 @@ fixture`HtmlEditor - common` .page(url(__dirname, '../../../../container-extended.html')); const ADD_IMAGE_POPUP_CONTENT_SELECTOR = '.dx-htmleditor-add-image-popup .dx-overlay-content'; +const LONG_FILE_UPLOADER_LABEL_TEXT = 'Drop an image here or click the button to browse'; test('TabPanel in HtmlEditor must have correct borders', async (t) => { const { takeScreenshot, compareResults } = createScreenshotsComparer(t); @@ -36,6 +37,33 @@ test('TabPanel in HtmlEditor must have correct borders', async (t) => { }); }); +test('File uploader label container should keep the full dialog width', async (t) => { + const { takeScreenshot, compareResults } = createScreenshotsComparer(t); + const htmlEditor = new HtmlEditor('#container'); + + await t.click(htmlEditor.toolbar.getItemByName('image')); + + await testScreenshot(t, takeScreenshot, 'htmleditor-add-image-long-file-uploader-label.png', { + element: ADD_IMAGE_POPUP_CONTENT_SELECTOR, + }); + + await t + .expect(compareResults.isValid()) + .ok(compareResults.errorMessages()); +}).before(async () => { + await createWidget('dxHtmlEditor', { + height: 600, + width: 800, + imageUpload: { + tabs: ['file'], + fileUploaderOptions: { + labelText: LONG_FILE_UPLOADER_LABEL_TEXT, + }, + }, + toolbar: { items: ['image'] }, + }); +}); + test('Add button should be enabled after switch to url form', async (t) => { const htmlEditor = new HtmlEditor('#container'); diff --git a/e2e/testcafe-devextreme/tests/editors/htmlEditor/dialogs/addImage/etalons/htmleditor-add-image-long-file-uploader-label (fluent.blue.light).png b/e2e/testcafe-devextreme/tests/editors/htmlEditor/dialogs/addImage/etalons/htmleditor-add-image-long-file-uploader-label (fluent.blue.light).png new file mode 100644 index 0000000000000000000000000000000000000000..c894ea73179e217b215bfc91b152f8d133cf5b36 GIT binary patch literal 17224 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 { // eslint-disable-next-line @typescript-eslint/no-unsafe-return return ( uploaderInstance.isMouseOverElement(e, this.option('splitterElement')) - || uploaderInstance._shouldRaiseDragLeaveBase(e, true) + || uploaderInstance._shouldRaiseDragLeaveBase(e) ); } diff --git a/packages/devextreme/js/__internal/ui/file_uploader/file_uploader.ts b/packages/devextreme/js/__internal/ui/file_uploader/file_uploader.ts index 813ef46d3855..a0e3eaae8c60 100644 --- a/packages/devextreme/js/__internal/ui/file_uploader/file_uploader.ts +++ b/packages/devextreme/js/__internal/ui/file_uploader/file_uploader.ts @@ -1220,7 +1220,7 @@ class FileUploader extends Editor { dropZoneElement?: Element, ): boolean | string | undefined { return this._activeDropZone === null - && this.isMouseOverElement(e, dropZoneElement as HTMLElement, false) + && this.isMouseOverElement(e, dropZoneElement as HTMLElement) && e.originalEvent.dataTransfer.types.find((item) => item === 'Files'); } @@ -1230,12 +1230,12 @@ class FileUploader extends Editor { } e.originalEvent.dataTransfer.dropEffect = 'copy'; - if (!isCustomTarget) { // only default dropzone has pseudoelements + if (!isCustomTarget) { const dropZoneElement = this._getDropZoneElement(false, e); if (this._shouldRaiseDragOver(e, dropZoneElement)) { this._dragEnterHandler(false, e); } - if (this._shouldRaiseDragLeave(e, false)) { + if (this._shouldRaiseDragLeave(e)) { this._dragLeaveHandler(false, e); } } @@ -1246,18 +1246,17 @@ class FileUploader extends Editor { e.preventDefault(); } - if (this._shouldRaiseDragLeave(e, isCustomTarget)) { + if (this._shouldRaiseDragLeave(e)) { this._tryToggleDropZoneActive(false, isCustomTarget, e); this._activeDropZone = null; } } - _shouldRaiseDragLeave(e: MouseLikeEvent, isCustomTarget: boolean): boolean { + _shouldRaiseDragLeave(e: MouseLikeEvent): boolean { return this._activeDropZone !== null && !this.isMouseOverElement( e, this._activeDropZone as HTMLElement, - !isCustomTarget, -DRAG_EVENT_DELTA, ); } @@ -1517,17 +1516,13 @@ class FileUploader extends Editor { isMouseOverElement( mouseEvent: MouseLikeEvent, element?: HTMLElement, - correctPseudoElements?: boolean, dragEventDelta: number = DRAG_EVENT_DELTA, ): boolean { if (!element) return false; - const beforeHeight = correctPseudoElements ? parseFloat(window.getComputedStyle(element, ':before').height) : 0; - const afterHeight = correctPseudoElements ? parseFloat(window.getComputedStyle(element, ':after').height) : 0; - const x = getOffset(element).left; - const y = getOffset(element).top + beforeHeight; + const { left: x, top: y } = getOffset(element); const w = element.offsetWidth; - const h = element.offsetHeight - beforeHeight - afterHeight; + const h = element.offsetHeight; const eventX = this._getEventX(mouseEvent); const eventY = this._getEventY(mouseEvent); diff --git a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/fileUploader.tests.js b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/fileUploader.tests.js index 4f85be4adb3e..2478a3f42733 100644 --- a/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/fileUploader.tests.js +++ b/packages/devextreme/testing/tests/DevExpress.ui.widgets.editors/fileUploader.tests.js @@ -4078,6 +4078,28 @@ QUnit.module('Drag and drop', moduleConfig, () => { assert.strictEqual(onDropZoneLeaveSpy.args[0][0].dropZoneElement, $inputWrapper[0], 'dropZone argument is correct'); }); + QUnit.test('default drop zone should stay active while a file is dragged over it', function(assert) { + const onDropZoneLeaveSpy = sinon.spy(); + const $fileUploader = $('#fileuploader').dxFileUploader({ + uploadMode: 'useButtons', + onDropZoneLeave: onDropZoneLeaveSpy + }); + const $inputWrapper = $fileUploader.find('.' + FILEUPLOADER_INPUT_WRAPPER_CLASS); + const { left, top } = $inputWrapper.offset(); + + triggerDragEvent($inputWrapper, 'dragenter'); + assert.ok($fileUploader.hasClass('dx-fileuploader-dragover'), 'drop zone is active after dragenter'); + + $inputWrapper.trigger($.Event('dragover', { + clientX: left + $inputWrapper.outerWidth() / 2, + clientY: top + $inputWrapper.outerHeight() / 2, + originalEvent: $.Event('dragover', { dataTransfer: { types: ['Files'] } }) + })); + + assert.ok($fileUploader.hasClass('dx-fileuploader-dragover'), 'drop zone is still active after dragover'); + assert.ok(onDropZoneLeaveSpy.notCalled, 'dropZoneLeave not called'); + }); + QUnit.test('dropZoneEnter and dropZoneLeave events should not fire if dragged item is not file', function(assert) { const onDropZoneEnterSpy = sinon.spy(); const onDropZoneLeaveSpy = sinon.spy();