@quillsql/react 2.15.8 → 2.15.9

package/dist/index.cjs

@@ -1216,11 +1216,29 @@ var convertCustomIntervalToDateRange = (interval2) => {
         endDate: (0, import_date_fns2.endOfToday)()
       };
     case "repeating": {
-      const currentMonth = (/* @__PURE__ */ new Date()).getMonth() + 1;
-      const currentDay = (/* @__PURE__ */ new Date()).getDate();
-      const currentSubInterval = interval2.subIntervals.find(
-        (subInterval) => subInterval.startDate.month <= currentMonth && subInterval.endDate.month >= currentMonth && subInterval.startDate.day <= currentDay && subInterval.endDate.day >= currentDay
-      );
+      const currentDate = /* @__PURE__ */ new Date();
+      const currentYear = currentDate.getFullYear();
+      const currentSubInterval = interval2.subIntervals.find((subInterval) => {
+        const intervalStart = (0, import_date_fns2.set)(/* @__PURE__ */ new Date(), {
+          year: currentYear,
+          month: subInterval.startDate.month - 1,
+          // convert 1-index to 0-index
+          date: subInterval.startDate.day,
+          hours: 0,
+          minutes: 0,
+          seconds: 0
+        });
+        const intervalEnd = (0, import_date_fns2.set)(/* @__PURE__ */ new Date(), {
+          year: currentYear,
+          month: subInterval.endDate.month - 1,
+          // convert 1-index to 0-index
+          date: subInterval.endDate.day,
+          hours: 23,
+          minutes: 59,
+          seconds: 59
+        });
+        return currentDate >= intervalStart && currentDate <= intervalEnd;
+      });
       if (!currentSubInterval) {
         throw new Error("Date is not valid in this interval");
       }
@@ -1390,10 +1408,29 @@ var convertPresetOptionsToSelectableList = (customIntervals, defaultIntervals) =
       let currentDate = (0, import_date_fns2.endOfDay)(option.loopEnd ?? /* @__PURE__ */ new Date());
       const cutoffDate = option.loopStart;
       while (currentDate > cutoffDate) {
-        const currentMonth = currentDate.getMonth() + 1;
-        const currentDay = currentDate.getDate();
+        const loopCurrentYear = currentDate.getFullYear();
         const currentSubInterval = option.subIntervals.find(
-          (subInterval) => subInterval.startDate.month <= currentMonth && subInterval.endDate.month >= currentMonth && subInterval.startDate.day <= currentDay && subInterval.endDate.day >= currentDay
+          (subInterval) => {
+            const intervalStart2 = (0, import_date_fns2.set)(/* @__PURE__ */ new Date(), {
+              year: loopCurrentYear,
+              month: subInterval.startDate.month - 1,
+              // convert 1-index to 0-index
+              date: subInterval.startDate.day,
+              hours: 0,
+              minutes: 0,
+              seconds: 0
+            });
+            const intervalEnd = (0, import_date_fns2.set)(/* @__PURE__ */ new Date(), {
+              year: loopCurrentYear,
+              month: subInterval.endDate.month - 1,
+              // convert 1-index to 0-index
+              date: subInterval.endDate.day,
+              hours: 23,
+              minutes: 59,
+              seconds: 59
+            });
+            return currentDate >= intervalStart2 && currentDate <= intervalEnd;
+          }
         );
         if (!currentSubInterval) {
           return [];
@@ -1412,6 +1449,7 @@ var convertPresetOptionsToSelectableList = (customIntervals, defaultIntervals) =
           startDate: (0, import_date_fns2.set)(/* @__PURE__ */ new Date(), {
             year: currentYear,
             month: currentSubInterval.startDate.month - 1,
+            // convert 1-index to 0-index
             date: currentSubInterval.startDate.day,
             minutes: 0,
             hours: 0,
@@ -1420,6 +1458,7 @@ var convertPresetOptionsToSelectableList = (customIntervals, defaultIntervals) =
           endDate: (0, import_date_fns2.set)(/* @__PURE__ */ new Date(), {
             year: currentYear,
             month: currentSubInterval.endDate.month - 1,
+            // convert 1-index to 0-index
             date: currentSubInterval.endDate.day,
             minutes: 59,
             hours: 23,
@@ -1429,6 +1468,7 @@ var convertPresetOptionsToSelectableList = (customIntervals, defaultIntervals) =
         const intervalStart = (0, import_date_fns2.set)(/* @__PURE__ */ new Date(), {
           year: currentYear,
           month: currentSubInterval.startDate.month - 1,
+          // convert 1-index to 0-index
           date: currentSubInterval.startDate.day
         });
         currentDate = (0, import_date_fns2.sub)(intervalStart, { days: 1 });

package/dist/index.d.cts

@@ -3426,4 +3426,4 @@ interface ReportTableProps {
 }
 declare const ReportTable: ({ reportBuilder, TableComponent, }: ReportTableProps) => react_jsx_runtime.JSX.Element;
 
-export { ALL_TENANTS, AddColumns, AddFilters, AddLimit, AddPivot, AddSort, type AxisFormat, type ButtonComponentProps, Calculation, Chart, ChartEditor, type ChartEditorProps, type ChartProps, type CheckboxComponentProps, type ColorMapType, type Column$1 as Column, type ContainerComponentProps, Dashboard, DashboardFilterType, type DashboardProps, type DashboardSectionComponentProps, DateOperator, type DateRange, type DateRangePickerComponentProps, type DateRangePickerOption, type DeleteButtonComponentProps, type DraggableColumnComponentProps, type EventBreadcrumb, type EventContext, type EventError, type EventMetadata, type EventTracking, type EventUser, type Filter, type FilterPopoverComponentProps, FilterType, type HeaderComponentProps, type HeaderProps, type InternalDashboardDateFilter, type InternalDashboardTenantFilter, type InternalFilter, type LabelComponentProps, type LimitPopoverComponentProps, type ModalComponentProps, NullOperator, NumberOperator, type Option, type Pivot, type PopoverComponentProps, type QuillCustomInterval, type QuillCustomRelativeInterval, type QuillCustomRepeatingInterval, type QuillCustomStaticInterval, QuillProvider, type QuillProviderProps, type QuillReport, type QuillReportProps, type QuillTheme, type QuillWeekInterval, ReportBuilder$1 as ReportBuilder, type ReportBuilderColumn, type ReportBuilderLimit, type ReportBuilderProps, type ReportBuilderSort, type ReportBuilderState, ReportTable, SINGLE_TENANT, SQLEditor, type SQLEditorProps, SaveReport, SchemaListComponent, type SelectColumnComponentProps, type SelectComponentProps, type SidebarComponentProps, type SidebarHeadingComponentProps, type SortPopoverComponentProps, StaticChart, type StaticChartProps, StringOperator, Table$1 as Table, type TableComponentProps, type TableProps, type TabsComponentProps, type TextComponentProps, type TextInputComponentProps, ThemeContext, downloadCSV, quillFormat as format, useAllReports, useAskQuill, useDashboard, useDashboardInternal, useDashboardReport, useDashboardReports, useDashboards, useExport, useMemoizedRows, useQuill, useReportBuilder, useReports, useTenants, useVirtualTables };
+export { ALL_TENANTS, AddColumns, AddFilters, AddLimit, AddPivot, AddSort, type AxisFormat, type ButtonComponentProps, Calculation, Chart, ChartEditor, type ChartEditorProps, type ChartProps, type CheckboxComponentProps, type ColorMapType, type Column$1 as Column, type ContainerComponentProps, Dashboard, type DashboardFilter, DashboardFilterType, type DashboardProps, type DashboardSectionComponentProps, DateOperator, type DateRange, type DateRangePickerComponentProps, type DateRangePickerOption, type DeleteButtonComponentProps, type DraggableColumnComponentProps, type EventBreadcrumb, type EventContext, type EventError, type EventMetadata, type EventTracking, type EventUser, type Filter, type FilterPopoverComponentProps, FilterType, type HeaderComponentProps, type HeaderProps, type InternalDashboardDateFilter, type InternalDashboardTenantFilter, type InternalFilter, type LabelComponentProps, type LimitPopoverComponentProps, type ModalComponentProps, NullOperator, NumberOperator, type Option, type Pivot, type PopoverComponentProps, type QuillCustomInterval, type QuillCustomRelativeInterval, type QuillCustomRepeatingInterval, type QuillCustomStaticInterval, QuillProvider, type QuillProviderProps, type QuillReport, type QuillReportProps, type QuillTheme, type QuillWeekInterval, ReportBuilder$1 as ReportBuilder, type ReportBuilderColumn, type ReportBuilderLimit, type ReportBuilderProps, type ReportBuilderSort, type ReportBuilderState, ReportTable, SINGLE_TENANT, SQLEditor, type SQLEditorProps, SaveReport, SchemaListComponent, type SelectColumnComponentProps, type SelectComponentProps, type SidebarComponentProps, type SidebarHeadingComponentProps, type SortPopoverComponentProps, StaticChart, type StaticChartProps, StringOperator, Table$1 as Table, type TableComponentProps, type TableProps, type TabsComponentProps, type TextComponentProps, type TextInputComponentProps, ThemeContext, downloadCSV, quillFormat as format, useAllReports, useAskQuill, useDashboard, useDashboardInternal, useDashboardReport, useDashboardReports, useDashboards, useExport, useMemoizedRows, useQuill, useReportBuilder, useReports, useTenants, useVirtualTables };

package/dist/index.d.ts

@@ -3426,4 +3426,4 @@ interface ReportTableProps {
 }
 declare const ReportTable: ({ reportBuilder, TableComponent, }: ReportTableProps) => react_jsx_runtime.JSX.Element;
 
-export { ALL_TENANTS, AddColumns, AddFilters, AddLimit, AddPivot, AddSort, type AxisFormat, type ButtonComponentProps, Calculation, Chart, ChartEditor, type ChartEditorProps, type ChartProps, type CheckboxComponentProps, type ColorMapType, type Column$1 as Column, type ContainerComponentProps, Dashboard, DashboardFilterType, type DashboardProps, type DashboardSectionComponentProps, DateOperator, type DateRange, type DateRangePickerComponentProps, type DateRangePickerOption, type DeleteButtonComponentProps, type DraggableColumnComponentProps, type EventBreadcrumb, type EventContext, type EventError, type EventMetadata, type EventTracking, type EventUser, type Filter, type FilterPopoverComponentProps, FilterType, type HeaderComponentProps, type HeaderProps, type InternalDashboardDateFilter, type InternalDashboardTenantFilter, type InternalFilter, type LabelComponentProps, type LimitPopoverComponentProps, type ModalComponentProps, NullOperator, NumberOperator, type Option, type Pivot, type PopoverComponentProps, type QuillCustomInterval, type QuillCustomRelativeInterval, type QuillCustomRepeatingInterval, type QuillCustomStaticInterval, QuillProvider, type QuillProviderProps, type QuillReport, type QuillReportProps, type QuillTheme, type QuillWeekInterval, ReportBuilder$1 as ReportBuilder, type ReportBuilderColumn, type ReportBuilderLimit, type ReportBuilderProps, type ReportBuilderSort, type ReportBuilderState, ReportTable, SINGLE_TENANT, SQLEditor, type SQLEditorProps, SaveReport, SchemaListComponent, type SelectColumnComponentProps, type SelectComponentProps, type SidebarComponentProps, type SidebarHeadingComponentProps, type SortPopoverComponentProps, StaticChart, type StaticChartProps, StringOperator, Table$1 as Table, type TableComponentProps, type TableProps, type TabsComponentProps, type TextComponentProps, type TextInputComponentProps, ThemeContext, downloadCSV, quillFormat as format, useAllReports, useAskQuill, useDashboard, useDashboardInternal, useDashboardReport, useDashboardReports, useDashboards, useExport, useMemoizedRows, useQuill, useReportBuilder, useReports, useTenants, useVirtualTables };
+export { ALL_TENANTS, AddColumns, AddFilters, AddLimit, AddPivot, AddSort, type AxisFormat, type ButtonComponentProps, Calculation, Chart, ChartEditor, type ChartEditorProps, type ChartProps, type CheckboxComponentProps, type ColorMapType, type Column$1 as Column, type ContainerComponentProps, Dashboard, type DashboardFilter, DashboardFilterType, type DashboardProps, type DashboardSectionComponentProps, DateOperator, type DateRange, type DateRangePickerComponentProps, type DateRangePickerOption, type DeleteButtonComponentProps, type DraggableColumnComponentProps, type EventBreadcrumb, type EventContext, type EventError, type EventMetadata, type EventTracking, type EventUser, type Filter, type FilterPopoverComponentProps, FilterType, type HeaderComponentProps, type HeaderProps, type InternalDashboardDateFilter, type InternalDashboardTenantFilter, type InternalFilter, type LabelComponentProps, type LimitPopoverComponentProps, type ModalComponentProps, NullOperator, NumberOperator, type Option, type Pivot, type PopoverComponentProps, type QuillCustomInterval, type QuillCustomRelativeInterval, type QuillCustomRepeatingInterval, type QuillCustomStaticInterval, QuillProvider, type QuillProviderProps, type QuillReport, type QuillReportProps, type QuillTheme, type QuillWeekInterval, ReportBuilder$1 as ReportBuilder, type ReportBuilderColumn, type ReportBuilderLimit, type ReportBuilderProps, type ReportBuilderSort, type ReportBuilderState, ReportTable, SINGLE_TENANT, SQLEditor, type SQLEditorProps, SaveReport, SchemaListComponent, type SelectColumnComponentProps, type SelectComponentProps, type SidebarComponentProps, type SidebarHeadingComponentProps, type SortPopoverComponentProps, StaticChart, type StaticChartProps, StringOperator, Table$1 as Table, type TableComponentProps, type TableProps, type TabsComponentProps, type TextComponentProps, type TextInputComponentProps, ThemeContext, downloadCSV, quillFormat as format, useAllReports, useAskQuill, useDashboard, useDashboardInternal, useDashboardReport, useDashboardReports, useDashboards, useExport, useMemoizedRows, useQuill, useReportBuilder, useReports, useTenants, useVirtualTables };

package/dist/index.js

@@ -1213,11 +1213,29 @@ var convertCustomIntervalToDateRange = (interval2) => {
         endDate: endOfToday()
       };
     case "repeating": {
-      const currentMonth = (/* @__PURE__ */ new Date()).getMonth() + 1;
-      const currentDay = (/* @__PURE__ */ new Date()).getDate();
-      const currentSubInterval = interval2.subIntervals.find(
-        (subInterval) => subInterval.startDate.month <= currentMonth && subInterval.endDate.month >= currentMonth && subInterval.startDate.day <= currentDay && subInterval.endDate.day >= currentDay
-      );
+      const currentDate = /* @__PURE__ */ new Date();
+      const currentYear = currentDate.getFullYear();
+      const currentSubInterval = interval2.subIntervals.find((subInterval) => {
+        const intervalStart = set(/* @__PURE__ */ new Date(), {
+          year: currentYear,
+          month: subInterval.startDate.month - 1,
+          // convert 1-index to 0-index
+          date: subInterval.startDate.day,
+          hours: 0,
+          minutes: 0,
+          seconds: 0
+        });
+        const intervalEnd = set(/* @__PURE__ */ new Date(), {
+          year: currentYear,
+          month: subInterval.endDate.month - 1,
+          // convert 1-index to 0-index
+          date: subInterval.endDate.day,
+          hours: 23,
+          minutes: 59,
+          seconds: 59
+        });
+        return currentDate >= intervalStart && currentDate <= intervalEnd;
+      });
       if (!currentSubInterval) {
         throw new Error("Date is not valid in this interval");
       }
@@ -1387,10 +1405,29 @@ var convertPresetOptionsToSelectableList = (customIntervals, defaultIntervals) =
       let currentDate = endOfDay(option.loopEnd ?? /* @__PURE__ */ new Date());
       const cutoffDate = option.loopStart;
       while (currentDate > cutoffDate) {
-        const currentMonth = currentDate.getMonth() + 1;
-        const currentDay = currentDate.getDate();
+        const loopCurrentYear = currentDate.getFullYear();
         const currentSubInterval = option.subIntervals.find(
-          (subInterval) => subInterval.startDate.month <= currentMonth && subInterval.endDate.month >= currentMonth && subInterval.startDate.day <= currentDay && subInterval.endDate.day >= currentDay
+          (subInterval) => {
+            const intervalStart2 = set(/* @__PURE__ */ new Date(), {
+              year: loopCurrentYear,
+              month: subInterval.startDate.month - 1,
+              // convert 1-index to 0-index
+              date: subInterval.startDate.day,
+              hours: 0,
+              minutes: 0,
+              seconds: 0
+            });
+            const intervalEnd = set(/* @__PURE__ */ new Date(), {
+              year: loopCurrentYear,
+              month: subInterval.endDate.month - 1,
+              // convert 1-index to 0-index
+              date: subInterval.endDate.day,
+              hours: 23,
+              minutes: 59,
+              seconds: 59
+            });
+            return currentDate >= intervalStart2 && currentDate <= intervalEnd;
+          }
         );
         if (!currentSubInterval) {
           return [];
@@ -1409,6 +1446,7 @@ var convertPresetOptionsToSelectableList = (customIntervals, defaultIntervals) =
           startDate: set(/* @__PURE__ */ new Date(), {
             year: currentYear,
             month: currentSubInterval.startDate.month - 1,
+            // convert 1-index to 0-index
             date: currentSubInterval.startDate.day,
             minutes: 0,
             hours: 0,
@@ -1417,6 +1455,7 @@ var convertPresetOptionsToSelectableList = (customIntervals, defaultIntervals) =
           endDate: set(/* @__PURE__ */ new Date(), {
             year: currentYear,
             month: currentSubInterval.endDate.month - 1,
+            // convert 1-index to 0-index
             date: currentSubInterval.endDate.day,
             minutes: 59,
             hours: 23,
@@ -1426,6 +1465,7 @@ var convertPresetOptionsToSelectableList = (customIntervals, defaultIntervals) =
         const intervalStart = set(/* @__PURE__ */ new Date(), {
           year: currentYear,
           month: currentSubInterval.startDate.month - 1,
+          // convert 1-index to 0-index
           date: currentSubInterval.startDate.day
         });
         currentDate = sub(intervalStart, { days: 1 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quillsql/react",
-  "version": "2.15.8",
+  "version": "2.15.9",
   "type": "module",
   "exports": {
     ".": {
@@ -37,7 +37,7 @@
     "fast-deep-equal": "^3.1.3",
     "jspdf": "^3.0.1",
     "react-day-picker": "^9.7.0",
-    "react-simple-maps": "git+https://github.com/zcreativelabs/react-simple-maps.git",
+    "react-simple-maps": "git+https://github.com/zcreativelabs/react-simple-maps.git#b322da59a76fa789de1de77165bbef6df9beb0ef",
     "recharts": "^2.13.0"
   },
   "devDependencies": {