Merge pull request #2556 from pie-framework/develop

merge

Author: CarlaCostea

packages/boilerplate-item-type/configure/package.json

@@ -8,7 +8,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.14.3",
+    "@pie-lib/pie-toolbox": "2.14.5",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",

packages/boilerplate-item-type/controller/package.json

@@ -6,7 +6,7 @@
   "main": "lib/index.js",
   "module": "src/index.js",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.14.3",
+    "@pie-lib/pie-toolbox": "2.14.5",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   },

packages/boilerplate-item-type/package.json

@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.14.3",
+    "@pie-lib/pie-toolbox": "2.14.5",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"

packages/calculator/configure/package.json

@@ -7,7 +7,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.14.3",
+    "@pie-lib/pie-toolbox": "2.14.5",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
   },

packages/categorize/configure/package.json

@@ -12,7 +12,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.14.3",
+    "@pie-lib/pie-toolbox": "2.14.5",
     "classnames": "^2.2.5",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",

packages/categorize/controller/package.json

@@ -2,7 +2,7 @@
   "name": "@pie-element/categorize-controller",
   "private": true,
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.14.3",
+    "@pie-lib/pie-toolbox": "2.14.5",
     "lodash": "^4.17.15"
   },
   "version": "7.8.3",

packages/categorize/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.14.3",
+    "@pie-lib/pie-toolbox": "2.14.5",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.15",

packages/categorize/src/categorize/choice.jsx

@@ -2,8 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { withStyles } from '@material-ui/core/styles';
 import classNames from 'classnames';
-import { DragSource, DndProvider } from 'react-dnd';
-import HTML5Backend from 'react-dnd-html5-backend';
+import { DragSource } from 'react-dnd';
 import { uid } from '@pie-lib/pie-toolbox/drag';
 import Card from '@material-ui/core/Card';
 import CardContent from '@material-ui/core/CardContent';
@@ -160,10 +159,4 @@ const DraggableChoice = DragSource(
   }),
 )(Choice);
 
-const DraggableChoiceWithProvider = (props) => (
-    <DndProvider backend={HTML5Backend}>
-      <DraggableChoice {...props} />
-    </DndProvider>
-);
-
-export default uid.withUid(DraggableChoiceWithProvider);
+export default uid.withUid(DraggableChoice);

packages/categorize/src/index.js

@@ -11,6 +11,9 @@ export default class Categorize extends HTMLElement {
 
     this.eliminateBlindAnswersFromSession();
     this.dispatchEvent(new ModelSetEvent(this.tagName.toLowerCase(), this.isComplete(), !!this._model));
+    // reset the audioInitialized to false since the model changed, and we might need to reinitialize the audio
+    this._audioInitialized = false;
+
     this.render();
   }
 
@@ -110,6 +113,7 @@ export default class Categorize extends HTMLElement {
     const observer = new MutationObserver((mutationsList, observer) => {
       mutationsList.forEach((mutation) => {
         if (mutation.type === 'childList') {
+          if (this._audioInitialized) return;
           const audio = this.querySelector('audio');
           const isInsidePrompt = audio && audio.closest('#preview-prompt');
 
@@ -180,6 +184,8 @@ export default class Categorize extends HTMLElement {
           this._handlePlaying = handlePlaying;
           this._handleEnded = handleEnded;
           this._enableAudio = enableAudio;
+          // set to true to prevent multiple initializations
+          this._audioInitialized = true;
 
           observer.disconnect();
         }

packages/charting/configure/package.json

@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.14.3",
+    "@pie-lib/pie-toolbox": "2.14.5",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "prop-types": "^15.6.2",