Skip to content
Merged

master #3055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
aeb4e0c
fix(rubric/math-observer): implement math rendering observer for impr…
PatriciaRomaniuc Jun 17, 2026
b7447f4
fix: if allowMultiplePlacements default should be false PIE-682
arimieandreea Jun 17, 2026
3f93d0d
fix: if allowMultiplePlacements is missing default should be false P…
arimieandreea Jun 17, 2026
22a5399
Merge pull request #3049 from pie-framework/fix/PIE-682
CarlaCostea Jun 18, 2026
7ba1005
Merge pull request #3048 from pie-framework/fix/PIE-671
CarlaCostea Jun 18, 2026
9b241e8
fix(extended-text-entry): re-render elements on reconnect PIE-672
CarlaCostea Jun 18, 2026
59d45d7
Merge pull request #3050 from pie-framework/fix/PIE-672-ete
CarlaCostea Jun 18, 2026
9d5923f
fix: handle webcomponent lifecycle on every element that misses it PI…
arimieandreea Jun 18, 2026
4e07188
fix: add done button when editing choice [PIE-683]
lakatosandrei Jun 19, 2026
40b5dc6
fix(drag-in-the-blank): update onChoiceDone to pass latest value from…
PatriciaRomaniuc Jun 19, 2026
a93d945
Merge pull request #3053 from pie-framework/fix/PIE-701
CarlaCostea Jun 22, 2026
6c15677
Merge pull request #3052 from pie-framework/fix/PIE-683
CarlaCostea Jun 22, 2026
75cb935
Merge pull request #3051 from pie-framework/fix/PIE-703
CarlaCostea Jun 22, 2026
78a3f64
fix: bump shared modules and libs PIE-674, PIE-662, PIE-705, PIE-674,…
CarlaCostea Jun 22, 2026
a5b5d41
Merge pull request #3054 from pie-framework/fix/bump-libs22Jun
CarlaCostea Jun 22, 2026
a230a25
fix(extended-text-entry): ensure StyledPrompt is displayed as a block…
PatriciaRomaniuc Jun 22, 2026
d73e9cc
Merge pull request #3056 from pie-framework/fix/PIE-692
CarlaCostea Jun 22, 2026
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
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@
"publish:beta:prerelease": "lerna publish prerelease --dist-tag beta --preid beta --force-publish --ignore-scripts",
"postinstall": "git config --local include.path ../.gitconfig",
"clean-install": "git clean -xdf . && yarn install && ./scripts/build babel",
"check-pie-lib-updates": "lerna exec -- npm-check-updates '@pie-lib/*' --pre --target prerelease",
"update-pie-lib": "lerna exec -- npm-check-updates '@pie-lib/*' --pre --target prerelease -u",
"check-pie-lib-updates": "lerna exec -- npm-check-updates '@pie-lib/*' --target latest",
"update-pie-lib": "lerna exec -- npm-check-updates '@pie-lib/*' --target latest -u && node scripts/sync-pie-lib-resolutions.js",
"check-pie-lib-next": "lerna exec -- npm-check-updates '@pie-lib/*' --pre --target prerelease --preid next",
"update-pie-lib-next": "lerna exec -- npm-check-updates '@pie-lib/*' --pre --target prerelease --preid next -u",
"update-pie-lib-next": "lerna exec -- npm-check-updates '@pie-lib/*' --pre --target prerelease --preid next -u && node scripts/sync-pie-lib-resolutions.js",
"health:scan": "pie-health scan packages",
"health:report": "pie-health report",
"health:serve": "pie-health serve",
Expand Down Expand Up @@ -89,27 +89,27 @@
"@jest/test-sequencer": "29.7.0",
"@types/d3-array": "3.0.3",
"@pie-lib/categorize": "2.0.2",
"@pie-lib/charting": "7.0.8",
"@pie-lib/config-ui": "13.0.8",
"@pie-lib/charting": "7.0.9",
"@pie-lib/config-ui": "13.0.9",
"@pie-lib/controller-utils": "2.0.2",
"@pie-lib/correct-answer-toggle": "4.0.4",
"@pie-lib/drag": "4.0.5",
"@pie-lib/editable-html": "13.0.5",
"@pie-lib/editable-html-tip-tap": "2.1.6",
"@pie-lib/editable-html-tip-tap": "2.1.7",
"@pie-lib/feedback": "2.0.2",
"@pie-lib/graphing-solution-set": "4.0.8",
"@pie-lib/graphing-solution-set": "4.0.9",
"@pie-lib/graphing-utils": "3.0.2",
"@pie-lib/graphing": "4.0.9",
"@pie-lib/graphing": "4.0.10",
"@pie-lib/icons": "4.0.3",
"@pie-lib/mask-markup": "3.0.8",
"@pie-lib/mask-markup": "3.0.9",
"@pie-lib/math-evaluator": "4.0.2",
"@pie-lib/math-input": "8.1.1",
"@pie-lib/math-rendering-accessible": "5.0.2",
"@pie-lib/math-rendering": "5.0.2",
"@pie-lib/math-toolbar": "3.0.4",
"@pie-lib/plot": "4.0.8",
"@pie-lib/plot": "4.0.9",
"@pie-lib/render-ui": "6.1.2",
"@pie-lib/rubric": "2.0.8",
"@pie-lib/rubric": "2.0.9",
"@pie-lib/scoring-config": "5.0.3",
"@pie-lib/style-utils": "2.0.2",
"@pie-lib/test-utils": "2.0.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/boilerplate-item-type/configure/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"@mui/icons-material": "^7.3.4",
"@mui/material": "^7.3.4",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/config-ui": "13.0.8",
"@pie-lib/editable-html-tip-tap": "2.1.6",
"@pie-lib/config-ui": "13.0.9",
"@pie-lib/editable-html-tip-tap": "2.1.7",
"@pie-lib/render-ui": "6.1.2",
"debug": "^4.1.1",
"lodash-es": "^4.17.23",
Expand Down
1 change: 1 addition & 0 deletions packages/boilerplate-item-type/configure/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ export default class BoilerplateItemTypeConfigure extends HTMLElement {
disconnectedCallback() {
if (this._root) {
this._root.unmount();
this._root = null;
}
}
}
1 change: 1 addition & 0 deletions packages/boilerplate-item-type/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ export default class BoilerplateItemType extends HTMLElement {
disconnectedCallback() {
if (this._root) {
this._root.unmount();
this._root = null;
}
}
}
2 changes: 1 addition & 1 deletion packages/calculator/configure/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"@mui/material": "^7.3.4",
"@pie-framework/material-ui-calculator": "4.0.0",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/config-ui": "13.0.8",
"@pie-lib/config-ui": "13.0.9",
"react": "18.3.1",
"react-dom": "18.3.1"
},
Expand Down
1 change: 1 addition & 0 deletions packages/calculator/configure/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ export default class Calculator extends HTMLElement {
disconnectedCallback() {
if (this._root) {
this._root.unmount();
this._root = null;
}
}
}
1 change: 1 addition & 0 deletions packages/calculator/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ export default class Calculator extends HTMLElement {
disconnectedCallback() {
if (this._root) {
this._root.unmount();
this._root = null;
}
}
}
4 changes: 2 additions & 2 deletions packages/categorize/configure/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
"@mui/material": "^7.3.4",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/categorize": "2.0.2",
"@pie-lib/config-ui": "13.0.8",
"@pie-lib/config-ui": "13.0.9",
"@pie-lib/drag": "4.0.5",
"@pie-lib/editable-html-tip-tap": "2.1.6",
"@pie-lib/editable-html-tip-tap": "2.1.7",
"@pie-lib/math-rendering": "5.0.2",
"@pie-lib/render-ui": "6.1.2",
"@pie-lib/translator": "4.0.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/categorize/configure/src/defaults.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export default {
model: {
allowAlternateEnabled: true,
allowMaxChoicesPerCategory: false,
allowMultiplePlacementsEnabled: multiplePlacements.enabled,
allowMultiplePlacementsEnabled: multiplePlacements.disabled,
alternates: [],
categories: [],
categoriesPerRow: 2,
Expand Down
2 changes: 1 addition & 1 deletion packages/categorize/controller/src/defaults.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { multiplePlacements } from './utils';

export default {
allowMultiplePlacementsEnabled: multiplePlacements.enabled,
allowMultiplePlacementsEnabled: multiplePlacements.disabled,
alternates: [],
categories: [],
categoriesPerRow: 2,
Expand Down
2 changes: 1 addition & 1 deletion packages/categorize/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@mui/material": "^7.3.4",
"@pie-framework/pie-player-events": "^0.1.0",
"@pie-lib/categorize": "2.0.2",
"@pie-lib/config-ui": "13.0.8",
"@pie-lib/config-ui": "13.0.9",
"@pie-lib/correct-answer-toggle": "4.0.4",
"@pie-lib/drag": "4.0.5",
"@pie-lib/math-rendering": "5.0.2",
Expand Down
6 changes: 3 additions & 3 deletions packages/charting/configure/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"@mui/icons-material": "^7.3.4",
"@mui/material": "^7.3.4",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/charting": "7.0.8",
"@pie-lib/config-ui": "13.0.8",
"@pie-lib/editable-html-tip-tap": "2.1.6",
"@pie-lib/charting": "7.0.9",
"@pie-lib/config-ui": "13.0.9",
"@pie-lib/editable-html-tip-tap": "2.1.7",
"@pie-lib/math-rendering": "5.0.2",
"@pie-lib/render-ui": "6.1.2",
"debug": "^4.1.1",
Expand Down
5 changes: 5 additions & 0 deletions packages/charting/configure/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,14 @@ export default class GraphLinesConfigure extends HTMLElement {
}
}

connectedCallback() {
this._render();
}

disconnectedCallback() {
if (this._root) {
this._root.unmount();
this._root = null;
}
}
}
2 changes: 1 addition & 1 deletion packages/charting/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"@mui/icons-material": "^7.3.4",
"@mui/material": "^7.3.4",
"@pie-framework/pie-player-events": "^0.1.0",
"@pie-lib/charting": "7.0.8",
"@pie-lib/charting": "7.0.9",
"@pie-lib/correct-answer-toggle": "4.0.4",
"@pie-lib/math-rendering": "5.0.2",
"@pie-lib/render-ui": "6.1.2",
Expand Down
1 change: 1 addition & 0 deletions packages/charting/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ export default class Graphing extends HTMLElement {
this._disconnectMathObserver();
if (this._root) {
this._root.unmount();
this._root = null;
}
}
}
4 changes: 2 additions & 2 deletions packages/complex-rubric/configure/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"@pie-element/multi-trait-rubric": "^8.1.0",
"@pie-element/rubric": "^8.1.0",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/config-ui": "13.0.8",
"@pie-lib/config-ui": "13.0.9",
"@pie-lib/render-ui": "6.1.2",
"@pie-lib/rubric": "2.0.8",
"@pie-lib/rubric": "2.0.9",
"debug": "^4.1.1",
"lodash-es": "^4.17.23",
"prop-types": "^15.8.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/complex-rubric/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@pie-element/multi-trait-rubric": "^8.1.0",
"@pie-element/rubric": "^8.1.0",
"@pie-framework/pie-player-events": "^0.1.0",
"@pie-lib/rubric": "2.0.8",
"@pie-lib/rubric": "2.0.9",
"classnames": "^2.2.6",
"debug": "^4.1.1",
"lodash-es": "^4.17.23",
Expand Down
4 changes: 2 additions & 2 deletions packages/drag-in-the-blank/configure/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"@mui/icons-material": "^7.3.4",
"@mui/material": "^7.3.4",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/config-ui": "13.0.8",
"@pie-lib/config-ui": "13.0.9",
"@pie-lib/drag": "4.0.5",
"@pie-lib/editable-html-tip-tap": "2.1.6",
"@pie-lib/editable-html-tip-tap": "2.1.7",
"@pie-lib/math-rendering": "5.0.2",
"debug": "^4.1.1",
"lodash-es": "^4.17.23",
Expand Down
16 changes: 12 additions & 4 deletions packages/drag-in-the-blank/configure/src/choices.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -134,12 +134,20 @@ export class Choices extends React.Component {
onChange(newChoices);
};

onChoiceDone = (choiceId) => {
onChoiceDone = (choiceId, latestValue) => {
const { onChange, model } = this.props;
const { choices } = model;
const currentChoice = (choices || []).find((c) => c.id === choiceId);

if (!currentChoice || !choiceIsEmpty(currentChoice)) {
// model.choices[i].value can be stale when the editor's onChange did not fire for the most recent edit
// (for example, image uploads). In that case, we want to use the latest value from the editor.
const effectiveValue = latestValue !== undefined ? latestValue : currentChoice && currentChoice.value;

if (!currentChoice || !choiceIsEmpty({ value: effectiveValue })) {
if (currentChoice && currentChoice.value !== effectiveValue) {
const newChoices = (choices || []).map((c) => (c.id === choiceId ? { ...c, value: effectiveValue } : c));
onChange(newChoices);
}
this.setState({ focusedEl: undefined });
return;
}
Expand Down Expand Up @@ -270,12 +278,12 @@ export class Choices extends React.Component {

this.onChoiceChanged(choice.value, val, choice.id);
}}
onDone={() => {
onDone={(val) => {
if (this.preventDone) {
return;
}

this.onChoiceDone(choice.id);
this.onChoiceDone(choice.id, val);
}}
onBlur={(e) => {
const inInInsertCharacter = e.relatedTarget && e.relatedTarget.closest('.insert-character-dialog');
Expand Down
5 changes: 5 additions & 0 deletions packages/drag-in-the-blank/configure/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -158,9 +158,14 @@ export default class DragInTheBlank extends HTMLElement {
}, 0);
}

connectedCallback() {
this._render();
}

disconnectedCallback() {
if (this._root) {
this._root.unmount();
this._root = null;
}
}
}
2 changes: 1 addition & 1 deletion packages/drag-in-the-blank/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"@pie-framework/pie-player-events": "^0.1.0",
"@pie-lib/correct-answer-toggle": "4.0.4",
"@pie-lib/drag": "4.0.5",
"@pie-lib/mask-markup": "3.0.8",
"@pie-lib/mask-markup": "3.0.9",
"@pie-lib/math-rendering": "5.0.2",
"@pie-lib/render-ui": "6.1.2",
"lodash-es": "^4.17.23",
Expand Down
1 change: 1 addition & 0 deletions packages/drag-in-the-blank/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,7 @@ export default class DragInTheBlank extends HTMLElement {

if (this._root) {
this._root.unmount();
this._root = null;
}
}
}
4 changes: 2 additions & 2 deletions packages/drawing-response/configure/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
"@mui/icons-material": "^7.3.4",
"@mui/material": "^7.3.4",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/config-ui": "13.0.8",
"@pie-lib/editable-html-tip-tap": "2.1.6",
"@pie-lib/config-ui": "13.0.9",
"@pie-lib/editable-html-tip-tap": "2.1.7",
"debug": "^4.1.1",
"lodash-es": "^4.17.23",
"prop-types": "^15.8.1",
Expand Down
5 changes: 5 additions & 0 deletions packages/drawing-response/configure/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,14 @@ export default class DrawableResponseConfigure extends HTMLElement {
this._root.render(element);
}

connectedCallback() {
this._render();
}

disconnectedCallback() {
if (this._root) {
this._root.unmount();
this._root = null;
}
}
}
1 change: 1 addition & 0 deletions packages/drawing-response/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ export default class DrawingResponse extends HTMLElement {
disconnectedCallback() {
if (this._root) {
this._root.unmount();
this._root = null;
}
}
}
2 changes: 1 addition & 1 deletion packages/ebsr/configure/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"@mui/material": "^7.3.4",
"@pie-element/multiple-choice": "^13.2.0",
"@pie-framework/pie-configure-events": "^1.2.0",
"@pie-lib/config-ui": "13.0.8",
"@pie-lib/config-ui": "13.0.9",
"lodash-es": "^4.17.23",
"prop-types": "^15.8.1",
"react": "18.3.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/explicit-constructed-response/configure/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
"@mui/icons-material": "^7.3.4",
"@mui/material": "^7.3.4",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/config-ui": "13.0.8",
"@pie-lib/editable-html-tip-tap": "2.1.6",
"@pie-lib/config-ui": "13.0.9",
"@pie-lib/editable-html-tip-tap": "2.1.7",
"classnames": "^2.2.6",
"debug": "^4.1.1",
"lodash-es": "^4.17.23",
Expand Down
5 changes: 5 additions & 0 deletions packages/explicit-constructed-response/configure/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -174,9 +174,14 @@ export default class ExplicitConstructedResponse extends HTMLElement {
this._root.render(element);
}

connectedCallback() {
this._render();
}

disconnectedCallback() {
if (this._root) {
this._root.unmount();
this._root = null;
}
}
}
2 changes: 1 addition & 1 deletion packages/explicit-constructed-response/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"@mui/material": "^7.3.4",
"@pie-framework/pie-player-events": "^0.1.0",
"@pie-lib/correct-answer-toggle": "4.0.4",
"@pie-lib/mask-markup": "3.0.8",
"@pie-lib/mask-markup": "3.0.9",
"@pie-lib/math-rendering": "5.0.2",
"@pie-lib/render-ui": "6.1.2",
"@pie-lib/translator": "4.0.2",
Expand Down
1 change: 1 addition & 0 deletions packages/explicit-constructed-response/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ export default class InlineDropdown extends HTMLElement {
disconnectedCallback() {
if (this._root) {
this._root.unmount();
this._root = null;
}
}
}
4 changes: 2 additions & 2 deletions packages/extended-text-entry/configure/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"@mui/icons-material": "^7.3.4",
"@mui/material": "^7.3.4",
"@pie-framework/pie-configure-events": "^1.3.0",
"@pie-lib/config-ui": "13.0.8",
"@pie-lib/editable-html-tip-tap": "2.1.6",
"@pie-lib/config-ui": "13.0.9",
"@pie-lib/editable-html-tip-tap": "2.1.7",
"lodash-es": "^4.17.23",
"prop-types": "^15.8.1",
"react": "18.3.1",
Expand Down
Loading
Loading