Merge remote-tracking branch 'origin/develop'

Author: andreeapescar

packages/calculator/configure/package.json

@@ -7,7 +7,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.2.0",
-    "@pie-lib/config-ui": "^10.10.2",
+    "@pie-lib/config-ui": "^10.10.9",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
   },

packages/categorize/configure/package.json

@@ -13,10 +13,10 @@
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.2.0",
     "@pie-lib/categorize": "^0.6.24",
-    "@pie-lib/config-ui": "^10.10.2",
+    "@pie-lib/config-ui": "^10.10.9",
     "@pie-lib/drag": "^1.1.52",
-    "@pie-lib/editable-html": "^7.17.2",
-    "@pie-lib/render-ui": "^4.11.9",
+    "@pie-lib/editable-html": "^7.17.9",
+    "@pie-lib/render-ui": "^4.12.2",
     "classnames": "^2.2.5",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",

packages/categorize/configure/src/design/categories/choice-preview.jsx

@@ -25,17 +25,20 @@ export class ChoicePreview extends React.Component {
     const { classes, className, choice } = this.props;
     return (
       <div className={classNames(classes.choicePreview, className)}>
-        <Choice>
-          <HtmlAndMath html={choice.content} />
-          <IconButton
-            color="secondary"
-            aria-label="delete"
-            className={classes.delete}
-            onClick={this.delete}
-          >
-            <Delete />
-          </IconButton>
-        </Choice>
+        {
+          choice ? <Choice>
+            <HtmlAndMath html={choice?.content} />
+            <IconButton
+              color="secondary"
+              aria-label="delete"
+              className={classes.delete}
+              onClick={this.delete}
+            >
+              <Delete />
+            </IconButton>
+          </Choice>
+            : null
+        }
       </div>
     );
   }

packages/categorize/configure/src/design/categories/droppable-placeholder.jsx

@@ -24,13 +24,13 @@ const Helper = withStyles(() => ({
 
 const Previews = ({ choices, onDeleteChoice }) => (
   <React.Fragment>
-    {choices.map((c, index) => (
-      <ChoicePreview
+    {choices.map((c, index) =>
+      c && <ChoicePreview
         choice={c}
         key={index}
         onDelete={choice => onDeleteChoice(choice, index)}
       />
-    ))}
+    )}
   </React.Fragment>
 );
 

packages/charting/configure/package.json

@@ -9,9 +9,9 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.2.0",
-    "@pie-lib/charting": "^4.5.10",
-    "@pie-lib/config-ui": "^10.10.2",
-    "@pie-lib/editable-html": "^7.17.2",
+    "@pie-lib/charting": "^4.5.13",
+    "@pie-lib/config-ui": "^10.10.9",
+    "@pie-lib/editable-html": "^7.17.9",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "prop-types": "^15.6.2",

packages/drag-in-the-blank/configure/package.json

@@ -8,10 +8,10 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.2.0",
-    "@pie-lib/config-ui": "^10.10.2",
+    "@pie-lib/config-ui": "^10.10.9",
     "@pie-lib/drag": "^1.1.52",
-    "@pie-lib/editable-html": "^7.17.2",
-    "@pie-lib/math-rendering": "^2.3.8",
+    "@pie-lib/editable-html": "^7.17.9",
+    "@pie-lib/math-rendering": "^2.3.11",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",

packages/drawing-response/configure/package.json

@@ -9,8 +9,8 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.2.0",
-    "@pie-lib/config-ui": "^10.10.2",
-    "@pie-lib/editable-html": "^7.17.2",
+    "@pie-lib/config-ui": "^10.10.9",
+    "@pie-lib/editable-html": "^7.17.9",
     "classnames": "^2.2.6",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",

packages/ebsr/configure/package.json

@@ -10,7 +10,7 @@
     "@material-ui/core": "^3.9.2",
     "@pie-element/multiple-choice": "^6.0.1",
     "@pie-framework/pie-configure-events": "^1.2.0",
-    "@pie-lib/config-ui": "^10.10.2",
+    "@pie-lib/config-ui": "^10.10.9",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
     "react": "^16.8.1",

packages/explicit-constructed-response/configure/package.json

@@ -8,8 +8,8 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.2.0",
-    "@pie-lib/config-ui": "^10.10.2",
-    "@pie-lib/editable-html": "^7.17.2",
+    "@pie-lib/config-ui": "^10.10.9",
+    "@pie-lib/editable-html": "^7.17.9",
     "classnames": "^2.2.6",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",

packages/extended-text-entry/configure/package.json

@@ -10,8 +10,8 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.2.0",
-    "@pie-lib/config-ui": "^10.10.2",
-    "@pie-lib/editable-html": "^7.17.2",
+    "@pie-lib/config-ui": "^10.10.9",
+    "@pie-lib/editable-html": "^7.17.9",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
     "react": "^16.8.1",