Do not proxy propertiesHash object

surveyjs · Mar 15, 2023 · 4d6a718 · 4d6a718
1 parent 9db854a
commit 4d6a718
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/packages/survey-vue-ui/src/Survey.vue b/packages/survey-vue-ui/src/Survey.vue
@@ -86,7 +86,8 @@
 </template>
 
 <script lang="ts">
-import { Base, StylesManager, surveyCss, SvgRegistry, SurveyModel, doKey2ClickUp, IAttachKey2clickOptions } from "survey-core";
+import { SvgRegistry, SurveyModel } from "survey-core";
+import { reactive, isReactive } from "vue";
 import { defineSurveyComponent } from "./base";
 
 export default defineSurveyComponent({
@@ -129,7 +130,8 @@ export default defineSurveyComponent({
   },
   computed: {
     vueSurvey(): SurveyModel {
-      return !!this.survey ? this.survey : this.model;
+      const survey = !!this.survey ? this.survey : this.model;
+      return isReactive(survey) ? survey : reactive(survey);
     },
     pageId: {
       get() {

diff --git a/packages/survey-vue-ui/src/base.ts b/packages/survey-vue-ui/src/base.ts
@@ -1,6 +1,17 @@
-import type { Base } from "survey-core";
-import { ref, defineComponent, type ComponentOptions, unref, isRef } from "vue";
-
+import { Base } from "survey-core";
+import {
+  ref,
+  defineComponent,
+  type ComponentOptions,
+  unref,
+  isRef,
+  markRaw,
+} from "vue";
+Base.createPropertiesHash = () => {
+  const res = {};
+  markRaw(res);
+  return res;
+};
 function makeReactive(surveyElement: Base) {
   surveyElement.iteratePropertiesHash((propertiesHash: any, name: any) => {
     // (<any>Vue.util).defineReactive(propertiesHash, name, propertiesHash[name]);

diff --git a/src/base.ts b/src/base.ts
@@ -224,8 +224,11 @@ export class Base {
   protected isPropertyEmpty(value: any): boolean {
     return value !== "" && this.isValueEmpty(value);
   }
+  public static createPropertiesHash() {
+    return {};
+  }
 
-  private propertyHash: { [index: string]: any } = {};
+  private propertyHash: { [index: string]: any } = Base.createPropertiesHash();
   private localizableStrings: { [index: string]: LocalizableString };
   private arraysInfo: { [index: string]: any };
   private eventList: Array<EventBase<any>> = [];