zavadil-ts-common 1.2.61 → 1.2.63

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "zavadil-ts-common",
-	"version": "1.2.61",
+	"version": "1.2.63",
 	"description": "Common types and components for Typescript UI apps.",
 	"main": "dist/index.js",
 	"module": "dist/index.esm.js",

package/src/component/UserAlerts.ts

@@ -6,7 +6,7 @@ export class UserAlerts {
 
 	private maxAlerts: number;
 
-	public maxVisibilitySecs: number;
+	public maxVisibilityMs: number;
 
 	private em: EventManager;
 
@@ -14,9 +14,9 @@ export class UserAlerts {
 
 	public visibleAlerts: Array<UserAlert>;
 
-	constructor(maxAlerts: number = 10, maxVisibilitySecs: number = 5) {
+	constructor(maxAlerts: number = 20, maxVisibilityMs: number = 7000) {
 		this.maxAlerts = maxAlerts;
-		this.maxVisibilitySecs = maxVisibilitySecs;
+		this.maxVisibilityMs = maxVisibilityMs;
 		this.em = new EventManager();
 		this.alerts = [];
 		this.visibleAlerts = [];
@@ -53,12 +53,12 @@ export class UserAlerts {
 	updateVisibility() {
 		this.visibleAlerts.forEach(
 			a => {
-				const elapsedMs = DateUtil.getSinceDurationMs(a.time) || 0;
-				const remainsSecs = this.maxVisibilitySecs - (elapsedMs / 1000);
-				if (remainsSecs > 0) {
-					a.remainsSecs = remainsSecs;
+				const elapsedMs = DateUtil.getSinceDurationMs(a.time) || this.maxVisibilityMs;
+				const remainsMs = this.maxVisibilityMs - elapsedMs;
+				if (remainsMs > 0) {
+					a.remainsMs = remainsMs;
 				} else {
-					a.remainsSecs = undefined;
+					a.remainsMs = undefined;
 					this.hide(a);
 				}
 			}
@@ -72,8 +72,8 @@ export class UserAlerts {
 	};
 
 	add(alert: UserAlert) {
-		if (alert.remainsSecs === undefined) {
-			alert.remainsSecs = this.maxVisibilitySecs;
+		if (alert.remainsMs === undefined) {
+			alert.remainsMs = this.maxVisibilityMs;
 		}
 		this.alerts.push(alert);
 		this.visibleAlerts.push(alert);

package/src/type/UserAlert.ts

@@ -8,5 +8,5 @@ export type UserAlert = {
 	time: Date;
 	type: UserAlertType;
 	message: string;
-	remainsSecs?: number; //remain visible for this amount of seconds
+	remainsMs?: number; //remain visible for this amount of seconds
 }

package/src/util/DateUtil.ts

@@ -1,4 +1,5 @@
 import {ObjectUtil} from "./ObjectUtil";
+import {NumberUtil} from "./NumberUtil";
 
 export class DateUtil {
 
@@ -93,7 +94,7 @@ export class DateUtil {
 		if (hrs > 0) items.push(`${hrs}h`);
 		if (mins > 0) items.push(`${mins}m`);
 		if (secs > 0 && days === 0 && hrs === 0) items.push(`${secs}s`);
-		if (ms > 0 && days === 0 && hrs === 0 && mins === 0) items.push(`${ms}ms`);
+		if (ms > 0 && days === 0 && hrs === 0 && mins === 0) items.push(`${NumberUtil.round(ms, 2)}ms`);
 
 		return items.join(' ');
 	}