fix(feature): focused feature not properly focused in toolbox

infra-geo-ouverte · May 15, 2017 · c2d88fe · c2d88fe
1 parent 71c06a6
commit c2d88fe
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/lib/feature/feature-details/feature-details-binding.directive.ts b/src/lib/feature/feature-details/feature-details-binding.directive.ts
@@ -20,6 +20,7 @@ export class FeatureDetailsBindingDirective implements OnInit, OnDestroy {
 
   ngOnInit() {
     this.focusedFeatures$$ = this.featureService.focusedFeature$
+      .filter(feature => feature !== undefined)
       .subscribe(feature => this.component.feature = feature);
   }
 

diff --git a/src/lib/feature/feature-list/feature-list-binding.directive.ts b/src/lib/feature/feature-list/feature-list-binding.directive.ts
@@ -17,13 +17,13 @@ export class FeatureListBindingDirective implements OnInit, OnDestroy {
   private initialized: boolean = false;
 
   @HostListener('focus', ['$event']) onFocus(feature: Feature) {
-    if (this.initialized) {
+    if (this.initialized || this.featureService.focusedFeature$.value === undefined) {
       this.featureService.focusFeature(feature);
     }
   }
 
   @HostListener('select', ['$event']) onSelect(feature: Feature) {
-    if (this.initialized) {
+    if (this.initialized || this.featureService.selectedFeature$.value === undefined) {
       this.featureService.selectFeature(feature);
     }
   }
@@ -46,6 +46,7 @@ export class FeatureListBindingDirective implements OnInit, OnDestroy {
     // having multiple feature list is unusual, no better fix is provided
     // for now.
     this.focusedFeature$$ = this.featureService.focusedFeature$
+      .filter(feature => feature !== undefined)
       .debounceTime(100)
       .subscribe(feature => this.component.focusedFeature = feature);