Skip to content

Commit

Permalink
AG-11495 Erroneous warning when using rowData
Browse files Browse the repository at this point in the history
  • Loading branch information
seanlandsman authored and AndrewGlazier committed May 15, 2024
1 parent 5ff8442 commit af0a966
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion community-modules/vue3/src/AgGridVue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export const AgGridVue = defineComponent({
},
checkForBindingConflicts() {
const thisAsAny = (this as any);
if ((thisAsAny.rowData || this.gridOptions.rowData) &&
if (((thisAsAny.rowData && thisAsAny.rowData !== 'AG-VUE-OMITTED-PROPERTY') || this.gridOptions.rowData) &&
thisAsAny.modelValue) {
console.warn('AG Grid: Using both rowData and v-model. rowData will be ignored.');
}
Expand Down
2 changes: 1 addition & 1 deletion packages/ag-grid-vue3/src/AgGridVue.ts
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export const AgGridVue = defineComponent({
},
checkForBindingConflicts() {
const thisAsAny = (this as any);
if ((thisAsAny.rowData || this.gridOptions.rowData) &&
if (((thisAsAny.rowData && thisAsAny.rowData !== 'AG-VUE-OMITTED-PROPERTY') || this.gridOptions.rowData) &&
thisAsAny.modelValue) {
console.warn('AG Grid: Using both rowData and v-model. rowData will be ignored.');
}
Expand Down

0 comments on commit af0a966

Please sign in to comment.