inviton-powerduck 0.0.134 → 0.0.136

package/common/utils/date-utils.ts

@@ -1,3 +1,4 @@
+import PowerduckState from '../../app/powerduck-state';
 import { DateWrapper } from '../date-wrapper';
 
 const _isInteger = (val: any) => {
@@ -30,7 +31,7 @@ const _getInt = (
 };
 
 export default class DateUtils {
-	static getWeekNumber(date: DateWrapper | Date) {
+	static getWeekNumber (date: DateWrapper | Date) {
 		const target = new Date(date.getTime());
 		// Nastaviť na najbližší štvrtok (ISO týždne začínajú v pondelok)
 		target.setHours(
@@ -50,7 +51,7 @@ export default class DateUtils {
 		return weekNumber;
 	}
 
-	static formatDate(date: Date | DateWrapper | number, format: string): string {
+	static formatDate (date: Date | DateWrapper | number, format: string): string {
 		if (typeof date === 'number') {
 			date = new DateWrapper(date);
 		}
@@ -69,6 +70,8 @@ export default class DateUtils {
 		const s = date.getSeconds();
 		const LZ = x => (x < 0 || x > 9 ? '' : '0') + x;
 
+		const locale = PowerduckState.getCurrentLanguage();
+
 		// Convert real date parts into formatted versions
 		const value: any = new Object();
 		if (y.length < 4) {
@@ -80,8 +83,12 @@ export default class DateUtils {
 		value.yy = y.substring(2, 4);
 		value.M = M;
 		value.MM = LZ(M);
+		value.MMM = date.toLocaleDateString({ month: 'short', timeZone: 'UTC', language: locale });
+		value.MMMM = date.toLocaleDateString({ month: 'long', timeZone: 'UTC', language: locale });
 		value.d = d;
 		value.dd = LZ(d);
+		value.E = date.toLocaleDateString({ weekday: 'short', timeZone: 'UTC', language: locale });
+		value.EEEE = date.toLocaleDateString({ weekday: 'long', timeZone: 'UTC', language: locale });
 		value.H = H;
 		value.HH = LZ(H);
 		if (H == 0) {
@@ -127,7 +134,7 @@ export default class DateUtils {
 		return result;
 	};
 
-	static getDateWrapperFromFormat(val: string, format: string): DateWrapper {
+	static getDateWrapperFromFormat (val: string, format: string): DateWrapper {
 		// In case somehow the date is already a datewrapper
 		if ((val as any)._dte != null) {
 			return (val as any);
@@ -149,6 +156,44 @@ export default class DateUtils {
 		let ss: any = now.getSeconds();
 		let ampm = '';
 
+		const _isValidChar = (char: string): boolean => /[a-záčďéíĺľńóôŕšťúýž]/i.test(char);
+		const locale = PowerduckState.getCurrentLanguage();
+		const getMonthFromName = (monthName: string, isShort: boolean = false): number => {
+			const date = new Date(2022, 0, 1);
+
+			for (let monthIndex = 0; monthIndex < 12; monthIndex++) {
+				date.setMonth(monthIndex);
+				const name = date.toLocaleDateString(locale, {
+					month: isShort ? 'short' : 'long',
+					timeZone: 'UTC'
+				}).toLowerCase();
+
+				if (name == monthName.toLowerCase()) {
+					return monthIndex;
+				}
+			}
+
+			return null;
+		};
+
+		const getDayFromName = (dayName: string, isShort: boolean = false): number => {
+			const date = new Date(2022, 0, 2);
+
+			for (let dayIndex = 0; dayIndex < 7; dayIndex++) {
+				date.setDate(2 + dayIndex);
+				const name = date.toLocaleDateString(locale, {
+					weekday: isShort ? 'short' : 'long',
+					timeZone: 'UTC'
+				}).toLowerCase();
+
+				if (name == dayName.toLowerCase()) {
+					return date.getDay();
+				}
+			}
+
+			return null;
+		};
+
 		while (i_format < format.length) {
 			// Get next token from format string
 			c = format.charAt(i_format);
@@ -203,6 +248,46 @@ export default class DateUtils {
 				}
 
 				i_val += month.length;
+			} else if (token == 'MMMM') {
+				let monthName = '';
+				let tmpIndex = i_val;
+
+				while (tmpIndex < val.length) {
+					const char = val.charAt(tmpIndex);
+					if (_isValidChar(char)) {
+						monthName += char;
+						tmpIndex++;
+					} else {
+						break;
+					}
+				}
+
+				month = getMonthFromName(monthName, false);
+				if (month == null) {
+					return null;
+				}
+
+				i_val = tmpIndex;
+			} else if (token == 'MMM') {
+				let monthName = '';
+				let tempIndex = i_val;
+
+				while (tempIndex < val.length && (tempIndex - i_val) < 4) {
+					const char = val.charAt(tempIndex);
+					if (_isValidChar(char)) {
+						monthName += char;
+						tempIndex++;
+					} else {
+						break;
+					}
+				}
+
+				month = getMonthFromName(monthName, true);
+				if (month == null) {
+					return null;
+				}
+
+				i_val = tempIndex;
 			} else if (token == 'dd' || token == 'd') {
 				date = _getInt(
 					val,
@@ -215,6 +300,46 @@ export default class DateUtils {
 				}
 
 				i_val += date.length;
+			} else if (token == 'EEEE') {
+				let dayName = '';
+				let tempIndex = i_val;
+
+				while (tempIndex < val.length) {
+					const char = val.charAt(tempIndex);
+					if (_isValidChar(char)) {
+						dayName += char;
+						tempIndex++;
+					} else {
+						break;
+					}
+				}
+
+				const dayIndex = getDayFromName(dayName, false);
+				if (dayIndex == null) {
+					return null;
+				}
+
+				i_val = tempIndex;
+			} else if (token == 'E') {
+				let dayName = '';
+				let tempIndex = i_val;
+
+				while (tempIndex < val.length && (tempIndex - i_val) < 4) {
+					const char = val.charAt(tempIndex);
+					if (_isValidChar(char)) {
+						dayName += char;
+						tempIndex++;
+					} else {
+						break;
+					}
+				}
+
+				const dayIndex = getDayFromName(dayName, true);
+				if (dayIndex == null) {
+					return null;
+				}
+
+				i_val = tempIndex;
 			} else if (token == 'hh' || token == 'h') {
 				hh = _getInt(
 					val,

package/components/datatable/datatable.tsx

@@ -1419,7 +1419,7 @@ class DataTableComponent extends TsxComponent<DataTableArgs> implements DataTabl
 						} else {
 							mySelf.totalCount = data.totalCount ?? data.TotalCount;
 							mySelf.totalFilteredCount = data.totalFilteredCount ?? data.TotalFilteredCount;
-							mySelf.rows = data.rows ?? data.Rows;
+							mySelf.rows = data.rows ?? data.Rows ?? data.data;
 						}
 
 						mySelf.loadedRows = mySelf.rows;

package/components/input/daterange-picker.tsx

@@ -42,6 +42,7 @@ interface DaterangePickerArgs extends FormItemWrapperArgs {
 	maxDate?: DateWrapper;
 	prevIcon?: string;
 	nextIcon?: string;
+	hideYearInMonthName?: boolean;
 	singleMonth?: boolean;
 	calendarPlacement?: 'body' | 'inline' | 'input-container-leftalign' | 'input-container-rightalign';
 	ensureMonthContinuity?: boolean;
@@ -112,6 +113,7 @@ class DaterangePickerComponent extends TsxComponent<DaterangePickerArgs> impleme
 	@Prop() maxDate?: DateWrapper;
 	@Prop() prevIcon?: string;
 	@Prop() nextIcon?: string;
+	@Prop() hideYearInMonthName?: boolean;
 	@Prop() disabled!: boolean;
 	@Prop() readOnly?: boolean;
 	@Prop() customTooltip?: (dayCount: number) => string;
@@ -161,6 +163,7 @@ class DaterangePickerComponent extends TsxComponent<DaterangePickerArgs> impleme
 			singleDate: this.singleDate == true,
 			startOfWeek: DateInputHelper.getStartOfWeek() == 0 ? 'sunday' : 'monday',
 			separator: self.getSeparator(),
+			hideYearInMonthName: this.hideYearInMonthName == true,
 			format: self.getFormat(),
 			language: self.getLanguage(),
 			autoClose: self.autoClose,
@@ -405,7 +408,7 @@ class DaterangePickerComponent extends TsxComponent<DaterangePickerArgs> impleme
 		}
 	}
 
-	syncInputDefaultValue(dateStart?: string, dateEnd?: string) {
+	syncInputDefaultValue (dateStart?: string, dateEnd?: string) {
 		const startDate = this.getDateFromString(dateStart);
 		if (startDate?.getTime() != this._startDate?.getTime()) {
 			this._startDate = startDate;
@@ -420,7 +423,16 @@ class DaterangePickerComponent extends TsxComponent<DaterangePickerArgs> impleme
 			}
 		}
 
-		const inputValue = DateUtils.formatDate(startDate, this.getFormat()) + this.getSeparator() + DateUtils.formatDate(endDate, this.getFormat());
+		const getInputValue = (): string => {
+			const formattedStartDate = DateUtils.formatDate(startDate, this.getFormat());
+			if (this.singleDate) {
+				return formattedStartDate;
+			}
+
+			return formattedStartDate + this.getSeparator() + DateUtils.formatDate(endDate, this.getFormat());
+		}
+
+		const inputValue = getInputValue();
 		this._lastText = inputValue;
 		this.writeCustomText();
 	}

package/components/input/plugins/daterangepicker/jquery.daterangepicker.ts

@@ -1696,7 +1696,7 @@ import './daterangepicker.css';
 		function showMonth(date: DateWrapper, month: 'month1' | 'month2') {
 			date = date.clone();
 			const monthName = nameMonth(date.getMonth());
-			box.find(`.${month} .month-name`).html(`${monthName} ${date.getFullYear()}`);
+			box.find(`.${month} .month-name`).html(`${monthName}${opt.hideYearInMonthName ? '' : ` ${date.getFullYear()}`}`);
 			box.find(`.${month} tbody`).html(createMonthHTML(date));
 			opt[month] = date;
 			updateSelectableRange();
@@ -2290,4 +2290,4 @@ import './daterangepicker.css';
 			showGap();
 		}
 	};
-})($);
+})($);

package/components/input/wysiwig.tsx

@@ -21,6 +21,7 @@ import './plugins/trumbowyg/modal-issues-fix';
 import 'trumbowyg/plugins/emoji/trumbowyg.emoji.js';
 import 'trumbowyg/plugins/noembed/trumbowyg.noembed.js';
 import 'trumbowyg/plugins/fontsize/trumbowyg.fontsize.js';
+import 'trumbowyg/plugins/lineheight/trumbowyg.lineheight.js';
 import 'trumbowyg/dist/ui/trumbowyg.min.css';
 import 'trumbowyg/dist/plugins/emoji/ui/trumbowyg.emoji.css';
 import '../input/css/wysiwig.css';
@@ -96,6 +97,18 @@ class WysiwigEditorComponent extends TsxComponent<WysiwigEditorArgs> implements
 				},
 				cleanPasteCustom: {
 
+				},
+				lineheight: {
+					sizeList: [
+						'0.9',
+                                                '1.0',
+						'normal',
+                                                '1.2',
+                                                '1.3',
+						'1.5',
+						'2.0'
+					],
+					allowCustomSize: true,
 				},
 				fontsize: {
 					sizeList: [
@@ -132,6 +145,7 @@ class WysiwigEditorComponent extends TsxComponent<WysiwigEditorArgs> implements
 					'foreColor',
 					'backColor',
 				],
+				['lineheight'],
 				['link'],
 				['image'],
 				['emoji'],

package/package.json

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