@flowerforce/flower-react 3.4.0 → 3.4.1-beta.1

package/dist/index.cjs.js

@@ -252,6 +252,7 @@ const FlowerClient = ({ children, name, destroyOnUnmount = true, startId = null,
         wsDevtools,
         isInitialized
     ]);
+    const currentNodeId = prevFlowerNodeId || current;
     const contextValues = React.useMemo(() => ({
         flowName,
         initialData,
@@ -260,11 +261,11 @@ const FlowerClient = ({ children, name, destroyOnUnmount = true, startId = null,
     const prevContextValues = React.useMemo(() => ({
         flowName,
         initialData,
-        currentNode: prevFlowerNodeId
-    }), [flowName, initialData, prevFlowerNodeId]);
+        currentNode: currentNodeId
+    }), [flowName, initialData, currentNodeId]);
     return isInitialized ? (React.createElement(React.Fragment, null,
-        prevFlowerNodeId !== current && typeof prevFlowerNodeId === 'string' && (React.createElement(Provider, { value: prevContextValues }, nodeById[prevFlowerNodeId])),
-        React.createElement(Provider, { value: contextValues }, !isDisabled && nodeById[current]))) : null;
+        React.createElement(Provider, { value: prevContextValues }, nodeById[currentNodeId]),
+        React.createElement(Provider, { value: contextValues }, !isDisabled && current !== currentNodeId && nodeById[current]))) : null;
 };
 const component$c = React.memo(FlowerClient);
 
@@ -406,7 +407,7 @@ function isIntrinsicElement$1(x) {
     return typeof x === 'string';
 }
 //TODO make types for wrapper function props
-function Wrapper$1({ Component, id, flowName, currentNode, validate, asyncDebounce = 0, asyncValidate, asyncInitialError, asyncWaitingError, destroyValue, onBlur = (val) => null, hidden, onUpdate, defaultValue, ...props }) {
+function Wrapper$1({ Component, id, flowName, currentNode, validate, asyncDebounce = 0, asyncValidate, asyncInitialError, asyncWaitingError, destroyValue, onBlur, hidden, onUpdate, defaultValue, ...props }) {
     const dispatch = useDispatch();
     const [customAsyncErrors, setCustomAsyncErrors] = React.useState(asyncValidate && [asyncInitialError]);
     const [isValidating, setIsValidating] = React.useState(undefined);
@@ -455,7 +456,7 @@ function Wrapper$1({ Component, id, flowName, currentNode, validate, asyncDeboun
                 dirty: defaultValue ? !isEqual(val, defaultValue) : true
             }
         });
-    }, [flowNameFromPath, id, onBlur, dispatch, setCustomAsyncErrors, asyncValidate, asyncWaitingError]);
+    }, [flowNameFromPath, id, dispatch, setCustomAsyncErrors, asyncValidate, asyncWaitingError]);
     const onBlurInternal = React.useCallback((e) => {
         setTouched(true);
         onBlur && onBlur(e);
@@ -667,7 +668,8 @@ const makeActionPayloadOnRestart = makeActionPayload(ACTION_TYPES.restart, PAYLA
 const useFlower = ({ flowName: customFlowName, name } = {}) => {
     const dispatch = useDispatch();
     const { flowName: flowNameDefault, initialData } = React.useContext(context);
-    const flowName = customFlowName || name || flowNameDefault;
+    const store = useStore();
+    const flowName = (customFlowName || name || flowNameDefault);
     const nodeId = useSelector(makeSelectCurrentNodeId(flowName ?? ''));
     const startId = useSelector(makeSelectStartNodeId(flowName ?? ''));
     const emitNavigateEvent = React.useCallback(
@@ -720,9 +722,17 @@ const useFlower = ({ flowName: customFlowName, name } = {}) => {
         dispatch({ type: `flower/${type}`, payload });
         emitNavigateEvent({ type, payload });
     }, [dispatch, emitNavigateEvent, flowName]);
+    const getCurrentNodeId = React.useCallback((customFlowName) => {
+        return _get(store.getState(), [
+            'flower',
+            customFlowName || flowName,
+            'current'
+        ]);
+    }, [store, flowName]);
     return {
         flowName,
         nodeId,
+        getCurrentNodeId,
         startId,
         next,
         jump,

package/dist/index.esm.js

@@ -250,6 +250,7 @@ const FlowerClient = ({ children, name, destroyOnUnmount = true, startId = null,
         wsDevtools,
         isInitialized
     ]);
+    const currentNodeId = prevFlowerNodeId || current;
     const contextValues = useMemo(() => ({
         flowName,
         initialData,
@@ -258,11 +259,11 @@ const FlowerClient = ({ children, name, destroyOnUnmount = true, startId = null,
     const prevContextValues = useMemo(() => ({
         flowName,
         initialData,
-        currentNode: prevFlowerNodeId
-    }), [flowName, initialData, prevFlowerNodeId]);
+        currentNode: currentNodeId
+    }), [flowName, initialData, currentNodeId]);
     return isInitialized ? (React.createElement(React.Fragment, null,
-        prevFlowerNodeId !== current && typeof prevFlowerNodeId === 'string' && (React.createElement(Provider, { value: prevContextValues }, nodeById[prevFlowerNodeId])),
-        React.createElement(Provider, { value: contextValues }, !isDisabled && nodeById[current]))) : null;
+        React.createElement(Provider, { value: prevContextValues }, nodeById[currentNodeId]),
+        React.createElement(Provider, { value: contextValues }, !isDisabled && current !== currentNodeId && nodeById[current]))) : null;
 };
 const component$c = memo(FlowerClient);
 
@@ -404,7 +405,7 @@ function isIntrinsicElement$1(x) {
     return typeof x === 'string';
 }
 //TODO make types for wrapper function props
-function Wrapper$1({ Component, id, flowName, currentNode, validate, asyncDebounce = 0, asyncValidate, asyncInitialError, asyncWaitingError, destroyValue, onBlur = (val) => null, hidden, onUpdate, defaultValue, ...props }) {
+function Wrapper$1({ Component, id, flowName, currentNode, validate, asyncDebounce = 0, asyncValidate, asyncInitialError, asyncWaitingError, destroyValue, onBlur, hidden, onUpdate, defaultValue, ...props }) {
     const dispatch = useDispatch();
     const [customAsyncErrors, setCustomAsyncErrors] = useState(asyncValidate && [asyncInitialError]);
     const [isValidating, setIsValidating] = useState(undefined);
@@ -453,7 +454,7 @@ function Wrapper$1({ Component, id, flowName, currentNode, validate, asyncDeboun
                 dirty: defaultValue ? !isEqual(val, defaultValue) : true
             }
         });
-    }, [flowNameFromPath, id, onBlur, dispatch, setCustomAsyncErrors, asyncValidate, asyncWaitingError]);
+    }, [flowNameFromPath, id, dispatch, setCustomAsyncErrors, asyncValidate, asyncWaitingError]);
     const onBlurInternal = useCallback((e) => {
         setTouched(true);
         onBlur && onBlur(e);
@@ -665,7 +666,8 @@ const makeActionPayloadOnRestart = makeActionPayload(ACTION_TYPES.restart, PAYLA
 const useFlower = ({ flowName: customFlowName, name } = {}) => {
     const dispatch = useDispatch();
     const { flowName: flowNameDefault, initialData } = useContext(context);
-    const flowName = customFlowName || name || flowNameDefault;
+    const store = useStore();
+    const flowName = (customFlowName || name || flowNameDefault);
     const nodeId = useSelector(makeSelectCurrentNodeId(flowName ?? ''));
     const startId = useSelector(makeSelectStartNodeId(flowName ?? ''));
     const emitNavigateEvent = useCallback(
@@ -718,9 +720,17 @@ const useFlower = ({ flowName: customFlowName, name } = {}) => {
         dispatch({ type: `flower/${type}`, payload });
         emitNavigateEvent({ type, payload });
     }, [dispatch, emitNavigateEvent, flowName]);
+    const getCurrentNodeId = useCallback((customFlowName) => {
+        return _get(store.getState(), [
+            'flower',
+            customFlowName || flowName,
+            'current'
+        ]);
+    }, [store, flowName]);
     return {
         flowName,
         nodeId,
+        getCurrentNodeId,
         startId,
         next,
         jump,

package/dist/src/components/types/FlowerHooks.d.ts

@@ -55,6 +55,8 @@ type useFlowerActions = {
     jump: (payload: RouteNode) => void;
     /**Use this function to reset the flow data and history */
     restart: (payload?: RouteRestart) => void;
+    /**Get current node by flowName or current flow */
+    getCurrentNodeId: (flowName?: string) => void;
 };
 export type UseFlower = (options?: UseFlowerProps) => useFlowerActions & {
     /**The flow in which the hook is used.*/

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowerforce/flower-react",
-  "version": "3.4.0",
+  "version": "3.4.1-beta.1",
   "description": "FlowerJS components, hooks and utils for React.",
   "repository": {
     "type": "git",
@@ -34,7 +34,7 @@
     "typescript": "^5.4.5"
   },
   "dependencies": {
-    "@flowerforce/flower-core": "3.2.2",
+    "@flowerforce/flower-core": "3.2.3-beta.5",
     "@reduxjs/toolkit": "^2.2.4",
     "lodash": "^4.17.21",
     "react-redux": "^9.1.2",