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

Commit bf3b6d4

Browse files
codebender828codebender828
authored
Merge branch 'develop' into fix/alert_dialog_leastDestructiveRef_type
2 parents 89fd2a2 + 42e93b7 commit bf3b6d4

File tree

15 files changed

+191
-22
lines changed

15 files changed

+191
-22
lines changed

‎.changeset/empty-dryers-rescue.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎examples/nuxt-js/CHANGELOG.md

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
11
# nuxt-js
22

3+
## 1.2.0
4+
5+
### Minor Changes
6+
7+
- [`442faab6`](https://github.com/chakra-ui/chakra-ui-vue/commit/442faab62d2e8dc5cebb786625df6ac914232c49) [#540](https://github.com/chakra-ui/chakra-ui-vue/pull/540) Thanks [@codebender828](https://github.com/codebender828)! - fix: Include all position values in CToast, fix: import in custom theme code snippet
8+
9+
### Patch Changes
10+
11+
- Updated dependencies [[`442faab6`](https://github.com/chakra-ui/chakra-ui-vue/commit/442faab62d2e8dc5cebb786625df6ac914232c49)]:
12+
- @chakra-ui/nuxt@0.6.0
13+
314
## 1.1.0
415

516
### Minor Changes

‎examples/nuxt-js/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nuxt-js",
3-
"version": "1.1.0",
3+
"version": "1.2.0",
44
"private": true,
55
"scripts": {
66
"dev": "nuxt",
@@ -9,7 +9,7 @@
99
"generate": "nuxt generate"
1010
},
1111
"dependencies": {
12-
"@chakra-ui/nuxt": "^0.5.0",
12+
"@chakra-ui/nuxt": "^0.6.0",
1313
"@nuxtjs/emotion": "^0.1.0",
1414
"core-js": "^3.15.1",
1515
"nuxt": "^2.15.7"

‎packages/chakra-ui-core/CHANGELOG.md

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

3+
## 0.12.0
4+
5+
### Minor Changes
6+
7+
- [`442faab6`](https://github.com/chakra-ui/chakra-ui-vue/commit/442faab62d2e8dc5cebb786625df6ac914232c49) [#540](https://github.com/chakra-ui/chakra-ui-vue/pull/540) Thanks [@codebender828](https://github.com/codebender828)! - fix: Include all position values in CToast, fix: import in custom theme code snippet
8+
9+
### Patch Changes
10+
11+
- Updated dependencies [[`442faab6`](https://github.com/chakra-ui/chakra-ui-vue/commit/442faab62d2e8dc5cebb786625df6ac914232c49)]:
12+
- @chakra-ui/theme-vue@0.5.0
13+
314
## 0.11.0
415

516
### Minor Changes

‎packages/chakra-ui-core/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@chakra-ui/vue",
3-
"version": "0.11.0",
3+
"version": "0.12.0",
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",
@@ -37,7 +37,7 @@
3737
},
3838
"dependencies": {
3939
"@chakra-ui/styled-system": "^1.15.0",
40-
"@chakra-ui/theme-vue": "^0.4.0",
40+
"@chakra-ui/theme-vue": "^0.5.0",
4141
"@popperjs/core": "^2.4.0",
4242
"animejs": "^3.1.0",
4343
"aria-hidden": "^1.1.1",

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ const CMenu = {
9393
focusAtIndex: this.focusAtIndex,
9494
focusOnLastItem: this.focusOnLastItem,
9595
focusOnFirstItem: this.focusOnFirstItem,
96+
openMenu: this.openMenu,
9697
closeMenu: this.closeMenu,
9798
autoSelect: this.autoSelect,
9899
closeOnSelect: this.closeOnSelect,

‎packages/chakra-ui-core/src/CTextarea/CTextarea.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ const CTextarea = {
2626
name: 'CTextarea',
2727
functional: true,
2828
model: {
29-
prop: 'inputValue',
29+
prop: 'value',
3030
event: 'change'
3131
},
3232
props: {

‎packages/chakra-ui-core/src/CTextarea/tests/CTextarea.test.js

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
import { CTextarea } from '../..'
2+
import { render, screen, userEvent } from '@/tests/test-utils'
3+
4+
const renderComponent = (props) => {
5+
const inlineAttrs = (props && props.inlineAttrs) || ''
6+
const base = {
7+
data: () => ({ text: 'hello' }),
8+
components: { CTextarea },
9+
template: `<CTextarea data-testid="textarea" placeholder="textarea placeholder" v-model="text" ${inlineAttrs}/>`,
10+
...props
11+
}
12+
return render(base)
13+
}
14+
15+
test('should render correctly', () => {
16+
const { asFragment } = renderComponent()
17+
expect(asFragment()).toMatchSnapshot()
18+
})
19+
20+
test('v-model works', () => {
21+
renderComponent()
22+
const textarea = screen.getByTestId('textarea')
23+
24+
userEvent.type(textarea, ' world')
25+
expect(textarea).toHaveValue('hello world')
26+
})
27+
28+
test('readonly textarea renders correctly', () => {
29+
renderComponent({ inlineAttrs: 'isReadOnly' })
30+
const textarea = screen.getByTestId('textarea')
31+
32+
expect(textarea).toHaveAttribute('readonly')
33+
})
34+
35+
test('disabled textarea renders correctly', () => {
36+
renderComponent({ inlineAttrs: 'isDisabled' })
37+
const textarea = screen.getByTestId('textarea')
38+
39+
expect(textarea).toHaveAttribute('disabled')
40+
})

‎packages/chakra-ui-core/src/CTextarea/tests/__snapshots__/CTextarea.test.js.snap

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
// Jest Snapshot v1, https://goo.gl/fbAQLP
2+
3+
exports[`should render correctly 1`] = `
4+
<DocumentFragment>
5+
.emotion-0 {
6+
width: 100%;
7+
display: -webkit-box;
8+
display: -webkit-flex;
9+
display: -ms-flexbox;
10+
display: flex;
11+
-webkit-align-items: center;
12+
-webkit-box-align: center;
13+
-ms-flex-align: center;
14+
align-items: center;
15+
position: relative;
16+
-webkit-transition: all 0.2s;
17+
transition: all 0.2s;
18+
outline: 2px solid transparent;
19+
outline-offset: 2px;
20+
-webkit-appearance: none;
21+
-moz-appearance: none;
22+
-ms-appearance: none;
23+
appearance: none;
24+
font-size: var(--chakra-fontSizes-md);
25+
-webkit-padding-start: var(--chakra-space-4);
26+
padding-inline-start: var(--chakra-space-4);
27+
-webkit-padding-end: var(--chakra-space-4);
28+
padding-inline-end: var(--chakra-space-4);
29+
height: var(--chakra-sizes-10);
30+
line-height: var(--chakra-lineHeights-shorter);
31+
border-radius: var(--chakra-radii-md);
32+
border-width: 1px;
33+
border-color: inherit;
34+
background: var(--chakra-colors-white);
35+
font-family: var(--chakra-fonts-body);
36+
padding-top: 8px;
37+
padding-bottom: 8px;
38+
min-height: 80px;
39+
}
40+
41+
.emotion-0[aria-readonly=true],
42+
.emotion-0[readonly],
43+
.emotion-0[data-readonly] {
44+
background: var(--chakra-colors-transparent);
45+
box-shadow: none!important;
46+
-webkit-user-select: all;
47+
-moz-user-select: all;
48+
-ms-user-select: all;
49+
user-select: all;
50+
}
51+
52+
.emotion-0:hover,
53+
.emotion-0[data-hover] {
54+
border-color: var(--chakra-colors-gray-300);
55+
}
56+
57+
.emotion-0[disabled],
58+
.emotion-0[aria-disabled=true],
59+
.emotion-0[data-disabled] {
60+
opacity: 0.4;
61+
cursor: not-allowed;
62+
}
63+
64+
.emotion-0:focus,
65+
.emotion-0[data-focus] {
66+
z-index: 1;
67+
border-color: #7db1ff;
68+
box-shadow: 0 0 0 1px #7db1ff;
69+
}
70+
71+
.emotion-0[aria-invalid=true],
72+
.emotion-0[data-invalid] {
73+
border-color: #e66673;
74+
box-shadow: 0 0 0 1px #e66673;
75+
}
76+
77+
<textarea
78+
class="emotion-0"
79+
data-chakra-component="CTextarea"
80+
data-testid="textarea"
81+
placeholder="textarea placeholder"
82+
/>
83+
</DocumentFragment>
84+
`;

‎packages/chakra-ui-nuxt/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.6.0
4+
5+
### Minor Changes
6+
7+
- [`442faab6`](https://github.com/chakra-ui/chakra-ui-vue/commit/442faab62d2e8dc5cebb786625df6ac914232c49) [#540](https://github.com/chakra-ui/chakra-ui-vue/pull/540) Thanks [@codebender828](https://github.com/codebender828)! - fix: Include all position values in CToast, fix: import in custom theme code snippet
8+
9+
### Patch Changes
10+
11+
- Updated dependencies [[`442faab6`](https://github.com/chakra-ui/chakra-ui-vue/commit/442faab62d2e8dc5cebb786625df6ac914232c49)]:
12+
- @chakra-ui/vue@0.12.0
13+
- @chakra-ui/theme-vue@0.5.0
14+
315
## 0.5.0
416

517
### Minor Changes

‎packages/chakra-ui-nuxt/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@chakra-ui/nuxt",
3-
"version": "0.5.0",
3+
"version": "0.6.0",
44
"description": "Chakra UI Module for Nuxt.js",
55
"repository": "https://github.com/chakra-ui/chakra-ui-vue",
66
"license": "MIT",
@@ -19,8 +19,8 @@
1919
"test": "jest"
2020
},
2121
"dependencies": {
22-
"@chakra-ui/theme-vue": "^0.4.0",
23-
"@chakra-ui/vue": "^0.11.0",
22+
"@chakra-ui/theme-vue": "^0.5.0",
23+
"@chakra-ui/vue": "^0.12.0",
2424
"@emotion/css": "^11.0.0",
2525
"chakra-loader": "latest"
2626
},

‎packages/chakra-ui-theme/CHANGELOG.md

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

3+
## 0.5.0
4+
5+
### Minor Changes
6+
7+
- [`442faab6`](https://github.com/chakra-ui/chakra-ui-vue/commit/442faab62d2e8dc5cebb786625df6ac914232c49) [#540](https://github.com/chakra-ui/chakra-ui-vue/pull/540) Thanks [@codebender828](https://github.com/codebender828)! - fix: Include all position values in CToast, fix: import in custom theme code snippet
8+
39
## 0.4.0
410

511
### Minor Changes

‎packages/chakra-ui-theme/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/theme-vue",
3-
"version": "0.4.0",
3+
"version": "0.5.0",
44
"description": "Default theme for @chakra-ui/vue default theme object",
55
"author": {
66
"name": "Jonathan Bakebwa",

‎website/CHANGELOG.md

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

3+
## 0.9.0
4+
5+
### Minor Changes
6+
7+
- [`442faab6`](https://github.com/chakra-ui/chakra-ui-vue/commit/442faab62d2e8dc5cebb786625df6ac914232c49) [#540](https://github.com/chakra-ui/chakra-ui-vue/pull/540) Thanks [@codebender828](https://github.com/codebender828)! - fix: Include all position values in CToast, fix: import in custom theme code snippet
8+
9+
### Patch Changes
10+
11+
- Updated dependencies [[`442faab6`](https://github.com/chakra-ui/chakra-ui-vue/commit/442faab62d2e8dc5cebb786625df6ac914232c49)]:
12+
- @chakra-ui/vue@0.12.0
13+
- @chakra-ui/nuxt@0.6.0
14+
- @chakra-ui/theme-vue@0.5.0
15+
316
## 0.8.0
417

518
### Minor Changes

‎website/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "chakra-ui-docs",
3-
"version": "0.8.0",
3+
"version": "0.9.0",
44
"description": "Chakra UI Vue documentation site",
55
"private": true,
66
"scripts": {
@@ -26,9 +26,9 @@
2626
}
2727
},
2828
"dependencies": {
29-
"@chakra-ui/nuxt": "^0.5.0",
30-
"@chakra-ui/theme-vue": "^0.4.0",
31-
"@chakra-ui/vue": "^0.11.0",
29+
"@chakra-ui/nuxt": "^0.6.0",
30+
"@chakra-ui/theme-vue": "^0.5.0",
31+
"@chakra-ui/vue": "^0.12.0",
3232
"@emotion/css": "^11.0.0",
3333
"@mdx-js/vue-loader": "^1.6.1",
3434
"@nuxtjs/dotenv": "^1.4.0",

0 commit comments

Comments
 (0)