Revert "Fixed #1737 - New selectionMode for OrderList"

This reverts commit d849dea6f8.
pull/1792/head
Cagatay Civici 2021-11-18 13:29:10 +03:00
parent 989514a724
commit 82b01a5311
4 changed files with 6 additions and 44 deletions

View File

@ -11,12 +11,6 @@ const OrderListProps = [
default: "null",
description: "Selected items in the list."
},
{
name: "selectionMode",
type: "string",
default: "null",
description: 'Defines selection mode, options are "single" and "multiple".'
},
{
name: "metaKeySelection",
type: "boolean",

View File

@ -4,7 +4,6 @@ interface OrderListProps {
modelValue?: any[];
dataKey?: string;
selection?: any[];
selectionMode?: string;
metaKeySelection?: boolean;
listStyle?: any;
responsive?: boolean;

View File

@ -42,10 +42,6 @@ export default {
type: Array,
default: null
},
selectionMode: {
type: String,
default: null
},
dataKey: {
type: String,
default: null
@ -206,46 +202,31 @@ export default {
},
onItemClick(event, item, index) {
this.itemTouched = false;
let selection = this.d_selection;
let selectedIndex = ObjectUtils.findIndexInList(item, this.d_selection);
let selected = (selectedIndex != -1);
let metaSelection = this.itemTouched ? false : this.metaKeySelection;
let _selection = [];
if (metaSelection) {
let metaKey = (event.metaKey || event.ctrlKey);
if (selected && metaKey) {
_selection = selection.filter((val, index) => index !== selectedIndex);
this.d_selection = this.d_selection.filter((val, index) => index !== selectedIndex);
}
else {
if (this.isMultipleSelectionMode()) {
_selection = (selection && metaKey) ? [...selection] : [];
}
ObjectUtils.insertIntoOrderedArray(item, index, _selection, this.modelValue);
this.d_selection = (metaKey) ? this.d_selection ? [...this.d_selection] : [] : [];
ObjectUtils.insertIntoOrderedArray(item, index, this.d_selection, this.modelValue);
}
}
else {
if (selected) {
if (this.isSingleSelectionMode()) {
_selection = [...selection];
}
else if (this.isMultipleSelectionMode()) {
_selection = selection.filter((val, index) => index !== selectedIndex);
}
this.d_selection = this.d_selection.filter((val, index) => index !== selectedIndex);
}
else {
if (this.isMultipleSelectionMode()) {
_selection = selection ? [...selection] : [];
}
ObjectUtils.insertIntoOrderedArray(item, index, _selection, this.modelValue);
this.d_selection = this.d_selection ? [...this.d_selection] : [];
ObjectUtils.insertIntoOrderedArray(item, index, this.d_selection, this.modelValue);
}
}
let newSelection = [this.d_selection];
newSelection = _selection;
this.d_selection = newSelection;
this.$emit('update:selection', this.d_selection);
this.$emit('selection-change', {
originalEvent:event,
@ -368,12 +349,6 @@ export default {
document.head.removeChild(this.styleElement);
this.styleElement = null;
}
},
isSingleSelectionMode() {
return this.selectionMode === 'single';
},
isMultipleSelectionMode() {
return this.selectionMode === 'multiple';
}
},
computed: {

View File

@ -93,12 +93,6 @@ import OrderList from 'primevue/orderlist';
<td>null</td>
<td>Selected items in the list.</td>
</tr>
<tr>
<td>selectionMode</td>
<td>string</td>
<td>null</td>
<td>Defines selection mode, options are "single" and "multiple".</td>
</tr>
<tr>
<td>metaKeySelection</td>
<td>boolean</td>