fix(theme): add optional chaining for custom theme checks

themesberg · Jan 22, 2025 · ec5d379 · ec5d379
1 parent 80e6565
commit ec5d379
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/packages/ui/src/helpers/resolve-theme.ts b/packages/ui/src/helpers/resolve-theme.ts
@@ -91,11 +91,11 @@ export function resolveTheme<T>(
 
   let theme = baseTheme;
 
-  if (_custom.length) {
+  if (_custom?.length) {
     theme = deepMergeStrings(twMerge)(baseTheme, ...custom) as T;
   }
 
-  if (_applyThemeList?.length && _custom.length) {
+  if (_applyThemeList?.length && _custom?.length) {
     const finalApplyTheme = cloneWithValue<T, ApplyTheme>(baseTheme, "merge");
 
     let run = false;