-
Notifications
You must be signed in to change notification settings - Fork 26
New column header component #2490
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.
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
Merged
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
465c65c
Remove table-based layout
jasontaylordev f9aafd8
Add ColumnHelp component
jasontaylordev 992a5d2
Fixed delete button
jasontaylordev 7b3f83f
Add ColumnHeader (WIP)
jasontaylordev 0e6717c
Simplify column headers.
jasontaylordev 4d06a14
Clean-up unused components
jasontaylordev 8d4e21c
Refactor column headers (WIP)
jasontaylordev 7ee4b39
Enhance ColumnHeader component with unit prop and improve help tooltips
jasontaylordev cd86d31
Remove for consistency
jasontaylordev 2dedc24
Remove unused component.
jasontaylordev bafefdf
Switch to $slots
jasontaylordev 5916181
Switch to build-in class binding
jasontaylordev File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| <script setup lang="ts"> | ||
| import { computed, useSlots } from "vue"; | ||
| import type { SortInfo } from "./SortInfo"; | ||
|
|
||
| const props = withDefaults( | ||
| defineProps<{ | ||
| name: string; | ||
| label: string; | ||
| unit?: string; | ||
| sortable?: boolean; | ||
| sortBy?: string; | ||
| sortState?: SortInfo; | ||
| defaultAscending?: boolean; | ||
| columnClass: string; | ||
| interactiveHelp?: boolean; | ||
| }>(), | ||
| { | ||
| sortable: false, | ||
| defaultAscending: false, | ||
| interactiveHelp: false, | ||
| } | ||
| ); | ||
|
|
||
| const slots = useSlots(); | ||
jasontaylordev marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| const sortByColumn = computed(() => props.sortBy || props.name); | ||
| const activeSortColumn = defineModel<SortInfo>(); | ||
| const isSortActive = computed(() => activeSortColumn?.value?.property === sortByColumn.value); | ||
| const sortIcon = computed(() => (activeSortColumn?.value?.isAscending ? "sort-up" : "sort-down")); | ||
|
|
||
| function toggleSort() { | ||
| activeSortColumn.value = { property: sortByColumn.value, isAscending: isSortActive.value ? !activeSortColumn?.value?.isAscending : props.defaultAscending }; | ||
jasontaylordev marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
| </script> | ||
|
|
||
| <template> | ||
| <div role="columnheader" :aria-label="props.name" :class="props.columnClass"> | ||
| <div class="box-header"> | ||
| <button v-if="props.sortable" @click="toggleSort" class="column-header-button" :aria-label="props.name"> | ||
| <span> | ||
| {{ props.label }} | ||
| <span v-if="props.unit" class="table-header-unit">{{ props.unit }}</span> | ||
| <span v-if="isSortActive"> | ||
| <i role="img" :class="sortIcon" :aria-label="sortIcon"></i> | ||
| </span> | ||
| <tippy v-if="slots.help" max-width="400px" :interactive="props.interactiveHelp"> | ||
| <i class="fa fa-sm fa-info-circle text-primary ps-1" /> | ||
| <template #content> | ||
| <slot name="help" /> | ||
| </template> | ||
| </tippy> | ||
| </span> | ||
| </button> | ||
| <div v-else class="column-header"> | ||
| <span> | ||
| {{ props.label }} | ||
| <span v-if="props.unit" class="table-header-unit">{{ props.unit }}</span> | ||
| </span> | ||
| <tippy v-if="slots.help" max-width="400px" :interactive="props.interactiveHelp"> | ||
| <i class="fa fa-sm fa-info-circle text-primary ps-1" /> | ||
| <template #content> | ||
| <slot name="help" /> | ||
| </template> | ||
| </tippy> | ||
| </div> | ||
| </div> | ||
| </div> | ||
| </template> | ||
|
|
||
| <style scoped> | ||
| .column-header { | ||
| background: none; | ||
| border: none; | ||
| padding: 0; | ||
| cursor: default; | ||
| max-width: 100%; | ||
| display: flex; | ||
| flex-wrap: wrap; | ||
| } | ||
| .column-header span, | ||
| .column-header-button span { | ||
| text-transform: uppercase; | ||
| display: inline-block; | ||
| text-align: left; | ||
| } | ||
| .column-header-button { | ||
| background: none; | ||
| border: none; | ||
| padding: 0; | ||
| cursor: pointer; | ||
| max-width: 100%; | ||
| display: flex; | ||
| flex-wrap: wrap; | ||
| align-items: end; | ||
| } | ||
|
|
||
| .column-header-button:hover span { | ||
| text-decoration: underline; | ||
| } | ||
|
|
||
| .column-header-button div { | ||
| display: inline-block; | ||
| } | ||
|
|
||
| .sort-up, | ||
| .sort-down { | ||
| background-position: center; | ||
| background-repeat: no-repeat; | ||
| width: 8px; | ||
| height: 14px; | ||
| padding: 0; | ||
| margin-left: 10px; | ||
| } | ||
|
|
||
| .sort-up { | ||
| background-image: url("@/assets/sort-up.svg"); | ||
| } | ||
|
|
||
| .sort-down { | ||
| background: url("@/assets/sort-down.svg"); | ||
| } | ||
|
|
||
| .sort-up, | ||
| .sort-down { | ||
| background-repeat: no-repeat; | ||
| display: inline-block; | ||
| vertical-align: middle; | ||
| } | ||
| </style> | ||
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
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
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
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.
Uh oh!
There was an error while loading. Please reload this page.