fix(tree-selection): if ngModel change View will have previous value (#…

…183)
positive-js · Jul 23, 2019 · 33ad81b · 33ad81b
1 parent 49dca88
commit 33ad81b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/packages/mosaic-dev/tree/module.ts b/packages/mosaic-dev/tree/module.ts
@@ -4,6 +4,7 @@ import { FormsModule } from '@angular/forms';
 import { BrowserModule } from '@angular/platform-browser';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { FlatTreeControl, NestedTreeControl } from '@ptsecurity/cdk/tree';
+import { McButtonModule } from '@ptsecurity/mosaic/button';
 import { McIconModule } from '@ptsecurity/mosaic/icon';
 import {
     McTreeFlatDataSource,
@@ -191,6 +192,7 @@ export class DemoComponent {
     imports: [
         BrowserModule,
         FormsModule,
+        McButtonModule,
         McTreeModule,
         McIconModule
     ],

diff --git a/packages/mosaic-dev/tree/template.html b/packages/mosaic-dev/tree/template.html
@@ -6,8 +6,14 @@
 </style>
 <h5>multiple selection</h5>
 
+<button class="mc-primary" mc-button (click)="modelValue = 'Applications'">set modelValue = Applications</button>
+
+<br><br><br>
+
 <div>ngModel: {{ modelValue }}</div>
 
+<br><br><br>
+
     <!--auto-select="true"-->
     <!--no-unselect="false"-->
 <!--    multiple-->

diff --git a/packages/mosaic/tree/tree-selection.ts b/packages/mosaic/tree/tree-selection.ts
@@ -186,7 +186,7 @@ export class McTreeSelection extends McTreeSelectionBaseMixin<McTreeOption>
             .subscribe((options) => {
                 options.forEach((option) => {
                     this.selectionModel.selected.forEach((selectedOption) => {
-                        if (option.value === selectedOption) { option._selected = true; }
+                        option._selected = option.value === selectedOption;
                     });
                 });
             });
@@ -398,13 +398,17 @@ export class McTreeSelection extends McTreeSelectionBaseMixin<McTreeOption>
     }
 
     private setOptionsFromValues(values: any[]): void {
+        this.selectionModel.clear();
+
         values.forEach((value) => {
             const correspondingOption = this.getCorrespondOption(value);
 
             this.selectionModel.select(value);
 
             if (correspondingOption) { correspondingOption.selected = true; }
         });
+
+        this.options.notifyOnChanges();
     }
 
     private canDeselectLast(option: McTreeOption): boolean {