diff --git a/webapp/packages/core-blocks/src/Table/Table.tsx b/webapp/packages/core-blocks/src/Table/Table.tsx index 5a9ba2e7d1..76f174fb54 100644 --- a/webapp/packages/core-blocks/src/Table/Table.tsx +++ b/webapp/packages/core-blocks/src/Table/Table.tsx @@ -81,7 +81,6 @@ export const Table = observer(function Table({ state, selectedItems: selected, expandedItems: expanded, - isItemSelectable, setItemExpand, setItemSelect, clearSelection, diff --git a/webapp/packages/core-blocks/src/Table/TableItem.tsx b/webapp/packages/core-blocks/src/Table/TableItem.tsx index 3f05bb7bf4..9feb4f97fe 100644 --- a/webapp/packages/core-blocks/src/Table/TableItem.tsx +++ b/webapp/packages/core-blocks/src/Table/TableItem.tsx @@ -50,20 +50,21 @@ export const TableItem = observer(function TableItem({ const styles = useStyles(); const context = useContext(TableContext); const props = useObjectRef({ selectOnItem }); + if (!context) { throw new Error('TableContext must be provided'); } - const selectable = getComputed(() => selectDisabled || (!!context.state.isItemSelectable && (( + const selectionDisabled = getComputed(() => selectDisabled || (!!context.state.isItemSelectable && (( context.state.selectableItems.length > 0 && !context.state.selectableItems.includes(item) ) || !context.state.isItemSelectable(item)))); const itemContext = useMemo(() => ({ item, - selectDisabled: selectable, + selectDisabled: selectionDisabled, isSelected: () => !!context.selectedItems.get(item), isExpanded: () => !!context.expandedItems.get(item), - }), [item, selectable]); + }), [item, selectionDisabled]); const isSelected = itemContext.isSelected(); const isExpanded = itemContext.isExpanded();