intelliwaketssveltekitv25 0.1.119 → 0.1.121

package/dist/Functions.d.ts

@@ -1,3 +1,4 @@
+import { type TNumberStringOptions } from '@solidbasisventures/intelliwaketsfoundation';
 import type { HTMLInputAttributes } from 'svelte/elements';
 import type { ActionArray } from './useActions';
 export declare const KEY_UP_ARROW = 38;
@@ -201,18 +202,11 @@ export declare function IsMobileOrTablet(): boolean;
  */
 export declare function DownloadString(filename: string, text: string): void;
 export declare function HandleKeyDownNumerics(event: KeyboardEvent, allowDecimals?: boolean, allowNegative?: boolean): void;
-export type TInputNumberAttributes = Omit<HTMLInputAttributes, 'value' | 'this' | 'onchange' | 'min' | 'max' | 'use'> & {
+export type TInputNumberAttributes = Omit<HTMLInputAttributes, 'value' | 'this' | 'onchange' | 'use'> & {
     value: number | null;
     onchange?: (value: number | null) => void;
     inputClass?: string;
-    decimals?: number;
-    decimalsMax?: number;
-    min?: number | null;
-    max?: number | null;
-    prefix?: string;
-    suffix?: string;
-    shiftDigits?: number;
     allowNegative?: boolean;
     use?: ActionArray;
     thisRef?: HTMLInputElement;
-};
+} & TNumberStringOptions;

package/dist/InputNumber.svelte

@@ -3,8 +3,7 @@
 		CleanNumber,
 		CleanNumberNull,
 		CleanNumbers,
-		ToDigits,
-		ToDigitsMax
+		ToNumberString
 	} from '@solidbasisventures/intelliwaketsfoundation'
 	import { tick } from 'svelte'
 	import { HandleKeyDownNumerics, type TInputNumberAttributes } from './Functions'
@@ -15,14 +14,20 @@
 		class: clazz = '',
 		inputClass = '',
 		onchange,
-		decimals,
-		decimalsMax,
-		min = null,
-		max = null,
+		currency,
+		percent,
+		fixedDecimals,
+		minDecimals,
+		maxDecimals,
+		zeroBlank,
+		zeroDash,
+		nullBlank,
+		nullDash,
 		prefix,
 		suffix,
+		min,
+		max,
 		allowNegative,
-		shiftDigits = 0,
 		use = [],
 		thisRef = $bindable<HTMLInputElement>(),
 		...otherProps
@@ -30,10 +35,13 @@
 
 	let displayValue = $state('')
 	let isFocused = $state(false)
+	let shiftDigits = $derived(!!percent ? 2 : 0)
 	let displayMultiplier = $derived(shiftDigits === 0 ? 1 : shiftDigits > 0 ? CleanNumber(`1${'0'.repeat(shiftDigits)}`) : CleanNumber(`.${'0'.repeat(Math.abs(shiftDigits) + 1)}1`))
-	let constrainDecimals = $derived(decimalsMax ?? decimals ?? 0)
+	let constrainDecimals = $derived(fixedDecimals ?? maxDecimals ?? minDecimals ?? (currency ? 2 : 0))
 	let useDecimals = $derived(!shiftDigits ? constrainDecimals : CleanNumbers(0, constrainDecimals, shiftDigits))
 	let plainTextMode = $derived(!!otherProps.readonly || !!otherProps.disabled)
+	let usePrefix = $derived(prefix ?? (currency ? '$' : ''))
+	let useSuffix = $derived(suffix ?? (percent ? '%' : ''))
 
 	function refreshDisplayValue(useValue: number | null) {
 		if (!isFocused) {
@@ -44,18 +52,17 @@
 						newDisplayValue = !!otherProps.required ? '0' : ''
 					} else {
 						const workingValue = useValue * displayMultiplier
-						if (decimalsMax) {
-							newDisplayValue = ToDigitsMax(workingValue, decimalsMax, decimals)
-						} else if (decimals) {
-							newDisplayValue = ToDigits(workingValue, decimals)
-						} else {
-							newDisplayValue = ToDigits(workingValue)
-						}
-					}
-
-					if (plainTextMode) {
-						if (prefix) newDisplayValue = `${prefix} ${newDisplayValue}`
-						if (suffix) newDisplayValue = `${newDisplayValue} ${suffix}`
+						newDisplayValue = ToNumberString(workingValue, {
+							currency: !!plainTextMode && currency,
+							percent: !!plainTextMode && percent,
+							fixedDecimals,
+							minDecimals,
+							maxDecimals,
+							zeroBlank,
+							zeroDash,
+							nullBlank,
+							nullDash
+						})
 					}
 
 					if (displayValue !== newDisplayValue) {
@@ -79,16 +86,19 @@
 			if (onchange) onchange(numericValue)
 		} else if (!isNaN(numericValue)) {
 			numericValue /= displayMultiplier
-			if (min !== null) numericValue = Math.max(numericValue, min)
-			if (max !== null) numericValue = Math.min(numericValue, max)
+			const useMin = CleanNumberNull(min)
+			if (useMin !== null) numericValue = Math.max(numericValue, useMin)
+			const useMax = CleanNumberNull(max)
+			if (useMax !== null) numericValue = Math.min(numericValue, useMax)
 			value = CleanNumber(numericValue, useDecimals)
+
 			if (onchange) onchange(numericValue)
 		}
 	}
 
 	let inputStyle = $derived([
-		!!prefix ? `padding-left: ${0.75 + (prefix.length * 0.5)}em;` : '',
-		!!suffix ? `padding-right: ${0.75 + (suffix.length * 0.5)}em;` : ''
+		!!usePrefix ? `padding-left: ${0.75 + (usePrefix.length * 0.5)}em;` : '',
+		!!useSuffix ? `padding-right: ${0.75 + (useSuffix.length * 0.5)}em;` : ''
 	].join(' ').trim())
 
 	// 		pattern={!!constrainDecimals ? "[0-9,]*[.,]?[0-9]+" : "[0-9,]*"}
@@ -119,11 +129,11 @@
 		bind:this={thisRef}
 	/>
 	{#if !plainTextMode}
-		{#if prefix}
-			<div class="absolute pointer-events-none left-1 top-1/2 -translate-y-1/2">{prefix}</div>
+		{#if usePrefix}
+			<div class="absolute pointer-events-none left-1 top-1/2 -translate-y-1/2">{usePrefix}</div>
 		{/if}
-		{#if suffix}
-			<div class="absolute pointer-events-none right-1 top-1/2 -translate-y-1/2">{suffix}</div>
+		{#if useSuffix}
+			<div class="absolute pointer-events-none right-1 top-1/2 -translate-y-1/2">{useSuffix}</div>
 		{/if}
 	{/if}
 </div>

package/dist/index.d.ts

@@ -11,8 +11,6 @@ import DropDownControl from './DropDownControl.svelte';
 import EllipsesTruncate from './EllipsesTruncate.svelte';
 import Icon from './Icon.svelte';
 import InputNumberScroll from './InputNumberScroll.svelte';
-import InputPercent from './InputPercent.svelte';
-import InputCurrency from './InputCurrency.svelte';
 import InputNumber from './InputNumber.svelte';
 import ListGroupItems from './ListGroupItems.svelte';
 import DisplayHTML from './DisplayHTML.svelte';
@@ -60,8 +58,6 @@ export { DropDownControl };
 export { EllipsesTruncate };
 export { Icon };
 export { InputNumberScroll };
-export { InputPercent };
-export { InputCurrency };
 export { InputNumber };
 export { ListGroupItems };
 export { MasterDetailLayout };

package/dist/index.js

@@ -12,8 +12,6 @@ import DropDownControl from './DropDownControl.svelte';
 import EllipsesTruncate from './EllipsesTruncate.svelte';
 import Icon from './Icon.svelte';
 import InputNumberScroll from './InputNumberScroll.svelte';
-import InputPercent from './InputPercent.svelte';
-import InputCurrency from './InputCurrency.svelte';
 import InputNumber from './InputNumber.svelte';
 import ListGroupItems from './ListGroupItems.svelte';
 import DisplayHTML from './DisplayHTML.svelte';
@@ -61,8 +59,6 @@ export { DropDownControl };
 export { EllipsesTruncate };
 export { Icon };
 export { InputNumberScroll };
-export { InputPercent };
-export { InputCurrency };
 export { InputNumber };
 export { ListGroupItems };
 export { MasterDetailLayout };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "intelliwaketssveltekitv25",
-  "version": "0.1.119",
+  "version": "0.1.121",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -14,7 +14,7 @@
     "!dist/**/*.spec.*"
   ],
   "peerDependencies": {
-    "@solidbasisventures/intelliwaketsfoundation": "^5.12.63",
+    "@solidbasisventures/intelliwaketsfoundation": "^5.12.64",
     "@sveltejs/kit": "^2.21.4",
     "svelte": "^5.33.19"
   },

package/dist/InputCurrency.svelte

@@ -1,19 +0,0 @@
-<script lang="ts">
-	import InputNumber from './InputNumber.svelte'
-	import type { TInputNumberAttributes } from './Functions'
-
-	let {
-		value = $bindable(),
-		decimals = 2,
-		thisRef = $bindable<HTMLInputElement>(),
-		...otherProps
-	}: TInputNumberAttributes = $props()
-
-</script>
-
-<InputNumber bind:value
-						 bind:thisRef
-						 {decimals}
-						 {...otherProps}
-						 prefix="$"
-/>

package/dist/InputCurrency.svelte.d.ts

@@ -1,4 +0,0 @@
-import type { TInputNumberAttributes } from './Functions';
-declare const InputCurrency: import("svelte").Component<TInputNumberAttributes, {}, "value" | "thisRef">;
-type InputCurrency = ReturnType<typeof InputCurrency>;
-export default InputCurrency;

package/dist/InputPercent.svelte

@@ -1,20 +0,0 @@
-<script lang="ts">
-	import InputNumber from './InputNumber.svelte'
-	import type { TInputNumberAttributes } from './Functions'
-
-	let {
-		value = $bindable(),
-		decimals = 0,
-		thisRef = $bindable<HTMLInputElement>(),
-		...otherProps
-	}: TInputNumberAttributes = $props()
-
-</script>
-
-<InputNumber bind:value
-						 {decimals}
-						 bind:thisRef
-						 {...otherProps}
-						 shiftDigits={2}
-						 suffix="%"
-/>

package/dist/InputPercent.svelte.d.ts

@@ -1,4 +0,0 @@
-import type { TInputNumberAttributes } from './Functions';
-declare const InputPercent: import("svelte").Component<TInputNumberAttributes, {}, "value" | "thisRef">;
-type InputPercent = ReturnType<typeof InputPercent>;
-export default InputPercent;