Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Extend context menu alignment without chevrons
Browse files Browse the repository at this point in the history
For context menus without chevrons, this changes the menu components to still
set default styles that align the menu based on the edges used to specify the
menu's position. This is not intended to change the positioning of any existing
menus.
  • Loading branch information
jryans committed Jun 10, 2019
1 parent 41cbfe0 commit 3126880
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 9 deletions.
24 changes: 20 additions & 4 deletions res/css/structures/_ContextualMenu.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,11 @@ limitations under the License.
z-index: 5001;
}

.mx_ContextualMenu.mx_ContextualMenu_right {
.mx_ContextualMenu_right {
right: 0;
}

.mx_ContextualMenu.mx_ContextualMenu_withChevron_right {
right: 8px;
}

Expand All @@ -66,7 +70,11 @@ limitations under the License.
right: 1px;
}

.mx_ContextualMenu.mx_ContextualMenu_left {
.mx_ContextualMenu_left {
left: 0;
}

.mx_ContextualMenu.mx_ContextualMenu_withChevron_left {
left: 8px;
}

Expand All @@ -93,7 +101,11 @@ limitations under the License.
left: 1px;
}

.mx_ContextualMenu.mx_ContextualMenu_top {
.mx_ContextualMenu_top {
top: 0;
}

.mx_ContextualMenu.mx_ContextualMenu_withChevron_top {
top: 8px;
}

Expand All @@ -120,7 +132,11 @@ limitations under the License.
top: 1px;
}

.mx_ContextualMenu.mx_ContextualMenu_bottom {
.mx_ContextualMenu_bottom {
bottom: 0;
}

.mx_ContextualMenu.mx_ContextualMenu_withChevron_bottom {
bottom: 8px;
}

Expand Down
13 changes: 8 additions & 5 deletions src/components/structures/ContextualMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -183,11 +183,14 @@ export default class ContextualMenu extends React.Component {

const menuClasses = classNames({
'mx_ContextualMenu': true,
'mx_ContextualMenu_noChevron': chevronFace === 'none',
'mx_ContextualMenu_left': chevronFace === 'left',
'mx_ContextualMenu_right': chevronFace === 'right',
'mx_ContextualMenu_top': chevronFace === 'top',
'mx_ContextualMenu_bottom': chevronFace === 'bottom',
'mx_ContextualMenu_left': !hasChevron && position.left,
'mx_ContextualMenu_right': !hasChevron && position.right,
'mx_ContextualMenu_top': !hasChevron && position.top,
'mx_ContextualMenu_bottom': !hasChevron && position.bottom,
'mx_ContextualMenu_withChevron_left': chevronFace === 'left',
'mx_ContextualMenu_withChevron_right': chevronFace === 'right',
'mx_ContextualMenu_withChevron_top': chevronFace === 'top',
'mx_ContextualMenu_withChevron_bottom': chevronFace === 'bottom',
});

const menuStyle = {};
Expand Down

0 comments on commit 3126880

Please sign in to comment.