inviton-powerduck 0.0.119 → 0.0.121

package/common/location-utils.ts

@@ -0,0 +1,12 @@
+export default class LocationUtils {
+	static getCurrentLocation (): Promise<GeolocationPosition> {
+		return new Promise((resolve, reject) => {
+			if (!navigator.geolocation) {
+				reject(new Error('Geolocation is not supported.'));
+				return;
+			}
+
+			navigator.geolocation.getCurrentPosition(resolve, reject);
+		});
+	}
+}

package/components/counter/testall.tsx

@@ -45,6 +45,11 @@ import Modal, { ModalSize } from '../modal/modal';
 import ModalBody from '../modal/modal-body';
 import ModalFooter from '../modal/modal-footer';
 
+interface TagItem {
+	id: string;
+	text: string;
+}
+
 @Component
 class TestAllComponentsPageComponent extends PowerduckViewModelBase {
 	name: string = null; // Needs to have =null suffixed so that TS compiler takes it into account
@@ -55,6 +60,8 @@ class TestAllComponentsPageComponent extends PowerduckViewModelBase {
 	blockModal: boolean = false;
 	color: string = '#FF00FF';
 	numberVal: number = 1;
+	tags: TagItem[] = [];
+	selectedTagIds: string[] = [];
 
 	protected get breadcrumbItems(): BreadcrumbItem[] {
 		return [
@@ -128,6 +135,19 @@ class TestAllComponentsPageComponent extends PowerduckViewModelBase {
 		});
 	}
 
+	getTagDropdown(): typeof DropdownList.prototype {
+		return this.$refs.tagsDropdown as typeof DropdownList.prototype;
+	}
+
+	fireChangedEvent(e: string[]) {
+		this.$nextTick(() => {
+			this.getTagDropdown().close();
+			this.$nextTick(() => {
+				this.selectedTagIds = e;
+			});
+		});
+	}
+
 	render(h) {
 		return (
 			<div>
@@ -292,11 +312,11 @@ class TestAllComponentsPageComponent extends PowerduckViewModelBase {
 								<p>Some modal content1</p>
 							</ModalSection>
 							{this.boolValue == true
-								&& (
-									<ModalSection icon="icon icon-settings" navCaption="Settings2">
-										<p>Some modal content2</p>
-									</ModalSection>
-								)}
+							&& (
+								<ModalSection icon="icon icon-settings" navCaption="Settings2">
+									<p>Some modal content2</p>
+								</ModalSection>
+							)}
 
 							<ModalSection icon="icon icon-settings" navCaption="Settings4">
 								<p>Some modal content4444</p>
@@ -360,6 +380,37 @@ class TestAllComponentsPageComponent extends PowerduckViewModelBase {
 						this.selectedOptions = v.id;
 					}}
 				/>
+				<DropdownList
+					ref="tagsDropdown"
+					closeOnSelect={true}
+					blocked={false}
+					options={this.tags}
+					displayMember={item => item.text}
+					valueMember={item => item.text}
+					multiselect={true}
+					label=""
+					tags={true}
+					tagsShouldPrependContent={true}
+					tagsAdded={(e) => {
+						e.closeSelection = true;
+
+						const newItem: TagItem = {
+							id: e.tagArr[0],
+							text: e.tagArr[0],
+						};
+
+						const selectedClone = [...this.selectedTagIds];
+						selectedClone.push(newItem.id);
+
+						this.tags.push(newItem);
+						this.fireChangedEvent(selectedClone);
+					}}
+					selected={this.tags.filter(p => (this.selectedTagIds || []).includes(p.id))}
+					changed={(e) => {
+						this.fireChangedEvent((e || []).map(p => p.id));
+					}}
+				/>
+
 				<DropdownButton layout={ButtonLayout.Default} size={ButtonSize.Regular} text="Akcie">
 					<DropdownButtonItem icon="icon icon-settings" text="Edit" clicked={() => alert('clicked me')} />
 					<DropdownButtonSeparator />

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,14 +1100,14 @@ 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): any => {
 										retVal.prepend(elem);
 										retVal.append = oldAppend;
-									} as any;
+									};
 								}
 
 								return retVal;
@@ -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.121",
 	"files": [
 		"app/",
 		"common/",