Cleanup code

tailwindlabs · Sep 6, 2024 · cea86ed · cea86ed
1 parent c45ed2b
commit cea86ed
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/tailwindcss/src/compat/plugin-functions.ts b/packages/tailwindcss/src/compat/plugin-functions.ts
@@ -211,14 +211,14 @@ function readFromCss(
   // the `DEFAULT` key from the list of possible values. If there is no
   // `DEFAULT` in the list, there is no match so return `null`.
   if (path[path.length - 1] === 'DEFAULT') {
-    return [(obj?.DEFAULT ?? null) as any, optionsObj.DEFAULT ?? 0] as const
+    return [(obj?.DEFAULT ?? null) as any, optionsObj.DEFAULT ?? ThemeOptions.NONE] as const
   }
 
   // The request looked like `theme('animation.spin')` and was turned into a
   // lookup for `--animation-spin-*` which had only one entry which means it
   // should be returned directly.
   if ('DEFAULT' in obj && Object.keys(obj).length === 1) {
-    return [obj.DEFAULT as any, optionsObj.DEFAULT ?? 0] as const
+    return [obj.DEFAULT as any, optionsObj.DEFAULT ?? ThemeOptions.NONE] as const
   }
 
   // Attach the CSS values to the object for later use. This object could be

diff --git a/packages/tailwindcss/src/theme.ts b/packages/tailwindcss/src/theme.ts
@@ -66,11 +66,11 @@ export class Theme {
   }
 
   hasDefault(key: string): boolean {
-    return ((this.values.get(key)?.options ?? 0) & ThemeOptions.DEFAULT) === ThemeOptions.DEFAULT
+    return (this.getOptions(key) & ThemeOptions.DEFAULT) === ThemeOptions.DEFAULT
   }
 
   getOptions(key: string) {
-    return this.values.get(key)?.options ?? 0
+    return this.values.get(key)?.options ?? ThemeOptions.NONE
   }
 
   entries() {