stk-table-vue 0.8.2 → 0.8.3

package/lib/src/StkTable/StkTable.vue.d.ts

@@ -347,7 +347,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
      * en: Set expanded rows
      * @see {@link setRowExpand}
      */
-    setRowExpand: (rowKeyOrRow: string | undefined | PrivateRowDT, expand?: boolean, data?: {
+    setRowExpand: (rowKeyOrRow: string | undefined | PrivateRowDT, expand?: boolean | null, data?: {
         col?: StkTableColumn<PrivateRowDT>;
         silent?: boolean;
     }) => void;

package/lib/src/StkTable/useRowExpand.d.ts

@@ -9,7 +9,7 @@ type Option<DT extends Record<string, any>> = {
 };
 export declare function useRowExpand({ dataSourceCopy, rowKeyGen, emits }: Option<DT>): {
     toggleExpandRow: (row: DT, col: StkTableColumn<DT>) => void;
-    setRowExpand: (rowKeyOrRow: string | undefined | DT, expand?: boolean, data?: {
+    setRowExpand: (rowKeyOrRow: string | undefined | DT, expand?: boolean | null, data?: {
         col?: StkTableColumn<DT>;
         silent?: boolean;
     }) => void;

package/lib/stk-table-vue.js

@@ -854,8 +854,12 @@ function useKeyboardArrowScroll(targetElement, { props, scrollTo, virtualScroll,
   }
 }
 function useRowExpand({ dataSourceCopy, rowKeyGen, emits }) {
+  const expandedKey = "__EXPANDED__";
+  function isExpanded(row, col) {
+    return (row == null ? void 0 : row[expandedKey]) === col ? !(row == null ? void 0 : row[expandedKey]) : true;
+  }
   function toggleExpandRow(row, col) {
-    const isExpand = (row == null ? void 0 : row.__EXPANDED__) === col ? !(row == null ? void 0 : row.__EXPANDED__) : true;
+    const isExpand = isExpanded(row, col);
     setRowExpand(row, isExpand, { col });
   }
   function setRowExpand(rowKeyOrRow, expand, data) {
@@ -883,6 +887,9 @@ function useRowExpand({ dataSourceCopy, rowKeyGen, emits }) {
     }
     const row = tempData[index];
     const col = (data == null ? void 0 : data.col) || null;
+    if (expand == null) {
+      expand = isExpanded(row, col);
+    }
     if (expand) {
       const newExpandRow = {
         __ROW_KEY__: EXPANDED_ROW_KEY_PREFIX + rowKey,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stk-table-vue",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "description": "Simple realtime virtual table for vue3 and vue2.7",
   "main": "./lib/stk-table-vue.js",
   "types": "./lib/src/StkTable/index.d.ts",

package/src/StkTable/useRowExpand.ts

@@ -9,26 +9,32 @@ type Option<DT extends Record<string, any>> = {
 };
 
 export function useRowExpand({ dataSourceCopy, rowKeyGen, emits }: Option<DT>) {
+    const expandedKey = '__EXPANDED__';
+
+    function isExpanded(row: DT, col?: StkTableColumn<DT> | null) {
+        return row?.[expandedKey] === col ? !row?.[expandedKey] : true;
+    }
     /** click expended icon to toggle expand row */
     function toggleExpandRow(row: DT, col: StkTableColumn<DT>) {
-        const isExpand = row?.__EXPANDED__ === col ? !row?.__EXPANDED__ : true;
+        const isExpand = isExpanded(row, col);
         setRowExpand(row, isExpand, { col });
     }
 
     /**
      *
      * @param rowKeyOrRow rowKey or row
-     * @param expand expand or collapse
+     * @param expand expand or collapse, if set null, toggle expand
      * @param data { col?: StkTableColumn<DT> }
      * @param data.silent if set true, not emit `toggle-row-expand`, default:false
      */
-    function setRowExpand(rowKeyOrRow: string | undefined | DT, expand?: boolean, data?: { col?: StkTableColumn<DT>; silent?: boolean }) {
+    function setRowExpand(rowKeyOrRow: string | undefined | DT, expand?: boolean | null, data?: { col?: StkTableColumn<DT>; silent?: boolean }) {
         let rowKey: UniqKey;
         if (typeof rowKeyOrRow === 'string') {
             rowKey = rowKeyOrRow;
         } else {
             rowKey = rowKeyGen(rowKeyOrRow);
         }
+
         const tempData = dataSourceCopy.value.slice();
         const index = tempData.findIndex(it => rowKeyGen(it) === rowKey);
         if (index === -1) {
@@ -51,6 +57,10 @@ export function useRowExpand({ dataSourceCopy, rowKeyGen, emits }: Option<DT>) {
         const row = tempData[index];
         const col = data?.col || null;
 
+        if (expand == null) {
+            expand = isExpanded(row, col);
+        }
+
         if (expand) {
             // insert new expanded row
             const newExpandRow: ExpandedRow = {