FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix(table): Adds support for custom dataLabel prop on table header by AllenBW · Pull Request #3040 · patternfly/patternfly-react · GitHub

/ patternfly-react Public

fix(table): Adds support for custom dataLabel prop on table header #3040

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
redallen merged 1 commit into from
Oct 3, 2019
Conversation 9 Commits 1 Checks 0 Files changed
Merged

fix(table): Adds support for custom dataLabel prop on table header #3040

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 .tsx  (4) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
    • HeaderCell.tsx
    • Table.tsx
      • headerUtils.test.tsx
      • headerUtils.tsx
2 changes: 2 additions & 0 deletions packages/patternfly-4/react-table/src/components/Table/HeaderCell.tsx
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export interface HeaderCellProps {
isVisible?: boolean;
scope?: string;
textCenter?: boolean;
dataLabel?: string;
}

export const HeaderCell: React.FunctionComponent<HeaderCellProps> = ({
Expand All @@ -17,6 +18,7 @@ export const HeaderCell: React.FunctionComponent<HeaderCellProps> = ({
isVisible,
scope = '',
textCenter = false,
dataLabel = '',
...props
}: HeaderCellProps ) => {
const Component = component as any;
Expand Down
1 change: 1 addition & 0 deletions packages/patternfly-4/react-table/src/components/Table/Table.tsx
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ export interface ICell {
data?: any;
header?: any;
cell?: any;
dataLabel?: string;
}

export interface IRowCell {
Expand Down
10 changes: 10 additions & 0 deletions packages/patternfly-4/react-table/src/components/Table/utils/headerUtils.test.tsx
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,16 @@ describe('headerUtils', () => {
expect(result[0].cell.formatters.find((formatter) => formatter.name === 'testFunc')).toBeDefined();
expect(result[0].cell.transforms.find((transform) => transform.name === 'testFunc')).toBeDefined();
});

describe('custom dataLabel', () => {
const cells = [{ title: 'expanded first', dataLabel: 'compact first' }, { title: 'expanded second'}] as ICell[];
const mixed = calculateColumns(cells, {});
cells.forEach((oneCell: ICell, key) => {
test(`${oneCell}`, () => {
expect(mixed[key].props['data-label']).toBe(oneCell.dataLabel ||oneCell.title);
});
});
});
});
});

Expand Down
5 changes: 3 additions & 2 deletions packages/patternfly-4/react-table/src/components/Table/utils/headerUtils.tsx
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,15 @@ const generateCell = ({ cellFormatters, cellTransforms, columnTransforms, cell }
/**
* Function to map custom simple object properties to expected format with property, header, cell, extra params
* and props.
* @param {*} column to be shown in header - either string or object with title, transformers and formatters (for cels as well).
* @param {*} column to be shown in header - either string or object with title, transformers and formatters (for cells as well).
* @param {*} extra additional object with callbacks for specific formatters.
* @param {*} key cell key to be shown in data-key.
* @param {*} props additional props for each cell.
* @returns {*} object with property, extraParams, header, cell and props.
*/
const mapHeader = (column: ICell, extra: any, key: number, ...props: any) => {
const title = (column.hasOwnProperty('title') ? column.title : column) as string | ICell;
const dataLabel = (column.hasOwnProperty('dataLabel') ? column.dataLabel : typeof title === 'string' ? title : `column-${key}`) as string | ICell;
return {
property:
(typeof title === 'string' &&
Expand All @@ -80,7 +81,7 @@ const mapHeader = (column: ICell, extra: any, key: number, ...props: any) => {
header: generateHeader(column, title),
cell: generateCell(column, extra),
props: {
'data-label': typeof title === 'string' ? title : `column-${key}`,
'data-label': dataLabel,
'data-key': key,
...(column.hasOwnProperty('props') ? column.props : {}),
...props
Expand Down
Back | FazBrowse Home | New Git URL