naive-ui 2.41.1 → 2.43.0

package/lib/data-table/src/interface.d.ts

@@ -609,7 +609,20 @@ export declare const dataTableProps: {
                         arrowOffsetVertical: string;
                         arrowHeight: string;
                         padding: string;
-                    }, any>;
+                    }, {
+                        Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                            height: string;
+                            width: string;
+                            borderRadius: string;
+                            color: string;
+                            colorHover: string;
+                            railInsetHorizontalBottom: string;
+                            railInsetHorizontalTop: string;
+                            railInsetVerticalRight: string;
+                            railInsetVerticalLeft: string;
+                            railColor: string;
+                        }, any>;
+                    }>;
                 }>;
                 InternalSelectMenu: import("../../_mixins").Theme<"InternalSelectMenu", {
                     optionFontSizeTiny: string;
@@ -740,7 +753,20 @@ export declare const dataTableProps: {
                 paddingMedium: string;
                 paddingLarge: string;
                 clearSize: string;
-            }, any>;
+            }, {
+                Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                    height: string;
+                    width: string;
+                    borderRadius: string;
+                    color: string;
+                    colorHover: string;
+                    railInsetHorizontalBottom: string;
+                    railInsetHorizontalTop: string;
+                    railInsetVerticalRight: string;
+                    railInsetVerticalLeft: string;
+                    railColor: string;
+                }, any>;
+            }>;
             Popselect: import("../../_mixins").Theme<"Popselect", {
                 menuBoxShadow: string;
             }, {
@@ -757,7 +783,20 @@ export declare const dataTableProps: {
                     arrowOffsetVertical: string;
                     arrowHeight: string;
                     padding: string;
-                }, any>;
+                }, {
+                    Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                        height: string;
+                        width: string;
+                        borderRadius: string;
+                        color: string;
+                        colorHover: string;
+                        railInsetHorizontalBottom: string;
+                        railInsetHorizontalTop: string;
+                        railInsetVerticalRight: string;
+                        railInsetVerticalLeft: string;
+                        railColor: string;
+                    }, any>;
+                }>;
                 InternalSelectMenu: import("../../_mixins").Theme<"InternalSelectMenu", {
                     optionFontSizeTiny: string;
                     optionFontSizeSmall: string;
@@ -867,7 +906,20 @@ export declare const dataTableProps: {
             arrowOffsetVertical: string;
             arrowHeight: string;
             padding: string;
-        }, any>;
+        }, {
+            Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                height: string;
+                width: string;
+                borderRadius: string;
+                color: string;
+                colorHover: string;
+                railInsetHorizontalBottom: string;
+                railInsetHorizontalTop: string;
+                railInsetVerticalRight: string;
+                railInsetVerticalLeft: string;
+                railColor: string;
+            }, any>;
+        }>;
         Ellipsis: import("../../_mixins").Theme<"Ellipsis", unknown, {
             Tooltip: import("../../_mixins").Theme<"Tooltip", {
                 borderRadius: string;
@@ -889,7 +941,20 @@ export declare const dataTableProps: {
                     arrowOffsetVertical: string;
                     arrowHeight: string;
                     padding: string;
-                }, any>;
+                }, {
+                    Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                        height: string;
+                        width: string;
+                        borderRadius: string;
+                        color: string;
+                        colorHover: string;
+                        railInsetHorizontalBottom: string;
+                        railInsetHorizontalTop: string;
+                        railInsetVerticalRight: string;
+                        railInsetVerticalLeft: string;
+                        railColor: string;
+                    }, any>;
+                }>;
             }>;
         }>;
         Dropdown: import("../../_mixins").Theme<"Dropdown", {
@@ -960,7 +1025,20 @@ export declare const dataTableProps: {
                 arrowOffsetVertical: string;
                 arrowHeight: string;
                 padding: string;
-            }, any>;
+            }, {
+                Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                    height: string;
+                    width: string;
+                    borderRadius: string;
+                    color: string;
+                    colorHover: string;
+                    railInsetHorizontalBottom: string;
+                    railInsetHorizontalTop: string;
+                    railInsetVerticalRight: string;
+                    railInsetVerticalLeft: string;
+                    railColor: string;
+                }, any>;
+            }>;
         }>;
     }>>;
     readonly themeOverrides: PropType<import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"DataTable", {
@@ -1436,7 +1514,20 @@ export declare const dataTableProps: {
                         arrowOffsetVertical: string;
                         arrowHeight: string;
                         padding: string;
-                    }, any>;
+                    }, {
+                        Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                            height: string;
+                            width: string;
+                            borderRadius: string;
+                            color: string;
+                            colorHover: string;
+                            railInsetHorizontalBottom: string;
+                            railInsetHorizontalTop: string;
+                            railInsetVerticalRight: string;
+                            railInsetVerticalLeft: string;
+                            railColor: string;
+                        }, any>;
+                    }>;
                 }>;
                 InternalSelectMenu: import("../../_mixins").Theme<"InternalSelectMenu", {
                     optionFontSizeTiny: string;
@@ -1567,7 +1658,20 @@ export declare const dataTableProps: {
                 paddingMedium: string;
                 paddingLarge: string;
                 clearSize: string;
-            }, any>;
+            }, {
+                Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                    height: string;
+                    width: string;
+                    borderRadius: string;
+                    color: string;
+                    colorHover: string;
+                    railInsetHorizontalBottom: string;
+                    railInsetHorizontalTop: string;
+                    railInsetVerticalRight: string;
+                    railInsetVerticalLeft: string;
+                    railColor: string;
+                }, any>;
+            }>;
             Popselect: import("../../_mixins").Theme<"Popselect", {
                 menuBoxShadow: string;
             }, {
@@ -1584,7 +1688,20 @@ export declare const dataTableProps: {
                     arrowOffsetVertical: string;
                     arrowHeight: string;
                     padding: string;
-                }, any>;
+                }, {
+                    Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                        height: string;
+                        width: string;
+                        borderRadius: string;
+                        color: string;
+                        colorHover: string;
+                        railInsetHorizontalBottom: string;
+                        railInsetHorizontalTop: string;
+                        railInsetVerticalRight: string;
+                        railInsetVerticalLeft: string;
+                        railColor: string;
+                    }, any>;
+                }>;
                 InternalSelectMenu: import("../../_mixins").Theme<"InternalSelectMenu", {
                     optionFontSizeTiny: string;
                     optionFontSizeSmall: string;
@@ -1694,7 +1811,20 @@ export declare const dataTableProps: {
             arrowOffsetVertical: string;
             arrowHeight: string;
             padding: string;
-        }, any>;
+        }, {
+            Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                height: string;
+                width: string;
+                borderRadius: string;
+                color: string;
+                colorHover: string;
+                railInsetHorizontalBottom: string;
+                railInsetHorizontalTop: string;
+                railInsetVerticalRight: string;
+                railInsetVerticalLeft: string;
+                railColor: string;
+            }, any>;
+        }>;
         Ellipsis: import("../../_mixins").Theme<"Ellipsis", unknown, {
             Tooltip: import("../../_mixins").Theme<"Tooltip", {
                 borderRadius: string;
@@ -1716,7 +1846,20 @@ export declare const dataTableProps: {
                     arrowOffsetVertical: string;
                     arrowHeight: string;
                     padding: string;
-                }, any>;
+                }, {
+                    Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                        height: string;
+                        width: string;
+                        borderRadius: string;
+                        color: string;
+                        colorHover: string;
+                        railInsetHorizontalBottom: string;
+                        railInsetHorizontalTop: string;
+                        railInsetVerticalRight: string;
+                        railInsetVerticalLeft: string;
+                        railColor: string;
+                    }, any>;
+                }>;
             }>;
         }>;
         Dropdown: import("../../_mixins").Theme<"Dropdown", {
@@ -1787,7 +1930,20 @@ export declare const dataTableProps: {
                 arrowOffsetVertical: string;
                 arrowHeight: string;
                 padding: string;
-            }, any>;
+            }, {
+                Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                    height: string;
+                    width: string;
+                    borderRadius: string;
+                    color: string;
+                    colorHover: string;
+                    railInsetHorizontalBottom: string;
+                    railInsetHorizontalTop: string;
+                    railInsetVerticalRight: string;
+                    railInsetVerticalLeft: string;
+                    railColor: string;
+                }, any>;
+            }>;
         }>;
     }>>>;
     readonly builtinThemeOverrides: PropType<import("../../_mixins/use-theme").ExtractThemeOverrides<import("../../_mixins").Theme<"DataTable", {
@@ -2263,7 +2419,20 @@ export declare const dataTableProps: {
                         arrowOffsetVertical: string;
                         arrowHeight: string;
                         padding: string;
-                    }, any>;
+                    }, {
+                        Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                            height: string;
+                            width: string;
+                            borderRadius: string;
+                            color: string;
+                            colorHover: string;
+                            railInsetHorizontalBottom: string;
+                            railInsetHorizontalTop: string;
+                            railInsetVerticalRight: string;
+                            railInsetVerticalLeft: string;
+                            railColor: string;
+                        }, any>;
+                    }>;
                 }>;
                 InternalSelectMenu: import("../../_mixins").Theme<"InternalSelectMenu", {
                     optionFontSizeTiny: string;
@@ -2394,7 +2563,20 @@ export declare const dataTableProps: {
                 paddingMedium: string;
                 paddingLarge: string;
                 clearSize: string;
-            }, any>;
+            }, {
+                Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                    height: string;
+                    width: string;
+                    borderRadius: string;
+                    color: string;
+                    colorHover: string;
+                    railInsetHorizontalBottom: string;
+                    railInsetHorizontalTop: string;
+                    railInsetVerticalRight: string;
+                    railInsetVerticalLeft: string;
+                    railColor: string;
+                }, any>;
+            }>;
             Popselect: import("../../_mixins").Theme<"Popselect", {
                 menuBoxShadow: string;
             }, {
@@ -2411,7 +2593,20 @@ export declare const dataTableProps: {
                     arrowOffsetVertical: string;
                     arrowHeight: string;
                     padding: string;
-                }, any>;
+                }, {
+                    Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                        height: string;
+                        width: string;
+                        borderRadius: string;
+                        color: string;
+                        colorHover: string;
+                        railInsetHorizontalBottom: string;
+                        railInsetHorizontalTop: string;
+                        railInsetVerticalRight: string;
+                        railInsetVerticalLeft: string;
+                        railColor: string;
+                    }, any>;
+                }>;
                 InternalSelectMenu: import("../../_mixins").Theme<"InternalSelectMenu", {
                     optionFontSizeTiny: string;
                     optionFontSizeSmall: string;
@@ -2521,7 +2716,20 @@ export declare const dataTableProps: {
             arrowOffsetVertical: string;
             arrowHeight: string;
             padding: string;
-        }, any>;
+        }, {
+            Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                height: string;
+                width: string;
+                borderRadius: string;
+                color: string;
+                colorHover: string;
+                railInsetHorizontalBottom: string;
+                railInsetHorizontalTop: string;
+                railInsetVerticalRight: string;
+                railInsetVerticalLeft: string;
+                railColor: string;
+            }, any>;
+        }>;
         Ellipsis: import("../../_mixins").Theme<"Ellipsis", unknown, {
             Tooltip: import("../../_mixins").Theme<"Tooltip", {
                 borderRadius: string;
@@ -2543,7 +2751,20 @@ export declare const dataTableProps: {
                     arrowOffsetVertical: string;
                     arrowHeight: string;
                     padding: string;
-                }, any>;
+                }, {
+                    Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                        height: string;
+                        width: string;
+                        borderRadius: string;
+                        color: string;
+                        colorHover: string;
+                        railInsetHorizontalBottom: string;
+                        railInsetHorizontalTop: string;
+                        railInsetVerticalRight: string;
+                        railInsetVerticalLeft: string;
+                        railColor: string;
+                    }, any>;
+                }>;
             }>;
         }>;
         Dropdown: import("../../_mixins").Theme<"Dropdown", {
@@ -2614,7 +2835,20 @@ export declare const dataTableProps: {
                 arrowOffsetVertical: string;
                 arrowHeight: string;
                 padding: string;
-            }, any>;
+            }, {
+                Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                    height: string;
+                    width: string;
+                    borderRadius: string;
+                    color: string;
+                    colorHover: string;
+                    railInsetHorizontalBottom: string;
+                    railInsetHorizontalTop: string;
+                    railInsetVerticalRight: string;
+                    railInsetVerticalLeft: string;
+                    railColor: string;
+                }, any>;
+            }>;
         }>;
     }>>>;
 };
@@ -2681,6 +2915,7 @@ export type TableBaseColumn<T = InternalRowData> = {
     sorter?: boolean | Sorter<T> | 'default';
     defaultSortOrder?: SortOrder;
     sortOrder?: SortOrder;
+    customNextSortOrder?: (order: SortOrder) => SortOrder;
     resizable?: boolean;
     minWidth?: string | number;
     maxWidth?: string | number;

package/lib/data-table/src/use-sorter.d.ts

@@ -1,4 +1,4 @@
-import type { ColumnKey, CompareFn, DataTableSetupProps, InternalRowData, SortOrder, SortState, TableBaseColumn, TableExpandColumn, TableSelectionColumn, TmNode } from './interface';
+import type { ColumnKey, DataTableSetupProps, InternalRowData, SortOrder, SortState, TableBaseColumn, TableExpandColumn, TableSelectionColumn, TmNode } from './interface';
 import { type ComputedRef } from 'vue';
 export declare function useSorter(props: DataTableSetupProps, { dataRelatedColsRef, filteredDataRef }: {
     dataRelatedColsRef: ComputedRef<Array<TableSelectionColumn | TableBaseColumn | TableExpandColumn>>;
@@ -10,10 +10,7 @@ export declare function useSorter(props: DataTableSetupProps, { dataRelatedColsR
     mergedSortStateRef: ComputedRef<{
         columnKey: ColumnKey;
         order: SortOrder;
-        sorter: boolean | "default" | CompareFn<InternalRowData> | {
-            multiple: number;
-            compare?: "default" | CompareFn<InternalRowData> | undefined;
-        };
+        sorter: boolean | "default" | import("./interface").Sorter<InternalRowData>;
     }[]>;
     deriveNextSorter: (sortState: SortState | null) => void;
 };

package/lib/data-table/src/use-table-data.d.ts

@@ -13,10 +13,7 @@ export declare function useTableData(props: DataTableSetupProps, { dataRelatedCo
     mergedSortStateRef: ComputedRef<{
         columnKey: ColumnKey;
         order: import("./interface").SortOrder;
-        sorter: boolean | "default" | import("./interface").CompareFn<InternalRowData> | {
-            multiple: number;
-            compare?: "default" | import("./interface").CompareFn<InternalRowData> | undefined;
-        };
+        sorter: boolean | "default" | import("./interface").Sorter<InternalRowData>;
     }[]>;
     hoverKeyRef: import("vue").Ref<RowKey | null, RowKey | null>;
     selectionColumnRef: ComputedRef<TableSelectionColumn | null>;

package/lib/data-table/src/utils.js

@@ -133,6 +133,7 @@ function getNextOrderOf(order) {
 function createNextSorter(column, currentSortState) {
     if (column.sorter === undefined)
         return null;
+    const { customNextSortOrder } = column;
     if (currentSortState === null || currentSortState.columnKey !== column.key) {
         return {
             columnKey: column.key,
@@ -141,7 +142,7 @@ function createNextSorter(column, currentSortState) {
         };
     }
     else {
-        return Object.assign(Object.assign({}, currentSortState), { order: getNextOrderOf(currentSortState.order) });
+        return Object.assign(Object.assign({}, currentSortState), { order: (customNextSortOrder || getNextOrderOf)(currentSortState.order) });
     }
 }
 function isColumnSorting(column, mergedSortState) {

package/lib/data-table/styles/light.d.ts

@@ -530,7 +530,20 @@ declare const dataTableLight: import("../../_mixins").Theme<"DataTable", {
                     arrowOffsetVertical: string;
                     arrowHeight: string;
                     padding: string;
-                }, any>;
+                }, {
+                    Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                        height: string;
+                        width: string;
+                        borderRadius: string;
+                        color: string;
+                        colorHover: string;
+                        railInsetHorizontalBottom: string;
+                        railInsetHorizontalTop: string;
+                        railInsetVerticalRight: string;
+                        railInsetVerticalLeft: string;
+                        railColor: string;
+                    }, any>;
+                }>;
             }>;
             InternalSelectMenu: import("../../_mixins").Theme<"InternalSelectMenu", {
                 optionFontSizeTiny: string;
@@ -661,7 +674,20 @@ declare const dataTableLight: import("../../_mixins").Theme<"DataTable", {
             paddingMedium: string;
             paddingLarge: string;
             clearSize: string;
-        }, any>;
+        }, {
+            Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                height: string;
+                width: string;
+                borderRadius: string;
+                color: string;
+                colorHover: string;
+                railInsetHorizontalBottom: string;
+                railInsetHorizontalTop: string;
+                railInsetVerticalRight: string;
+                railInsetVerticalLeft: string;
+                railColor: string;
+            }, any>;
+        }>;
         Popselect: import("../../_mixins").Theme<"Popselect", {
             menuBoxShadow: string;
         }, {
@@ -678,7 +704,20 @@ declare const dataTableLight: import("../../_mixins").Theme<"DataTable", {
                 arrowOffsetVertical: string;
                 arrowHeight: string;
                 padding: string;
-            }, any>;
+            }, {
+                Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                    height: string;
+                    width: string;
+                    borderRadius: string;
+                    color: string;
+                    colorHover: string;
+                    railInsetHorizontalBottom: string;
+                    railInsetHorizontalTop: string;
+                    railInsetVerticalRight: string;
+                    railInsetVerticalLeft: string;
+                    railColor: string;
+                }, any>;
+            }>;
             InternalSelectMenu: import("../../_mixins").Theme<"InternalSelectMenu", {
                 optionFontSizeTiny: string;
                 optionFontSizeSmall: string;
@@ -788,7 +827,20 @@ declare const dataTableLight: import("../../_mixins").Theme<"DataTable", {
         arrowOffsetVertical: string;
         arrowHeight: string;
         padding: string;
-    }, any>;
+    }, {
+        Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+            height: string;
+            width: string;
+            borderRadius: string;
+            color: string;
+            colorHover: string;
+            railInsetHorizontalBottom: string;
+            railInsetHorizontalTop: string;
+            railInsetVerticalRight: string;
+            railInsetVerticalLeft: string;
+            railColor: string;
+        }, any>;
+    }>;
     Ellipsis: import("../../_mixins").Theme<"Ellipsis", unknown, {
         Tooltip: import("../../_mixins").Theme<"Tooltip", {
             borderRadius: string;
@@ -810,7 +862,20 @@ declare const dataTableLight: import("../../_mixins").Theme<"DataTable", {
                 arrowOffsetVertical: string;
                 arrowHeight: string;
                 padding: string;
-            }, any>;
+            }, {
+                Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                    height: string;
+                    width: string;
+                    borderRadius: string;
+                    color: string;
+                    colorHover: string;
+                    railInsetHorizontalBottom: string;
+                    railInsetHorizontalTop: string;
+                    railInsetVerticalRight: string;
+                    railInsetVerticalLeft: string;
+                    railColor: string;
+                }, any>;
+            }>;
         }>;
     }>;
     Dropdown: import("../../_mixins").Theme<"Dropdown", {
@@ -881,7 +946,20 @@ declare const dataTableLight: import("../../_mixins").Theme<"DataTable", {
             arrowOffsetVertical: string;
             arrowHeight: string;
             padding: string;
-        }, any>;
+        }, {
+            Scrollbar: import("../../_mixins").Theme<"Scrollbar", {
+                height: string;
+                width: string;
+                borderRadius: string;
+                color: string;
+                colorHover: string;
+                railInsetHorizontalBottom: string;
+                railInsetHorizontalTop: string;
+                railInsetVerticalRight: string;
+                railInsetVerticalLeft: string;
+                railColor: string;
+            }, any>;
+        }>;
     }>;
 }>;
 export default dataTableLight;