IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web: Components: ContextMenuButton: Fixed render call on context call, added padding for inserted DropDown

Browse Source
This commit is contained in:
Ilya Oleshko 2021-03-12 11:35:22 +03:00
parent e018a15087
commit 2795a89970
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/asc-web-components/context-menu-button/index.js
View File

@ -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" ? (
<DropDown
manualX={manualX}
manualY={manualY}
directionX={directionX}
directionY={directionY}
open={isOpen}
@ -272,6 +280,10 @@ ContextMenuButton.propTypes = {
directionX: PropTypes.string,
/** Direction Y */
directionY: PropTypes.string,
/** Manual X padding */
manualX: PropTypes.string,
/** Manual Y padding */
manualY: PropTypes.string,
/** Accepts class */
className: PropTypes.string,
/** Accepts id */