Fixed issue when not user format locale was used for formatting and f…

…ixed input's style
vuelessjs · Jan 22, 2025 · 58e508f · 58e508f
1 parent a31ad6d
commit 58e508f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/ui.form-date-picker-range/config.ts b/src/ui.form-date-picker-range/config.ts
@@ -104,11 +104,11 @@ export default /*tw*/ {
   },
   rangeInputFirst: {
     base: "{UInput} {>rangeInput}",
-    wrapper: "rounded-r-none",
+    wrapper: "!rounded-r-none",
   },
   rangeInputLast: {
     base: "{UInput} {>rangeInput}",
-    wrapper: "rounded-l-none",
+    wrapper: "!rounded-l-none",
   },
   rangeInputError: "text-xs font-normal leading-none mt-2 text-center text-red-500",
   datepickerCalendar: {

diff --git a/src/ui.form-date-picker-range/useUserFormat.ts b/src/ui.form-date-picker-range/useUserFormat.ts
@@ -53,20 +53,20 @@ export function useUserFormat(
       const fromTitle = from ? formatDate(from, fromFormat, userFormatLocale.value) : "";
       const toTitle = to ? formatDate(to, userDateFormat, userFormatLocale.value) : "";
 
-      title = `${fromTitle} – ${toTitle}`;
+      title = `${fromTitle.trim()} – ${toTitle.trim()}`;
     }
 
     if (isPeriod.value.month) {
-      title = formatDate(from, "F Y", locale.value);
+      title = formatDate(from, "F Y", userFormatLocale.value);
     }
 
     if (isPeriod.value.quarter || isPeriod.value.year) {
       const fromFormat = userDateFormat.replace(/[Yy]/g, "");
 
-      const fromTitle = from ? formatDate(from, fromFormat, locale.value) : "";
-      const toTitle = to ? formatDate(to, userDateFormat, locale.value) : "";
+      const fromTitle = from ? formatDate(from, fromFormat, userFormatLocale.value) : "";
+      const toTitle = to ? formatDate(to, userDateFormat, userFormatLocale.value) : "";
 
-      title = `${fromTitle} – ${toTitle}`;
+      title = `${fromTitle.trim()} – ${toTitle.trim()}`;
     }
 
     return title;