@nextui-org/theme 0.0.0-dev-v2-20230715151949 → 0.0.0-dev-v2-20230717232039

package/dist/{chunk-HK6FLMPL.mjs → chunk-7MCHEQXT.mjs}

@@ -31,25 +31,17 @@ var defaultLayout = {
     large: "0px 0px 30px 0px rgb(0 0 0 / 0.04), 0px 30px 60px 0px rgb(0 0 0 / 0.12), 0px 0px 1px 0px rgb(0 0 0 / 0.3)"
   }
 };
-var lightLayout = {
-  ...defaultLayout
-};
+var lightLayout = {};
 var darkLayout = {
-  ...defaultLayout,
   boxShadow: {
     small: "0px 0px 5px 0px rgb(0 0 0 / 0.05), 0px 2px 10px 0px rgb(0 0 0 / 0.2), inset 0px 0px 1px 0px rgb(255 255 255 / 0.15)",
     medium: "0px 0px 15px 0px rgb(0 0 0 / 0.06), 0px 2px 30px 0px rgb(0 0 0 / 0.22), inset 0px 0px 1px 0px rgb(255 255 255 / 0.15)",
     large: "0px 0px 30px 0px rgb(0 0 0 / 0.07), 0px 30px 60px 0px rgb(0 0 0 / 0.26), inset 0px 0px 1px 0px rgb(255 255 255 / 0.15)"
   }
 };
-var layouts = {
-  light: lightLayout,
-  dark: darkLayout
-};
 
 export {
   defaultLayout,
   lightLayout,
-  darkLayout,
-  layouts
+  darkLayout
 };

package/dist/{chunk-NAXYVM2Y.mjs → chunk-GIVXQT7B.mjs}

@@ -18,9 +18,8 @@ import {
 import {
   darkLayout,
   defaultLayout,
-  layouts,
   lightLayout
-} from "./chunk-HK6FLMPL.mjs";
+} from "./chunk-7MCHEQXT.mjs";
 import {
   animations
 } from "./chunk-DMASP6FA.mjs";
@@ -107,7 +106,7 @@ var resolveConfig = (themes = {}, defaultTheme, prefix) => {
   });
   return resolved;
 };
-var corePlugin = (themes = {}, defaultTheme, prefix, omitCommonColors) => {
+var corePlugin = (themes = {}, defaultTheme, prefix, addCommonColors) => {
   const resolved = resolveConfig(themes, defaultTheme, prefix);
   const minSizes = {
     "unit-1": `var(--${prefix}-spacing-unit)`,
@@ -143,7 +142,7 @@ var corePlugin = (themes = {}, defaultTheme, prefix, omitCommonColors) => {
       theme: {
         extend: {
           colors: {
-            ...omitCommonColors ? {} : commonColors,
+            ...addCommonColors ? commonColors : {},
             ...resolved.colors
           },
           height: {
@@ -208,13 +207,27 @@ var corePlugin = (themes = {}, defaultTheme, prefix, omitCommonColors) => {
   );
 };
 var nextui = (config = {}) => {
-  const themeObject = config.themes;
+  const {
+    themes: themeObject = {},
+    defaultTheme = "light",
+    layout: userLayout,
+    defaultExtendTheme = "light",
+    prefix: defaultPrefix = DEFAULT_PREFIX,
+    addCommonColors = false
+  } = config;
   const userLightColors = get(themeObject, "light.colors", {});
   const userDarkColors = get(themeObject, "dark.colors", {});
-  const defaultTheme = config.defaultTheme || "light";
-  const defaultExtendTheme = config.defaultExtendTheme || "light";
-  const defaultPrefix = config.prefix || DEFAULT_PREFIX;
-  const omitCommonColors = config.omitCommonColors || false;
+  const defaultLayoutObj = userLayout && typeof userLayout === "object" ? deepMerge(defaultLayout, userLayout) : defaultLayout;
+  const baseLayouts = {
+    light: {
+      ...defaultLayoutObj,
+      ...lightLayout
+    },
+    dark: {
+      ...defaultLayoutObj,
+      ...darkLayout
+    }
+  };
   let otherThemes = omit(themeObject, ["light", "dark"]) || {};
   forEach(otherThemes, ({ extend, colors, layout }, themeName) => {
     const baseTheme = extend && isBaseTheme(extend) ? extend : defaultExtendTheme;
@@ -222,15 +235,18 @@ var nextui = (config = {}) => {
       otherThemes[themeName].colors = deepMerge(semanticColors[baseTheme], colors);
     }
     if (layout && typeof layout === "object") {
-      otherThemes[themeName].layout = deepMerge(extend ? layouts[extend] : defaultLayout, layout);
+      otherThemes[themeName].layout = deepMerge(
+        extend ? baseLayouts[extend] : defaultLayoutObj,
+        layout
+      );
     }
   });
   const light = {
-    layout: deepMerge(lightLayout, get(themeObject, "light.layout", {})),
+    layout: deepMerge(baseLayouts.light, get(themeObject, "light.layout", {})),
     colors: deepMerge(semanticColors.light, userLightColors)
   };
   const dark = {
-    layout: deepMerge(darkLayout, get(themeObject, "dark.layout", {})),
+    layout: deepMerge(baseLayouts.dark, get(themeObject, "dark.layout", {})),
     colors: deepMerge(semanticColors.dark, userDarkColors)
   };
   const themes = {
@@ -238,7 +254,7 @@ var nextui = (config = {}) => {
     dark,
     ...otherThemes
   };
-  return corePlugin(themes, defaultTheme, defaultPrefix, omitCommonColors);
+  return corePlugin(themes, defaultTheme, defaultPrefix, addCommonColors);
 };
 
 export {

package/dist/default-layout.d.ts

@@ -4,9 +4,5 @@ import './colors/types.js';
 declare const defaultLayout: LayoutTheme;
 declare const lightLayout: LayoutTheme;
 declare const darkLayout: LayoutTheme;
-declare const layouts: {
-    light: LayoutTheme;
-    dark: LayoutTheme;
-};
 
-export { darkLayout, defaultLayout, layouts, lightLayout };
+export { darkLayout, defaultLayout, lightLayout };

package/dist/default-layout.js

@@ -22,7 +22,6 @@ var default_layout_exports = {};
 __export(default_layout_exports, {
   darkLayout: () => darkLayout,
   defaultLayout: () => defaultLayout,
-  layouts: () => layouts,
   lightLayout: () => lightLayout
 });
 module.exports = __toCommonJS(default_layout_exports);
@@ -58,25 +57,17 @@ var defaultLayout = {
     large: "0px 0px 30px 0px rgb(0 0 0 / 0.04), 0px 30px 60px 0px rgb(0 0 0 / 0.12), 0px 0px 1px 0px rgb(0 0 0 / 0.3)"
   }
 };
-var lightLayout = {
-  ...defaultLayout
-};
+var lightLayout = {};
 var darkLayout = {
-  ...defaultLayout,
   boxShadow: {
     small: "0px 0px 5px 0px rgb(0 0 0 / 0.05), 0px 2px 10px 0px rgb(0 0 0 / 0.2), inset 0px 0px 1px 0px rgb(255 255 255 / 0.15)",
     medium: "0px 0px 15px 0px rgb(0 0 0 / 0.06), 0px 2px 30px 0px rgb(0 0 0 / 0.22), inset 0px 0px 1px 0px rgb(255 255 255 / 0.15)",
     large: "0px 0px 30px 0px rgb(0 0 0 / 0.07), 0px 30px 60px 0px rgb(0 0 0 / 0.26), inset 0px 0px 1px 0px rgb(255 255 255 / 0.15)"
   }
 };
-var layouts = {
-  light: lightLayout,
-  dark: darkLayout
-};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   darkLayout,
   defaultLayout,
-  layouts,
   lightLayout
 });

package/dist/default-layout.mjs

@@ -1,12 +1,10 @@
 import {
   darkLayout,
   defaultLayout,
-  layouts,
   lightLayout
-} from "./chunk-HK6FLMPL.mjs";
+} from "./chunk-7MCHEQXT.mjs";
 export {
   darkLayout,
   defaultLayout,
-  layouts,
   lightLayout
 };

package/dist/index.js

@@ -6350,21 +6350,14 @@ var defaultLayout = {
     large: "0px 0px 30px 0px rgb(0 0 0 / 0.04), 0px 30px 60px 0px rgb(0 0 0 / 0.12), 0px 0px 1px 0px rgb(0 0 0 / 0.3)"
   }
 };
-var lightLayout = {
-  ...defaultLayout
-};
+var lightLayout = {};
 var darkLayout = {
-  ...defaultLayout,
   boxShadow: {
     small: "0px 0px 5px 0px rgb(0 0 0 / 0.05), 0px 2px 10px 0px rgb(0 0 0 / 0.2), inset 0px 0px 1px 0px rgb(255 255 255 / 0.15)",
     medium: "0px 0px 15px 0px rgb(0 0 0 / 0.06), 0px 2px 30px 0px rgb(0 0 0 / 0.22), inset 0px 0px 1px 0px rgb(255 255 255 / 0.15)",
     large: "0px 0px 30px 0px rgb(0 0 0 / 0.07), 0px 30px 60px 0px rgb(0 0 0 / 0.26), inset 0px 0px 1px 0px rgb(255 255 255 / 0.15)"
   }
 };
-var layouts = {
-  light: lightLayout,
-  dark: darkLayout
-};
 
 // src/plugin.ts
 var DEFAULT_PREFIX = "nextui";
@@ -6437,7 +6430,7 @@ var resolveConfig = (themes = {}, defaultTheme, prefix) => {
   });
   return resolved;
 };
-var corePlugin = (themes = {}, defaultTheme, prefix, omitCommonColors) => {
+var corePlugin = (themes = {}, defaultTheme, prefix, addCommonColors) => {
   const resolved = resolveConfig(themes, defaultTheme, prefix);
   const minSizes = {
     "unit-1": `var(--${prefix}-spacing-unit)`,
@@ -6473,7 +6466,7 @@ var corePlugin = (themes = {}, defaultTheme, prefix, omitCommonColors) => {
       theme: {
         extend: {
           colors: {
-            ...omitCommonColors ? {} : commonColors,
+            ...addCommonColors ? commonColors : {},
             ...resolved.colors
           },
           height: {
@@ -6538,13 +6531,27 @@ var corePlugin = (themes = {}, defaultTheme, prefix, omitCommonColors) => {
   );
 };
 var nextui = (config = {}) => {
-  const themeObject = config.themes;
+  const {
+    themes: themeObject = {},
+    defaultTheme = "light",
+    layout: userLayout,
+    defaultExtendTheme = "light",
+    prefix: defaultPrefix = DEFAULT_PREFIX,
+    addCommonColors = false
+  } = config;
   const userLightColors = (0, import_lodash.default)(themeObject, "light.colors", {});
   const userDarkColors = (0, import_lodash.default)(themeObject, "dark.colors", {});
-  const defaultTheme = config.defaultTheme || "light";
-  const defaultExtendTheme = config.defaultExtendTheme || "light";
-  const defaultPrefix = config.prefix || DEFAULT_PREFIX;
-  const omitCommonColors = config.omitCommonColors || false;
+  const defaultLayoutObj = userLayout && typeof userLayout === "object" ? (0, import_deepmerge.default)(defaultLayout, userLayout) : defaultLayout;
+  const baseLayouts = {
+    light: {
+      ...defaultLayoutObj,
+      ...lightLayout
+    },
+    dark: {
+      ...defaultLayoutObj,
+      ...darkLayout
+    }
+  };
   let otherThemes = (0, import_lodash2.default)(themeObject, ["light", "dark"]) || {};
   (0, import_lodash3.default)(otherThemes, ({ extend, colors: colors2, layout }, themeName) => {
     const baseTheme = extend && isBaseTheme(extend) ? extend : defaultExtendTheme;
@@ -6552,15 +6559,18 @@ var nextui = (config = {}) => {
       otherThemes[themeName].colors = (0, import_deepmerge.default)(semanticColors[baseTheme], colors2);
     }
     if (layout && typeof layout === "object") {
-      otherThemes[themeName].layout = (0, import_deepmerge.default)(extend ? layouts[extend] : defaultLayout, layout);
+      otherThemes[themeName].layout = (0, import_deepmerge.default)(
+        extend ? baseLayouts[extend] : defaultLayoutObj,
+        layout
+      );
     }
   });
   const light2 = {
-    layout: (0, import_deepmerge.default)(lightLayout, (0, import_lodash.default)(themeObject, "light.layout", {})),
+    layout: (0, import_deepmerge.default)(baseLayouts.light, (0, import_lodash.default)(themeObject, "light.layout", {})),
     colors: (0, import_deepmerge.default)(semanticColors.light, userLightColors)
   };
   const dark = {
-    layout: (0, import_deepmerge.default)(darkLayout, (0, import_lodash.default)(themeObject, "dark.layout", {})),
+    layout: (0, import_deepmerge.default)(baseLayouts.dark, (0, import_lodash.default)(themeObject, "dark.layout", {})),
     colors: (0, import_deepmerge.default)(semanticColors.dark, userDarkColors)
   };
   const themes = {
@@ -6568,7 +6578,7 @@ var nextui = (config = {}) => {
     dark,
     ...otherThemes
   };
-  return corePlugin(themes, defaultTheme, defaultPrefix, omitCommonColors);
+  return corePlugin(themes, defaultTheme, defaultPrefix, addCommonColors);
 };
 
 // src/index.ts

package/dist/index.mjs

@@ -106,7 +106,7 @@ import {
 import "./chunk-6AEINX52.mjs";
 import {
   nextui
-} from "./chunk-NAXYVM2Y.mjs";
+} from "./chunk-GIVXQT7B.mjs";
 import "./chunk-XA5ALA4E.mjs";
 import "./chunk-DYIIRM5B.mjs";
 import "./chunk-DI2L75XK.mjs";
@@ -130,7 +130,7 @@ import {
 } from "./chunk-G4RCK475.mjs";
 import "./chunk-KUNVFLXJ.mjs";
 import "./chunk-M63AFAHO.mjs";
-import "./chunk-HK6FLMPL.mjs";
+import "./chunk-7MCHEQXT.mjs";
 import {
   mappedSpacingScaleKeys,
   spacingScaleKeys

package/dist/plugin.js

@@ -647,12 +647,6 @@ function createSpacingUnits(prefix) {
   return result;
 }
 
-// src/utils/classes.ts
-var baseStyles = (prefix) => ({
-  color: `hsl(var(--${prefix}-foreground))`,
-  backgroundColor: `hsl(var(--${prefix}-background))`
-});
-
 // src/default-layout.ts
 var defaultLayout = {
   spacingUnit: 4,
@@ -686,21 +680,20 @@ var defaultLayout = {
     large: "0px 0px 30px 0px rgb(0 0 0 / 0.04), 0px 30px 60px 0px rgb(0 0 0 / 0.12), 0px 0px 1px 0px rgb(0 0 0 / 0.3)"
   }
 };
-var lightLayout = {
-  ...defaultLayout
-};
+var lightLayout = {};
 var darkLayout = {
-  ...defaultLayout,
   boxShadow: {
     small: "0px 0px 5px 0px rgb(0 0 0 / 0.05), 0px 2px 10px 0px rgb(0 0 0 / 0.2), inset 0px 0px 1px 0px rgb(255 255 255 / 0.15)",
     medium: "0px 0px 15px 0px rgb(0 0 0 / 0.06), 0px 2px 30px 0px rgb(0 0 0 / 0.22), inset 0px 0px 1px 0px rgb(255 255 255 / 0.15)",
     large: "0px 0px 30px 0px rgb(0 0 0 / 0.07), 0px 30px 60px 0px rgb(0 0 0 / 0.26), inset 0px 0px 1px 0px rgb(255 255 255 / 0.15)"
   }
 };
-var layouts = {
-  light: lightLayout,
-  dark: darkLayout
-};
+
+// src/utils/classes.ts
+var baseStyles = (prefix) => ({
+  color: `hsl(var(--${prefix}-foreground))`,
+  backgroundColor: `hsl(var(--${prefix}-background))`
+});
 
 // src/plugin.ts
 var DEFAULT_PREFIX = "nextui";
@@ -773,7 +766,7 @@ var resolveConfig = (themes = {}, defaultTheme, prefix) => {
   });
   return resolved;
 };
-var corePlugin = (themes = {}, defaultTheme, prefix, omitCommonColors) => {
+var corePlugin = (themes = {}, defaultTheme, prefix, addCommonColors) => {
   const resolved = resolveConfig(themes, defaultTheme, prefix);
   const minSizes = {
     "unit-1": `var(--${prefix}-spacing-unit)`,
@@ -809,7 +802,7 @@ var corePlugin = (themes = {}, defaultTheme, prefix, omitCommonColors) => {
       theme: {
         extend: {
           colors: {
-            ...omitCommonColors ? {} : commonColors,
+            ...addCommonColors ? commonColors : {},
             ...resolved.colors
           },
           height: {
@@ -874,13 +867,27 @@ var corePlugin = (themes = {}, defaultTheme, prefix, omitCommonColors) => {
   );
 };
 var nextui = (config = {}) => {
-  const themeObject = config.themes;
+  const {
+    themes: themeObject = {},
+    defaultTheme = "light",
+    layout: userLayout,
+    defaultExtendTheme = "light",
+    prefix: defaultPrefix = DEFAULT_PREFIX,
+    addCommonColors = false
+  } = config;
   const userLightColors = (0, import_lodash.default)(themeObject, "light.colors", {});
   const userDarkColors = (0, import_lodash.default)(themeObject, "dark.colors", {});
-  const defaultTheme = config.defaultTheme || "light";
-  const defaultExtendTheme = config.defaultExtendTheme || "light";
-  const defaultPrefix = config.prefix || DEFAULT_PREFIX;
-  const omitCommonColors = config.omitCommonColors || false;
+  const defaultLayoutObj = userLayout && typeof userLayout === "object" ? (0, import_deepmerge.default)(defaultLayout, userLayout) : defaultLayout;
+  const baseLayouts = {
+    light: {
+      ...defaultLayoutObj,
+      ...lightLayout
+    },
+    dark: {
+      ...defaultLayoutObj,
+      ...darkLayout
+    }
+  };
   let otherThemes = (0, import_lodash2.default)(themeObject, ["light", "dark"]) || {};
   (0, import_lodash3.default)(otherThemes, ({ extend, colors: colors2, layout }, themeName) => {
     const baseTheme = extend && isBaseTheme(extend) ? extend : defaultExtendTheme;
@@ -888,15 +895,18 @@ var nextui = (config = {}) => {
       otherThemes[themeName].colors = (0, import_deepmerge.default)(semanticColors[baseTheme], colors2);
     }
     if (layout && typeof layout === "object") {
-      otherThemes[themeName].layout = (0, import_deepmerge.default)(extend ? layouts[extend] : defaultLayout, layout);
+      otherThemes[themeName].layout = (0, import_deepmerge.default)(
+        extend ? baseLayouts[extend] : defaultLayoutObj,
+        layout
+      );
     }
   });
   const light = {
-    layout: (0, import_deepmerge.default)(lightLayout, (0, import_lodash.default)(themeObject, "light.layout", {})),
+    layout: (0, import_deepmerge.default)(baseLayouts.light, (0, import_lodash.default)(themeObject, "light.layout", {})),
     colors: (0, import_deepmerge.default)(semanticColors.light, userLightColors)
   };
   const dark = {
-    layout: (0, import_deepmerge.default)(darkLayout, (0, import_lodash.default)(themeObject, "dark.layout", {})),
+    layout: (0, import_deepmerge.default)(baseLayouts.dark, (0, import_lodash.default)(themeObject, "dark.layout", {})),
     colors: (0, import_deepmerge.default)(semanticColors.dark, userDarkColors)
   };
   const themes = {
@@ -904,7 +914,7 @@ var nextui = (config = {}) => {
     dark,
     ...otherThemes
   };
-  return corePlugin(themes, defaultTheme, defaultPrefix, omitCommonColors);
+  return corePlugin(themes, defaultTheme, defaultPrefix, addCommonColors);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/plugin.mjs

@@ -1,6 +1,6 @@
 import {
   nextui
-} from "./chunk-NAXYVM2Y.mjs";
+} from "./chunk-GIVXQT7B.mjs";
 import "./chunk-XA5ALA4E.mjs";
 import "./chunk-DYIIRM5B.mjs";
 import "./chunk-DI2L75XK.mjs";
@@ -12,7 +12,7 @@ import "./chunk-QZTWGJ72.mjs";
 import "./chunk-G4RCK475.mjs";
 import "./chunk-KUNVFLXJ.mjs";
 import "./chunk-M63AFAHO.mjs";
-import "./chunk-HK6FLMPL.mjs";
+import "./chunk-7MCHEQXT.mjs";
 import "./chunk-WA5F6AED.mjs";
 import "./chunk-DMASP6FA.mjs";
 import "./chunk-IAS3SFA4.mjs";

package/dist/types.d.ts

@@ -104,7 +104,7 @@ type ConfigTheme = {
 type ConfigThemes = Record<string, ConfigTheme>;
 /**
  * The NextUI config.
- * @see https://nextui.org/docs/theme/customize-theme
+ * @see https://nextui.org/docs/customization/customize-theme
  */
 type NextUIPluginConfig = {
     /**
@@ -116,7 +116,11 @@ type NextUIPluginConfig = {
      * If true, the common nextui colors (e.g. "blue", "green", "purple") will not be extended on the theme.
      * @default false
      */
-    omitCommonColors?: boolean;
+    addCommonColors?: boolean;
+    /**
+     * Common layout definitions. These definitions are applied to all themes.
+     */
+    layout?: LayoutTheme;
     /**
      * The theme definitions.
      */
@@ -130,7 +134,7 @@ type NextUIPluginConfig = {
      * The default theme to extend.
      * @default "light"
      */
-    defaultExtendTheme?: "light" | "dark";
+    defaultExtendTheme?: DefaultThemeType;
 };
 
 export { BaseThemeUnit, ConfigTheme, ConfigThemes, DefaultThemeType, FontThemeUnit, LayoutTheme, NextUIPluginConfig, SpacingScale, SpacingScaleKeys, mappedSpacingScaleKeys, spacingScaleKeys };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nextui-org/theme",
-  "version": "0.0.0-dev-v2-20230715151949",
+  "version": "0.0.0-dev-v2-20230717232039",
   "description": "The default theme for NextUI components",
   "keywords": [
     "theme",