Merge pull request #2813 from openedx/master

sync: master to alpha
openedx · Aug 5, 2024 · 81d3ee2 · 81d3ee2
1 parent 4cce07b
commit 81d3ee2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/src/DataTable/ExpandRow.jsx b/src/DataTable/ExpandRow.jsx
@@ -6,9 +6,9 @@ import IconButton from '../IconButton';
 
 const EXPAND_COLLAPSE_ICON_SIZE = 'inline';
 
-function ExpandRow({ row, ...rest }) {
+function ExpandRow({ row }) {
   return (
-    <span {...row.getToggleRowExpandedProps()} {...rest}>
+    <span {...row.getToggleRowExpandedProps()}>
       {row.isExpanded
         ? <IconButton src={ExpandLess} iconAs={Icon} alt="Collapse row" size={EXPAND_COLLAPSE_ICON_SIZE} />
         : <IconButton src={ExpandMore} iconAs={Icon} alt="Expand row" size={EXPAND_COLLAPSE_ICON_SIZE} />}

diff --git a/src/DataTable/selection/ControlledSelect.jsx b/src/DataTable/selection/ControlledSelect.jsx
@@ -10,7 +10,7 @@ import {
   addSelectedRowAction,
 } from './data/actions';
 
-function ControlledSelect({ row, ...rest }) {
+function ControlledSelect({ row }) {
   const {
     itemCount,
     controlledTableSelections: [, dispatch],
@@ -34,7 +34,6 @@ function ControlledSelect({ row, ...rest }) {
       <CheckboxControl
         {...updatedProps}
         onChange={toggleSelected}
-        {...rest}
       />
     </div>
   );

diff --git a/src/DataTable/selection/ControlledSelectHeader.jsx b/src/DataTable/selection/ControlledSelectHeader.jsx
@@ -9,7 +9,7 @@ import {
   setSelectedRowsAction,
 } from './data/actions';
 
-function ControlledSelectHeader({ rows, ...rest }) {
+function ControlledSelectHeader({ rows }) {
   const {
     itemCount,
     controlledTableSelections: [, dispatch],
@@ -44,7 +44,6 @@ function ControlledSelectHeader({ rows, ...rest }) {
       <CheckboxControl
         {...toggleAllPageRowsSelectedProps}
         onChange={toggleAllPageRowsSelected}
-        {...rest}
       />
     </div>
   );

diff --git a/src/DataTable/selection/ControlledSelectionStatus.jsx b/src/DataTable/selection/ControlledSelectionStatus.jsx
@@ -14,7 +14,7 @@ import {
   getRowIds,
 } from './data/helpers';
 
-function ControlledSelectionStatus({ className, clearSelectionText, ...rest }) {
+function ControlledSelectionStatus({ className, clearSelectionText }) {
   const {
     itemCount,
     page,
@@ -44,7 +44,6 @@ function ControlledSelectionStatus({ className, clearSelectionText, ...rest }) {
     clearSelectionText,
     onSelectAll: () => dispatch(setSelectAllRowsAllPagesAction()),
     onClear: () => dispatch(clearSelectionAction()),
-    ...rest,
   };
   return <BaseSelectionStatus {...selectionStatusProps} />;
 }