Skip to content

merge #2844

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CarlaCostea merged 12 commits into from
Nov 27, 2025
Merged

merge #2844

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
066bf5c
Merge pull request #2832 from pie-framework/master
CarlaCostea Oct 23, 2025
8685fe6
fix(likert, matrix): handle disabled color, add important for radio s…
arimieandreea Oct 24, 2025
bc282d1
feat: remove list tools from extended-text-entry player view PD-5266
CarlaCostea Nov 4, 2025
4648663
fix: tests
CarlaCostea Nov 4, 2025
eae0f5f
update shuffled values structure to be per response area PD-5248
andreeimiron Nov 7, 2025
8dc646d
update shuffled values structure to be per response area PD-5248
andreeimiron Nov 10, 2025
5b9317e
Merge pull request #2838 from pie-framework/fix/PD-5248-hotfix
CarlaCostea Nov 27, 2025
79d379c
Merge pull request #2837 from pie-framework/fix/PD-5248
CarlaCostea Nov 27, 2025
529ca2f
Merge pull request #2834 from pie-framework/feat/PD-5266
CarlaCostea Nov 27, 2025
5ca99df
Merge pull request #2833 from pie-framework/fix/PD-5274
CarlaCostea Nov 27, 2025
7610b25
fix: bump libs PD-5274, PD-5211, PD-5248
CarlaCostea Nov 27, 2025
f431e4a
fix: add babel-loader
CarlaCostea Nov 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 17 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
"babel-core": "^7.0.0-bridge.0",
"babel-eslint": "^9.0.0",
"babel-jest": "^23.4.2",
"babel-loader": "^8.0.0",
"chalk": "^2.4.2",
"child-process-promise": "^2.2.1",
"debug": "^4.1.1",
Expand Down Expand Up @@ -61,6 +62,21 @@
"rollup-plugin-analyzer": "^4.0.0"
},
"resolutions": {
"@types/d3-array": "3.0.3"
"@types/d3-array": "3.0.3",
"@pie-lib/charting": "5.36.2",
"@pie-lib/config-ui": "11.30.2",
"@pie-lib/controller-utils": "0.22.2",
"@pie-lib/correct-answer-toggle": "2.25.2",
"@pie-lib/drag": "2.22.2",
"@pie-lib/editable-html": "11.21.2",
"@pie-lib/graphing-solution-set": "2.34.2",
"@pie-lib/graphing": "2.34.2",
"@pie-lib/mask-markup": "1.33.2",
"@pie-lib/math-toolbar": "1.31.2",
"@pie-lib/plot": "2.27.2",
"@pie-lib/render-ui": "4.35.2",
"@pie-lib/rubric": "0.28.2",
"@pie-lib/scoring-config": "3.26.2",
"@pie-lib/text-select": "1.32.2"
}
}
4 changes: 2 additions & 2 deletions packages/boilerplate-item-type/configure/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"dependencies": {
"@material-ui/core": "^3.9.2",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/config-ui": "^11.30.1",
"@pie-lib/editable-html": "^11.21.1",
"@pie-lib/config-ui": "11.30.2",
"@pie-lib/editable-html": "11.21.2",
"debug": "^3.1.0",
"lodash": "^4.17.15",
"prop-types": "^15.6.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/boilerplate-item-type/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"dependencies": {
"@material-ui/core": "^3.9.2",
"@pie-framework/pie-player-events": "^0.1.0",
"@pie-lib/math-rendering": "^3.22.1",
"@pie-lib/render-ui": "^4.35.1",
"@pie-lib/math-rendering": "3.22.1",
"@pie-lib/render-ui": "4.35.2",
"prop-types": "^15.6.1",
"react": "^16.8.1",
"react-dom": "^16.8.1"
Expand Down
2 changes: 1 addition & 1 deletion packages/calculator/configure/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"dependencies": {
"@material-ui/core": "^3.9.2",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/config-ui": "^11.30.1",
"@pie-lib/config-ui": "11.30.2",
"react": "^16.8.1",
"react-dom": "^16.8.1"
},
Expand Down
14 changes: 7 additions & 7 deletions packages/categorize/configure/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
"@material-ui/core": "^3.9.2",
"@material-ui/icons": "^3.0.1",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/categorize": "^0.28.1",
"@pie-lib/config-ui": "^11.30.1",
"@pie-lib/drag": "^2.22.1",
"@pie-lib/editable-html": "^11.21.1",
"@pie-lib/math-rendering": "^3.22.1",
"@pie-lib/render-ui": "^4.35.1",
"@pie-lib/translator": "^2.23.1",
"@pie-lib/categorize": "0.28.1",
"@pie-lib/config-ui": "11.30.2",
"@pie-lib/drag": "2.22.2",
"@pie-lib/editable-html": "11.21.2",
"@pie-lib/math-rendering": "3.22.1",
"@pie-lib/render-ui": "4.35.2",
"@pie-lib/translator": "2.23.1",
"classnames": "^2.2.5",
"debug": "^3.1.0",
"lodash": "^4.17.15",
Expand Down
8 changes: 4 additions & 4 deletions packages/categorize/controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
"name": "@pie-element/categorize-controller",
"private": true,
"dependencies": {
"@pie-lib/categorize": "^0.28.1",
"@pie-lib/controller-utils": "^0.22.1",
"@pie-lib/feedback": "^0.24.1",
"@pie-lib/translator": "^2.23.1",
"@pie-lib/categorize": "0.28.1",
"@pie-lib/controller-utils": "0.22.2",
"@pie-lib/feedback": "0.24.1",
"@pie-lib/translator": "2.23.1",
"lodash": "^4.17.15"
},
"version": "8.3.2",
Expand Down
14 changes: 7 additions & 7 deletions packages/categorize/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@
"dependencies": {
"@material-ui/core": "^3.9.2",
"@pie-framework/pie-player-events": "^0.1.0",
"@pie-lib/categorize": "^0.28.1",
"@pie-lib/config-ui": "^11.30.1",
"@pie-lib/correct-answer-toggle": "^2.25.1",
"@pie-lib/drag": "^2.22.1",
"@pie-lib/math-rendering": "^3.22.1",
"@pie-lib/render-ui": "^4.35.1",
"@pie-lib/translator": "^2.23.1",
"@pie-lib/categorize": "0.28.1",
"@pie-lib/config-ui": "11.30.2",
"@pie-lib/correct-answer-toggle": "2.25.2",
"@pie-lib/drag": "2.22.2",
"@pie-lib/math-rendering": "3.22.1",
"@pie-lib/render-ui": "4.35.2",
"@pie-lib/translator": "2.23.1",
"classnames": "^2.2.5",
"debug": "^4.1.1",
"lodash": "^4.17.15",
Expand Down
8 changes: 4 additions & 4 deletions packages/charting/configure/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
"dependencies": {
"@material-ui/core": "^3.9.2",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/charting": "^5.36.1",
"@pie-lib/config-ui": "^11.30.1",
"@pie-lib/editable-html": "^11.21.1",
"@pie-lib/charting": "5.36.2",
"@pie-lib/config-ui": "11.30.2",
"@pie-lib/editable-html": "11.21.2",
"@pie-lib/math-rendering": "3.22.1",
"@pie-lib/render-ui": "^4.35.1",
"@pie-lib/render-ui": "4.35.2",
"classnames": "^2.2.5",
"debug": "^4.1.1",
"prop-types": "^15.6.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/charting/controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"test": "./node_modules/.bin/jest"
},
"dependencies": {
"@pie-lib/controller-utils": "^0.22.1",
"@pie-lib/controller-utils": "0.22.2",
"debug": "^4.1.1",
"lodash": "^4.17.15"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/charting/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"dependencies": {
"@material-ui/core": "^3.9.2",
"@pie-framework/pie-player-events": "^0.1.0",
"@pie-lib/charting": "^5.36.1",
"@pie-lib/correct-answer-toggle": "^2.25.1",
"@pie-lib/charting": "5.36.2",
"@pie-lib/correct-answer-toggle": "2.25.2",
"@pie-lib/math-rendering": "3.22.1",
"@pie-lib/render-ui": "^4.35.1",
"@pie-lib/render-ui": "4.35.2",
"classnames": "^2.2.5",
"debug": "^4.1.1",
"lodash": "^4.17.15",
Expand Down
6 changes: 3 additions & 3 deletions packages/complex-rubric/configure/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"@pie-element/multi-trait-rubric": "^6.3.2",
"@pie-element/rubric": "^6.3.2",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/config-ui": "^11.30.1",
"@pie-lib/render-ui": "^4.35.1",
"@pie-lib/rubric": "^0.28.1",
"@pie-lib/config-ui": "11.30.2",
"@pie-lib/render-ui": "4.35.2",
"@pie-lib/rubric": "0.28.2",
"debug": "^4.1.1",
"lodash": "^4.17.15",
"prop-types": "^15.6.2",
Expand Down
8 changes: 4 additions & 4 deletions packages/drag-in-the-blank/configure/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@
"@material-ui/core": "^3.9.2",
"@material-ui/icons": "^3.0.1",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/config-ui": "^11.30.1",
"@pie-lib/drag": "^2.22.1",
"@pie-lib/editable-html": "^11.21.1",
"@pie-lib/math-rendering": "^3.22.1",
"@pie-lib/config-ui": "11.30.2",
"@pie-lib/drag": "2.22.2",
"@pie-lib/editable-html": "11.21.2",
"@pie-lib/math-rendering": "3.22.1",
"debug": "^3.1.0",
"lodash": "^4.17.15",
"prop-types": "^15.6.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/drag-in-the-blank/controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"author": "",
"license": "ISC",
"dependencies": {
"@pie-lib/controller-utils": "^0.22.1",
"@pie-lib/controller-utils": "0.22.2",
"debug": "^3.1.0",
"lodash": "^4.17.15",
"type-of": "^2.0.1"
Expand Down
10 changes: 5 additions & 5 deletions packages/drag-in-the-blank/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
"dependencies": {
"@material-ui/core": "^3.9.2",
"@pie-framework/pie-player-events": "^0.1.0",
"@pie-lib/correct-answer-toggle": "^2.25.1",
"@pie-lib/drag": "^2.22.1",
"@pie-lib/mask-markup": "^1.33.1",
"@pie-lib/math-rendering": "^3.22.1",
"@pie-lib/render-ui": "^4.35.1",
"@pie-lib/correct-answer-toggle": "2.25.2",
"@pie-lib/drag": "2.22.2",
"@pie-lib/mask-markup": "1.33.2",
"@pie-lib/math-rendering": "3.22.1",
"@pie-lib/render-ui": "4.35.2",
"classnames": "^2.2.5",
"lodash": "^4.17.10",
"prop-types": "^15.6.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/drawing-response/configure/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"dependencies": {
"@material-ui/core": "^3.9.2",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/config-ui": "^11.30.1",
"@pie-lib/editable-html": "^11.21.1",
"@pie-lib/config-ui": "11.30.2",
"@pie-lib/editable-html": "11.21.2",
"classnames": "^2.2.6",
"debug": "^3.1.0",
"lodash": "^4.17.15",
Expand Down
6 changes: 3 additions & 3 deletions packages/drawing-response/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"@mdi/js": "^3.6.95",
"@mdi/react": "^1.1.1",
"@pie-framework/pie-player-events": "^0.1.0",
"@pie-lib/math-rendering": "^3.22.1",
"@pie-lib/render-ui": "^4.35.1",
"@pie-lib/translator": "^2.23.1",
"@pie-lib/math-rendering": "3.22.1",
"@pie-lib/render-ui": "4.35.2",
"@pie-lib/translator": "2.23.1",
"classnames": "^2.2.6",
"enzyme-to-json": "^3.3.5",
"konva": "^3.4.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/ebsr/configure/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"@material-ui/core": "^3.9.2",
"@pie-element/multiple-choice": "^11.4.2",
"@pie-framework/pie-configure-events": "^1.2.0",
"@pie-lib/config-ui": "^11.30.1",
"@pie-lib/config-ui": "11.30.2",
"lodash": "^4.17.15",
"prop-types": "^15.6.2",
"react": "^16.8.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/ebsr/controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
"test": "echo \"Error: no test specified\" && exit 1"
},
"dependencies": {
"@pie-lib/controller-utils": "^0.22.1",
"@pie-lib/translator": "^2.23.1",
"@pie-lib/controller-utils": "0.22.2",
"@pie-lib/translator": "2.23.1",
"lodash": "^4.17.15"
},
"author": "",
Expand Down
2 changes: 1 addition & 1 deletion packages/ebsr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"dependencies": {
"@pie-element/multiple-choice": "^11.4.2",
"@pie-framework/pie-player-events": "^0.1.0",
"@pie-lib/translator": "^2.23.1",
"@pie-lib/translator": "2.23.1",
"classnames": "^2.2.5",
"debug": "^4.1.1",
"lodash": "^4.17.11"
Expand Down
4 changes: 2 additions & 2 deletions packages/explicit-constructed-response/configure/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"@material-ui/core": "^3.9.2",
"@material-ui/icons": "^3.0.1",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/config-ui": "^11.30.1",
"@pie-lib/editable-html": "^11.21.1",
"@pie-lib/config-ui": "11.30.2",
"@pie-lib/editable-html": "11.21.2",
"classnames": "^2.2.6",
"debug": "^3.1.0",
"lodash": "^4.17.15",
Expand Down
4 changes: 2 additions & 2 deletions packages/explicit-constructed-response/controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"author": "",
"license": "ISC",
"dependencies": {
"@pie-lib/controller-utils": "^0.22.1",
"@pie-lib/translator": "^2.23.1",
"@pie-lib/controller-utils": "0.22.2",
"@pie-lib/translator": "2.23.1",
"debug": "^3.1.0",
"he": "^1.2.0",
"lodash": "^4.17.15",
Expand Down
10 changes: 5 additions & 5 deletions packages/explicit-constructed-response/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
"dependencies": {
"@material-ui/core": "^3.9.2",
"@pie-framework/pie-player-events": "^0.1.0",
"@pie-lib/correct-answer-toggle": "^2.25.1",
"@pie-lib/mask-markup": "^1.33.1",
"@pie-lib/math-rendering": "^3.22.1",
"@pie-lib/render-ui": "^4.35.1",
"@pie-lib/translator": "^2.23.1",
"@pie-lib/correct-answer-toggle": "2.25.2",
"@pie-lib/mask-markup": "1.33.2",
"@pie-lib/math-rendering": "3.22.1",
"@pie-lib/render-ui": "4.35.2",
"@pie-lib/translator": "2.23.1",
"classnames": "^2.2.5",
"he": "^1.2.0",
"lodash": "^4.17.10",
Expand Down
4 changes: 2 additions & 2 deletions packages/extended-text-entry/configure/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"dependencies": {
"@material-ui/core": "^3.9.2",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/config-ui": "^11.30.1",
"@pie-lib/editable-html": "^11.21.1",
"@pie-lib/config-ui": "11.30.2",
"@pie-lib/editable-html": "11.21.2",
"lodash": "^4.17.15",
"prop-types": "^15.6.2",
"react": "^16.8.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/extended-text-entry/controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"main": "lib/index.js",
"module": "src/index.js",
"dependencies": {
"@pie-lib/feedback": "^0.24.1"
"@pie-lib/feedback": "0.24.1"
},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
Expand Down
8 changes: 4 additions & 4 deletions packages/extended-text-entry/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
"@material-ui/core": "^3.9.2",
"@material-ui/icons": "^3.0.2",
"@pie-framework/pie-player-events": "^0.1.0",
"@pie-lib/config-ui": "^11.30.1",
"@pie-lib/editable-html": "^11.21.1",
"@pie-lib/math-rendering": "^3.22.1",
"@pie-lib/render-ui": "^4.35.1",
"@pie-lib/config-ui": "11.30.2",
"@pie-lib/editable-html": "11.21.2",
"@pie-lib/math-rendering": "3.22.1",
"@pie-lib/render-ui": "4.35.2",
"classnames": "^2.2.5",
"debug": "^4.1.1",
"lodash.throttle": "^4.1.1",
Expand Down
12 changes: 12 additions & 0 deletions packages/extended-text-entry/src/__tests__/__snapshots__/main.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,9 @@ exports[`Render Main Component should match snapshot 1`] = `
"disabled": true,
"keypadMode": undefined,
},
"ol_list": Object {
"disabled": true,
},
"separateParagraphs": Object {
"disabled": false,
},
Expand All @@ -35,6 +38,9 @@ exports[`Render Main Component should match snapshot 1`] = `
"textAlign": Object {
"disabled": true,
},
"ul_list": Object {
"disabled": true,
},
"video": Object {
"disabled": true,
},
Expand Down Expand Up @@ -90,6 +96,9 @@ exports[`Render Main Component should match snapshot with teacher instructions 1
"disabled": true,
"keypadMode": undefined,
},
"ol_list": Object {
"disabled": true,
},
"separateParagraphs": Object {
"disabled": false,
},
Expand All @@ -99,6 +108,9 @@ exports[`Render Main Component should match snapshot with teacher instructions 1
"textAlign": Object {
"disabled": true,
},
"ul_list": Object {
"disabled": true,
},
"video": Object {
"disabled": true,
},
Expand Down
2 changes: 2 additions & 0 deletions packages/extended-text-entry/src/main.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,8 @@ export class Main extends React.Component {
disabled: true,
},
separateParagraphs: { disabled: false },
ul_list: { disabled: true },
ol_list: { disabled: true },
}}
languageCharactersProps={languageCharactersProps}
/>
Expand Down
4 changes: 2 additions & 2 deletions packages/fraction-model/configure/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
"dependencies": {
"@material-ui/core": "^3.9.2",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/config-ui": "^11.30.1",
"@pie-lib/editable-html": "^11.21.1",
"@pie-lib/config-ui": "11.30.2",
"@pie-lib/editable-html": "11.21.2",
"debug": "^3.1.0",
"lodash": "^4.17.15",
"prop-types": "^15.6.2",
Expand Down
Loading
Loading