@quillsql/react 2.11.15 → 2.11.17

package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts

@@ -1,3 +1,5 @@
+import { ReactNode } from 'react';
+import { ButtonComponentProps } from '../../components/UiComponents';
 export interface Pivot {
     rowField: string;
     rowFieldType: string;
@@ -8,7 +10,7 @@ export interface Pivot {
     title?: string;
     triggerButtonText?: string;
 }
-export declare const PivotModal: ({ pivotRowField, setPivotRowField, pivotColumnField, setPivotColumnField, pivotValueField, setPivotValueField, pivotAggregation, setPivotAggregation, popUpTitle, setPopUpTitle, selectedTable, SelectComponent, ButtonComponent, SecondaryButtonComponent, PopoverComponent, HeaderComponent, LabelComponent, TextComponent, selectedPivotIndex, setSelectedPivotIndex, removePivot, selectPivot, showUpdatePivot, setShowUpdatePivot, data, columns, theme, isOpen, setIsOpen, dateRange, createdPivots, setCreatedPivots, recommendedPivots, setRecommendedPivots, triggerButtonText, showPivotEditButton, showEditOnPivotClick, selectPivotOnEdit, showTrigger, rightAlign, parentRef, recommendPivotCount, }: {
+export interface PivotModalProps {
     pivotRowField: any;
     setPivotRowField: any;
     pivotColumnField: any;
@@ -22,11 +24,23 @@ export declare const PivotModal: ({ pivotRowField, setPivotRowField, pivotColumn
     selectedTable: any;
     SelectComponent: any;
     ButtonComponent: any;
-    SecondaryButtonComponent: any;
-    PopoverComponent: any;
-    HeaderComponent: any;
-    LabelComponent: any;
-    TextComponent: any;
+    SecondaryButtonComponent: (props: ButtonComponentProps) => JSX.Element;
+    PopoverComponent: (props: {
+        isOpen: boolean;
+        setIsOpen: (isOpen: boolean) => void;
+        triggerLabel?: string | undefined;
+        popoverTitle?: string | undefined;
+        popoverChildren: ReactNode;
+    }) => JSX.Element;
+    HeaderComponent: (props: {
+        label: string;
+    }) => JSX.Element;
+    LabelComponent: (props: {
+        label: string;
+    }) => JSX.Element;
+    TextComponent: (props: {
+        label: string;
+    }) => JSX.Element;
     selectedPivotIndex: any;
     setSelectedPivotIndex: any;
     removePivot: any;
@@ -43,15 +57,16 @@ export declare const PivotModal: ({ pivotRowField, setPivotRowField, pivotColumn
     setCreatedPivots: any;
     recommendedPivots: any;
     setRecommendedPivots: any;
-    triggerButtonText?: string | undefined;
-    showPivotEditButton?: boolean | undefined;
-    showEditOnPivotClick?: boolean | undefined;
-    selectPivotOnEdit?: boolean | undefined;
-    showTrigger?: boolean | undefined;
-    rightAlign?: boolean | undefined;
+    triggerButtonText?: string;
+    showPivotEditButton?: boolean;
+    showEditOnPivotClick?: boolean;
+    selectPivotOnEdit?: boolean;
+    showTrigger?: boolean;
+    rightAlign?: boolean;
     parentRef: any;
-    recommendPivotCount?: number | undefined;
-}) => import("react/jsx-runtime").JSX.Element;
+    recommendPivotCount?: number;
+}
+export declare const PivotModal: ({ pivotRowField, setPivotRowField, pivotColumnField, setPivotColumnField, pivotValueField, setPivotValueField, pivotAggregation, setPivotAggregation, popUpTitle, setPopUpTitle, selectedTable, SelectComponent, ButtonComponent, SecondaryButtonComponent, PopoverComponent, HeaderComponent, LabelComponent, TextComponent, selectedPivotIndex, setSelectedPivotIndex, removePivot, selectPivot, showUpdatePivot, setShowUpdatePivot, data, columns, theme, isOpen, setIsOpen, dateRange, createdPivots, setCreatedPivots, recommendedPivots, setRecommendedPivots, triggerButtonText, showPivotEditButton, showEditOnPivotClick, selectPivotOnEdit, showTrigger, rightAlign, parentRef, recommendPivotCount, }: PivotModalProps) => import("react/jsx-runtime").JSX.Element;
 export declare function generatePivotTableYAxis(pivot: any, cols: any, format: any): any;
 export declare function isDateField(fieldType: any): boolean;
 export declare function generatePivotTable(pivot: Pivot, data: any, dateRange: any, isComparison: boolean, rowLimit?: number, compRange?: any): {

package/dist/cjs/internals/ReportBuilder/PivotModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PivotModal.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotModal.tsx"],"names":[],"mappings":"AA+BA,MAAM,WAAW,KAAK;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAkBD,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6CA0tBtB,CAAC;AAEF,wBAAgB,uBAAuB,CAAC,KAAK,KAAA,EAAE,IAAI,KAAA,EAAE,MAAM,KAAA,OAyB1D;AAkHD,wBAAgB,WAAW,CAAC,SAAS,KAAA,WAYpC;AAgCD,wBAAgB,kBAAkB,CAChC,KAAK,EAAE,KAAK,EACZ,IAAI,EAAE,GAAG,EACT,SAAS,EAAE,GAAG,EACd,YAAY,EAAE,OAAO,EACrB,QAAQ,SAAK,EACb,SAAS,GAAE,GAAU;;;;;;EA6btB"}
+{"version":3,"file":"PivotModal.d.ts","sourceRoot":"","sources":["../../../../src/internals/ReportBuilder/PivotModal.tsx"],"names":[],"mappings":"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"}

package/dist/cjs/internals/ReportBuilder/PivotModal.js

@@ -11,6 +11,8 @@ const date_fns_1 = require("date-fns");
 const valueFormatter_1 = require("../../utils/valueFormatter");
 const ChartBuilder_1 = require("../../ChartBuilder");
 const textProcessing_1 = require("../../utils/textProcessing");
+const util_1 = require("../../components/ReportBuilder/util");
+const ast_1 = require("../../components/ReportBuilder/ast");
 const QuillHover = () => {
     return ((0, jsx_runtime_1.jsx)("style", { children: `
   .quill-hover {
@@ -73,7 +75,7 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
         return (columns || []).reduce((map, col) => {
             // only use columns shown in the report builder's table
             // also filter out id
-            if (col.field !== 'id' && !col.field.endsWith('_id')) {
+            if (col.field !== 'id') {
                 map[col.field] = col.fieldType || col.format;
             }
             return map;
@@ -193,7 +195,7 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
         return pts;
     }, [createdPivots, data]);
     const samplePivotTable = (0, react_1.useMemo)(() => {
-        if (!pivotAggregation || !pivotRowField) {
+        if (!pivotAggregation) {
             return null;
         }
         const pivot = {
@@ -229,10 +231,7 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
                             position: 'absolute',
                             top: -2,
                             right: -2,
-                        } })) }), (0, jsx_runtime_1.jsx)(PopoverComponent, { onClose: () => {
-                        setShowUpdatePivot(false);
-                        setPopUpTitle('Add Pivot');
-                    }, style: rightAlign ? { right: 0 } : {}, parentRef: parentRef, showTrigger: showTrigger, label: triggerButtonText, isOpen: isOpen, setIsOpen: setIsOpen, onClick: () => {
+                        } })) }), showTrigger && ((0, jsx_runtime_1.jsx)(SecondaryButtonComponent, { onClick: () => {
                         if (columns.length === 0) {
                             setIsOpen(false);
                         }
@@ -243,15 +242,19 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
                         if (!isOpen && recommendedPivots.length === 0) {
                             refreshPivots();
                         }
+                        setIsOpen(!isOpen);
                         setShowUpdatePivot(false);
-                    }, children: (0, jsx_runtime_1.jsx)("div", { children: showUpdatePivot ? ((0, jsx_runtime_1.jsxs)("div", { className: "ref-in-use", ref: editModalRef, style: {
+                    }, label: triggerButtonText })), (0, jsx_runtime_1.jsx)(PopoverComponent, { isOpen: isOpen, setIsOpen: (isOpen) => {
+                        if (!isOpen) {
+                            setShowUpdatePivot(false);
+                            setPopUpTitle('Add Pivot');
+                        }
+                        setIsOpen(isOpen);
+                    }, popoverChildren: (0, jsx_runtime_1.jsx)("div", { children: showUpdatePivot ? ((0, jsx_runtime_1.jsxs)("div", { className: "ref-in-use", ref: editModalRef, style: {
                                 backgroundColor: 'rgb(255, 255, 255)',
                                 display: 'flex',
                                 flexDirection: 'column',
-                            }, children: [(0, jsx_runtime_1.jsx)(HeaderComponent, { children: popUpTitle }), (0, jsx_runtime_1.jsx)("div", { style: { height: 12 } }), (0, jsx_runtime_1.jsx)("div", { style: { width: divWidth }, children: samplePivotTable && ((0, jsx_runtime_1.jsx)("div", { style: {
-                                            marginBottom: 20,
-                                            minHeight: 160,
-                                        }, children: (0, jsx_runtime_1.jsx)(PivotList_1.PivotCard, { pivotTable: samplePivotTable, theme: theme, index: 0, onSelectPivot: () => { }, selectedPivotIndex: -1, onEditPivot: () => { }, ButtonComponent: ButtonComponent, showEdit: false, clickable: false, minHeight: 140, LabelComponent: LabelComponent, TextComponent: TextComponent, HeaderComponent: HeaderComponent }) })) }), (0, jsx_runtime_1.jsxs)("div", { style: {
+                            }, children: [(0, jsx_runtime_1.jsx)(HeaderComponent, { label: popUpTitle }), (0, jsx_runtime_1.jsx)("div", { style: { height: 12 } }), (0, jsx_runtime_1.jsxs)("div", { style: {
                                         display: 'flex',
                                         flexDirection: 'column',
                                         gap: 10,
@@ -262,49 +265,55 @@ const PivotModal = ({ pivotRowField, setPivotRowField, pivotColumnField, setPivo
                                                 flexDirection: 'row',
                                                 gap: 20,
                                                 marginBottom: 5,
-                                            }, children: [(0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(LabelComponent, { children: "Row Field" }), (0, jsx_runtime_1.jsx)(SelectComponent, { id: "pivot-row-field", value: pivotRowField, onChange: (e) => {
-                                                                setPivotRowField(e === '' ? undefined : e);
+                                            }, children: [(0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(LabelComponent, { label: "Row Field" }), (0, jsx_runtime_1.jsx)(SelectComponent, { id: "pivot-row-field", value: pivotRowField, onChange: (e) => {
+                                                                setPivotRowField(e.target.value === ''
+                                                                    ? undefined
+                                                                    : e.target.value);
                                                             }, options: [
                                                                 ...columnSelectOptions.filter((option) => {
                                                                     const format = columns.find((col) => col.field === option.value)?.format;
                                                                     return (format === 'string' ||
-                                                                        ChartBuilder_1.dateFormatOptions.includes(format));
+                                                                        ChartBuilder_1.dateFormatOptions.includes(format) ||
+                                                                        (0, util_1.isIdColumn)(option.value));
                                                                 }),
-                                                            ], theme: theme })] }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(LabelComponent, { children: "Column Field" }), (0, jsx_runtime_1.jsx)(SelectComponent, { id: "pivot-row-field", value: pivotColumnField, onChange: (e) => {
-                                                                setPivotColumnField(e === '' ? undefined : e);
+                                                            ] })] }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(LabelComponent, { label: "Column Field" }), (0, jsx_runtime_1.jsx)(SelectComponent, { id: "pivot-row-field", value: pivotColumnField, onChange: (e) => {
+                                                                setPivotColumnField(e.target.value === ''
+                                                                    ? undefined
+                                                                    : e.target.value);
                                                             }, options: [
                                                                 ...columnSelectOptions.filter((option) => {
-                                                                    return (columns.find((col) => col.field === option.value)
-                                                                        ?.format === 'string');
+                                                                    return (columns.find((col) => col.field === option.value)?.format === 'string');
                                                                 }),
-                                                            ], theme: theme })] })] }), (0, jsx_runtime_1.jsxs)("div", { style: {
+                                                            ] })] })] }), (0, jsx_runtime_1.jsxs)("div", { style: {
                                                 display: 'flex',
                                                 flexDirection: 'row',
                                                 gap: 20,
                                                 marginBottom: 20,
-                                            }, children: [(0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(LabelComponent, { children: "Value Field" }), (0, jsx_runtime_1.jsx)(SelectComponent, { id: "pivot-row-field", value: pivotValueField, onChange: (e) => {
-                                                                setPivotValueField(e === '' ? undefined : e);
+                                            }, children: [(0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(LabelComponent, { label: "Value Field" }), (0, jsx_runtime_1.jsx)(SelectComponent, { id: "pivot-row-field", value: pivotValueField, onChange: (e) => {
+                                                                setPivotValueField(e.target.value === ''
+                                                                    ? undefined
+                                                                    : e.target.value);
                                                             }, options: [
                                                                 ...columnSelectOptions.filter((option) => {
-                                                                    return (option.value === '' ||
-                                                                        ChartBuilder_1.numberFormatOptions.includes(columns.find((col) => col.field === option.value)?.format));
+                                                                    return ((option.value === '' ||
+                                                                        ChartBuilder_1.numberFormatOptions.includes(columns.find((col) => col.field === option.value)?.format)) &&
+                                                                        !(0, util_1.isIdColumn)(option.value));
                                                                 }),
-                                                            ], theme: theme })] }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(LabelComponent, { children: "Aggregation Type" }), (0, jsx_runtime_1.jsx)(SelectComponent, { id: "pivot-row-field", value: pivotAggregation, theme: theme, onChange: (e) => {
-                                                                if (e !== 'count' &&
+                                                            ] })] }), (0, jsx_runtime_1.jsxs)("div", { children: [(0, jsx_runtime_1.jsx)(LabelComponent, { label: "Aggregation Type" }), (0, jsx_runtime_1.jsx)(SelectComponent, { id: "pivot-row-field", value: pivotAggregation, onChange: (e) => {
+                                                                if (e.target.value !== 'count' &&
                                                                     pivotValueField &&
                                                                     !ChartBuilder_1.numberFormatOptions.includes(columns.find((col) => col.field === pivotValueField)?.format)) {
                                                                     setPivotValueField(null);
                                                                 }
-                                                                setPivotAggregation(e === '' ? undefined : e);
+                                                                setPivotAggregation(e.target.value === ''
+                                                                    ? undefined
+                                                                    : e.target.value);
                                                             }, options: [
                                                                 ...['sum', 'average', 'count', 'max', 'min'].map((option) => {
                                                                     return { label: option, value: option };
                                                                 }),
                                                             ] })] })] })] }), (0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(ButtonComponent, { id: "custom-button", onClick: () => {
                                             const errors = [];
-                                            if (!pivotRowField) {
-                                                errors.push('Row field cannot be empty');
-                                            }
                                             if (!pivotValueField && pivotAggregation !== 'count') {
                                                 errors.push("Value field cannot be empty when aggregation is not 'count'");
                                             }
@@ -547,7 +556,7 @@ const fixBigQueryData = (data = []) => {
 function generatePivotTable(pivot, data, dateRange, isComparison, rowLimit = -1, compRange = null) {
     // If there is no rowField, aggregate on the valueField
     if (!pivot.rowField) {
-        return valueFieldAggregation(data, pivot.valueField, pivot.aggregationType);
+        return valueFieldAggregation(data, pivot.valueField, pivot.aggregationType, isComparison);
     }
     // Handle edge-case for BigQuery objects.
     data = fixBigQueryData(data);
@@ -767,15 +776,6 @@ function generatePivotTable(pivot, data, dateRange, isComparison, rowLimit = -1,
                     }
                     break;
                 case 'average':
-                    value = filteredData.length
-                        ? filteredData.reduce((sum, item) => sum + parseFloat(item[key] ?? 0), 0) / filteredData.length
-                        : 0;
-                    if (isComparison) {
-                        comparisonValue = comparisonFilteredData.length
-                            ? comparisonFilteredData.reduce((sum, item) => sum + parseFloat(item[key] ?? 0), 0) / comparisonFilteredData.length
-                            : 0;
-                    }
-                    break;
                 case 'avg':
                     value = filteredData.length
                         ? filteredData.reduce((sum, item) => sum + parseFloat(item[key] ?? 0), 0) / filteredData.length
@@ -879,12 +879,18 @@ function generatePivotTable(pivot, data, dateRange, isComparison, rowLimit = -1,
                 if (pivot.rowFieldType === 'date') {
                     return new Date(a[pivot.rowField]) - new Date(b[pivot.rowField]);
                 }
+                else if ((0, ast_1.isNumericColumnType)(pivot.rowFieldType)) {
+                    return a[pivot.rowField] - b[pivot.rowField];
+                }
                 return a[pivot.rowField].localeCompare(b[pivot.rowField]);
             }
             else {
                 if (pivot.rowFieldType === 'date') {
                     return new Date(b[pivot.rowField]) - new Date(a[pivot.rowField]);
                 }
+                else if ((0, ast_1.isNumericColumnType)(pivot.rowFieldType)) {
+                    return a[pivot.rowField] - b[pivot.rowField];
+                }
                 return b[pivot.rowField].localeCompare(a[pivot.rowField]);
             }
         });
@@ -892,30 +898,45 @@ function generatePivotTable(pivot, data, dateRange, isComparison, rowLimit = -1,
     return { rows: pivotRows, columns };
 }
 exports.generatePivotTable = generatePivotTable;
-function valueFieldAggregation(data, valueField, aggregationType) {
-    let value;
+function valueFieldAggregation(data, valueField, aggregationType, isComparison) {
+    let value = 0;
+    let comparisonValue = 0;
     switch (aggregationType) {
         case 'sum':
             value = data.reduce((sum, item) => sum + parseFloat(item[valueField] ?? 0), 0);
+            if (isComparison) {
+                comparisonValue = data.reduce((sum, item) => sum + parseFloat(item[`comparison_${valueField}`] ?? 0), 0);
+            }
             break;
         case 'count':
-            value = data.length;
+            value = data.reduce((count, item) => count + (item[valueField] ? 1 : 0), 0);
+            if (isComparison) {
+                comparisonValue = data.reduce((count, item) => count + (item[`comparison_${valueField}`] ? 1 : 0), 0);
+            }
             break;
         case 'avg':
-            value = data.length
-                ? data.reduce((sum, item) => sum + parseFloat(item[valueField] ?? 0), 0) / data.length
-                : 0;
-            break;
         case 'average':
-            value = data.length
-                ? data.reduce((sum, item) => sum + parseFloat(item[valueField] ?? 0), 0) / data.length
-                : 0;
+            const count = data.reduce((count, item) => count + (item[valueField] ? 1 : 0), 0);
+            value =
+                data.reduce((sum, item) => sum + parseFloat(item[valueField] ?? 0), 0) /
+                    (count === 0 ? 1 : count);
+            if (isComparison) {
+                const comparisonCount = data.reduce((count, item) => count + (item[`comparison_${valueField}`] ? 1 : 0), 0);
+                comparisonValue =
+                    data.reduce((sum, item) => sum + parseFloat(item[`comparison_${valueField}`] ?? 0), 0) / (comparisonCount === 0 ? 1 : comparisonCount);
+            }
             break;
         case 'max':
             value = data.reduce((max, item) => Math.max(max, parseFloat(item[valueField] ?? 0)), -Infinity);
+            if (isComparison) {
+                comparisonValue = data.reduce((max, item) => Math.max(max, parseFloat(item[`comparison_${valueField}`] ?? 0)), -Infinity);
+            }
             break;
         case 'min':
             value = data.reduce((min, item) => Math.min(min, parseFloat(item[valueField] ?? 0)), Infinity);
+            if (isComparison) {
+                comparisonValue = data.reduce((min, item) => Math.min(min, parseFloat(item[`comparison_${valueField}`] ?? 0)), Infinity);
+            }
             break;
         // Implement other aggregation types as needed
         default:
@@ -923,6 +944,9 @@ function valueFieldAggregation(data, valueField, aggregationType) {
     }
     const row = {};
     row[valueField] = value;
+    if (isComparison) {
+        row[`comparison_${valueField}`] = comparisonValue;
+    }
     return {
         rows: [row],
         columns: [{ label: (0, textProcessing_1.snakeCaseToTitleCase)(valueField), field: valueField }],

package/dist/cjs/utils/dataFetcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AAEA,wBAAsB,OAAO,CAC3B,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,GAAG,EACtB,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBA8DhB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBA+BhB"}
+{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AAEA,wBAAsB,OAAO,CAC3B,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,GAAG,EACtB,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBAgEhB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBA+BhB"}

package/dist/cjs/utils/dataFetcher.js

@@ -23,6 +23,7 @@ async function getData(client, cloudQueryEndpoint, noCred, hostedRequestBody, cl
             let result;
             if (responseJson.data?.data) {
                 result = {
+                    fields: responseJson?.data.queries?.queryResults[0]?.fields,
                     ...responseJson.data.data,
                     rows: responseJson?.data.queries?.queryResults[0]?.rows,
                     compareRows: responseJson?.data.queries?.queryResults[1]?.rows,
@@ -30,6 +31,7 @@ async function getData(client, cloudQueryEndpoint, noCred, hostedRequestBody, cl
             }
             else {
                 result = {
+                    fields: responseJson?.queries?.queryResults[0]?.fields,
                     ...responseJson.data,
                     rows: responseJson?.queries?.queryResults[0]?.rows,
                     compareRows: responseJson?.queries?.queryResults[1]?.rows,

package/dist/cjs/utils/width.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Calculates the width that the first child of the given container should be
+ * such that the first child takes up as much space as possible in the container
+ * without crowding out the rest of its siblings. Also respects flexbox gap.
+ * @param containerRef the ref of the container element
+ * @param setState a callback to set the new width of the first child
+ * @param options config options ('gap' sets the size of the flexbox gap)
+ */
+export declare const updateFirstChildWidth: (containerRef: React.RefObject<HTMLElement>, setState: (value: React.SetStateAction<number>) => void, options?: {
+    gap: number;
+}) => void;
+//# sourceMappingURL=width.d.ts.map

package/dist/cjs/utils/width.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"width.d.ts","sourceRoot":"","sources":["../../../src/utils/width.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,iBAClB,MAAM,SAAS,CAAC,WAAW,CAAC,oBACxB,MAAM,cAAc,CAAC,MAAM,CAAC,KAAK,IAAI,YAC9C;IAAE,GAAG,EAAE,MAAM,CAAA;CAAE,SAazB,CAAC"}

package/dist/cjs/utils/width.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.updateFirstChildWidth = void 0;
+/**
+ * Calculates the width that the first child of the given container should be
+ * such that the first child takes up as much space as possible in the container
+ * without crowding out the rest of its siblings. Also respects flexbox gap.
+ * @param containerRef the ref of the container element
+ * @param setState a callback to set the new width of the first child
+ * @param options config options ('gap' sets the size of the flexbox gap)
+ */
+const updateFirstChildWidth = (containerRef, setState, options = { gap: 0 }) => {
+    if (containerRef.current) {
+        const element = containerRef.current;
+        const totalWidth = element.getBoundingClientRect().width;
+        const gapWidth = options.gap * (element.childElementCount - 1);
+        let siblingsWidth = 0;
+        const children = Array.from(containerRef.current.children);
+        for (let i = 1; i < children.length; i++) {
+            siblingsWidth += children[i].getBoundingClientRect().width;
+        }
+        setState(totalWidth - siblingsWidth - gapWidth);
+    }
+};
+exports.updateFirstChildWidth = updateFirstChildWidth;

package/dist/esm/Chart.d.ts

@@ -1,46 +1,6 @@
 /// <reference types="react" />
 import { QuillTheme } from './QuillProvider';
-interface BaseChartProps {
-    colors?: string[];
-    containerStyle?: React.CSSProperties;
-    dateFilter?: any;
-    theme?: any;
-    isDateFilter?: boolean;
-    isAnimationActive?: boolean;
-    hideXAxis?: boolean;
-    hideYAxis?: boolean;
-    hideCartesianGrid?: boolean;
-    dashedComparison?: boolean;
-    dateRangeFilterDisabled?: boolean;
-    singlePointStyle?: 'dot' | 'line';
-    mapColorsToFields?: (_dashboardItem: DashboardItem, _theme: QuillTheme) => ColorMapType;
-}
-interface WithChartId extends BaseChartProps {
-    chartId: string;
-}
-export type FieldFormat = 'whole_number' | 'one_decimal_place' | 'two_decimal_places' | 'dollar_amount' | 'dollar_cents' | 'MMM_yyyy' | 'MMM_dd_yyyy' | 'MMM_dd-MMM_dd' | 'MMM_dd_hh:mm_ap_pm' | 'hh_ap_pm' | 'percent' | 'string';
-interface YAxisField {
-    label: string;
-    field: string;
-    chartType: string;
-    format: FieldFormat;
-}
-export interface DashboardItem {
-    id: string;
-    name: string;
-    chartType: string;
-    xAxisField: string;
-    xAxisLabel: string;
-    xAxisFormat: FieldFormat;
-    yAxisFields: YAxisField[];
-    rows: any[];
-    columns: any[];
-    pivot: any;
-}
-interface WithConfig extends BaseChartProps {
-    config: DashboardItem | any;
-}
-type ChartProps = WithChartId | WithConfig;
+import { type DashboardItem } from './Dashboard';
 export declare function didFiltersChange(dashboardItem: any, filters: any): boolean;
 export type ColorMapType = {
     [key: string]: {
@@ -52,6 +12,121 @@ export type ColorMapType = {
         comparisonGradientStop?: string;
     };
 };
-declare const Chart: (data: ChartProps) => import("react/jsx-runtime").JSX.Element;
+/**
+ * Props for the Quill Chart component.
+ */
+export interface ChartProps {
+    /**
+     * A dashboard item to render, if any.
+     *
+     * When config is passed, the chart will not refetch the given dashboard item
+     * and will instead simply render the item it was given.
+     *
+     * A `config` must be passed if `chartId` is not present.
+     */
+    config?: DashboardItem | any;
+    /**
+     * A dashboard item to render, if any.
+     *
+     * When a chartId is passed, the chart will first fetch the data necessary to
+     * render this chart, and then it will render the dashboard item that it
+     * receives from the server.
+     *
+     * A `chartId` must be passed if `config` is not present.
+     */
+    chartId?: string;
+    /**
+     * A list of color strings used to color the chart.
+     *
+     * For example, a pie chart would use the colors for each section and a bar
+     * chart would use the colors for each bar.
+     */
+    colors?: string[];
+    /**
+     * Applies the given date filter to this chart, if any.
+     */
+    dateFilter?: any;
+    /**
+     * Whether this chart has a date filter.
+     */
+    isDateFilter?: boolean;
+    /**
+     * Whether to show animations on render complete.
+     */
+    isAnimationActive?: boolean;
+    /**
+     * Whether to hide the x axis.
+     */
+    hideXAxis?: boolean;
+    /**
+     * Whether to hide the y axis.
+     */
+    hideYAxis?: boolean;
+    /**
+     * Whether to hide the cartesian grid lines.
+     */
+    hideCartesianGrid?: boolean;
+    /**
+     * Whether the date range filter has been disabled.
+     */
+    hideDateRangeFilter?: boolean;
+    /**
+     * Whether the comparison range shows as dashed for date comparison line
+     * charts (as opposed to the default solid line).
+     */
+    comparisonLineStyle?: 'solid' | 'dashed';
+    /**
+     * An optional function that takes a dashboard item and theme and returns a
+     * map of keys used in that dashboard item to the colors they should use.
+     *
+     * The color values support RGB hexcodes and CSS color literals.
+     *
+     * @example
+     * ```js
+     * let mapColorsToFields = (item, theme) => {
+     *   return {
+     *     // all the queries with yAxis of 'amount' get colored this way:
+     *     amount: {
+     *       primary: 'red',
+     *       comparison: 'gray',
+     *       primaryGradientStart: 'red',
+     *       primaryGradientStop: 'lightred',
+     *       comparisonGradientStart: '#EFEFEF',
+     *       comparisonGradientStop: '#EFEFEF00',
+     *     },
+     *     total: {
+     *       primary: 'red'
+     *     },
+     *   };
+     * }
+     * ```
+     */
+    mapColorsToFields?: (dashboardItem: DashboardItem, theme: QuillTheme) => ColorMapType;
+    /**
+     * Styles the top-level container of the Chart.
+     */
+    containerStyle?: React.CSSProperties;
+}
+/**
+ * ### Quill Chart
+ *
+ * A simple component that displays the given data in one of many chart types.
+ *
+ * @example
+ * ```js
+ * // Usage with chart id (will auto-fetch data)
+ * <Chart chartId="12345" />
+ * ```
+ *
+ * @example
+ * ```js
+ * // Usage with a dashboard item (will not auto-fetch data)
+ * <Chart config={dashboardItem} />
+ * ```
+ *
+ * ### Chart API
+ * @see https://docs.quillsql.com/components/chart
+ */
+declare const Chart: (props: ChartProps) => import("react/jsx-runtime").JSX.Element;
 export default Chart;
 //# sourceMappingURL=Chart.d.ts.map

package/dist/esm/Chart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Chart.d.ts","sourceRoot":"","sources":["../../src/Chart.tsx"],"names":[],"mappings":";AAYA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAgB7C,UAAU,cAAc;IACtB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACrC,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,gBAAgB,CAAC,EAAE,OAAO,CAAC;IAC3B,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,gBAAgB,CAAC,EAAE,KAAK,GAAG,MAAM,CAAC;IAClC,iBAAiB,CAAC,EAAE,CAClB,cAAc,EAAE,aAAa,EAC7B,MAAM,EAAE,UAAU,KACf,YAAY,CAAC;CACnB;AAED,UAAU,WAAY,SAAQ,cAAc;IAC1C,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,WAAW,GACnB,cAAc,GACd,mBAAmB,GACnB,oBAAoB,GACpB,eAAe,GACf,cAAc,GACd,UAAU,GACV,aAAa,GACb,eAAe,GACf,oBAAoB,GACpB,UAAU,GACV,SAAS,GACT,QAAQ,CAAC;AAEb,UAAU,UAAU;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,WAAW,CAAC;CACrB;AAED,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,WAAW,EAAE,WAAW,CAAC;IACzB,WAAW,EAAE,UAAU,EAAE,CAAC;IAC1B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,OAAO,EAAE,GAAG,EAAE,CAAC;IACf,KAAK,EAAE,GAAG,CAAC;CACZ;AAED,UAAU,UAAW,SAAQ,cAAc;IACzC,MAAM,EAAE,aAAa,GAAG,GAAG,CAAC;CAC7B;AAED,KAAK,UAAU,GAAG,WAAW,GAAG,UAAU,CAAC;AA+D3C,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,WAQhE;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,uBAAuB,CAAC,EAAE,MAAM,CAAC;QACjC,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACjC,CAAC;CACH,CAAC;AAaF,QAAA,MAAM,KAAK,SAAU,UAAU,4CAqC9B,CAAC;AAkiBF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"Chart.d.ts","sourceRoot":"","sources":["../../src/Chart.tsx"],"names":[],"mappings":";AAWA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAgB7C,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAiGjD,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,WAQhE;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,CAAC,GAAG,EAAE,MAAM,GAAG;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,UAAU,CAAC,EAAE,MAAM,CAAC;QACpB,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,uBAAuB,CAAC,EAAE,MAAM,CAAC;QACjC,sBAAsB,CAAC,EAAE,MAAM,CAAC;KACjC,CAAC;CACH,CAAC;AAeF;;GAEG;AACH,MAAM,WAAW,UAAU;IACzB;;;;;;;OAOG;IACH,MAAM,CAAC,EAAE,aAAa,GAAG,GAAG,CAAC;IAE7B;;;;;;;;OAQG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAElB;;OAEG;IACH,UAAU,CAAC,EAAE,GAAG,CAAC;IAEjB;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC;IAEvB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;OAEG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;;OAGG;IACH,mBAAmB,CAAC,EAAE,OAAO,GAAG,QAAQ,CAAC;IAEzC;;;;;;;;;;;;;;;;;;;;;;;;;OAyBG;IACH,iBAAiB,CAAC,EAAE,CAClB,aAAa,EAAE,aAAa,EAC5B,KAAK,EAAE,UAAU,KACd,YAAY,CAAC;IAElB;;OAEG;IACH,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;CACtC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,QAAA,MAAM,KAAK,UAAW,UAAU,4CAqC/B,CAAC;AA+hBF,eAAe,KAAK,CAAC"}