daisyui 2.0.9 → 2.1.0

package/src/index.js

@@ -9,8 +9,7 @@ const styledRtl = require("../dist/styled.rtl");
 const utilitiesUnstyled = require("../dist/utilities-unstyled");
 const utilitiesStyled = require("../dist/utilities-styled");
 const themes = require("./colors/themes");
-const colorNames = require("./colors/colorNames");
-const Color = require("color");
+const colorFunctions = require("./colors/functions");
 
 const mainFunction = ({ addBase, addComponents, addUtilities, config }) => {
   let diasyuiIncludedItems = [];
@@ -64,144 +63,10 @@ const mainFunction = ({ addBase, addComponents, addUtilities, config }) => {
   }
   addComponents(file);
 
-  let includedThemesObj = new Object();
+  const themeInjector = colorFunctions.injectThemes(addBase, config, themes)
+  themeInjector;
 
-  function convertThemeColorsToHsl(input) {
-    let resultObj = {};
-    if (typeof input === "object" && input !== null) {
-      Object.entries(input).forEach(([rule, value]) => {
-        if (colorNames.hasOwnProperty(rule)) {
-          const hslArray = Color(value).hsl().round().array();
-          resultObj[colorNames[rule]] =
-            hslArray[0] + " " + hslArray[1] + "%" + " " + hslArray[2] + "%";
-        } else {
-          resultObj[rule] = value;
-          // console.log(input)
-        }
-      });
-      return resultObj;
-    }
-    return input;
-  }
-
-  // add light themes
-  if (config("daisyui.themes") == false) {
-    Object.entries(themes).forEach(([theme, index]) => {
-      includedThemesObj[theme] = convertThemeColorsToHsl(themes[theme]);
-    });
-  }
-
-  // add default themes
-  if (config("daisyui.themes") != false) {
-    Object.entries(themes).forEach(([theme, index]) => {
-      includedThemesObj[theme] = convertThemeColorsToHsl(themes[theme]);
-    });
-  }
-
-  // add custom themes
-  if (Array.isArray(config("daisyui.themes"))) {
-    config("daisyui.themes").forEach((item, index) => {
-      if (typeof item === "object" && item !== null) {
-        Object.entries(item).forEach(([customThemeName, customThemevalue]) => {
-          includedThemesObj["[data-theme=" + customThemeName + "]"] =
-            convertThemeColorsToHsl(customThemevalue);
-        });
-      }
-    });
-  }
-
-  let themeOrder = [];
-  if (Array.isArray(config("daisyui.themes"))) {
-    config("daisyui.themes").forEach((theme, index) => {
-      if (typeof theme === "object" && theme !== null) {
-        Object.entries(theme).forEach(([customThemeName, customThemevalue]) => {
-          themeOrder.push(customThemeName);
-        });
-      } else if (
-        includedThemesObj.hasOwnProperty("[data-theme=" + theme + "]")
-      ) {
-        themeOrder.push(theme);
-      }
-    });
-  } else if (config("daisyui.themes") != false) {
-    themeOrder = [
-      "light",
-      "dark",
-      "cupcake",
-      "bumblebee",
-      "emerald",
-      "corporate",
-      "synthwave",
-      "retro",
-      "cyberpunk",
-      "valentine",
-      "halloween",
-      "garden",
-      "forest",
-      "aqua",
-      "lofi",
-      "pastel",
-      "fantasy",
-      "wireframe",
-      "black",
-      "luxury",
-      "dracula",
-      "cmyk",
-    ];
-  } else if (config("daisyui.themes") == false) {
-    themeOrder.push("light");
-  }
-
-  // inject themes in order
-  themeOrder.forEach((themeName, index) => {
-    if (index === 0) {
-      // first theme as root
-      addBase({
-        [":root"]: includedThemesObj["[data-theme=" + themeName + "]"],
-      });
-    } else if (index === 1) {
-      // auto dark
-      if (config("daisyui.darkTheme")) {
-        if (
-          themeOrder[0] != config("daisyui.darkTheme") &&
-          themeOrder.includes(config("daisyui.darkTheme"))
-        ) {
-          addBase({
-            ["@media (prefers-color-scheme: dark)"]: {
-              [":root"]:
-                includedThemesObj[
-                `[data-theme=${config("daisyui.darkTheme")}]`
-                ],
-            },
-          });
-        }
-      } else {
-        if (themeOrder[0] != "dark" && themeOrder.includes("dark")) {
-          addBase({
-            ["@media (prefers-color-scheme: dark)"]: {
-              [":root"]: includedThemesObj["[data-theme=dark]"],
-            },
-          });
-        }
-      }
-      // theme 0 with name
-      addBase({
-        ["[data-theme=" + themeOrder[0] + "]"]:
-          includedThemesObj["[data-theme=" + themeOrder[0] + "]"],
-      });
-      // theme 1 with name
-      addBase({
-        ["[data-theme=" + themeOrder[1] + "]"]:
-          includedThemesObj["[data-theme=" + themeOrder[1] + "]"],
-      });
-    } else {
-      addBase({
-        ["[data-theme=" + themeName + "]"]:
-          includedThemesObj["[data-theme=" + themeName + "]"],
-      });
-    }
-  });
-  diasyuiIncludedItems.push("themes[" + themeOrder.length + "]");
+  diasyuiIncludedItems.push("themes[" + themeInjector.themeOrder.length + "]");
 
   // inject @utilities style needed by components
   if (config("daisyui.utils") != false) {

package/src/colors/windi.js

@@ -1,12 +0,0 @@
-const colorValues = require("./colorNames");
-
-let colorObject = {
-  transparent: "transparent",
-  current: "currentColor",
-};
-
-for (const [key, item] of Object.entries(colorValues)) {
-  colorObject[key] = `hsla(var(${item}) / var(--tw-bg-opacity, 1))`;
-}
-
-module.exports = colorObject;