vueless 0.0.102 → 0.0.103

package/package.json

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

package/ui.container-modal-confirm/index.vue

@@ -169,7 +169,8 @@ const isShownModal = computed({
   set: (value) => emit("update:modelValue", value),
 });
 
-const currentLocale = computed(() => merge(tm("UModalConfirm"), props.config.i18n));
+const i18nGlobal = tm(UModalConfirm);
+const currentLocale = computed(() => merge(defaultConfig.i18n, i18nGlobal, props.config.i18n));
 
 function closeModal() {
   isShownModal.value = false;

package/ui.data-list/index.vue

@@ -218,7 +218,8 @@ const {
 } = useAttrs(props);
 const { tm } = useLocale();
 
-const currentLocale = computed(() => merge(tm("UDataList"), props.config.i18n));
+const i18nGlobal = tm(UDataListName);
+const currentLocale = computed(() => merge(defaultConfig.i18n, i18nGlobal, props.config.i18n));
 
 function onDragMove(event) {
   const isDisabledNestingItem = event.draggedContext.element.isDisabledNesting;

package/ui.data-table/index.vue

@@ -427,7 +427,8 @@ const isFooterSticky = computed(
     isCheckedMoreOneTableItems.value,
 );
 
-const currentLocale = computed(() => merge(tm("UTable"), props.config.i18n));
+const i18nGlobal = tm(UTable);
+const currentLocale = computed(() => merge(defaultConfig.i18n, i18nGlobal, props.config.i18n));
 
 const normalizedColumns = computed(() => TableService.normalizeColumns(props.columns));
 

package/ui.dropdown-list/index.vue

@@ -242,7 +242,8 @@ const { tm } = useLocale();
 
 defineExpose({ pointerSet, pointerBackward, pointerForward, pointerReset, addPointerElement });
 
-const currentLocale = computed(() => merge(tm("UDropdownList"), props.config.i18n));
+const i18nGlobal = tm(UDropdownList);
+const currentLocale = computed(() => merge(defaultConfig.i18n, i18nGlobal, props.config.i18n));
 
 const addOptionKeyCombination = computed(() => {
   return isMac ? "(⌘ + Enter)" : "(Ctrl + Enter)";

package/ui.form-calendar/index.vue

@@ -348,7 +348,8 @@ const isCurrentView = computed(() => ({
   year: currentView.value === VIEW.year,
 }));
 
-const currentLocale = computed(() => merge(tm("UCalendar"), props.config.i18n));
+const i18nGlobal = tm(UCalendar);
+const currentLocale = computed(() => merge(defaultConfig.i18n, i18nGlobal, props.config.i18n));
 
 const locale = computed(() => {
   const { months, weekdays } = currentLocale.value;
@@ -370,13 +371,15 @@ const locale = computed(() => {
 const userFormatLocale = computed(() => {
   const { months, weekdays } = currentLocale.value;
 
-  const monthsLonghand = props.config.i18n?.months?.userFormat
-    ? months.userFormat
-    : months.longhand;
+  const monthsLonghand =
+    Boolean(props.config.i18n?.months?.userFormat) || Boolean(i18nGlobal?.months?.userFormat)
+      ? months.userFormat
+      : months.longhand;
 
-  const weekdaysLonghand = props.config.i18n?.weekdays?.userFormat
-    ? weekdays.userFormat
-    : weekdays.longhand;
+  const weekdaysLonghand =
+    Boolean(props.config.i18n?.weekdays?.userFormat) || Boolean(i18nGlobal?.weekdays?.userFormat)
+      ? weekdays.userFormat
+      : weekdays.longhand;
 
   // formatted locale
   return {

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

@@ -259,7 +259,8 @@ function onBlur(event) {
 function formatUserDate(data) {
   if (props.dateFormat !== STANDARD_USER_FORMAT) return data;
 
-  const currentLocale = merge(tm("UDatePicker"), props.config.i18n);
+  const i18nGlobal = tm(UDatePicker);
+  const currentLocale = computed(() => merge(defaultConfig.i18n, i18nGlobal, props.config.i18n));
 
   let prefix = "";
   const formattedDate = data.charAt(0).toUpperCase() + data.toLowerCase().slice(1);
@@ -273,15 +274,15 @@ function formatUserDate(data) {
   const isTomorrow = isSameDay(addDays(today, 1), selectedDate);
 
   if (isToday) {
-    prefix = currentLocale.today;
+    prefix = currentLocale.value.today;
   }
 
   if (isYesterday) {
-    prefix = currentLocale.yesterday;
+    prefix = currentLocale.value.yesterday;
   }
 
   if (isTomorrow) {
-    prefix = currentLocale.tomorrow;
+    prefix = currentLocale.value.tomorrow;
   }
 
   return prefix ? `${prefix}, ${formattedDateWithoutDay}` : formattedDate;

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

@@ -432,8 +432,10 @@ const localValue = computed({
 });
 
 const { isMobileBreakpoint } = useBreakpoint();
+const i18nGlobal = tm(UDatePickerRange);
+
 const rangeInputName = computed(() => `rangeInput-${props.id}`);
-const currentLocale = computed(() => merge(tm("UDatePickerRange"), props.config.i18n));
+const currentLocale = computed(() => merge(defaultConfig.i18n, i18nGlobal, props.config.i18n));
 
 const locale = computed(() => {
   const { months, weekdays } = currentLocale.value;
@@ -455,13 +457,15 @@ const locale = computed(() => {
 const userFormatLocale = computed(() => {
   const { months, weekdays } = currentLocale.value;
 
-  const monthsLonghand = props.config.i18n?.months?.userFormat
-    ? months.userFormat
-    : months.longhand;
+  const monthsLonghand =
+    Boolean(props.config.i18n?.months?.userFormat) || Boolean(i18nGlobal?.months?.userFormat)
+      ? months.userFormat
+      : months.longhand;
 
-  const weekdaysLonghand = props.config.i18n?.weekdays?.userFormat
-    ? weekdays.userFormat
-    : weekdays.longhand;
+  const weekdaysLonghand =
+    Boolean(props.config.i18n?.weekdays?.userFormat) || Boolean(i18nGlobal?.weekdays?.userFormat)
+      ? weekdays.userFormat
+      : weekdays.longhand;
 
   // formatted locale
   return {

package/ui.form-input-file/index.vue

@@ -184,7 +184,8 @@ const {
   inputAttrs,
 } = useAttrs(props);
 
-const currentLocale = computed(() => merge(tm("UInputFile"), props.config.i18n));
+const i18nGlobal = tm(UInputFile);
+const currentLocale = computed(() => merge(defaultConfig.i18n, i18nGlobal, props.config.i18n));
 
 const currentFiles = computed({
   get: () => props.modelValue,

package/ui.form-select/index.vue

@@ -500,7 +500,8 @@ const {
   dropdownListAttrs,
 } = useAttrs(props, { isTop, isOpen, selectedLabel });
 
-const currentLocale = computed(() => merge(tm("USelect"), props.config.i18n));
+const i18nGlobal = tm(USelect);
+const currentLocale = computed(() => merge(defaultConfig.i18n, i18nGlobal, props.config.i18n));
 
 const inputPlaceholder = computed(() => {
   const message = currentLocale.value.addMore;

package/ui.form-switch/index.vue

@@ -158,7 +158,8 @@ const emit = defineEmits(["update:modelValue"]);
 
 const { tm } = useLocale();
 
-const currentLocale = computed(() => merge(tm("USwitch"), props.config.i18n));
+const i18nGlobal = tm(USwitch);
+const currentLocale = computed(() => merge(defaultConfig.i18n, i18nGlobal, props.config.i18n));
 
 const checkedValue = computed({
   get: () => props.modelValue,

package/ui.notify/index.vue

@@ -142,7 +142,8 @@ const notifyPositionStyles = ref({});
 
 const notificationsWrapperRef = ref(null);
 
-const currentLocale = computed(() => merge(tm("UNotify"), props.config.i18n));
+const i18nGlobal = tm(UNotify);
+const currentLocale = computed(() => merge(defaultConfig.i18n, i18nGlobal, props.config.i18n));
 
 onMounted(() => {
   window.addEventListener("resize", setPosition, { passive: true });

package/web-types.json

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