Merge pull request #2656 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.18.1",
+    "@pie-lib/pie-toolbox": "2.19.0",
     "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.18.1",
+    "@pie-lib/pie-toolbox": "2.19.0",
     "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.18.1",
+    "@pie-lib/pie-toolbox": "2.19.0",
     "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.18.1",
+    "@pie-lib/pie-toolbox": "2.19.0",
     "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.18.1",
+    "@pie-lib/pie-toolbox": "2.19.0",
     "classnames": "^2.2.5",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",

packages/categorize/configure/src/design/buttons.jsx

@@ -53,11 +53,4 @@ const DeleteButton = withStyles(() => ({
   </Button>
 ));
 
-const Divider = withStyles((theme) => ({
-  divider: {
-    marginTop: 2 * theme.spacing.unit,
-    marginBottom: 2 * theme.spacing.unit,
-  },
-}))(({ classes }) => <MuiDivider className={classes.divider} />);
-
-export { AddButton, DeleteButton, Divider };
+export { AddButton, DeleteButton };

packages/categorize/configure/src/design/categories/alternateResponses.jsx

@@ -2,9 +2,9 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { withStyles } from '@material-ui/core/styles';
 import classNames from 'classnames';
-import Category from './category';
 import { moveChoiceToAlternate, removeChoiceFromAlternate } from '@pie-lib/pie-toolbox/categorize';
-import { RowLabel } from './RowLabel';
+
+import Category from './category';
 import { getMaxCategoryChoices } from '../../utils';
 
 const styles = (theme) => ({
@@ -28,9 +28,6 @@ const styles = (theme) => ({
   rowLabel: {
     gridColumn: '1/3',
   },
-  rowLabelHolder: {
-    width: '100%',
-  },
 });
 
 export class AlternateResponses extends React.Component {
@@ -44,15 +41,12 @@ export class AlternateResponses extends React.Component {
     classes: PropTypes.object.isRequired,
     className: PropTypes.string,
     categories: PropTypes.array,
-    defaultImageMaxHeight: PropTypes.number,
-    defaultImageMaxWidth: PropTypes.number,
     onModelChanged: PropTypes.func,
     model: PropTypes.object.isRequired,
     uploadSoundSupport: PropTypes.shape({
       add: PropTypes.func.isRequired,
       delete: PropTypes.func.isRequired,
     }),
-    toolbarOpts: PropTypes.object,
     spellCheck: PropTypes.bool,
   };
 
@@ -161,14 +155,10 @@ export class AlternateResponses extends React.Component {
       imageSupport,
       spellCheck,
       uploadSoundSupport,
-      toolbarOpts,
-      defaultImageMaxHeight,
-      defaultImageMaxWidth,
       mathMlOptions = {},
     } = this.props;
     const { categoriesPerRow, errors, rowLabels } = model;
     const { duplicateAlternate } = errors || {};
-    const { maxImageWidth = {}, maxImageHeight = {} } = configuration || {};
 
     const holderStyle = {
       gridTemplateColumns: `repeat(${categoriesPerRow}, 1fr)`,

packages/categorize/configure/src/design/choices/choice.jsx

@@ -37,8 +37,6 @@ export class Choice extends React.Component {
     choice: PropTypes.object.isRequired,
     connectDropTarget: PropTypes.func,
     deleteFocusedEl: PropTypes.func,
-    defaultImageMaxHeight: PropTypes.number,
-    defaultImageMaxWidth: PropTypes.number,
     focusedEl: PropTypes.number,
     index: PropTypes.number,
     lockChoiceOrder: PropTypes.bool,

packages/categorize/configure/src/design/choices/index.jsx

@@ -4,7 +4,6 @@ import { withStyles } from '@material-ui/core/styles';
 import classNames from 'classnames';
 import Choice from './choice';
 import Header from '../header';
-import every from 'lodash/every';
 import Config from './config';
 import { choiceUtils as utils } from '@pie-lib/pie-toolbox/config-ui';
 import { removeAllChoices } from '@pie-lib/pie-toolbox/categorize';
@@ -49,7 +48,7 @@ export class Choices extends React.Component {
 
   allChoicesHaveCount = (count) => {
     const { choices } = this.props;
-    return every(choices, (c) => c.categoryCount === count);
+    return Array.isArray(choices) && choices.every((c) => c.categoryCount === count);
   };
 
   addChoice = () => {

packages/categorize/configure/src/design/index.jsx

@@ -215,7 +215,6 @@ export class Design extends React.Component {
       spellCheckEnabled,
       teacherInstructionsEnabled,
       toolbarEditorPosition,
-      maxAnswerChoices,
       extraCSSRules,
     } = model || {};
     const {
@@ -428,9 +427,6 @@ export class Design extends React.Component {
                     categories={categoriesList}
                     onModelChanged={this.updateModel}
                     uploadSoundSupport={uploadSoundSupport}
-                    toolbarOpts={toolbarOpts}
-                    defaultImageMaxWidth={defaultImageMaxWidth}
-                    defaultImageMaxHeight={defaultImageMaxHeight}
                     mathMlOptions={mathMlOptions}
                   />
                 </React.Fragment>