chore: isRowDisabled

gravity-ui · Jan 18, 2024 · 8e3718f · 8e3718f
1 parent dc062af
commit 8e3718f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/components/Table/hoc/withTableActions/withTableActions.tsx b/src/components/Table/hoc/withTableActions/withTableActions.tsx
@@ -115,14 +115,15 @@ export function withTableActions<I extends TableDataItem, E extends {} = {}>(
         }
 
         private renderBodyCell = (item: I, index: number) => {
-            const {isRowDisabled, getRowActions, rowActionsSize} = this.props;
+            const {isRowDisabled, getRowActions, rowActionsSize, getRowDescriptor} = this.props;
             const actions = getRowActions(item, index);
 
             if (actions.length === 0) {
                 return null;
             }
 
-            const disabled = isRowDisabled ? isRowDisabled(item, index) : false;
+            const disabled =
+                getRowDescriptor?.(item, index).disabled || isRowDisabled?.(item, index) || false;
 
             return (
                 <div className={b('actions')}>

diff --git a/src/components/Table/hoc/withTableSelection/withTableSelection.tsx b/src/components/Table/hoc/withTableSelection/withTableSelection.tsx
@@ -239,11 +239,13 @@ export function withTableSelection<I extends TableDataItem, E extends {} = {}>(
         );
 
         private isDisabled = (item: I, index: number) => {
-            const {isRowDisabled, isRowSelectionDisabled} = this.props;
+            const {isRowDisabled, isRowSelectionDisabled, getRowDescriptor} = this.props;
             if (isRowSelectionDisabled && isRowSelectionDisabled(item, index)) {
                 return true;
             }
-            return isRowDisabled ? isRowDisabled(item, index) : false;
+            return (
+                getRowDescriptor?.(item, index).disabled || isRowDisabled?.(item, index) || false
+            );
         };
     };
 }