Skip to content

fix(Table): Do not return value if table is not collapsed #1272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlabaj merged 1 commit into from
Jan 29, 2019
Merged

fix(Table): Do not return value if table is not collapsed #1272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 0 additions & 26 deletions packages/patternfly-4/react-table/src/components/Table/__snapshots__/Table.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13462,12 +13462,10 @@ exports[`Collapsible nested table 1`] = `
data-key={1}
data-label="Header cell"
key="1-cell"
title="one"
>
<td
data-key={1}
data-label="Header cell"
title="one"
>
one
</td>
Expand Down Expand Up @@ -14651,12 +14649,10 @@ exports[`Collapsible nested table 1`] = `
data-key={1}
data-label="Header cell"
key="1-cell"
title="one"
>
<td
data-key={1}
data-label="Header cell"
title="one"
>
one
</td>
Expand Down Expand Up @@ -15370,12 +15366,10 @@ exports[`Collapsible nested table 1`] = `
data-key={1}
data-label="Header cell"
key="1-cell"
title="one"
>
<td
data-key={1}
data-label="Header cell"
title="one"
>
one
</td>
Expand Down Expand Up @@ -15735,12 +15729,10 @@ exports[`Collapsible nested table 1`] = `
data-key={1}
data-label="Header cell"
key="1-cell"
title="one"
>
<td
data-key={1}
data-label="Header cell"
title="one"
>
one
</td>
Expand Down Expand Up @@ -16100,12 +16092,10 @@ exports[`Collapsible nested table 1`] = `
data-key={1}
data-label="Header cell"
key="1-cell"
title="one"
>
<td
data-key={1}
data-label="Header cell"
title="one"
>
one
</td>
Expand Down Expand Up @@ -16465,12 +16455,10 @@ exports[`Collapsible nested table 1`] = `
data-key={1}
data-label="Header cell"
key="1-cell"
title="one"
>
<td
data-key={1}
data-label="Header cell"
title="one"
>
one
</td>
Expand Down Expand Up @@ -18399,12 +18387,10 @@ exports[`Collapsible table 1`] = `
data-key={1}
data-label="Header cell"
key="1-cell"
title="one"
>
<td
data-key={1}
data-label="Header cell"
title="one"
>
one
</td>
Expand Down Expand Up @@ -19116,12 +19102,10 @@ exports[`Collapsible table 1`] = `
data-key={1}
data-label="Header cell"
key="1-cell"
title="one"
>
<td
data-key={1}
data-label="Header cell"
title="one"
>
one
</td>
Expand Down Expand Up @@ -19540,12 +19524,10 @@ exports[`Collapsible table 1`] = `
data-key={1}
data-label="Header cell"
key="1-cell"
title="one"
>
<td
data-key={1}
data-label="Header cell"
title="one"
>
one
</td>
Expand Down Expand Up @@ -20259,12 +20241,10 @@ exports[`Collapsible table 1`] = `
data-key={1}
data-label="Header cell"
key="1-cell"
title="one"
>
<td
data-key={1}
data-label="Header cell"
title="one"
>
one
</td>
Expand Down Expand Up @@ -20624,12 +20604,10 @@ exports[`Collapsible table 1`] = `
data-key={1}
data-label="Header cell"
key="1-cell"
title="one"
>
<td
data-key={1}
data-label="Header cell"
title="one"
>
one
</td>
Expand Down Expand Up @@ -20989,12 +20967,10 @@ exports[`Collapsible table 1`] = `
data-key={1}
data-label="Header cell"
key="1-cell"
title="one"
>
<td
data-key={1}
data-label="Header cell"
title="one"
>
one
</td>
Expand Down Expand Up @@ -21354,12 +21330,10 @@ exports[`Collapsible table 1`] = `
data-key={1}
data-label="Header cell"
key="1-cell"
title="one"
>
<td
data-key={1}
data-label="Header cell"
title="one"
>
one
</td>
Expand Down
8 changes: 3 additions & 5 deletions packages/patternfly-4/react-table/src/components/Table/utils/decorators/collapsible.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,10 @@ export const collapsible = (

export const expandedRow = (colSpan) => {
const expandedRowFormatter = (value, { rowIndex, rowData, column: { extraParams: { contentId = 'expanded-content' } } }) => {
return {
...rowData.hasOwnProperty('parent') ? {
return rowData.hasOwnProperty('parent') && {
colSpan: colSpan,
children: <ExpandableRowContent id={contentId + rowIndex}>{value.title || value}</ExpandableRowContent>
} : value
};
}
}
};
return expandedRowFormatter;
}
2 changes: 1 addition & 1 deletion packages/patternfly-4/react-table/src/components/Table/utils/transformers.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@ describe('Transformer functions', () => {
test('no parent', () => {
expect(
expandedRow(5)({ title: 'test' }, { rowData: {}, column: { extraParams: {} } })
).toMatchObject({ title: 'test' });
).toBe(false)
});
});

Expand Down