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

fix(Table): respect sort prop updates from parent component #1208

Merged
merged 3 commits into from
Jan 9, 2024
Merged

fix(Table): respect sort prop updates from parent component #1208

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
537ae48
fix(table): respect sort prop updates from parent component
ivantopo Jan 6, 2024
aeaf749
Merge branch 'dev' into fix/table-sort-from-parent-component
benjamincanac Jan 9, 2024
013c4bb
lint
benjamincanac Jan 9, 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
9 changes: 4 additions & 5 deletions src/runtime/components/data/Table.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,11 @@
</template>

<script lang="ts">
import { ref, computed, defineComponent, toRaw, toRef } from 'vue'
import { computed, defineComponent, toRaw, toRef } from 'vue'
import type { PropType } from 'vue'
import { upperFirst } from 'scule'
import { defu } from 'defu'
import { useVModel } from '@vueuse/core'
import UButton from '../elements/Button.vue'
import UIcon from '../elements/Icon.vue'
import UCheckbox from '../forms/Checkbox.vue'
Expand Down Expand Up @@ -170,7 +171,7 @@ export default defineComponent({

const columns = computed(() => props.columns ?? Object.keys(props.rows[0] ?? {}).map((key) => ({ key, label: upperFirst(key), sortable: false, class: undefined, sort: defaultSort })))

const sort = ref(defu({}, props.sort, { column: null, direction: 'asc' }))
const sort = useVModel(props, 'sort', emit, { passive: true, defaultValue: defu({}, props.sort, { column: null, direction: 'asc' }) })
Copy link
Member

@benjamincanac benjamincanac Jan 8, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is deep option not necessary here?


const savedSort = { column: sort.value.column, direction: null }

Expand Down Expand Up @@ -235,13 +236,11 @@ export default defineComponent({
if (sort.value.direction === direction) {
sort.value = defu({}, savedSort, { column: null, direction: 'asc' })
} else {
sort.value.direction = sort.value.direction === 'asc' ? 'desc' : 'asc'
sort.value = { column: sort.value.column, direction: sort.value.direction === 'asc' ? 'desc' : 'asc' }
}
} else {
sort.value = { column: column.key, direction: column.direction || 'asc' }
}

emit('update:sort', sort.value)
}

function onSelect (row) {
Expand Down