survey-angular-ui 2.0.0-rc.9 → 2.0.0

package/base-angular.d.ts

@@ -15,6 +15,9 @@ export declare abstract class BaseAngular<T extends Base = Base> extends Embedde
     private getIsRendering;
     private isDestroyed;
     ngOnDestroy(): void;
+    private makeBaseElementAngularCallback?;
+    protected isBaseElementSubsribed(stateElement: Base): boolean;
+    private getBaseElementCallbacks;
     private makeBaseElementAngular;
     private unMakeBaseElementAngular;
     protected update(key?: string): void;

package/bundles/survey-angular-ui.umd.js

@@ -601,10 +601,18 @@
           this.unMakeBaseElementAngular(this.getModel());
           this.previousModel = undefined;
       };
+      BaseAngular.prototype.isBaseElementSubsribed = function (stateElement) {
+          return !!stateElement.__ngImplemented;
+      };
+      BaseAngular.prototype.getBaseElementCallbacks = function (stateElement) {
+          var _a;
+          stateElement.__ngSubscribers = (_a = stateElement.__ngSubscribers) !== null && _a !== void 0 ? _a : [];
+          return (stateElement.__ngSubscribers);
+      };
       BaseAngular.prototype.makeBaseElementAngular = function (stateElement) {
           var _this = this;
-          if (!!stateElement && !stateElement.__ngImplemented) {
-              this.isModelSubsribed = true;
+          this.makeBaseElementAngularCallback = function () {
+              _this.isModelSubsribed = true;
               stateElement.__ngImplemented = true;
               stateElement.iteratePropertiesHash(function (hash, key) {
                   var val = hash[key];
@@ -622,21 +630,41 @@
                   }
               };
               stateElement.enableOnElementRerenderedEvent();
+          };
+          if (!!stateElement) {
+              if (!stateElement.__ngImplemented) {
+                  this.makeBaseElementAngularCallback();
+              }
+              else {
+                  this.getBaseElementCallbacks(stateElement).push(this.makeBaseElementAngularCallback);
+              }
           }
       };
       BaseAngular.prototype.unMakeBaseElementAngular = function (stateElement) {
-          if (!!stateElement && this.isModelSubsribed) {
-              this.isModelSubsribed = false;
-              stateElement.__ngImplemented = false;
-              stateElement.setPropertyValueCoreHandler = undefined;
-              stateElement.iteratePropertiesHash(function (hash, key) {
-                  var val = hash[key];
-                  if (Array.isArray(val)) {
-                      var val = val;
-                      val["onArrayChanged"] = function () { };
+          if (!!stateElement) {
+              if (this.isModelSubsribed) {
+                  this.isModelSubsribed = false;
+                  stateElement.__ngImplemented = false;
+                  stateElement.setPropertyValueCoreHandler = undefined;
+                  stateElement.iteratePropertiesHash(function (hash, key) {
+                      var val = hash[key];
+                      if (Array.isArray(val)) {
+                          var val = val;
+                          val["onArrayChanged"] = function () { };
+                      }
+                  });
+                  stateElement.disableOnElementRerenderedEvent();
+                  var callbacks = this.getBaseElementCallbacks(stateElement);
+                  var callback = callbacks.shift();
+                  callback && callback();
+              }
+              else if (this.makeBaseElementAngularCallback) {
+                  var callbacks = this.getBaseElementCallbacks(stateElement);
+                  var index = callbacks.indexOf(this.makeBaseElementAngularCallback);
+                  if (index > -1) {
+                      callbacks.splice(index, 1);
                   }
-              });
-              stateElement.disableOnElementRerenderedEvent();
+              }
           }
       };
       BaseAngular.prototype.update = function (key) {
@@ -1471,8 +1499,10 @@
       };
       RowComponent.prototype.ngOnDestroy = function () {
           _super.prototype.ngOnDestroy.call(this);
-          this.row.setRootElement(undefined);
-          this.stopLazyRendering();
+          if (!this.isBaseElementSubsribed(this.row)) {
+              this.row.setRootElement(undefined);
+              this.stopLazyRendering();
+          }
       };
       return RowComponent;
   }(BaseAngular));