fix(shop): item not selectable

scenario: * select or pick an item * select an item from the preview menu (from/into) * unable to select or pick the first item again
SteveVanOpstal · Dec 15, 2016 · 9639efe · 9639efe
1 parent fd82f3a
commit 9639efe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/src/client/build/shop/preview/preview.component.ts b/src/client/build/shop/preview/preview.component.ts
@@ -61,6 +61,7 @@ export class PreviewComponent implements OnChanges {
   selectItem(item: Item) {
     this.item = item;
     this.ngOnChanges();
+    return false;  // stop context menu from appearing
   }
 
   pickItem(item: Item) {

diff --git a/src/client/build/shop/shop.component.ts b/src/client/build/shop/shop.component.ts
@@ -3,6 +3,7 @@ import {Component, EventEmitter, OnInit, Output} from '@angular/core';
 import {LolApiService} from '../../services/lolapi.service';
 import {ToIterablePipe} from '../../shared/to-iterable.pipe';
 import {Item} from '../item';
+import {PreviewComponent} from './preview/preview.component';
 
 @Component({
   selector: 'lb-shop',
@@ -39,19 +40,19 @@ import {Item} from '../item';
             <lb-item [item]="item"
                   [ngClass]="{disabled: item.disabled}"
                   [attr.title]="item.description"
-                  (click)="selectItem(item)"
-                  (contextmenu)="pickItem(item);selectItem(item)"
-                  (dblclick)="pickItem(item);selectItem(item)">
+                  (click)="preview.selectItem(item)"
+                  (contextmenu)="pickItem(item);preview.selectItem(item)"
+                  (dblclick)="pickItem(item);preview.selectItem(item)">
             </lb-item>
           </template>
           <lb-loading [loading]="loading"></lb-loading>
           <lb-retry [error]="error" (retry)="ngOnInit()"></lb-retry>
         </div>
       </div>
       <div class="right">
-        <lb-preview [item]="selectedItem"
-                 [items]="items | lbMap:11 | lbChampion:123"
-                 (itemPicked)="pickItem($event)">
+        <lb-preview #preview
+                    [items]="items | lbMap:11 | lbChampion:123"
+                    (itemPicked)="pickItem($event)">
         </lb-preview>
       </div>
     </div>`
@@ -60,6 +61,8 @@ import {Item} from '../item';
 export class ShopComponent implements OnInit {
   @Output() itemPicked: EventEmitter<Item> = new EventEmitter<Item>();
 
+  preview: PreviewComponent;
+
   loading: boolean = true;
   error: boolean = false;
 
@@ -68,7 +71,6 @@ export class ShopComponent implements OnInit {
 
   data: Object;
   items: Array<Item> = [];
-  selectedItem: Item;
   private originalItems: Array<Item> = [];
 
   constructor(private lolApi: LolApiService) {}
@@ -105,11 +107,6 @@ export class ShopComponent implements OnInit {
     }
   }
 
-  selectItem(item: Item) {
-    this.selectedItem = item;
-    return false;  // stop context menu from appearing
-  }
-
   pickItem(item: Item) {
     this.itemPicked.emit(item);
     return false;  // stop context menu from appearing