@pandacss/studio 0.0.0-dev-20231031135158 → 0.0.0-dev-20231031144201
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pandacss/studio",
|
|
3
|
-
"version": "0.0.0-dev-
|
|
3
|
+
"version": "0.0.0-dev-20231031144201",
|
|
4
4
|
"description": "The automated token documentation for Panda CSS",
|
|
5
5
|
"main": "dist/studio.js",
|
|
6
6
|
"module": "dist/studio.mjs",
|
|
@@ -43,12 +43,12 @@
|
|
|
43
43
|
"react": "18.2.0",
|
|
44
44
|
"react-dom": "18.2.0",
|
|
45
45
|
"vite": "4.4.11",
|
|
46
|
-
"@pandacss/config": "0.0.0-dev-
|
|
47
|
-
"@pandacss/logger": "0.0.0-dev-
|
|
48
|
-
"@pandacss/node": "0.0.0-dev-
|
|
49
|
-
"@pandacss/shared": "0.0.0-dev-
|
|
50
|
-
"@pandacss/token-dictionary": "0.0.0-dev-
|
|
51
|
-
"@pandacss/types": "0.0.0-dev-
|
|
46
|
+
"@pandacss/config": "0.0.0-dev-20231031144201",
|
|
47
|
+
"@pandacss/logger": "0.0.0-dev-20231031144201",
|
|
48
|
+
"@pandacss/node": "0.0.0-dev-20231031144201",
|
|
49
|
+
"@pandacss/shared": "0.0.0-dev-20231031144201",
|
|
50
|
+
"@pandacss/token-dictionary": "0.0.0-dev-20231031144201",
|
|
51
|
+
"@pandacss/types": "0.0.0-dev-20231031144201"
|
|
52
52
|
},
|
|
53
53
|
"devDependencies": {
|
|
54
54
|
"@types/react": "18.2.22",
|
|
@@ -24,9 +24,9 @@ export function cva(config) {
|
|
|
24
24
|
return mergeCss(variantCss, compoundVariantCss)
|
|
25
25
|
}
|
|
26
26
|
|
|
27
|
-
function merge(
|
|
28
|
-
const override = defaults(
|
|
29
|
-
const variantKeys = uniq(
|
|
27
|
+
function merge(__cva) {
|
|
28
|
+
const override = defaults(__cva.config)
|
|
29
|
+
const variantKeys = uniq(__cva.variantKeys, Object.keys(variants))
|
|
30
30
|
return cva({
|
|
31
31
|
base: mergeCss(base, override.base),
|
|
32
32
|
variants: Object.fromEntries(
|
|
@@ -10,7 +10,7 @@ export const composeShouldForwardProps = (tag, shouldForwardProp) =>
|
|
|
10
10
|
export const composeCvaFn = (cvaA, cvaB) => {
|
|
11
11
|
if (cvaA && !cvaB) return cvaA
|
|
12
12
|
if (!cvaA && cvaB) return cvaB
|
|
13
|
-
if ((cvaA.__cva__ && cvaB.__cva__) || (cvaA.__recipe__ && cvaB.__recipe__)) return cvaA.merge(cvaB
|
|
13
|
+
if ((cvaA.__cva__ && cvaB.__cva__) || (cvaA.__recipe__ && cvaB.__recipe__)) return cvaA.merge(cvaB)
|
|
14
14
|
const error = new TypeError('Cannot merge cva with recipe. Please use either cva or recipe.')
|
|
15
15
|
TypeError.captureStackTrace?.(error)
|
|
16
16
|
throw error
|