vueless 0.0.46 → 0.0.48

package/package.json

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

package/ui.form-calendar/index.vue

@@ -148,6 +148,7 @@
 
 <script setup>
 import { computed, onMounted, ref, watch } from "vue";
+import { merge } from "lodash-es";
 
 import UIcon from "../ui.image-icon";
 import UButton from "../ui.button";
@@ -344,40 +345,40 @@ const isCurrentView = computed(() => ({
   year: currentView.value === VIEW.year,
 }));
 
+const currentLocale = computed(() => merge(props.config.i18n, tm("UCalendar")));
+
 const locale = computed(() => {
-  const currentLocale = props.config.i18n || tm("UCalendar");
+  const { months, weekdays } = currentLocale.value;
 
-  const formattedLocale = {
-    ...currentLocale,
+  // formatted locale
+  return {
+    ...currentLocale.value,
     months: {
-      shorthand: getSortedLocale(currentLocale.months.shorthand, LOCALE_TYPE.month),
-      longhand: getSortedLocale(currentLocale.months.longhand, LOCALE_TYPE.month),
+      shorthand: getSortedLocale(months.shorthand, LOCALE_TYPE.month),
+      longhand: getSortedLocale(months.longhand, LOCALE_TYPE.month),
     },
     weekdays: {
-      shorthand: getSortedLocale(currentLocale.weekdays.shorthand, LOCALE_TYPE.day),
-      longhand: getSortedLocale(currentLocale.weekdays.longhand, LOCALE_TYPE.day),
+      shorthand: getSortedLocale(weekdays.shorthand, LOCALE_TYPE.day),
+      longhand: getSortedLocale(weekdays.longhand, LOCALE_TYPE.day),
     },
   };
-
-  return formattedLocale;
 });
 
 const userFormatLocale = computed(() => {
-  const currentLocale = props.config.i18n || tm("UCalendar");
+  const { months, weekdays } = currentLocale.value;
 
-  const formattedLocale = {
+  // formatted locale
+  return {
     ...currentLocale,
     months: {
-      shorthand: getSortedLocale(currentLocale.months.shorthand, LOCALE_TYPE.month),
-      longhand: getSortedLocale(currentLocale.months.userFormat, LOCALE_TYPE.month),
+      shorthand: getSortedLocale(months.shorthand, LOCALE_TYPE.month),
+      longhand: getSortedLocale(months.userFormat || months.longhand, LOCALE_TYPE.month),
     },
     weekdays: {
-      shorthand: getSortedLocale(currentLocale.weekdays.shorthand, LOCALE_TYPE.day),
-      longhand: getSortedLocale(currentLocale.weekdays.userFormat, LOCALE_TYPE.day),
+      shorthand: getSortedLocale(weekdays.shorthand, LOCALE_TYPE.day),
+      longhand: getSortedLocale(weekdays.userFormat || weekdays.longhand, LOCALE_TYPE.day),
     },
   };
-
-  return formattedLocale;
 });
 
 const isTimepickerEnabled = computed(() => {

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

@@ -180,6 +180,7 @@
 <script setup>
 import { computed, watch, ref, nextTick } from "vue";
 import { useStore } from "vuex";
+import { merge } from "lodash-es";
 
 import UIcon from "../ui.image-icon";
 import UInput from "../ui.form-input";
@@ -413,42 +414,41 @@ 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 locale = computed(() => {
-  const currentLocale = props.config.i18n || tm("UDatePickerRange");
-  const formattedLocale = {
-    ...currentLocale,
+  const { months, weekdays } = currentLocale.value;
+
+  // formatted locale
+  return {
+    ...currentLocale.value,
     months: {
-      shorthand: getSortedLocale(currentLocale.months.shorthand, LOCALE_TYPE.month),
-      longhand: getSortedLocale(currentLocale.months.longhand, LOCALE_TYPE.month),
+      shorthand: getSortedLocale(months.shorthand, LOCALE_TYPE.month),
+      longhand: getSortedLocale(months.longhand, LOCALE_TYPE.month),
     },
     weekdays: {
-      shorthand: getSortedLocale(currentLocale.weekdays.shorthand, LOCALE_TYPE.day),
-      longhand: getSortedLocale(currentLocale.weekdays.longhand, LOCALE_TYPE.day),
+      shorthand: getSortedLocale(weekdays.shorthand, LOCALE_TYPE.day),
+      longhand: getSortedLocale(weekdays.longhand, LOCALE_TYPE.day),
     },
   };
-
-  return formattedLocale;
 });
 
 const userFormatLocale = computed(() => {
-  const currentLocale = props.config.i18n || tm("UDatePickerRange");
+  const { months, weekdays } = currentLocale.value;
 
-  const formattedLocale = {
+  // formatted locale
+  return {
     ...currentLocale,
     months: {
-      shorthand: getSortedLocale(currentLocale.months.shorthand, LOCALE_TYPE.month),
-      longhand: getSortedLocale(currentLocale.months.userFormat, LOCALE_TYPE.month),
+      shorthand: getSortedLocale(months.shorthand, LOCALE_TYPE.month),
+      longhand: getSortedLocale(months.userFormat || months.longhand, LOCALE_TYPE.month),
     },
     weekdays: {
-      shorthand: getSortedLocale(currentLocale.weekdays.shorthand, LOCALE_TYPE.day),
-      longhand: getSortedLocale(currentLocale.weekdays.userFormat, LOCALE_TYPE.day),
+      shorthand: getSortedLocale(weekdays.shorthand, LOCALE_TYPE.day),
+      longhand: getSortedLocale(weekdays.userFormat || weekdays.longhand, LOCALE_TYPE.day),
     },
   };
-
-  return formattedLocale;
 });
 
 const periods = computed(() => [

package/web-types.json

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