@zeedhi/common 3.0.2 → 3.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zeedhi/common",
-  "version": "3.0.2",
+  "version": "3.0.4",
   "description": "Zeedhi Common",
   "author": "Zeedhi <zeedhi@teknisa.com>",
   "license": "ISC",
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "@zeedhi/autonumeric": "^4.6.3",
-    "@zeedhi/core": "^3.0.2",
+    "@zeedhi/core": "^3.0.4",
     "lodash.clonedeep": "^4.5.0",
     "lodash.debounce": "^4.0.8",
     "lodash.get": "^4.4.2",
@@ -42,5 +42,5 @@
     "lodash.times": "^4.3.2",
     "mockdate": "^3.0.5"
   },
-  "gitHead": "3998ba0d7d1747ed341a90f01839d8de065d6c37"
+  "gitHead": "7acd4545ec3846bc0918899b09877e5cb08c5b4c"
 }

package/src/components/index.ts

@@ -175,8 +175,6 @@ export * from './zd-grid-editable';
 
 export * from './zd-tree-grid';
 
-export * from './tek-grid';
-
 export * from './zd-checkbox-multiple/checkbox-multiple';
 export * from './zd-checkbox-multiple/interfaces';
 

package/src/components/zd-date-input/date-input.ts

@@ -94,6 +94,8 @@ export class DateInput extends TextInput implements IDateInput {
 
 	protected isSimpleDisplay!: boolean;
 
+	public inputMode?: string = 'none';
+
 	/* istanbul ignore next */
 	/**
 	 * Creates a new Date.
@@ -167,6 +169,10 @@ export class DateInput extends TextInput implements IDateInput {
 		this.internalDisplayValue = this.formatter(value);
 		this.internalValue = value;
 
+		if (!value) {
+			this.dateObject = null;
+			return;
+		}
 		if (this.isValidFormatDate(value, this.dateFormat)) {
 			this.dateObject = dayjs(value, this.dateFormat);
 		}

package/src/components/zd-date-range/date-range.ts

@@ -109,6 +109,8 @@ export class DateRange extends TextInput implements IDateRange {
 
 	protected isSimpleDisplay!: boolean;
 
+	public inputMode?: string | undefined = 'none';
+
 	/* istanbul ignore next */
 	/**
 	 * Creates a new Date.
@@ -200,20 +202,54 @@ export class DateRange extends TextInput implements IDateRange {
 		this.value = this.internalValue; // forces value accessor to be called if necessary
 	}
 
-	get value(): any {
+	get value(): string[] {
 		return this.internalValue;
 	}
 
-	set value(value: any) {
-		if (this.internalValue !== value) {
-			this.internalDisplayValue = this.formatter(value);
-			this.internalValue = value;
-		}
-		if (value === null) {
+	set value(value: unknown) {
+		if (!Array.isArray(value) && value !== null && value !== undefined) return;
+
+		if (!value || value.length === 0) {
 			this.internalValue = [];
+			this.internalDisplayValue = '';
+			this.dateObject = [];
+			return;
+		}
+
+		if (this.internalValue === value) return;
+
+		this.internalDisplayValue = this.formatter(value);
+		this.internalValue = value;
+
+		const [startDate, endDate] = value;
+		const isStartValid = this.isValidFormatDate(startDate, this.dateFormat);
+		// if end date is not defined, no need to validate it
+		const isEndValid = !endDate || this.isValidFormatDate(endDate, this.dateFormat);
+		const areDatesValid = isStartValid && isEndValid;
+
+		if (areDatesValid) {
+			this.dateObject = this.getDatesInRange(startDate, endDate);
 		}
 	}
 
+	/**
+	 * Returns all days ranging from start to end as dayjs objects
+	 * @returns an array of dayjs objects containing all days between start and end
+	 */
+	private getDatesInRange(startDateStr: string, endDateStr?: string): dayjs.Dayjs[] {
+		const dates: dayjs.Dayjs[] = [];
+		let startDate = dayjs(startDateStr, this.dateFormat);
+		if (!endDateStr) return [startDate];
+
+		const endDate = dayjs(endDateStr, this.dateFormat);
+
+		while (startDate.isBefore(endDate) || startDate.isSame(endDate)) {
+			dates.push(startDate);
+			startDate = startDate.add(1, 'day');
+		}
+		return dates;
+	};
+
 	/**
 	 * Assign the updated mask to mask property
 	 */
@@ -244,12 +280,12 @@ export class DateRange extends TextInput implements IDateRange {
 			this.internalDisplayValue = displayValue;
 			this.internalValue = this.parser(displayValue);
 			this.dateError = false;
-			if (lastValue !== this.displayValue) this.change(this.value);
+			if (lastValue !== this.displayValue) this.change();
 		} else {
 			if (!displayValue) {
 				this.internalDisplayValue = displayValue;
 				this.internalValue = [];
-				if (lastValue !== this.displayValue) this.change(this.value);
+				if (lastValue !== this.displayValue) this.change();
 			}
 			this.dateError = !!displayValue;
 		}
@@ -307,7 +343,7 @@ export class DateRange extends TextInput implements IDateRange {
 		const lastValue: string[] = this.value;
 		this.dateError = false;
 		this.value = this.parseISODateRangeValue(newValue);
-		if (!Utils.isEqual(lastValue, this.value)) this.change(this.value);
+		if (!Utils.isEqual(lastValue, this.value)) this.change();
 	}
 
 	public formatISODateRangeValue(dates: string[] | string): string[] {
@@ -489,7 +525,7 @@ export class DateRange extends TextInput implements IDateRange {
 			.map((obj) => obj.format(this.dateFormat));
 	}
 
-	private dateObject: (dayjs.Dayjs | null)[] = [null, null];
+	private dateObject: (dayjs.Dayjs | null)[] = [];
 
 	public getNativeDate() {
 		return this.dateObject.filter((obj): obj is dayjs.Dayjs => obj !== null).map((obj) => obj.toDate());

package/src/components/zd-grid-editable/index.ts

@@ -5,3 +5,4 @@ export * from './grid-editable-controller';
 export * from './grid-editable-events';
 export * from './grid-editable';
 export * from './interfaces';
+export * from './keymap-editing';

package/src/components/zd-text-input/interfaces.ts

@@ -22,4 +22,5 @@ export interface ITextInput extends IInput {
 	suffix?: string;
 	valueWithPrefix?: boolean;
 	valueWithSuffix?: boolean;
+	inputMode?: string;
 }

package/src/components/zd-text-input/text-input.ts

@@ -66,6 +66,8 @@ export class TextInput extends Input implements ITextInput {
 	 */
 	public valueWithSuffix: boolean = textInputDefaults.valueWithSuffix;
 
+	public inputMode?: string | undefined;
+
 	protected formatterFn = FormatterParserProvider.getFormatter('ZdTextInput');
 
 	protected parserFn = FormatterParserProvider.getParser('ZdTextInput');
@@ -86,6 +88,7 @@ export class TextInput extends Input implements ITextInput {
 		this.type = props.type || this.type;
 		this.valueWithPrefix = this.getInitValue('valueWithPrefix', props.valueWithPrefix, this.valueWithPrefix);
 		this.valueWithSuffix = this.getInitValue('valueWithSuffix', props.valueWithSuffix, this.valueWithSuffix);
+		this.inputMode = this.getInitValue('inputMode', props.inputMode, this.inputMode);
 	}
 
 	public onCreated(): void {

package/src/components/zd-time/time.ts

@@ -1,4 +1,4 @@
-import { Config, FormatterParserProvider, I18n, Mask, dayjs } from '@zeedhi/core';
+import { Config, FormatterParserProvider, I18n, Mask, Utils, dayjs } from '@zeedhi/core';
 import isUndefined from 'lodash.isundefined';
 import { InputFactory } from '../zd-input/input-factory';
 import { TextInput } from '../zd-text-input/text-input';
@@ -95,6 +95,8 @@ export class Time extends TextInput implements ITime {
 
 	protected timeError = false;
 
+	public inputMode?: string | undefined = 'none';
+
 	/**
 	 * Create a new Time Picker.
 	 * @param props Time properties
@@ -312,6 +314,10 @@ export class Time extends TextInput implements ITime {
 		this.removeTimeMask();
 		this.setTimeValue(this.formatter(this.value));
 		super.blur(event, element);
+
+		if (!Utils.isMobile()) {
+			this.showTimePicker = false;
+		}
 	}
 
 	public focus(event: Event, element: any) {

package/src/error/index.ts

@@ -1,2 +1,3 @@
 export * from './zeedhi-error';
 export * from './delete-rows';
+export * from './non-initialized'

package/src/index.ts

@@ -4,6 +4,7 @@ import AutoNumeric  from '@zeedhi/autonumeric';
 export * from './components';
 export * from './services';
 export * from './utils';
+export * from './error';
 
 Icons.addIcons({
 	add: 'mdi-plus-box',

package/src/utils/index.ts

@@ -2,9 +2,6 @@ export * from './theme/theme';
 export * from './icons/icons';
 export * from './data-value-out';
 export * from './unique-by/unique-by';
-export * from './is-filled-object/is-filled-object';
 export * from './datasource-searcher';
 export * from './omit/omit';
 export * from './tree-data-structure';
-export * from './is-nil';
-export * from './config/config';

package/src/components/tek-grid/columns-searcher.ts

@@ -1,22 +0,0 @@
-import { IDictionary } from '@zeedhi/core';
-import { IColumnsSearcher, ITekGridColumn } from './interfaces';
-
-export class ColumnsSearcher implements IColumnsSearcher {
-	async searchColumn(columns: ITekGridColumn[], search: string): Promise<IDictionary<(string | number)[]>> {
-		const lookupColumns = columns.filter((column) => !!column.componentProps?.datasource && !column.skipLookupSearch);
-		const searchJoin: IDictionary<Array<string | number>> = {};
-
-		if (search) {
-			const promises = lookupColumns.map(async (column) => {
-				const searchData = await column.memorySearch(search);
-
-				const lookupId = column.componentProps!.datasource.uniqueKey;
-				searchJoin[column.name] = searchData.map((row: IDictionary) => row[lookupId]);
-			});
-
-			await Promise.all(promises);
-		}
-
-		return searchJoin;
-	}
-}

package/src/components/tek-grid/dynamic-filter-datasource-factory.ts

@@ -1,20 +0,0 @@
-import { Datasource, DatasourceFactory, IDictionary } from '@zeedhi/core';
-import { IDynamicFilterDatasourceFactory } from './interfaces';
-
-export class DynamicFilterDatasourceFactory implements IDynamicFilterDatasourceFactory {
-	factory(options: IDictionary<boolean>): Datasource {
-		return DatasourceFactory.factory({
-			data: this.getFilterOptionsData(options),
-			loadAll: true,
-			translate: ['text'],
-		});
-	}
-
-	private getFilterOptionsData(options: IDictionary<boolean>): IDictionary<any>[] {
-		const optionsKeys = Object.keys(options);
-		return optionsKeys.map((item) => ({
-			text: `TEKGRID_${item}`,
-			value: item,
-		}));
-	}
-}

package/src/components/tek-grid/filter-helper.ts

@@ -1,20 +0,0 @@
-import { DateHelper } from '@zeedhi/core';
-import { TekGridColumn } from '..';
-
-export class TekFilterHelper {
-	public static getLabel(name: string) {
-		return DateHelper.getLabel(name);
-	}
-
-	public static getValue(name: string, column: TekGridColumn) {
-		return DateHelper.getValue(name, column.componentProps.dateFormat);
-	}
-
-	public static register(name: string, label: string, fn: () => Date | [Date, Date]) {
-		DateHelper.register(name, label, fn);
-	}
-
-	public static unregister(name: string) {
-		DateHelper.unregister(name);
-	}
-}