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

Commit 1432b29

Browse files
codebender828codebender828
committed
Merge branch 'main' of github.com:chakra-ui/chakra-ui-vue-next into feat/tabs-component
2 parents 1289531 + 57c6471 commit 1432b29

File tree

102 files changed

+1122
-83
lines changed

Some content is hidden

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

102 files changed

+1122
-83
lines changed

‎.changeset/breezy-scissors-compete.md

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
---
2+
"@chakra-ui/vue-composables": patch
3+
"@chakra-ui/c-close-button": patch
4+
"@chakra-ui/c-form-control": patch
5+
"@chakra-ui/c-scroll-lock": patch
6+
"@chakra-ui/c-breadcrumb": patch
7+
"@chakra-ui/c-accordion": patch
8+
"@chakra-ui/c-pin-input": patch
9+
"@chakra-ui/c-checkbox": patch
10+
"@chakra-ui/c-skip-nav": patch
11+
"@chakra-ui/c-popover": patch
12+
"@chakra-ui/c-spinner": patch
13+
"@chakra-ui/c-avatar": patch
14+
"@chakra-ui/c-button": patch
15+
"@chakra-ui/c-motion": patch
16+
"@chakra-ui/vue-accessibilty": patch
17+
"@chakra-ui/c-alert": patch
18+
"@chakra-ui/c-image": patch
19+
"@chakra-ui/c-input": patch
20+
"@chakra-ui/c-modal": patch
21+
"@chakra-ui/c-code": patch
22+
"@chakra-ui/c-menu": patch
23+
"@chakra-ui/vue-layout": patch
24+
"@chakra-ui/vue-system": patch
25+
"@chakra-ui/c-tag": patch
26+
"@chakra-ui/vue-utils": patch
27+
"@chakra-ui/vue-next": patch
28+
---
29+
30+
Feature: Provide default `<c-avatar-badge />` box-size"

‎.changeset/cuddly-flies-draw.md

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
---
2+
"@chakra-ui/c-avatar": patch
3+
"@chakra-ui/c-image": patch
4+
"@chakra-ui/nuxt-next": patch
5+
"@chakra-ui/c-accordion": patch
6+
"@chakra-ui/c-alert": patch
7+
"@chakra-ui/c-breadcrumb": patch
8+
"@chakra-ui/c-button": patch
9+
"@chakra-ui/c-checkbox": patch
10+
"@chakra-ui/c-close-button": patch
11+
"@chakra-ui/c-code": patch
12+
"@chakra-ui/c-color-mode": patch
13+
"@chakra-ui/c-focus-lock": patch
14+
"@chakra-ui/c-form-control": patch
15+
"@chakra-ui/c-icon": patch
16+
"@chakra-ui/c-input": patch
17+
"@chakra-ui/c-live-region": patch
18+
"@chakra-ui/c-media-query": patch
19+
"@chakra-ui/c-menu": patch
20+
"@chakra-ui/c-modal": patch
21+
"@chakra-ui/c-motion": patch
22+
"@chakra-ui/c-pin-input": patch
23+
"@chakra-ui/c-popover": patch
24+
"@chakra-ui/c-popper": patch
25+
"@chakra-ui/c-portal": patch
26+
"@chakra-ui/c-reset": patch
27+
"@chakra-ui/c-scroll-lock": patch
28+
"@chakra-ui/c-skip-nav": patch
29+
"@chakra-ui/c-spinner": patch
30+
"@chakra-ui/c-table": patch
31+
"@chakra-ui/c-tag": patch
32+
"@chakra-ui/c-textarea": patch
33+
"@chakra-ui/c-theme-provider": patch
34+
"@chakra-ui/c-toast": patch
35+
"@chakra-ui/c-tooltip": patch
36+
"@chakra-ui/c-visually-hidden": patch
37+
"@chakra-ui/vue-layout": patch
38+
"@chakra-ui/vue-styled": patch
39+
"@chakra-ui/vue-system": patch
40+
"@chakra-ui/vue-test-utils": patch
41+
"@chakra-ui/vue-utils": patch
42+
"@chakra-ui/vue-next": patch
43+
"@chakra-ui/vue-accessibilty": patch
44+
"@chakra-ui/vue-composables": patch
45+
"@chakra-ui/vue-auto-import": patch
46+
---
47+
48+
Fix Avatar Badge SSR bug

‎.changeset/pre.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@
5151
"beige-ants-beg",
5252
"beige-bugs-try",
5353
"blue-penguins-swim",
54+
"breezy-scissors-compete",
5455
"chilly-forks-stare",
56+
"cuddly-flies-draw",
5557
"giant-deers-compete",
5658
"gorgeous-swans-kneel",
5759
"happy-impalas-lick",

‎@types/components.d.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/**
2-
* Typescript support for @chakra-ui/vue-next2.1.0-beta.8 auto-imported
2+
* Typescript support for @chakra-ui/vue-next2.1.0-beta.9 auto-imported
33
* components using `unplugin-vue-components,`
44
*
55
* @see: https://github.com/antfu/unplugin-vue-components/#typescript
66
*
77
* This is a generated file. Do not edit it's contents.
88
*
9-
* This file was generated on 2023-03-22T17:58:36.992Z
9+
* This file was generated on 2023-03-28T13:35:59.574Z
1010
*/
1111

1212
import { ChakraProps, chakra } from "@chakra-ui/vue-system"
@@ -77,6 +77,7 @@ declare module "@vue/runtime-core" {
7777
CAspectRatio: typeof import("@chakra-ui/vue-next")["CAspectRatio"]
7878
CAvatar: typeof import("@chakra-ui/vue-next")["CAvatar"]
7979
CAvatarBadge: typeof import("@chakra-ui/vue-next")["CAvatarBadge"]
80+
CAvatarGroup: typeof import("@chakra-ui/vue-next")["CAvatarGroup"]
8081
CBadge: typeof import("@chakra-ui/vue-next")["CBadge"]
8182
CBox: typeof import("@chakra-ui/vue-next")["CBox"]
8283
CBreadcrumb: typeof import("@chakra-ui/vue-next")["CBreadcrumb"]

‎README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,13 @@ The official working repository for V1 of Chakra UI Vue with Vue 3 support.
88
```bash
99
pnpm install
1010

11+
pnpm build
12+
13+
# Start packages dev server
1114
pnpm dev
1215

16+
17+
# In separate terminal
1318
pnpm playground:dev
1419
```
1520

‎components.d.ts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
/**
2-
* Typescript support for @chakra-ui/vue-next2.1.0-beta.8 auto-imported
2+
* Typescript support for @chakra-ui/vue-next2.1.0-beta.9 auto-imported
33
* components using `unplugin-vue-components,`
44
*
55
* @see: https://github.com/antfu/unplugin-vue-components/#typescript
66
*
77
* This is a generated file. Do not edit it's contents.
88
*
9-
* This file was generated on 2023-03-22T17:58:36.992Z
9+
* This file was generated on 2023-03-28T13:35:59.574Z
1010
*/
1111

1212
import { ChakraProps, chakra } from "@chakra-ui/vue-system"
@@ -77,6 +77,7 @@ declare module "@vue/runtime-core" {
7777
CAspectRatio: typeof import("@chakra-ui/vue-next")["CAspectRatio"]
7878
CAvatar: typeof import("@chakra-ui/vue-next")["CAvatar"]
7979
CAvatarBadge: typeof import("@chakra-ui/vue-next")["CAvatarBadge"]
80+
CAvatarGroup: typeof import("@chakra-ui/vue-next")["CAvatarGroup"]
8081
CBadge: typeof import("@chakra-ui/vue-next")["CBadge"]
8182
CBox: typeof import("@chakra-ui/vue-next")["CBox"]
8283
CBreadcrumb: typeof import("@chakra-ui/vue-next")["CBreadcrumb"]

‎modules/nuxt/CHANGELOG.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
# @chakra-ui/nuxt-next
22

3+
## 2.1.0-beta.11
4+
5+
### Patch Changes
6+
7+
- 78f0fb00: Fix Avatar Badge SSR bug
8+
- Updated dependencies [78f0fb00]
9+
- @chakra-ui/c-color-mode@2.1.0-beta.9
10+
- @chakra-ui/vue-next@2.1.0-beta.10
11+
12+
## 2.1.0-beta.10
13+
14+
### Patch Changes
15+
16+
- Updated dependencies [14ac48aa]
17+
- @chakra-ui/vue-next@2.1.0-beta.9
18+
- @chakra-ui/c-color-mode@2.1.0-beta.8
19+
320
## 2.1.0-beta.9
421

522
### Minor Changes

‎modules/nuxt/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/nuxt-next",
3-
"version": "2.1.0-beta.9",
3+
"version": "2.1.0-beta.11",
44
"description": "Nuxt 3 compatible version of Chakra UI Vue",
55
"license": "MIT",
66
"type": "module",

‎modules/nuxt/playground/app.vue

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,67 @@
120120
<DiscordIcon />
121121
</c-icon-button>
122122
</c-button-group>
123+
<c-stack>
124+
<c-heading as="h3" size="md"> Avatars </c-heading>
125+
<c-avatar-group :max="3" size="md">
126+
<c-avatar
127+
name="Sarah Drasner"
128+
src="https://avatars.githubusercontent.com/u/2281088?v=4"
129+
alt="Sarah Drasner"
130+
:border-color="
131+
useColorModeValue(
132+
`${selectedColor.color}.50`,
133+
`${selectedColor.color}.900`
134+
).value
135+
"
136+
>
137+
<c-avatar-badge
138+
bg="green.400"
139+
border-width="2px"
140+
box-size="0.8em"
141+
/>
142+
</c-avatar>
143+
<c-avatar
144+
name="Evan You"
145+
alt="Evan You"
146+
src="https://www.github.com/yyx990803.png"
147+
:border-color="
148+
useColorModeValue(
149+
`${selectedColor.color}.50`,
150+
`${selectedColor.color}.900`
151+
).value
152+
"
153+
>
154+
<c-avatar-badge
155+
bg="green.400"
156+
border-width="2px"
157+
box-size="0.8em"
158+
/>
159+
</c-avatar>
160+
<c-avatar
161+
name="Anthony Fu"
162+
src="https://avatars.githubusercontent.com/u/11247099?v=4"
163+
alt="Anthony Fu"
164+
:border-color="
165+
useColorModeValue(
166+
`${selectedColor.color}.50`,
167+
`${selectedColor.color}.900`
168+
).value
169+
"
170+
>
171+
<c-avatar-badge
172+
bg="green.400"
173+
border-width="2px"
174+
box-size="0.8em"
175+
/>
176+
</c-avatar>
177+
<c-avatar
178+
name="Maya Shavin"
179+
src="https://avatars.githubusercontent.com/u/6650139?v=4"
180+
alt="Maya Shavin"
181+
></c-avatar>
182+
</c-avatar-group>
183+
</c-stack>
123184
</c-stack>
124185
</chakra.div>
125186
</template>

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"@babel/runtime": "^7.20.13",
7777
"@chakra-ui/anatomy": "^2.0.1",
7878
"@chakra-ui/nuxt-next": "workspace:*",
79-
"@chakra-ui/styled-system": "2.6.1",
79+
"@chakra-ui/styled-system": "2.7.0",
8080
"@chakra-ui/theme": "^2.2.5",
8181
"@chakra-ui/theme-tools": "^2.0.17",
8282
"@chakra-ui/theme-utils": "^2.0.6",

0 commit comments

Comments
 (0)