From ba4a43fe8e16651088d7253327cd1a226aca942c Mon Sep 17 00:00:00 2001 From: tsv2013 Date: Wed, 15 May 2024 15:24:01 +0300 Subject: [PATCH] Work for #8254 - Console Warnings when running the Form Library demo - Warning: Cannot update during an existing state transition (such as within render) - refactoring - get rid of unnecessary code --- .../src/components/dropdown/dropdown.component.ts | 3 --- packages/survey-vue3-ui/src/components/dropdown/Dropdown.vue | 4 ---- src/knockout/components/dropdown/dropdown.ts | 3 --- src/react/dropdown-base.tsx | 3 --- src/vue/components/dropdown/dropdown.vue | 3 --- 5 files changed, 16 deletions(-) diff --git a/packages/survey-angular-ui/src/components/dropdown/dropdown.component.ts b/packages/survey-angular-ui/src/components/dropdown/dropdown.component.ts index 575ce7a046..b1f8d5c3e9 100644 --- a/packages/survey-angular-ui/src/components/dropdown/dropdown.component.ts +++ b/packages/survey-angular-ui/src/components/dropdown/dropdown.component.ts @@ -18,9 +18,6 @@ export class DropdownComponent extends BaseAngular implements OnInit { override ngOnInit(): void { super.ngOnInit(); - if (!this.model.dropdownListModel) { - this.model.dropdownListModel = new DropdownListModel(this.model); - } } click(event: any) { diff --git a/packages/survey-vue3-ui/src/components/dropdown/Dropdown.vue b/packages/survey-vue3-ui/src/components/dropdown/Dropdown.vue index 121510a605..bb8e52b336 100644 --- a/packages/survey-vue3-ui/src/components/dropdown/Dropdown.vue +++ b/packages/survey-vue3-ui/src/components/dropdown/Dropdown.vue @@ -130,10 +130,6 @@ import { computed, onMounted, onUpdated, ref } from "vue"; const props = defineProps<{ question: Question }>(); const inputElement = ref(null as any); const model = computed(() => { - const question = props.question; - if (!question.dropdownListModel) { - question.dropdownListModel = new DropdownListModel(question); - } return props.question.dropdownListModel; }); const click = (event: any) => { diff --git a/src/knockout/components/dropdown/dropdown.ts b/src/knockout/components/dropdown/dropdown.ts index 8c2536f316..eaf25f8221 100644 --- a/src/knockout/components/dropdown/dropdown.ts +++ b/src/knockout/components/dropdown/dropdown.ts @@ -29,9 +29,6 @@ ko.components.register("sv-dropdown", { const focus = (_: any, e: any) => { q.dropdownListModel?.onFocus(e); }; - if (!q.dropdownListModel) { - q.dropdownListModel = new DropdownListModel(params.question); - } new ImplementorBase(q.dropdownListModel); return { question: q, model: q.dropdownListModel, click: click, clear: clear, keyhandler: keyhandler, blur: blur, focus: focus, chevronPointerDown: chevronPointerDown }; }, diff --git a/src/react/dropdown-base.tsx b/src/react/dropdown-base.tsx index a298562e11..1f4d9db545 100644 --- a/src/react/dropdown-base.tsx +++ b/src/react/dropdown-base.tsx @@ -51,9 +51,6 @@ export class SurveyQuestionDropdownBase extends SurveyQuesti {this.renderReadOnlyElement()} ; } else { - if (!(this.question as any)["dropdownListModel"]) { - (this.question as any)["dropdownListModel"] = new DropdownListModel(this.question); - } selectElement = <> {this.renderInput(this.question["dropdownListModel"])} diff --git a/src/vue/components/dropdown/dropdown.vue b/src/vue/components/dropdown/dropdown.vue index 8be4ca8d06..c3ab9b3409 100644 --- a/src/vue/components/dropdown/dropdown.vue +++ b/src/vue/components/dropdown/dropdown.vue @@ -119,9 +119,6 @@ export class DropdownComponent extends BaseVue { return this.question.dropdownListModel; } getModel() { - if (!this.question.dropdownListModel) { - this.question.dropdownListModel = new DropdownListModel(this.question); - } return this.model; }