Skip to content

Commit

Permalink
Merge pull request #1022 from glints-dev/feature/index-table-diabled-…
Browse files Browse the repository at this point in the history
…rows

@next IndexTable: fix display nothing issue if all rows disabled
  • Loading branch information
music1353 authored Apr 24, 2024
2 parents 52afa66 + ac3f684 commit ef3413d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 2 deletions.
10 changes: 8 additions & 2 deletions src/@next/IndexTable/IndexTable.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -250,8 +250,13 @@ const Template: Story<IndexTableProps> = args => {
const selectableCandidates = candidatesSlice.filter(
candidate => !candidate.disabled
);
const selectableCandidatesCount = selectableCandidates.length;

const tableCandidatesData = selectableCandidatesCount
? selectableCandidates
: candidatesSlice;
const { selectedResources, allResourcesSelected, handleSelectionChange } =
useIndexResourceState(selectableCandidates);
useIndexResourceState(tableCandidatesData);

const rowMarkup = candidatesSlice.map(
(
Expand Down Expand Up @@ -308,11 +313,12 @@ const Template: Story<IndexTableProps> = args => {
return (
<IndexTable
{...args}
itemCount={selectableCandidates.length}
itemCount={tableCandidatesData.length}
resourceName={resourceName}
selectedItemsCount={
allResourcesSelected ? 'All' : selectedResources.length
}
selectableItemsCount={selectableCandidates.length}
onSelectionChange={handleSelectionChange}
promotedBulkActions={promotedBulkActions}
headings={[
Expand Down
3 changes: 3 additions & 0 deletions src/@next/IndexTable/IndexTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { CheckboxCellContentContainer } from './components/Checkbox/CheckboxStyl

type IndexTableProps = Omit<PolarisIndexTableProps, 'emptySearchTitle'> & {
height?: string;
selectableItemsCount?: number;
};

const IndexTable = ({
Expand All @@ -23,6 +24,7 @@ const IndexTable = ({
selectedItemsCount,
loading,
emptyState,
selectableItemsCount,
...props
}: IndexTableProps) => {
const renderCheckboxHeader = ({
Expand All @@ -36,6 +38,7 @@ const IndexTable = ({
onChange={onChange}
checked={checked}
isPadded={false}
disabled={props.disabled || selectableItemsCount === 0}
{...props}
/>
</CheckboxCellContentContainer>
Expand Down

0 comments on commit ef3413d

Please sign in to comment.