@flowerforce/flower-react 3.0.1-beta.1 → 3.0.1-beta.2

package/dist/index.cjs.js

@@ -227,8 +227,9 @@ const FlowerClient = ({
   }, [dispatch, flowName, current, isDisabled, store, wsDevtools, isInitialized]);
   const contextValues = React.useMemo(() => ({
     flowName,
+    initialData: _initialData,
     currentNode: current
-  }), [flowName, current]);
+  }), [flowName, _initialData, current]);
   return isInitialized ? ( /*#__PURE__*/React.createElement(Provider, {
     value: contextValues
   }, prevFlowerNodeId !== current && typeof prevFlowerNodeId === 'string' && nodeById[prevFlowerNodeId], !isDisabled && nodeById[current])) : null;
@@ -351,29 +352,22 @@ const component$6 = /*#__PURE__*/React.memo(FlowerRoute);
 component$6.displayName = 'FlowerRoute';
 
 function _extends() {
-  _extends = Object.assign ? Object.assign.bind() : function (target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i];
-      for (var key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          target[key] = source[key];
-        }
-      }
+  return _extends = Object.assign ? Object.assign.bind() : function (n) {
+    for (var e = 1; e < arguments.length; e++) {
+      var t = arguments[e];
+      for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]);
     }
-    return target;
-  };
-  return _extends.apply(this, arguments);
+    return n;
+  }, _extends.apply(null, arguments);
 }
-function _objectWithoutPropertiesLoose(source, excluded) {
-  if (source == null) return {};
-  var target = {};
-  for (var key in source) {
-    if (Object.prototype.hasOwnProperty.call(source, key)) {
-      if (excluded.indexOf(key) >= 0) continue;
-      target[key] = source[key];
-    }
+function _objectWithoutPropertiesLoose(r, e) {
+  if (null == r) return {};
+  var t = {};
+  for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
+    if (e.indexOf(n) >= 0) continue;
+    t[n] = r[n];
   }
-  return target;
+  return t;
 }
 
 const FlowerRule = ({
@@ -789,15 +783,17 @@ component$3.displayName = 'FlowerValue';
 
 const ACTION_TYPES = {
   back: ['prev', 'prevToNode'],
-  reset: ['reset', 'initializeFromNode'],
   jump: ['node', 'node'],
-  next: ['next', 'next']
+  next: ['next', 'next'],
+  restart: ['restart', 'restart'],
+  reset: ['reset', 'initializeFromNode']
 };
 const PAYLAOAD_KEYS_NEEDED = {
   back: ['node'],
-  reset: ['node'],
   jump: ['node', 'history'],
-  next: ['node', 'route', 'data']
+  next: ['node', 'route', 'data'],
+  restart: ['node'],
+  reset: ['node', 'initialData']
 };
 const makeActionPayload = (actions, keys) => (flowName, params) => {
   const rest = typeof params === 'string' ? {
@@ -816,13 +812,15 @@ const makeActionPayloadOnPrev = makeActionPayload(ACTION_TYPES.back, PAYLAOAD_KE
 const makeActionPayloadOnReset = makeActionPayload(ACTION_TYPES.reset, PAYLAOAD_KEYS_NEEDED.reset);
 const makeActionPayloadOnNode = makeActionPayload(ACTION_TYPES.jump, PAYLAOAD_KEYS_NEEDED.jump);
 const makeActionPayloadOnNext = makeActionPayload(ACTION_TYPES.next, PAYLAOAD_KEYS_NEEDED.next);
+const makeActionPayloadOnRestart = makeActionPayload(ACTION_TYPES.restart, PAYLAOAD_KEYS_NEEDED.restart);
 const useFlower = ({
   flowName: customFlowName,
   name
 } = {}) => {
   const dispatch = useDispatch();
   const {
-    flowName: flowNameDefault
+    flowName: flowNameDefault,
+    initialData
   } = React.useContext(context);
   const flowName = customFlowName || name || flowNameDefault;
   const nodeId = useSelector(makeSelectCurrentNodeId(flowName != null ? flowName : ''));
@@ -860,11 +858,11 @@ const useFlower = ({
       payload
     });
   }, [dispatch, emitNavigateEvent, flowName]);
-  const reset = React.useCallback(param => {
+  const restart = React.useCallback(param => {
     const {
       type,
       payload
-    } = makeActionPayloadOnReset(flowName, param);
+    } = makeActionPayloadOnRestart(flowName, param);
     dispatch({
       type: `flower/${type}`,
       payload
@@ -874,6 +872,25 @@ const useFlower = ({
       payload
     });
   }, [dispatch, emitNavigateEvent, flowName]);
+  const reset = React.useCallback(param => {
+    const {
+      type,
+      payload
+    } = makeActionPayloadOnReset(flowName, typeof param === 'string' ? {
+      node: param,
+      initialData
+    } : _extends({}, param, {
+      initialData
+    }));
+    dispatch({
+      type: `flower/${type}`,
+      payload
+    });
+    emitNavigateEvent({
+      type,
+      payload
+    });
+  }, [dispatch, emitNavigateEvent, flowName, initialData]);
   const jump = React.useCallback(param => {
     const {
       type,
@@ -894,7 +911,8 @@ const useFlower = ({
     next,
     jump,
     back,
-    reset
+    reset,
+    restart
   };
 };
 
@@ -912,7 +930,8 @@ const useFlowerNavigate = ({
     next,
     jump,
     back,
-    reset
+    reset,
+    restart
   } = useFlower({
     flowName: name
   });
@@ -930,11 +949,14 @@ const useFlowerNavigate = ({
       case 'reset':
         reset(node);
         return;
+      case 'restart':
+        restart(node);
+        return;
       default:
         next();
         return;
     }
-  }, [next, jump, back, reset, node, route]);
+  }, [next, jump, back, reset, restart, node, route]);
   return {
     onNavigate,
     flowName

package/dist/index.esm.js

@@ -225,8 +225,9 @@ const FlowerClient = ({
   }, [dispatch, flowName, current, isDisabled, store, wsDevtools, isInitialized]);
   const contextValues = useMemo(() => ({
     flowName,
+    initialData: _initialData,
     currentNode: current
-  }), [flowName, current]);
+  }), [flowName, _initialData, current]);
   return isInitialized ? ( /*#__PURE__*/React.createElement(Provider, {
     value: contextValues
   }, prevFlowerNodeId !== current && typeof prevFlowerNodeId === 'string' && nodeById[prevFlowerNodeId], !isDisabled && nodeById[current])) : null;
@@ -349,29 +350,22 @@ const component$6 = /*#__PURE__*/React.memo(FlowerRoute);
 component$6.displayName = 'FlowerRoute';
 
 function _extends() {
-  _extends = Object.assign ? Object.assign.bind() : function (target) {
-    for (var i = 1; i < arguments.length; i++) {
-      var source = arguments[i];
-      for (var key in source) {
-        if (Object.prototype.hasOwnProperty.call(source, key)) {
-          target[key] = source[key];
-        }
-      }
+  return _extends = Object.assign ? Object.assign.bind() : function (n) {
+    for (var e = 1; e < arguments.length; e++) {
+      var t = arguments[e];
+      for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]);
     }
-    return target;
-  };
-  return _extends.apply(this, arguments);
+    return n;
+  }, _extends.apply(null, arguments);
 }
-function _objectWithoutPropertiesLoose(source, excluded) {
-  if (source == null) return {};
-  var target = {};
-  for (var key in source) {
-    if (Object.prototype.hasOwnProperty.call(source, key)) {
-      if (excluded.indexOf(key) >= 0) continue;
-      target[key] = source[key];
-    }
+function _objectWithoutPropertiesLoose(r, e) {
+  if (null == r) return {};
+  var t = {};
+  for (var n in r) if ({}.hasOwnProperty.call(r, n)) {
+    if (e.indexOf(n) >= 0) continue;
+    t[n] = r[n];
   }
-  return target;
+  return t;
 }
 
 const FlowerRule = ({
@@ -787,15 +781,17 @@ component$3.displayName = 'FlowerValue';
 
 const ACTION_TYPES = {
   back: ['prev', 'prevToNode'],
-  reset: ['reset', 'initializeFromNode'],
   jump: ['node', 'node'],
-  next: ['next', 'next']
+  next: ['next', 'next'],
+  restart: ['restart', 'restart'],
+  reset: ['reset', 'initializeFromNode']
 };
 const PAYLAOAD_KEYS_NEEDED = {
   back: ['node'],
-  reset: ['node'],
   jump: ['node', 'history'],
-  next: ['node', 'route', 'data']
+  next: ['node', 'route', 'data'],
+  restart: ['node'],
+  reset: ['node', 'initialData']
 };
 const makeActionPayload = (actions, keys) => (flowName, params) => {
   const rest = typeof params === 'string' ? {
@@ -814,13 +810,15 @@ const makeActionPayloadOnPrev = makeActionPayload(ACTION_TYPES.back, PAYLAOAD_KE
 const makeActionPayloadOnReset = makeActionPayload(ACTION_TYPES.reset, PAYLAOAD_KEYS_NEEDED.reset);
 const makeActionPayloadOnNode = makeActionPayload(ACTION_TYPES.jump, PAYLAOAD_KEYS_NEEDED.jump);
 const makeActionPayloadOnNext = makeActionPayload(ACTION_TYPES.next, PAYLAOAD_KEYS_NEEDED.next);
+const makeActionPayloadOnRestart = makeActionPayload(ACTION_TYPES.restart, PAYLAOAD_KEYS_NEEDED.restart);
 const useFlower = ({
   flowName: customFlowName,
   name
 } = {}) => {
   const dispatch = useDispatch();
   const {
-    flowName: flowNameDefault
+    flowName: flowNameDefault,
+    initialData
   } = useContext(context);
   const flowName = customFlowName || name || flowNameDefault;
   const nodeId = useSelector(makeSelectCurrentNodeId(flowName != null ? flowName : ''));
@@ -858,11 +856,11 @@ const useFlower = ({
       payload
     });
   }, [dispatch, emitNavigateEvent, flowName]);
-  const reset = useCallback(param => {
+  const restart = useCallback(param => {
     const {
       type,
       payload
-    } = makeActionPayloadOnReset(flowName, param);
+    } = makeActionPayloadOnRestart(flowName, param);
     dispatch({
       type: `flower/${type}`,
       payload
@@ -872,6 +870,25 @@ const useFlower = ({
       payload
     });
   }, [dispatch, emitNavigateEvent, flowName]);
+  const reset = useCallback(param => {
+    const {
+      type,
+      payload
+    } = makeActionPayloadOnReset(flowName, typeof param === 'string' ? {
+      node: param,
+      initialData
+    } : _extends({}, param, {
+      initialData
+    }));
+    dispatch({
+      type: `flower/${type}`,
+      payload
+    });
+    emitNavigateEvent({
+      type,
+      payload
+    });
+  }, [dispatch, emitNavigateEvent, flowName, initialData]);
   const jump = useCallback(param => {
     const {
       type,
@@ -892,7 +909,8 @@ const useFlower = ({
     next,
     jump,
     back,
-    reset
+    reset,
+    restart
   };
 };
 
@@ -910,7 +928,8 @@ const useFlowerNavigate = ({
     next,
     jump,
     back,
-    reset
+    reset,
+    restart
   } = useFlower({
     flowName: name
   });
@@ -928,11 +947,14 @@ const useFlowerNavigate = ({
       case 'reset':
         reset(node);
         return;
+      case 'restart':
+        restart(node);
+        return;
       default:
         next();
         return;
     }
-  }, [next, jump, back, reset, node, route]);
+  }, [next, jump, back, reset, restart, node, route]);
   return {
     onNavigate,
     flowName

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

@@ -1,4 +1,4 @@
-import { Route, RouteNode, RoutePrev, RouteReset } from './FlowerNavigate';
+import { Route, RouteNode, RoutePrev, RouteReset, RouteRestart } from './FlowerNavigate';
 export type UseFlowerProps = {
     [x in 'name' | 'flowName']?: string;
 };
@@ -17,6 +17,7 @@ type useFlowerActions = {
     back: (payload?: RoutePrev) => void;
     reset: (payload?: RouteReset) => void;
     jump: (payload: RouteNode) => void;
+    restart: (payload?: RouteRestart) => void;
 };
 export type UseFlower = (options?: UseFlowerProps) => useFlowerActions & {
     flowName?: string;

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

@@ -5,9 +5,14 @@ export type RouteNode = string | {
     flowName?: string;
     history?: string[];
 };
+export type RouteRestart = string | {
+    node: string;
+    flowName?: string;
+};
 export type RouteReset = string | {
     node: string;
     flowName?: string;
+    initialData?: Record<string, any>;
 };
 export type RoutePrev = string | {
     node: string;
@@ -34,4 +39,8 @@ export type FlowerNavigateProps = {
     action?: 'jump';
     node?: RouteNode;
     route?: undefined;
+} | {
+    action?: 'restart';
+    node?: RouteRestart;
+    route?: undefined;
 });

package/dist/src/context.d.ts

@@ -3,6 +3,7 @@ export type FlowerContext = {
     flowName?: string | undefined;
     currentNode?: string | undefined;
     autostart?: boolean | undefined;
+    initialData?: Record<string, any>;
 };
 export declare const context: React.Context<FlowerContext>;
 export declare const Provider: React.Provider<FlowerContext>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowerforce/flower-react",
-  "version": "3.0.1-beta.1",
+  "version": "3.0.1-beta.2",
   "description": "FlowerJS components, hooks and utils for React.",
   "repository": {
     "type": "git",
@@ -22,8 +22,7 @@
   },
   "license": "ISC",
   "peerDependencies": {
-    "react": ">=18",
-    "react-dom": ">=18"
+    "react": ">=18"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^6.4.5",
@@ -35,7 +34,7 @@
     "typescript": "^5.4.5"
   },
   "dependencies": {
-    "@flowerforce/flower-core": "3.0.1-beta.1",
+    "@flowerforce/flower-core": "3.0.0",
     "@reduxjs/toolkit": "^2.2.4",
     "lodash": "^4.17.21",
     "react-redux": "^9.1.2",