From 121fa7d31a834bb5224ea55b29667d84b48472ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=87a=C4=9Fatay=20=C3=87ivici?=
 <jagatai@Prime-MacBook.local>
Date: Thu, 30 Aug 2018 10:24:02 +0300
Subject: [PATCH] Fixed #6422

---
 src/app/components/multiselect/multiselect.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/app/components/multiselect/multiselect.ts b/src/app/components/multiselect/multiselect.ts
index f7c059e447e..8afee8b75cd 100644
--- a/src/app/components/multiselect/multiselect.ts
+++ b/src/app/components/multiselect/multiselect.ts
@@ -52,7 +52,7 @@ export const MULTISELECT_VALUE_ACCESSOR: any = {
                 </div>
                 <div class="ui-multiselect-items-wrapper" [style.max-height]="scrollHeight||'auto'">
                     <ul class="ui-multiselect-items ui-multiselect-list ui-widget-content ui-widget ui-corner-all ui-helper-reset">
-                        <li *ngFor="let option of options; let i = index" class="ui-multiselect-item ui-corner-all" (click)="onItemClick($event,option.value)"
+                        <li *ngFor="let option of options; let i = index" class="ui-multiselect-item ui-corner-all" (click)="onItemClick($event,option)"
                             [style.display]="isItemVisible(option) ? 'block' : 'none'"
                             [ngClass]="{'ui-state-highlight': isSelected(option.value), 'ui-state-disabled': option.disabled || (maxSelectionLimitReached && !isSelected(option.value))}">
                             <div class="ui-chkbox ui-widget">
@@ -276,7 +276,12 @@ export class MultiSelect implements OnInit,AfterViewInit,AfterContentInit,AfterV
         this.disabled = val;
     }
     
-    onItemClick(event, value) {
+    onItemClick(event, option) {
+        if (option.disabled) {
+            return;
+        }
+        
+        const value = option.value;
         let selectionIndex = this.findSelectionIndex(value);
         if (selectionIndex != -1) {
             this.value = this.value.filter((val,i) => i != selectionIndex);