vueless 0.0.47 → 0.0.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vueless",
-  "version": "0.0.47",
+  "version": "0.0.49",
   "license": "MIT",
   "description": "Vue Styleless Component Framework.",
   "homepage": "https://vueless.com",

package/ui.form-calendar/index.vue

@@ -345,7 +345,7 @@ const isCurrentView = computed(() => ({
   year: currentView.value === VIEW.year,
 }));
 
-const currentLocale = computed(() => merge(props.config.i18n, tm("UCalendar")));
+const currentLocale = computed(() => merge(tm("UCalendar"), props.config.i18n));
 
 const locale = computed(() => {
   const { months, weekdays } = currentLocale.value;
@@ -367,16 +367,24 @@ const locale = computed(() => {
 const userFormatLocale = computed(() => {
   const { months, weekdays } = currentLocale.value;
 
+  const monthsLonghand = props.config.i18n?.months?.userFormat
+    ? months.userFormat
+    : months.longhand;
+
+  const weekdaysLonghand = props.config.i18n?.weekdays?.userFormat
+    ? weekdays.userFormat
+    : weekdays.longhand;
+
   // formatted locale
   return {
     ...currentLocale,
     months: {
       shorthand: getSortedLocale(months.shorthand, LOCALE_TYPE.month),
-      longhand: getSortedLocale(months.userFormat || months.longhand, LOCALE_TYPE.month),
+      longhand: getSortedLocale(monthsLonghand, LOCALE_TYPE.month),
     },
     weekdays: {
       shorthand: getSortedLocale(weekdays.shorthand, LOCALE_TYPE.day),
-      longhand: getSortedLocale(weekdays.userFormat || weekdays.longhand, LOCALE_TYPE.day),
+      longhand: getSortedLocale(weekdaysLonghand, LOCALE_TYPE.day),
     },
   };
 });

package/ui.form-date-picker/index.vue

@@ -53,6 +53,7 @@
 
 <script setup>
 import { computed, nextTick, ref } from "vue";
+import { merge } from "lodash-es";
 
 import UInput from "../ui.form-input";
 import UCalendar from "../ui.form-calendar";
@@ -258,7 +259,7 @@ function onBlur(event) {
 function formatUserDate(data) {
   if (props.dateFormat !== STANDARD_USER_FORMAT) return data;
 
-  const currentLocale = props.config.i18n || tm("UDatePicker");
+  const currentLocale = merge(tm("UDatePicker"), props.config.i18n);
 
   let prefix = "";
   const formattedDate = data.charAt(0).toUpperCase() + data.toLowerCase().slice(1);

package/ui.form-date-picker-range/index.vue

@@ -415,7 +415,7 @@ const localValue = computed({
 
 const isMobileDevice = computed(() => store.getters["breakpoint/isMobileDevice"]);
 const rangeInputName = computed(() => `rangeInput-${props.id}`);
-const currentLocale = computed(() => merge(props.config.i18n, tm("UDatePickerRange")));
+const currentLocale = computed(() => merge(tm("UDatePickerRange"), props.config.i18n));
 
 const locale = computed(() => {
   const { months, weekdays } = currentLocale.value;
@@ -437,16 +437,24 @@ const locale = computed(() => {
 const userFormatLocale = computed(() => {
   const { months, weekdays } = currentLocale.value;
 
+  const monthsLonghand = props.config.i18n?.months?.userFormat
+    ? months.userFormat
+    : months.longhand;
+
+  const weekdaysLonghand = props.config.i18n?.weekdays?.userFormat
+    ? weekdays.userFormat
+    : weekdays.longhand;
+
   // formatted locale
   return {
     ...currentLocale,
     months: {
       shorthand: getSortedLocale(months.shorthand, LOCALE_TYPE.month),
-      longhand: getSortedLocale(months.userFormat || months.longhand, LOCALE_TYPE.month),
+      longhand: getSortedLocale(monthsLonghand, LOCALE_TYPE.month),
     },
     weekdays: {
       shorthand: getSortedLocale(weekdays.shorthand, LOCALE_TYPE.day),
-      longhand: getSortedLocale(weekdays.userFormat || weekdays.longhand, LOCALE_TYPE.day),
+      longhand: getSortedLocale(weekdaysLonghand, LOCALE_TYPE.day),
     },
   };
 });

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "framework": "vue",
   "name": "vueless",
-  "version": "0.0.47",
+  "version": "0.0.49",
   "contributions": {
     "html": {
       "description-markup": "markdown",