feat: enabled sync rules execution for controls disable and elements …

…hiding
ballerine-io · Jan 20, 2025 · 50829ad · 50829ad
1 parent 5ef9151
commit 50829ad
Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/...ages/ui/src/components/organisms/Form/DynamicForm/hooks/external/useControl/useControl.ts b/...ages/ui/src/components/organisms/Form/DynamicForm/hooks/external/useControl/useControl.ts
@@ -15,7 +15,7 @@ export const useControl = (element: IFormElement<any, any>, stack?: TDeepthLevel
   const disabledRulesResult = useRuleEngine(valuesAndMetadata, {
     rules: useRules(element.disable, stack),
     runOnInitialize: true,
-    executionDelay: 500,
+    executeRulesSync: true,
   });
 
   const isDisabled = useMemo(() => {

diff --git a/...ages/ui/src/components/organisms/Form/DynamicForm/hooks/external/useElement/useElement.ts b/...ages/ui/src/components/organisms/Form/DynamicForm/hooks/external/useElement/useElement.ts
@@ -6,6 +6,7 @@ import { IFormElement } from '../../../types';
 import { usePriorityFields } from '../../internal/usePriorityFields';
 import { useElementId } from '../useElementId';
 import { useRules } from '../useRules';
+import { useClearValueOnUnmount } from './hooks/useClearValueOnUnmount';
 
 export const useElement = <TElements extends string, TParams>(
   element: IFormElement<TElements, TParams>,
@@ -16,7 +17,7 @@ export const useElement = <TElements extends string, TParams>(
   const hiddenRulesResult = useRuleEngine(valuesAndMetadata, {
     rules: useRules(element.hidden, stack),
     runOnInitialize: true,
-    executionDelay: 500,
+    executeRulesSync: true,
   });
 
   const isHidden = useMemo(() => {
@@ -25,7 +26,7 @@ export const useElement = <TElements extends string, TParams>(
     return hiddenRulesResult.some(result => result.result === true);
   }, [hiddenRulesResult]);
 
-  // useClearValueOnUnmount(element, isHidden);
+  useClearValueOnUnmount(element, isHidden);
 
   return {
     id: useElementId(element, stack),

diff --git a/packages/ui/src/components/organisms/Form/DynamicForm/hooks/external/useField/useField.ts b/packages/ui/src/components/organisms/Form/DynamicForm/hooks/external/useField/useField.ts
@@ -9,7 +9,7 @@ import { useElementId } from '../useElementId';
 import { useRules } from '../useRules';
 import { useValueDestination } from '../useValueDestination';
 
-export const useField = <TValue>(element: IFormElement<any, any>, stack: TDeepthLevelStack) => {
+export const useField = <TValue>(element: IFormElement<any, any>, stack?: TDeepthLevelStack) => {
   const fieldId = useElementId(element, stack);
   const valueDestination = useValueDestination(element, stack);