@gamelearn/arcade-components 0.21.11 → 0.22.1

package/dist/components/arcade-render/element/AnimateElement.js

@@ -37,15 +37,19 @@ var AnimateElement = function AnimateElement(_ref) {
 
   var _useAnimations = (0, _drei.useAnimations)(animations),
       ref = _useAnimations.ref,
-      mixer = _useAnimations.mixer,
-      actions = _useAnimations.actions;
+      mixer = _useAnimations.mixer;
 
   (0, _react.useEffect)(function () {
-    var _Object$values;
-
-    mixer.stopAllAction();
-    (_Object$values = Object.values(actions)) === null || _Object$values === void 0 ? void 0 : _Object$values[0].play();
-  }, [actions, model, mixer]);
+    if (ref.current) {
+      mixer.stopAllAction();
+      var clip = animations[0];
+
+      if (clip) {
+        var action = mixer.clipAction(clip, ref.current);
+        action.play();
+      }
+    }
+  }, [mixer, ref, animations]);
   return /*#__PURE__*/_react.default.createElement("primitive", _extends({
     ref: ref,
     object: model,

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

@@ -21,8 +21,6 @@ function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return
 
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
-function _extends() { _extends = Object.assign || 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 target; }; return _extends.apply(this, arguments); }
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
 
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
@@ -47,6 +45,7 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
   var emitEvent = _ref.emitEvent,
       lines = _ref.lines,
       characters = _ref.characters,
+      actors = _ref.actors,
       background = _ref.background,
       soundActions = _ref.soundActions,
       lodSettings = _ref.lodSettings;
@@ -92,6 +91,32 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
     return line.slots;
   });
   var lastLine = lines[currentLine - 1] ? lines[currentLine - 1] : {};
+  var hasCharacters = !currentLineData.decision && currentLineData.slots.filter(function (slot) {
+    return slot.uid;
+  }).length;
+  var currentSlots = [];
+
+  if (currentLineData.slots) {
+    currentSlots = currentLineData.slots;
+  } else if (leftWithSlots) {
+    currentSlots = leftWithSlots.slots;
+  }
+
+  var currentCharacters = currentSlots.filter(function (slot) {
+    return slot.uid;
+  }).map(function (slot) {
+    var character = (characters || actors || []).find(function (c) {
+      return c.uid === slot.uid;
+    });
+
+    if (character) {
+      slot.resource = character.resource;
+      slot.type = character.type;
+    }
+
+    if (!slot.resource) slot.resource = {};
+    return slot;
+  });
 
   if (voiceOver) {
     var rightWithSlots = lines.slice(currentLine).find(function (line) {
@@ -103,14 +128,14 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
       voiceOverSlots = lineWithSlots.slots;
       isFlex = lineWithSlots.flex;
     }
-  } else if (!decision) {
+  } else if (!decision && hasCharacters) {
     currentLineData.slots.forEach(function (slot) {
-      var indx = characters.findIndex(function (char) {
+      var indx = currentCharacters.findIndex(function (char) {
         return char.uid === slot.uid;
       });
 
       if (indx >= 0) {
-        characters[indx].emotion = slot.emotion;
+        currentCharacters[indx].emotion = slot.emotion;
       }
     });
 
@@ -118,10 +143,10 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
       var notFlexedPosition = currentLineData.slots.findIndex(function (char) {
         return char.uid === currentMessage.uid;
       });
-      var flexedPosition = characters.findIndex(function (char) {
+      var flexedPosition = currentCharacters.findIndex(function (char) {
         return char.uid === currentMessage.uid;
       });
-      characters.forEach(function (c) {
+      currentCharacters.forEach(function (c) {
         if (c.uid === currentMessage.uid) c.name = currentMessage.alias;
       });
       currentMessage.position = isFlex ? flexedPosition : notFlexedPosition;
@@ -129,7 +154,9 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
   }
 
   var listProps = {
-    characters: characters,
+    characters: currentCharacters,
+    lodSettings: lodSettings,
+    actors: actors,
     currentMessage: currentMessage || {},
     slots: !voiceOver ? currentLineData.slots : voiceOverSlots,
     flex: isFlex
@@ -171,7 +198,7 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
     emitEvent: emitEvent,
     soundActions: soundActions,
     inheritProps: {
-      characters: characters,
+      characters: currentCharacters,
       background: background,
       flex: leftWithSlots ? leftWithSlots.flex : true,
       slots: !leftWithSlots ? [] : leftWithSlots.slots
@@ -189,10 +216,7 @@ var ConversationProViewer = function ConversationProViewer(_ref) {
     style: backgroundImage ? {
       backgroundImage: "url(\"".concat(backgroundImage, "\")")
     } : {}
-  }, /*#__PURE__*/_react.default.createElement(_SlotList.default, _extends({}, listProps, {
-    characters: characters,
-    lodSettings: lodSettings
-  })), /*#__PURE__*/_react.default.createElement("div", {
+  }, /*#__PURE__*/_react.default.createElement(_SlotList.default, listProps), /*#__PURE__*/_react.default.createElement("div", {
     className: "conversation--body"
   }, currentMessage ? /*#__PURE__*/_react.default.createElement(_Message.default, {
     current: currentMessage,

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

@@ -7,8 +7,6 @@ exports.default = void 0;
 
 var _react = _interopRequireDefault(require("react"));
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _Slot = _interopRequireDefault(require("./Slot"));
 
 var _scene = _interopRequireDefault(require("./scene"));
@@ -19,6 +17,7 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
 
 var SlotList = function SlotList(_ref) {
   var characters = _ref.characters,
+      actors = _ref.actors,
       lodSettings = _ref.lodSettings,
       currentMessage = _ref.currentMessage,
       flex = _ref.flex,
@@ -37,6 +36,33 @@ var SlotList = function SlotList(_ref) {
     };
   };
 
+  var gameChars = slots.reduce(function (acc, current) {
+    var actor = actors === null || actors === void 0 ? void 0 : actors.find(function (a) {
+      return a.uid === current.uid;
+    });
+    var char = Object.assign({}, current);
+
+    if (current.character) {
+      char.name = current.alias || current.character.name;
+      char.resource = char.character.resource;
+      delete char.character;
+      char.type = 'character';
+      acc.push(char);
+    } else if (actor) {
+      var resource = actor.resource;
+      char.name = current.alias || current.name;
+      char.resource = resource;
+      char.type = actor.type;
+      acc.push(char);
+    } else if (!flex) {
+      acc.push(null);
+    }
+
+    return acc;
+  }, []);
+  var hasGameChars = gameChars.length && gameChars.some(function (c) {
+    return c;
+  });
   var currentChars = characters.filter(function (c) {
     return slots.find(function (s) {
       return c.uid === s.uid;
@@ -44,6 +70,25 @@ var SlotList = function SlotList(_ref) {
   });
 
   var Slots = function Slots() {
+    if (hasGameChars) {
+      return gameChars.map(function (character, index) {
+        if (!character) {
+          return /*#__PURE__*/_react.default.createElement("div", {
+            key: "void_".concat(index),
+            className: "conversation--character__item void ".concat(index)
+          });
+        }
+
+        return /*#__PURE__*/_react.default.createElement(_Slot.default, _extends({
+          key: character.uid + index
+        }, characterProps({
+          character: character,
+          active: character.talking,
+          slot: index
+        })));
+      });
+    }
+
     if (flex) {
       return currentChars.map(function (character, index) {
         var active = currentMessage.position === index;
@@ -57,7 +102,7 @@ var SlotList = function SlotList(_ref) {
       });
     }
 
-    return slots.length > 0 && characters.length > 0 ? slots.map(function (el, index) {
+    return slots.length > 0 ? slots.map(function (el, index) {
       var character = characters.find(function (char) {
         return char.uid === el.uid;
       });
@@ -84,7 +129,7 @@ var SlotList = function SlotList(_ref) {
   return /*#__PURE__*/_react.default.createElement("div", {
     className: "conversation--characters"
   }, /*#__PURE__*/_react.default.createElement(_scene.default, {
-    characters: currentChars,
+    characters: hasGameChars ? gameChars : currentChars,
     slots: slots,
     flex: flex,
     currentMessage: currentMessage,
@@ -92,18 +137,6 @@ var SlotList = function SlotList(_ref) {
   }), children ? children : /*#__PURE__*/_react.default.createElement(Slots, null));
 };
 
-SlotList.propTypes = {
-  characters: _propTypes.default.arrayOf(_propTypes.default.shape({
-    name: _propTypes.default.string,
-    url: _propTypes.default.string
-  })),
-  currentMessage: _propTypes.default.shape({
-    emotion: _propTypes.default.string,
-    position: _propTypes.default.number
-  }),
-  flex: _propTypes.default.bool,
-  slots: _propTypes.default.arrayOf(_propTypes.default.shape({}))
-};
 SlotList.defaultProps = {
   characters: [],
   currentMessage: {},

package/dist/components/conversational-pro-component/components/scene/Panels.js

@@ -18,15 +18,15 @@ var Panels = function Panels(_ref) {
       flex = _ref.flex,
       lodSettings = _ref.lodSettings;
   return slots.map(function (slot, slotPosition) {
+    var currentCharacter = null;
     var characterPos = characters.findIndex(function (c) {
-      return c.uid === slot.uid;
+      return c && c.uid === slot.uid;
     });
 
     if (characterPos >= 0) {
       var currentPosition = !flex ? slotPosition : characterPos;
-      var currentCharacter = Object.assign({}, characters[characterPos]);
-      currentCharacter.index = characterPos;
-      currentCharacter.slot = slotPosition;
+      currentCharacter = Object.assign({}, characters[characterPos]);
+      currentCharacter.slot = currentPosition;
       return /*#__PURE__*/_react.default.createElement(_Panel.default, {
         key: "".concat(currentCharacter.uid, "_").concat(slotPosition, "_").concat(characterPos),
         character: currentCharacter,

package/dist/components/writer-puzzle-component/components/WriterPuzzleComponent.js

@@ -60,6 +60,7 @@ var WriterPuzzleComponent = function WriterPuzzleComponent(_ref) {
       skip = _ref.skip,
       type = _ref.type,
       documentTitle = _ref.documentTitle,
+      documentTitle_labelId = _ref.documentTitle_labelId,
       texts = _ref.texts,
       soundActions = _ref.soundActions;
 
@@ -163,20 +164,20 @@ var WriterPuzzleComponent = function WriterPuzzleComponent(_ref) {
     var currentDecision = decisionsList.filter(function (obj) {
       return obj.currenTextParagraph === indexOfText;
     });
-    return currentDecision[0].fullText;
+    return currentDecision[0].fullText_labelId;
   };
 
   var createLecture = function createLecture() {
     return texts.map(function (element, indexOfText) {
       if (element.type === 'fixed') {
-        if (element.fullText) {
-          return element.fullText;
-        }
+        var _element$fullText_lab;
+
+        return (_element$fullText_lab = element.fullText_labelId) !== null && _element$fullText_lab !== void 0 ? _element$fullText_lab : element.fullText;
       } else if (element.type === 'election') {
-        var correctElection = getCorrectElection(element);
+        var correctElection = getCorrectElection(element); // 0,1,2 or undefined
 
-        if (correctElection) {
-          return element.electionTexts[correctElection].fullText;
+        if (correctElection >= 0) {
+          return element.electionTexts[correctElection].fullText_labelId;
         } // If there is no correct Election then it should pick the election of student
 
 
@@ -237,11 +238,12 @@ var WriterPuzzleComponent = function WriterPuzzleComponent(_ref) {
   var handleLectures = function handleLectures() {
     var text = createLecture();
     emitEvent({
-      type: 'finishLecture',
+      type: 'finishMedia',
       payload: {
-        name: documentTitle,
+        name: documentTitle_labelId,
         text: text,
-        documentType: type
+        documentType: type,
+        type: 'text'
       }
     });
   };
@@ -291,18 +293,16 @@ var WriterPuzzleComponent = function WriterPuzzleComponent(_ref) {
   };
 
   var handleFinish = function handleFinish() {
-    if (checkAllDecisionsRightWrong()) {
-      // if all Decisions are right or wrong we just skip to end
-      setReviewDone(true);
-      setFeedbackScreenDone(true);
-      endGame();
-    }
-
     if (!checkIfFeedbackNeeded()) {
       // THis case is for when we do not have any Decision
       setReviewDone(true);
       setFeedbackScreen(true);
       endGame();
+    } else if (checkAllDecisionsRightWrong()) {
+      // if all Decisions are right or wrong we just skip to end
+      setReviewDone(true);
+      setFeedbackScreenDone(true);
+      endGame();
     }
 
     if (!reviewDone) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gamelearn/arcade-components",
   "license": "Gamelearn",
-  "version": "0.21.11",
+  "version": "0.22.1",
   "main": "dist/index.js",
   "files": [
     "dist",