@quillsql/react 2.13.49 → 2.13.51

package/dist/esm/components/QuillMultiSelectWithCombo.js

@@ -207,7 +207,6 @@ export function QuillMultiSelectComponentWithCombo({ options, width, onChange, l
                     fontWeight: 600,
                 }, children: label ?? nullLabel })), _jsxs("button", { style: {
                     fontFamily: theme?.fontFamily,
-                    color: theme?.primaryTextColor,
                     width: '100%',
                     display: 'flex',
                     alignItems: 'center',
@@ -227,8 +226,8 @@ export function QuillMultiSelectComponentWithCombo({ options, width, onChange, l
                     height: 40,
                     minHeight: 40,
                     maxHeight: 40,
-                }, className: 'quill-select-button', onClick: () => setShowModal((showModal) => !showModal), disabled: disabled, ref: buttonRef, children: [_jsx("style", { children: ` .quill-select-button { background: ${theme?.backgroundColor}; } 
-          .quill-select-button:hover { background: ${theme?.hoverBackgroundColor}; }
+                }, className: 'quill-select-button', onClick: () => setShowModal((showModal) => !showModal), disabled: disabled, ref: buttonRef, children: [_jsx("style", { children: ` .quill-select-button { background: ${theme?.backgroundColor}; color: ${theme?.primaryTextColor}; } 
+          .quill-select-button:hover { background: ${theme?.hoverBackgroundColor}; color: ${theme?.hoverTextColor}; }
           .quill-select-button:disabled {
             cursor: not-allowed;
             background: ${theme?.hoverBackgroundColor};
@@ -241,9 +240,6 @@ export function QuillMultiSelectComponentWithCombo({ options, width, onChange, l
                             textAlign: 'left',
                             zIndex: 1,
                             fontWeight: value?.length || isLoading ? undefined : 300,
-                            color: value?.length || isLoading
-                                ? undefined
-                                : theme?.secondaryTextColor,
                         }, children: selectedOptionsLabel }), _jsx("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 20 20", fill: "currentColor", "aria-hidden": "true", "data-slot": "icon", height: 20, width: 20, style: { minHeight: 20, minWidth: 20 }, children: _jsx("path", { fillRule: "evenodd", d: "M5.22 8.22a.75.75 0 0 1 1.06 0L10 11.94l3.72-3.72a.75.75 0 1 1 1.06 1.06l-4.25 4.25a.75.75 0 0 1-1.06 0L5.22 9.28a.75.75 0 0 1 0-1.06Z", clipRule: "evenodd" }) })] }), showModal &&
                 createPortal(_jsxs("div", { style: {
                         position: 'absolute',
@@ -260,7 +256,7 @@ export function QuillMultiSelectComponentWithCombo({ options, width, onChange, l
                         borderStyle: 'solid',
                         borderColor: theme?.borderColor,
                         borderRadius: 6,
-                        background: 'white',
+                        background: theme?.backgroundColor,
                         marginTop: 12,
                         zIndex: z,
                         padding: 6,
@@ -296,10 +292,12 @@ export function QuillMultiSelectComponentWithCombo({ options, width, onChange, l
                                 overflow: 'hidden',
                             }, children: [_jsx("style", { children: `
                 .quill-option {
-                  background: white;
+                  background: ${theme?.backgroundColor};
+                  color: ${theme?.primaryTextColor};
                 }
                 .quill-option:hover {
-                  background: #F4F4F5;
+                  background: ${theme?.hoverBackgroundColor};
+                  color: ${theme?.hoverTextColor};
                 }
               ` }), _jsx("span", { style: {
                                         textOverflow: 'ellipsis',
@@ -349,10 +347,12 @@ export function QuillMultiSelectComponentWithCombo({ options, width, onChange, l
                                         debounce(updatedChangeEvent);
                                     }, children: [_jsx("style", { children: `
                   .quill-option {
-                    background: white;
+                    background: ${theme?.backgroundColor};
+                    color: ${theme?.primaryTextColor};
                   }
                   .quill-option:hover {
-                    background: #F4F4F5;
+                    background: ${theme?.hoverBackgroundColor};
+                    color: ${theme?.hoverTextColor};
                   }
                 ` }), _jsx("input", { ref: selectAllRef, type: "checkbox", checked: selectAllCheckboxState === CheckboxState.SELECTED, style: {
                                                 width: '14px',
@@ -363,7 +363,6 @@ export function QuillMultiSelectComponentWithCombo({ options, width, onChange, l
                                                 whiteSpace: 'nowrap',
                                                 overflow: 'hidden',
                                             }, children: _jsx("span", { style: {
-                                                    color: theme?.secondaryTextColor,
                                                     fontWeight: 300,
                                                 }, children: "Select all" }) })] })), filteredItems.map((option) => (_jsxs("button", { style: {
                                         display: 'flex',
@@ -420,10 +419,12 @@ export function QuillMultiSelectComponentWithCombo({ options, width, onChange, l
                                         debounce(updatedChangeEvent);
                                     }, children: [_jsx("style", { children: `
                     .quill-option {
-                      background: white;
+                      background: ${theme?.backgroundColor};
+                      color: ${theme?.primaryTextColor};
                     }
                     .quill-option:hover {
-                      background: #F4F4F5;
+                      background: ${theme?.hoverBackgroundColor};
+                      color: ${theme?.hoverTextColor};
                     }
                   ` }), _jsx("input", { type: "checkbox", checked: selectedOptions.includes(option.value), style: {
                                                 width: '14px',
@@ -436,6 +437,7 @@ export function QuillMultiSelectComponentWithCombo({ options, width, onChange, l
                                             }, children: option.label ?? nullLabel })] }, option.value)))] })) : isLoading ? (_jsx("div", { children: _jsx(LoadingSpinner, {}) })) : null] }), document.body)] }));
 }
 export const ListboxTextInput = ({ value, onChange, placeholder, }) => {
+    const [theme] = useContext(ThemeContext);
     return (_jsxs("div", { style: {
             position: 'relative',
             display: 'flex',
@@ -448,16 +450,20 @@ export const ListboxTextInput = ({ value, onChange, placeholder, }) => {
           height: 40px;
          width: 145px;
          z-index: 2;
-         color: #384151;
+         color: ${theme?.primaryTextColor ?? '#384151'};
          border-radius: 4px;
          text-align: left;
          padding-top: 0px;
          padding-bottom: 0px;
          box-sizing: content-box;
          margin-left: 6px;
-         border: 0 solid #e5e7eb;
+         border: 0 solid ${theme?.borderColor ?? '#e5e7eb'};
       }
       .quill-text-input:focus {
         outline: none;
-    }` }), _jsx("div", { style: { width: 6 } }), _jsx("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 16 16", fill: "rgba(56, 65, 81, 0.7)", height: "16", width: "16", children: _jsx("path", { fillRule: "evenodd", d: "M9.965 11.026a5 5 0 1 1 1.06-1.06l2.755 2.754a.75.75 0 1 1-1.06 1.06l-2.755-2.754ZM10.5 7a3.5 3.5 0 1 1-7 0 3.5 3.5 0 0 1 7 0Z", clipRule: "evenodd" }) }), _jsx("input", { className: "quill-text-input", type: "text", value: value, onChange: (event) => onChange(event.target.value), placeholder: placeholder })] }));
+    }` }), _jsx("div", { style: { width: 6 } }), _jsx("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 16 16", fill: "rgba(56, 65, 81, 0.7)", height: "16", width: "16", children: _jsx("path", { fillRule: "evenodd", d: "M9.965 11.026a5 5 0 1 1 1.06-1.06l2.755 2.754a.75.75 0 1 1-1.06 1.06l-2.755-2.754ZM10.5 7a3.5 3.5 0 1 1-7 0 3.5 3.5 0 0 1 7 0Z", clipRule: "evenodd" }) }), _jsx("input", { className: "quill-text-input", type: "text", value: value, onChange: (event) => onChange(event.target.value), placeholder: placeholder, style: {
+                    fontFamily: theme?.fontFamily,
+                    color: theme?.primaryTextColor,
+                    background: theme?.backgroundColor,
+                } })] }));
 };

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

@@ -1 +1 @@
-{"version":3,"file":"QuillSelect.d.ts","sourceRoot":"","sources":["../../../src/components/QuillSelect.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAkB,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAatE;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,EACnC,OAAO,EACP,KAAK,EACL,KAAK,EACL,QAAQ,EACR,KAAK,EACL,SAAS,EACT,QAAQ,EACR,eAAe,GAChB,EAAE,oBAAoB,2CA2TtB"}
+{"version":3,"file":"QuillSelect.d.ts","sourceRoot":"","sources":["../../../src/components/QuillSelect.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAkB,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAatE;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,EACnC,OAAO,EACP,KAAK,EACL,KAAK,EACL,QAAQ,EACR,KAAK,EACL,SAAS,EACT,QAAQ,EACR,eAAe,GAChB,EAAE,oBAAoB,2CA0TtB"}

package/dist/esm/components/QuillSelect.js

@@ -92,7 +92,6 @@ export function QuillSelectComponent({ options, value, width, onChange, label, i
                     fontWeight: 600,
                 }, children: label ?? nullLabel })), _jsxs("button", { style: {
                     fontFamily: theme?.fontFamily,
-                    color: theme?.primaryTextColor,
                     width: '100%',
                     display: 'flex',
                     alignItems: 'center',
@@ -112,8 +111,8 @@ export function QuillSelectComponent({ options, value, width, onChange, label, i
                     minHeight: 40,
                     maxHeight: 40,
                 }, className: "quill-select-button", onClick: () => setShowModal((showModal) => !showModal), disabled: disabled, ref: buttonRef, children: [_jsx("style", { children: ` 
-            .quill-select-button { background: ${theme?.backgroundColor}; } 
-            .quill-select-button:hover { background: ${theme?.hoverBackgroundColor}; }
+            .quill-select-button { background: ${theme?.backgroundColor}; color: ${theme?.primaryTextColor}; } 
+            .quill-select-button:hover { background: ${theme?.hoverBackgroundColor}; color: ${theme?.hoverTextColor}; }
             .quill-select-button:disabled, {
               background: ${theme?.hoverBackgroundColor};
               cursor: not-allowed;
@@ -140,7 +139,7 @@ export function QuillSelectComponent({ options, value, width, onChange, label, i
                         borderStyle: 'solid',
                         borderColor: theme?.borderColor,
                         borderRadius: 6,
-                        background: 'white',
+                        background: theme?.backgroundColor,
                         marginTop: 12,
                         zIndex: z,
                         padding: 6,
@@ -171,12 +170,14 @@ export function QuillSelectComponent({ options, value, width, onChange, label, i
                                 setShowModal(false);
                             }, disabled: disabled, children: [_jsx("style", { children: `
                 .quill-option {
-                  background: white;
+                  background: ${theme?.backgroundColor};
+                  color: ${theme?.secondaryTextColor};
                 }
                   .quill-option:hover {
-                    background: #F4F4F5;
+                    background: ${theme?.hoverBackgroundColor};
+                    color: ${theme?.hoverTextColor};
                   }
-                ` }), _jsx("span", { style: { color: theme?.secondaryTextColor, fontWeight: 300 }, children: "Select" })] })), !isLoading ? (options.map((option) => (_jsxs("button", { style: {
+                ` }), _jsx("span", { style: { fontWeight: 300 }, children: "Select" })] })), !isLoading ? (options.map((option) => (_jsxs("button", { style: {
                                 display: 'flex',
                                 alignItems: 'center',
                                 justifyContent: 'space-between',
@@ -200,10 +201,12 @@ export function QuillSelectComponent({ options, value, width, onChange, label, i
                                 setShowModal(false);
                             }, disabled: disabled, children: [_jsx("style", { children: `
                 .quill-option {
-                  background: white;
+                  background: ${theme?.backgroundColor};
+                  color: ${theme?.primaryTextColor};
                 }
                   .quill-option:hover {
-                    background: #F4F4F5;
+                    background: ${theme?.hoverBackgroundColor};
+                    color: ${theme?.hoverTextColor};
                   }
                 ` }), _jsx("span", { style: {
                                         textOverflow: 'ellipsis',

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,EAAkB,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AAWtE;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,EAC5C,OAAO,EACP,KAAK,EACL,KAAK,EACL,QAAQ,EACR,KAAK,EACL,SAAS,EACT,eAAe,EACf,QAAQ,GACT,EAAE,oBAAoB,2CAkUtB"}
+{"version":3,"file":"QuillSelectWithCombo.d.ts","sourceRoot":"","sources":["../../../src/components/QuillSelectWithCombo.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,oBAAoB,EACrB,MAAM,gBAAgB,CAAC;AAWxB;;GAEG;AACH,wBAAgB,6BAA6B,CAAC,EAC5C,OAAO,EACP,KAAK,EACL,KAAK,EACL,QAAQ,EACR,KAAK,EACL,SAAS,EACT,eAAe,EACf,QAAQ,GACT,EAAE,oBAAoB,2CA0TtB"}

package/dist/esm/components/QuillSelectWithCombo.js

@@ -1,6 +1,5 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useOnClickOutside } from '../hooks';
-import { LoadingSpinner } from './UiComponents';
+import { LoadingSpinner, QuillPortal, } from './UiComponents';
 import React, { useContext, useMemo, useRef, useState, } from 'react';
 import { ThemeContext } from '../Context';
 import { ListboxTextInput } from './QuillMultiSelectWithCombo';
@@ -71,10 +70,6 @@ export function QuillSelectComponentWithCombo({ options, value, width, onChange,
             ? nullLabel
             : (selectedOption?.label ?? 'Select');
     }, [value, options, nullLabel]);
-    useOnClickOutside(modalRef, (event) => {
-        if (!buttonRef.current?.contains(event.target))
-            setShowModal(false);
-    }, showModal);
     return (_jsxs("div", { style: {
             position: 'relative',
             // width: 200,
@@ -90,7 +85,6 @@ export function QuillSelectComponentWithCombo({ options, value, width, onChange,
                     fontWeight: 600,
                 }, children: label })), _jsxs("button", { style: {
                     fontFamily: theme?.fontFamily,
-                    color: theme?.primaryTextColor,
                     width: '100%',
                     display: 'flex',
                     alignItems: 'center',
@@ -110,8 +104,8 @@ export function QuillSelectComponentWithCombo({ options, value, width, onChange,
                     minHeight: 40,
                     maxHeight: 40,
                 }, className: 'quill-select-button', onClick: () => setShowModal((showModal) => !showModal), disabled: disabled, ref: buttonRef, children: [_jsx("style", { children: ` 
-          .quill-select-button { background: ${theme?.backgroundColor}; }
-          .quill-select-button:hover { background: ${theme?.hoverBackgroundColor}; }
+          .quill-select-button { background: ${theme?.backgroundColor}; color: ${theme?.primaryTextColor}; }
+          .quill-select-button:hover { background: ${theme?.hoverBackgroundColor}; color: ${theme?.hoverTextColor}; }
           .quill-select-button:disabled { 
             cursor: not-allowed;
             background: ${theme?.hoverBackgroundColor}; 
@@ -122,97 +116,98 @@ export function QuillSelectComponentWithCombo({ options, value, width, onChange,
                             whiteSpace: 'nowrap',
                             overflow: 'hidden',
                             fontWeight: value?.length || isLoading ? undefined : 300,
-                            color: value?.length || isLoading
-                                ? undefined
-                                : theme?.secondaryTextColor,
-                        }, children: selectedLabel }), _jsx("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 20 20", fill: "currentColor", "aria-hidden": "true", "data-slot": "icon", height: 20, width: 20, style: { minHeight: 20, minWidth: 20 }, children: _jsx("path", { fillRule: "evenodd", d: "M5.22 8.22a.75.75 0 0 1 1.06 0L10 11.94l3.72-3.72a.75.75 0 1 1 1.06 1.06l-4.25 4.25a.75.75 0 0 1-1.06 0L5.22 9.28a.75.75 0 0 1 0-1.06Z", clipRule: "evenodd" }) })] }), showModal && (_jsxs("div", { style: {
-                    position: 'absolute',
-                    width: '100%',
-                    display: 'flex',
-                    flexDirection: 'column',
-                    boxSizing: 'border-box',
-                    borderWidth: 1,
-                    borderStyle: 'solid',
-                    borderColor: theme?.borderColor,
-                    borderRadius: 6,
-                    background: 'white',
-                    marginTop: 12,
-                    zIndex: 100,
-                    paddingTop: 6,
-                    paddingBottom: 6,
-                    paddingLeft: 6,
-                    paddingRight: 6,
-                    fontFamily: theme?.fontFamily,
-                    maxHeight: '50vh',
-                    overflow: 'scroll',
-                    fontSize: 14,
-                }, ref: modalRef, children: [options && options.length > 20 && !isLoading && (_jsx(ListboxTextInput, { value: searchQuery, placeholder: "Search", onChange: (value) => {
-                            setSearchQuery(value);
-                        } })), searchQuery === '' &&
-                        !isLoading &&
-                        (!hideEmptyOption || !options.length) && (_jsxs("button", { style: {
-                            display: 'flex',
-                            alignItems: 'center',
-                            justifyContent: 'space-between',
-                            padding: '8px 8px',
-                            margin: 0,
-                            boxSizing: 'border-box',
-                            borderWidth: 0,
-                            fontSize: 14,
-                            borderStyle: 'solid',
-                            borderColor: theme?.borderColor,
-                            borderRadius: 4,
-                            fontFamily: theme?.fontFamily,
-                            textOverflow: 'ellipsis',
-                            whiteSpace: 'nowrap',
-                            overflow: 'hidden',
-                            height: 34,
-                            minHeight: 34,
-                        }, className: "quill-option", onClick: () => {
-                            // Manually create a synthetic ChangeEvent and pass it to callback
-                            const changeEvent = { target: { value: undefined } };
-                            onChange(changeEvent);
-                            setShowModal(false);
-                        }, children: [_jsx("style", { children: `
+                        }, children: selectedLabel }), _jsx("svg", { xmlns: "http://www.w3.org/2000/svg", viewBox: "0 0 20 20", fill: "currentColor", "aria-hidden": "true", "data-slot": "icon", height: 20, width: 20, style: { minHeight: 20, minWidth: 20 }, children: _jsx("path", { fillRule: "evenodd", d: "M5.22 8.22a.75.75 0 0 1 1.06 0L10 11.94l3.72-3.72a.75.75 0 1 1 1.06 1.06l-4.25 4.25a.75.75 0 0 1-1.06 0L5.22 9.28a.75.75 0 0 1 0-1.06Z", clipRule: "evenodd" }) })] }), showModal && (_jsx(QuillPortal, { anchorRef: buttonRef, showModal: showModal, setShowModal: setShowModal, children: _jsxs("div", { style: {
+                        position: 'absolute',
+                        width: '100%',
+                        display: 'flex',
+                        flexDirection: 'column',
+                        boxSizing: 'border-box',
+                        borderWidth: 1,
+                        borderStyle: 'solid',
+                        borderColor: theme?.borderColor,
+                        borderRadius: 6,
+                        background: theme?.backgroundColor,
+                        marginTop: 12,
+                        zIndex: 100,
+                        paddingTop: 6,
+                        paddingBottom: 6,
+                        paddingLeft: 6,
+                        paddingRight: 6,
+                        fontFamily: theme?.fontFamily,
+                        maxHeight: '50vh',
+                        overflow: 'scroll',
+                        fontSize: 14,
+                    }, ref: modalRef, children: [options && options.length > 20 && !isLoading && (_jsx(ListboxTextInput, { value: searchQuery, placeholder: "Search", onChange: (value) => {
+                                setSearchQuery(value);
+                            } })), searchQuery === '' &&
+                            !isLoading &&
+                            (!hideEmptyOption || !options.length) && (_jsxs("button", { style: {
+                                display: 'flex',
+                                alignItems: 'center',
+                                justifyContent: 'space-between',
+                                padding: '8px 8px',
+                                margin: 0,
+                                boxSizing: 'border-box',
+                                borderWidth: 0,
+                                fontSize: 14,
+                                borderStyle: 'solid',
+                                borderColor: theme?.borderColor,
+                                borderRadius: 4,
+                                fontFamily: theme?.fontFamily,
+                                textOverflow: 'ellipsis',
+                                whiteSpace: 'nowrap',
+                                overflow: 'hidden',
+                                height: 34,
+                                minHeight: 34,
+                            }, className: "quill-option", onClick: () => {
+                                // Manually create a synthetic ChangeEvent and pass it to callback
+                                const changeEvent = { target: { value: undefined } };
+                                onChange(changeEvent);
+                                setShowModal(false);
+                            }, children: [_jsx("style", { children: `
                 .quill-option {
-                  background: white;
+                  background: ${theme?.backgroundColor};
+                  color: ${theme?.secondaryTextColor};
                 }
                   .quill-option:hover {
-                    background: #F4F4F5;
+                    background: ${theme?.hoverBackgroundColor};
+                    color: ${theme?.hoverTextColor};
                   }
-                ` }), _jsx("span", { style: { color: theme?.secondaryTextColor, fontWeight: 300 }, children: "Select" })] })), !isLoading ? (filteredItems.map((option) => (_jsxs("button", { style: {
-                            display: 'flex',
-                            alignItems: 'center',
-                            justifyContent: 'space-between',
-                            padding: '8px 8px',
-                            margin: 0,
-                            boxSizing: 'border-box',
-                            borderWidth: 0,
-                            fontSize: 14,
-                            borderStyle: 'solid',
-                            borderColor: theme?.borderColor,
-                            borderRadius: 4,
-                            fontFamily: theme?.fontFamily,
-                            textOverflow: 'ellipsis',
-                            whiteSpace: 'nowrap',
-                            height: 34,
-                            minHeight: 34,
-                            overflow: 'hidden',
-                        }, className: "quill-option", onClick: () => {
-                            // Manually create a synthetic ChangeEvent and pass it to callback
-                            const changeEvent = { target: { value: option.value } };
-                            onChange(changeEvent);
-                            setShowModal(false);
-                        }, children: [_jsx("style", { children: `
+                ` }), _jsx("span", { style: { fontWeight: 300 }, children: "Select" })] })), !isLoading ? (filteredItems.map((option) => (_jsxs("button", { style: {
+                                display: 'flex',
+                                alignItems: 'center',
+                                justifyContent: 'space-between',
+                                padding: '8px 8px',
+                                margin: 0,
+                                boxSizing: 'border-box',
+                                borderWidth: 0,
+                                fontSize: 14,
+                                borderStyle: 'solid',
+                                borderColor: theme?.borderColor,
+                                borderRadius: 4,
+                                fontFamily: theme?.fontFamily,
+                                textOverflow: 'ellipsis',
+                                whiteSpace: 'nowrap',
+                                height: 34,
+                                minHeight: 34,
+                                overflow: 'hidden',
+                            }, className: "quill-option", onClick: () => {
+                                // Manually create a synthetic ChangeEvent and pass it to callback
+                                const changeEvent = { target: { value: option.value } };
+                                onChange(changeEvent);
+                                setShowModal(false);
+                            }, children: [_jsx("style", { children: `
                 .quill-option {
-                  background: white;
+                  background: ${theme?.backgroundColor};
+                  color: ${theme?.primaryTextColor};
                 }
                   .quill-option:hover {
-                    background: #F4F4F5;
+                    background: ${theme?.hoverBackgroundColor};
+                    color: ${theme?.hoverTextColor};
                   }
                 ` }), _jsx("span", { style: {
-                                    textOverflow: 'ellipsis',
-                                    whiteSpace: 'nowrap',
-                                    overflow: 'hidden',
-                                }, children: option.label ?? nullLabel })] }, option.value)))) : (_jsx(LoadingSpinner, {}))] }))] }));
+                                        textOverflow: 'ellipsis',
+                                        whiteSpace: 'nowrap',
+                                        overflow: 'hidden',
+                                    }, children: option.label ?? nullLabel })] }, option.value)))) : (_jsx(LoadingSpinner, {}))] }) }))] }));
 }

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

@@ -1 +1 @@
-{"version":3,"file":"QuillTable.d.ts","sourceRoot":"","sources":["../../../src/components/QuillTable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAG/D,OAAO,EAAE,oBAAoB,EAAyB,MAAM,gBAAgB,CAAC;AAE7E,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5C,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACrC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IACrC,0BAA0B,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC1E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,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;AAED,UAAU,wBAAyB,SAAQ,mBAAmB;IAC5D,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAI,EACJ,QAAQ,EACR,iBAAiB,EACjB,OAAO,EACP,SAAS,EACT,WAAW,EACX,IAAI,EACJ,qBAA4B,EAC5B,cAAc,EACd,SAAS,EACT,gBAAwC,EACxC,WAAgB,EAChB,eAA8B,EAC9B,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,WAAW,GACZ,EAAE,wBAAwB,2CA8e1B"}
+{"version":3,"file":"QuillTable.d.ts","sourceRoot":"","sources":["../../../src/components/QuillTable.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAG/D,OAAO,EAAE,oBAAoB,EAAyB,MAAM,gBAAgB,CAAC;AAE7E,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,OAAO,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5C,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,SAAS,EAAE,MAAM,CAAA;KAAE,CAAC;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,cAAc,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IACrC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,qBAAqB,CAAC,EAAE,OAAO,CAAC;IAChC,WAAW,CAAC,EAAE,MAAM,IAAI,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,GAAG,CAAC,OAAO,CAAC;IACrC,0BAA0B,CAAC,EAAE,CAAC,KAAK,EAAE,oBAAoB,KAAK,GAAG,CAAC,OAAO,CAAC;IAC1E,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,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;AAED,UAAU,wBAAyB,SAAQ,mBAAmB;IAC5D,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,EACjC,IAAI,EACJ,QAAQ,EACR,iBAAiB,EACjB,OAAO,EACP,SAAS,EACT,WAAW,EACX,IAAI,EACJ,qBAA4B,EAC5B,cAAc,EACd,SAAS,EACT,gBAAwC,EACxC,WAAgB,EAChB,eAA8B,EAC9B,WAAW,EACX,YAAY,EACZ,YAAY,EACZ,UAAU,EACV,WAAW,GACZ,EAAE,wBAAwB,2CA+e1B"}

package/dist/esm/components/QuillTable.js

@@ -192,6 +192,7 @@ export default function QuillTable({ rows, rowCount, rowCountIsLoading, columns,
                                         justifyContent: 'center',
                                         alignItems: 'center',
                                         fontSize: 13,
+                                        fontFamily: theme?.fontFamily,
                                         color: theme?.secondaryTextColor || 'rgb(55, 65, 81)',
                                         position: 'absolute',
                                         width: '100%',

package/dist/esm/components/ReportBuilder/FilterModal.d.ts

@@ -1,5 +1,6 @@
 import { InternalFilter, Operator } from '../../models/Filter';
 import { UniqueValuesByTable, Table, UniqueValuesByColumn } from '../../models/Tables';
+import { ReportBuilderColumn } from '../../models/ReportBuilder';
 interface FilterModalProps {
     schema: Table[];
     tables?: string[];
@@ -15,6 +16,7 @@ interface FilterModalProps {
     TextInputComponent: React.ComponentType<any>;
     SecondaryButtonComponent?: React.ComponentType<any>;
     MultiSelectComponent: React.ComponentType<any>;
+    reportBuilderColumns?: ReportBuilderColumn[];
 }
 type OperatorOptionsMap = {
     [key: string]: Operator[];
@@ -22,6 +24,6 @@ type OperatorOptionsMap = {
 /**
  * Modal for adding, editing, and deleting Filters
  */
-export default function FilterModal({ schema, tables, filter, fieldValuesMap, fieldValuesMapIsLoading, customOperatorOptions, hideTableName, onSubmitFilter, onDeleteFilter, ButtonComponent, SelectComponent, TextInputComponent, SecondaryButtonComponent, MultiSelectComponent, }: FilterModalProps): import("react/jsx-runtime").JSX.Element | null;
+export default function FilterModal({ schema, tables, filter, fieldValuesMap, fieldValuesMapIsLoading, customOperatorOptions, hideTableName, onSubmitFilter, onDeleteFilter, ButtonComponent, SelectComponent, TextInputComponent, SecondaryButtonComponent, MultiSelectComponent, reportBuilderColumns, }: FilterModalProps): import("react/jsx-runtime").JSX.Element | null;
 export {};
 //# sourceMappingURL=FilterModal.d.ts.map

package/dist/esm/components/ReportBuilder/FilterModal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FilterModal.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/FilterModal.tsx"],"names":[],"mappings":"AAIA,OAAO,EACL,cAAc,EAId,QAAQ,EAMT,MAAM,qBAAqB,CAAC;AAO7B,OAAO,EACL,mBAAmB,EACnB,KAAK,EACL,oBAAoB,EACrB,MAAM,qBAAqB,CAAC;AAC7B,UAAU,gBAAgB;IACxB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,cAAc,EACZ,oBAAoB,GAClB,mBAAmB,CAAC;IACxB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,qBAAqB,CAAC,EAAE,kBAAkB,CAAC;IAC3C,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC;IACjD,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,kBAAkB,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC7C,wBAAwB,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACpD,oBAAoB,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;CAChD;AAQD,KAAK,kBAAkB,GAAG;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,EAAE,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,MAAM,EACN,MAAM,EACN,MAAM,EACN,cAAc,EACd,uBAAuB,EACvB,qBAAqB,EACrB,aAAa,EACb,cAAc,EACd,cAAc,EACd,eAAe,EACf,eAAe,EACf,kBAAkB,EAClB,wBAAwB,EACxB,oBAAoB,GACrB,EAAE,gBAAgB,kDAk4BlB"}
+{"version":3,"file":"FilterModal.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/FilterModal.tsx"],"names":[],"mappings":"AAIA,OAAO,EACL,cAAc,EAId,QAAQ,EAMT,MAAM,qBAAqB,CAAC;AAO7B,OAAO,EACL,mBAAmB,EACnB,KAAK,EACL,oBAAoB,EACrB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AACjE,UAAU,gBAAgB;IACxB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,cAAc,EACZ,oBAAoB,GAClB,mBAAmB,CAAC;IACxB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,qBAAqB,CAAC,EAAE,kBAAkB,CAAC;IAC3C,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC;IACjD,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,eAAe,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC1C,kBAAkB,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC7C,wBAAwB,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IACpD,oBAAoB,EAAE,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;IAC/C,oBAAoB,CAAC,EAAE,mBAAmB,EAAE,CAAC;CAC9C;AAQD,KAAK,kBAAkB,GAAG;IACxB,CAAC,GAAG,EAAE,MAAM,GAAG,QAAQ,EAAE,CAAC;CAC3B,CAAC;AAEF;;GAEG;AACH,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,MAAM,EACN,MAAM,EACN,MAAM,EACN,cAAc,EACd,uBAAuB,EACvB,qBAAqB,EACrB,aAAa,EACb,cAAc,EACd,cAAc,EACd,eAAe,EACf,eAAe,EACf,kBAAkB,EAClB,wBAAwB,EACxB,oBAAoB,EACpB,oBAAoB,GACrB,EAAE,gBAAgB,kDA84BlB"}

package/dist/esm/components/ReportBuilder/FilterModal.js

@@ -10,7 +10,7 @@ import { getType } from '../../utils/filterProcessing';
 /**
  * Modal for adding, editing, and deleting Filters
  */
-export default function FilterModal({ schema, tables, filter, fieldValuesMap, fieldValuesMapIsLoading, customOperatorOptions, hideTableName, onSubmitFilter, onDeleteFilter, ButtonComponent, SelectComponent, TextInputComponent, SecondaryButtonComponent, MultiSelectComponent, }) {
+export default function FilterModal({ schema, tables, filter, fieldValuesMap, fieldValuesMapIsLoading, customOperatorOptions, hideTableName, onSubmitFilter, onDeleteFilter, ButtonComponent, SelectComponent, TextInputComponent, SecondaryButtonComponent, MultiSelectComponent, reportBuilderColumns, }) {
     const [field, setField] = useState('');
     const [fieldOptions, setFieldOptions] = useState([]);
     const [fieldValues, setFieldValues] = useState([]);
@@ -546,6 +546,17 @@ export default function FilterModal({ schema, tables, filter, fieldValuesMap, fi
     const handleDelete = () => {
         onDeleteFilter();
     };
+    const filterColumnLabel = (option) => {
+        if (reportBuilderColumns) {
+            const column = reportBuilderColumns.find((col) => col.field === option.name && (col.table || '') === option.table);
+            if (column && column.alias) {
+                return snakeAndCamelCaseToTitleCase(column.alias);
+            }
+        }
+        return option.table !== '' && !hideTableName
+            ? `${snakeAndCamelCaseToTitleCase(option.name)} (${option.table})`
+            : snakeAndCamelCaseToTitleCase(option.name);
+    };
     if (filter && !filterInitialized) {
         return null; // prevent flashing
     }
@@ -567,9 +578,7 @@ export default function FilterModal({ schema, tables, filter, fieldValuesMap, fi
                     }, children: [_jsx("div", { style: { display: 'flex', gap: 20 }, children: _jsx(SelectComponent, { value: `${table ?? ''}:${field}`, width: 200, onChange: handleFieldChange, options: [
                                     ...fieldOptions.map((option) => ({
                                         value: `${option.table}:${option.name}`,
-                                        label: option.table !== '' && !hideTableName
-                                            ? `${snakeAndCamelCaseToTitleCase(option.name)} (${option.table})`
-                                            : snakeAndCamelCaseToTitleCase(option.name),
+                                        label: filterColumnLabel(option),
                                     })),
                                 ] }) }), operatorOptions.length > 0 && (_jsx("div", { style: { display: 'flex', gap: 20 }, children: _jsx(SelectComponent, { value: operator, width: 200, onChange: handleOperatorChange, options: [
                                     ...operatorOptions.map((operator) => ({

package/dist/esm/components/ReportBuilder/FilterStack.d.ts

@@ -1,6 +1,6 @@
 import { FilterTreeNode } from '../../utils/astFilterProcessing';
 import { SchemaData } from '../../models/Schema';
-import { ReportBuilderTable } from '../../models/ReportBuilder';
+import { ReportBuilderColumn, ReportBuilderTable } from '../../models/ReportBuilder';
 import { UniqueValuesByTable } from '../../models/Tables';
 interface FilterStackProps {
     client: any;
@@ -21,7 +21,8 @@ interface FilterStackProps {
     actionsEnabled: boolean;
     dashboardName: string;
     getToken: () => Promise<string>;
+    reportBuilderColumns: ReportBuilderColumn[];
 }
-export default function FilterStack({ client, filterStack, handleFilterStackChange, schemaData, uniqueValues, uniqueValuesIsLoading, tables, TabsComponent, FilterPopoverComponent, FilterModal, ButtonComponent, SecondaryButtonComponent, SelectComponent, TextInputComponent, MultiSelectComponent, actionsEnabled, dashboardName, getToken, }: FilterStackProps): import("react/jsx-runtime").JSX.Element;
+export default function FilterStack({ client, filterStack, handleFilterStackChange, schemaData, uniqueValues, uniqueValuesIsLoading, tables, TabsComponent, FilterPopoverComponent, FilterModal, ButtonComponent, SecondaryButtonComponent, SelectComponent, TextInputComponent, MultiSelectComponent, actionsEnabled, dashboardName, getToken, reportBuilderColumns, }: FilterStackProps): import("react/jsx-runtime").JSX.Element;
 export {};
 //# sourceMappingURL=FilterStack.d.ts.map

package/dist/esm/components/ReportBuilder/FilterStack.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FilterStack.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/FilterStack.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAKjE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE1D,UAAU,gBAAgB;IACxB,MAAM,EAAE,GAAG,CAAC;IACZ,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,uBAAuB,EAAE,CACvB,QAAQ,EAAE,cAAc,EAAE,EAC1B,SAAS,CAAC,EAAE,OAAO,KAChB,IAAI,CAAC;IACV,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,mBAAmB,CAAC;IAClC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,MAAM,EAAE,kBAAkB,EAAE,CAAC;IAC7B,aAAa,EAAE,GAAG,CAAC;IACnB,sBAAsB,EAAE,GAAG,CAAC;IAC5B,WAAW,EAAE,GAAG,CAAC;IACjB,eAAe,EAAE,GAAG,CAAC;IACrB,wBAAwB,EAAE,GAAG,CAAC;IAC9B,eAAe,EAAE,GAAG,CAAC;IACrB,kBAAkB,EAAE,GAAG,CAAC;IACxB,oBAAoB,EAAE,GAAG,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;CACjC;AAED,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,MAAM,EACN,WAAW,EACX,uBAAuB,EACvB,UAAU,EACV,YAAY,EACZ,qBAAqB,EACrB,MAAM,EACN,aAAa,EACb,sBAAsB,EACtB,WAAW,EACX,eAAe,EACf,wBAAwB,EACxB,eAAe,EACf,kBAAkB,EAClB,oBAAoB,EACpB,cAAqB,EACrB,aAAa,EACb,QAAQ,GACT,EAAE,gBAAgB,2CAoFlB"}
+{"version":3,"file":"FilterStack.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/FilterStack.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAKjE,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EACnB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE1D,UAAU,gBAAgB;IACxB,MAAM,EAAE,GAAG,CAAC;IACZ,WAAW,EAAE,cAAc,EAAE,CAAC;IAC9B,uBAAuB,EAAE,CACvB,QAAQ,EAAE,cAAc,EAAE,EAC1B,SAAS,CAAC,EAAE,OAAO,KAChB,IAAI,CAAC;IACV,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,EAAE,mBAAmB,CAAC;IAClC,qBAAqB,EAAE,OAAO,CAAC;IAC/B,MAAM,EAAE,kBAAkB,EAAE,CAAC;IAC7B,aAAa,EAAE,GAAG,CAAC;IACnB,sBAAsB,EAAE,GAAG,CAAC;IAC5B,WAAW,EAAE,GAAG,CAAC;IACjB,eAAe,EAAE,GAAG,CAAC;IACrB,wBAAwB,EAAE,GAAG,CAAC;IAC9B,eAAe,EAAE,GAAG,CAAC;IACrB,kBAAkB,EAAE,GAAG,CAAC;IACxB,oBAAoB,EAAE,GAAG,CAAC;IAC1B,cAAc,EAAE,OAAO,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAChC,oBAAoB,EAAE,mBAAmB,EAAE,CAAC;CAC7C;AAED,MAAM,CAAC,OAAO,UAAU,WAAW,CAAC,EAClC,MAAM,EACN,WAAW,EACX,uBAAuB,EACvB,UAAU,EACV,YAAY,EACZ,qBAAqB,EACrB,MAAM,EACN,aAAa,EACb,sBAAsB,EACtB,WAAW,EACX,eAAe,EACf,wBAAwB,EACxB,eAAe,EACf,kBAAkB,EAClB,oBAAoB,EACpB,cAAqB,EACrB,aAAa,EACb,QAAQ,EACR,oBAAoB,GACrB,EAAE,gBAAgB,2CAqFlB"}

package/dist/esm/components/ReportBuilder/FilterStack.js

@@ -3,7 +3,7 @@ import { filterSentence } from '../../utils/filterProcessing';
 import { DEFAULT_TAB_OPTIONS } from '../UiComponents';
 import { FilterPopoverWrapper } from './ui';
 import { deepCopy } from './util';
-export default function FilterStack({ client, filterStack, handleFilterStackChange, schemaData, uniqueValues, uniqueValuesIsLoading, tables, TabsComponent, FilterPopoverComponent, FilterModal, ButtonComponent, SecondaryButtonComponent, SelectComponent, TextInputComponent, MultiSelectComponent, actionsEnabled = true, dashboardName, getToken, }) {
+export default function FilterStack({ client, filterStack, handleFilterStackChange, schemaData, uniqueValues, uniqueValuesIsLoading, tables, TabsComponent, FilterPopoverComponent, FilterModal, ButtonComponent, SecondaryButtonComponent, SelectComponent, TextInputComponent, MultiSelectComponent, actionsEnabled = true, dashboardName, getToken, reportBuilderColumns, }) {
     return (_jsx("div", { style: {
             display: 'flex',
             flexDirection: 'column',
@@ -45,7 +45,7 @@ export default function FilterStack({ client, filterStack, handleFilterStackChan
                             }
                         }
                         handleFilterStackChange(newStack, true);
-                    }, disabled: !actionsEnabled, dashboardName: dashboardName, getToken: getToken }, `filter_${index}_${item.value ? filterSentence(item.value) : ''}`));
+                    }, disabled: !actionsEnabled, dashboardName: dashboardName, getToken: getToken, reportBuilderColumns: reportBuilderColumns }, `filter_${index}_${item.value ? filterSentence(item.value) : ''}`));
             }
         }) }));
 }

package/dist/esm/components/ReportBuilder/ui.d.ts

@@ -3,7 +3,7 @@ import { SidebarComponentProps, ContainerComponentProps } from '../UiComponents'
 import { InternalFilter } from '../../models/Filter';
 import { FilterTreeNode } from '../../utils/astFilterProcessing';
 import { QuillProviderClient } from '../../models/Client';
-import { ReportBuilderState, ReportBuilderTable } from '../../models/ReportBuilder';
+import { ReportBuilderColumn, ReportBuilderState, ReportBuilderTable } from '../../models/ReportBuilder';
 import { UniqueValuesByTable, Table } from '../../models/Tables';
 /**
  * This file is a collection of basic UI components that conform to the shape
@@ -130,6 +130,7 @@ export interface FilterPopoverWrapperProps {
     containerStyle?: any;
     dashboardName: string;
     getToken: () => Promise<string>;
+    reportBuilderColumns?: ReportBuilderColumn[];
 }
-export declare const FilterPopoverWrapper: ({ reportBuilderState, schema, filter, filterLabel, index, FilterTagComponent, FilterModal, fieldValuesMap, fieldValuesMapIsLoading, priorFilters, tables, client, customOperatorOptions, ButtonComponent, SecondaryButtonComponent, SelectComponent, TextInputComponent, MultiSelectComponent, handleFilterDelete, handleFilterSave, disabled, containerStyle, dashboardName, getToken, }: FilterPopoverWrapperProps) => import("react/jsx-runtime").JSX.Element;
+export declare const FilterPopoverWrapper: ({ reportBuilderState, schema, filter, filterLabel, index, FilterTagComponent, FilterModal, fieldValuesMap, fieldValuesMapIsLoading, priorFilters, tables, client, customOperatorOptions, ButtonComponent, SecondaryButtonComponent, SelectComponent, TextInputComponent, MultiSelectComponent, handleFilterDelete, handleFilterSave, disabled, containerStyle, dashboardName, getToken, reportBuilderColumns, }: FilterPopoverWrapperProps) => import("react/jsx-runtime").JSX.Element;
 //# sourceMappingURL=ui.d.ts.map

package/dist/esm/components/ReportBuilder/ui.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ui.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/ui.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ui.d.ts","sourceRoot":"","sources":["../../../../src/components/ReportBuilder/ui.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,SAAS,EAMV,MAAM,OAAO,CAAC;AACf,OAAO,EAGL,qBAAqB,EACrB,uBAAuB,EAExB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAGjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,4BAA4B,CAAC;AACpC,OAAO,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAGjE;;;;;GAKG;AAEH,eAAO,MAAM,WAAW,2BAA4B,GAAG,4CA0BtD,CAAC;AAEF,eAAO,MAAM,oBAAoB,2BAA4B,GAAG,4CA0B/D,CAAC;AAEF,eAAO,MAAM,QAAQ,sGA0EpB,CAAC;AAEF,MAAM,WAAW,4BAA4B;IAC3C,KAAK,EAAE,MAAM,CAAC;CACf;AAGD,eAAO,MAAM,mBAAmB,eAE7B,4BAA4B,4CAiB9B,CAAC;AAGF,eAAO,MAAM,YAAY,iBAAkB,qBAAqB,4CAkB/D,CAAC;AAGF,eAAO,MAAM,eAAe,iBAAkB,uBAAuB,4CAqBpE,CAAC;AAGF,eAAO,MAAM,iBAAiB,+CAsE7B,CAAC;AAEF,MAAM,WAAW,0BAA0B;IACzC,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,OAAO,CAAC;IACpB,WAAW,EAAE,MAAM,IAAI,CAAC;IACxB,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE;QAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,OAAO,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;CAC5E;AAED,eAAO,MAAM,iBAAiB,oDAK3B,0BAA0B,4CA4B5B,CAAC;AAEF;;GAEG;AACH,MAAM,WAAW,6BAA6B;IAC5C,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,IAAI,CAAC;IACrB,UAAU,EAAE,CAAC,EAAE,QAAQ,EAAE,EAAE;QAAE,QAAQ,EAAE,MAAM,GAAG,CAAC,OAAO,CAAA;KAAE,KAAK,GAAG,CAAC,OAAO,CAAC;IAC3E,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;GAEG;AACH,eAAO,MAAM,oBAAoB,qDAK9B,6BAA6B,4CAmD/B,CAAC;AAGF,eAAO,MAAM,uBAAuB,+CAMnC,CAAC;AAGF,eAAO,MAAM,sBAAsB,+CAMlC,CAAC;AAEF,eAAO,MAAM,WAAW,+EAOrB,GAAG,4CA+BL,CAAC;AAEF,MAAM,WAAW,2BAA2B;IAC1C,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,SAAS,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,aAAa,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;IAC1D,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,eAAO,MAAM,kBAAkB,gGAQ5B,2BAA2B,4CAqB7B,CAAC;AAEF,MAAM,WAAW,yBAAyB;IACxC,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,SAAS,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;IAC1D,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,eAAO,MAAM,gBAAgB,8FAQ1B,yBAAyB,4CAoB3B,CAAC;AAEF,MAAM,WAAW,0BAA0B;IACzC,MAAM,EAAE,OAAO,CAAC;IAChB,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,KAAK,IAAI,CAAC;IACrC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE,SAAS,CAAC;IAC3B,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;IAC1D,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,eAAO,MAAM,iBAAiB,+FAQ3B,0BAA0B,4CAoB5B,CAAC;AAEF,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,OAAO,CAAC;IACf,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,GAAG,CAAC;IACd,cAAc,EAAE,GAAG,CAAC;IACpB,iBAAiB,EAAE,GAAG,CAAC;IACvB,iBAAiB,EAAE,GAAG,CAAC;IACvB,aAAa,EAAE,GAAG,CAAC;IACnB,cAAc,EAAE,GAAG,CAAC;IACpB,YAAY,EAAE,GAAG,CAAC;IAClB,eAAe,EAAE,GAAG,CAAC;IACrB,YAAY,EAAE,GAAG,CAAC;IAClB,aAAa,EAAE,GAAG,CAAC;IACnB,oBAAoB,EAAE,GAAG,CAAC;IAC1B,aAAa,EAAE,CAAC,KAAK,EAAE,2BAA2B,KAAK,GAAG,CAAC,OAAO,CAAC;IACnE,QAAQ,EAAE,GAAG,CAAC;IACd,WAAW,EAAE,GAAG,CAAC;IACjB,MAAM,EAAE,GAAG,CAAC;IACZ,eAAe,EAAE,GAAG,CAAC;IACrB,UAAU,EAAE,GAAG,CAAC;IAChB,QAAQ,EAAE,GAAG,CAAC;CACf;AAED,eAAO,MAAM,UAAU,wTAuBpB,eAAe,4CAwGjB,CAAC;AAEF,eAAO,MAAM,gBAAgB,oDAK1B,GAAG,4CAsBL,CAAC;AAEF,MAAM,WAAW,yBAAyB;IACxC,kBAAkB,CAAC,EAAE,kBAAkB,CAAC;IACxC,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,MAAM,EAAE,cAAc,CAAC;IACvB,WAAW,EAAE,MAAM,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,kBAAkB,EAAE,GAAG,CAAC;IACxB,WAAW,EAAE,GAAG,CAAC;IACjB,cAAc,EAAE,mBAAmB,CAAC;IACpC,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,YAAY,CAAC,EAAE,cAAc,EAAE,CAAC;IAChC,MAAM,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC9B,MAAM,CAAC,EAAE,mBAAmB,CAAC;IAC7B,YAAY,CAAC,EAAE,GAAG,CAAC;IACnB,qBAAqB,CAAC,EAAE,GAAG,CAAC;IAC5B,eAAe,EAAE,GAAG,CAAC;IACrB,wBAAwB,EAAE,GAAG,CAAC;IAC9B,eAAe,EAAE,GAAG,CAAC;IACrB,kBAAkB,EAAE,GAAG,CAAC;IACxB,oBAAoB,EAAE,GAAG,CAAC;IAC1B,kBAAkB,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5C,gBAAgB,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAC;IACnD,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,cAAc,CAAC,EAAE,GAAG,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAChC,oBAAoB,CAAC,EAAE,mBAAmB,EAAE,CAAC;CAC9C;AAED,eAAO,MAAM,oBAAoB,oZA0B9B,yBAAyB,4CA4G3B,CAAC"}