@ostack.tech/ui 0.12.0 → 0.12.1

package/dist/ostack-ui.js

@@ -1049,7 +1049,7 @@ function numberOfRows$1(columns) {
 }
 function numberOfColumns(columns) {
   return columns.reduce(
-    (n, column) => n + (column.subColumns.length === 0 ? 1 : numberOfColumns(column.subColumns)),
+    (n, column) => n + (column.subColumns.length === 0 ? column.colSpan ?? 1 : numberOfColumns(column.subColumns)),
     0
   );
 }
@@ -4245,7 +4245,7 @@ const TableCell = forwardRef(
           { fireImmediately: true }
         );
       }
-    }, [_stickyColumnIndex, colSpan, otherProps.colSpan, sticky, store]);
+    }, [_stickyColumnIndex, colSpan, sticky, store]);
     useEffect(() => {
       if (_stickyColumnIndex != null && sticky) {
         return store.subscribe(
@@ -4449,16 +4449,18 @@ const TableRow = forwardRef(
         return child;
       }
       const tableCellProps = child.props;
-      const { columnIndex, colSpan, ...otherTableCellProps } = tableCellProps;
+      const { columnIndex, colSpan } = tableCellProps;
       if (columnIndex !== void 0) {
-        nextIdx = (columnIndex ?? nextIdx) + (colSpan ?? 1);
+        if (columnIndex !== null) {
+          nextIdx = columnIndex + (colSpan ?? 1);
+        }
         return child;
       }
       const cellIdx = nextIdx;
       nextIdx += colSpan ?? 1;
       return cloneElement(
         child,
-        { columnIndex: cellIdx, colSpan, ...otherTableCellProps }
+        { ...tableCellProps, columnIndex: cellIdx }
       );
     });
     return /* @__PURE__ */ jsx(