Merge pull request #245 from chakra-ui/fix/extendTheme

codebender828 · web-flow · commit 2230ae385686 · 2023-01-10T21:13:26.000+08:00
fix(theme): fix extendChakra theme
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -45,7 +45,7 @@ const ChakraUIVuePlugin: Plugin = {
     // 2. Parse theme tokens to CSS variables
     // 3. Inject all CSS variables as theme object
     const theme: Theme | (Omit<Theme, "components"> & { components: Dict }) =
-      options.extendTheme || options.isBaseTheme ? baseTheme : defaultTheme
+      options.extendTheme ?? (options.isBaseTheme ? baseTheme : defaultTheme)
     const computedTheme = computed<WithCSSVar<ThemeOverride>>(() =>
       toCSSVar(theme)
     )

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ const ChakraUIVuePlugin: Plugin = {`
`45`	`45`	`// 2. Parse theme tokens to CSS variables`
`46`	`46`	`// 3. Inject all CSS variables as theme object`
`47`	`47`	`const theme: Theme \| (Omit<Theme, "components"> & { components: Dict }) =`
`48`		`- options.extendTheme \|\| options.isBaseTheme ? baseTheme : defaultTheme`
	`48`	`+ options.extendTheme ?? (options.isBaseTheme ? baseTheme : defaultTheme)`
`49`	`49`	`const computedTheme = computed<WithCSSVar<ThemeOverride>>(() =>`
`50`	`50`	`toCSSVar(theme)`
`51`	`51`	`)`