@wise/dynamic-flow-client 4.3.8 → 4.3.10

package/build/main.js

@@ -2508,6 +2508,8 @@ var getComponentMultiPersistAsync = (update, performPersistAsync) => (
           ...draft.persistedState.slice(0, index),
           ...draft.persistedState.slice(index + 1)
         ];
+        draft.value.splice(index, 1);
+        draft.files.splice(index, 1);
       });
       throw error;
     });
@@ -2561,9 +2563,17 @@ var debounce = (callback, waitMs) => {
       clearTimer();
     }
   };
+  debouncedFn.isPending = () => timeoutId !== null;
   return debouncedFn;
 };
 
+// src/revamp/domain/components/utils/isOrWasValid.ts
+var isOrWasValid = (getErrors, previous, current) => {
+  const wasValid = getErrors(previous).length === 0 && previous !== null;
+  const isValid = getErrors(current).length === 0;
+  return wasValid || isValid;
+};
+
 // src/revamp/domain/features/refresh/getPerformRefresh.ts
 var getPerformRefresh = (schema, onRefresh) => {
   var _a, _b;
@@ -2576,7 +2586,21 @@ var getPerformRefresh = (schema, onRefresh) => {
   }
   return void 0;
 };
-var getDebouncedPerformRefresh = (performRefresh) => performRefresh ? debounce(performRefresh, 1e3) : void 0;
+var getDebouncedPerformRefresh = (performRefresh, getValidationErrors) => {
+  if (!performRefresh) {
+    return void 0;
+  }
+  const performDebouncedRefresh = debounce(performRefresh, 1e3);
+  const debouncedFn = (prevValue, updatedValue) => {
+    if (isOrWasValid(getValidationErrors, prevValue, updatedValue) || (performDebouncedRefresh == null ? void 0 : performDebouncedRefresh.isPending())) {
+      performDebouncedRefresh == null ? void 0 : performDebouncedRefresh();
+    }
+  };
+  debouncedFn.flush = () => performDebouncedRefresh.flush();
+  debouncedFn.cancel = () => performDebouncedRefresh.cancel();
+  debouncedFn.isPending = () => performDebouncedRefresh.isPending();
+  return debouncedFn;
+};
 
 // src/revamp/domain/features/validationAsync/getComponentValidationAsync.ts
 var getComponentValidationAsync = (update, performValidationAsync) => (
@@ -2627,9 +2651,6 @@ var getComponentValidationAsync = (update, performValidationAsync) => (
   }
 );
 
-// src/revamp/domain/components/utils/isOrWasValid.ts
-var isOrWasValid = (getErrors, previous, current) => getErrors(previous).length === 0 || getErrors(current).length === 0;
-
 // src/revamp/domain/components/NumberInputComponent.ts
 var createNumberInputComponent = (numberInputProps, updateComponent) => {
   const _a = numberInputProps, {
@@ -2651,9 +2672,9 @@ var createNumberInputComponent = (numberInputProps, updateComponent) => {
     "onValueChange",
     "summariser"
   ]);
-  const performDebouncedRefresh = getDebouncedPerformRefresh(performRefresh);
   const update = getInputUpdateFunction(uid, updateComponent);
   const getValidationErrors = getLocalValueValidator(checks);
+  const performDebouncedRefresh = getDebouncedPerformRefresh(performRefresh, getValidationErrors);
   const getAndSetValidationErrors = (currentValue) => {
     const messages = getValidationErrors(currentValue);
     update((draft) => {
@@ -2679,9 +2700,7 @@ var createNumberInputComponent = (numberInputProps, updateComponent) => {
         draft.validationAsyncState.messages = {};
         draft.value = updatedValue;
       });
-      if (isOrWasValid(getValidationErrors, prevValue, updatedValue)) {
-        performDebouncedRefresh == null ? void 0 : performDebouncedRefresh();
-      }
+      performDebouncedRefresh == null ? void 0 : performDebouncedRefresh(prevValue, updatedValue);
       onValueChange();
     },
     async getSubmittableValue() {
@@ -3443,9 +3462,9 @@ var createIntegerInputComponent = (integerInputProps, updateComponent) => {
     "onValueChange",
     "summariser"
   ]);
-  const performDebouncedRefresh = getDebouncedPerformRefresh(performRefresh);
   const update = getInputUpdateFunction(uid, updateComponent);
   const getValidationErrors = getLocalValueValidator(checks);
+  const performDebouncedRefresh = getDebouncedPerformRefresh(performRefresh, getValidationErrors);
   const getAndSetValidationErrors = (currentValue) => {
     const messages = getValidationErrors(currentValue);
     update((draft) => {
@@ -3472,9 +3491,7 @@ var createIntegerInputComponent = (integerInputProps, updateComponent) => {
         draft.validationAsyncState.messages = {};
         draft.value = updatedValue;
       });
-      if (isOrWasValid(getValidationErrors, prevValue, updatedValue)) {
-        performDebouncedRefresh == null ? void 0 : performDebouncedRefresh();
-      }
+      performDebouncedRefresh == null ? void 0 : performDebouncedRefresh(prevValue, updatedValue);
       onValueChange();
     },
     async getSubmittableValue() {
@@ -4076,9 +4093,9 @@ var createTextInputComponent = (textInputProps, updateComponent) => {
     "summariser",
     "value"
   ]);
-  const performDebouncedRefresh = getDebouncedPerformRefresh(performRefresh);
   const update = getInputUpdateFunction(uid, updateComponent);
   const getValidationErrors = getLocalValueValidator(checks);
+  const performDebouncedRefresh = getDebouncedPerformRefresh(performRefresh, getValidationErrors);
   const getAndSetValidationErrors = (currentValue) => {
     const messages = getValidationErrors(currentValue);
     update((draft) => {
@@ -4105,9 +4122,7 @@ var createTextInputComponent = (textInputProps, updateComponent) => {
         draft.validationAsyncState.messages = {};
         draft.value = updatedValue;
       });
-      if (isOrWasValid(getValidationErrors, prevValue, updatedValue)) {
-        performDebouncedRefresh == null ? void 0 : performDebouncedRefresh();
-      }
+      performDebouncedRefresh == null ? void 0 : performDebouncedRefresh(prevValue, updatedValue);
       onValueChange();
     },
     async getSubmittableValue() {
@@ -6357,12 +6372,12 @@ function useDynamicFlowCore(props) {
   );
   const trackEvent = (0, import_react3.useCallback)(
     (eventName, properties) => {
-      var _a2, _b, _c, _d;
-      const stepId = (_c = (_a2 = stepRef.current) == null ? void 0 : _a2.id) != null ? _c : (_b = stepRef.current) == null ? void 0 : _b.key;
-      const analytics = (_d = stepRef.current) == null ? void 0 : _d.analytics;
-      const metadata = __spreadValues(__spreadValues(__spreadValues({
+      var _a2, _b, _c, _d, _e;
+      const stepId = stepRef.current ? (_d = (_c = (_a2 = stepRef.current) == null ? void 0 : _a2.id) != null ? _c : (_b = stepRef.current) == null ? void 0 : _b.key) != null ? _d : "" : null;
+      const analytics = (_e = stepRef.current) == null ? void 0 : _e.analytics;
+      const metadata = __spreadValues(__spreadValues(__spreadValues(__spreadValues({
         flowId
-      }, stepId ? { stepId } : {}), analytics), properties);
+      }, stepId !== null ? { stepId } : {}), stepRef.current ? { stepCount: stepCount.current } : {}), analytics), properties);
       try {
         onEvent == null ? void 0 : onEvent(`Dynamic Flow - ${eventName}`, __spreadValues({}, metadata));
       } catch (e) {
@@ -6374,12 +6389,12 @@ function useDynamicFlowCore(props) {
   const trackCoreEvent = trackEvent;
   const logEvent = (0, import_react3.useCallback)(
     (level, message, properties) => {
-      var _a2, _b, _c;
+      var _a2, _b, _c, _d;
+      const stepId = stepRef.current ? (_d = (_c = (_a2 = stepRef.current) == null ? void 0 : _a2.id) != null ? _c : (_b = stepRef.current) == null ? void 0 : _b.key) != null ? _d : "" : null;
       try {
-        onLog == null ? void 0 : onLog(level, message, __spreadProps(__spreadValues({}, properties), {
-          flowId,
-          stepId: (_c = (_a2 = stepRef.current) == null ? void 0 : _a2.id) != null ? _c : (_b = stepRef.current) == null ? void 0 : _b.key
-        }));
+        onLog == null ? void 0 : onLog(level, message, __spreadValues(__spreadValues(__spreadProps(__spreadValues({}, properties), {
+          flowId
+        }), stepId !== null ? { stepId } : {}), stepRef.current ? { stepCount: stepCount.current } : {}));
       } catch (e) {
       }
     },

package/build/main.mjs

@@ -2465,6 +2465,8 @@ var getComponentMultiPersistAsync = (update, performPersistAsync) => (
           ...draft.persistedState.slice(0, index),
           ...draft.persistedState.slice(index + 1)
         ];
+        draft.value.splice(index, 1);
+        draft.files.splice(index, 1);
       });
       throw error;
     });
@@ -2518,9 +2520,17 @@ var debounce = (callback, waitMs) => {
       clearTimer();
     }
   };
+  debouncedFn.isPending = () => timeoutId !== null;
   return debouncedFn;
 };
 
+// src/revamp/domain/components/utils/isOrWasValid.ts
+var isOrWasValid = (getErrors, previous, current) => {
+  const wasValid = getErrors(previous).length === 0 && previous !== null;
+  const isValid = getErrors(current).length === 0;
+  return wasValid || isValid;
+};
+
 // src/revamp/domain/features/refresh/getPerformRefresh.ts
 var getPerformRefresh = (schema, onRefresh) => {
   var _a, _b;
@@ -2533,7 +2543,21 @@ var getPerformRefresh = (schema, onRefresh) => {
   }
   return void 0;
 };
-var getDebouncedPerformRefresh = (performRefresh) => performRefresh ? debounce(performRefresh, 1e3) : void 0;
+var getDebouncedPerformRefresh = (performRefresh, getValidationErrors) => {
+  if (!performRefresh) {
+    return void 0;
+  }
+  const performDebouncedRefresh = debounce(performRefresh, 1e3);
+  const debouncedFn = (prevValue, updatedValue) => {
+    if (isOrWasValid(getValidationErrors, prevValue, updatedValue) || (performDebouncedRefresh == null ? void 0 : performDebouncedRefresh.isPending())) {
+      performDebouncedRefresh == null ? void 0 : performDebouncedRefresh();
+    }
+  };
+  debouncedFn.flush = () => performDebouncedRefresh.flush();
+  debouncedFn.cancel = () => performDebouncedRefresh.cancel();
+  debouncedFn.isPending = () => performDebouncedRefresh.isPending();
+  return debouncedFn;
+};
 
 // src/revamp/domain/features/validationAsync/getComponentValidationAsync.ts
 var getComponentValidationAsync = (update, performValidationAsync) => (
@@ -2584,9 +2608,6 @@ var getComponentValidationAsync = (update, performValidationAsync) => (
   }
 );
 
-// src/revamp/domain/components/utils/isOrWasValid.ts
-var isOrWasValid = (getErrors, previous, current) => getErrors(previous).length === 0 || getErrors(current).length === 0;
-
 // src/revamp/domain/components/NumberInputComponent.ts
 var createNumberInputComponent = (numberInputProps, updateComponent) => {
   const _a = numberInputProps, {
@@ -2608,9 +2629,9 @@ var createNumberInputComponent = (numberInputProps, updateComponent) => {
     "onValueChange",
     "summariser"
   ]);
-  const performDebouncedRefresh = getDebouncedPerformRefresh(performRefresh);
   const update = getInputUpdateFunction(uid, updateComponent);
   const getValidationErrors = getLocalValueValidator(checks);
+  const performDebouncedRefresh = getDebouncedPerformRefresh(performRefresh, getValidationErrors);
   const getAndSetValidationErrors = (currentValue) => {
     const messages = getValidationErrors(currentValue);
     update((draft) => {
@@ -2636,9 +2657,7 @@ var createNumberInputComponent = (numberInputProps, updateComponent) => {
         draft.validationAsyncState.messages = {};
         draft.value = updatedValue;
       });
-      if (isOrWasValid(getValidationErrors, prevValue, updatedValue)) {
-        performDebouncedRefresh == null ? void 0 : performDebouncedRefresh();
-      }
+      performDebouncedRefresh == null ? void 0 : performDebouncedRefresh(prevValue, updatedValue);
       onValueChange();
     },
     async getSubmittableValue() {
@@ -3400,9 +3419,9 @@ var createIntegerInputComponent = (integerInputProps, updateComponent) => {
     "onValueChange",
     "summariser"
   ]);
-  const performDebouncedRefresh = getDebouncedPerformRefresh(performRefresh);
   const update = getInputUpdateFunction(uid, updateComponent);
   const getValidationErrors = getLocalValueValidator(checks);
+  const performDebouncedRefresh = getDebouncedPerformRefresh(performRefresh, getValidationErrors);
   const getAndSetValidationErrors = (currentValue) => {
     const messages = getValidationErrors(currentValue);
     update((draft) => {
@@ -3429,9 +3448,7 @@ var createIntegerInputComponent = (integerInputProps, updateComponent) => {
         draft.validationAsyncState.messages = {};
         draft.value = updatedValue;
       });
-      if (isOrWasValid(getValidationErrors, prevValue, updatedValue)) {
-        performDebouncedRefresh == null ? void 0 : performDebouncedRefresh();
-      }
+      performDebouncedRefresh == null ? void 0 : performDebouncedRefresh(prevValue, updatedValue);
       onValueChange();
     },
     async getSubmittableValue() {
@@ -4033,9 +4050,9 @@ var createTextInputComponent = (textInputProps, updateComponent) => {
     "summariser",
     "value"
   ]);
-  const performDebouncedRefresh = getDebouncedPerformRefresh(performRefresh);
   const update = getInputUpdateFunction(uid, updateComponent);
   const getValidationErrors = getLocalValueValidator(checks);
+  const performDebouncedRefresh = getDebouncedPerformRefresh(performRefresh, getValidationErrors);
   const getAndSetValidationErrors = (currentValue) => {
     const messages = getValidationErrors(currentValue);
     update((draft) => {
@@ -4062,9 +4079,7 @@ var createTextInputComponent = (textInputProps, updateComponent) => {
         draft.validationAsyncState.messages = {};
         draft.value = updatedValue;
       });
-      if (isOrWasValid(getValidationErrors, prevValue, updatedValue)) {
-        performDebouncedRefresh == null ? void 0 : performDebouncedRefresh();
-      }
+      performDebouncedRefresh == null ? void 0 : performDebouncedRefresh(prevValue, updatedValue);
       onValueChange();
     },
     async getSubmittableValue() {
@@ -6314,12 +6329,12 @@ function useDynamicFlowCore(props) {
   );
   const trackEvent = useCallback2(
     (eventName, properties) => {
-      var _a2, _b, _c, _d;
-      const stepId = (_c = (_a2 = stepRef.current) == null ? void 0 : _a2.id) != null ? _c : (_b = stepRef.current) == null ? void 0 : _b.key;
-      const analytics = (_d = stepRef.current) == null ? void 0 : _d.analytics;
-      const metadata = __spreadValues(__spreadValues(__spreadValues({
+      var _a2, _b, _c, _d, _e;
+      const stepId = stepRef.current ? (_d = (_c = (_a2 = stepRef.current) == null ? void 0 : _a2.id) != null ? _c : (_b = stepRef.current) == null ? void 0 : _b.key) != null ? _d : "" : null;
+      const analytics = (_e = stepRef.current) == null ? void 0 : _e.analytics;
+      const metadata = __spreadValues(__spreadValues(__spreadValues(__spreadValues({
         flowId
-      }, stepId ? { stepId } : {}), analytics), properties);
+      }, stepId !== null ? { stepId } : {}), stepRef.current ? { stepCount: stepCount.current } : {}), analytics), properties);
       try {
         onEvent == null ? void 0 : onEvent(`Dynamic Flow - ${eventName}`, __spreadValues({}, metadata));
       } catch (e) {
@@ -6331,12 +6346,12 @@ function useDynamicFlowCore(props) {
   const trackCoreEvent = trackEvent;
   const logEvent = useCallback2(
     (level, message, properties) => {
-      var _a2, _b, _c;
+      var _a2, _b, _c, _d;
+      const stepId = stepRef.current ? (_d = (_c = (_a2 = stepRef.current) == null ? void 0 : _a2.id) != null ? _c : (_b = stepRef.current) == null ? void 0 : _b.key) != null ? _d : "" : null;
       try {
-        onLog == null ? void 0 : onLog(level, message, __spreadProps(__spreadValues({}, properties), {
-          flowId,
-          stepId: (_c = (_a2 = stepRef.current) == null ? void 0 : _a2.id) != null ? _c : (_b = stepRef.current) == null ? void 0 : _b.key
-        }));
+        onLog == null ? void 0 : onLog(level, message, __spreadValues(__spreadValues(__spreadProps(__spreadValues({}, properties), {
+          flowId
+        }), stepId !== null ? { stepId } : {}), stepRef.current ? { stepCount: stepCount.current } : {}));
       } catch (e) {
       }
     },

package/build/types/revamp/domain/components/utils/debounce.d.ts

@@ -2,5 +2,6 @@ export interface DebouncedFunc<T extends (...args: Parameters<T>) => ReturnType<
     (...args: Parameters<T>): void;
     cancel: () => void;
     flush: () => void;
+    isPending: () => boolean;
 }
 export declare const debounce: <T extends (...args: Parameters<T>) => ReturnType<T>>(callback: T, waitMs: number) => DebouncedFunc<T>;

package/build/types/revamp/domain/features/refresh/getPerformRefresh.d.ts

@@ -1,5 +1,12 @@
 import type { Schema } from '@wise/dynamic-flow-types/build/next';
-import type { OnRefresh } from '../../types';
+import type { LocalValue, OnRefresh } from '../../types';
 export type PerformRefresh = () => void;
 export declare const getPerformRefresh: (schema: Schema, onRefresh: OnRefresh) => PerformRefresh | undefined;
-export declare const getDebouncedPerformRefresh: (performRefresh: PerformRefresh | undefined) => import("../../components/utils/debounce").DebouncedFunc<PerformRefresh> | undefined;
+type DebouncedPerformRefresh<V extends LocalValue> = {
+    (prevValue: V, updatedValue: V): void;
+    cancel: () => void;
+    flush: () => void;
+    isPending: () => boolean;
+};
+export declare const getDebouncedPerformRefresh: <V extends LocalValue>(performRefresh: PerformRefresh | undefined, getValidationErrors: (value: V) => string[]) => DebouncedPerformRefresh<V> | undefined;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wise/dynamic-flow-client",
-  "version": "4.3.8",
+  "version": "4.3.10",
   "description": "Dynamic Flow web client",
   "license": "Apache-2.0",
   "main": "./build/main.js",
@@ -85,8 +85,8 @@
     "tsx": "4.19.3",
     "typescript": "5.8.3",
     "webpack": "5.98.0",
-    "@wise/dynamic-flow-fixtures": "0.0.1",
-    "@wise/dynamic-flow-renderers": "0.0.0"
+    "@wise/dynamic-flow-renderers": "0.0.0",
+    "@wise/dynamic-flow-fixtures": "0.0.1"
   },
   "peerDependencies": {
     "@transferwise/components": "^46.92.0",