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

Commit 93fa51e

Browse files
Merge pull request #272 from chakra-ui/develop
Chore: Release patches and update docs
2 parents 49f85bc + 8cfa284 commit 93fa51e

File tree

19 files changed

+251
-18
lines changed

19 files changed

+251
-18
lines changed

.all-contributorsrc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,15 @@
137137
"doc",
138138
"code"
139139
]
140+
},
141+
{
142+
"login": "Anmol270900",
143+
"name": "Anmol",
144+
"avatar_url": "https://avatars2.githubusercontent.com/u/43845658?v=4",
145+
"profile": "https://github.com/Anmol270900",
146+
"contributions": [
147+
"doc"
148+
]
140149
}
141150
],
142151
"contributorsPerLine": 7,

.storybook/config.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ import {
3333
faGithub
3434
} from '@fortawesome/free-brands-svg-icons'
3535

36+
import {
37+
faDiscord
38+
} from '@fortawesome/free-brands-svg-icons'
39+
3640
Vue.use(Chakra, {
3741
icons: {
3842
iconPack: 'fa',
@@ -51,6 +55,7 @@ Vue.use(Chakra, {
5155
faSearch,
5256
faTimesCircle,
5357
faGithub,
58+
faDiscord,
5459
faCheckCircle,
5560
faCog,
5661
faLock,

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
208208
<td align="center"><a href="https://github.com/saptaksengupta"><img src="https://avatars2.githubusercontent.com/u/21155006?v=4" width="50px;" alt=""/><br /><sub><b>Saptak Sengupta</b></sub></a><br /><a href="https://github.com/chakra-ui/chakra-ui-vue/commits?author=saptaksengupta" title="Documentation">📖</a></td>
209209
<td align="center"><a href="https://kuro.tw"><img src="https://avatars1.githubusercontent.com/u/362912?v=4" width="50px;" alt=""/><br /><sub><b>Kuro Hsu</b></sub></a><br /><a href="https://github.com/chakra-ui/chakra-ui-vue/commits?author=kurotanshi" title="Documentation">📖</a> <a href="https://github.com/chakra-ui/chakra-ui-vue/commits?author=kurotanshi" title="Code">💻</a></td>
210210
</tr>
211+
<tr>
212+
<td align="center"><a href="https://github.com/Anmol270900"><img src="https://avatars2.githubusercontent.com/u/43845658?v=4" width="50px;" alt=""/><br /><sub><b>Anmol</b></sub></a><br /><a href="https://github.com/chakra-ui/chakra-ui-vue/commits?author=Anmol270900" title="Documentation">📖</a></td>
213+
</tr>
211214
</table>
212215

213216
<!-- markdownlint-enable -->

packages/chakra-ui-core/CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,15 @@
11
# Change Log
22

3+
## 0.6.1
4+
5+
### Patch Changes
6+
7+
- ## Bug fixes
8+
- `CCollapse` component name option typo fix
9+
- `CMenu`: add `as` polymophic prop support for `CMenuItem` component
10+
- `chakra-loader`: Add documentation for the `chakra-loader` webpack plugin
11+
- Community: Add link to Chakra UI discord to docs.
12+
313
## 0.6.0
414

515
### Minor Changes

packages/chakra-ui-core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@chakra-ui/vue",
3-
"version": "0.6.0",
3+
"version": "0.6.1",
44
"description": "Build Accessible and Responsive Vue.js websites and applications with speed ⚡️",
55
"main": "dist/cjs/index.js",
66
"module": "dist/esm/index.js",

packages/chakra-ui-core/src/CButton/utils/button.props.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ export const buttonProps = {
3333
size: {
3434
type: String,
3535
default: 'md',
36-
validator: value => value.match(/^(sm|md|lg)$/)
36+
validator: value => value.match(/^(xs|sm|md|lg|xl)$/)
3737
},
3838
loadingText: {
3939
type: String,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import { extractListeners } from '../utils'
2323
* @see Docs https://vue.chakra-ui.com/collpse
2424
*/
2525
const CCollapse = {
26-
name: 'Collapse',
26+
name: 'CCollapse',
2727
functional: true,
2828
props: {
2929
isOpen: Boolean,

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -446,6 +446,10 @@ const CMenuItem = {
446446
role: {
447447
type: String,
448448
default: 'menuitem'
449+
},
450+
as: {
451+
type: [String, Object],
452+
default: 'button'
449453
}
450454
},
451455
computed: {
@@ -466,7 +470,7 @@ const CMenuItem = {
466470
const { focusableItems, focusAtIndex, closeOnSelect, closeMenu } = this.context
467471
return h(CPseudoBox, {
468472
props: {
469-
as: 'button'
473+
as: this.as
470474
},
471475
attrs: {
472476
display: 'flex',

packages/nuxt-chakra/CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
# Change Log
22

3+
## 0.0.7
4+
5+
### Patch Changes
6+
7+
- ## Bug fixes
8+
- `CCollapse` component name option typo fix
9+
- `CMenu`: add `as` polymophic prop support for `CMenuItem` component
10+
- `chakra-loader`: Add documentation for the `chakra-loader` webpack plugin
11+
- Community: Add link to Chakra UI discord to docs.
12+
- Updated dependencies [undefined]
13+
- @chakra-ui/vue@0.6.1
14+
315
## 0.0.6
416

517
### Patch Changes

packages/nuxt-chakra/lib/module.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ module.exports = function (moduleOptions) {
1414
}
1515

1616
// Recursively merge extended theme variables
17-
const theme = defu(defaultTheme, options.extendTheme)
17+
const theme = defu(options.extendTheme, defaultTheme)
1818

1919
// Resolve icons
2020
let packIcons = {}

0 commit comments

Comments
 (0)