From a4acbe0cf2dc0e15500eaeba323352909ea95878 Mon Sep 17 00:00:00 2001 From: mertsincan Date: Tue, 16 Mar 2021 16:23:33 +0300 Subject: [PATCH] Refactor #1878 --- src/components/autocomplete/AutoComplete.js | 2 ++ src/components/calendar/Calendar.js | 2 ++ src/components/cascadeselect/CascadeSelect.js | 2 ++ src/components/colorpicker/ColorPicker.js | 2 ++ src/components/confirmpopup/ConfirmPopup.js | 2 ++ src/components/contextmenu/ContextMenu.js | 2 ++ src/components/dialog/Dialog.js | 2 ++ src/components/dropdown/Dropdown.js | 2 ++ src/components/galleria/Galleria.js | 2 ++ src/components/menu/Menu.js | 2 ++ src/components/menubar/Menubar.js | 4 ++++ src/components/multiselect/MultiSelect.js | 2 ++ src/components/overlaypanel/OverlayPanel.js | 2 ++ src/components/password/Password.js | 2 ++ src/components/scrolltop/ScrollTop.js | 2 ++ src/components/sidebar/Sidebar.js | 2 ++ src/components/slidemenu/SlideMenu.js | 2 ++ src/components/splitbutton/SplitButton.js | 2 ++ src/components/tieredmenu/TieredMenu.js | 2 ++ src/components/tooltip/Tooltip.js | 2 ++ 20 files changed, 42 insertions(+) diff --git a/src/components/autocomplete/AutoComplete.js b/src/components/autocomplete/AutoComplete.js index 479d0cb0d6..353a0b296e 100644 --- a/src/components/autocomplete/AutoComplete.js +++ b/src/components/autocomplete/AutoComplete.js @@ -691,6 +691,8 @@ export class AutoComplete extends Component { if (this.timeout) { clearTimeout(this.timeout); } + + DomHandler.revertZIndex(); } renderTooltip() { diff --git a/src/components/calendar/Calendar.js b/src/components/calendar/Calendar.js index 76e9386247..9bbba3a46e 100644 --- a/src/components/calendar/Calendar.js +++ b/src/components/calendar/Calendar.js @@ -301,6 +301,8 @@ export class Calendar extends Component { this.scrollHandler.destroy(); this.scrollHandler = null; } + + DomHandler.revertZIndex(); } renderTooltip() { diff --git a/src/components/cascadeselect/CascadeSelect.js b/src/components/cascadeselect/CascadeSelect.js index dee6c8ca7f..5060da6b15 100644 --- a/src/components/cascadeselect/CascadeSelect.js +++ b/src/components/cascadeselect/CascadeSelect.js @@ -347,6 +347,8 @@ export class CascadeSelect extends Component { this.scrollHandler.destroy(); this.scrollHandler = null; } + + DomHandler.revertZIndex(); } componentDidUpdate(prevProps) { diff --git a/src/components/colorpicker/ColorPicker.js b/src/components/colorpicker/ColorPicker.js index cd92cf6d97..7ee9b2b365 100644 --- a/src/components/colorpicker/ColorPicker.js +++ b/src/components/colorpicker/ColorPicker.js @@ -593,6 +593,8 @@ export class ColorPicker extends Component { this.tooltip.destroy(); this.tooltip = null; } + + DomHandler.revertZIndex(); } updateUI() { diff --git a/src/components/confirmpopup/ConfirmPopup.js b/src/components/confirmpopup/ConfirmPopup.js index 5e215791e9..054cd71727 100644 --- a/src/components/confirmpopup/ConfirmPopup.js +++ b/src/components/confirmpopup/ConfirmPopup.js @@ -291,6 +291,8 @@ export class ConfirmPopup extends Component { this.scrollHandler.destroy(); this.scrollHandler = null; } + + DomHandler.revertZIndex(); } renderContent() { diff --git a/src/components/contextmenu/ContextMenu.js b/src/components/contextmenu/ContextMenu.js index 024300d204..49e6791061 100644 --- a/src/components/contextmenu/ContextMenu.js +++ b/src/components/contextmenu/ContextMenu.js @@ -456,6 +456,8 @@ export class ContextMenu extends Component { componentWillUnmount() { this.unbindDocumentListeners(); this.unbindDocumentContextMenuListener(); + + DomHandler.revertZIndex(); } renderContextMenu() { diff --git a/src/components/dialog/Dialog.js b/src/components/dialog/Dialog.js index 8ac8af3266..4f49007be6 100644 --- a/src/components/dialog/Dialog.js +++ b/src/components/dialog/Dialog.js @@ -533,6 +533,8 @@ export class Dialog extends Component { document.head.removeChild(this.styleElement); this.styleElement = null; } + + DomHandler.revertZIndex(); } renderCloseIcon() { diff --git a/src/components/dropdown/Dropdown.js b/src/components/dropdown/Dropdown.js index 304f6ba040..81d2196650 100644 --- a/src/components/dropdown/Dropdown.js +++ b/src/components/dropdown/Dropdown.js @@ -788,6 +788,8 @@ export class Dropdown extends Component { clearTimeout(this.hideTimeout); this.hideTimeout = null; } + + DomHandler.revertZIndex(); } componentDidUpdate(prevProps) { diff --git a/src/components/galleria/Galleria.js b/src/components/galleria/Galleria.js index b5976fe718..977dc7bf17 100644 --- a/src/components/galleria/Galleria.js +++ b/src/components/galleria/Galleria.js @@ -181,6 +181,8 @@ export class Galleria extends Component { if (this.state.slideShowActive) { this.stopSlideShow(); } + + DomHandler.revertZIndex(); } renderHeader() { diff --git a/src/components/menu/Menu.js b/src/components/menu/Menu.js index 7f7bfcf8ec..8fb12b4cd5 100644 --- a/src/components/menu/Menu.js +++ b/src/components/menu/Menu.js @@ -243,6 +243,8 @@ export class Menu extends Component { this.scrollHandler.destroy(); this.scrollHandler = null; } + + DomHandler.revertZIndex(); } renderSubmenu(submenu, index) { diff --git a/src/components/menubar/Menubar.js b/src/components/menubar/Menubar.js index 2712b739de..6aa310df71 100644 --- a/src/components/menubar/Menubar.js +++ b/src/components/menubar/Menubar.js @@ -86,6 +86,10 @@ export class Menubar extends Component { }); } + componentWillUnmount() { + DomHandler.revertZIndex(); + } + renderCustomContent() { if (this.props.children) { return ( diff --git a/src/components/multiselect/MultiSelect.js b/src/components/multiselect/MultiSelect.js index b2f2eb2629..e850d8fb75 100644 --- a/src/components/multiselect/MultiSelect.js +++ b/src/components/multiselect/MultiSelect.js @@ -536,6 +536,8 @@ export class MultiSelect extends Component { this.tooltip.destroy(); this.tooltip = null; } + + DomHandler.revertZIndex(); } hasFilter() { diff --git a/src/components/overlaypanel/OverlayPanel.js b/src/components/overlaypanel/OverlayPanel.js index 9e65e5a026..91e05b73d4 100644 --- a/src/components/overlaypanel/OverlayPanel.js +++ b/src/components/overlaypanel/OverlayPanel.js @@ -257,6 +257,8 @@ export class OverlayPanel extends Component { document.head.removeChild(this.styleElement); this.styleElement = null; } + + DomHandler.revertZIndex(); } renderCloseIcon() { diff --git a/src/components/password/Password.js b/src/components/password/Password.js index 761ee53622..b0e817881b 100644 --- a/src/components/password/Password.js +++ b/src/components/password/Password.js @@ -377,6 +377,8 @@ export class Password extends Component { this.tooltip.destroy(); this.tooltip = null; } + + DomHandler.revertZIndex(); } renderTooltip() { diff --git a/src/components/scrolltop/ScrollTop.js b/src/components/scrolltop/ScrollTop.js index 76368b923d..cc7b835728 100644 --- a/src/components/scrolltop/ScrollTop.js +++ b/src/components/scrolltop/ScrollTop.js @@ -100,6 +100,8 @@ export class ScrollTop extends Component { this.unbindDocumentScrollListener(); else if (this.props.target === 'parent') this.unbindParentScrollListener(); + + DomHandler.revertZIndex(); } render() { diff --git a/src/components/sidebar/Sidebar.js b/src/components/sidebar/Sidebar.js index 493be2a9bf..f0617de743 100644 --- a/src/components/sidebar/Sidebar.js +++ b/src/components/sidebar/Sidebar.js @@ -191,6 +191,8 @@ export class Sidebar extends Component { componentWillUnmount() { this.unbindMaskClickListener(); this.disableModality(); + + DomHandler.revertZIndex(); } renderCloseIcon() { diff --git a/src/components/slidemenu/SlideMenu.js b/src/components/slidemenu/SlideMenu.js index 5954b1f828..7c8b7431d7 100644 --- a/src/components/slidemenu/SlideMenu.js +++ b/src/components/slidemenu/SlideMenu.js @@ -376,6 +376,8 @@ export class SlideMenu extends Component { this.scrollHandler.destroy(); this.scrollHandler = null; } + + DomHandler.revertZIndex(); } renderElement() { diff --git a/src/components/splitbutton/SplitButton.js b/src/components/splitbutton/SplitButton.js index 9931d1f7e1..c3fc689332 100644 --- a/src/components/splitbutton/SplitButton.js +++ b/src/components/splitbutton/SplitButton.js @@ -206,6 +206,8 @@ export class SplitButton extends Component { this.tooltip.destroy(); this.tooltip = null; } + + DomHandler.revertZIndex(); } renderTooltip() { diff --git a/src/components/tieredmenu/TieredMenu.js b/src/components/tieredmenu/TieredMenu.js index bef7f99bf6..857847b99e 100644 --- a/src/components/tieredmenu/TieredMenu.js +++ b/src/components/tieredmenu/TieredMenu.js @@ -186,6 +186,8 @@ export class TieredMenu extends Component { this.scrollHandler.destroy(); this.scrollHandler = null; } + + DomHandler.revertZIndex(); } renderElement() { diff --git a/src/components/tooltip/Tooltip.js b/src/components/tooltip/Tooltip.js index a7c15a7db7..6e13c21b9e 100644 --- a/src/components/tooltip/Tooltip.js +++ b/src/components/tooltip/Tooltip.js @@ -445,6 +445,8 @@ export class Tooltip extends Component { this.scrollHandler.destroy(); this.scrollHandler = null; } + + DomHandler.revertZIndex(); } renderElement() {