@choice-ui/react 1.6.0 → 1.6.1

package/dist/components/calendar/dist/index.js

@@ -1222,54 +1222,71 @@ function parseCompositeFormat(input, format10, locale) {
   }
 }
 function removeWeekdayFromFormat(format10) {
-  return format10.replace(/\s*[eEic]{1,4}\s*/g, "").replace(/\s+/g, " ").replace(/\s*([,，、])\s*/g, "$1").trim();
+  return format10.replace(/\s*[eEic]{1,4}\s*/g, "").replace(/MMM(?!M)/g, "M月").replace(/\s+/g, " ").replace(/\s*([,，、])\s*/g, "$1").trim();
 }
 function removeWeekdayFromInput(input, locale) {
   try {
-    const weekdayNames = generateWeekdayNames2(locale);
-    if (weekdayNames.length === 0) {
-      return input;
+    const { longNames, shortNames } = generateWeekdayNames2(locale);
+    let result = input;
+    if (longNames.length > 0) {
+      const sortedLongNames = longNames.sort((a, b) => b.length - a.length);
+      const longPattern = new RegExp(`\\s*(${sortedLongNames.join("|")})\\s*`, "gi");
+      result = result.replace(longPattern, " ");
+    }
+    if (shortNames.length > 0) {
+      const sortedShortNames = shortNames.sort((a, b) => b.length - a.length);
+      const singleCharNames = sortedShortNames.filter((name) => name.length === 1);
+      const multiCharNames = sortedShortNames.filter((name) => name.length > 1);
+      if (multiCharNames.length > 0) {
+        const multiPattern = new RegExp(`\\s*(${multiCharNames.join("|")})\\s*`, "gi");
+        result = result.replace(multiPattern, " ");
+      }
+      if (singleCharNames.length > 0) {
+        const singlePattern = new RegExp(
+          `([（(「【])(${singleCharNames.join("|")})([）)」】])`,
+          "gi"
+        );
+        result = result.replace(singlePattern, "$1$3");
+      }
     }
-    const sortedNames = weekdayNames.sort((a, b) => b.length - a.length);
-    const pattern = new RegExp(`\\s*(${sortedNames.join("|")})\\s*`, "gi");
-    return input.replace(pattern, "").replace(/\s+/g, " ").trim();
+    return result.replace(/\s+/g, " ").trim();
   } catch {
     return input.replace(/\s*(星期[一二三四五六日天]|周[一二三四五六日天])\s*/g, "").replace(/\s+/g, " ").trim();
   }
 }
 function generateWeekdayNames2(locale) {
-  const names = [];
+  const longNames = [];
+  const shortNames = [];
   try {
     const baseDate = new Date(2024, 0, 7);
     for (let i = 0; i < 7; i++) {
       const currentDate = new Date(baseDate);
       currentDate.setDate(baseDate.getDate() + i);
       const fullName = format(currentDate, "eeee", { locale });
-      if (fullName && fullName !== "eeee") {
-        names.push(fullName);
+      if (fullName && fullName !== "eeee" && !fullName.includes("e")) {
+        longNames.push(fullName);
       }
       const shortName = format(currentDate, "eee", { locale });
-      if (shortName && shortName !== "eee" && shortName !== fullName) {
-        names.push(shortName);
-      }
-      const veryShortName = format(currentDate, "ee", { locale });
-      if (veryShortName && veryShortName !== "ee" && veryShortName !== shortName && veryShortName !== fullName) {
-        names.push(veryShortName);
+      if (shortName && shortName !== "eee" && shortName !== fullName && !shortName.includes("e")) {
+        shortNames.push(shortName);
       }
       const localeKey = getLocaleKey(locale);
-      if (localeKey === "zh") {
-        const weekFormat = format(currentDate, "eeee", { locale }).replace("星期", "周");
+      if (localeKey === "zh" && fullName) {
+        const weekFormat = fullName.replace("星期", "周");
         if (weekFormat !== fullName) {
-          names.push(weekFormat);
+          shortNames.push(weekFormat);
         }
       }
     }
-    return [...new Set(names)].filter(
-      (name) => name && name.length > 0 && !name.includes("e") && // 过滤掉格式化失败的情况
-      name !== "Invalid Date"
+    const filterNames = (names) => [...new Set(names)].filter(
+      (name) => name && name.length > 0 && !/^\d+$/.test(name) && name !== "Invalid Date"
     );
+    return {
+      longNames: filterNames(longNames),
+      shortNames: filterNames(shortNames)
+    };
   } catch {
-    return [];
+    return { longNames: [], shortNames: [] };
   }
 }
 function parseInvalidFormattedDate(input, targetFormat, locale) {

package/dist/components/calendar/src/utils/parsers/parsers.js

@@ -501,54 +501,71 @@ function parseCompositeFormat(input, format2, locale) {
   }
 }
 function removeWeekdayFromFormat(format2) {
-  return format2.replace(/\s*[eEic]{1,4}\s*/g, "").replace(/\s+/g, " ").replace(/\s*([,，、])\s*/g, "$1").trim();
+  return format2.replace(/\s*[eEic]{1,4}\s*/g, "").replace(/MMM(?!M)/g, "M月").replace(/\s+/g, " ").replace(/\s*([,，、])\s*/g, "$1").trim();
 }
 function removeWeekdayFromInput(input, locale) {
   try {
-    const weekdayNames = generateWeekdayNames(locale);
-    if (weekdayNames.length === 0) {
-      return input;
+    const { longNames, shortNames } = generateWeekdayNames(locale);
+    let result = input;
+    if (longNames.length > 0) {
+      const sortedLongNames = longNames.sort((a, b) => b.length - a.length);
+      const longPattern = new RegExp(`\\s*(${sortedLongNames.join("|")})\\s*`, "gi");
+      result = result.replace(longPattern, " ");
     }
-    const sortedNames = weekdayNames.sort((a, b) => b.length - a.length);
-    const pattern = new RegExp(`\\s*(${sortedNames.join("|")})\\s*`, "gi");
-    return input.replace(pattern, "").replace(/\s+/g, " ").trim();
+    if (shortNames.length > 0) {
+      const sortedShortNames = shortNames.sort((a, b) => b.length - a.length);
+      const singleCharNames = sortedShortNames.filter((name) => name.length === 1);
+      const multiCharNames = sortedShortNames.filter((name) => name.length > 1);
+      if (multiCharNames.length > 0) {
+        const multiPattern = new RegExp(`\\s*(${multiCharNames.join("|")})\\s*`, "gi");
+        result = result.replace(multiPattern, " ");
+      }
+      if (singleCharNames.length > 0) {
+        const singlePattern = new RegExp(
+          `([（(「【])(${singleCharNames.join("|")})([）)」】])`,
+          "gi"
+        );
+        result = result.replace(singlePattern, "$1$3");
+      }
+    }
+    return result.replace(/\s+/g, " ").trim();
   } catch {
     return input.replace(/\s*(星期[一二三四五六日天]|周[一二三四五六日天])\s*/g, "").replace(/\s+/g, " ").trim();
   }
 }
 function generateWeekdayNames(locale) {
-  const names = [];
+  const longNames = [];
+  const shortNames = [];
   try {
     const baseDate = new Date(2024, 0, 7);
     for (let i = 0; i < 7; i++) {
       const currentDate = new Date(baseDate);
       currentDate.setDate(baseDate.getDate() + i);
       const fullName = format(currentDate, "eeee", { locale });
-      if (fullName && fullName !== "eeee") {
-        names.push(fullName);
+      if (fullName && fullName !== "eeee" && !fullName.includes("e")) {
+        longNames.push(fullName);
       }
       const shortName = format(currentDate, "eee", { locale });
-      if (shortName && shortName !== "eee" && shortName !== fullName) {
-        names.push(shortName);
-      }
-      const veryShortName = format(currentDate, "ee", { locale });
-      if (veryShortName && veryShortName !== "ee" && veryShortName !== shortName && veryShortName !== fullName) {
-        names.push(veryShortName);
+      if (shortName && shortName !== "eee" && shortName !== fullName && !shortName.includes("e")) {
+        shortNames.push(shortName);
       }
       const localeKey = getLocaleKey(locale);
-      if (localeKey === "zh") {
-        const weekFormat = format(currentDate, "eeee", { locale }).replace("星期", "周");
+      if (localeKey === "zh" && fullName) {
+        const weekFormat = fullName.replace("星期", "周");
         if (weekFormat !== fullName) {
-          names.push(weekFormat);
+          shortNames.push(weekFormat);
         }
       }
     }
-    return [...new Set(names)].filter(
-      (name) => name && name.length > 0 && !name.includes("e") && // 过滤掉格式化失败的情况
-      name !== "Invalid Date"
+    const filterNames = (names) => [...new Set(names)].filter(
+      (name) => name && name.length > 0 && !/^\d+$/.test(name) && name !== "Invalid Date"
     );
+    return {
+      longNames: filterNames(longNames),
+      shortNames: filterNames(shortNames)
+    };
   } catch {
-    return [];
+    return { longNames: [], shortNames: [] };
   }
 }
 function parseInvalidFormattedDate(input, targetFormat, locale) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@choice-ui/react",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "A desktop-first React UI component library built for professional desktop applications with comprehensive documentation",
   "sideEffects": false,
   "type": "module",