@ostack.tech/ui 0.12.0 → 0.12.2

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
   );
 }
@@ -1159,6 +1159,10 @@ function useCreateTableContext({
         scrollPosition: void 0,
         leafColumns: void 0,
         defaultColumnWidth,
+        numberOfColumns: computed(
+          () => [get().leafColumns],
+          (leaves) => leaves && numberOfColumns(leaves)
+        ),
         stickyColumnOffsets: computed(
           () => [get().leafColumns, get().defaultColumnWidth],
           (leaves, defaultColumnWidth2) => leaves && stickyColumnOffsets(leaves, defaultColumnWidth2)
@@ -1187,7 +1191,7 @@ function useTableContext() {
 }
 function useTableNumberOfColumns() {
   const { store } = useTableContext();
-  return useStore$1(store, (state) => state.leafColumns?.length);
+  return useStore$1(store, ({ numberOfColumns: numberOfColumns2 }) => numberOfColumns2());
 }
 const TableHeadContext = createContext(false);
 function useIsInTableHead() {
@@ -4245,7 +4249,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 +4453,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(
@@ -5464,19 +5470,26 @@ function useDataTableSelectionColumn() {
       }
       const [selectedRows2] = state.selectedRows;
       const window2 = selectionWindow(displayMode, state);
-      let enabledCount = 0;
       let selectedCount = 0;
+      let disabledCount = 0;
+      let allEnabledChecked = true;
       for (const row of window2) {
         if (row === void 0) {
           return "loading";
         }
         const key = getRowKey(row, rowKey);
-        enabledCount += +!disabledSelections?.has(key);
-        selectedCount += +selectedRows2.has(key);
+        const isSelected = selectedRows2.has(key);
+        const isDisabled = disabledSelections?.has(key) ?? false;
+        selectedCount += +isSelected;
+        disabledCount += +isDisabled;
+        if (!isDisabled) {
+          allEnabledChecked = allEnabledChecked && isSelected;
+        }
       }
       return {
-        allChecked: selectedCount === window2.length ? true : selectedCount === 0 ? false : "indeterminate",
-        allEnabledChecked: selectedCount >= enabledCount
+        allDisabled: disabledCount === window2.length,
+        allChecked: window2.length > 0 && selectedCount === window2.length ? true : selectedCount === 0 ? false : "indeterminate",
+        allEnabledChecked
       };
     })
   );
@@ -5496,6 +5509,7 @@ function useDataTableSelectionColumn() {
               selectRows(keys);
             }
           },
+          disabled: allCheckedStatus.allDisabled,
           labelProps: {
             containerProps: { className: prefix("visually-hidden") }
           },
@@ -5657,10 +5671,10 @@ function DataTableEmptyOrLoadingRows({
   emptyMessageProps
 }) {
   const prefix = usePrefix();
-  const { showSelectionColumn, renderRow, store, apiRef } = useDataTableContext();
+  const { renderRow, store, apiRef } = useDataTableContext();
   const loading = useStore$1(store, (state) => state.loading);
   const loadingCount = useStore$1(store, (state) => state.loadingCount);
-  const numberOfColumns2 = (useTableNumberOfColumns() ?? 1) + (showSelectionColumn ? 1 : 0);
+  const numberOfColumns2 = useTableNumberOfColumns() ?? 1;
   const headCount = useStore$1(store, (state) => state.headCount);
   useImperativeHandle(
     apiRef,
@@ -5681,11 +5695,12 @@ function DataTableEmptyOrLoadingRows({
   }) : /* @__PURE__ */ jsx(TableRow, { "aria-rowindex": headCount + 1, children: /* @__PURE__ */ jsx(
     TableCell,
     {
+      columnIndex: null,
       header: true,
       variant: "data",
       paddingless: false,
       colSpan: numberOfColumns2 === 1 ? void 0 : numberOfColumns2,
-      children: !loading && /* @__PURE__ */ jsx(
+      children: /* @__PURE__ */ jsx(
         "div",
         {
           className: cx(
@@ -8550,7 +8565,7 @@ function SelectNative({
     [hasEmptyOption, optionStates]
   );
   const options = useMemo(
-    () => optionStates.map(({ value, content, disabled }) => /* @__PURE__ */ jsx("option", { value, disabled, children: content }, value)),
+    () => optionStates.map(({ value, disabled }) => /* @__PURE__ */ jsx("option", { value, disabled }, value)),
     [optionStates]
   );
   return /* @__PURE__ */ jsxs(