@ceed/cds 1.7.4-next.2 → 1.7.4

package/dist/components/DataTable/types.d.ts

@@ -140,13 +140,6 @@ export type DataTableProps<T extends Record<PropertyKey, any>, GetId extends ((r
      * MUI에는 없는 인터페이스지만 Total Select 기능이 추가되었기 때문에 추가해야했다.
      */
     isTotalSelected?: boolean) => void;
-    /**
-     * row별로 선택 가능 여부를 결정하는 함수
-     */
-    isRowSelectable?: (params: {
-        row: T;
-        id: InferredIdType<T, GetId>;
-    }) => boolean;
     disableSelectionOnClick?: boolean;
     initialState?: Partial<{
         sorting: Partial<{

package/dist/index.cjs

@@ -3508,8 +3508,7 @@ function useDataTableRenderer({
   onSelectionModelChange,
   editMode,
   getId: _getId,
-  isTotalSelected: _isTotalSelected,
-  isRowSelectable
+  isTotalSelected: _isTotalSelected
 }) {
   const [focusedRowId, setFocusedRowId] = (0, import_react25.useState)(null);
   const [sortModel, setSortModel] = useControlledState(
@@ -3585,27 +3584,14 @@ function useDataTableRenderer({
     () => !pagination || paginationMode === "server" ? rows : rows.slice((page - 1) * pageSize, (page - 1) * pageSize + pageSize),
     [rows, page, pageSize, paginationMode, pagination]
   );
-  const selectableDataInPage = (0, import_react25.useMemo)(
-    () => dataInPage.filter((row, i) => {
-      if (!isRowSelectable) return true;
-      return isRowSelectable({ row, id: getId(row, i) });
-    }),
-    [dataInPage, isRowSelectable, getId]
-  );
   const isAllSelected = (0, import_react25.useMemo)(
-    () => selectableDataInPage.length > 0 && selectableDataInPage.every(
-      (row, i) => selectedModelSet.has(getId(row, i))
-    ),
-    [selectableDataInPage, selectedModelSet, getId]
+    () => dataInPage.length > 0 && dataInPage.every((row, i) => selectedModelSet.has(getId(row, i))),
+    [dataInPage, selectedModelSet, getId]
   );
   const rowCount = totalRowsProp || rows.length;
-  const selectableRowCount = (0, import_react25.useMemo)(() => {
-    if (!isRowSelectable) return rowCount;
-    return rows.filter((row, i) => isRowSelectable({ row, id: getId(row, i) })).length;
-  }, [rows, isRowSelectable, getId, rowCount]);
   const isTotalSelected = (0, import_react25.useMemo)(
-    () => _isTotalSelected ?? (selectableRowCount > 0 && (selectionModel?.length || 0) === selectableRowCount),
-    [_isTotalSelected, selectionModel, selectableRowCount]
+    () => _isTotalSelected ?? (rowCount > 0 && (selectionModel?.length || 0) === rowCount),
+    [_isTotalSelected, selectionModel, rowCount]
   );
   const columnWidths = useColumnWidths(columnsByField);
   const getWidth = (0, import_react25.useCallback)(
@@ -3701,10 +3687,9 @@ function useDataTableRenderer({
   }, [page, rowCount, pageSize, handlePageChange]);
   (0, import_react25.useEffect)(() => {
     onSelectionModelChange?.([]);
-  }, [page, onSelectionModelChange]);
+  }, [page]);
   return {
     rowCount,
-    selectableRowCount,
     page,
     pageSize,
     onPaginationModelChange: handlePageChange,
@@ -3720,22 +3705,13 @@ function useDataTableRenderer({
       (model) => selectedModelSet.has(model),
       [selectedModelSet]
     ),
-    isRowSelectable: (0, import_react25.useCallback)(
-      (rowId, row) => {
-        if (!isRowSelectable) return true;
-        return isRowSelectable({ row, id: rowId });
-      },
-      [isRowSelectable]
-    ),
     focusedRowId,
     onRowFocus: (0, import_react25.useCallback)((rowId) => {
       setFocusedRowId(rowId);
     }, []),
     onAllCheckboxChange: (0, import_react25.useCallback)(() => {
-      onSelectionModelChange?.(
-        isAllSelected ? [] : selectableDataInPage.map(getId)
-      );
-    }, [isAllSelected, selectableDataInPage, onSelectionModelChange, getId]),
+      onSelectionModelChange?.(isAllSelected ? [] : dataInPage.map(getId));
+    }, [isAllSelected, dataInPage, onSelectionModelChange, getId]),
     onCheckboxChange: (0, import_react25.useCallback)(
       (event, selectedModel) => {
         if (selectedModelSet.has(selectedModel)) {
@@ -3752,15 +3728,11 @@ function useDataTableRenderer({
     ),
     columns,
     onTotalSelect: (0, import_react25.useCallback)(() => {
-      const selectableRows = rows.filter((row, i) => {
-        if (!isRowSelectable) return true;
-        return isRowSelectable({ row, id: getId(row, i) });
-      });
       onSelectionModelChange?.(
-        isTotalSelected ? [] : selectableRows.map(getId),
+        isTotalSelected ? [] : rows.map(getId),
         !isTotalSelected
       );
-    }, [isTotalSelected, rows, onSelectionModelChange, getId, isRowSelectable])
+    }, [isTotalSelected, rows, onSelectionModelChange, getId])
   };
 }
 function Component(props, apiRef) {
@@ -3770,7 +3742,6 @@ function Component(props, apiRef) {
     editMode,
     selectionModel,
     onSelectionModelChange,
-    isRowSelectable,
     disableSelectionOnClick,
     onRowClick,
     pinnedColumns,
@@ -3818,12 +3789,10 @@ function Component(props, apiRef) {
     columns,
     isAllSelected,
     isSelectedRow,
-    isRowSelectable: isRowSelectableCheck,
     onAllCheckboxChange,
     onCheckboxChange,
     getId,
     rowCount,
-    selectableRowCount,
     page,
     pageSize,
     onPaginationModelChange,
@@ -3849,15 +3818,9 @@ function Component(props, apiRef) {
   const getRowClickHandler = (0, import_react25.useCallback)(
     (row, rowId) => (e) => {
       onRowClick?.({ row, rowId }, e);
-      checkboxSelection && !disableSelectionOnClick && isRowSelectableCheck(rowId, row) && onCheckboxChange(e, rowId);
+      checkboxSelection && !disableSelectionOnClick && onCheckboxChange(e, rowId);
     },
-    [
-      onRowClick,
-      checkboxSelection,
-      disableSelectionOnClick,
-      onCheckboxChange,
-      isRowSelectableCheck
-    ]
+    [onRowClick, checkboxSelection, disableSelectionOnClick, onCheckboxChange]
   );
   const getRowFocusHandler = (0, import_react25.useCallback)(
     (rowId) => () => {
@@ -3872,12 +3835,10 @@ function Component(props, apiRef) {
     []
   );
   const getCheckboxChangeHandler = (0, import_react25.useCallback)(
-    (rowId, row) => (e) => {
-      if (isRowSelectableCheck(rowId, row)) {
-        onCheckboxChange(e, rowId);
-      }
+    (rowId) => (e) => {
+      onCheckboxChange(e, rowId);
     },
-    [onCheckboxChange, isRowSelectableCheck]
+    [onCheckboxChange]
   );
   (0, import_react25.useImperativeHandle)(apiRef, () => ({
     getRowIndexRelativeToVisibleRows(rowId) {
@@ -3915,7 +3876,7 @@ function Component(props, apiRef) {
         justifyContent: "space-between",
         alignItems: "center"
       },
-      !!checkboxSelection && /* @__PURE__ */ import_react25.default.createElement(Stack_default, { direction: "row", spacing: 1 }, !isAllSelected && /* @__PURE__ */ import_react25.default.createElement(Typography_default, { level: "body-xs" }, numberFormatter(selectionModel?.length || 0), " items selected"), isAllSelected && !isTotalSelected && /* @__PURE__ */ import_react25.default.createElement(Stack_default, { direction: "row", spacing: 1, alignItems: "center" }, /* @__PURE__ */ import_react25.default.createElement(Typography_default, { level: "body-xs" }, "All ", numberFormatter(selectionModel?.length || 0), " items on this page are selected."), /* @__PURE__ */ import_react25.default.createElement(Button_default, { size: "sm", variant: "plain", onClick: onTotalSelect }, "Select all ", numberFormatter(selectableRowCount), " items")), isTotalSelected && /* @__PURE__ */ import_react25.default.createElement(Stack_default, { direction: "row", spacing: 1, alignItems: "center" }, /* @__PURE__ */ import_react25.default.createElement(Typography_default, { level: "body-xs" }, "All ", numberFormatter(selectableRowCount), " items are selected."), /* @__PURE__ */ import_react25.default.createElement(
+      !!checkboxSelection && /* @__PURE__ */ import_react25.default.createElement(Stack_default, { direction: "row", spacing: 1 }, !isAllSelected && /* @__PURE__ */ import_react25.default.createElement(Typography_default, { level: "body-xs" }, numberFormatter(selectionModel?.length || 0), " items selected"), isAllSelected && !isTotalSelected && /* @__PURE__ */ import_react25.default.createElement(Stack_default, { direction: "row", spacing: 1, alignItems: "center" }, /* @__PURE__ */ import_react25.default.createElement(Typography_default, { level: "body-xs" }, "All ", numberFormatter(selectionModel?.length || 0), " items on this page are selected."), /* @__PURE__ */ import_react25.default.createElement(Button_default, { size: "sm", variant: "plain", onClick: onTotalSelect }, "Select all ", numberFormatter(rowCount ?? rows.length), " items")), isTotalSelected && /* @__PURE__ */ import_react25.default.createElement(Stack_default, { direction: "row", spacing: 1, alignItems: "center" }, /* @__PURE__ */ import_react25.default.createElement(Typography_default, { level: "body-xs" }, "All ", numberFormatter(rowCount ?? rows.length), " items are selected."), /* @__PURE__ */ import_react25.default.createElement(
         Button_default,
         {
           size: "sm",
@@ -3960,7 +3921,6 @@ function Component(props, apiRef) {
             onChange: onAllCheckboxChange,
             checked: isAllSelected,
             indeterminate: (selectionModel || []).length > 0 && !isAllSelected,
-            disabled: dataInPage.length > 0 && !selectableRowCount,
             ...checkboxProps
           }
         )
@@ -4038,9 +3998,8 @@ function Component(props, apiRef) {
                 RenderCheckbox,
                 {
                   onClick: getCheckboxClickHandler(),
-                  onChange: getCheckboxChangeHandler(rowId, row),
+                  onChange: getCheckboxChangeHandler(rowId),
                   checked: isSelectedRow(rowId),
-                  disabled: !isRowSelectableCheck(rowId, row),
                   ...checkboxProps
                 }
               )

package/dist/index.js

@@ -3476,8 +3476,7 @@ function useDataTableRenderer({
   onSelectionModelChange,
   editMode,
   getId: _getId,
-  isTotalSelected: _isTotalSelected,
-  isRowSelectable
+  isTotalSelected: _isTotalSelected
 }) {
   const [focusedRowId, setFocusedRowId] = useState6(null);
   const [sortModel, setSortModel] = useControlledState(
@@ -3553,27 +3552,14 @@ function useDataTableRenderer({
     () => !pagination || paginationMode === "server" ? rows : rows.slice((page - 1) * pageSize, (page - 1) * pageSize + pageSize),
     [rows, page, pageSize, paginationMode, pagination]
   );
-  const selectableDataInPage = useMemo8(
-    () => dataInPage.filter((row, i) => {
-      if (!isRowSelectable) return true;
-      return isRowSelectable({ row, id: getId(row, i) });
-    }),
-    [dataInPage, isRowSelectable, getId]
-  );
   const isAllSelected = useMemo8(
-    () => selectableDataInPage.length > 0 && selectableDataInPage.every(
-      (row, i) => selectedModelSet.has(getId(row, i))
-    ),
-    [selectableDataInPage, selectedModelSet, getId]
+    () => dataInPage.length > 0 && dataInPage.every((row, i) => selectedModelSet.has(getId(row, i))),
+    [dataInPage, selectedModelSet, getId]
   );
   const rowCount = totalRowsProp || rows.length;
-  const selectableRowCount = useMemo8(() => {
-    if (!isRowSelectable) return rowCount;
-    return rows.filter((row, i) => isRowSelectable({ row, id: getId(row, i) })).length;
-  }, [rows, isRowSelectable, getId, rowCount]);
   const isTotalSelected = useMemo8(
-    () => _isTotalSelected ?? (selectableRowCount > 0 && (selectionModel?.length || 0) === selectableRowCount),
-    [_isTotalSelected, selectionModel, selectableRowCount]
+    () => _isTotalSelected ?? (rowCount > 0 && (selectionModel?.length || 0) === rowCount),
+    [_isTotalSelected, selectionModel, rowCount]
   );
   const columnWidths = useColumnWidths(columnsByField);
   const getWidth = useCallback9(
@@ -3669,10 +3655,9 @@ function useDataTableRenderer({
   }, [page, rowCount, pageSize, handlePageChange]);
   useEffect5(() => {
     onSelectionModelChange?.([]);
-  }, [page, onSelectionModelChange]);
+  }, [page]);
   return {
     rowCount,
-    selectableRowCount,
     page,
     pageSize,
     onPaginationModelChange: handlePageChange,
@@ -3688,22 +3673,13 @@ function useDataTableRenderer({
       (model) => selectedModelSet.has(model),
       [selectedModelSet]
     ),
-    isRowSelectable: useCallback9(
-      (rowId, row) => {
-        if (!isRowSelectable) return true;
-        return isRowSelectable({ row, id: rowId });
-      },
-      [isRowSelectable]
-    ),
     focusedRowId,
     onRowFocus: useCallback9((rowId) => {
       setFocusedRowId(rowId);
     }, []),
     onAllCheckboxChange: useCallback9(() => {
-      onSelectionModelChange?.(
-        isAllSelected ? [] : selectableDataInPage.map(getId)
-      );
-    }, [isAllSelected, selectableDataInPage, onSelectionModelChange, getId]),
+      onSelectionModelChange?.(isAllSelected ? [] : dataInPage.map(getId));
+    }, [isAllSelected, dataInPage, onSelectionModelChange, getId]),
     onCheckboxChange: useCallback9(
       (event, selectedModel) => {
         if (selectedModelSet.has(selectedModel)) {
@@ -3720,15 +3696,11 @@ function useDataTableRenderer({
     ),
     columns,
     onTotalSelect: useCallback9(() => {
-      const selectableRows = rows.filter((row, i) => {
-        if (!isRowSelectable) return true;
-        return isRowSelectable({ row, id: getId(row, i) });
-      });
       onSelectionModelChange?.(
-        isTotalSelected ? [] : selectableRows.map(getId),
+        isTotalSelected ? [] : rows.map(getId),
         !isTotalSelected
       );
-    }, [isTotalSelected, rows, onSelectionModelChange, getId, isRowSelectable])
+    }, [isTotalSelected, rows, onSelectionModelChange, getId])
   };
 }
 function Component(props, apiRef) {
@@ -3738,7 +3710,6 @@ function Component(props, apiRef) {
     editMode,
     selectionModel,
     onSelectionModelChange,
-    isRowSelectable,
     disableSelectionOnClick,
     onRowClick,
     pinnedColumns,
@@ -3786,12 +3757,10 @@ function Component(props, apiRef) {
     columns,
     isAllSelected,
     isSelectedRow,
-    isRowSelectable: isRowSelectableCheck,
     onAllCheckboxChange,
     onCheckboxChange,
     getId,
     rowCount,
-    selectableRowCount,
     page,
     pageSize,
     onPaginationModelChange,
@@ -3817,15 +3786,9 @@ function Component(props, apiRef) {
   const getRowClickHandler = useCallback9(
     (row, rowId) => (e) => {
       onRowClick?.({ row, rowId }, e);
-      checkboxSelection && !disableSelectionOnClick && isRowSelectableCheck(rowId, row) && onCheckboxChange(e, rowId);
+      checkboxSelection && !disableSelectionOnClick && onCheckboxChange(e, rowId);
     },
-    [
-      onRowClick,
-      checkboxSelection,
-      disableSelectionOnClick,
-      onCheckboxChange,
-      isRowSelectableCheck
-    ]
+    [onRowClick, checkboxSelection, disableSelectionOnClick, onCheckboxChange]
   );
   const getRowFocusHandler = useCallback9(
     (rowId) => () => {
@@ -3840,12 +3803,10 @@ function Component(props, apiRef) {
     []
   );
   const getCheckboxChangeHandler = useCallback9(
-    (rowId, row) => (e) => {
-      if (isRowSelectableCheck(rowId, row)) {
-        onCheckboxChange(e, rowId);
-      }
+    (rowId) => (e) => {
+      onCheckboxChange(e, rowId);
     },
-    [onCheckboxChange, isRowSelectableCheck]
+    [onCheckboxChange]
   );
   useImperativeHandle2(apiRef, () => ({
     getRowIndexRelativeToVisibleRows(rowId) {
@@ -3883,7 +3844,7 @@ function Component(props, apiRef) {
         justifyContent: "space-between",
         alignItems: "center"
       },
-      !!checkboxSelection && /* @__PURE__ */ React23.createElement(Stack_default, { direction: "row", spacing: 1 }, !isAllSelected && /* @__PURE__ */ React23.createElement(Typography_default, { level: "body-xs" }, numberFormatter(selectionModel?.length || 0), " items selected"), isAllSelected && !isTotalSelected && /* @__PURE__ */ React23.createElement(Stack_default, { direction: "row", spacing: 1, alignItems: "center" }, /* @__PURE__ */ React23.createElement(Typography_default, { level: "body-xs" }, "All ", numberFormatter(selectionModel?.length || 0), " items on this page are selected."), /* @__PURE__ */ React23.createElement(Button_default, { size: "sm", variant: "plain", onClick: onTotalSelect }, "Select all ", numberFormatter(selectableRowCount), " items")), isTotalSelected && /* @__PURE__ */ React23.createElement(Stack_default, { direction: "row", spacing: 1, alignItems: "center" }, /* @__PURE__ */ React23.createElement(Typography_default, { level: "body-xs" }, "All ", numberFormatter(selectableRowCount), " items are selected."), /* @__PURE__ */ React23.createElement(
+      !!checkboxSelection && /* @__PURE__ */ React23.createElement(Stack_default, { direction: "row", spacing: 1 }, !isAllSelected && /* @__PURE__ */ React23.createElement(Typography_default, { level: "body-xs" }, numberFormatter(selectionModel?.length || 0), " items selected"), isAllSelected && !isTotalSelected && /* @__PURE__ */ React23.createElement(Stack_default, { direction: "row", spacing: 1, alignItems: "center" }, /* @__PURE__ */ React23.createElement(Typography_default, { level: "body-xs" }, "All ", numberFormatter(selectionModel?.length || 0), " items on this page are selected."), /* @__PURE__ */ React23.createElement(Button_default, { size: "sm", variant: "plain", onClick: onTotalSelect }, "Select all ", numberFormatter(rowCount ?? rows.length), " items")), isTotalSelected && /* @__PURE__ */ React23.createElement(Stack_default, { direction: "row", spacing: 1, alignItems: "center" }, /* @__PURE__ */ React23.createElement(Typography_default, { level: "body-xs" }, "All ", numberFormatter(rowCount ?? rows.length), " items are selected."), /* @__PURE__ */ React23.createElement(
         Button_default,
         {
           size: "sm",
@@ -3928,7 +3889,6 @@ function Component(props, apiRef) {
             onChange: onAllCheckboxChange,
             checked: isAllSelected,
             indeterminate: (selectionModel || []).length > 0 && !isAllSelected,
-            disabled: dataInPage.length > 0 && !selectableRowCount,
             ...checkboxProps
           }
         )
@@ -4006,9 +3966,8 @@ function Component(props, apiRef) {
                 RenderCheckbox,
                 {
                   onClick: getCheckboxClickHandler(),
-                  onChange: getCheckboxChangeHandler(rowId, row),
+                  onChange: getCheckboxChangeHandler(rowId),
                   checked: isSelectedRow(rowId),
-                  disabled: !isRowSelectableCheck(rowId, row),
                   ...checkboxProps
                 }
               )