Skip to content

Commit 97cdc63

Browse files
Merge pull request #710 from pie-framework/chore/dev-to-master
Chore/dev to master
2 parents 0df2889 + 4a95f43 commit 97cdc63

File tree

50 files changed

+3093
-1429
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+3093
-1429
lines changed

packages/calculator/configure/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"dependencies": {
88
"@material-ui/core": "^3.9.2",
99
"@pie-framework/pie-configure-events": "^1.2.0",
10-
"@pie-lib/config-ui": "^10.10.2",
10+
"@pie-lib/config-ui": "^10.10.9",
1111
"react": "^16.8.1",
1212
"react-dom": "^16.8.1"
1313
},

packages/categorize/configure/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@
1313
"@material-ui/icons": "^3.0.1",
1414
"@pie-framework/pie-configure-events": "^1.2.0",
1515
"@pie-lib/categorize": "^0.6.24",
16-
"@pie-lib/config-ui": "^10.10.2",
16+
"@pie-lib/config-ui": "^10.10.9",
1717
"@pie-lib/drag": "^1.1.52",
18-
"@pie-lib/editable-html": "^7.17.2",
19-
"@pie-lib/render-ui": "^4.11.9",
18+
"@pie-lib/editable-html": "^7.17.9",
19+
"@pie-lib/render-ui": "^4.12.2",
2020
"classnames": "^2.2.5",
2121
"debug": "^3.1.0",
2222
"lodash": "^4.17.15",

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

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,20 @@ export class ChoicePreview extends React.Component {
2525
const { classes, className, choice } = this.props;
2626
return (
2727
<div className={classNames(classes.choicePreview, className)}>
28-
<Choice>
29-
<HtmlAndMath html={choice.content} />
30-
<IconButton
31-
color="secondary"
32-
aria-label="delete"
33-
className={classes.delete}
34-
onClick={this.delete}
35-
>
36-
<Delete />
37-
</IconButton>
38-
</Choice>
28+
{
29+
choice ? <Choice>
30+
<HtmlAndMath html={choice?.content} />
31+
<IconButton
32+
color="secondary"
33+
aria-label="delete"
34+
className={classes.delete}
35+
onClick={this.delete}
36+
>
37+
<Delete />
38+
</IconButton>
39+
</Choice>
40+
: null
41+
}
3942
</div>
4043
);
4144
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ const Helper = withStyles(() => ({
2424

2525
const Previews = ({ choices, onDeleteChoice }) => (
2626
<React.Fragment>
27-
{choices.map((c, index) => (
28-
<ChoicePreview
27+
{choices.map((c, index) =>
28+
c && <ChoicePreview
2929
choice={c}
3030
key={index}
3131
onDelete={choice => onDeleteChoice(choice, index)}
3232
/>
33-
))}
33+
)}
3434
</React.Fragment>
3535
);
3636

packages/charting/configure/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
"dependencies": {
1010
"@material-ui/core": "^3.9.2",
1111
"@pie-framework/pie-configure-events": "^1.2.0",
12-
"@pie-lib/charting": "^4.5.10",
13-
"@pie-lib/config-ui": "^10.10.2",
14-
"@pie-lib/editable-html": "^7.17.2",
12+
"@pie-lib/charting": "^4.5.13",
13+
"@pie-lib/config-ui": "^10.10.9",
14+
"@pie-lib/editable-html": "^7.17.9",
1515
"classnames": "^2.2.5",
1616
"debug": "^4.1.1",
1717
"prop-types": "^15.6.2",

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
"@material-ui/core": "^3.9.2",
99
"@material-ui/icons": "^3.0.1",
1010
"@pie-framework/pie-configure-events": "^1.2.0",
11-
"@pie-lib/config-ui": "^10.10.2",
11+
"@pie-lib/config-ui": "^10.10.9",
1212
"@pie-lib/drag": "^1.1.52",
13-
"@pie-lib/editable-html": "^7.17.2",
14-
"@pie-lib/math-rendering": "^2.3.8",
13+
"@pie-lib/editable-html": "^7.17.9",
14+
"@pie-lib/math-rendering": "^2.3.11",
1515
"debug": "^3.1.0",
1616
"lodash": "^4.17.15",
1717
"prop-types": "^15.6.2",

packages/drawing-response/configure/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"dependencies": {
1010
"@material-ui/core": "^3.9.2",
1111
"@pie-framework/pie-configure-events": "^1.2.0",
12-
"@pie-lib/config-ui": "^10.10.2",
13-
"@pie-lib/editable-html": "^7.17.2",
12+
"@pie-lib/config-ui": "^10.10.9",
13+
"@pie-lib/editable-html": "^7.17.9",
1414
"classnames": "^2.2.6",
1515
"debug": "^3.1.0",
1616
"lodash": "^4.17.15",

packages/ebsr/configure/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"@material-ui/core": "^3.9.2",
1111
"@pie-element/multiple-choice": "^6.0.1",
1212
"@pie-framework/pie-configure-events": "^1.2.0",
13-
"@pie-lib/config-ui": "^10.10.2",
13+
"@pie-lib/config-ui": "^10.10.9",
1414
"lodash": "^4.17.15",
1515
"prop-types": "^15.6.2",
1616
"react": "^16.8.1",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"@material-ui/core": "^3.9.2",
99
"@material-ui/icons": "^3.0.1",
1010
"@pie-framework/pie-configure-events": "^1.2.0",
11-
"@pie-lib/config-ui": "^10.10.2",
12-
"@pie-lib/editable-html": "^7.17.2",
11+
"@pie-lib/config-ui": "^10.10.9",
12+
"@pie-lib/editable-html": "^7.17.9",
1313
"classnames": "^2.2.6",
1414
"debug": "^3.1.0",
1515
"lodash": "^4.17.15",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
"dependencies": {
1111
"@material-ui/core": "^3.9.2",
1212
"@pie-framework/pie-configure-events": "^1.2.0",
13-
"@pie-lib/config-ui": "^10.10.2",
14-
"@pie-lib/editable-html": "^7.17.2",
13+
"@pie-lib/config-ui": "^10.10.9",
14+
"@pie-lib/editable-html": "^7.17.9",
1515
"lodash": "^4.17.15",
1616
"prop-types": "^15.6.2",
1717
"react": "^16.8.1",

0 commit comments

Comments
 (0)