Skip to content
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

Table: Set fixed check box width , new prop for setting row action column width #2874

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
+35 −2
Draft

Table: Set fixed check box width , new prop for setting row action column width #2874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
22c3f2b
Update table width
ElishaSamPeterPrabhu Sep 19, 2024
9908d8e
Merge branch 'main' into 1922-table-uneven-width-on-row-selection-and…
prashanth-offcl Sep 30, 2024
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
1 change: 1 addition & 0 deletions stencil-workspace/src/components/modus-checkbox/modus-checkbox.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
:host {
align-items: center;
display: flex;
justify-content: center;
}

.modus-checkbox {
Expand Down
2 changes: 2 additions & 0 deletions stencil-workspace/src/components/modus-table/models/table-context.models.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ export interface TableContext {

rowActions: TableRowActionWithOverflow[];

rowActionSize: number;

rowsExpandable: boolean;

rowSelection: boolean;
Expand Down
4 changes: 4 additions & 0 deletions stencil-workspace/src/components/modus-table/modus-table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,9 @@ export class ModusTable {
/** (Optional) Actions that can be performed on each row. A maximum of 4 icons will be shown, including overflow menu and expand icons. */
@Prop() rowActions: ModusTableRowAction[] = [];

/**(Optional) The size of the row action's column*/
@Prop() rowActionSize: number;

/** (Optional) To display expanded rows. */
@Prop() rowsExpandable = false;
@Watch('rowsExpandable') onRowsExpandableChange(newVal: boolean) {
Expand Down Expand Up @@ -520,6 +523,7 @@ export class ModusTable {
rowSelectionChange: this.rowSelectionChange,
rowExpanded: this.rowExpanded,
rowActionClick: this.rowActionClick,
rowActionSize: this.rowActionSize,
sortChange: this.sortChange,
paginationChange: this.paginationChange,
columnSizingChange: this.columnSizingChange,
Expand Down
3 changes: 2 additions & 1 deletion stencil-workspace/src/components/modus-table/parts/modus-table-header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,12 @@ export const ModusTableHeader: FunctionalComponent<ModusTableHeaderProps> = ({
rowSelection,
componentId,
rowActions,
rowActionSize,
} = context;

const tableHeadClass = { 'show-resize-cursor': getColumnResizing(), 'show-column-reorder-cursor': columnReorder };
const headerGroups: HeaderGroup<unknown>[] = getHeaderGroups();
const rowActionsLength = Math.min(Math.max(rowActions.length * 40, 90), 160);
const rowActionsLength = rowActionSize ? rowActionSize : Math.min(Math.max(rowActions.length * 40, 90), 160);

return (
<thead class={tableHeadClass}>
Expand Down
10 changes: 9 additions & 1 deletion ...-workspace/src/components/modus-table/parts/row/selection/modus-table-header-checkbox.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,20 @@ export const ModusTableHeaderCheckbox: FunctionalComponent<ModusTableHeaderCheck
rowSelectionOptions,
density,
} = context;
const densityWidths = new Map<string, string>([
['compact', '38px'],
['comfortable', '46px'],
['relaxed', '46px'],
]);

let checkboxSize: 'medium' | 'small' = 'medium';
if (density === 'compact') {
checkboxSize = 'small';
}

const width = densityWidths.get(density) || '46px';
return (
<th class={'row-checkbox sticky-left ' + checkboxSize}>
<th class={'row-checkbox sticky-left ' + checkboxSize} style={{ width: width }}>
{rowSelectionOptions?.multiple && (
<modus-checkbox
ariaLabel="Select all rows"
Expand Down
1 change: 1 addition & 0 deletions stencil-workspace/src/components/modus-table/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
| `maxWidth` | `max-width` | (Optional) To display a horizontal scrollbar when the width is exceeded. | `string` | `undefined` |
| `pageSizeList` | -- | | `number[]` | `PAGINATION_DEFAULT_SIZES` |
| `pagination` | `pagination` | | `boolean` | `undefined` |
| `rowActionSize` | `row-action-size` | (Optional) The size of the row action's column | `number` | `undefined` |
| `rowActions` | -- | (Optional) Actions that can be performed on each row. A maximum of 4 icons will be shown, including overflow menu and expand icons. | `ModusTableRowAction[]` | `[]` |
| `rowSelection` | `row-selection` | (Optional) To display checkbox. | `boolean` | `false` |
| `rowSelectionOptions` | -- | (Optional) To control multiple row selection. | `ModusTableRowSelectionOptions` | `{ multiple: false, subRowSelection: false, }` |
Expand Down
1 change: 1 addition & 0 deletions ...rkspace/storybook/stories/components/modus-table/modus-table-storybook-docs.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -937,6 +937,7 @@ Users can use keyboard navigation to perform different actions.
| `pageSizeList` | -- | | `number[]` | `PAGINATION_DEFAULT_SIZES` |
| `pagination` | `pagination` | | `boolean` | `undefined` |
| `rowActions` | -- | (Optional) Actions that can be performed on each row. A maximum of 4 icons will be shown, including overflow menu and expand icons. | `ModusTableRowAction[]` | `[]` |
| `rowActionSize` | `row-action-size` | (Optional) The size of the row action's column | `number` | `undefined ` |
| `rowSelection` | `row-selection` | (Optional) To display checkbox. | `boolean` | `false` |
| `rowSelectionOptions` | -- | (Optional) To control multiple row selection. | `ModusTableRowSelectionOptions` | `{ multiple: false, subRowSelection: false, }` |
| `rowsExpandable` | `rows-expandable` | (Optional) To display expanded rows. | `boolean` | `false` |
Expand Down
15 changes: 15 additions & 0 deletions stencil-workspace/storybook/stories/components/modus-table/modus-table.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ function initializeTable(props) {
displayOptions,
rowSelectionOptions,
rowActions,
rowActionSize,
manualPaginationOptions,
manualSortingOptions,
defaultSort,
Expand All @@ -77,6 +78,7 @@ function initializeTable(props) {
modusTable.displayOptions = ${JSON.stringify(displayOptions)};
modusTable.rowSelectionOptions = ${JSON.stringify(rowSelectionOptions)};
modusTable.rowActions = ${JSON.stringify(rowActions)};
modusTable.rowActionSize= ${JSON.stringify(rowActionSize)};
modusTable.manualPaginationOptions = ${JSON.stringify(manualPaginationOptions)};
modusTable.manualSortingOptions = ${JSON.stringify(manualSortingOptions)};
modusTable.defaultSort = ${JSON.stringify(defaultSort)};
Expand Down Expand Up @@ -329,6 +331,7 @@ const DefaultArgs = {
maxHeight: '',
maxWidth: '',
rowActions: [],
rowActionSize: 0,
rowSelection: false,
rowSelectionOptions: {},
wrapText: false,
Expand Down Expand Up @@ -506,6 +509,15 @@ export default {
},
type: { required: false },
},
rowActionSize: {
name: 'rowActionSize',
description: "The size of the row action's column",
control: 'number',
table: {
defaultValue: { summary: false },
type: { summary: 'number' },
},
},
maxHeight: {
name: 'maxHeight',
description: 'To display a vertical scrollbar when the height is exceeded.',
Expand Down Expand Up @@ -644,6 +656,7 @@ const Template = ({
maxHeight,
maxWidth,
rowActions,
rowActionSize,
rowSelection,
rowSelectionOptions,
manualPaginationOptions,
Expand Down Expand Up @@ -681,6 +694,7 @@ const Template = ({
displayOptions,
rowSelectionOptions,
rowActions,
rowActionSize,
manualPaginationOptions,
manualSortingOptions,
defaultSort,
Expand Down Expand Up @@ -982,6 +996,7 @@ LargeDataset.args = {
export const RowActions = Template.bind({});
RowActions.args = {
...DefaultArgs,
rowActionSize: 160,
rowActions: [
{
id: '1',
Expand Down