feat(table): S2 tableview custom column menu #7617
+153
−29
There are no files selected for viewing
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -11,8 +11,9 @@ | |
| */ | ||
|
|
||
| import {action} from '@storybook/addon-actions'; | ||
| import {ActionButton, Cell, Column, Content, Heading, IllustratedMessage, Link, MenuItem, MenuSection, Row, TableBody, TableHeader, TableView, Text} from '../src'; | ||
| import {categorizeArgTypes} from './utils'; | ||
| import Filter from '../s2wf-icons/S2_Icon_Filter_20_N.svg'; | ||
| import FolderOpen from '../spectrum-illustrations/linear/FolderOpen'; | ||
| import type {Meta} from '@storybook/react'; | ||
| import {SortDescriptor} from 'react-aria-components'; | ||
|
|
@@ -151,6 +152,94 @@ const DynamicTable = (args: any) => ( | |
| </TableView> | ||
| ); | ||
|
|
||
|
|
||
| const DynamicTableWithCustomMenus = (args: any) => ( | ||
| <TableView aria-label="Dynamic table" {...args} styles={style({width: 320, height: 208})}> | ||
| <TableHeader columns={columns}> | ||
| {(column) => ( | ||
| <Column | ||
| width={150} | ||
| minWidth={150} | ||
| isRowHeader={column.isRowHeader} | ||
| menu={ | ||
|
There was a problem hiding this comment. Bit strange that this doesn't actually accept a There was a problem hiding this comment. yeah, that's another option to handle it if it accepted a Menu, I guess we could do a custom renderer to inject our three menu items, still not a good way to ensure groups that make sense though maybe people have to provide a menu with specific ids on certain children if they want resize/sort? open to other ideas, not sold on what I currently have |
||
| <> | ||
| <MenuSection> | ||
| <MenuItem onAction={action('filter')}><Filter /><Text slot="label">Filter</Text></MenuItem> | ||
| </MenuSection> | ||
snowystinger marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| <MenuSection> | ||
| <MenuItem onAction={action('hide column')}><Text slot="label">Hide column</Text></MenuItem> | ||
| <MenuItem onAction={action('manage columns')}><Text slot="label">Manage columns</Text></MenuItem> | ||
| </MenuSection> | ||
| </> | ||
| }>{column.name}</Column> | ||
| )} | ||
| </TableHeader> | ||
| <TableBody items={items}> | ||
| {item => ( | ||
| <Row id={item.id} columns={columns}> | ||
| {(column) => { | ||
| return <Cell>{item[column.id]}</Cell>; | ||
| }} | ||
| </Row> | ||
| )} | ||
| </TableBody> | ||
| </TableView> | ||
| ); | ||
|
|
||
| let sortItems = items; | ||
| const DynamicSortableTableWithCustomMenus = (args: any) => { | ||
| let [items, setItems] = useState(sortItems); | ||
| let [sortDescriptor, setSortDescriptor] = useState({}); | ||
| let onSortChange = (sortDescriptor: SortDescriptor) => { | ||
| let {direction = 'ascending', column = 'name'} = sortDescriptor; | ||
|
|
||
| let sorted = items.slice().sort((a, b) => { | ||
| let cmp = a[column] < b[column] ? -1 : 1; | ||
| if (direction === 'descending') { | ||
| cmp *= -1; | ||
| } | ||
| return cmp; | ||
| }); | ||
|
|
||
| setItems(sorted); | ||
| setSortDescriptor(sortDescriptor); | ||
| }; | ||
|
|
||
| return ( | ||
| <TableView aria-label="Dynamic table" {...args} sortDescriptor={sortDescriptor} onSortChange={onSortChange} styles={style({width: 320, height: 208})}> | ||
| <TableHeader columns={columns}> | ||
| {(column) => ( | ||
| <Column | ||
| allowsSorting | ||
| width={150} | ||
| minWidth={150} | ||
| isRowHeader={column.isRowHeader} | ||
| menu={ | ||
| <> | ||
| <MenuSection> | ||
| <MenuItem onAction={action('filter')}><Filter /><Text slot="label">Filter</Text></MenuItem> | ||
| </MenuSection> | ||
| <MenuSection> | ||
| <MenuItem onAction={action('hide column')}><Text slot="label">Hide column</Text></MenuItem> | ||
| <MenuItem onAction={action('manage columns')}><Text slot="label">Manage columns</Text></MenuItem> | ||
| </MenuSection> | ||
| </> | ||
| }>{column.name}</Column> | ||
| )} | ||
| </TableHeader> | ||
| <TableBody items={items}> | ||
| {item => ( | ||
| <Row id={item.id} columns={columns}> | ||
| {(column) => { | ||
| return <Cell>{item[column.id]}</Cell>; | ||
| }} | ||
| </Row> | ||
| )} | ||
| </TableBody> | ||
| </TableView> | ||
| ); | ||
| }; | ||
|
|
||
| export const Dynamic = { | ||
| render: DynamicTable, | ||
| args: { | ||
|
|
@@ -159,6 +248,22 @@ export const Dynamic = { | |
| } | ||
| }; | ||
|
|
||
| export const DynamicCustomMenus = { | ||
| render: DynamicTableWithCustomMenus, | ||
| args: { | ||
| ...Example.args, | ||
| disabledKeys: ['Foo 5'] | ||
| } | ||
| }; | ||
|
|
||
| export const DynamicSortableCustomMenus = { | ||
| render: DynamicSortableTableWithCustomMenus, | ||
| args: { | ||
| ...Example.args, | ||
| disabledKeys: ['Foo 5'] | ||
| } | ||
| }; | ||
|
|
||
| function renderEmptyState() { | ||
| return ( | ||
| <IllustratedMessage> | ||
|
|
@@ -471,7 +576,11 @@ const SortableResizableTable = (args: any) => { | |
| <TableView aria-label="sortable table" {...args} sortDescriptor={isSortable ? sortDescriptor : null} onSortChange={isSortable ? onSortChange : null} styles={style({width: 384, height: 320})}> | ||
| <TableHeader columns={args.columns}> | ||
| {(column: any) => ( | ||
| <Column | ||
| isRowHeader={column.isRowHeader} | ||
| allowsSorting={column.isSortable} | ||
| allowsResizing={column.allowsResizing} | ||
| align={column.align}>{column.name}</Column> | ||
| )} | ||
| </TableHeader> | ||
| <TableBody items={items}> | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
not translated. also probably shouldn't be a question
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
haha, it's a question because #7617 (comment)