From 2795a899703e5a307f7007a2ac517725a3519948 Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Fri, 12 Mar 2021 11:35:22 +0300 Subject: [PATCH] Web: Components: ContextMenuButton: Fixed render call on context call, added padding for inserted DropDown --- .../context-menu-button/index.js | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/packages/asc-web-components/context-menu-button/index.js b/packages/asc-web-components/context-menu-button/index.js index 87382e4af4..66426967da 100644 --- a/packages/asc-web-components/context-menu-button/index.js +++ b/packages/asc-web-components/context-menu-button/index.js @@ -70,6 +70,10 @@ class ContextMenuButton extends React.Component { this.toggle(this.props.opened); } + if (this.props.manualX !== prevProps.manualX) { + this.onIconButtonClick(); + } + if (this.props.opened && this.state.displayType === "aside") { window.addEventListener("popstate", this.popstate, false); } @@ -99,9 +103,9 @@ class ContextMenuButton extends React.Component { }; clickOutsideAction = (e) => { - const path = e.path || (e.composedPath && e.composedPath()); + /* const path = e.path || (e.composedPath && e.composedPath()); const dropDownItem = path ? path.find((x) => x === this.ref.current) : null; - if (!dropDownItem) return; + if (!dropDownItem) return; */ this.onIconButtonClick(); }; @@ -124,7 +128,7 @@ class ContextMenuButton extends React.Component { } render() { - //console.log("ContextMenuButton render"); + //console.log("ContextMenuButton render", this.props); const { className, clickColor, @@ -147,6 +151,8 @@ class ContextMenuButton extends React.Component { style, isFill, // eslint-disable-line react/prop-types asideHeader, // eslint-disable-line react/prop-types + manualX, + manualY, } = this.props; const { isOpen, displayType } = this.state; @@ -171,6 +177,8 @@ class ContextMenuButton extends React.Component { /> {displayType === "dropdown" ? (