@quillsql/react 2.16.22 → 2.16.23

package/dist/index.cjs

@@ -1534,6 +1534,7 @@ var init_dateRangePickerUtils = __esm({
     };
     convertPresetOptionsToSelectableList = (customIntervals, defaultIntervals) => {
       const customLabelMap = /* @__PURE__ */ new Map();
+      const displayLabelByValue = /* @__PURE__ */ new Map();
       defaultIntervals.forEach((interval2) => {
         if (interval2.customLabel) {
           customLabelMap.set(interval2.label, interval2.customLabel);
@@ -1703,11 +1704,14 @@ var init_dateRangePickerUtils = __esm({
             }
           ];
         }
-        if (interval2.customLabel && createdIntervals.length > 0) {
-          return createdIntervals.map((i) => ({
-            ...i,
-            label: interval2.customLabel
-          }));
+        if (createdIntervals.length > 0) {
+          const displayLabel = interval2.customLabel ?? interval2.label;
+          createdIntervals.forEach((createdInterval) => {
+            const canonicalValue = getLabelForCustomInterval(createdInterval).toUpperCase().replace(/ /g, "_");
+            if (displayLabel && canonicalValue) {
+              displayLabelByValue.set(canonicalValue, displayLabel);
+            }
+          });
         }
         return createdIntervals;
       });
@@ -1763,9 +1767,10 @@ var init_dateRangePickerUtils = __esm({
                 customLabel2 = customLabelMap.get("This year") || customLabelMap.get("Yearly");
               }
             }
+            const value2 = getLabelForSubInterval(currentSubInterval).toUpperCase().replace(/ /g, "_") ?? "";
             presets.push({
-              label: customLabel2 || baseLabel,
-              value: getLabelForSubInterval(currentSubInterval).toUpperCase().replace(/ /g, "_") ?? "",
+              label: displayLabelByValue.get(value2) || customLabel2 || baseLabel,
+              value: value2,
               startDate: (0, import_date_fns2.set)(/* @__PURE__ */ new Date(), {
                 year: currentYear,
                 month: currentSubInterval.startDate.month - 1,
@@ -1797,13 +1802,14 @@ var init_dateRangePickerUtils = __esm({
         }
         const dateRange = convertCustomIntervalToDateRange(option);
         const generatedLabel = getLabelForCustomInterval(option);
+        const value = getLabelForCustomInterval(option).toUpperCase().replace(/ /g, "_") ?? "";
         const customLabel = customLabelMap.get(generatedLabel);
-        const finalLabel = customLabel || generatedLabel;
+        const finalLabel = displayLabelByValue.get(value) || customLabel || generatedLabel;
         return [
           {
             label: finalLabel,
             // Value is option label in uppercase with spaces replaced by underscores
-            value: getLabelForCustomInterval(option).toUpperCase().replace(/ /g, "_") ?? "",
+            value,
             startDate: dateRange.startDate,
             endDate: dateRange.endDate
           }
@@ -1999,7 +2005,10 @@ var init_dateRangePickerUtils = __esm({
     getRangeFromPresetOptions = (preset, presetOptions) => {
       const foundPreset = presetOptions.find((elem) => elem.value === preset);
       if (foundPreset) {
-        return { startDate: foundPreset?.startDate, endDate: foundPreset?.endDate };
+        return {
+          startDate: foundPreset.startDate ? (0, import_date_fns2.startOfDay)(foundPreset.startDate) : foundPreset.startDate,
+          endDate: foundPreset.endDate ? (0, import_date_fns2.endOfDay)(foundPreset.endDate) : foundPreset.endDate
+        };
       } else {
         return { startDate: null, endDate: null };
       }
@@ -33508,24 +33517,24 @@ function DayPicker({
         if (localStartDate && !localEndDate) {
           setLocalEndDate(date);
           updateDateFilter({
-            startDate: localStartDate,
-            endDate: date
+            startDate: (0, import_date_fns13.startOfDay)(localStartDate),
+            endDate: (0, import_date_fns13.endOfDay)(date)
           });
           setLocalPreset("");
         }
         if (localStartDate && localEndDate && (0, import_date_fns13.isAfter)(date, localStartDate)) {
           setLocalEndDate(date);
           updateDateFilter({
-            startDate: localStartDate,
-            endDate: date
+            startDate: (0, import_date_fns13.startOfDay)(localStartDate),
+            endDate: (0, import_date_fns13.endOfDay)(date)
           });
           setLocalPreset("");
         }
         if (localStartDate && localEndDate && (0, import_date_fns13.isBefore)(date, localStartDate)) {
           setLocalStartDate(date);
           updateDateFilter({
-            startDate: date,
-            endDate: localEndDate
+            startDate: (0, import_date_fns13.startOfDay)(date),
+            endDate: (0, import_date_fns13.endOfDay)(localEndDate)
           });
           setLocalPreset("");
         }
@@ -36032,12 +36041,41 @@ var useReportInternal = (reportId) => {
 var import_fast_deep_equal3 = __toESM(require("fast-deep-equal"), 1);
 
 // src/components/Chart/MapChart.tsx
-var import_react_simple_maps = require("react-simple-maps");
-var import_react27 = require("react");
+var import_react27 = __toESM(require("react"), 1);
 init_valueFormatter();
+var import_states_10m = __toESM(require("us-atlas/states-10m.json"), 1);
+var import_countries_50m = __toESM(require("world-atlas/countries-50m.json"), 1);
 var import_jsx_runtime46 = require("react/jsx-runtime");
-var statesUrl = "https://cdn.jsdelivr.net/npm/us-atlas@3/states-10m.json";
-var countriesUrl = "https://cdn.jsdelivr.net/npm/world-atlas@2/countries-50m.json";
+var statesGeography = import_states_10m.default;
+var countriesGeography = import_countries_50m.default;
+var getSimpleMapsImport = () => {
+  const majorVersion = Number.parseInt(import_react27.default.version.split(".")[0] ?? "18", 10);
+  if (majorVersion >= 19) {
+    const react19Maps = "@vnedyalk0v/react19-simple-maps";
+    return import(
+      /* @vite-ignore */
+      react19Maps
+    ).catch(() => {
+      return import("react-simple-maps");
+    });
+  }
+  return import("react-simple-maps");
+};
+var useSimpleMapsModule = () => {
+  const [simpleMapsModule, setSimpleMapsModule] = (0, import_react27.useState)();
+  (0, import_react27.useEffect)(() => {
+    let mounted = true;
+    getSimpleMapsImport().then((module2) => {
+      if (mounted) {
+        setSimpleMapsModule(module2);
+      }
+    });
+    return () => {
+      mounted = false;
+    };
+  }, []);
+  return simpleMapsModule;
+};
 var fipsToNames = {
   "01": { name: "Alabama", abbreviation: "AL" },
   "02": { name: "Alaska", abbreviation: "AK" },
@@ -36360,6 +36398,7 @@ function USMap({
   className,
   containerStyle
 }) {
+  const simpleMaps = useSimpleMapsModule();
   const containerRef = (0, import_react27.useRef)(null);
   const [hoveredState, setHoveredState] = (0, import_react27.useState)(
     void 0
@@ -36428,6 +36467,9 @@ function USMap({
       }
     );
   }
+  if (!simpleMaps) {
+    return null;
+  }
   return /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)(
     "div",
     {
@@ -36442,9 +36484,10 @@ function USMap({
         position: "relative"
       },
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(import_react_simple_maps.ComposableMap, { projection: "geoAlbersUsa", children: /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(simpleMaps.ComposableMap, { projection: "geoAlbersUsa", children: /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(
           MapLayout,
           {
+            simpleMaps,
             hoveredRegion: hoveredState,
             setHoveredRegion: setHoveredState,
             setHoveredCoords,
@@ -36454,7 +36497,7 @@ function USMap({
             colorScale,
             onClickChartElement,
             regionNames: fipsToNames,
-            geographyUrl: statesUrl
+            geographyUrl: statesGeography
           }
         ) }),
         hoveredCoords && hoveredState && /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(
@@ -36551,6 +36594,7 @@ function WorldMap({
   className,
   containerStyle
 }) {
+  const simpleMaps = useSimpleMapsModule();
   const containerRef = (0, import_react27.useRef)(null);
   const [hoveredCountry, setHoveredCountry] = (0, import_react27.useState)(
     void 0
@@ -36619,6 +36663,9 @@ function WorldMap({
       }
     );
   }
+  if (!simpleMaps) {
+    return null;
+  }
   return /* @__PURE__ */ (0, import_jsx_runtime46.jsxs)(
     "div",
     {
@@ -36634,9 +36681,10 @@ function WorldMap({
         position: "relative"
       },
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(import_react_simple_maps.ComposableMap, { projection: "geoEqualEarth", children: /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(
+        /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(simpleMaps.ComposableMap, { projection: "geoEqualEarth", children: /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(
           MapLayout,
           {
+            simpleMaps,
             hoveredRegion: hoveredCountry,
             setHoveredRegion: setHoveredCountry,
             setHoveredCoords,
@@ -36645,7 +36693,7 @@ function WorldMap({
             measureField,
             colorScale,
             onClickChartElement,
-            geographyUrl: countriesUrl,
+            geographyUrl: countriesGeography,
             regionNames: isoToNames
           }
         ) }),
@@ -36732,6 +36780,7 @@ function WorldMap({
   );
 }
 function MapLayout({
+  simpleMaps,
   geographyUrl,
   hoveredRegion,
   setHoveredRegion,
@@ -36743,19 +36792,19 @@ function MapLayout({
   onClickChartElement,
   regionNames
 }) {
-  const { projection } = (0, import_react_simple_maps.useMapContext)();
+  const { projection } = simpleMaps.useMapContext();
   const [geoCentroid, setGeoCentroid] = (0, import_react27.useState)(null);
   (0, import_react27.useEffect)(() => {
     import("d3-geo").then((geo) => {
       setGeoCentroid(() => geo.geoCentroid);
     });
   }, []);
-  return /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(import_react_simple_maps.Geographies, { geography: geographyUrl, children: ({ geographies }) => geographies.map((geo, index) => {
+  return /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(simpleMaps.Geographies, { geography: geographyUrl, children: ({ geographies }) => geographies.map((geo, index) => {
     const regionData = mappedData[geo.id] ?? mappedData[regionNames[geo.id]?.abbreviation ?? ""] ?? mappedData[regionNames[geo.id]?.name ?? ""] ?? mappedData[regionNames[geo.id]?.abbreviation?.toLowerCase() ?? ""] ?? mappedData[regionNames[geo.id]?.name?.toLowerCase() ?? ""];
     const value = regionData ? parseFloat(regionData[measureField]) : null;
     const fill = value != null ? colorScale(value) : "#D6D6DA";
     return /* @__PURE__ */ (0, import_jsx_runtime46.jsx)(
-      import_react_simple_maps.Geography,
+      simpleMaps.Geography,
       {
         geography: geo,
         fill,
@@ -41416,9 +41465,12 @@ function Dashboard({
     setFilterListAddFilterPopoverIsOpen
   ] = (0, import_react38.useState)(false);
   const presetOptions = (0, import_react38.useMemo)(() => {
-    return populatedDashboardFilters?.[0]?.filterType === "date_range" ? convertPresetOptionsToSelectableList(
-      populatedDashboardFilters[0].presetOptions ?? [],
-      populatedDashboardFilters[0].defaultPresetRanges ?? []
+    const dashboardDateFilter = populatedDashboardFilters?.find(
+      (filter) => filter.filterType === "date_range"
+    );
+    return dashboardDateFilter ? convertPresetOptionsToSelectableList(
+      dashboardDateFilter.presetOptions ?? [],
+      dashboardDateFilter.defaultPresetRanges ?? []
     ) : defaultOptionsV2;
   }, [populatedDashboardFilters]);
   const [filterValues, setFilterValues] = (0, import_react38.useState)({});
@@ -48857,7 +48909,7 @@ function ChartBuilder({
                           )
                         }
                       ),
-                      (showTableFormatOptions || isAdmin) && /* @__PURE__ */ (0, import_jsx_runtime66.jsxs)(
+                      (showTableFormatOptions || isAdmin || formData.chartType === "table" && !hideTableView) && /* @__PURE__ */ (0, import_jsx_runtime66.jsxs)(
                         "div",
                         {
                           style: {