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

Commit eb3cf70

Browse files
Merge pull request #258 from chakra-ui/docs/algolia
docs: Adds search to documentation with Algolia
2 parents 0980044 + fe859ac commit eb3cf70

File tree

134 files changed

+783
-70
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

134 files changed

+783
-70
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
},
1212
"workspaces": {
1313
"packages": [
14-
"packages/*"
14+
"packages/*",
15+
"website"
1516
],
1617
"nohoist": [
1718
"core-js"
@@ -58,7 +59,6 @@
5859
"@nuxtjs/dotenv": "^1.4.0",
5960
"@nuxtjs/emotion": "^0.0.1",
6061
"@nuxtjs/now-builder": "^0.17.1",
61-
"@nuxtjs/pwa": "^3.0.0-0",
6262
"@nuxtjs/router": "^1.5.0",
6363
"@popperjs/core": "^2.4.0",
6464
"@storybook/addon-actions": "^5.2.1",

packages/chakra-ui-core/src/CMenu/CMenu.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ const CMenuList = {
384384
}
385385
},
386386
render (h) {
387-
const { isOpen, buttonNode, menuId, buttonId, placement, closeMenu } = this.context
387+
const { isOpen, buttonNode, menuId, buttonId, placement, closeMenu, closeOnBlur } = this.context
388388
return h(CPopper, {
389389
props: {
390390
usePortal: false,
@@ -399,7 +399,7 @@ const CMenuList = {
399399
}
400400
}
401401
],
402-
closeOnClickAway: true,
402+
closeOnClickAway: closeOnBlur,
403403
hasArrow: false
404404
},
405405
attrs: {

packages/chakra-ui-core/src/CMenu/CMenu.stories.js

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,29 @@
11
import { storiesOf } from '@storybook/vue'
2-
import { CMenu, CMenuGroup, CMenuButton, CMenuList, CMenuOptionGroup, CImage, CMenuItemOption, CMenuItem, CMenuDivider, CIcon, defaultTheme } from '..'
2+
import { CMenu, CFade, CMenuGroup, CMenuButton, CMenuList, CMenuOptionGroup, CImage, CMenuItemOption, CMenuItem, CMenuDivider, CIcon, defaultTheme } from '..'
33

44
console.log({ defaultTheme })
55

66
storiesOf('UI | Menu', module)
7-
.add('Default Menu', () => ({
8-
components: { CMenu, CMenuGroup, CMenuButton, CMenuList, CMenuItem, CMenuDivider, CIcon },
9-
template: `
10-
<CMenu>
11-
<CMenuButton as="Button" rightIcon="chevron-down">
12-
Actions
13-
</CMenuButton>
14-
<CMenuList>
15-
<CMenuItem>Download</CMenuItem>
16-
<CMenuItem>Create a Copy</CMenuItem>
17-
<CMenuItem>Mark as Draft</CMenuItem>
18-
<CMenuItem>Delete</CMenuItem>
19-
<CMenuItem as="a" href="#">
20-
Attend a Workshop
21-
</CMenuItem>
22-
</CMenuList>
23-
</CMenu>
24-
`
25-
}))
267
.add('With internal state', () => ({
27-
components: { CMenu, CMenuGroup, CMenuButton, CMenuList, CMenuItem, CMenuDivider },
8+
components: { CFade, CMenu, CMenuGroup, CMenuButton, CMenuList, CMenuItem, CMenuDivider },
289
template: `
29-
<CMenu v-slot="{ isOpen }">
10+
<CMenu v-slot="{ isOpen }" :close-on-blur="false">
3011
<CMenuButton right-icon="chevron-down" variantColor="pink">
3112
{{ isOpen ? 'Close' : 'Open' }}
3213
</CMenuButton>
33-
<CMenuList>
34-
<CMenuGroup title="Profile">
35-
<CMenuItem>My Account</CMenuItem>
36-
<CMenuItem>Payments </CMenuItem>
37-
</CMenuGroup>
38-
<CMenuDivider />
39-
<CMenuGroup title="Help">
40-
<CMenuItem>Docs</CMenuItem>
41-
<CMenuItem>FAQ</CMenuItem>
42-
</CMenuGroup>
43-
</CMenuList>
14+
<CFade>
15+
<CMenuList>
16+
<CMenuGroup title="Profile">
17+
<CMenuItem>My Account</CMenuItem>
18+
<CMenuItem>Payments </CMenuItem>
19+
</CMenuGroup>
20+
<CMenuDivider />
21+
<CMenuGroup title="Help">
22+
<CMenuItem>Docs</CMenuItem>
23+
<CMenuItem>FAQ</CMenuItem>
24+
</CMenuGroup>
25+
</CMenuList>
26+
</CFade>
4427
</CMenu>
4528
`
4629
}))
@@ -123,3 +106,22 @@ storiesOf('UI | Menu', module)
123106
</c-menu>
124107
`
125108
}))
109+
.add('No close on blur', () => ({
110+
components: { CMenu, CMenuGroup, CMenuButton, CMenuList, CMenuItem, CMenuDivider, CIcon },
111+
template: `
112+
<CMenu :closeOnBlur="false">
113+
<CMenuButton as="Button" rightIcon="chevron-down">
114+
Actions
115+
</CMenuButton>
116+
<CMenuList>
117+
<CMenuItem>Download</CMenuItem>
118+
<CMenuItem>Create a Copy</CMenuItem>
119+
<CMenuItem>Mark as Draft</CMenuItem>
120+
<CMenuItem>Delete</CMenuItem>
121+
<CMenuItem as="a" href="#">
122+
Attend a Workshop
123+
</CMenuItem>
124+
</CMenuList>
125+
</CMenu>
126+
`
127+
}))

packages/chakra-ui-core/src/CPopper/CPopper.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ const CPopper = {
259259
*/
260260
wrapClose (e) {
261261
if (this.popper && !(this.anchor.contains(e.target))) {
262-
this.handleClose()
262+
this.closeOnClickAway && this.handleClose()
263263
}
264264
},
265265

packages/chakra-ui-core/src/utils/playground.stories.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/* eslint import/namespace: [2, { allowComputed: true }] */
22
import { storiesOf } from '@storybook/vue'
33
import Vue from 'vue'
4-
import CodeBlock from '../../../chakra-ui-docs/components/CodeBlock.js'
4+
import CodeBlock from '../../../../website/components/CodeBlock.js'
55
import * as ChakraComponents from '..'
66

77
Object.keys(ChakraComponents).forEach((key) => {

packages/chakra-ui-docs/components/internal-icons.js

Lines changed: 0 additions & 1 deletion
This file was deleted.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)