From 390c6b22019af7420d9b2fce542acb2bc4cd7c4a Mon Sep 17 00:00:00 2001 From: "Ahmad K. Bawaneh" Date: Sun, 22 Dec 2024 13:31:42 +0300 Subject: [PATCH] fix #974 select menu does not close when changing tabs --- .../java/org/dominokit/domino/ui/carousel/Carousel.java | 4 +++- .../src/main/java/org/dominokit/domino/ui/icons/Icon.java | 1 - .../java/org/dominokit/domino/ui/icons/ToggleIcon.java | 1 - .../src/main/java/org/dominokit/domino/ui/style/Waves.java | 7 +++++-- .../src/main/java/org/dominokit/domino/ui/tabs/Tab.java | 3 --- .../main/java/org/dominokit/domino/ui/tabs/TabsPanel.java | 2 -- .../css/domino-ui/dui-components/domino-ui-waves.css | 1 - 7 files changed, 8 insertions(+), 11 deletions(-) diff --git a/domino-ui/src/main/java/org/dominokit/domino/ui/carousel/Carousel.java b/domino-ui/src/main/java/org/dominokit/domino/ui/carousel/Carousel.java index adf2396a3..39f04ffc3 100644 --- a/domino-ui/src/main/java/org/dominokit/domino/ui/carousel/Carousel.java +++ b/domino-ui/src/main/java/org/dominokit/domino/ui/carousel/Carousel.java @@ -105,9 +105,11 @@ public void run() { nextSlide(); } }; + + init(this); addAttachListener(); addDetachListener(); - init(this); + addEventListener( EventType.wheel.getName(), evt -> { diff --git a/domino-ui/src/main/java/org/dominokit/domino/ui/icons/Icon.java b/domino-ui/src/main/java/org/dominokit/domino/ui/icons/Icon.java index 661242f34..da72ac719 100644 --- a/domino-ui/src/main/java/org/dominokit/domino/ui/icons/Icon.java +++ b/domino-ui/src/main/java/org/dominokit/domino/ui/icons/Icon.java @@ -15,7 +15,6 @@ */ package org.dominokit.domino.ui.icons; -import static org.dominokit.domino.ui.utils.Domino.*; import static org.dominokit.domino.ui.utils.Domino.dui_clickable; import elemental2.dom.EventListener; diff --git a/domino-ui/src/main/java/org/dominokit/domino/ui/icons/ToggleIcon.java b/domino-ui/src/main/java/org/dominokit/domino/ui/icons/ToggleIcon.java index 4c83d6444..dc2ee9be4 100644 --- a/domino-ui/src/main/java/org/dominokit/domino/ui/icons/ToggleIcon.java +++ b/domino-ui/src/main/java/org/dominokit/domino/ui/icons/ToggleIcon.java @@ -50,7 +50,6 @@ public ToggleIcon(I primary, I toggle) { swapCss = AutoSwapCssClass.of(CompositeCssClass.of(primary), CompositeCssClass.of(toggle)); this.primary.addClickListener( evt -> { - evt.stopPropagation(); if (toggleOnClick) { toggle(); } diff --git a/domino-ui/src/main/java/org/dominokit/domino/ui/style/Waves.java b/domino-ui/src/main/java/org/dominokit/domino/ui/style/Waves.java index cc4df1c34..80b1052ad 100644 --- a/domino-ui/src/main/java/org/dominokit/domino/ui/style/Waves.java +++ b/domino-ui/src/main/java/org/dominokit/domino/ui/style/Waves.java @@ -18,10 +18,13 @@ import static elemental2.dom.DomGlobal.window; import static java.util.Objects.nonNull; import static org.dominokit.domino.ui.events.EventType.mousedown; -import static org.dominokit.domino.ui.utils.Domino.*; import static org.dominokit.domino.ui.utils.ElementsFactory.elements; -import elemental2.dom.*; +import elemental2.dom.DOMRect; +import elemental2.dom.Element; +import elemental2.dom.Event; +import elemental2.dom.EventListener; +import elemental2.dom.MouseEvent; import jsinterop.base.Js; import jsinterop.base.JsPropertyMap; import org.dominokit.domino.ui.IsElement; diff --git a/domino-ui/src/main/java/org/dominokit/domino/ui/tabs/Tab.java b/domino-ui/src/main/java/org/dominokit/domino/ui/tabs/Tab.java index f0f87d2c5..9a6adb7fc 100644 --- a/domino-ui/src/main/java/org/dominokit/domino/ui/tabs/Tab.java +++ b/domino-ui/src/main/java/org/dominokit/domino/ui/tabs/Tab.java @@ -31,7 +31,6 @@ import org.dominokit.domino.ui.elements.DivElement; import org.dominokit.domino.ui.elements.LIElement; import org.dominokit.domino.ui.elements.SpanElement; -import org.dominokit.domino.ui.events.EventType; import org.dominokit.domino.ui.icons.Icon; import org.dominokit.domino.ui.utils.*; @@ -87,10 +86,8 @@ private Tab() { .addCss(dui_tab_header_item, dui_tab_header_close) .addClickListener( evt -> { - evt.stopPropagation(); close(); }) - .addEventListener(EventType.mousedown.getName(), Event::stopPropagation) .clickable(), tabHeader); diff --git a/domino-ui/src/main/java/org/dominokit/domino/ui/tabs/TabsPanel.java b/domino-ui/src/main/java/org/dominokit/domino/ui/tabs/TabsPanel.java index be8fc350b..1e7651e84 100644 --- a/domino-ui/src/main/java/org/dominokit/domino/ui/tabs/TabsPanel.java +++ b/domino-ui/src/main/java/org/dominokit/domino/ui/tabs/TabsPanel.java @@ -133,8 +133,6 @@ public TabsPanel insertAt(int index, Tab tab) { .addEventListener( "click", evt -> { - evt.preventDefault(); - evt.stopPropagation(); activateTab(tab); }); tab.setParent(this); diff --git a/domino-ui/src/main/resources/org/dominokit/domino/ui/public/css/domino-ui/dui-components/domino-ui-waves.css b/domino-ui/src/main/resources/org/dominokit/domino/ui/public/css/domino-ui/dui-components/domino-ui-waves.css index b39a079a8..4932c0738 100644 --- a/domino-ui/src/main/resources/org/dominokit/domino/ui/public/css/domino-ui/dui-components/domino-ui-waves.css +++ b/domino-ui/src/main/resources/org/dominokit/domino/ui/public/css/domino-ui/dui-components/domino-ui-waves.css @@ -32,7 +32,6 @@ -ms-transform: scale(0) translate(0, 0); -o-transform: scale(0) translate(0, 0); transform: scale(0) translate(0, 0); - pointer-events: none; } .dui-waves-effect.dui-waves-light .dui-waves-ripple { background: rgba(255, 255, 255, 0.4);