@quillsql/react 2.12.51 → 2.12.53

package/dist/esm/components/Dashboard/DataLoader.d.ts

@@ -10,6 +10,8 @@ export type DataLoaderChildProps = {
         direction: string;
     }) => void;
     data: QuillReport;
+    rowCount?: number;
+    rowCountIsLoading?: boolean;
 };
 export default function DataLoader({ item, children, filters, }: {
     item: any;
@@ -31,6 +33,8 @@ export type ChartDataLoaderChildProps = {
     error?: string;
     data: QuillReport;
     dateBucket?: string;
+    rowCount?: number;
+    rowCountIsLoading?: boolean;
 };
 export declare const ChartDataLoader: ({ item, children, dateBucket, additionalProcessing, filters, }: {
     item: any;
@@ -38,7 +42,7 @@ export declare const ChartDataLoader: ({ item, children, dateBucket, additionalP
     mapColorsToFields?: ((_report: QuillReport, _theme: QuillTheme) => ColorMapType) | undefined;
     additionalProcessing?: any;
     filters: any[] | null;
-    children: ({ isLoading, error, data, dateBucket, }: ChartDataLoaderChildProps) => JSX.Element;
+    children: ({ isLoading, error, data, dateBucket, rowCount, rowCountIsLoading, }: ChartDataLoaderChildProps) => JSX.Element;
 }) => JSX.Element;
 export {};
 //# sourceMappingURL=DataLoader.d.ts.map

package/dist/esm/components/Dashboard/DataLoader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataLoader.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DataLoader.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,WAAW,EAAuB,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAmCjD,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,YAAY,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACnE,IAAI,EAAE,WAAW,CAAC;CACnB,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAI,EACJ,QAAQ,EACR,OAAO,GACR,EAAE;IACD,IAAI,EAAE,GAAG,CAAC;IACV,OAAO,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,CAAC,EACT,SAAS,EACT,KAAK,EACL,YAAY,EACZ,YAAY,EACZ,IAAI,GACL,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;CACzC,GAAG,GAAG,CAAC,OAAO,CAiJd;AAED,KAAK,YAAY,GAAG;IAClB,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,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,WAAW,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAIF,eAAO,MAAM,eAAe;UAOpB,GAAG;;mCAGE,WAAW,UACZ,UAAU,KACf,YAAY;2BACM,GAAG;aACjB,GAAG,EAAE,GAAG,IAAI;wDAMlB,yBAAyB,KAAK,WAAW;MAC1C,WA4EH,CAAC"}
+{"version":3,"file":"DataLoader.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/DataLoader.tsx"],"names":[],"mappings":";AAOA,OAAO,EAAE,WAAW,EAAuB,MAAM,qBAAqB,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAoCjD,MAAM,MAAM,oBAAoB,GAAG;IACjC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,YAAY,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;IACnE,IAAI,EAAE,WAAW,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAI,EACJ,QAAQ,EACR,OAAO,GACR,EAAE;IACD,IAAI,EAAE,GAAG,CAAC;IACV,OAAO,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,CAAC,EACT,SAAS,EACT,KAAK,EACL,YAAY,EACZ,YAAY,EACZ,IAAI,GACL,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;CACzC,GAAG,GAAG,CAAC,OAAO,CA+Kd;AAED,KAAK,YAAY,GAAG;IAClB,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,MAAM,MAAM,yBAAyB,GAAG;IACtC,SAAS,EAAE,OAAO,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,WAAW,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;CAC7B,CAAC;AAIF,eAAO,MAAM,eAAe;UAOpB,GAAG;;mCAGE,WAAW,UACZ,UAAU,KACf,YAAY;2BACM,GAAG;aACjB,GAAG,EAAE,GAAG,IAAI;qFAQlB,yBAAyB,KAAK,WAAW;MAC1C,WA4EH,CAAC"}

package/dist/esm/components/Dashboard/DataLoader.js

@@ -2,9 +2,9 @@ import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 import { useContext, useEffect, useState } from 'react';
 import { didFiltersChange } from '../../Chart';
 import { ClientContext, DashboardContext, SchemaDataContext, } from '../../Context';
-import { convertInternalReportToReport, EMPTY_INTERNAL_REPORT, fetchReport, } from '../../utils/report';
+import { convertInternalReportToReport, EMPTY_INTERNAL_REPORT, fetchReport, fetchReportRowCount, } from '../../utils/report';
 import { shouldFetchMore, DEFAULT_PAGINATION, shouldSortInMemory, } from '../../utils/paginationProcessing';
-import { fetchTableByReport } from '../../utils/tableProcessing';
+import { fetchResultsByReport } from '../../utils/tableProcessing';
 const constructReportFromItem = (item) => {
     return {
         ...EMPTY_INTERNAL_REPORT,
@@ -36,6 +36,22 @@ export default function DataLoader({ item, children, filters, }) {
     const [additionalProcessing, setAdditionProcessing] = useState({
         page: DEFAULT_PAGINATION,
     });
+    const [rowCount, setRowCount] = useState(dashboard[item._id]?.rowCount ?? 0);
+    const [rowCountIsLoading, setRowCountIsLoading] = useState(false);
+    const fetchRowCount = async (processing) => {
+        if (!client || !filters) {
+            return;
+        }
+        setRowCountIsLoading(true);
+        const rowCount = await fetchReportRowCount(item._id, client, true, filters, processing, schemaData.customFields);
+        dispatch({
+            type: 'UPDATE_DASHBOARD_ITEM',
+            id: item._id,
+            data: { rowCount },
+        });
+        setRowCount(rowCount);
+        setRowCountIsLoading(false);
+    };
     const onPageChange = (page) => {
         if (additionalProcessing &&
             additionalProcessing.page &&
@@ -69,7 +85,7 @@ export default function DataLoader({ item, children, filters, }) {
             setLoading(true);
             try {
                 const updatedProcessing = { ...additionalProcessing, ...processing };
-                const paginatedRows = await fetchTableByReport(report.id, client, updatedProcessing, filters, schemaData.customFields);
+                const paginatedRows = await fetchResultsByReport(report.id, client, updatedProcessing, filters, schemaData.customFields);
                 if (paginatedRows.error) {
                     throw new Error('Error fetching chart');
                 }
@@ -106,13 +122,14 @@ export default function DataLoader({ item, children, filters, }) {
             return;
         }
         setLoading(true);
-        const { report, error } = await fetchReport(item._id, client, true, filters, processing, undefined, schemaData.customFields);
+        const { report: fetchedReport, error } = await fetchReport(item._id, client, true, filters, processing, undefined, schemaData.customFields);
+        fetchRowCount(processing);
         dispatch({
             type: 'ADD_DASHBOARD_ITEM',
             id: item._id,
-            data: { ...report, triggerReload: false },
+            data: { ...fetchedReport, triggerReload: false },
         });
-        const convertedReport = convertInternalReportToReport(report);
+        const convertedReport = convertInternalReportToReport(fetchedReport);
         setReport(convertedReport);
         setAdditionProcessing(processing);
         setError(error);
@@ -136,6 +153,8 @@ export default function DataLoader({ item, children, filters, }) {
             onPageChange,
             onSortChange,
             data: report,
+            rowCount,
+            rowCountIsLoading,
         }) }));
 }
 // The same data-loader pattern as above, but with special logic for charts

package/dist/esm/components/Dashboard/TableComponent.d.ts

@@ -1,11 +1,12 @@
 /// <reference types="react" />
 import { QuillReport } from '../../models/Report';
-export default function QuillTableComponent({ report, onClick, isLoading, error, rowCount, onPageChange, onSortChange, }: {
+export default function QuillTableComponent({ report, onClick, isLoading, error, rowCount, rowCountIsLoading, onPageChange, onSortChange, }: {
     report: QuillReport;
     onClick?: (report: QuillReport) => void;
     isLoading?: boolean;
     error?: string;
     rowCount?: number;
+    rowCountIsLoading?: boolean;
     onPageChange?: (page: number) => void;
     onSortChange?: (sort: {
         field: string;

package/dist/esm/components/Dashboard/TableComponent.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"TableComponent.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/TableComponent.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAKlD,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAC1C,MAAM,EACN,OAAO,EACP,SAAS,EACT,KAAK,EACL,QAAQ,EACR,YAAY,EACZ,YAAY,GACb,EAAE;IACD,MAAM,EAAE,WAAW,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,IAAI,CAAC;IACxC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CACrE,GAAG,GAAG,CAAC,OAAO,CAyFd"}
+{"version":3,"file":"TableComponent.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/TableComponent.tsx"],"names":[],"mappings":";AAIA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAKlD,MAAM,CAAC,OAAO,UAAU,mBAAmB,CAAC,EAC1C,MAAM,EACN,OAAO,EACP,SAAS,EACT,KAAK,EACL,QAAQ,EACR,iBAAiB,EACjB,YAAY,EACZ,YAAY,GACb,EAAE;IACD,MAAM,EAAE,WAAW,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,IAAI,CAAC;IACxC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACtC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,KAAK,IAAI,CAAC;CACrE,GAAG,GAAG,CAAC,OAAO,CA0Fd"}

package/dist/esm/components/Dashboard/TableComponent.js

@@ -6,7 +6,7 @@ import ChartError from '../Chart/ChartError';
 import { useExport } from '../../hooks/useExport';
 import { DEFAULT_PAGINATION } from '../../utils/paginationProcessing';
 import { ThemeContext } from '../../Context';
-export default function QuillTableComponent({ report, onClick, isLoading, error, rowCount, onPageChange, onSortChange, }) {
+export default function QuillTableComponent({ report, onClick, isLoading, error, rowCount, rowCountIsLoading, onPageChange, onSortChange, }) {
     const [theme] = useContext(ThemeContext);
     const [initialLoad, setInitialLoad] = useState(true);
     const { downloadCSV } = useExport(report?.id);
@@ -40,7 +40,7 @@ export default function QuillTableComponent({ report, onClick, isLoading, error,
                 } })) : error ? (_jsx("div", { style: {
                     width: '100%',
                     height: '400px',
-                }, children: _jsx(ChartError, { errorMessage: error }) })) : (_jsx(QuillTable, { isLoading: isLoading, rows: report.rows ?? [], rowCount: rowCount, columns: report.columns, rowsPerPage: report.pagination?.rowsPerPage ?? DEFAULT_PAGINATION.rowsPerPage, containerStyle: {
+                }, children: _jsx(ChartError, { errorMessage: error }) })) : (_jsx(QuillTable, { isLoading: isLoading, rows: report.rows ?? [], rowCount: rowCount, rowCountIsLoading: rowCountIsLoading, columns: report.columns, rowsPerPage: report.pagination?.rowsPerPage ?? DEFAULT_PAGINATION.rowsPerPage, containerStyle: {
                     width: '100%',
                     height: '400px',
                 }, downloadCSV: () => {

package/dist/esm/components/Dashboard/util.d.ts

@@ -1,7 +1,7 @@
-import { Client } from '../../models/Client';
+import { QuillProviderClient } from '../../models/Client';
 export declare function validateTemplatesAgainstFilters(filters: any[], templates: any[]): {
     valid: boolean;
     error: string;
 };
-export declare function addTemplatesToDashboard(name: any, newTemplates: any[], client: Client, dashboardData: any): Promise<any>;
+export declare function addTemplatesToDashboard(name: any, newTemplates: any[], client: QuillProviderClient, dashboardData: any): Promise<any>;
 //# sourceMappingURL=util.d.ts.map

package/dist/esm/components/Dashboard/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAG7C,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,GAAG,EAAE,EACd,SAAS,EAAE,GAAG,EAAE,GACf;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAiCnC;AAED,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,GAAG,EAAE,EACnB,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,GAAG,GACjB,OAAO,CAAC,GAAG,CAAC,CAiDd"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../src/components/Dashboard/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAG1D,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,GAAG,EAAE,EACd,SAAS,EAAE,GAAG,EAAE,GACf;IAAE,KAAK,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAiCnC;AAED,wBAAsB,uBAAuB,CAC3C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,GAAG,EAAE,EACnB,MAAM,EAAE,mBAAmB,EAC3B,aAAa,EAAE,GAAG,GACjB,OAAO,CAAC,GAAG,CAAC,CAiDd"}

package/dist/esm/components/Dashboard/util.js

@@ -36,13 +36,13 @@ export function validateTemplatesAgainstFilters(filters, templates) {
 }
 export async function addTemplatesToDashboard(name, newTemplates, client, dashboardData) {
     try {
-        const { publicKey, customerId } = client;
+        const { publicKey, organizationId } = client;
         const hostedBody = {
             metadata: {
                 dashboardName: name,
                 task: 'add-from-template',
                 clientId: publicKey,
-                orgId: customerId || '*',
+                orgId: organizationId || '*',
                 templateReportIds: newTemplates.map((template) => template._id),
             },
         };

package/dist/esm/components/QuillMultiSelect.d.ts

@@ -2,7 +2,7 @@ import { MultiSelectComponentProps } from './UiComponents';
 /**
  * A robust select component that implements the new minimal Select interface.
  */
-export declare function QuillMultiSelectComponent({ options, width, onChange, label, value, }: MultiSelectComponentProps): import("react/jsx-runtime").JSX.Element;
+export declare function QuillMultiSelectComponent({ options, width, onChange, label, value, isLoading, }: MultiSelectComponentProps): import("react/jsx-runtime").JSX.Element;
 export declare const ListboxTextInput: ({ value, onChange, placeholder, }: {
     value: string;
     onChange: (e: string) => void;

package/dist/esm/components/QuillMultiSelect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QuillMultiSelect.d.ts","sourceRoot":"","sources":["../../../src/components/QuillMultiSelect.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAgC3D;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,EACxC,OAAO,EACP,KAAK,EACL,QAAQ,EACR,KAAK,EACL,KAAK,GACN,EAAE,yBAAyB,2CAsQ3B;AAED,eAAO,MAAM,gBAAgB;WAKpB,MAAM;kBACC,MAAM,KAAK,IAAI;iBAChB,MAAM;6CAyDpB,CAAC"}
+{"version":3,"file":"QuillMultiSelect.d.ts","sourceRoot":"","sources":["../../../src/components/QuillMultiSelect.tsx"],"names":[],"mappings":"AACA,OAAO,EAAkB,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAiC3E;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,EACxC,OAAO,EACP,KAAK,EACL,QAAQ,EACR,KAAK,EACL,KAAK,EACL,SAAS,GACV,EAAE,yBAAyB,2CAsO3B;AAED,eAAO,MAAM,gBAAgB;WAKpB,MAAM;kBACC,MAAM,KAAK,IAAI;iBAChB,MAAM;6CAyDpB,CAAC"}

package/dist/esm/components/QuillMultiSelect.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useOnClickOutside } from '../hooks';
-import { useContext, useEffect, useRef, useState, } from 'react';
+import { LoadingSpinner } from './UiComponents';
+import { useContext, useEffect, useMemo, useRef, useState, } from 'react';
 import { ThemeContext } from '../Context';
 /**
  * Helper function for displaying option labels
@@ -14,20 +15,18 @@ function displaySelectedOptionLabels({ options, value, }) {
         return 'Select';
     }
     return matchingOptions
-        .map((elem) => elem.label)
+        .map((elem) => elem.label ?? '-')
         .join(', ');
 }
 /**
  * A robust select component that implements the new minimal Select interface.
  */
-export function QuillMultiSelectComponent({ options, width, onChange, label, value, }) {
+export function QuillMultiSelectComponent({ options, width, onChange, label, value, isLoading, }) {
     const [theme] = useContext(ThemeContext);
     const [selectedOptions, setSelectedOptions] = useState([]);
     const [showModal, setShowModal] = useState(false);
     const modalRef = useRef(null);
     const debounceTimeoutId = useRef(null);
-    // const [searchQuery, setSearchQuery] = useState('');
-    // const [filteredOptions, setFilteredOptions] = useState(options);
     useOnClickOutside(modalRef, () => setShowModal(false));
     useEffect(() => {
         if (!value) {
@@ -37,6 +36,21 @@ export function QuillMultiSelectComponent({ options, width, onChange, label, val
             setSelectedOptions(value);
         }
     }, [value]);
+    const sortedItems = useMemo(() => {
+        // Sort null to top
+        return options.sort((a, b) => {
+            if (a.value === null) {
+                return -1;
+            }
+            if (b.value === null) {
+                return 1;
+            }
+            return a.label.localeCompare(b.label);
+        });
+    }, [options]);
+    const nullLabel = useMemo(() => {
+        return sortedItems.some((item) => item.value === '-') ? 'None' : '-';
+    }, [sortedItems]);
     const debounce = (updatedChangeEvent) => {
         if (debounceTimeoutId.current) {
             clearTimeout(debounceTimeoutId.current);
@@ -45,14 +59,6 @@ export function QuillMultiSelectComponent({ options, width, onChange, label, val
             onChange(updatedChangeEvent);
         }, 500);
     };
-    // const filterOptions = (query: string) => {
-    //   setSearchQuery(query);
-    //   setFilteredOptions(
-    //     options.filter((option) =>
-    //       option.label.toLowerCase().includes(query.toLowerCase()),
-    //     ),
-    //   );
-    // };
     return (_jsxs("div", { style: {
             position: 'relative',
             borderRadius: '6px',
@@ -112,7 +118,7 @@ export function QuillMultiSelectComponent({ options, width, onChange, label, val
                     fontFamily: theme?.fontFamily,
                     maxHeight: '50vh',
                     overflow: 'scroll',
-                }, children: options.map((option) => (_jsxs("button", { style: {
+                }, children: !isLoading ? (sortedItems.map((option) => (_jsxs("button", { style: {
                         display: 'flex',
                         alignItems: 'center',
                         padding: 8,
@@ -163,7 +169,7 @@ export function QuillMultiSelectComponent({ options, width, onChange, label, val
                                 textOverflow: 'ellipsis',
                                 whiteSpace: 'nowrap',
                                 overflow: 'hidden',
-                            }, children: option.label })] }, option.value))) }))] }));
+                            }, children: option.label ?? nullLabel })] }, option.value)))) : (_jsx(LoadingSpinner, {})) }))] }));
 }
 export const ListboxTextInput = ({ value, onChange, placeholder, }) => {
     return (_jsxs("div", { style: {

package/dist/esm/components/QuillMultiSelectWithCombo.d.ts

@@ -2,7 +2,7 @@ import { MultiSelectComponentProps } from './UiComponents';
 /**
  * A robust select component that implements the new minimal Select interface.
  */
-export declare function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, value, }: MultiSelectComponentProps): import("react/jsx-runtime").JSX.Element;
+export declare function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, value, isLoading, }: MultiSelectComponentProps): import("react/jsx-runtime").JSX.Element;
 export declare const ListboxTextInput: ({ value, onChange, placeholder, }: {
     value: string;
     onChange: (e: string) => void;

package/dist/esm/components/QuillMultiSelectWithCombo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QuillMultiSelectWithCombo.d.ts","sourceRoot":"","sources":["../../../src/components/QuillMultiSelectWithCombo.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAgC3D;;GAEG;AACH,wBAAgB,kCAAkC,CAAC,EACjD,OAAO,EACP,KAAK,EACL,QAAQ,EACR,KAAK,EACL,KAAK,GACN,EAAE,yBAAyB,2CAiV3B;AAED,eAAO,MAAM,gBAAgB;WAKpB,MAAM;kBACC,MAAM,KAAK,IAAI;iBAChB,MAAM;6CAwDpB,CAAC"}
+{"version":3,"file":"QuillMultiSelectWithCombo.d.ts","sourceRoot":"","sources":["../../../src/components/QuillMultiSelectWithCombo.tsx"],"names":[],"mappings":"AACA,OAAO,EAAkB,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAiC3E;;GAEG;AACH,wBAAgB,kCAAkC,CAAC,EACjD,OAAO,EACP,KAAK,EACL,QAAQ,EACR,KAAK,EACL,KAAK,EACL,SAAS,GACV,EAAE,yBAAyB,2CA4U3B;AAED,eAAO,MAAM,gBAAgB;WAKpB,MAAM;kBACC,MAAM,KAAK,IAAI;iBAChB,MAAM;6CAwDpB,CAAC"}

package/dist/esm/components/QuillMultiSelectWithCombo.js

@@ -1,6 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useOnClickOutside } from '../hooks';
-import React, { useContext, useEffect, useRef, useState, } from 'react';
+import { LoadingSpinner } from './UiComponents';
+import React, { useContext, useEffect, useMemo, useRef, useState, } from 'react';
 import { ThemeContext } from '../Context';
 /**
  * Helper function for displaying option labels
@@ -20,34 +21,22 @@ function displaySelectedOptionLabels({ options, value, }) {
 /**
  * A robust select component that implements the new minimal Select interface.
  */
-export function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, value, }) {
+export function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, value, isLoading, }) {
     const [theme] = useContext(ThemeContext);
     const [selectedOptions, setSelectedOptions] = useState([]);
     const [showModal, setShowModal] = useState(false);
     const modalRef = useRef(null);
     const debounceTimeoutId = useRef(null);
     const [searchQuery, setSearchQuery] = React.useState('');
-    const [filteredItems, setFilteredItems] = React.useState(options.slice(0, 20));
+    const [exceedsLimit, setExceedsLimit] = useState(false);
     useEffect(() => {
-        setFilteredItems(options.slice(0, 20));
+        if (options.length > 0 && options?.[0]?.value === 'EXCEEDS_LIMIT') {
+            setExceedsLimit(true);
+        }
+        else {
+            setExceedsLimit(false);
+        }
     }, [options]);
-    const handleSearchChange = (value) => {
-        setSearchQuery(value);
-        const curFilteredItems = value === ''
-            ? options.slice(0, 20)
-            : options
-                .filter((option) => {
-                if (!option) {
-                    return false;
-                }
-                return option.value
-                    .toLowerCase()
-                    .replace(/\s+/g, '')
-                    .includes(value.toLowerCase().replace(/\s+/g, ''));
-            })
-                .slice(0, 20);
-        setFilteredItems(curFilteredItems);
-    };
     useOnClickOutside(modalRef, () => setShowModal(false));
     useEffect(() => {
         if (!value) {
@@ -65,14 +54,43 @@ export function QuillMultiSelectComponentWithCombo({ options, width, onChange, l
             onChange(updatedChangeEvent);
         }, 500);
     };
-    // const filterOptions = (query: string) => {
-    //   setSearchQuery(query);
-    //   setFilteredOptions(
-    //     options.filter((option) =>
-    //       option.label.toLowerCase().includes(query.toLowerCase()),
-    //     ),
-    //   );
-    // };
+    const filteredItems = React.useMemo(function () {
+        // Sort null to top
+        if (searchQuery === '') {
+            return options.sort((a, b) => {
+                if (a.value === null) {
+                    return -1;
+                }
+                if (b.value === null) {
+                    return 1;
+                }
+                return a.label.localeCompare(b.label);
+            });
+        }
+        return options
+            .filter((option) => {
+            if (!option) {
+                return false;
+            }
+            return option.value
+                .toLowerCase()
+                .replace(/\s+/g, '')
+                .includes(searchQuery.toLowerCase().replace(/\s+/g, ''));
+        })
+            .sort((a, b) => {
+            if (a.value === null) {
+                return -1;
+            }
+            if (b.value === null) {
+                return 1;
+            }
+            return a.label.localeCompare(b.label);
+        })
+            .slice(0, 20);
+    }, [options, searchQuery]);
+    const nullLabel = useMemo(() => {
+        return filteredItems.some((item) => item.value === '-') ? 'None' : '-';
+    }, [filteredItems]);
     return (_jsxs("div", { style: {
             position: 'relative',
             borderRadius: '6px',
@@ -84,7 +102,7 @@ export function QuillMultiSelectComponentWithCombo({ options, width, onChange, l
                     fontFamily: theme?.fontFamily,
                     paddingBottom: 5,
                     fontWeight: 600,
-                }, children: label })), _jsxs("button", { style: {
+                }, children: label ?? nullLabel })), _jsxs("button", { style: {
                     fontFamily: theme?.fontFamily,
                     color: theme?.primaryTextColor,
                     width: '100%',
@@ -133,9 +151,14 @@ export function QuillMultiSelectComponentWithCombo({ options, width, onChange, l
                     maxHeight: '50vh',
                     overflow: 'scroll',
                     fontSize: 14,
-                }, children: [options && options.length > 20 && (_jsx(ListboxTextInput, { value: searchQuery, placeholder: "Search", onChange: (value) => {
-                            handleSearchChange(value);
-                        } })), options && options.length > 20 && (_jsx("div", { style: { height: 9, width: 230, borderTop: '1px solid #e7e7e7' } })), (!filteredItems || filteredItems.length === 0) && (_jsxs("div", { style: {
+                }, children: [!exceedsLimit && options && options.length > 20 && (_jsx(ListboxTextInput, { value: searchQuery, placeholder: "Search", onChange: (value) => {
+                            setSearchQuery(value);
+                        } })), !exceedsLimit && options && options.length > 20 && (_jsx("div", { style: {
+                            height: 9,
+                            width: 230,
+                            borderTop: '1px solid #e7e7e7',
+                        } })), !isLoading &&
+                        (!filteredItems || filteredItems.length === 0 || exceedsLimit) && (_jsxs("div", { style: {
                             display: 'flex',
                             alignItems: 'center',
                             padding: 8,
@@ -154,18 +177,18 @@ export function QuillMultiSelectComponentWithCombo({ options, width, onChange, l
                             gap: 6,
                             overflow: 'hidden',
                         }, children: [_jsx("style", { children: `
-            .quill-option {
-              background: white;
-            }
-              .quill-option:hover {
-                background: #F4F4F5;
+              .quill-option {
+                background: white;
               }
-            ` }), _jsx("span", { style: {
+                .quill-option:hover {
+                  background: #F4F4F5;
+                }
+              ` }), _jsx("span", { style: {
                                     textOverflow: 'ellipsis',
                                     whiteSpace: 'nowrap',
                                     overflow: 'hidden',
                                     cursor: 'default',
-                                }, children: "No options available" })] })), filteredItems.map((option) => (_jsxs("button", { style: {
+                                }, children: exceedsLimit ? 'Too many options' : 'No options available' })] })), !exceedsLimit && !isLoading ? (filteredItems.map((option) => (_jsxs("button", { style: {
                             display: 'flex',
                             alignItems: 'center',
                             padding: 8,
@@ -206,17 +229,17 @@ export function QuillMultiSelectComponentWithCombo({ options, width, onChange, l
                             }
                             debounce(updatedChangeEvent);
                         }, children: [_jsx("style", { children: `
-                .quill-option {
-                  background: white;
-                }
-                  .quill-option:hover {
-                    background: #F4F4F5;
+                  .quill-option {
+                    background: white;
                   }
-                ` }), _jsx("input", { type: "checkbox", checked: selectedOptions.includes(option.value), style: { width: '14px', height: '14px', margin: 'auto 0' }, readOnly: true }), _jsx("span", { style: {
+                    .quill-option:hover {
+                      background: #F4F4F5;
+                    }
+                  ` }), _jsx("input", { type: "checkbox", checked: selectedOptions.includes(option.value), style: { width: '14px', height: '14px', margin: 'auto 0' }, readOnly: true }), _jsx("span", { style: {
                                     textOverflow: 'ellipsis',
                                     whiteSpace: 'nowrap',
                                     overflow: 'hidden',
-                                }, children: option.label })] }, option.value)))] }))] }));
+                                }, children: option.label ?? nullLabel })] }, option.value)))) : isLoading ? (_jsx("div", { children: _jsx(LoadingSpinner, {}) })) : null] }))] }));
 }
 export const ListboxTextInput = ({ value, onChange, placeholder, }) => {
     return (_jsxs("div", { style: {

package/dist/esm/components/QuillSelect.d.ts

@@ -2,5 +2,5 @@ import { SelectComponentProps } from './UiComponents';
 /**
  * A robust select component that implements the new minimal Select interface.
  */
-export declare function QuillSelectComponent({ options, value, width, onChange, label, }: SelectComponentProps): import("react/jsx-runtime").JSX.Element;
+export declare function QuillSelectComponent({ options, value, width, onChange, label, isLoading, disabled, }: SelectComponentProps): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=QuillSelect.d.ts.map

package/dist/esm/components/QuillSelect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QuillSelect.d.ts","sourceRoot":"","sources":["../../../src/components/QuillSelect.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAItD;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,EACnC,OAAO,EACP,KAAK,EACL,KAAK,EACL,QAAQ,EACR,KAAK,GACN,EAAE,oBAAoB,2CA2MtB"}
+{"version":3,"file":"QuillSelect.d.ts","sourceRoot":"","sources":["../../../src/components/QuillSelect.tsx"],"names":[],"mappings":"AACA,OAAO,EAAkB,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAItE;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,EACnC,OAAO,EACP,KAAK,EACL,KAAK,EACL,QAAQ,EACR,KAAK,EACL,SAAS,EACT,QAAQ,GACT,EAAE,oBAAoB,2CA8OtB"}

package/dist/esm/components/QuillSelect.js

@@ -1,15 +1,31 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useOnClickOutside } from '../hooks';
-import { useContext, useRef, useState } from 'react';
+import { LoadingSpinner } from './UiComponents';
+import { useContext, useMemo, useRef, useState } from 'react';
 import { ThemeContext } from '../Context';
 /**
  * A robust select component that implements the new minimal Select interface.
  */
-export function QuillSelectComponent({ options, value, width, onChange, label, }) {
+export function QuillSelectComponent({ options, value, width, onChange, label, isLoading, disabled, }) {
     const [theme] = useContext(ThemeContext);
     const [showModal, setShowModal] = useState(false);
     const modalRef = useRef(null);
     useOnClickOutside(modalRef, () => setShowModal(false));
+    const sortedItems = useMemo(() => {
+        // Sort null to top
+        return options.sort((a, b) => {
+            if (a.value === null) {
+                return -1;
+            }
+            if (b.value === null) {
+                return 1;
+            }
+            return a.label.localeCompare(b.label);
+        });
+    }, [options]);
+    const nullLabel = useMemo(() => {
+        return sortedItems.some((item) => item.value === '-') ? 'None' : '-';
+    }, [sortedItems]);
     return (_jsxs("div", { style: {
             position: 'relative',
             // width: 200,
@@ -23,7 +39,7 @@ export function QuillSelectComponent({ options, value, width, onChange, label, }
                     fontFamily: theme?.fontFamily,
                     paddingBottom: 5,
                     fontWeight: 600,
-                }, children: label })), _jsxs("button", { style: {
+                }, children: label ?? nullLabel })), _jsxs("button", { style: {
                     fontFamily: theme?.fontFamily,
                     color: theme?.primaryTextColor,
                     width: '100%',
@@ -44,7 +60,14 @@ export function QuillSelectComponent({ options, value, width, onChange, label, }
                     height: 40,
                     minHeight: 40,
                     maxHeight: 40,
-                }, className: "quill-select-button", onClick: () => setShowModal((showModal) => !showModal), children: [_jsx("style", { children: ` .quill-select-button { background: ${theme?.backgroundColor}; } .quill-select-button:hover { background: ${theme?.hoverBackgroundColor}; }` }), _jsx("span", { style: {
+                }, className: "quill-select-button", onClick: () => setShowModal((showModal) => !showModal), disabled: disabled, children: [_jsx("style", { children: ` 
+            .quill-select-button { background: ${theme?.backgroundColor}; } 
+            .quill-select-button:hover { background: ${theme?.hoverBackgroundColor}; }
+            .quill-select-button:disabled {
+              opacity: 0.5;
+              cursor: not-allowed;
+            }        
+          ` }), _jsx("span", { style: {
                             textOverflow: 'ellipsis',
                             whiteSpace: 'nowrap',
                             overflow: 'hidden',
@@ -68,7 +91,7 @@ export function QuillSelectComponent({ options, value, width, onChange, label, }
                     fontFamily: theme?.fontFamily,
                     maxHeight: '50vh',
                     overflow: 'scroll',
-                }, children: [_jsxs("button", { style: {
+                }, children: [!isLoading && (_jsxs("button", { style: {
                             display: 'flex',
                             alignItems: 'center',
                             justifyContent: 'space-between',
@@ -91,14 +114,14 @@ export function QuillSelectComponent({ options, value, width, onChange, label, }
                             const changeEvent = { target: { value: '' } };
                             onChange(changeEvent);
                             setShowModal(false);
-                        }, children: [_jsx("style", { children: `
+                        }, disabled: disabled, children: [_jsx("style", { children: `
                 .quill-option {
                   background: white;
                 }
                   .quill-option:hover {
                     background: #F4F4F5;
                   }
-                ` }), 'Select'] }), options.map((option) => (_jsxs("button", { style: {
+                ` }), 'Select'] })), !isLoading ? (options.map((option) => (_jsxs("button", { style: {
                             display: 'flex',
                             alignItems: 'center',
                             justifyContent: 'space-between',
@@ -121,7 +144,7 @@ export function QuillSelectComponent({ options, value, width, onChange, label, }
                             const changeEvent = { target: { value: option.value } };
                             onChange(changeEvent);
                             setShowModal(false);
-                        }, children: [_jsx("style", { children: `
+                        }, disabled: disabled, children: [_jsx("style", { children: `
                 .quill-option {
                   background: white;
                 }
@@ -132,5 +155,5 @@ export function QuillSelectComponent({ options, value, width, onChange, label, }
                                     textOverflow: 'ellipsis',
                                     whiteSpace: 'nowrap',
                                     overflow: 'hidden',
-                                }, children: option.label })] }, option.label)))] }))] }));
+                                }, children: option.label ?? '-' })] }, option.label)))) : (_jsx(LoadingSpinner, {}))] }))] }));
 }

package/dist/esm/components/QuillSelectWithCombo.d.ts

@@ -2,5 +2,5 @@ import { SelectComponentProps } from './UiComponents';
 /**
  * A robust select component that implements the new minimal Select interface.
  */
-export declare function QuillSelectComponentWithCombo({ options, value, width, onChange, label, }: SelectComponentProps): import("react/jsx-runtime").JSX.Element;
+export declare function QuillSelectComponentWithCombo({ options, value, width, onChange, label, isLoading, }: SelectComponentProps): import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=QuillSelectWithCombo.d.ts.map

package/dist/esm/components/QuillSelectWithCombo.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"QuillSelectWithCombo.d.ts","sourceRoot":"","sources":["../../../src/components/QuillSelectWithCombo.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAWtD;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,EAC5C,OAAO,EACP,KAAK,EACL,KAAK,EACL,QAAQ,EACR,KAAK,GACN,EAAE,oBAAoB,2CAoPtB"}
+{"version":3,"file":"QuillSelectWithCombo.d.ts","sourceRoot":"","sources":["../../../src/components/QuillSelectWithCombo.tsx"],"names":[],"mappings":"AACA,OAAO,EAAkB,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAWtE;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,EAC5C,OAAO,EACP,KAAK,EACL,KAAK,EACL,QAAQ,EACR,KAAK,EACL,SAAS,GACV,EAAE,oBAAoB,2CA8QtB"}