@quillsql/react 2.13.35 → 2.13.36

package/dist/esm/utils/valueFormatter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"valueFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/valueFormatter.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,MAAM,KAAK,GAAG;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,SAAS,CAAC,EAAE;QAAE,KAAK,EAAE,IAAI,CAAC;QAAC,GAAG,EAAE,IAAI,CAAA;KAAE,CAAC;CACxC,CAAC;AAEF,eAAO,MAAM,iBAAiB,UAQ7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,UAO/B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,yCAKxB,KAAK,KAAG,MA8CV,CAAC;AAEF,eAAO,MAAM,WAAW,uBAGrB;IACD,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;CAChB,KAAG,MAkDH,CAAC;AA0OF,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,oBAG9C;AAED,eAAO,MAAM,aAAa,MACrB;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,KACtB;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,UACjB,MAAM,KACb,MAkDF,CAAC"}
+{"version":3,"file":"valueFormatter.d.ts","sourceRoot":"","sources":["../../../src/utils/valueFormatter.ts"],"names":[],"mappings":"AAYA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,MAAM,MAAM,KAAK,GAAG;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,KAAK,KAAK,GAAG;IACX,KAAK,EAAE,GAAG,CAAC;IACX,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAAC;IACjC,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,SAAS,CAAC,EAAE;QAAE,KAAK,EAAE,IAAI,CAAC;QAAC,GAAG,EAAE,IAAI,CAAA;KAAE,CAAC;IACvC,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,eAAO,MAAM,iBAAiB,UAQ7B,CAAC;AAEF,eAAO,MAAM,mBAAmB,UAO/B,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,cAAc,uDAMxB,KAAK,KAAG,MA8CV,CAAC;AAEF,eAAO,MAAM,WAAW,uBAGrB;IACD,KAAK,EAAE,GAAG,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;CAChB,KAAG,MAkDH,CAAC;AAgPF,wBAAgB,YAAY,CAAC,UAAU,EAAE,MAAM,oBAG9C;AAED,eAAO,MAAM,aAAa,MACrB;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,KACtB;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;CAAE,UACjB,MAAM,KACb,MAkDF,CAAC"}

package/dist/esm/utils/valueFormatter.js

@@ -20,7 +20,7 @@ export const NUMBER_FORMAT_TYPES = [
 /**
  * Pretty-prints the given values to their nice-looking string form.
  */
-export const valueFormatter = ({ value, field, fields, dateRange, }) => {
+export const valueFormatter = ({ value, field, fields, dateRange, databaseType, }) => {
     if (field === undefined || field === null)
         return '';
     if (value === undefined || value === null)
@@ -58,7 +58,7 @@ export const valueFormatter = ({ value, field, fields, dateRange, }) => {
         case 'hh_ap_pm':
             return format_hh_ap_pm(value);
         case 'MMM_dd-MMM_dd':
-            return format_MMM_d_MMM_d(value, dateRange);
+            return format_MMM_d_MMM_d(value, dateRange, databaseType);
         case 'MMM_dd_hh:mm_ap_pm':
             return format_MMM_dd_hh_mm_ap_pm(value);
         case 'wo, yyyy':
@@ -69,7 +69,7 @@ export const valueFormatter = ({ value, field, fields, dateRange, }) => {
 };
 export const quillFormat = ({ value, format, }) => {
     // Handle special case, if value is null and format is numeric display '-'
-    if (value === null &&
+    if ((value === null || value === undefined) &&
         (NUMBER_FORMAT_TYPES.includes(format) || DATE_FORMAT_TYPES.includes(format))) {
         return '-';
     }
@@ -232,12 +232,16 @@ const format_MMM_d = (value) => _getUTCDateHelper(value, 'MMM d');
 const format_MMM_dd_yyyy = (value) => {
     return _getUTCDateHelper(value, 'dd MMM yyyy');
 };
-const format_MMM_d_MMM_d = (value, dateRange) => {
+const format_MMM_d_MMM_d = (value, dateRange, databaseType) => {
     const utcDate = parseISO(value.split('T')[0]);
     if (!isValid(utcDate))
         return 'Invalid date';
-    let monday = startOfWeek(utcDate, { weekStartsOn: 1 });
-    let sunday = endOfWeek(utcDate, { weekStartsOn: 1 });
+    let weekStartsOn = 1;
+    if (databaseType && ['mssql'].includes(databaseType)) {
+        weekStartsOn = 0;
+    }
+    let weekStart = startOfWeek(utcDate, { weekStartsOn });
+    let weekEnd = endOfWeek(utcDate, { weekStartsOn });
     // If date range is provided, adjust the start and end dates
     if (dateRange && dateRange.start && dateRange.end) {
         const utcStartString = dateRange.start.toISOString().split('T')[0];
@@ -245,23 +249,23 @@ const format_MMM_d_MMM_d = (value, dateRange) => {
         if (utcStartString && utcEndString) {
             const utcStart = parseISO(utcStartString);
             const utcEnd = parseISO(utcEndString);
-            if (isBefore(monday, utcStart)) {
-                monday = utcStart;
+            if (isBefore(weekStart, utcStart)) {
+                weekStart = utcStart;
             }
-            if (isAfter(sunday, utcEnd)) {
-                sunday = utcEnd;
+            if (isAfter(weekEnd, utcEnd)) {
+                weekEnd = utcEnd;
             }
-            if (isAfter(monday, utcEnd) || isBefore(sunday, utcStart)) {
+            if (isAfter(weekStart, utcEnd) || isBefore(weekEnd, utcStart)) {
                 return 'Date outside range';
             }
         }
     }
     // Check if start and end are in the same month
-    if (format(monday, 'MMM') === format(sunday, 'MMM')) {
-        return `${format(monday, 'MMM d')} - ${format(sunday, 'd')}`;
+    if (format(weekStart, 'MMM') === format(weekEnd, 'MMM')) {
+        return `${format(weekStart, 'MMM d')} - ${format(weekEnd, 'd')}`;
     }
     else {
-        return `${format(monday, 'MMM d')} - ${format(sunday, 'MMM d')}`;
+        return `${format(weekStart, 'MMM d')} - ${format(weekEnd, 'MMM d')}`;
     }
 };
 const format_MMM_dd_hh_mm_ap_pm = (value) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/react",
-  "version": "2.13.35",
+  "version": "2.13.36",
   "exports": {
     ".": {
       "import": "./dist/esm/index.js",