axidio-styleguide-library1-v2 0.3.5 → 0.3.6

package/fesm2022/axidio-styleguide-library1-v2.mjs

@@ -7952,42 +7952,42 @@ class HorizontalGroupedBarWithScrollZoomComponent extends ComponentUniqueId {
     formatXLabelText(d, data, metaData, subgroups, self, isMobile) {
         // Check if we're on mobile or tablet
         const isSmallScreen = window.innerWidth < 992; // Less than 992px (mobile or tablet)
+        // Helper to extract and format week number
+        const extractWeekNumber = (text) => {
+            const match = text.match(/(?:week|wk|w)\s*(\d+)/i);
+            return match ? `W${match[1]}` : null;
+        };
+        // Helper to extract date part
+        const extractDate = (text) => {
+            const match = text.match(/\d{2}[-\/]\d{2}[-\/]\d{2,4}/);
+            return match ? match[0] : null;
+        };
         // Check if label contains both date and week information
         const hasDateAndTime = (text) => {
-            const dateMatch = /\d{2,4}[-\/]\d{1,2}[-\/]\d{1,4}/.test(text) || !isNaN(Date.parse(text));
-            const weekMatch = /week|wk|w\d+/i.test(text);
+            const dateMatch = /\d{2,4}[-\/]\d{1,2}[-\/]\d{1,4}/.test(text);
+            const weekMatch = /(?:week|wk|w)\s*\d+/i.test(text);
             return { isDate: dateMatch, isWeek: weekMatch };
         };
         const labelInfo = hasDateAndTime(d);
-        // When label contains both date and week, show it as-is (no trimming)
-        if (isSmallScreen && labelInfo.isDate && labelInfo.isWeek) {
-            return d;
-        }
-        // Mobile handling: format date and week on separate lines
+        // Mobile handling: format date and week parts
         if (isMobile) {
             // If header is hidden (compact mobile)
             if (!self.isHeaderVisible) {
-                const labelInfo = hasDateAndTime(d);
-                // Extract week number if present
-                const getWeekNumber = (text) => {
-                    const match = text.match(/(?:week|wk|w)\s*(\d+)/i);
-                    return match ? `W${match[1]}` : null;
-                };
-                // If it has both date and week, split them
+                // If it has both date and week, format appropriately
                 if (labelInfo.isDate && labelInfo.isWeek) {
-                    const datePart = d.match(/\d{2}[-\/]\d{2}[-\/]\d{2,4}/)?.[0] || '';
-                    const weekPart = getWeekNumber(d);
-                    if (weekPart) {
+                    const datePart = extractDate(d);
+                    const weekPart = extractWeekNumber(d);
+                    if (datePart && weekPart) {
                         return `${datePart}\n${weekPart}`;
                     }
                 }
                 // If it's just a date, return it unchanged
                 if (labelInfo.isDate) {
-                    return d;
+                    return extractDate(d) || d;
                 }
-                // If it has just week number, format it
+                // If it has just week number, format it as W##
                 if (labelInfo.isWeek) {
-                    const weekPart = getWeekNumber(d);
+                    const weekPart = extractWeekNumber(d);
                     if (weekPart) {
                         return weekPart;
                     }