From 8d7af1cba193fcebb1b0be7b11eba8b111398d32 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Tue, 4 Jul 2023 12:30:03 +0400
Subject: [PATCH] Handle properly Component model `defaults` as functions.
 Closes #5199

---
 src/dom_components/index.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/dom_components/index.ts b/src/dom_components/index.ts
index 761f69bbb..430ecb45f 100644
--- a/src/dom_components/index.ts
+++ b/src/dom_components/index.ts
@@ -480,8 +480,7 @@ export default class ComponentManager extends ItemManagerModule<DomComponentsCon
 
     // If the model/view is a simple object I need to extend it
     if (typeof model === 'object') {
-      const defaults = result(model, 'defaults');
-      // @ts-ignore
+      const modelDefaults = { defaults: model.defaults };
       delete model.defaults;
       methods.model = modelToExt.extend(
         {
@@ -492,12 +491,12 @@ export default class ComponentManager extends ItemManagerModule<DomComponentsCon
           isComponent: compType && !extendType && !isComponent ? modelToExt.isComponent : isComponent || (() => 0),
         }
       );
-      // @ts-ignore
-      Object.defineProperty(methods.model.prototype, 'defaults', {
-        value: {
+      // Reassign the defaults getter to the model
+      Object.defineProperty(methods.model!.prototype, 'defaults', {
+        get: () => ({
           ...(result(modelToExt.prototype, 'defaults') || {}),
-          ...(defaults || {}),
-        },
+          ...(result(modelDefaults, 'defaults') || {}),
+        }),
       });
     }