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

fix(menu): closeOnBlur #257

Merged
codebender828 merged 2 commits into from
Jul 17, 2020
Merged

fix(menu): closeOnBlur #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e0152d
fix(menu): closeOnBlur
codebender828 Jul 17, 2020
085a392
Merge branch 'develop' into fix/menu-close-on-click
codebender828 Jul 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/chakra-ui-core/src/CMenu/CMenu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ const CMenuList = {
}
},
render (h) {
const { isOpen, buttonNode, menuId, buttonId, placement, closeMenu } = this.context
const { isOpen, buttonNode, menuId, buttonId, placement, closeMenu, closeOnBlur } = this.context
return h(CPopper, {
props: {
usePortal: false,
Expand All @@ -399,7 +399,7 @@ const CMenuList = {
}
}
],
closeOnClickAway: true,
closeOnClickAway: closeOnBlur,
hasArrow: false
},
attrs: {
Expand Down
68 changes: 35 additions & 33 deletions packages/chakra-ui-core/src/CMenu/CMenu.stories.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,46 +1,29 @@
import { storiesOf } from '@storybook/vue'
import { CMenu, CMenuGroup, CMenuButton, CMenuList, CMenuOptionGroup, CImage, CMenuItemOption, CMenuItem, CMenuDivider, CIcon, defaultTheme } from '..'
import { CMenu, CFade, CMenuGroup, CMenuButton, CMenuList, CMenuOptionGroup, CImage, CMenuItemOption, CMenuItem, CMenuDivider, CIcon, defaultTheme } from '..'

console.log({ defaultTheme })

storiesOf('UI | Menu', module)
.add('Default Menu', () => ({
components: { CMenu, CMenuGroup, CMenuButton, CMenuList, CMenuItem, CMenuDivider, CIcon },
template: `
<CMenu>
<CMenuButton as="Button" rightIcon="chevron-down">
Actions
</CMenuButton>
<CMenuList>
<CMenuItem>Download</CMenuItem>
<CMenuItem>Create a Copy</CMenuItem>
<CMenuItem>Mark as Draft</CMenuItem>
<CMenuItem>Delete</CMenuItem>
<CMenuItem as="a" href="#">
Attend a Workshop
</CMenuItem>
</CMenuList>
</CMenu>
`
}))
.add('With internal state', () => ({
components: { CMenu, CMenuGroup, CMenuButton, CMenuList, CMenuItem, CMenuDivider },
components: { CFade, CMenu, CMenuGroup, CMenuButton, CMenuList, CMenuItem, CMenuDivider },
template: `
<CMenu v-slot="{ isOpen }">
<CMenu v-slot="{ isOpen }" :close-on-blur="false">
<CMenuButton right-icon="chevron-down" variantColor="pink">
{{ isOpen ? 'Close' : 'Open' }}
</CMenuButton>
<CMenuList>
<CMenuGroup title="Profile">
<CMenuItem>My Account</CMenuItem>
<CMenuItem>Payments </CMenuItem>
</CMenuGroup>
<CMenuDivider />
<CMenuGroup title="Help">
<CMenuItem>Docs</CMenuItem>
<CMenuItem>FAQ</CMenuItem>
</CMenuGroup>
</CMenuList>
<CFade>
<CMenuList>
<CMenuGroup title="Profile">
<CMenuItem>My Account</CMenuItem>
<CMenuItem>Payments </CMenuItem>
</CMenuGroup>
<CMenuDivider />
<CMenuGroup title="Help">
<CMenuItem>Docs</CMenuItem>
<CMenuItem>FAQ</CMenuItem>
</CMenuGroup>
</CMenuList>
</CFade>
</CMenu>
`
}))
Expand Down Expand Up @@ -123,3 +106,22 @@ storiesOf('UI | Menu', module)
</c-menu>
`
}))
.add('No close on blur', () => ({
components: { CMenu, CMenuGroup, CMenuButton, CMenuList, CMenuItem, CMenuDivider, CIcon },
template: `
<CMenu :closeOnBlur="false">
<CMenuButton as="Button" rightIcon="chevron-down">
Actions
</CMenuButton>
<CMenuList>
<CMenuItem>Download</CMenuItem>
<CMenuItem>Create a Copy</CMenuItem>
<CMenuItem>Mark as Draft</CMenuItem>
<CMenuItem>Delete</CMenuItem>
<CMenuItem as="a" href="#">
Attend a Workshop
</CMenuItem>
</CMenuList>
</CMenu>
`
}))
2 changes: 1 addition & 1 deletion packages/chakra-ui-core/src/CPopper/CPopper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ const CPopper = {
*/
wrapClose (e) {
if (this.popper && !(this.anchor.contains(e.target))) {
this.handleClose()
this.closeOnClickAway && this.handleClose()
}
},

Expand Down