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

Commit 1fcbcba

Browse files
Merge pull request #267 from chakra-ui/fix/vue-system
fix(system): fix ambiguous export
2 parents be3bcc0 + 95d5354 commit 1fcbcba

Some content is hidden

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

61 files changed

+145
-256
lines changed

@types/components.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* This is a generated file. Do not edit it's contents.
88
*
9-
* This file was generated on 2023-02-18T03:42:38.183Z
9+
* This file was generated on 2023-02-19T13:06:33.516Z
1010
*/
1111

1212
import { ChakraProps, chakra } from "@chakra-ui/vue-system"

components.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
*
77
* This is a generated file. Do not edit it's contents.
88
*
9-
* This file was generated on 2023-02-18T03:42:38.183Z
9+
* This file was generated on 2023-02-19T13:06:33.516Z
1010
*/
1111

1212
import { ChakraProps, chakra } from "@chakra-ui/vue-system"

packages/c-accordion/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"@chakra-ui/vue-system": "workspace:*",
3333
"@chakra-ui/vue-utils": "workspace:*",
3434
"@zag-js/accordion": "0.2.11",
35+
"@chakra-ui/styled-system": "2.5.1",
3536
"@zag-js/vue": "^0.2.9"
3637
},
3738
"peerDependencies": {

packages/c-accordion/src/accordion.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ import {
66
DOMElements,
77
StylesProvider,
88
HTMLChakraProps,
9-
ThemingProps,
109
useMultiStyleConfig,
1110
useStyles,
1211
} from "@chakra-ui/vue-system"
12+
1313
import { useId } from "@chakra-ui/vue-composables"
1414
import {
1515
createContext,
@@ -19,7 +19,7 @@ import {
1919
vueThemingProps,
2020
} from "@chakra-ui/vue-utils"
2121
import { filterUndefined, mergeWith } from "@chakra-ui/utils"
22-
import { SystemStyleObject } from "@chakra-ui/styled-system"
22+
import { SystemStyleObject, ThemingProps } from "@chakra-ui/styled-system"
2323
import { CCollapse } from "@chakra-ui/c-motion"
2424
import { CIcon } from "@chakra-ui/c-icon"
2525

packages/c-alert/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"build:types": "tsup src --dts-only"
2626
},
2727
"dependencies": {
28+
"@chakra-ui/styled-system": "2.5.1",
2829
"@chakra-ui/c-icon": "workspace:*",
2930
"@chakra-ui/vue-system": "workspace:*",
3031
"@chakra-ui/vue-utils": "workspace:*"

packages/c-alert/src/alert.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,11 @@ import {
88
} from "vue"
99
import {
1010
chakra,
11-
ThemingProps,
1211
useMultiStyleConfig,
1312
createStylesContext,
1413
DOMElements,
15-
SystemStyleObject,
1614
} from "@chakra-ui/vue-system"
15+
import { ThemingProps, SystemStyleObject } from "@chakra-ui/styled-system"
1716
import { createContext, getValidChildren } from "@chakra-ui/vue-utils"
1817
import { CCheckIcon, CErrorIcon, CInfoIcon, CWarningIcon } from "./icons"
1918

packages/c-avatar/src/c-avatar-group.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
import {
33
useMultiStyleConfig,
44
chakra,
5-
SystemStyleObject,
65
} from "@chakra-ui/vue-system"
6+
import { SystemStyleObject } from "@chakra-ui/styled-system"
77
import {
88
getValidChildren,
99
SNAO,

packages/c-avatar/src/c-avatar-image.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ import { CImageProps, useImage } from "@chakra-ui/c-image"
1010
import { SNAO } from "@chakra-ui/vue-utils"
1111
import { CAvatarName } from "./c-avatar-name"
1212
import { CDefaultAvatarIcon } from "./c-default-avatar-icon"
13-
import { chakra, SystemStyleObject } from "@chakra-ui/vue-system"
13+
import { chakra } from "@chakra-ui/vue-system"
14+
import { SystemStyleObject } from "@chakra-ui/styled-system"
1415
import { useAvatarContext } from "./c-avatar"
1516

1617
export interface CAvatarImageProps extends Omit<CImageProps, "borderRadius"> {

packages/c-breadcrumb/src/c-breadcrumb.tsx

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,13 @@ import {
2020
import {
2121
chakra,
2222
HTMLChakraProps,
23-
SystemProps,
24-
ThemingProps,
2523
StylesProvider,
2624
useMultiStyleConfig,
2725
useStyles,
28-
SystemStyleObject,
2926
ChakraProps,
3027
ComponentWithProps,
3128
} from "@chakra-ui/vue-system"
29+
import { SystemProps, ThemingProps, SystemStyleObject } from "@chakra-ui/styled-system"
3230
import { filterUndefined } from "@chakra-ui/utils"
3331
import {
3432
getValidChildren,
@@ -58,8 +56,8 @@ export interface BreadcrumbOptions {
5856

5957
export interface BreadcrumbProps
6058
extends ChakraProps,
61-
BreadcrumbOptions,
62-
ThemingProps<"Breadcrumb"> {}
59+
BreadcrumbOptions,
60+
ThemingProps<"Breadcrumb"> { }
6361

6462
/**
6563
* CBreadcrumb is used to render a breadcrumb navigation landmark.
@@ -88,14 +86,14 @@ export const CBreadcrumb = defineComponent(
8886
return typeof props.separator === "string"
8987
? props.separator
9088
: isObjectComponent(props.separator!)
91-
? // TODO:
89+
? // TODO:
9290
// Add support for
9391
// object components. ATM,
9492
// This computed property will only
9593
// work for functional components provided as
9694
// separators
9795
h(() => props.separator!)
98-
: h(props.separator!)
96+
: h(props.separator!)
9997
}
10098
})
10199

@@ -199,7 +197,7 @@ interface BreadcrumbItemOptions extends BreadcrumbOptions {
199197

200198
export interface BreadcrumbItemProps
201199
extends BreadcrumbItemOptions,
202-
ChakraProps {}
200+
ChakraProps { }
203201

204202
export const CBreadcrumbItem = defineComponent(
205203
(props: BreadcrumbItemOptions, { attrs, slots }) => {

packages/c-button/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@
2929
"@chakra-ui/c-spinner": "workspace:*",
3030
"@chakra-ui/utils": "2.0.15",
3131
"@chakra-ui/vue-system": "workspace:*",
32-
"@chakra-ui/vue-utils": "workspace:*"
32+
"@chakra-ui/vue-utils": "workspace:*",
33+
"@chakra-ui/styled-system": "2.5.1"
3334
},
3435
"peerDependencies": {
3536
"vue": "3.2.47"

0 commit comments

Comments
 (0)