vueless 1.2.5-beta.4 → 1.2.5-beta.6

package/index.d.ts

@@ -7,13 +7,14 @@ export {
   isSSR,
   isCSR,
   setTitle,
+  getStored,
   getRandomId,
   createDebounce,
   hasSlotContent
 } from "./utils/helper";
 export { isMac, isPWA, isIOS, isAndroid, isMobileApp, isWindows } from "./utils/platform";
 export { cx, cva, compose, getDefaults, setVuelessConfig, setColor, vuelessConfig } from "./utils/ui";
-export { getTheme, setTheme, resetTheme, normalizeThemeConfig, getStored, cssVar } from "./utils/theme";
+export { getTheme, setTheme, resetTheme, normalizeThemeConfig, cssVar } from "./utils/theme";
 export { getArgTypes, getSlotNames, getSlotsFragment, getSource, getDocsDescription } from "./utils/storybook";
 /* adapters */
 export { default as defaultEnLocale } from "./adapter.locale/locales/en";

package/index.ts

@@ -13,13 +13,14 @@ export {
   isSSR,
   isCSR,
   setTitle,
+  getStored,
   getRandomId,
   createDebounce,
   hasSlotContent
 } from "./utils/helper";
 export { isMac, isPWA, isIOS, isAndroid, isMobileApp, isWindows } from "./utils/platform";
 export { cx, cva, compose, getDefaults, setVuelessConfig, setColor, vuelessConfig } from "./utils/ui";
-export { getTheme, setTheme, resetTheme, normalizeThemeConfig, getStored, cssVar } from "./utils/theme";
+export { getTheme, setTheme, resetTheme, normalizeThemeConfig, cssVar } from "./utils/theme";
 export { getArgTypes, getSlotNames, getSlotsFragment, getSource, getDocsDescription } from "./utils/storybook";
 /* adapters */
 export { default as defaultEnLocale } from "./adapter.locale/locales/en";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vueless",
-  "version": "1.2.5-beta.4",
+  "version": "1.2.5-beta.6",
   "description": "Vue Styleless UI Component Library, powered by Tailwind CSS.",
   "author": "Johnny Grid <hello@vueless.com> (https://vueless.com)",
   "homepage": "https://vueless.com",

package/ui.container-accordion/tests/UAccordion.test.ts

@@ -73,14 +73,14 @@ describe("UAccordion", () => {
 
       const firstItem = component.findAllComponents(UAccordionItem)[0];
 
-      await firstItem.trigger("click");
+      await firstItem.find("[vl-child-key='title']").trigger("click");
 
       const updates = component.emitted("update:modelValue");
 
       expect(updates).toBeTruthy();
       expect(updates?.[0]).toEqual(["a"]);
 
-      await firstItem.trigger("click");
+      await firstItem.find("[vl-child-key='title']").trigger("click");
       const updates2 = component.emitted("update:modelValue");
 
       expect(updates2?.[1]).toEqual([null]);
@@ -103,14 +103,14 @@ describe("UAccordion", () => {
 
       const [firstItem, secondItem] = component.findAllComponents(UAccordionItem);
 
-      await firstItem.trigger("click");
-      await secondItem.trigger("click");
+      await firstItem.find("[vl-child-key='title']").trigger("click");
+      await secondItem.find("[vl-child-key='title']").trigger("click");
       const updates = component.emitted("update:modelValue");
 
       expect(updates?.[0]).toEqual([["a"]]);
       expect(updates?.[1]).toEqual([["a", "b"]]);
 
-      await firstItem.trigger("click");
+      await firstItem.find("[vl-child-key='title']").trigger("click");
       const updates2 = component.emitted("update:modelValue");
 
       expect(updates2?.[2]).toEqual([["b"]]);

package/ui.container-accordion-item/UAccordionItem.vue

@@ -42,8 +42,7 @@ const emit = defineEmits([
 ]);
 
 const wrapperRef = useTemplateRef<HTMLDivElement>("wrapper");
-const descriptionRef = useTemplateRef<HTMLDivElement>("description");
-const contentRef = useTemplateRef<HTMLDivElement>("content");
+const titleRef = useTemplateRef<HTMLDivElement>("title");
 
 const accordionSize = ref(toValue(getAccordionSize) || props.size);
 const accordionDisabled = ref(toValue(getAccordionDisabled) || props.disabled);
@@ -79,10 +78,9 @@ const toggleIconName = computed(() => {
 });
 
 function onClickItem(event: MouseEvent) {
-  const clickedInsideContent = contentRef.value?.contains(event.target as Node);
-  const clickedDescription = descriptionRef.value?.contains(event.target as Node);
+  const clickedOnTitle = titleRef.value?.contains(event.target as Node);
 
-  if (props.disabled || clickedDescription || clickedInsideContent) return;
+  if (!clickedOnTitle || props.disabled) return;
 
   emit("click", elementId, !isOpened.value);
 
@@ -123,7 +121,7 @@ const {
 <template>
   <div ref="wrapper" v-bind="wrapperAttrs" :data-test="getDataTest()" @click="onClickItem">
     <div v-bind="bodyAttrs">
-      <div v-bind="titleAttrs">
+      <div v-bind="titleAttrs" ref="title">
         {{ title }}
         <!--
           @slot Use it to add something instead of the toggle icon.
@@ -144,12 +142,11 @@ const {
       <div
         v-if="description"
         :id="`description-${elementId}`"
-        ref="description"
         v-bind="descriptionAttrs"
         v-text="description"
       />
 
-      <div v-if="isOpened && hasSlotContent(slots['default'])" ref="content" v-bind="contentAttrs">
+      <div v-if="isOpened && hasSlotContent(slots['default'])" v-bind="contentAttrs">
         <!-- @slot Use it to add accordion content. -->
         <slot />
       </div>

package/ui.container-accordion-item/tests/UAccordionItem.test.ts

@@ -171,7 +171,7 @@ describe("UAccordionItem", () => {
       expect(toggleElement.attributes("data-opened")).toBe("false");
 
       // Click to toggle
-      await component.trigger("click");
+      await component.find("[vl-key='title']").trigger("click");
 
       expect(toggleElement.attributes("data-opened")).toBe("true");
     });
@@ -190,12 +190,12 @@ describe("UAccordionItem", () => {
 
       expect(component.find(`.${slotClass}`).exists()).toBe(false);
 
-      await component.trigger("click");
+      await component.find("[vl-key='title']").trigger("click");
 
       expect(component.find(`.${slotClass}`).exists()).toBe(true);
       expect(component.find(`.${slotClass}`).text()).toBe(slotContent);
 
-      await component.trigger("click");
+      await component.find("[vl-key='title']").trigger("click");
 
       expect(component.find(`.${slotClass}`).exists()).toBe(false);
     });
@@ -217,7 +217,7 @@ describe("UAccordionItem", () => {
     it("does not render content wrapper when default slot is empty", async () => {
       const component = mount(UAccordionItem, { props: { name: "test" } });
 
-      await component.trigger("click");
+      await component.find("[vl-key='title']").trigger("click");
 
       expect(component.find("[vl-key='content']").exists()).toBe(false);
     });
@@ -235,7 +235,7 @@ describe("UAccordionItem", () => {
         },
       });
 
-      await component.trigger("click");
+      await component.find("[vl-key='title']").trigger("click");
 
       const emitted = component.emitted("click");
 
@@ -243,7 +243,7 @@ describe("UAccordionItem", () => {
       expect(emitted?.[0]).toEqual([id, true]);
 
       // Click again to toggle back
-      await component.trigger("click");
+      await component.find("[vl-key='title']").trigger("click");
 
       const emittedAgain = component.emitted("click");
 
@@ -281,13 +281,13 @@ describe("UAccordionItem", () => {
       expect(descriptionElement.classes()).not.toContain(openedClass);
 
       // Click to open
-      await component.trigger("click");
+      await component.find("[vl-key='title']").trigger("click");
 
       // Should be opened
       expect(descriptionElement.classes()).toContain(openedClass);
 
       // Click to close
-      await component.trigger("click");
+      await component.find("[vl-key='title']").trigger("click");
 
       // Should be closed again
       expect(descriptionElement.classes()).not.toContain(openedClass);

package/utils/helper.ts

@@ -184,3 +184,35 @@ export function isEmptyValue(value: object | null | undefined | string | unknown
     (typeof value === "object" && !Object.keys(value).length)
   );
 }
+
+/**
+ * Converts the given value to a number if possible.
+ *
+ * @param {unknown} value - The value to be converted to a number. Can be of any data type.
+ * @return {number | undefined} The numeric representation of the value if conversion is successful; otherwise, undefined.
+ */
+export function toNumber(value: unknown): number | undefined {
+  if (typeof value === "number") {
+    return value;
+  }
+
+  if (typeof value === "string" && value.trim() !== "") {
+    const number = Number(value);
+
+    if (!Number.isNaN(number)) {
+      return number;
+    }
+  }
+
+  return;
+}
+
+/**
+ * Get a stored value from local storage.
+ * @return string | undefined
+ */
+export function getStored(key: string) {
+  if (isSSR) return;
+
+  return localStorage.getItem(key) ?? undefined;
+}

package/utils/theme.ts

@@ -1,10 +1,11 @@
 import { cloneDeep, merge } from "lodash-es";
 
 import { vuelessConfig } from "./ui";
-import { isCSR, isSSR, setCookie, deleteCookie } from "./helper";
+import { isCSR, getStored, getCookie, setCookie, deleteCookie, toNumber } from "./helper";
 
 import {
   PX_IN_REM,
+  AUTO_MODE_KEY,
   COLOR_MODE_KEY,
   LIGHT_MODE_CLASS,
   DARK_MODE_CLASS,
@@ -34,7 +35,6 @@ import {
   DEFAULT_DISABLED_OPACITY,
   LETTER_SPACING,
   DEFAULT_LETTER_SPACING,
-  AUTO_MODE_KEY,
 } from "../constants";
 
 import type {
@@ -75,7 +75,7 @@ function toggleColorModeClass() {
   const colorMode = prefersColorSchemeDark.matches ? ColorMode.Dark : ColorMode.Light;
 
   setCookie(COLOR_MODE_KEY, colorMode);
-  localStorage.setItem(COLOR_MODE_KEY, colorMode);
+  setCookie(AUTO_MODE_KEY, String(Number(true)));
 
   document.documentElement.classList.toggle(DARK_MODE_CLASS, prefersColorSchemeDark.matches);
   document.documentElement.classList.toggle(LIGHT_MODE_CLASS, !prefersColorSchemeDark.matches);
@@ -92,8 +92,8 @@ function toggleColorModeClass() {
  * - `isColorModeAuto` {boolean}: Indicates whether the color mode is set to auto.
  */
 function setCSRColorMode(mode: `${ColorMode}`): SetColorMode {
-  const colorMode = mode || getStored(COLOR_MODE_KEY) || vuelessConfig.colorMode || ColorMode.Light;
-  const isCachedAutoMode = !!Number(getStored(AUTO_MODE_KEY) ?? 0);
+  const colorMode = mode || getCookie(COLOR_MODE_KEY) || vuelessConfig.colorMode || ColorMode.Light;
+  const isCachedAutoMode = !!Number(getCookie(AUTO_MODE_KEY) ?? 0);
 
   const isAutoMode = colorMode === ColorMode.Auto;
   const isSystemDarkMode = isAutoMode && prefersColorSchemeDark && prefersColorSchemeDark?.matches;
@@ -123,12 +123,14 @@ function setCSRColorMode(mode: `${ColorMode}`): SetColorMode {
     currentColorMode = isDarkMode ? ColorMode.Dark : ColorMode.Light;
   }
 
-  if (mode) {
+  /* Define color mode cookies to be used in both CSR and SSR */
+  if (mode || getCookie(AUTO_MODE_KEY) === null) {
     setCookie(COLOR_MODE_KEY, currentColorMode);
     setCookie(AUTO_MODE_KEY, String(Number(isAutoMode)));
 
-    localStorage.setItem(COLOR_MODE_KEY, currentColorMode);
-    localStorage.setItem(AUTO_MODE_KEY, String(Number(isAutoMode)));
+    if (mode !== ColorMode.Auto && prefersColorSchemeDark) {
+      prefersColorSchemeDark.removeEventListener("change", toggleColorModeClass);
+    }
   }
 
   return {
@@ -164,16 +166,6 @@ export function cssVar(name: string) {
   return (isCSR && getComputedStyle(document.documentElement).getPropertyValue(name)) || undefined;
 }
 
-/**
- * Get a stored value from local storage.
- * @return string | undefined
- */
-export function getStored(key: string) {
-  if (isSSR) return;
-
-  return localStorage.getItem(key) ?? undefined;
-}
-
 /**
  * Resets all theme data by clearing cookies and localStorage.
  * This removes all stored theme preferences including color mode, colors, text sizes,
@@ -207,40 +199,6 @@ export function resetTheme() {
   });
 }
 
-/**
- * Normalizes the provided theme configuration object into a structured format.
- *
- * @param {object} theme - The theme configuration object to normalize.
- * @return {MergedThemeConfig}
- */
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function normalizeThemeConfig(theme: any): MergedThemeConfig {
-  return {
-    colorMode: theme.colorMode,
-    isColorModeAuto: theme.isColorModeAuto,
-    primary: theme.primary,
-    neutral: theme.neutral,
-    text: {
-      xs: toNumber(theme.text?.xs),
-      sm: toNumber(theme.text?.sm),
-      md: toNumber(theme.text?.md),
-      lg: toNumber(theme.text?.lg),
-    },
-    outline: {
-      sm: toNumber(theme.outline?.sm),
-      md: toNumber(theme.outline?.md),
-      lg: toNumber(theme.outline?.lg),
-    },
-    rounding: {
-      sm: toNumber(theme.rounding?.sm),
-      md: toNumber(theme.rounding?.md),
-      lg: toNumber(theme.rounding?.lg),
-    },
-    letterSpacing: toNumber(theme.letterSpacing),
-    disabledOpacity: toNumber(theme.disabledOpacity),
-  };
-}
-
 /**
  * Retrieves the current theme configuration.
  * @return ThemeConfig - current theme configuration
@@ -363,6 +321,45 @@ export function setTheme(config: ThemeConfig = {}) {
   });
 }
 
+/**
+ * Normalizes the provided theme configuration object into a structured format.
+ *
+ * @param {object} theme - The theme configuration object to normalize.
+ * @return {MergedThemeConfig}
+ */
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function normalizeThemeConfig(theme: any): MergedThemeConfig {
+  return {
+    colorMode: theme.colorMode,
+    isColorModeAuto: theme.isColorModeAuto,
+    primary: theme.primary,
+    neutral: theme.neutral,
+    text: {
+      xs: toNumber(theme.text?.xs),
+      sm: toNumber(theme.text?.sm),
+      md: toNumber(theme.text?.md),
+      lg: toNumber(theme.text?.lg),
+    },
+    outline: {
+      sm: toNumber(theme.outline?.sm),
+      md: toNumber(theme.outline?.md),
+      lg: toNumber(theme.outline?.lg),
+    },
+    rounding: {
+      sm: toNumber(theme.rounding?.sm),
+      md: toNumber(theme.rounding?.md),
+      lg: toNumber(theme.rounding?.lg),
+    },
+    letterSpacing: toNumber(theme.letterSpacing),
+    disabledOpacity: toNumber(theme.disabledOpacity),
+  };
+}
+
+/**
+ * Determines if the provided color mode configuration has a primary color
+ * that differs from the default color mode configuration.
+ * @return {boolean}
+ */
 function hasPrimaryColor(
   colorModeConfig: Partial<VuelessCssVariables> | undefined,
   defaultColorModeConfig: Partial<VuelessCssVariables>,
@@ -639,14 +636,6 @@ function getDisabledOpacity(disabledOpacity?: ThemeConfig["disabledOpacity"]) {
   return mergedOpacity;
 }
 
-/**
- * Converts a primitive value into an object with the primitive value assigned to a key "md".
- * If the provided value is already an object, it returns a deeply cloned copy of that object.
- */
-function primitiveToObject(value: unknown): object {
-  return typeof value === "object" ? cloneDeep(value as object) : { md: value };
-}
-
 /**
  * Generate and apply Vueless CSS variables.
  * @return string - Vueless CSS variables string.
@@ -745,23 +734,9 @@ function setCSSVariables(
 }
 
 /**
- * Converts the given value to a number if possible.
- *
- * @param {unknown} value - The value to be converted to a number. Can be of any data type.
- * @return {number | undefined} The numeric representation of the value if conversion is successful; otherwise, undefined.
+ * Converts a primitive value into an object with the primitive value assigned to a key "md".
+ * If the provided value is already an object, it returns a deeply cloned copy of that object.
  */
-function toNumber(value: unknown): number | undefined {
-  if (typeof value === "number") {
-    return value;
-  }
-
-  if (typeof value === "string" && value.trim() !== "") {
-    const number = Number(value);
-
-    if (!Number.isNaN(number)) {
-      return number;
-    }
-  }
-
-  return;
+function primitiveToObject(value: unknown): object {
+  return typeof value === "object" ? cloneDeep(value as object) : { md: value };
 }