@visactor/vtable 0.20.1 → 0.20.2

package/dist/vtable.js

@@ -21847,13 +21847,123 @@
         }
     }
 
-    function of$2(columnStyle, bodyStyle, styleArg, StyleClassDef = Style$1, globalAutoWrapText) {
+    let defaultStyle$5;
+    let CheckboxStyle$1 = class CheckboxStyle extends Style$1 {
+        _size;
+        _spaceBetweenTextAndIcon;
+        _defaultFill;
+        _defaultStroke;
+        _disableFill;
+        _checkedFill;
+        _checkedStroke;
+        _disableCheckedFill;
+        _disableCheckedStroke;
+        _checkIconImage;
+        _indeterminateIconImage;
+        static get DEFAULT() {
+            return defaultStyle$5 ? defaultStyle$5 : (defaultStyle$5 = new CheckboxStyle());
+        }
+        constructor(style = {}, headerStyle = {}, checkboxThemeStyle = {}) {
+            super(style, headerStyle);
+            this._size = (style?.size ?? headerStyle?.size ?? checkboxThemeStyle?.size) || 14;
+            this._spaceBetweenTextAndIcon =
+                (style?.spaceBetweenTextAndIcon ??
+                    headerStyle?.spaceBetweenTextAndIcon ??
+                    checkboxThemeStyle?.spaceBetweenTextAndIcon) ||
+                    8;
+            this._defaultFill = style?.checkboxStyle?.defaultFill ?? checkboxThemeStyle?.defaultFill;
+            this._defaultStroke = style?.checkboxStyle?.defaultStroke ?? checkboxThemeStyle?.defaultStroke;
+            this._disableFill = style?.checkboxStyle?.disableFill ?? checkboxThemeStyle?.disableFill;
+            this._checkedFill = style?.checkboxStyle?.checkedFill ?? checkboxThemeStyle?.checkedFill;
+            this._checkedStroke = style?.checkboxStyle?.checkedStroke ?? checkboxThemeStyle?.checkedStroke;
+            this._disableCheckedFill = style?.checkboxStyle?.disableCheckedFill ?? checkboxThemeStyle?.disableCheckedFill;
+            this._disableCheckedStroke = style?.checkboxStyle?.disableCheckedStroke ?? checkboxThemeStyle?.disableCheckedStroke;
+            this._spaceBetweenTextAndIcon =
+                style?.checkboxStyle?.spaceBetweenTextAndIcon ?? checkboxThemeStyle?.spaceBetweenTextAndIcon;
+            this._indeterminateIconImage =
+                style?.checkboxStyle?.indeterminateIconImage ?? checkboxThemeStyle?.indeterminateIconImage;
+        }
+        get size() {
+            return this._size;
+        }
+        set size(size) {
+            this._size = size;
+        }
+        get spaceBetweenTextAndIcon() {
+            return this._spaceBetweenTextAndIcon;
+        }
+        set spaceBetweenTextAndIcon(spaceBetweenTextAndIcon) {
+            this._spaceBetweenTextAndIcon = spaceBetweenTextAndIcon;
+        }
+        get defaultFill() {
+            return this._defaultFill;
+        }
+        set defaultFill(defaultFill) {
+            this._defaultFill = defaultFill;
+        }
+        get defaultStroke() {
+            return this._defaultStroke;
+        }
+        set defaultStroke(defaultStroke) {
+            this._defaultStroke = defaultStroke;
+        }
+        get disableFill() {
+            return this._disableFill;
+        }
+        set disableFill(disableFill) {
+            this._disableFill = disableFill;
+        }
+        get checkedFill() {
+            return this._checkedFill;
+        }
+        set checkedFill(checkedFill) {
+            this._checkedFill = checkedFill;
+        }
+        get checkedStroke() {
+            return this._checkedStroke;
+        }
+        set checkedStroke(checkedStroke) {
+            this._checkedStroke = checkedStroke;
+        }
+        get disableCheckedFill() {
+            return this._disableCheckedFill;
+        }
+        set disableCheckedFill(disableCheckedFill) {
+            this._disableCheckedFill = disableCheckedFill;
+        }
+        get disableCheckedStroke() {
+            return this._disableCheckedStroke;
+        }
+        set disableCheckedStroke(disableCheckedStroke) {
+            this._disableCheckedStroke = disableCheckedStroke;
+        }
+        get checkIconImage() {
+            return this._checkIconImage;
+        }
+        set checkIconImage(checkIconImage) {
+            this._checkIconImage = checkIconImage;
+        }
+        get indeterminateIconImage() {
+            return this._indeterminateIconImage;
+        }
+        set indeterminateIconImage(indeterminateIconImage) {
+            this._indeterminateIconImage = indeterminateIconImage;
+        }
+        getStyle(style) {
+            return new CheckboxStyle(style, this);
+        }
+        clone() {
+            return new CheckboxStyle(this);
+        }
+    };
+
+    function of$2(columnStyle, bodyStyle, styleArg, StyleClassDef = Style$1, globalAutoWrapText, theme) {
         if (columnStyle || bodyStyle) {
             if (columnStyle instanceof Style$1) {
                 return columnStyle;
             }
             else if (typeof columnStyle === 'function') {
-                return of$2(columnStyle(styleArg), bodyStyle, styleArg, StyleClassDef, globalAutoWrapText);
+                return of$2(columnStyle(styleArg), bodyStyle, styleArg, StyleClassDef, globalAutoWrapText, theme);
             }
             if (!columnStyle) {
                 columnStyle = {};
@@ -21861,12 +21971,15 @@
             if (globalAutoWrapText && !isValid$1(columnStyle.autoWrapText)) {
                 columnStyle.autoWrapText = true;
             }
+            if (StyleClassDef === CheckboxStyle$1) {
+                return new CheckboxStyle$1(columnStyle ?? {}, (bodyStyle ?? {}), (theme.checkboxStyle ?? {}));
+            }
             return new StyleClassDef((columnStyle ?? {}), (bodyStyle ?? {}));
         }
         return StyleClassDef.DEFAULT;
     }
 
-    let defaultStyle$5;
+    let defaultStyle$4;
     const EVENT_TYPE$1 = {
         CHANGE_STYLE: 'change_style'
     };
@@ -21901,7 +22014,7 @@
             return EVENT_TYPE$1;
         }
         static get DEFAULT() {
-            return defaultStyle$5 ? defaultStyle$5 : (defaultStyle$5 = new Style());
+            return defaultStyle$4 ? defaultStyle$4 : (defaultStyle$4 = new Style());
         }
         constructor(style = {}, headerStyle = {}) {
             super();
@@ -22086,12 +22199,12 @@
         }
     }
 
-    let defaultStyle$4;
+    let defaultStyle$3;
     class TextHeaderStyle extends Style {
         _autoWrapText;
         _lineClamp;
         static get DEFAULT() {
-            return defaultStyle$4 ? defaultStyle$4 : (defaultStyle$4 = new TextHeaderStyle());
+            return defaultStyle$3 ? defaultStyle$3 : (defaultStyle$3 = new TextHeaderStyle());
         }
         constructor(style = {}, headerStyle = null) {
             super(style, headerStyle);
@@ -22115,13 +22228,123 @@
         }
     }
 
-    function of$1(headerStyle, defaultHeaderStyle, styleArg, StyleClass, globalAutoWrapText) {
+    let defaultStyle$2;
+    class CheckboxStyle extends Style {
+        _size;
+        _spaceBetweenTextAndIcon;
+        _defaultFill;
+        _defaultStroke;
+        _disableFill;
+        _checkedFill;
+        _checkedStroke;
+        _disableCheckedFill;
+        _disableCheckedStroke;
+        _checkIconImage;
+        _indeterminateIconImage;
+        static get DEFAULT() {
+            return defaultStyle$2 ? defaultStyle$2 : (defaultStyle$2 = new CheckboxStyle());
+        }
+        constructor(style = {}, headerStyle = {}, checkboxThemeStyle = {}) {
+            super(style, headerStyle);
+            this._size = (style?.size ?? headerStyle?.size ?? checkboxThemeStyle?.size) || 14;
+            this._spaceBetweenTextAndIcon =
+                (style?.spaceBetweenTextAndIcon ??
+                    headerStyle?.spaceBetweenTextAndIcon ??
+                    checkboxThemeStyle?.spaceBetweenTextAndIcon) ||
+                    8;
+            this._defaultFill = style?.checkboxStyle?.defaultFill ?? checkboxThemeStyle?.defaultFill;
+            this._defaultStroke = style?.checkboxStyle?.defaultStroke ?? checkboxThemeStyle?.defaultStroke;
+            this._disableFill = style?.checkboxStyle?.disableFill ?? checkboxThemeStyle?.disableFill;
+            this._checkedFill = style?.checkboxStyle?.checkedFill ?? checkboxThemeStyle?.checkedFill;
+            this._checkedStroke = style?.checkboxStyle?.checkedStroke ?? checkboxThemeStyle?.checkedStroke;
+            this._disableCheckedFill = style?.checkboxStyle?.disableCheckedFill ?? checkboxThemeStyle?.disableCheckedFill;
+            this._disableCheckedStroke = style?.checkboxStyle?.disableCheckedStroke ?? checkboxThemeStyle?.disableCheckedStroke;
+            this._spaceBetweenTextAndIcon =
+                style?.checkboxStyle?.spaceBetweenTextAndIcon ?? checkboxThemeStyle?.spaceBetweenTextAndIcon;
+            this._indeterminateIconImage =
+                style?.checkboxStyle?.indeterminateIconImage ?? checkboxThemeStyle?.indeterminateIconImage;
+        }
+        get size() {
+            return this._size;
+        }
+        set size(size) {
+            this._size = size;
+        }
+        get spaceBetweenTextAndIcon() {
+            return this._spaceBetweenTextAndIcon;
+        }
+        set spaceBetweenTextAndIcon(spaceBetweenTextAndIcon) {
+            this._spaceBetweenTextAndIcon = spaceBetweenTextAndIcon;
+        }
+        get defaultFill() {
+            return this._defaultFill;
+        }
+        set defaultFill(defaultFill) {
+            this._defaultFill = defaultFill;
+        }
+        get defaultStroke() {
+            return this._defaultStroke;
+        }
+        set defaultStroke(defaultStroke) {
+            this._defaultStroke = defaultStroke;
+        }
+        get disableFill() {
+            return this._disableFill;
+        }
+        set disableFill(disableFill) {
+            this._disableFill = disableFill;
+        }
+        get checkedFill() {
+            return this._checkedFill;
+        }
+        set checkedFill(checkedFill) {
+            this._checkedFill = checkedFill;
+        }
+        get checkedStroke() {
+            return this._checkedStroke;
+        }
+        set checkedStroke(checkedStroke) {
+            this._checkedStroke = checkedStroke;
+        }
+        get disableCheckedFill() {
+            return this._disableCheckedFill;
+        }
+        set disableCheckedFill(disableCheckedFill) {
+            this._disableCheckedFill = disableCheckedFill;
+        }
+        get disableCheckedStroke() {
+            return this._disableCheckedStroke;
+        }
+        set disableCheckedStroke(disableCheckedStroke) {
+            this._disableCheckedStroke = disableCheckedStroke;
+        }
+        get checkIconImage() {
+            return this._checkIconImage;
+        }
+        set checkIconImage(checkIconImage) {
+            this._checkIconImage = checkIconImage;
+        }
+        get indeterminateIconImage() {
+            return this._indeterminateIconImage;
+        }
+        set indeterminateIconImage(indeterminateIconImage) {
+            this._indeterminateIconImage = indeterminateIconImage;
+        }
+        getStyle(style) {
+            return new CheckboxStyle(style, this);
+        }
+        clone() {
+            return new CheckboxStyle(this);
+        }
+    }
+
+    function of$1(headerStyle, defaultHeaderStyle, styleArg, StyleClass, globalAutoWrapText, theme) {
         if (headerStyle || defaultHeaderStyle) {
             if (headerStyle instanceof Style) {
                 return headerStyle;
             }
             else if (typeof headerStyle === 'function') {
-                return of$1(headerStyle(styleArg), defaultHeaderStyle, styleArg, StyleClass, globalAutoWrapText);
+                return of$1(headerStyle(styleArg), defaultHeaderStyle, styleArg, StyleClass, globalAutoWrapText, theme);
             }
             if (!headerStyle) {
                 headerStyle = {};
@@ -22129,6 +22352,9 @@
             if (globalAutoWrapText && !isValid$1(headerStyle.autoWrapText)) {
                 headerStyle.autoWrapText = true;
             }
+            if (StyleClass === CheckboxStyle) {
+                return new CheckboxStyle(headerStyle ?? {}, (defaultHeaderStyle ?? {}), (theme.checkboxStyle ?? {}));
+            }
             return new StyleClass(headerStyle ?? {}, (defaultHeaderStyle ?? {}));
         }
         return StyleClass.DEFAULT;
@@ -23758,6 +23984,7 @@
         _frozenColumnLine = null;
         _selectionStyle = null;
         _axisStyle = null;
+        _checkboxStyle = null;
         _textPopTipStyle = null;
         constructor(obj, superTheme) {
             this.internalTheme = {
@@ -24179,6 +24406,14 @@
             }
             return this._axisStyle;
         }
+        get checkboxStyle() {
+            if (!this._checkboxStyle) {
+                const { obj, superTheme } = this.internalTheme;
+                const checkboxStyle = ingoreNoneValueMerge({}, superTheme.checkboxStyle, obj.checkboxStyle);
+                this._checkboxStyle = checkboxStyle;
+            }
+            return this._checkboxStyle;
+        }
         get textPopTipStyle() {
             if (!this._textPopTipStyle) {
                 const { obj, superTheme } = this.internalTheme;
@@ -32823,16 +33058,22 @@
         let fontFamily;
         let fontSize;
         let fontWeight;
+        let fontStyle;
+        let fontVariant;
         if (font) {
-            const { family, size, weight } = parseFont(font);
+            const { family, size, weight, style, variant } = parseFont(font);
             fontFamily = family.join(' ');
             fontSize = size;
             fontWeight = weight;
+            fontStyle = style;
+            fontStyle = variant;
         }
         else {
             fontFamily = getProp('fontFamily', headerStyle, col, row, table);
             fontSize = getProp('fontSize', headerStyle, col, row, table);
             fontWeight = getProp('fontWeight', headerStyle, col, row, table);
+            fontStyle = getProp('fontStyle', headerStyle, col, row, table);
+            fontVariant = getProp('fontVariant', headerStyle, col, row, table);
         }
         const textAlign = getProp('textAlign', headerStyle, col, row, table);
         const textBaseline = getProp('textBaseline', headerStyle, col, row, table);
@@ -32868,6 +33109,8 @@
                 fontFamily,
                 fontSize,
                 fontWeight,
+                fontStyle,
+                fontVariant,
                 fill: color,
                 textAlign,
                 textBaseline,
@@ -35916,6 +36159,15 @@
         const style = table._getCellStyle(col, row);
         const size = getProp('size', style, col, row, table);
         const spaceBetweenTextAndIcon = getProp('spaceBetweenTextAndIcon', style, col, row, table);
+        const defaultFill = getProp('defaultFill', style, col, row, table);
+        const defaultStroke = getProp('defaultStroke', style, col, row, table);
+        const disableFill = getProp('disableFill', style, col, row, table);
+        const checkedFill = getProp('checkedFill', style, col, row, table);
+        const checkedStroke = getProp('checkedStroke', style, col, row, table);
+        const disableCheckedFill = getProp('disableCheckedFill', style, col, row, table);
+        const disableCheckedStroke = getProp('disableCheckedStroke', style, col, row, table);
+        const checkIconImage = getProp('checkIconImage', style, col, row, table);
+        const indeterminateIconImage = getProp('indeterminateIconImage', style, col, row, table);
         const value = table.getCellValue(col, row);
         const dataValue = table.getCellOriginValue(col, row);
         let isChecked;
@@ -35972,45 +36224,39 @@
             whiteSpace: text.length === 1 && !autoWrapText ? 'no-wrap' : 'normal'
         };
         const testAttribute = cellTheme.text ? Object.assign({}, cellTheme.text, attribute) : attribute;
-        let checkbox;
+        const checkboxAttributes = {
+            x: 0,
+            y: 0,
+            text: testAttribute,
+            icon: {
+                width: Math.floor(size / 1.4),
+                height: Math.floor(size / 1.4)
+            },
+            box: {
+                width: size,
+                height: size
+            },
+            spaceBetweenTextAndIcon,
+            disabled: isDisabled ?? globalDisable ?? false
+        };
         if (isChecked === 'indeterminate') {
-            checkbox = new CheckBox({
-                x: 0,
-                y: 0,
-                text: testAttribute,
-                icon: {
-                    width: Math.floor(size / 1.4),
-                    height: Math.floor(size / 1.4)
-                },
-                box: {
-                    width: size,
-                    height: size
-                },
-                spaceBetweenTextAndIcon,
-                checked: undefined,
-                indeterminate: true,
-                disabled: isDisabled ?? globalDisable ?? false
-            });
+            checkboxAttributes.checked = undefined;
+            checkboxAttributes.indeterminate = true;
         }
         else {
-            checkbox = new CheckBox({
-                x: 0,
-                y: 0,
-                text: testAttribute,
-                icon: {
-                    width: Math.floor(size / 1.4),
-                    height: Math.floor(size / 1.4)
-                },
-                box: {
-                    width: size,
-                    height: size
-                },
-                spaceBetweenTextAndIcon,
-                checked: isChecked,
-                indeterminate: undefined,
-                disabled: isDisabled ?? globalDisable ?? false
-            });
-        }
+            checkboxAttributes.checked = isChecked;
+            checkboxAttributes.indeterminate = undefined;
+        }
+        defaultFill && (checkboxAttributes.box.fill = defaultFill);
+        defaultStroke && (checkboxAttributes.box.stroke = defaultStroke);
+        disableFill && (checkboxAttributes.box.disableFill = disableFill);
+        checkedFill && (checkboxAttributes.box.checkedFill = checkedFill);
+        checkedStroke && (checkboxAttributes.box.checkedStroke = checkedStroke);
+        disableCheckedFill && (checkboxAttributes.box.disableCheckedFill = disableCheckedFill);
+        disableCheckedStroke && (checkboxAttributes.box.disableCheckedStroke = disableCheckedStroke);
+        checkIconImage && (checkboxAttributes.icon.checkIconImage = checkIconImage);
+        indeterminateIconImage && (checkboxAttributes.icon.indeterminateIconImage = indeterminateIconImage);
+        const checkbox = new CheckBox(checkboxAttributes);
         checkbox.name = 'checkbox';
         return checkbox;
     }
@@ -45400,17 +45646,17 @@
                 }
             }
             if (this.table.bottomFrozenRowCount > 0) {
-                this.bottomFrozenGroup.setAttribute('y', this.tableGroup.attribute.height - this.bottomFrozenGroup.attribute.height);
+                this.bottomFrozenGroup.setAttribute('y', this.tableGroup.attribute.height - this.table.getBottomFrozenRowsHeight());
                 this.leftBottomCornerGroup.setAttributes({
                     visible: true,
-                    y: this.tableGroup.attribute.height - this.bottomFrozenGroup.attribute.height,
-                    height: this.bottomFrozenGroup.attribute.height,
+                    y: this.tableGroup.attribute.height - this.table.getBottomFrozenRowsHeight(),
+                    height: this.table.getBottomFrozenRowsHeight(),
                     width: this.table.getFrozenColsWidth()
                 });
                 this.rightBottomCornerGroup.setAttributes({
                     visible: true,
-                    y: this.tableGroup.attribute.height - this.bottomFrozenGroup.attribute.height,
-                    height: this.bottomFrozenGroup.attribute.height
+                    y: this.tableGroup.attribute.height - this.table.getBottomFrozenRowsHeight(),
+                    height: this.table.getBottomFrozenRowsHeight()
                 });
             }
             if (this.table.rightFrozenColCount > 0) {
@@ -48046,7 +48292,10 @@
                 if (cellGoup?.role === 'cell' &&
                     isValid$1(cellGoup.col) &&
                     isValid$1(cellGoup.row) &&
-                    (cellGoup.col !== table.stateManager.hover.cellPos.col || cellGoup.row !== table.stateManager.hover.cellPos.row)) {
+                    (cellGoup.col !== table.stateManager.hover.cellPos.col ||
+                        cellGoup.row !== table.stateManager.hover.cellPos.row) &&
+                    (cellGoup.col !== table.stateManager.hover.cellPosContainHeader?.col ||
+                        cellGoup.row !== table.stateManager.hover.cellPosContainHeader?.row)) {
                     table.fireListeners(TABLE_EVENT_TYPE.MOUSEENTER_CELL, {
                         col: cellGoup.col,
                         row: cellGoup.row,
@@ -49371,7 +49620,7 @@
         }
     }
 
-    let defaultStyle$3;
+    let defaultStyle$1;
     const DEFAULT_BAR_COLOR = (args) => {
         const num = args.value;
         if (Number(num) > 80) {
@@ -49402,7 +49651,7 @@
         _barMarkPosition;
         _barRightToLeft;
         static get DEFAULT() {
-            return defaultStyle$3 ? defaultStyle$3 : (defaultStyle$3 = new ProgressBarStyle());
+            return defaultStyle$1 ? defaultStyle$1 : (defaultStyle$1 = new ProgressBarStyle());
         }
         constructor(style = {}, bodyStyle = {}) {
             super(style, bodyStyle);
@@ -49540,35 +49789,6 @@
     ];
     const iconPropKeys = ICON_PROP_KEYS;
 
-    let defaultStyle$2;
-    let CheckboxStyle$1 = class CheckboxStyle extends Style$1 {
-        _size;
-        _spaceBetweenTextAndIcon;
-        static get DEFAULT() {
-            return defaultStyle$2 ? defaultStyle$2 : (defaultStyle$2 = new CheckboxStyle());
-        }
-        constructor(style = {}, headerStyle = {}) {
-            super(style, headerStyle);
-            this._size = (style.size ?? headerStyle?.size) || 14;
-            this._spaceBetweenTextAndIcon = (style.spaceBetweenTextAndIcon ?? headerStyle?.spaceBetweenTextAndIcon) || 8;
-        }
-        get size() {
-            return this._size;
-        }
-        set size(size) {
-            this._size = size;
-        }
-        get spaceBetweenTextAndIcon() {
-            return this._spaceBetweenTextAndIcon;
-        }
-        set spaceBetweenTextAndIcon(spaceBetweenTextAndIcon) {
-            this._spaceBetweenTextAndIcon = spaceBetweenTextAndIcon;
-        }
-        clone() {
-            return new CheckboxStyle(this);
-        }
-    };
-
     class BodyHelper {
         expandIcon;
         collapseIcon;
@@ -50290,10 +50510,10 @@
         return itemContainer;
     }
 
-    let defaultStyle$1;
+    let defaultStyle;
     class ImageStyle extends Style {
         static get DEFAULT() {
-            return defaultStyle$1 ? defaultStyle$1 : (defaultStyle$1 = new ImageStyle());
+            return defaultStyle ? defaultStyle : (defaultStyle = new ImageStyle());
         }
         constructor(style = {}, headerStyle = {}) {
             super(style, headerStyle);
@@ -50304,35 +50524,6 @@
         }
     }
 
-    let defaultStyle;
-    class CheckboxStyle extends Style {
-        _size;
-        _spaceBetweenTextAndIcon;
-        static get DEFAULT() {
-            return defaultStyle ? defaultStyle : (defaultStyle = new CheckboxStyle());
-        }
-        constructor(style = {}, headerStyle = {}) {
-            super(style, headerStyle);
-            this._size = (style.size ?? headerStyle?.size) || 14;
-            this._spaceBetweenTextAndIcon = (style.spaceBetweenTextAndIcon ?? headerStyle?.spaceBetweenTextAndIcon) || 8;
-        }
-        get size() {
-            return this._size;
-        }
-        set size(size) {
-            this._size = size;
-        }
-        get spaceBetweenTextAndIcon() {
-            return this._spaceBetweenTextAndIcon;
-        }
-        set spaceBetweenTextAndIcon(spaceBetweenTextAndIcon) {
-            this._spaceBetweenTextAndIcon = spaceBetweenTextAndIcon;
-        }
-        clone() {
-            return new CheckboxStyle(this);
-        }
-    }
-
     class HeaderHelper {
         normalIcon;
         upIcon;
@@ -52458,7 +52649,7 @@
             return TABLE_EVENT_TYPE;
         }
         options;
-        version = "0.20.1";
+        version = "0.20.2";
         pagination;
         id = `VTable${Date.now()}`;
         headerStyleCache;
@@ -54026,7 +54217,7 @@
                             value: customMerge.text,
                             dataValue: this.getCellOriginValue(col, row),
                             cellHeaderPaths: this.getCellHeaderPaths(col, row)
-                        }, styleClass, this.options.autoWrapText);
+                        }, styleClass, this.options.autoWrapText, this.theme);
                         customMerge.style = fullStyle;
                     }
                     return customMerge;
@@ -54174,7 +54365,7 @@
                         value: this.getCellValue(col, row),
                         dataValue: this.getCellOriginValue(col, row),
                         cellHeaderPaths: this.getCellHeaderPaths(col, row)
-                    }, styleClass, this.options.autoWrapText);
+                    }, styleClass, this.options.autoWrapText, this.theme);
                 }
                 else if (layoutMap.isRightFrozenColumn(col, row) && this.theme.rightFrozenStyle) {
                     cacheStyle = of$1(paddingForAxis ? { padding: paddingForAxis } : {}, this.theme.rightFrozenStyle, {
@@ -54184,7 +54375,7 @@
                         value: this.getCellValue(col, row),
                         dataValue: this.getCellOriginValue(col, row),
                         cellHeaderPaths: this.getCellHeaderPaths(col, row)
-                    }, styleClass, this.options.autoWrapText);
+                    }, styleClass, this.options.autoWrapText, this.theme);
                 }
                 else {
                     const style = hd?.style || {};
@@ -54202,7 +54393,7 @@
                         value: this.getCellValue(col, row),
                         dataValue: this.getCellOriginValue(col, row),
                         cellHeaderPaths: this.getCellHeaderPaths(col, row)
-                    }, styleClass, this.options.autoWrapText);
+                    }, styleClass, this.options.autoWrapText, this.theme);
                 }
                 this.headerStyleCache.set(cacheKey, cacheStyle);
                 return cacheStyle;
@@ -54240,7 +54431,7 @@
                 value: this.getCellValue(col, row),
                 dataValue: this.getCellOriginValue(col, row),
                 cellHeaderPaths: this.getCellHeaderPaths(col, row)
-            }, styleClass, this.options.autoWrapText);
+            }, styleClass, this.options.autoWrapText, this.theme);
             if (!isFunction$1(style)) {
                 if (layoutMap.isBottomFrozenRow(row)) {
                     this.bodyBottomStyleCache.set(cacheKey, cacheStyle);
@@ -56089,10 +56280,10 @@
         }
         get rightFrozenColCount() {
             if (this._table.internalProps.rightFrozenColCount) {
-                if (this.colCount - this.rowHeaderLevelCount >= this._table.internalProps.rightFrozenColCount) {
+                if (this.colCount - this.frozenColCount >= this._table.internalProps.rightFrozenColCount) {
                     return this._table.internalProps.rightFrozenColCount;
                 }
-                return this.colCount - this.rowHeaderLevelCount;
+                return Math.max(0, this.colCount - this.frozenColCount);
             }
             return 0;
         }
@@ -57614,8 +57805,11 @@
             if (Array.isArray(option) || option?.order) {
                 sort = option;
             }
-            else {
-                sort = option?.sortState;
+            else if (option) {
+                sort = option.sortState;
+            }
+            else if (option === null) {
+                sort = null;
             }
             typeof window !== 'undefined' ? window.performance.now() : 0;
             const oldHoverState = { col: this.stateManager.hover.cellPos.col, row: this.stateManager.hover.cellPos.row };
@@ -63959,7 +64153,7 @@
     }
 
     registerForVrender();
-    const version = "0.20.1";
+    const version = "0.20.2";
     function getIcons() {
         return get$2();
     }