From 99cb267661f7fc269962d1c419d31f208dce73ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bayram=20=C3=87i=C3=A7ek?= Date: Thu, 28 Mar 2024 11:12:04 +0300 Subject: [PATCH] Calc: fix drop zone indicator regression MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit with cbf452b03d71e4ed773e059b83b86af102c473eb drop indicator was not shown if the cursor is over the
elements that inside the tabs - fix by using e.currentTarget instead of e.target and do some checks while on _handleDragLeave Signed-off-by: Bayram Çiçek Change-Id: Iec8e246f18e553487b0eb0d9264cff8bb37b6305 --- browser/css/spreadsheet.css | 1 - browser/src/control/Control.Tabs.js | 9 +++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/browser/css/spreadsheet.css b/browser/css/spreadsheet.css index 7662bb4618..89b1a0a3dd 100644 --- a/browser/css/spreadsheet.css +++ b/browser/css/spreadsheet.css @@ -288,7 +288,6 @@ vertical-align: bottom; display: inline-block; background-color: var(--color-main-background); - padding-bottom: 5px; } .tab-drop-area-active { diff --git a/browser/src/control/Control.Tabs.js b/browser/src/control/Control.Tabs.js index f087ace22a..8413004627 100644 --- a/browser/src/control/Control.Tabs.js +++ b/browser/src/control/Control.Tabs.js @@ -440,13 +440,14 @@ L.Control.Tabs = L.Control.extend({ // support duplication with ctrl in the future. e.dataTransfer.dropEffect = 'move'; - e.target.previousElementSibling.classList.add('tab-drop-area-active'); + e.currentTarget.previousElementSibling.classList.add('tab-drop-area-active'); return false; }, _handleDragLeave: function (e) { - e.target.previousElementSibling.classList.remove('tab-drop-area-active'); + if ($(e.target).hasClass('spreadsheet-tab') || (e.target.getAttribute('id') == 'drop-zone-end-container')) + e.currentTarget.previousElementSibling.classList.remove('tab-drop-area-active'); }, _handleDrop: function(e) { @@ -454,13 +455,13 @@ L.Control.Tabs = L.Control.extend({ e.stopPropagation(); } - e.target.previousElementSibling.classList.remove('tab-drop-area-active'); + e.currentTarget.previousElementSibling.classList.remove('tab-drop-area-active'); var targetIndex = this._map._docLayer._partNames.indexOf(e.target.innerText); this._moveSheet(targetIndex + 1); // drop to left side of the tab }, _handleDragEnd: function (e) { - e.target.previousElementSibling.classList.remove('tab-drop-area-active'); + e.currentTarget.previousElementSibling.classList.remove('tab-drop-area-active'); } });