From 07ff1a2a4c6889a74bb1907203d947df8ae17c72 Mon Sep 17 00:00:00 2001 From: Duygu Ramadan Date: Wed, 11 Mar 2026 14:41:51 +0200 Subject: [PATCH 1/2] fix(ui5-dialog): prevent native drag behavior only for header fixes: #13131 downport of: #13177 --- packages/main/src/Dialog.ts | 4 +++- packages/main/test/pages/Dialog.html | 33 ++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/packages/main/src/Dialog.ts b/packages/main/src/Dialog.ts index 98ba6f55ce3f..02e6a997177a 100644 --- a/packages/main/src/Dialog.ts +++ b/packages/main/src/Dialog.ts @@ -707,7 +707,9 @@ class Dialog extends Popup { } _handleDragStart(e: DragEvent) { - if (this.draggable) { + // Only prevent native drag behavior when dragging from the header + // to allow native drag-and-drop functionality in the dialog content. + if (this.draggable && e.target instanceof HTMLElement && Dialog._isHeader(e.target)) { e.preventDefault(); } } diff --git a/packages/main/test/pages/Dialog.html b/packages/main/test/pages/Dialog.html index 5fcfced3f48a..c13d80319f16 100644 --- a/packages/main/test/pages/Dialog.html +++ b/packages/main/test/pages/Dialog.html @@ -72,8 +72,22 @@
Open dialog calling show() multiple times +
+
+ Open draggable dialog with native DnD + + +

Drag items to drop zone:

+
Item 1
+
Item 2
+
Drop Zone
+
+ Close +
+ +

Build enterprise-ready web applications, responsive to all devices and running on the browser of your choice. That´s OpenUI5.

@@ -805,6 +819,25 @@ window["dialogFocus1"].close(); }); + window["native-dnd-open"].addEventListener("click", () => window["native-dnd-dialog"].open = true); + window["native-dnd-close"].addEventListener("click", () => window["native-dnd-dialog"].open = false); + + document.getElementById("dnd-item-1").addEventListener("dragstart", (e) => { + e.dataTransfer.setData("text", "item-1"); + }); + + document.getElementById("dnd-item-2").addEventListener("dragstart", (e) => { + e.dataTransfer.setData("text", "item-2"); + }); + + const dropZone = document.getElementById("drop-zone"); + dropZone.addEventListener("dragover", (e) => e.preventDefault()); + dropZone.addEventListener("drop", (e) => { + e.preventDefault(); + const data = e.dataTransfer.getData("text"); + dropZone.textContent = `Dropped: ${data}`; + }); + From 4ab8bccc38a7f5b1475b1d3432a944caed1cd306 Mon Sep 17 00:00:00 2001 From: Duygu Ramadan Date: Wed, 11 Mar 2026 15:04:26 +0200 Subject: [PATCH 2/2] chore: update chrome driver --- packages/base/package.json | 2 +- packages/fiori/package.json | 2 +- packages/localization/package.json | 2 +- packages/main/package.json | 2 +- yarn.lock | 33 +++++++++++++++++++++++------- 5 files changed, 30 insertions(+), 11 deletions(-) diff --git a/packages/base/package.json b/packages/base/package.json index 0f6df3c964b8..2909204f1a5f 100644 --- a/packages/base/package.json +++ b/packages/base/package.json @@ -46,7 +46,7 @@ "devDependencies": { "@openui5/sap.ui.core": "1.120.17", "@ui5/webcomponents-tools": "1.24.26", - "chromedriver": "^143.0.4", + "chromedriver": "^145.0.0", "clean-css": "^5.2.2", "copy-and-watch": "^0.1.5", "cross-env": "^7.0.3", diff --git a/packages/fiori/package.json b/packages/fiori/package.json index aba64d248553..b1684af75dab 100644 --- a/packages/fiori/package.json +++ b/packages/fiori/package.json @@ -54,6 +54,6 @@ }, "devDependencies": { "@ui5/webcomponents-tools": "1.24.26", - "chromedriver": "^143.0.4" + "chromedriver": "^145.0.0" } } diff --git a/packages/localization/package.json b/packages/localization/package.json index 41bdac848481..d1f070d9b918 100644 --- a/packages/localization/package.json +++ b/packages/localization/package.json @@ -35,7 +35,7 @@ "@openui5/sap.ui.core": "1.120.17", "@ui5/webcomponents-tools": "1.24.26", "babel-plugin-amd-to-esm": "^2.0.3", - "chromedriver": "^143.0.4", + "chromedriver": "^145.0.0", "estree-walk": "^2.2.0", "mkdirp": "^1.0.4", "resolve": "^1.20.0" diff --git a/packages/main/package.json b/packages/main/package.json index 47b0e3dbbd51..87d795fa6993 100644 --- a/packages/main/package.json +++ b/packages/main/package.json @@ -57,6 +57,6 @@ }, "devDependencies": { "@ui5/webcomponents-tools": "1.24.26", - "chromedriver": "^143.0.4" + "chromedriver": "^145.0.0" } } diff --git a/yarn.lock b/yarn.lock index 015e472a67de..05ddbbaec577 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7214,6 +7214,15 @@ axios@^1.12.0: form-data "^4.0.4" proxy-from-env "^1.1.0" +axios@^1.13.5: + version "1.13.6" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.13.6.tgz#c3f92da917dc209a15dd29936d20d5089b6b6c98" + integrity sha512-ChTCHMouEe2kn713WHbQGcuYrr6fXTBiu460OTwWrWob16g1bXn4vtz07Ope7ewMozJAnEquLk5lWQWtBig9DQ== + dependencies: + follow-redirects "^1.15.11" + form-data "^4.0.5" + proxy-from-env "^1.1.0" + babar@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/babar/-/babar-0.2.0.tgz#79bc0f029721467207f2b6baedf96b3938ad7db0" @@ -8081,17 +8090,17 @@ chrome-trace-event@^1.0.2: resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac" integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg== -chromedriver@^143.0.4: - version "143.0.4" - resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-143.0.4.tgz#0ede0354f2970d8d650a6befc6b458d9cd8d32b9" - integrity sha512-mE++40DprY2n4d3OPxzW7ujIFRY9eLYwJf4uBgQtMaJQkapSVXRzUrLzSMcRaybrt47Y1t8xW5AKoaUIL3aYZw== +chromedriver@^145.0.0: + version "145.0.6" + resolved "https://registry.yarnpkg.com/chromedriver/-/chromedriver-145.0.6.tgz#34a75a001f8e0103ea102fe0d0ae1c985fbc2a86" + integrity sha512-qobFdfjk7G7U9GKB6RYGBuqQ8L0QG1M30p90sNIWLKdpeobhsedfBhVxRqT4m/nWAtM0PhNb9GDD9qzDwSSGlA== dependencies: "@testim/chrome-version" "^1.1.4" - axios "^1.12.0" + axios "^1.13.5" compare-versions "^6.1.0" extract-zip "^2.0.1" proxy-agent "^6.4.0" - proxy-from-env "^1.1.0" + proxy-from-env "^2.0.0" tcp-port-used "^1.0.2" ci-info@^2.0.0: @@ -10791,6 +10800,11 @@ follow-redirects@^1.0.0, follow-redirects@^1.15.6: resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.6.tgz#7f815c0cda4249c74ff09e95ef97c23b5fd0399b" integrity sha512-wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA== +follow-redirects@^1.15.11: + version "1.15.11" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.11.tgz#777d73d72a92f8ec4d2e410eb47352a56b8e8340" + integrity sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ== + for-each@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e" @@ -10847,7 +10861,7 @@ form-data@^3.0.0: combined-stream "^1.0.8" mime-types "^2.1.12" -form-data@^4.0.4: +form-data@^4.0.4, form-data@^4.0.5: version "4.0.5" resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.5.tgz#b49e48858045ff4cbf6b03e1805cebcad3679053" integrity sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w== @@ -17713,6 +17727,11 @@ proxy-from-env@1.1.0, proxy-from-env@^1.0.0, proxy-from-env@^1.1.0: resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2" integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== +proxy-from-env@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-2.0.0.tgz#3f9786a14a3c1f73a5a9e10f70fd0cb81e27eb4d" + integrity sha512-h2lD3OfRraP3R51rNFKIE8nX+qoLr1mE74X91YhVxtDbt+OD6ntoNZv56+JgI4RCdtwQ5eexsOk1KdOQDfvPCQ== + ps-list@^7.2.0: version "7.2.0" resolved "https://registry.yarnpkg.com/ps-list/-/ps-list-7.2.0.tgz#3d110e1de8249a4b178c9b1cf2a215d1e4e42fc0"