fix: layout/schema changes dont update form

Closes #27

Author: jscharett

projects/ngx-json-schema-form/src/lib/core/widget/widget.spec.ts

@@ -1,4 +1,4 @@
-import { Component, NO_ERRORS_SCHEMA, SimpleChange } from '@angular/core';
+import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
 import { ComponentFixture, inject, TestBed } from '@angular/core/testing';
 
 import { JsonSchemaFormService } from '../../form/services/json-schema-form.service';
@@ -93,9 +93,7 @@ describe('widgets', () => {
             options: {},
             type: ''
         } as any as LayoutNode;
-        const change = new SimpleChange(component.layoutNode, newLayoutNode, true);
         component.layoutNode = newLayoutNode;
-        component[`ngOnChanges`]({layoutNode: change});
         expect(edsService.set).toHaveBeenCalledWith(jasmine.any(HTMLElement), 'layout', newLayoutNode.layoutDefinition);
     });
 
@@ -104,14 +102,8 @@ describe('widgets', () => {
         (<jasmine.Spy>edsService.set).calls.reset();
         const newLayoutIndex = [1];
         const newDataIndex = [1];
-        const change1 = new SimpleChange(component.layoutIndex, newLayoutIndex, true);
-        const change2 = new SimpleChange(component.dataIndex, newDataIndex, true);
         component.layoutIndex = newLayoutIndex;
         component.dataIndex = newDataIndex;
-        component[`ngOnChanges`]({
-            dataIndex: change2,
-            layoutIndex: change1
-        });
         expect(edsService.set).not.toHaveBeenCalled();
     });
 

projects/ngx-json-schema-form/src/lib/core/widget/widget.ts

@@ -1,4 +1,4 @@
-import { AfterViewInit, ElementRef, Input, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core';
+import { AfterViewInit, ElementRef, Input, OnInit, ViewChild } from '@angular/core';
 import { AbstractControl } from '@angular/forms';
 
 import { JsonSchemaFormService } from '../../form/services/json-schema-form.service';
@@ -7,7 +7,7 @@ import { LayoutNode } from '../models/layout-node';
 import { ElementDataStorageService } from '../services/element-data-storage.service';
 
 /** AbstractWidget */
-export abstract class AbstractWidget implements OnChanges, OnInit, AfterViewInit {
+export abstract class AbstractWidget implements OnInit, AfterViewInit {
     /** Flag to disable the control */
     controlDisabled = false;
     /** Name for the control */
@@ -20,7 +20,15 @@ export abstract class AbstractWidget implements OnChanges, OnInit, AfterViewInit
     options: any;
 
     /** Layout Node describing the control */
-    @Input() layoutNode: LayoutNode;
+    private _layoutNode: LayoutNode;
+    @Input() set layoutNode(value: LayoutNode) {
+        this._layoutNode = value;
+        this.options = this._layoutNode.options;
+        this.updateData();
+    }
+    get layoutNode(): LayoutNode {
+        return this._layoutNode;
+    }
     /** Index of the layout in the Layout array */
     @Input() layoutIndex: Array<number>;
     /** Index of the data in data array */
@@ -32,18 +40,11 @@ export abstract class AbstractWidget implements OnChanges, OnInit, AfterViewInit
     /** constructor */
     constructor(protected jsf: JsonSchemaFormService, protected elementDataStorage: ElementDataStorageService) {}
 
-    /** Propagate layoutNode changes to the ElementDataStorage */
-    ngOnChanges(changes: SimpleChanges) {
-        if (changes.layoutNode) {
-            this.updateData();
-        }
-    }
     /**
      * Initialize the control and populate the options
      */
     ngOnInit() {
         this.jsf.initializeControl(this);
-        this.options = this.layoutNode.options;
     }
 
     /** Set the initial layout in the ElementDataStorage */

projects/ngx-json-schema-form/src/lib/form/json-schema-form.component.ts

@@ -105,7 +105,7 @@ export class JsonSchemaFormComponent implements OnChanges, OnDestroy, OnInit {
     }
 
     ngOnChanges(changes: SimpleChanges) {
-        if (changes.hasOwnProperty('schema')) {
+        if (changes.hasOwnProperty('schema') || changes.hasOwnProperty('layout')) {
             this.formInitialized = false;
         }
         this.updateForm();

projects/ngx-json-schema-form/src/lib/select-widget/select-widget.component.ts

@@ -18,7 +18,7 @@ import { JsonSchemaFormService } from '../form/services/json-schema-form.service
     styleUrls: ['./select-widget.component.css'],
     templateUrl: './select-widget.component.html'
 })
-export class SelectWidgetComponent extends AbstractWidget implements OnInit, OnChanges {
+export class SelectWidgetComponent extends AbstractWidget implements OnChanges, OnInit {
     private newComponent: ComponentRef<any>;
 
     /** Placeholder for injecting widget */
@@ -31,11 +31,11 @@ export class SelectWidgetComponent extends AbstractWidget implements OnInit, OnC
             super(jsf, elementDataStorage);
     }
 
-    ngOnInit() {
+    ngOnChanges() {
         this.updateComponent();
     }
 
-    ngOnChanges() {
+    ngOnInit() {
         this.updateComponent();
     }