Skip to content

Commit 7476d9a

Browse files
CarlaCosteaCarlaCostea
authored
Merge pull request #2698 from pie-framework/fix/PD-5135
fix: call renderMath in categories PD-5135
2 parents e70b36c + 7434408 commit 7476d9a

84 files changed

Lines changed: 112 additions & 86 deletions

File tree

Some content is hidden

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"dependencies": {
99
"@material-ui/core": "^3.9.2",
1010
"@pie-framework/pie-configure-events": "^1.3.0",
11-
"@pie-lib/pie-toolbox": "2.22.2",
11+
"@pie-lib/pie-toolbox": "2.22.3",
1212
"debug": "^3.1.0",
1313
"lodash": "^4.17.15",
1414
"prop-types": "^15.6.2",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"main": "lib/index.js",
77
"module": "src/index.js",
88
"dependencies": {
9-
"@pie-lib/pie-toolbox": "2.22.2",
9+
"@pie-lib/pie-toolbox": "2.22.3",
1010
"debug": "^3.1.0",
1111
"lodash": "^4.17.15"
1212
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"dependencies": {
1010
"@material-ui/core": "^3.9.2",
1111
"@pie-framework/pie-player-events": "^0.1.0",
12-
"@pie-lib/pie-toolbox": "2.22.2",
12+
"@pie-lib/pie-toolbox": "2.22.3",
1313
"prop-types": "^15.6.1",
1414
"react": "^16.8.1",
1515
"react-dom": "^16.8.1"

‎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.3.0",
10-
"@pie-lib/pie-toolbox": "2.22.2",
10+
"@pie-lib/pie-toolbox": "2.22.3",
1111
"react": "^16.8.1",
1212
"react-dom": "^16.8.1"
1313
},

‎packages/categorize/configure/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"@material-ui/core": "^3.9.2",
1313
"@material-ui/icons": "^3.0.1",
1414
"@pie-framework/pie-configure-events": "^1.3.0",
15-
"@pie-lib/pie-toolbox": "2.22.2",
15+
"@pie-lib/pie-toolbox": "2.22.3",
1616
"classnames": "^2.2.5",
1717
"debug": "^3.1.0",
1818
"lodash": "^4.17.15",

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import React from 'react';
2+
import ReactDOM from 'react-dom';
23
import PropTypes from 'prop-types';
34
import { withStyles } from '@material-ui/core/styles';
45
import { choiceUtils as utils } from '@pie-lib/pie-toolbox/config-ui';
@@ -16,6 +17,7 @@ import Category from './category';
1617
import Header from '../header';
1718
import { generateValidationMessage, getMaxCategoryChoices } from '../../utils';
1819
import { RowLabel } from './RowLabel';
20+
import { renderMath } from '@pie-lib/pie-toolbox/math-rendering';
1921

2022
const styles = (theme) => ({
2123
categories: {
@@ -79,6 +81,30 @@ export class Categories extends React.Component {
7981
focusedEl: null,
8082
};
8183

84+
componentDidMount() {
85+
try {
86+
// eslint-disable-next-line react/no-find-dom-node
87+
const domNode = ReactDOM.findDOMNode(this);
88+
89+
renderMath(domNode);
90+
} catch (e) {
91+
// Added try-catch block to handle "Unable to find node on an unmounted component" error from tests, thrown because of the usage of shallow
92+
console.error('DOM not mounted');
93+
}
94+
}
95+
96+
componentDidUpdate() {
97+
try {
98+
// eslint-disable-next-line react/no-find-dom-node
99+
const domNode = ReactDOM.findDOMNode(this);
100+
101+
renderMath(domNode);
102+
} catch (e) {
103+
// Added try-catch block to handle "Unable to find node on an unmounted component" error from tests, thrown because of the usage of shallow
104+
console.error('DOM not mounted');
105+
}
106+
}
107+
82108
add = () => {
83109
const { model, categories: oldCategories } = this.props;
84110
const { categoriesPerRow, correctResponse, allowAlternateEnabled } = model;

‎packages/categorize/controller/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "@pie-element/categorize-controller",
33
"private": true,
44
"dependencies": {
5-
"@pie-lib/pie-toolbox": "2.22.2",
5+
"@pie-lib/pie-toolbox": "2.22.3",
66
"lodash": "^4.17.15"
77
},
88
"version": "7.9.1",

‎packages/categorize/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"dependencies": {
1212
"@material-ui/core": "^3.9.2",
1313
"@pie-framework/pie-player-events": "^0.1.0",
14-
"@pie-lib/pie-toolbox": "2.22.2",
14+
"@pie-lib/pie-toolbox": "2.22.3",
1515
"classnames": "^2.2.5",
1616
"debug": "^4.1.1",
1717
"lodash": "^4.17.15",

‎packages/charting/configure/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"dependencies": {
1010
"@material-ui/core": "^3.9.2",
1111
"@pie-framework/pie-configure-events": "^1.3.0",
12-
"@pie-lib/pie-toolbox": "2.22.2",
12+
"@pie-lib/pie-toolbox": "2.22.3",
1313
"classnames": "^2.2.5",
1414
"debug": "^4.1.1",
1515
"prop-types": "^15.6.2",

‎packages/charting/controller/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"test": "./node_modules/.bin/jest"
1010
},
1111
"dependencies": {
12-
"@pie-lib/pie-toolbox": "2.22.2",
12+
"@pie-lib/pie-toolbox": "2.22.3",
1313
"debug": "^4.1.1",
1414
"lodash": "^4.17.15"
1515
},

0 commit comments

Comments
 (0)