refactor: Combine _initialOptions and _optionsToUpdate

Author: Aden-git

src/core/component.ts

@@ -18,8 +18,7 @@ import {
 } from './nested-option';
 
 export abstract class DxComponent implements AfterViewInit, AfterContentChecked, INestedOptionContainer, ICollectionNestedOptionContainer {
-    private _initialOptions: any;
-    private _optionToUpdate: any;
+    private _optionToUpdate: any = {};
     private _collectionContainerImpl: ICollectionNestedOptionContainer;
     eventHelper: EmitterHelper;
     templates: DxTemplateDirective[];
@@ -35,12 +34,12 @@ export abstract class DxComponent implements AfterViewInit, AfterContentChecked,
             this.templates.forEach(template => {
                 initialTemplates[template.name] = template;
             });
-            this._initialOptions.integrationOptions.templates = initialTemplates;
+            this._optionToUpdate.integrationOptions.templates = initialTemplates;
         }
     }
     private _initOptions() {
-        this._initialOptions.eventsStrategy = this.eventHelper.strategy;
-        this._initialOptions.integrationOptions.watchMethod = this.watcherHelper.getWatchMethod();
+        this._optionToUpdate.eventsStrategy = this.eventHelper.strategy;
+        this._optionToUpdate.integrationOptions.watchMethod = this.watcherHelper.getWatchMethod();
     }
     protected _createEventEmitters(events) {
         events.forEach(event => {
@@ -57,20 +56,11 @@ export abstract class DxComponent implements AfterViewInit, AfterContentChecked,
         return true;
     }
     protected _getOption(name: string) {
-        if (this.instance) {
-            return this.instance.option(name);
-        } else {
-            return this._initialOptions[name];
-        }
+        return this.instance ?
+            this.instance.option(name) :
+            this._optionToUpdate[name];
     }
     protected _setOption(name: string, value: any) {
-        if (this.instance) {
-            this._prepareOptionToUpdate(name, value);
-        } else {
-            this._initialOptions[name] = value;
-        }
-    }
-    protected _prepareOptionToUpdate(name: string, value: any) {
         if (this._shouldOptionChange(name, value)) {
             this._optionToUpdate[name] = value;
         };
@@ -79,17 +69,19 @@ export abstract class DxComponent implements AfterViewInit, AfterContentChecked,
     protected _createWidget(element: any) {
         let events = [];
 
+        this._optionToUpdate.integrationOptions = {};
         this._initTemplates();
         this._initOptions();
 
         let optionChangeHandler = function(e) {
             events.push(e.name);
         };
 
-        this._initialOptions.onInitializing = function() {
+        this._optionToUpdate.onInitializing = function() {
             this.on('optionChanged', optionChangeHandler);
         };
-        this.instance = this._createInstance(element, this._initialOptions);
+        this.instance = this._createInstance(element, this._optionToUpdate);
+        this._optionToUpdate = {};
 
         this.instance.off('optionChanged', optionChangeHandler);
         this.instance.on('optionChanged', (e) => {
@@ -115,8 +107,6 @@ export abstract class DxComponent implements AfterViewInit, AfterContentChecked,
         }
     }
     constructor(protected element: ElementRef, private ngZone: NgZone, templateHost: DxTemplateHost, private watcherHelper: WatcherHelper) {
-        this._initialOptions = { integrationOptions: {} };
-        this._optionToUpdate = {};
         this.templates = [];
         templateHost.setHost(this);
         this._collectionContainerImpl = new CollectionNestedOptionContainerImpl(this._setOption.bind(this));

templates/component.tst

@@ -148,13 +148,13 @@ export class <#= it.className #>Component extends <#= baseClass #> <#? implement
         this._watcherHelper.checkWatchers();
     }
 
-    _prepareOptionToUpdate(name: string, value: any) {
+    _setOption(name: string, value: any) {
         if (Array.isArray(value)) {
             this._idh.setupSingle(name, value);
             this._idh.getChanges(name, value);
         }
 
-        super._prepareOptionToUpdate(name, value);
+        super._setOption(name, value);
     }<#?#>
 <#? it.isEditor #>
     ngAfterContentInit() {