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.

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(DataTable): prevent rowClick trigger when button clicked #6544

Merged
merged 3 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
43 changes: 43 additions & 0 deletions packages/primevue/src/datatable/DataTable.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -582,6 +582,49 @@ describe('DataTable.vue', () => {
expect(wrapper.emitted()['row-select'][1][0].index).toBe(1);
});

it('should not select row when inner button is clicked', async () => {
wrapper = mount(DataTable, {
global: {
plugins: [PrimeVue],
components: {
Column,
Button
}
},
props: {
value: smallData,
expandedRows: [],
paginatorTemplate: 'CurrentPageReport FirstPageLink PrevPageLink PageLinks NextPageLink LastPageLink RowsPerPageDropdown',
rowsPerPageOptions: [5, 6, 7],
currentPageReportTemplate: 'Showing {first} to {last} of {totalRecords}'
},
slots: {
default: `
<Column :expander="true" />
<Column field="code" header="Code" sortable>
<template #body="slotProps">
<button @click="buttonClicked">button</button>
</template>
</Column>
<Column field="name" header="Name" sortable></Column>
`
},
methods: {
buttonClicked() {
console.log('button clicked');
}
}
});

const button = wrapper.find('button');

expect(button.exists()).toBe(true);

await button.trigger('click');

expect(wrapper.emitted()['row-click']).toBeUndefined();
});

it('should select all rows', async () => {
wrapper = mount(DataTable, {
global: {
Expand Down
4 changes: 2 additions & 2 deletions packages/primevue/src/datatable/DataTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -734,7 +734,7 @@ export default {
const body = this.$refs.bodyRef && this.$refs.bodyRef.$el;
const focusedItem = findSingle(body, 'tr[data-p-selectable-row="true"][tabindex="0"]');

if (isClickable(event.currentTarget)) {
if (isClickable(event.target)) {
return;
}

Expand Down Expand Up @@ -811,7 +811,7 @@ export default {
this.rowTouched = false;

if (focusedItem) {
if (event.currentTarget?.getAttribute('data-pc-section') === 'rowtoggleicon') return;
if (event.target?.getAttribute('data-pc-section') === 'rowtoggleicon') return;

const targetRow = event.currentTarget?.closest('tr[data-p-selectable-row="true"]');

Expand Down
Loading