Fixed #11283 and Fixed #11296

primefaces · Mar 11, 2022 · 6e80d00 · 6e80d00
1 parent 179cfa7
commit 6e80d00
Showing 1 changed file with 40 additions and 0 deletions.
diff --git a/src/app/components/picklist/picklist.ts b/src/app/components/picklist/picklist.ts
@@ -173,6 +173,8 @@ export class PickList implements AfterViewChecked,AfterContentInit {
 
     @Input() stripedRows: boolean;
 
+    @Input() keepSelection: boolean = false;
+
     @Output() onMoveToSource: EventEmitter<any> = new EventEmitter();
 
     @Output() onMoveAllToSource: EventEmitter<any> = new EventEmitter();
@@ -537,9 +539,15 @@ export class PickList implements AfterViewChecked,AfterContentInit {
                         this.visibleOptionsSource.splice(ObjectUtils.findIndexInList(selectedItem, this.visibleOptionsSource),1);
                 }
             }
+
             this.onMoveToTarget.emit({
                 items: this.selectedItemsSource
             });
+
+            if (this.keepSelection) {
+                this.selectedItemsTarget = [...this.selectedItemsTarget, ...this.selectedItemsSource]
+            }
+
             this.selectedItemsSource = [];
 
             if (this.filterValueTarget) {
@@ -565,6 +573,10 @@ export class PickList implements AfterViewChecked,AfterContentInit {
                 items: movedItems
             });
 
+            if (this.keepSelection) {
+                this.selectedItemsTarget = [...this.selectedItemsTarget, ...this.selectedItemsSource]
+            }
+
             this.selectedItemsSource = [];
 
             if (this.filterValueTarget) {
@@ -586,10 +598,15 @@ export class PickList implements AfterViewChecked,AfterContentInit {
                         this.visibleOptionsTarget.splice(ObjectUtils.findIndexInList(selectedItem, this.visibleOptionsTarget),1)[0]
                 }
             }
+
             this.onMoveToSource.emit({
                 items: this.selectedItemsTarget
             });
 
+            if (this.keepSelection) {
+                this.selectedItemsSource = [...this.selectedItemsSource, ...this.selectedItemsTarget]
+            }
+
             this.selectedItemsTarget = [];
 
             if (this.filterValueSource) {
@@ -615,6 +632,10 @@ export class PickList implements AfterViewChecked,AfterContentInit {
                 items: movedItems
             });
 
+            if (this.keepSelection) {
+                this.selectedItemsSource = [...this.selectedItemsSource, ...this.selectedItemsTarget]
+            }
+
             this.selectedItemsTarget = [];
 
             if (this.filterValueSource) {
@@ -640,6 +661,15 @@ export class PickList implements AfterViewChecked,AfterContentInit {
         if (listType === this.SOURCE_LIST) {
             if (isTransfer) {
                 transferArrayItem(event.previousContainer.data, event.container.data, dropIndexes.previousIndex, dropIndexes.currentIndex);
+                let selectedItemIndex  = ObjectUtils.findIndexInList(event.item.data, this.selectedItemsTarget);
+
+                if (selectedItemIndex != -1) {
+                    this.selectedItemsTarget.splice(selectedItemIndex,1);
+
+                    if (this.keepSelection) {
+                        this.selectedItemsTarget.push(event.item.data);
+                    }
+                }
 
                 if (this.visibleOptionsTarget)
                     this.visibleOptionsTarget.splice(event.previousIndex, 1);
@@ -659,6 +689,16 @@ export class PickList implements AfterViewChecked,AfterContentInit {
             if (isTransfer) {
                 transferArrayItem(event.previousContainer.data, event.container.data, dropIndexes.previousIndex, dropIndexes.currentIndex);
 
+                let selectedItemIndex = ObjectUtils.findIndexInList(event.item.data, this.selectedItemsSource);
+
+                if (selectedItemIndex != -1) {
+                    this.selectedItemsSource.splice(selectedItemIndex,1);
+
+                    if (this.keepSelection) {
+                        this.selectedItemsTarget.push(event.item.data);
+                    }
+                }
+
                 if (this.visibleOptionsSource)
                     this.visibleOptionsSource.splice(event.previousIndex, 1);