inviton-powerduck 0.0.158 → 0.0.159

package/common/validation.ts

@@ -1,6 +1,7 @@
 import type { Validation } from '@vuelidate/core';
 import type { PowerduckViewModelBase } from './base-component';
 import type { IValidationSet, ValidationRuleset, ValidationState } from './static-wrappers/interfaces/validation-interface';
+import { Temporal } from '@js-temporal/polyfill';
 import {
 	alpha,
 	alphaNum,
@@ -21,10 +22,11 @@ import {
 	requiredUnless,
 	url,
 } from '@vuelidate/validators';
+import { unref } from 'vue';
 import PowerduckState from '../app/powerduck-state';
+import { capitalize } from './extensions/string-extensions';
 import LocalizedValueHelper from './localized-value-helper';
 import { isNullOrEmpty } from './utils/is-null-or-empty';
-import { capitalize } from './extensions/string-extensions';
 
 const getFirstUnsattisfiedValidatorName = (valProp: Validation): string | null => {
 	const errors = valProp?.$errors || [];
@@ -134,6 +136,43 @@ export class ValidationHelper {
 	}
 }
 
+const customReq = (value: any): boolean => {
+	value = unref(value);
+
+	if (Array.isArray(value)) {
+		return !!value.length;
+	}
+
+	if (value === undefined || value === null) {
+		return false;
+	}
+
+	if (value === false) {
+		return true;
+	}
+
+	if (value instanceof Date) {
+		return !isNaN(value.getTime());
+	}
+
+	if (typeof Temporal !== 'undefined') {
+		if (value instanceof Temporal.PlainDateTime || value instanceof Temporal.PlainDate || value instanceof Temporal.ZonedDateTime || value instanceof Temporal.Instant) {
+			return true;
+		}
+	}
+
+	if (typeof value === 'object') {
+		// eslint-disable-next-line no-unreachable-loop
+		for (const _ in value) {
+			return true;
+		}
+
+		return false;
+	}
+
+	return !!String(value).length;
+};
+
 export class ValidationBuilder {
 	private _validationArgs: any = {};
 
@@ -150,8 +189,30 @@ export class ValidationBuilder {
 		return this;
 	}
 
-	requiredIf?(field: string | ((vm: any, parentVm?: PowerduckViewModelBase) => any)): ValidationBuilder {
-		this._validationArgs.requiredIf = requiredIf(field as string);
+	requiredIf(field: string | ((vm: any, parentVm?: PowerduckViewModelBase) => boolean)): ValidationBuilder {
+		const requireIf = (propOrFunction: boolean | string | ((...args: any[]) => boolean)) => {
+			const validate = (prop: any, val: any) => prop ? customReq(typeof val === 'string' ? val.trim() : val) : true;
+
+			return function (
+				this: any,
+				value: any,
+				parentVM: any,
+			) {
+				if (typeof propOrFunction != 'function') {
+					return validate((propOrFunction), value);
+				}
+
+				const result = propOrFunction.call(
+					this,
+					value,
+					parentVM,
+				);
+				return validate(result, value);
+			};
+		};
+
+		this._validationArgs.requiredIf = requireIf(field);
+
 		return this;
 	}
 

package/components/dropdown/country-dropdown.tsx

@@ -29,7 +29,7 @@ function getFlaggedResult(h, state, originator): void {
 	if (originator == 'mobile') {
 		return (<span>{state.text}</span>);
 	} else {
-		return (<span><span class={`fi fi-${state.dataRow.twoLetters}`}></span>&nbsp;&nbsp;{state.text}</span>);
+		return (<span><span class={`fi fi-${state.twoLetters}`}></span>&nbsp;&nbsp;{state.text}</span>);
 	}
 }
 

package/package.json

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