add caption component for table #513
Closed
Conversation
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
chawes13
requested changes
Nov 22, 2021
Comment on lines
+107
to
+170
| const columns = getColumnData(children, disableSort); | ||
| const { | ||
| initialSortPath, | ||
| initialSortFunc, | ||
| initialValueGetter, | ||
| } = getInitialSortControls(initialColumn, columns); | ||
| const [ascending, setAscending] = useState(initialAscending); | ||
| const [sortPath, setSortPath] = useState(initialSortPath); | ||
|
|
||
| // Setting and storing a function object requires special syntax. | ||
| // See: https://medium.com/swlh/how-to-store-a-function-with-the-usestate-hook-in-react-8a88dd4eede1 | ||
| const [sortFunc, setSortFunc] = useState(() => initialSortFunc) | ||
| const [valueGetter, setValueGetter] = useState(() => initialValueGetter) | ||
| const [sortFunc, setSortFunc] = useState(() => initialSortFunc); | ||
| const [valueGetter, setValueGetter] = useState(() => initialValueGetter); | ||
|
|
||
| const data = useMemo(() => { | ||
| if (controlled || disableSort) return unsortedData | ||
| if (controlled || disableSort) return unsortedData; | ||
|
|
||
| if (sortFunc) { | ||
| const sorted = [...unsortedData].sort(sortFunc) | ||
| if (!ascending && !disableReverse) sorted.reverse() | ||
| return sorted | ||
| } | ||
| else { | ||
| const order = ascending ? 'asc' : 'desc' | ||
| const sorted = [...unsortedData].sort(sortFunc); | ||
| if (!ascending && !disableReverse) sorted.reverse(); | ||
| return sorted; | ||
| } else { | ||
| const order = ascending ? "asc" : "desc"; | ||
| const sorted = orderBy( | ||
| unsortedData, | ||
| (item) => valueGetter ? valueGetter(item) : get(sortPath, item), | ||
| (item) => (valueGetter ? valueGetter(item) : get(sortPath, item)), | ||
| order | ||
| ) | ||
| return sorted | ||
| ); | ||
| return sorted; | ||
| } | ||
| }, [ascending, sortPath, sortFunc, valueGetter, controlled, disableSort, disableReverse, unsortedData]) | ||
| }, [ | ||
| ascending, | ||
| sortPath, | ||
| sortFunc, | ||
| valueGetter, | ||
| controlled, | ||
| disableSort, | ||
| disableReverse, | ||
| unsortedData, | ||
| ]); | ||
|
|
||
| const handleColumnChange = (column) => { | ||
| if (column.disabled) return | ||
| if (column.disabled) return; | ||
|
|
||
| const newSortPath = column.name | ||
| const newSortFunc = column.sortFunc || null | ||
| const newValueGetter = column.valueGetter || null | ||
| const newSortPath = column.name; | ||
| const newSortFunc = column.sortFunc || null; | ||
| const newValueGetter = column.valueGetter || null; | ||
|
|
||
| // Toggle ascending if the path is already selected. Otherwise, default | ||
| // to ascending when switching paths... | ||
| const newAscending = newSortPath === sortPath ? !ascending : true | ||
| const newAscending = newSortPath === sortPath ? !ascending : true; | ||
|
|
||
| setAscending(newAscending) | ||
| setSortPath(newSortPath) | ||
| setSortFunc(() => newSortFunc) | ||
| setValueGetter(() => newValueGetter) | ||
| setAscending(newAscending); | ||
| setSortPath(newSortPath); | ||
| setSortFunc(() => newSortFunc); | ||
| setValueGetter(() => newValueGetter); | ||
|
|
||
| if (onChange) onChange({ | ||
| ascending: newAscending, | ||
| sortPath: newSortPath, | ||
| sortFunc: newSortFunc | ||
| }) | ||
| } | ||
| if (onChange) | ||
| onChange({ | ||
| ascending: newAscending, | ||
| sortPath: newSortPath, | ||
| sortFunc: newSortFunc, | ||
| }); | ||
| }; |
There was a problem hiding this comment.
Did anything change here? It's hard to tell 🙈
| {columns.map((column, key) => { | ||
| const Header = column.headerComponent || headerComponent || DefaultHeader | ||
| <> | ||
| <CaptionComponent caption={caption} /> |
There was a problem hiding this comment.
As a node, you could just always render the caption. E.g.,
<caption>{caption}</caption>However, since we'd be introducing a new change this could impact styling on existing projects. I believe this is tagged to the v6 milestone, so please modify the base branch to v6 and add a note in the migration guide
5 tasks
|
closing in favor of #540 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Allow table to have a caption specified: #463
Author Checklist