@fluid-topics/ft-wc-utils 1.1.26 → 1.1.28

package/build/helpers.d.ts

@@ -1,7 +1,7 @@
 import { Optional, Provider } from "./generic-types";
 export declare const delay: (ms: number) => Promise<unknown>;
-export declare function waitUntil(condition: Provider<boolean | Promise<boolean>>, interval?: number, timeout?: number): Promise<void>;
-export declare function waitFor<T>(provider: Provider<Optional<T> | Promise<Optional<T>>>, interval?: number, timeout?: number): Promise<T>;
+export declare function waitUntil(condition: Provider<boolean | Promise<boolean>>, interval?: number, timeout?: Optional<number>): Promise<void>;
+export declare function waitFor<T>(provider: Provider<Optional<T> | Promise<Optional<T>>>, interval?: number, timeout?: Optional<number>): Promise<T>;
 export declare function flatDeep<T>(arr: Array<T>, getChildren: (o: T) => Array<T>): Array<T>;
 export declare function dateReviver(...dateKeys: string[]): (key: string, value: any) => any;
 export declare function parseDate(value: string): Date;

package/build/helpers.js

@@ -1,20 +1,20 @@
 export const delay = (ms) => new Promise(resolve => setTimeout(resolve, ms));
-export async function waitUntil(condition, interval = 5, timeout) {
-    let value = await condition();
+export async function waitUntil(condition, interval = 10, timeout = 20000) {
+    await waitFor(async () => await condition() || undefined, interval, timeout);
+}
+export async function waitFor(provider, interval = 10, timeout = 20000) {
+    let value = await provider();
     let start, now;
     start = now = performance.now();
-    while (!value && (!timeout || now - start < timeout)) {
+    while (value == null && (!timeout || now - start < timeout)) {
         await delay(interval);
-        value = await condition();
+        value = await provider();
         now = performance.now();
     }
     if (value == null) {
         throw new Error("Timeout exceeded");
     }
-}
-export async function waitFor(provider, interval = 5, timeout) {
-    await waitUntil(async () => (await provider()) != null, interval, timeout);
-    return (await provider());
+    return value;
 }
 export function flatDeep(arr, getChildren) {
     return arr.flatMap(o => [o, ...flatDeep(getChildren(o), getChildren)]);

package/build/index.d.ts

@@ -3,6 +3,7 @@ export declare const isSafari: boolean;
 export declare const isTouchScreen: boolean;
 export * from "./CacheRegistry";
 export * from "./CancelablePromise";
+export * from "./ClusteringHelper";
 export * from "./Debouncer";
 export * from "./decorators";
 export * from "./designSystemVariables";

package/build/index.js

@@ -8,6 +8,7 @@ export const isTouchScreen = (('ontouchstart' in window)
     || (navigator.msMaxTouchPoints > 0));
 export * from "./CacheRegistry";
 export * from "./CancelablePromise";
+export * from "./ClusteringHelper";
 export * from "./Debouncer";
 export * from "./decorators";
 export * from "./designSystemVariables";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fluid-topics/ft-wc-utils",
-  "version": "1.1.26",
+  "version": "1.1.28",
   "description": "Internal web components tools",
   "author": "Fluid Topics <devtopics@antidot.net>",
   "license": "ISC",
@@ -14,8 +14,8 @@
   ],
   "dependencies": {
     "@floating-ui/dom": "1.5.3",
-    "@fluid-topics/design-system-variables": "0.0.18",
-    "@fluid-topics/public-api": "1.0.56",
+    "@fluid-topics/design-system-variables": "0.0.20",
+    "@fluid-topics/public-api": "1.0.57",
     "@reduxjs/toolkit": "1.9.5",
     "@types/mark.js": "8.11.12",
     "@webcomponents/scoped-custom-element-registry": "0.0.9",
@@ -23,5 +23,5 @@
     "lit": "3.1.0",
     "mark.js": "8.11.1"
   },
-  "gitHead": "6734976f5a7f6b986917a085be0c38ca3ae562a0"
+  "gitHead": "8c1055ddd23e83efa3833f033a507aa1ab32fecc"
 }