vueless 0.0.820 → 0.0.822

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vueless",
-  "version": "0.0.820",
+  "version": "0.0.822",
   "license": "MIT",
   "description": "Vue Styleless UI Component Library, powered by Tailwind CSS.",
   "keywords": [

package/ui.data-table/UTableRow.vue

@@ -296,7 +296,7 @@ const { getDataTest } = useUI<Config>(defaultConfig);
         v-bind="attrs.bodySelectedDateDividerAttrs.value"
         :config="
           getMergedConfig({
-            defaultConfig: attrs.bodyDateDividerAttrs.value.config,
+            defaultConfig: attrs.bodySelectedDateDividerAttrs.value.config,
             globalConfig: dateDividerData.config,
           }) as UDividerConfig
         "

package/ui.form-date-picker-range/useUserFormat.ts

@@ -2,6 +2,7 @@ import { computed } from "vue";
 
 import { isSameMonth } from "../ui.form-calendar/utilDate.ts";
 import { formatDate, parseDate } from "../ui.form-calendar/utilCalendar.ts";
+import { getTokenIndexes } from "./utilDateRange.ts";
 
 import type { Ref } from "vue";
 import type { IsPeriod, SortedLocale } from "./types.ts";
@@ -28,6 +29,8 @@ export function useUserFormat(
         ? parseDate(localValue.value.to, dateFormat, locale.value)
         : null;
 
+    let fromFormat = userDateFormat;
+
     if (isDefaultTitle && from && to) {
       let startMonthName = userFormatLocale.value.months.longhand[from.getMonth()];
       const endMonthName = userFormatLocale.value.months.longhand[to.getMonth()];
@@ -40,8 +43,6 @@ export function useUserFormat(
       const isDateToSameMonth = isSameMonth(from, to);
       const isDateToSameYear = from.getFullYear() === to.getFullYear();
 
-      let fromFormat = userDateFormat;
-
       if (isDateToSameMonth && isDateToSameYear) {
         fromFormat = fromFormat.replace(/[YyMmFnU]/g, "");
       }
@@ -50,6 +51,8 @@ export function useUserFormat(
         fromFormat = fromFormat.replace(/[Yy]/g, "");
       }
 
+      fromFormat = fromFormat.slice(...getTokenIndexes(fromFormat));
+
       const fromTitle = from ? formatDate(from, fromFormat, userFormatLocale.value) : "";
       const toTitle = to ? formatDate(to, userDateFormat, userFormatLocale.value) : "";
 
@@ -61,7 +64,9 @@ export function useUserFormat(
     }
 
     if (isPeriod.value.quarter || isPeriod.value.year) {
-      const fromFormat = userDateFormat.replace(/[Yy]/g, "");
+      fromFormat = fromFormat.replace(/[Yy]/g, "");
+
+      fromFormat = fromFormat.slice(...getTokenIndexes(fromFormat));
 
       const fromTitle = from ? formatDate(from, fromFormat, userFormatLocale.value) : "";
       const toTitle = to ? formatDate(to, userDateFormat, userFormatLocale.value) : "";

package/ui.form-date-picker-range/utilDateRange.ts

@@ -11,6 +11,7 @@ import {
   getEndOfYear,
   getStartOfYear,
 } from "../ui.form-calendar/utilDate.ts";
+import { formats } from "../ui.form-calendar/utilFormatting.ts";
 
 export interface DatePeriodRange {
   title: string | number;
@@ -116,3 +117,34 @@ export function getWeekDateList(date: Date, monthShortLocales: string[] = []) {
 
   return weeks;
 }
+
+export function getTokenIndexes(inputString: string) {
+  let firstIndex = -1;
+  let lastIndex = 0;
+  let isEscaped = false;
+
+  const tokens = Object.keys(formats);
+
+  for (let i = 0; i < inputString.length; i++) {
+    const char = inputString[i];
+
+    if (char === "\\" && !isEscaped) {
+      isEscaped = true;
+      continue;
+    }
+
+    if (!isEscaped && tokens.includes(char)) {
+      if (firstIndex === -1) {
+        firstIndex = i;
+      }
+
+      lastIndex = i + 1;
+    }
+
+    if (isEscaped) {
+      isEscaped = false;
+    }
+  }
+
+  return [firstIndex, lastIndex];
+}