@quillsql/react 2.13.49 → 2.13.51

package/dist/cjs/components/QuillMultiSelectSectionList.js

@@ -143,7 +143,6 @@ function QuillMultiSelectSectionList({ options, width, onChange, label, sectionH
                     fontWeight: 600,
                 }, children: label })), (0, jsx_runtime_1.jsxs)("button", { style: {
                     fontFamily: theme?.fontFamily,
-                    color: theme?.primaryTextColor,
                     width: '100%',
                     display: 'flex',
                     alignItems: 'center',
@@ -163,8 +162,8 @@ function QuillMultiSelectSectionList({ options, width, onChange, label, sectionH
                     height: 40,
                     minHeight: 40,
                     maxHeight: 40,
-                }, className: 'quill-select-button', onClick: () => setShowModal((showModal) => !showModal), disabled: disabled, ref: buttonRef, children: [(0, jsx_runtime_1.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: [(0, jsx_runtime_1.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};
@@ -186,7 +185,7 @@ function QuillMultiSelectSectionList({ options, width, onChange, label, sectionH
                     borderStyle: 'solid',
                     borderColor: theme?.borderColor,
                     borderRadius: 6,
-                    background: 'white',
+                    background: theme?.backgroundColor,
                     marginTop: 12,
                     zIndex: 100,
                     padding: 6,
@@ -220,10 +219,10 @@ function QuillMultiSelectSectionList({ options, width, onChange, label, sectionH
                             overflow: 'hidden',
                         }, children: [(0, jsx_runtime_1.jsx)("style", { children: `
                 .quill-option {
-                  background: white;
+                  background: ${theme?.backgroundColor};
                 }
                 .quill-option:hover {
-                  background: #F4F4F5;
+                  background: ${theme?.hoverBackgroundColor};
                 }
               ` }), (0, jsx_runtime_1.jsx)("span", { style: {
                                     textOverflow: 'ellipsis',
@@ -264,10 +263,12 @@ function QuillMultiSelectSectionList({ options, width, onChange, label, sectionH
                                     debounce(updatedChangeEvent);
                                 }, children: [(0, jsx_runtime_1.jsx)("style", { children: `
                   .quill-option {
-                    background: white;
+                    background: ${theme?.backgroundColor};
+                    color: ${theme?.primaryTextColor};
                   }
                   .quill-option:hover {
-                    background: #F4F4F5;
+                    background: ${theme?.hoverBackgroundColor};
+                    color: ${theme?.hoverTextColor};
                   }
                 ` }), (0, jsx_runtime_1.jsx)("input", { type: "checkbox", checked: options[key]?.length === value[key]?.length, style: { width: '14px', height: '14px', margin: 'auto 0' }, readOnly: true }), (0, jsx_runtime_1.jsx)("span", { style: {
                                             textOverflow: 'ellipsis',
@@ -314,10 +315,12 @@ function QuillMultiSelectSectionList({ options, width, onChange, label, sectionH
                                     debounce(updatedChangeEvent);
                                 }, children: [(0, jsx_runtime_1.jsx)("style", { children: `
                     .quill-option {
-                      background: white;
+                      background: ${theme?.backgroundColor};
+                      color: ${theme?.primaryTextColor};
                     }
                     .quill-option:hover {
-                      background: #F4F4F5;
+                      background: ${theme?.hoverBackgroundColor};
+                      color: ${theme?.hoverTextColor};
                     }
                   ` }), (0, jsx_runtime_1.jsx)("input", { type: "checkbox", checked: value[key]?.includes(option.value) ?? false, style: {
                                             width: '14px',
@@ -330,6 +333,7 @@ function QuillMultiSelectSectionList({ options, width, onChange, label, sectionH
                                         }, children: option.label })] }, 'v-' + key + '-' + option.value)))] }, 'sp-' + key)))) : ((0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(UiComponents_1.LoadingSpinner, {}) }))] }))] }));
 }
 const ListboxTextInput = ({ value, onChange, placeholder, }) => {
+    const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
     return ((0, jsx_runtime_1.jsxs)("div", { style: {
             position: 'relative',
             display: 'flex',
@@ -349,10 +353,14 @@ const ListboxTextInput = ({ value, onChange, placeholder, }) => {
          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;
-    }` }), (0, jsx_runtime_1.jsx)("div", { style: { width: 6 } }), (0, jsx_runtime_1.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: (0, jsx_runtime_1.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" }) }), (0, jsx_runtime_1.jsx)("input", { className: "quill-text-input", type: "text", value: value, onChange: (event) => onChange(event.target.value), placeholder: placeholder })] }));
+    }` }), (0, jsx_runtime_1.jsx)("div", { style: { width: 6 } }), (0, jsx_runtime_1.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: (0, jsx_runtime_1.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" }) }), (0, jsx_runtime_1.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,
+                } })] }));
 };
 exports.ListboxTextInput = ListboxTextInput;

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

@@ -1 +1 @@
-{"version":3,"file":"QuillMultiSelectWithCombo.d.ts","sourceRoot":"","sources":["../../../src/components/QuillMultiSelectWithCombo.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAkB,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAc,EAEZ,aAAa,EAMd,MAAM,OAAO,CAAC;AAKf;;GAEG;AACH,wBAAgB,kCAAkC,CAAC,EACjD,OAAO,EACP,KAAK,EACL,QAAQ,EACR,KAAK,EACL,KAAK,EACL,SAAS,EACT,QAAQ,EACR,UAAU,EACV,gBAAgB,EAChB,KAAK,GACN,EAAE,yBAAyB,GAAG;IAC7B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB,2CAwmBA;AAED,eAAO,MAAM,gBAAgB,sCAI1B;IACD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;CACrB,4CAwDA,CAAC"}
+{"version":3,"file":"QuillMultiSelectWithCombo.d.ts","sourceRoot":"","sources":["../../../src/components/QuillMultiSelectWithCombo.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAkB,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAc,EAEZ,aAAa,EAMd,MAAM,OAAO,CAAC;AAKf;;GAEG;AACH,wBAAgB,kCAAkC,CAAC,EACjD,OAAO,EACP,KAAK,EACL,QAAQ,EACR,KAAK,EACL,KAAK,EACL,SAAS,EACT,QAAQ,EACR,UAAU,EACV,gBAAgB,EAChB,KAAK,GACN,EAAE,yBAAyB,GAAG;IAC7B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB,2CAwmBA;AAED,eAAO,MAAM,gBAAgB,sCAI1B;IACD,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;CACrB,4CA8DA,CAAC"}

package/dist/cjs/components/QuillMultiSelectWithCombo.js

@@ -244,7 +244,6 @@ function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, v
                     fontWeight: 600,
                 }, children: label ?? nullLabel })), (0, jsx_runtime_1.jsxs)("button", { style: {
                     fontFamily: theme?.fontFamily,
-                    color: theme?.primaryTextColor,
                     width: '100%',
                     display: 'flex',
                     alignItems: 'center',
@@ -264,8 +263,8 @@ function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, v
                     height: 40,
                     minHeight: 40,
                     maxHeight: 40,
-                }, className: 'quill-select-button', onClick: () => setShowModal((showModal) => !showModal), disabled: disabled, ref: buttonRef, children: [(0, jsx_runtime_1.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: [(0, jsx_runtime_1.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};
@@ -278,9 +277,6 @@ function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, v
                             textAlign: 'left',
                             zIndex: 1,
                             fontWeight: value?.length || isLoading ? undefined : 300,
-                            color: value?.length || isLoading
-                                ? undefined
-                                : theme?.secondaryTextColor,
                         }, children: selectedOptionsLabel }), (0, jsx_runtime_1.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: (0, jsx_runtime_1.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 &&
                 (0, react_dom_1.createPortal)((0, jsx_runtime_1.jsxs)("div", { style: {
                         position: 'absolute',
@@ -297,7 +293,7 @@ function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, v
                         borderStyle: 'solid',
                         borderColor: theme?.borderColor,
                         borderRadius: 6,
-                        background: 'white',
+                        background: theme?.backgroundColor,
                         marginTop: 12,
                         zIndex: z,
                         padding: 6,
@@ -333,10 +329,12 @@ function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, v
                                 overflow: 'hidden',
                             }, children: [(0, jsx_runtime_1.jsx)("style", { children: `
                 .quill-option {
-                  background: white;
+                  background: ${theme?.backgroundColor};
+                  color: ${theme?.primaryTextColor};
                 }
                 .quill-option:hover {
-                  background: #F4F4F5;
+                  background: ${theme?.hoverBackgroundColor};
+                  color: ${theme?.hoverTextColor};
                 }
               ` }), (0, jsx_runtime_1.jsx)("span", { style: {
                                         textOverflow: 'ellipsis',
@@ -386,10 +384,12 @@ function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, v
                                         debounce(updatedChangeEvent);
                                     }, children: [(0, jsx_runtime_1.jsx)("style", { children: `
                   .quill-option {
-                    background: white;
+                    background: ${theme?.backgroundColor};
+                    color: ${theme?.primaryTextColor};
                   }
                   .quill-option:hover {
-                    background: #F4F4F5;
+                    background: ${theme?.hoverBackgroundColor};
+                    color: ${theme?.hoverTextColor};
                   }
                 ` }), (0, jsx_runtime_1.jsx)("input", { ref: selectAllRef, type: "checkbox", checked: selectAllCheckboxState === CheckboxState.SELECTED, style: {
                                                 width: '14px',
@@ -400,7 +400,6 @@ function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, v
                                                 whiteSpace: 'nowrap',
                                                 overflow: 'hidden',
                                             }, children: (0, jsx_runtime_1.jsx)("span", { style: {
-                                                    color: theme?.secondaryTextColor,
                                                     fontWeight: 300,
                                                 }, children: "Select all" }) })] })), filteredItems.map((option) => ((0, jsx_runtime_1.jsxs)("button", { style: {
                                         display: 'flex',
@@ -457,10 +456,12 @@ function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, v
                                         debounce(updatedChangeEvent);
                                     }, children: [(0, jsx_runtime_1.jsx)("style", { children: `
                     .quill-option {
-                      background: white;
+                      background: ${theme?.backgroundColor};
+                      color: ${theme?.primaryTextColor};
                     }
                     .quill-option:hover {
-                      background: #F4F4F5;
+                      background: ${theme?.hoverBackgroundColor};
+                      color: ${theme?.hoverTextColor};
                     }
                   ` }), (0, jsx_runtime_1.jsx)("input", { type: "checkbox", checked: selectedOptions.includes(option.value), style: {
                                                 width: '14px',
@@ -473,6 +474,7 @@ function QuillMultiSelectComponentWithCombo({ options, width, onChange, label, v
                                             }, children: option.label ?? nullLabel })] }, option.value)))] })) : isLoading ? ((0, jsx_runtime_1.jsx)("div", { children: (0, jsx_runtime_1.jsx)(UiComponents_1.LoadingSpinner, {}) })) : null] }), document.body)] }));
 }
 const ListboxTextInput = ({ value, onChange, placeholder, }) => {
+    const [theme] = (0, react_1.useContext)(Context_1.ThemeContext);
     return ((0, jsx_runtime_1.jsxs)("div", { style: {
             position: 'relative',
             display: 'flex',
@@ -485,17 +487,21 @@ 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;
-    }` }), (0, jsx_runtime_1.jsx)("div", { style: { width: 6 } }), (0, jsx_runtime_1.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: (0, jsx_runtime_1.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" }) }), (0, jsx_runtime_1.jsx)("input", { className: "quill-text-input", type: "text", value: value, onChange: (event) => onChange(event.target.value), placeholder: placeholder })] }));
+    }` }), (0, jsx_runtime_1.jsx)("div", { style: { width: 6 } }), (0, jsx_runtime_1.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: (0, jsx_runtime_1.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" }) }), (0, jsx_runtime_1.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,
+                } })] }));
 };
 exports.ListboxTextInput = ListboxTextInput;

package/dist/cjs/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/cjs/components/QuillSelect.js

@@ -128,7 +128,6 @@ function QuillSelectComponent({ options, value, width, onChange, label, isLoadin
                     fontWeight: 600,
                 }, children: label ?? nullLabel })), (0, jsx_runtime_1.jsxs)("button", { style: {
                     fontFamily: theme?.fontFamily,
-                    color: theme?.primaryTextColor,
                     width: '100%',
                     display: 'flex',
                     alignItems: 'center',
@@ -148,8 +147,8 @@ function QuillSelectComponent({ options, value, width, onChange, label, isLoadin
                     minHeight: 40,
                     maxHeight: 40,
                 }, className: "quill-select-button", onClick: () => setShowModal((showModal) => !showModal), disabled: disabled, ref: buttonRef, children: [(0, jsx_runtime_1.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;
@@ -176,7 +175,7 @@ function QuillSelectComponent({ options, value, width, onChange, label, isLoadin
                         borderStyle: 'solid',
                         borderColor: theme?.borderColor,
                         borderRadius: 6,
-                        background: 'white',
+                        background: theme?.backgroundColor,
                         marginTop: 12,
                         zIndex: z,
                         padding: 6,
@@ -207,12 +206,14 @@ function QuillSelectComponent({ options, value, width, onChange, label, isLoadin
                                 setShowModal(false);
                             }, disabled: disabled, children: [(0, jsx_runtime_1.jsx)("style", { children: `
                 .quill-option {
-                  background: white;
+                  background: ${theme?.backgroundColor};
+                  color: ${theme?.secondaryTextColor};
                 }
                   .quill-option:hover {
-                    background: #F4F4F5;
+                    background: ${theme?.hoverBackgroundColor};
+                    color: ${theme?.hoverTextColor};
                   }
-                ` }), (0, jsx_runtime_1.jsx)("span", { style: { color: theme?.secondaryTextColor, fontWeight: 300 }, children: "Select" })] })), !isLoading ? (options.map((option) => ((0, jsx_runtime_1.jsxs)("button", { style: {
+                ` }), (0, jsx_runtime_1.jsx)("span", { style: { fontWeight: 300 }, children: "Select" })] })), !isLoading ? (options.map((option) => ((0, jsx_runtime_1.jsxs)("button", { style: {
                                 display: 'flex',
                                 alignItems: 'center',
                                 justifyContent: 'space-between',
@@ -236,10 +237,12 @@ function QuillSelectComponent({ options, value, width, onChange, label, isLoadin
                                 setShowModal(false);
                             }, disabled: disabled, children: [(0, jsx_runtime_1.jsx)("style", { children: `
                 .quill-option {
-                  background: white;
+                  background: ${theme?.backgroundColor};
+                  color: ${theme?.primaryTextColor};
                 }
                   .quill-option:hover {
-                    background: #F4F4F5;
+                    background: ${theme?.hoverBackgroundColor};
+                    color: ${theme?.hoverTextColor};
                   }
                 ` }), (0, jsx_runtime_1.jsx)("span", { style: {
                                         textOverflow: 'ellipsis',

package/dist/cjs/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/cjs/components/QuillSelectWithCombo.js

@@ -35,7 +35,6 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QuillSelectComponentWithCombo = QuillSelectComponentWithCombo;
 const jsx_runtime_1 = require("react/jsx-runtime");
-const hooks_1 = require("../hooks");
 const UiComponents_1 = require("./UiComponents");
 const react_1 = __importStar(require("react"));
 const Context_1 = require("../Context");
@@ -107,10 +106,6 @@ function QuillSelectComponentWithCombo({ options, value, width, onChange, label,
             ? nullLabel
             : (selectedOption?.label ?? 'Select');
     }, [value, options, nullLabel]);
-    (0, hooks_1.useOnClickOutside)(modalRef, (event) => {
-        if (!buttonRef.current?.contains(event.target))
-            setShowModal(false);
-    }, showModal);
     return ((0, jsx_runtime_1.jsxs)("div", { style: {
             position: 'relative',
             // width: 200,
@@ -126,7 +121,6 @@ function QuillSelectComponentWithCombo({ options, value, width, onChange, label,
                     fontWeight: 600,
                 }, children: label })), (0, jsx_runtime_1.jsxs)("button", { style: {
                     fontFamily: theme?.fontFamily,
-                    color: theme?.primaryTextColor,
                     width: '100%',
                     display: 'flex',
                     alignItems: 'center',
@@ -146,8 +140,8 @@ function QuillSelectComponentWithCombo({ options, value, width, onChange, label,
                     minHeight: 40,
                     maxHeight: 40,
                 }, className: 'quill-select-button', onClick: () => setShowModal((showModal) => !showModal), disabled: disabled, ref: buttonRef, children: [(0, jsx_runtime_1.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}; 
@@ -158,97 +152,98 @@ function QuillSelectComponentWithCombo({ options, value, width, onChange, label,
                             whiteSpace: 'nowrap',
                             overflow: 'hidden',
                             fontWeight: value?.length || isLoading ? undefined : 300,
-                            color: value?.length || isLoading
-                                ? undefined
-                                : theme?.secondaryTextColor,
-                        }, children: selectedLabel }), (0, jsx_runtime_1.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: (0, jsx_runtime_1.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 && ((0, jsx_runtime_1.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 && ((0, jsx_runtime_1.jsx)(QuillMultiSelectWithCombo_1.ListboxTextInput, { value: searchQuery, placeholder: "Search", onChange: (value) => {
-                            setSearchQuery(value);
-                        } })), searchQuery === '' &&
-                        !isLoading &&
-                        (!hideEmptyOption || !options.length) && ((0, jsx_runtime_1.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: [(0, jsx_runtime_1.jsx)("style", { children: `
+                        }, children: selectedLabel }), (0, jsx_runtime_1.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: (0, jsx_runtime_1.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 && ((0, jsx_runtime_1.jsx)(UiComponents_1.QuillPortal, { anchorRef: buttonRef, showModal: showModal, setShowModal: setShowModal, children: (0, jsx_runtime_1.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 && ((0, jsx_runtime_1.jsx)(QuillMultiSelectWithCombo_1.ListboxTextInput, { value: searchQuery, placeholder: "Search", onChange: (value) => {
+                                setSearchQuery(value);
+                            } })), searchQuery === '' &&
+                            !isLoading &&
+                            (!hideEmptyOption || !options.length) && ((0, jsx_runtime_1.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: [(0, jsx_runtime_1.jsx)("style", { children: `
                 .quill-option {
-                  background: white;
+                  background: ${theme?.backgroundColor};
+                  color: ${theme?.secondaryTextColor};
                 }
                   .quill-option:hover {
-                    background: #F4F4F5;
+                    background: ${theme?.hoverBackgroundColor};
+                    color: ${theme?.hoverTextColor};
                   }
-                ` }), (0, jsx_runtime_1.jsx)("span", { style: { color: theme?.secondaryTextColor, fontWeight: 300 }, children: "Select" })] })), !isLoading ? (filteredItems.map((option) => ((0, jsx_runtime_1.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: [(0, jsx_runtime_1.jsx)("style", { children: `
+                ` }), (0, jsx_runtime_1.jsx)("span", { style: { fontWeight: 300 }, children: "Select" })] })), !isLoading ? (filteredItems.map((option) => ((0, jsx_runtime_1.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: [(0, jsx_runtime_1.jsx)("style", { children: `
                 .quill-option {
-                  background: white;
+                  background: ${theme?.backgroundColor};
+                  color: ${theme?.primaryTextColor};
                 }
                   .quill-option:hover {
-                    background: #F4F4F5;
+                    background: ${theme?.hoverBackgroundColor};
+                    color: ${theme?.hoverTextColor};
                   }
                 ` }), (0, jsx_runtime_1.jsx)("span", { style: {
-                                    textOverflow: 'ellipsis',
-                                    whiteSpace: 'nowrap',
-                                    overflow: 'hidden',
-                                }, children: option.label ?? nullLabel })] }, option.value)))) : ((0, jsx_runtime_1.jsx)(UiComponents_1.LoadingSpinner, {}))] }))] }));
+                                        textOverflow: 'ellipsis',
+                                        whiteSpace: 'nowrap',
+                                        overflow: 'hidden',
+                                    }, children: option.label ?? nullLabel })] }, option.value)))) : ((0, jsx_runtime_1.jsx)(UiComponents_1.LoadingSpinner, {}))] }) }))] }));
 }

package/dist/cjs/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/cjs/components/QuillTable.js

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

package/dist/cjs/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/cjs/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/cjs/components/ReportBuilder/FilterModal.js

@@ -13,7 +13,7 @@ const filterProcessing_1 = require("../../utils/filterProcessing");
 /**
  * Modal for adding, editing, and deleting Filters
  */
-function FilterModal({ schema, tables, filter, fieldValuesMap, fieldValuesMapIsLoading, customOperatorOptions, hideTableName, onSubmitFilter, onDeleteFilter, ButtonComponent, SelectComponent, TextInputComponent, SecondaryButtonComponent, MultiSelectComponent, }) {
+function FilterModal({ schema, tables, filter, fieldValuesMap, fieldValuesMapIsLoading, customOperatorOptions, hideTableName, onSubmitFilter, onDeleteFilter, ButtonComponent, SelectComponent, TextInputComponent, SecondaryButtonComponent, MultiSelectComponent, reportBuilderColumns, }) {
     const [field, setField] = (0, react_1.useState)('');
     const [fieldOptions, setFieldOptions] = (0, react_1.useState)([]);
     const [fieldValues, setFieldValues] = (0, react_1.useState)([]);
@@ -549,6 +549,17 @@ function FilterModal({ schema, tables, filter, fieldValuesMap, fieldValuesMapIsL
     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 (0, textProcessing_1.snakeAndCamelCaseToTitleCase)(column.alias);
+            }
+        }
+        return option.table !== '' && !hideTableName
+            ? `${(0, textProcessing_1.snakeAndCamelCaseToTitleCase)(option.name)} (${option.table})`
+            : (0, textProcessing_1.snakeAndCamelCaseToTitleCase)(option.name);
+    };
     if (filter && !filterInitialized) {
         return null; // prevent flashing
     }
@@ -570,9 +581,7 @@ function FilterModal({ schema, tables, filter, fieldValuesMap, fieldValuesMapIsL
                     }, children: [(0, jsx_runtime_1.jsx)("div", { style: { display: 'flex', gap: 20 }, children: (0, jsx_runtime_1.jsx)(SelectComponent, { value: `${table ?? ''}:${field}`, width: 200, onChange: handleFieldChange, options: [
                                     ...fieldOptions.map((option) => ({
                                         value: `${option.table}:${option.name}`,
-                                        label: option.table !== '' && !hideTableName
-                                            ? `${(0, textProcessing_1.snakeAndCamelCaseToTitleCase)(option.name)} (${option.table})`
-                                            : (0, textProcessing_1.snakeAndCamelCaseToTitleCase)(option.name),
+                                        label: filterColumnLabel(option),
                                     })),
                                 ] }) }), operatorOptions.length > 0 && ((0, jsx_runtime_1.jsx)("div", { style: { display: 'flex', gap: 20 }, children: (0, jsx_runtime_1.jsx)(SelectComponent, { value: operator, width: 200, onChange: handleOperatorChange, options: [
                                     ...operatorOptions.map((operator) => ({