inviton-powerduck 0.0.119 → 0.0.120

package/components/dropdown/index.tsx

@@ -430,12 +430,12 @@ class DropdownListComponent extends TsxComponent<DropdownListArgs> implements Dr
 	getFormatResult() {
 		if (this.trailingButton) {
 			const self = this;
-			return function (row) {
+			return (row) => {
 				const retVal = $(`<span class="s2-ri-withtb">${row.text
-					}<button class="s2-trailing-button ${self.trailingButton.cssClass || ''
-					} btn-sm">${self.trailingButton.icon != null ? `<i class="${self.trailingButton.icon}"></i> ` : ''
-					}${self.trailingButton.text || ''
-					}</button></span>`);
+				}<button class="s2-trailing-button ${self.trailingButton.cssClass || ''
+				} btn-sm">${self.trailingButton.icon != null ? `<i class="${self.trailingButton.icon}"></i> ` : ''
+				}${self.trailingButton.text || ''
+				}</button></span>`);
 				retVal.find('button').click((e) => {
 					try {
 						clearTimeout(self.preventDefaultTimeout);
@@ -507,7 +507,7 @@ class DropdownListComponent extends TsxComponent<DropdownListArgs> implements Dr
 			},
 		});
 
-		dropDown.onCancel = function () {
+		dropDown.onCancel = () => {
 			selectedItems = null;
 			dropDown = null;
 		};
@@ -610,6 +610,7 @@ class DropdownListComponent extends TsxComponent<DropdownListArgs> implements Dr
 
 				this.tagsAdded(eventArgs);
 				forceClose = eventArgs.closeSelection;
+				return;
 			}
 		}
 
@@ -850,9 +851,7 @@ class DropdownListComponent extends TsxComponent<DropdownListArgs> implements Dr
 					return stripDiacritics(text).toUpperCase();
 				};
 				const stripDiacritics = (text: string) => {
-					function match(a) {
-						return DIACRITICS[a] || a;
-					}
+					const match = a => DIACRITICS[a] || a;
 
 					return text.replace(/[^\u0000-\u007E]/g, match);
 				};
@@ -923,7 +922,7 @@ class DropdownListComponent extends TsxComponent<DropdownListArgs> implements Dr
 			let validTagsButtons = false;
 			let tagsTemplate = this.tagsTemplate;
 			if (this.tags == true && this.tagsAdded != null) {
-				s2Args.createTag = function (params) {
+				s2Args.createTag = (params) => {
 					const term = $.trim(params.term);
 					if (term === '') {
 						return null;
@@ -937,7 +936,7 @@ class DropdownListComponent extends TsxComponent<DropdownListArgs> implements Dr
 				};
 
 				if (this.tagsNewPlaceLast != false) {
-					s2Args.insertTag = function (data, tag) {
+					s2Args.insertTag = (data, tag) => {
 						// Insert the tag at the end of the results
 						data.push(tag);
 					};
@@ -948,7 +947,7 @@ class DropdownListComponent extends TsxComponent<DropdownListArgs> implements Dr
 						validTagsButtons = true;
 						tagsTemplate
 							= '<li class="select2-selection__choice select2-selection__choice-with-button"><span class="select2-selection__choice__remove" role="presentation"><i class="fas fa-times"></i></span></li>';
-						s2Args.templateSelection = function (state): string | JQuery {
+						s2Args.templateSelection = (state): string | JQuery => {
 							if (!state) { return ''; }
 
 							if (!state.id) { return state.text; }
@@ -985,9 +984,7 @@ class DropdownListComponent extends TsxComponent<DropdownListArgs> implements Dr
 
 				if (!this.useMultiCheckboxes()) {
 					const currentMethod = instance.dataAdapter.current;
-					const getCurrentData = () => {
-						return instance.dataAccessor?.getData();
-					};
+					const getCurrentData = () => instance.dataAccessor?.getData();
 
 					const getSelected = () => {
 						const retArr = [];
@@ -1045,8 +1042,13 @@ class DropdownListComponent extends TsxComponent<DropdownListArgs> implements Dr
 
 					instance.dataAdapter.select = (data) => {
 						const adapter = instance.dataAdapter;
-						if (adapter.$element.prop('multiple')) {
+						if (adapter.$element.prop('multiple') || s2Args.tags) {
 							adapter.current((currentData) => {
+								const isNewTag = data.newTag;
+								if (isNewTag) {
+									data.selected = true;
+								}
+
 								data = [data];
 								data.push.apply(data, currentData);
 								unselectOthers(getCurrentData(), data.map(p => p.id));
@@ -1098,11 +1100,11 @@ class DropdownListComponent extends TsxComponent<DropdownListArgs> implements Dr
 						};
 
 						if (!isNullOrEmpty(tagsTemplate)) {
-							DropdownSelect2Helper.getSelect2Instance(s2Elem).selection.selectionContainer = function () {
+							DropdownSelect2Helper.getSelect2Instance(s2Elem).selection.selectionContainer = () => {
 								const retVal = $(tagsTemplate);
 								if (self.tagsShouldPrependContent != false) {
 									const oldAppend = retVal.append;
-									retVal.append = function (elem) {
+									retVal.append = (elem) => {
 										retVal.prepend(elem);
 										retVal.append = oldAppend;
 									} as any;
@@ -1165,9 +1167,7 @@ class DropdownListComponent extends TsxComponent<DropdownListArgs> implements Dr
 				}
 			}
 
-			DropdownSelect2Helper.getSelect2Instance(s2Elem).dataAccessor.getData = () => {
-				return opts;
-			};
+			DropdownSelect2Helper.getSelect2Instance(s2Elem).dataAccessor.getData = () => opts;
 
 			if (this.containerCssClass?.length > 0) {
 				DropdownSelect2Helper.getSelect2Instance(s2Elem).$dropdown.addClass(this.containerCssClass);

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "inviton-powerduck",
 	"type": "module",
-	"version": "0.0.119",
+	"version": "0.0.120",
 	"files": [
 		"app/",
 		"common/",