@gamelearn/arcade-components 2.30.0 → 2.31.1

package/dist/components/conversational-pro-component/components/ConversationalProComponent.js

@@ -33,7 +33,7 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var characterMs = 75;
 var minMs = 1400;
-var ConversationProViewer = function ConversationProViewer(_ref) {
+var ConversationalProComponent = function ConversationalProComponent(_ref) {
   var _background$img, _currentLineData$slot3, _currentMessage$text;
   var keyboardControl = _ref.keyboardControl,
     emitEvent = _ref.emitEvent,
@@ -277,6 +277,48 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
       finishConversation();
     }
   }, [currentLineData.id, edges, edgesHistory, emitEvent, finishConversation, lastNodeId, lines]);
+  var decisionNotifyProgress = (0, _react.useCallback)(function (choice) {
+    if (isBranched) {
+      if (choice) {
+        var currentId = [3, 2, 1][choice.id];
+        var optionsEdges = edges.filter(function (edge) {
+          return edge.fromId === currentLineData.id;
+        });
+        var currentEdge = optionsEdges.find(function (edge) {
+          return parseInt(edge.fromPointIndex) === currentId;
+        });
+        if (currentEdge) {
+          var destinationEdge = lines.findIndex(function (l) {
+            return l.id === currentEdge.toId;
+          });
+          if (destinationEdge >= 0) {
+            emitEvent({
+              type: 'notifyProgress',
+              payload: {
+                line: destinationEdge
+              }
+            });
+          }
+        } else {
+          emitEvent({
+            type: 'saveNode'
+          });
+        }
+      }
+    } else {
+      var line = currentLine;
+      var maxLine = lines.length - 1;
+      if (line + 1 <= maxLine) {
+        var next = line + 1;
+        emitEvent({
+          type: 'notifyProgress',
+          payload: {
+            line: next
+          }
+        });
+      }
+    }
+  }, [edges, lines, emitEvent, currentLine, currentLineData.id, isBranched]);
   var handleClickNext = (0, _react.useCallback)(function (choice, reset) {
     var isLast = false;
     setTTsStart(false);
@@ -434,21 +476,27 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
     }
   }, [edges, isBranched, lines, mounted, progress === null || progress === void 0 ? void 0 : progress.line]);
   keyboardControl(isDecision || disableBackButton ? null : manualClickBack, isDecision ? null : manualClickNext);
-  var decisionPayload = _objectSpread(_objectSpread({}, currentLineData.payload), {}, {
-    required: !isBranched,
-    branched: isBranched,
-    onFinish: handleClickNext,
-    keyboardControl: keyboardControl,
-    emitEvent: emitEvent,
-    soundActions: soundActions,
-    inheritProps: {
-      characters: currentCharacters,
-      background: background,
-      flex: leftWithSlots ? leftWithSlots.flex : true,
-      slots: !leftWithSlots ? [] : leftWithSlots.slots
-    }
-  });
   if (isDecision) {
+    var decisionPayload = _objectSpread(_objectSpread({}, currentLineData.payload), {}, {
+      decisionNumber: lines.filter(function (l) {
+        return l.decision;
+      }).findIndex(function (l) {
+        return l.id === lines[currentLine].id;
+      }) + 1,
+      required: !isBranched,
+      branched: isBranched,
+      onAddPoints: decisionNotifyProgress,
+      onFinish: handleClickNext,
+      keyboardControl: keyboardControl,
+      emitEvent: emitEvent,
+      soundActions: soundActions,
+      inheritProps: {
+        characters: currentCharacters,
+        background: background,
+        flex: leftWithSlots ? leftWithSlots.flex : true,
+        slots: !leftWithSlots ? [] : leftWithSlots.slots
+      }
+    });
     return /*#__PURE__*/_react.default.createElement(_decisionComponent.default, decisionPayload);
   }
   return /*#__PURE__*/_react.default.createElement("div", {
@@ -485,10 +533,10 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
     className: (0, _LangIsRtl.default)() ? 'icon-back' : 'icon-next'
   }))))));
 };
-ConversationProViewer.defaultProps = {
+ConversationalProComponent.defaultProps = {
   background: {},
   emitEvent: function emitEvent() {},
   soundActions: [function () {}, function () {}]
 };
-var _default = ConversationProViewer;
+var _default = ConversationalProComponent;
 exports.default = _default;

package/dist/components/decision-component/components/DecisionComponent.js

@@ -34,8 +34,10 @@ var DecisionComponent = function DecisionComponent(_ref) {
     props = _objectWithoutProperties(_ref, _excluded);
   var _props$inheritProps = props.inheritProps,
     inheritProps = _props$inheritProps === void 0 ? {} : _props$inheritProps,
+    decisionNumber = props.decisionNumber,
     required = props.required,
     question = props.question,
+    onAddPoints = props.onAddPoints,
     _onFinish = props.onFinish,
     branched = props.branched,
     simplifiedOptions = props.simplifiedOptions;
@@ -77,7 +79,10 @@ var DecisionComponent = function DecisionComponent(_ref) {
   var emitGameData = function emitGameData(choice) {
     emitEvent({
       type: 'decisionJournal',
-      payload: choice
+      payload: {
+        choice: choice,
+        decisionNumber: decisionNumber
+      }
     });
   };
   var onNext = function onNext(choice) {
@@ -93,6 +98,9 @@ var DecisionComponent = function DecisionComponent(_ref) {
             });
           }
         } else {
+          if (onAddPoints) {
+            onAddPoints(choice);
+          }
           emitGameData(choice);
           emitEvent({
             type: 'addPoints',

package/dist/components/dialog-component/components/DialogComponent.js

@@ -385,6 +385,44 @@ var DialogComponent = function DialogComponent(_ref) {
       });
     }
   }, [handleBranchDirection, emitEvent, isBranched, lastLine, line, talkingCharacter]);
+  var decisionNotifyProgress = (0, _react.useCallback)(function (choice) {
+    if (isBranched) {
+      if (choice) {
+        var currentId = [3, 2, 1][choice.id];
+        var optionsEdges = edges.filter(function (edge) {
+          return edge.fromId === currentLineData.id;
+        });
+        var currentEdge = optionsEdges.find(function (edge) {
+          return parseInt(edge.fromPointIndex) === currentId;
+        });
+        if (currentEdge) {
+          var destinationEdge = lines.findIndex(function (l) {
+            return l.id === currentEdge.toId;
+          });
+          if (destinationEdge >= 0) {
+            emitEvent({
+              type: 'notifyProgress',
+              payload: {
+                line: destinationEdge
+              }
+            });
+          }
+        } else {
+          emitEvent({
+            type: 'saveNode'
+          });
+        }
+      }
+    } else if (line < lines.length - 1) {
+      var next = line + 1;
+      emitEvent({
+        type: 'notifyProgress',
+        payload: {
+          line: next
+        }
+      });
+    }
+  }, [edges, line, lines, emitEvent, currentLineData.id, isBranched]);
   var nextLine = (0, _react.useCallback)(function (choice, reset) {
     lastTalking.current = _objectSpread({}, talkingCharacter);
     setEdgesHistory([].concat(_toConsumableArray(edgesHistory), [currentLineData.id]));
@@ -632,12 +670,18 @@ var DialogComponent = function DialogComponent(_ref) {
   var container = document.querySelector('.screens--container');
   if (isDecision) {
     var decisionPayload = _objectSpread(_objectSpread({}, currentLineData.payload), {}, {
+      decisionNumber: lines.filter(function (l) {
+        return l.decision;
+      }).findIndex(function (l) {
+        return l.id === currentLineData.id;
+      }) + 1,
       inheritProps: {
         slots: [],
         disableBackground: true
       },
       required: !isBranched,
       branched: isBranched,
+      onAddPoints: decisionNotifyProgress,
       onFinish: nextLine,
       emitEvent: emitEvent,
       pause: pause,

package/package.json

@@ -2,7 +2,7 @@
   "name": "@gamelearn/arcade-components",
   "author": "Gamelearn",
   "license": "unlicense",
-  "version": "2.30.0",
+  "version": "2.31.1",
   "main": "dist/index.js",
   "files": [
     "dist",