Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
bd981a0
chore(deps): bump nx from 22.5.0 to 22.7.8
dependabot[bot] Jul 31, 2026
b7dfd29
fix(multiple-choice, number-line): add render math in configure PIE-763
arimieandreea Aug 4, 2026
568a573
chore(deps): bump ip-address from 10.1.0 to 10.4.0
dependabot[bot] Aug 5, 2026
265b832
fix(match-list): improve keyboard drag-and-drop, collision detection …
andreeimiron Aug 6, 2026
6f3bba7
Merge pull request #3086 from pie-framework/dependabot/npm_and_yarn/n…
CarlaCostea Aug 7, 2026
7298928
Merge pull request #3088 from pie-framework/dependabot/npm_and_yarn/i…
CarlaCostea Aug 7, 2026
ed970a6
Merge pull request #3087 from pie-framework/fix/PIE-763
CarlaCostea Aug 7, 2026
7370e36
chore(deps-dev): bump postcss from 8.5.6 to 8.5.23
dependabot[bot] Aug 7, 2026
d47f74a
Merge pull request #3089 from pie-framework/feat/PIE-643
CarlaCostea Aug 7, 2026
f0395a9
fix(match-list/placement-ordering): scroll the interactive region hor…
PatriciaRomaniuc Aug 7, 2026
d8f7078
fix(multiple-choice, number-line): revert initial fix, avoid calling …
arimieandreea Aug 11, 2026
23dfd21
fix(hotspot): render hovered shape on top of other shapes PIE-900
andreeimiron Aug 12, 2026
6199e0e
feat(placement-ordering): add Tab/Shift+Tab keyboard accessibility su…
andreeimiron Aug 12, 2026
2521c50
Merge pull request #3090 from pie-framework/dependabot/npm_and_yarn/p…
CarlaCostea Aug 13, 2026
6e8a7c3
Merge pull request #3092 from pie-framework/fix/PIE-763-revert
CarlaCostea Aug 13, 2026
08a6086
Merge pull request #3091 from pie-framework/feat/PIE-766
CarlaCostea Aug 13, 2026
97b9c6c
Merge pull request #3093 from pie-framework/fix/PIE-900
CarlaCostea Aug 13, 2026
0bec0d6
Merge branch 'develop' into feat/PIE-767
CarlaCostea Aug 13, 2026
e25493d
Change collision detection method in DragProvider
CarlaCostea Aug 13, 2026
07f03f5
Merge pull request #3094 from pie-framework/feat/PIE-767
CarlaCostea Aug 13, 2026
1e035ff
chore: bump libs and shared-modules PIE-767, PIE-158
CarlaCostea Aug 13, 2026
cef96a5
Merge pull request #3095 from pie-framework/chore/bump-libs13Aug
CarlaCostea Aug 13, 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
27 changes: 27 additions & 0 deletions __mocks__/@dnd-kit/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,30 @@ export const closestCorners = jest.fn();
export const getFirstCollision = jest.fn();
export const pointerWithin = jest.fn();
export const rectIntersectionAlgorithm = jest.fn();

export const KeyboardCode = {
Space: 'Space',
Down: 'ArrowDown',
Right: 'ArrowRight',
Left: 'ArrowLeft',
Up: 'ArrowUp',
Esc: 'Escape',
Enter: 'Enter',
Tab: 'Tab',
};

// Mirrors dnd-kit's own defaultKeyboardCoordinateGetter (25px step per arrow key).
export const defaultKeyboardCoordinateGetter = (event, { currentCoordinates }) => {
switch (event.code) {
case KeyboardCode.Right:
return { ...currentCoordinates, x: currentCoordinates.x + 25 };
case KeyboardCode.Left:
return { ...currentCoordinates, x: currentCoordinates.x - 25 };
case KeyboardCode.Down:
return { ...currentCoordinates, y: currentCoordinates.y + 25 };
case KeyboardCode.Up:
return { ...currentCoordinates, y: currentCoordinates.y - 25 };
default:
return undefined;
}
};
22 changes: 11 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
"minimist": "^1.2.8",
"npm-check-updates": "^17.1.18",
"pacote": "^9.5.12",
"postcss": "8.5.6",
"postcss": "8.5.23",
"prettier": "^3.8.1",
"react": "18.3.1",
"react-dom": "18.3.1",
Expand All @@ -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.13",
"@pie-lib/config-ui": "13.0.13",
"@pie-lib/charting": "7.0.14",
"@pie-lib/config-ui": "13.0.14",
"@pie-lib/controller-utils": "2.0.3",
"@pie-lib/correct-answer-toggle": "4.0.5",
"@pie-lib/drag": "4.0.6",
"@pie-lib/editable-html": "13.0.8",
"@pie-lib/editable-html-tip-tap": "2.1.11",
"@pie-lib/drag": "4.1.0",
"@pie-lib/editable-html": "13.0.9",
"@pie-lib/editable-html-tip-tap": "2.1.12",
"@pie-lib/feedback": "2.0.2",
"@pie-lib/graphing-solution-set": "4.0.13",
"@pie-lib/graphing-solution-set": "4.0.14",
"@pie-lib/graphing-utils": "3.0.2",
"@pie-lib/graphing": "4.0.14",
"@pie-lib/graphing": "4.0.15",
"@pie-lib/icons": "4.0.3",
"@pie-lib/mask-markup": "3.0.13",
"@pie-lib/mask-markup": "3.0.14",
"@pie-lib/math-evaluator": "4.0.2",
"@pie-lib/math-input": "8.1.1",
"@pie-lib/math-rendering-accessible": "5.0.3",
"@pie-lib/math-rendering": "5.1.0",
"@pie-lib/math-toolbar": "3.0.6",
"@pie-lib/plot": "4.0.13",
"@pie-lib/plot": "4.0.14",
"@pie-lib/render-ui": "6.1.3",
"@pie-lib/rubric": "2.0.13",
"@pie-lib/rubric": "2.0.14",
"@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.13",
"@pie-lib/editable-html-tip-tap": "2.1.11",
"@pie-lib/config-ui": "13.0.14",
"@pie-lib/editable-html-tip-tap": "2.1.12",
"@pie-lib/render-ui": "6.1.3",
"debug": "^4.1.1",
"lodash-es": "^4.17.23",
Expand Down
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.13",
"@pie-lib/config-ui": "13.0.14",
"react": "18.3.1",
"react-dom": "18.3.1"
},
Expand Down
6 changes: 3 additions & 3 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.13",
"@pie-lib/drag": "4.0.6",
"@pie-lib/editable-html-tip-tap": "2.1.11",
"@pie-lib/config-ui": "13.0.14",
"@pie-lib/drag": "4.1.0",
"@pie-lib/editable-html-tip-tap": "2.1.12",
"@pie-lib/math-rendering": "5.1.0",
"@pie-lib/render-ui": "6.1.3",
"@pie-lib/translator": "4.0.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/categorize/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-player-events": "^0.1.0",
"@pie-lib/categorize": "2.0.2",
"@pie-lib/config-ui": "13.0.13",
"@pie-lib/config-ui": "13.0.14",
"@pie-lib/correct-answer-toggle": "4.0.5",
"@pie-lib/drag": "4.0.6",
"@pie-lib/drag": "4.1.0",
"@pie-lib/math-rendering": "5.1.0",
"@pie-lib/render-ui": "6.1.3",
"@pie-lib/translator": "4.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.13",
"@pie-lib/config-ui": "13.0.13",
"@pie-lib/editable-html-tip-tap": "2.1.11",
"@pie-lib/charting": "7.0.14",
"@pie-lib/config-ui": "13.0.14",
"@pie-lib/editable-html-tip-tap": "2.1.12",
"@pie-lib/math-rendering": "5.1.0",
"@pie-lib/render-ui": "6.1.3",
"debug": "^4.1.1",
Expand Down
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.13",
"@pie-lib/charting": "7.0.14",
"@pie-lib/correct-answer-toggle": "4.0.5",
"@pie-lib/math-rendering": "5.1.0",
"@pie-lib/render-ui": "6.1.3",
Expand Down
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.13",
"@pie-lib/config-ui": "13.0.14",
"@pie-lib/render-ui": "6.1.3",
"@pie-lib/rubric": "2.0.13",
"@pie-lib/rubric": "2.0.14",
"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.13",
"@pie-lib/rubric": "2.0.14",
"classnames": "^2.2.6",
"debug": "^4.1.1",
"lodash-es": "^4.17.23",
Expand Down
6 changes: 3 additions & 3 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.13",
"@pie-lib/drag": "4.0.6",
"@pie-lib/editable-html-tip-tap": "2.1.11",
"@pie-lib/config-ui": "13.0.14",
"@pie-lib/drag": "4.1.0",
"@pie-lib/editable-html-tip-tap": "2.1.12",
"@pie-lib/math-rendering": "5.1.0",
"debug": "^4.1.1",
"lodash-es": "^4.17.23",
Expand Down
4 changes: 2 additions & 2 deletions packages/drag-in-the-blank/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
"@mui/material": "^7.3.4",
"@pie-framework/pie-player-events": "^0.1.0",
"@pie-lib/correct-answer-toggle": "4.0.5",
"@pie-lib/drag": "4.0.6",
"@pie-lib/mask-markup": "3.0.13",
"@pie-lib/drag": "4.1.0",
"@pie-lib/mask-markup": "3.0.14",
"@pie-lib/math-rendering": "5.1.0",
"@pie-lib/render-ui": "6.1.3",
"lodash-es": "^4.17.23",
Expand Down
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.13",
"@pie-lib/editable-html-tip-tap": "2.1.11",
"@pie-lib/config-ui": "13.0.14",
"@pie-lib/editable-html-tip-tap": "2.1.12",
"debug": "^4.1.1",
"lodash-es": "^4.17.23",
"prop-types": "^15.8.1",
Expand Down
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.13",
"@pie-lib/config-ui": "13.0.14",
"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.13",
"@pie-lib/editable-html-tip-tap": "2.1.11",
"@pie-lib/config-ui": "13.0.14",
"@pie-lib/editable-html-tip-tap": "2.1.12",
"classnames": "^2.2.6",
"debug": "^4.1.1",
"lodash-es": "^4.17.23",
Expand Down
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.5",
"@pie-lib/mask-markup": "3.0.13",
"@pie-lib/mask-markup": "3.0.14",
"@pie-lib/math-rendering": "5.1.0",
"@pie-lib/render-ui": "6.1.3",
"@pie-lib/translator": "4.0.2",
Expand Down
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.13",
"@pie-lib/editable-html-tip-tap": "2.1.11",
"@pie-lib/config-ui": "13.0.14",
"@pie-lib/editable-html-tip-tap": "2.1.12",
"lodash-es": "^4.17.23",
"prop-types": "^15.8.1",
"react": "18.3.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/extended-text-entry/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
"@mui/icons-material": "^7.3.4",
"@mui/material": "^7.3.4",
"@pie-framework/pie-player-events": "^0.1.0",
"@pie-lib/config-ui": "13.0.13",
"@pie-lib/editable-html-tip-tap": "2.1.11",
"@pie-lib/config-ui": "13.0.14",
"@pie-lib/editable-html-tip-tap": "2.1.12",
"@pie-lib/math-rendering": "5.1.0",
"@pie-lib/render-ui": "6.1.3",
"classnames": "^2.2.6",
Expand Down
4 changes: 2 additions & 2 deletions packages/fraction-model/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.13",
"@pie-lib/editable-html-tip-tap": "2.1.11",
"@pie-lib/config-ui": "13.0.14",
"@pie-lib/editable-html-tip-tap": "2.1.12",
"debug": "^4.1.1",
"lodash-es": "^4.17.23",
"prop-types": "^15.8.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/fraction-model/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"@mui/icons-material": "^7.3.4",
"@mui/material": "^7.3.4",
"@pie-framework/pie-player-events": "^0.1.0",
"@pie-lib/config-ui": "13.0.13",
"@pie-lib/config-ui": "13.0.14",
"@pie-lib/correct-answer-toggle": "4.0.5",
"@pie-lib/math-rendering": "5.1.0",
"@pie-lib/render-ui": "6.1.3",
Expand Down
6 changes: 3 additions & 3 deletions packages/graphing-solution-set/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.13",
"@pie-lib/editable-html-tip-tap": "2.1.11",
"@pie-lib/graphing-solution-set": "4.0.13",
"@pie-lib/config-ui": "13.0.14",
"@pie-lib/editable-html-tip-tap": "2.1.12",
"@pie-lib/graphing-solution-set": "4.0.14",
"@pie-lib/math-rendering": "5.1.0",
"classnames": "^2.2.6",
"debug": "^4.1.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/graphing-solution-set/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
"@mui/icons-material": "^7.3.4",
"@mui/material": "^7.3.4",
"@pie-framework/pie-player-events": "^0.1.0",
"@pie-lib/config-ui": "13.0.13",
"@pie-lib/config-ui": "13.0.14",
"@pie-lib/correct-answer-toggle": "4.0.5",
"@pie-lib/graphing-solution-set": "4.0.13",
"@pie-lib/graphing-solution-set": "4.0.14",
"@pie-lib/math-rendering": "5.1.0",
"@pie-lib/render-ui": "6.1.3",
"classnames": "^2.2.6",
Expand Down
6 changes: 3 additions & 3 deletions packages/graphing/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.13",
"@pie-lib/editable-html-tip-tap": "2.1.11",
"@pie-lib/graphing": "4.0.14",
"@pie-lib/config-ui": "13.0.14",
"@pie-lib/editable-html-tip-tap": "2.1.12",
"@pie-lib/graphing": "4.0.15",
"@pie-lib/math-rendering": "5.1.0",
"classnames": "^2.2.6",
"debug": "^4.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/graphing/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.5",
"@pie-lib/graphing": "4.0.14",
"@pie-lib/graphing": "4.0.15",
"@pie-lib/math-rendering": "5.1.0",
"@pie-lib/render-ui": "6.1.3",
"classnames": "^2.2.6",
Expand Down
4 changes: 2 additions & 2 deletions packages/hotspot/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.13",
"@pie-lib/editable-html-tip-tap": "2.1.11",
"@pie-lib/config-ui": "13.0.14",
"@pie-lib/editable-html-tip-tap": "2.1.12",
"debug": "^4.1.1",
"konva": "8.3.0",
"lodash-es": "^4.17.23",
Expand Down
29 changes: 28 additions & 1 deletion packages/hotspot/src/hotspot/circle.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,28 @@ class CircleComponent extends React.Component {
this.state = {
hovered: false,
};
this.groupRef = React.createRef();
}

componentDidMount() {
if (this.props.focused) {
this.moveGroupToTop();
}
}

componentDidUpdate(prevProps) {
// `focused` (keyboard focus) can turn on the hovered style without going through handleMouseEnter
if (!prevProps.focused && this.props.focused) {
this.moveGroupToTop();
}
}

moveGroupToTop = () => {
if (this.groupRef.current) {
this.groupRef.current.moveToTop();
}
};

handleClick = (e) => {
const { onClick, id, selected, disabled } = this.props;

Expand All @@ -28,6 +48,7 @@ class CircleComponent extends React.Component {
document.body.style.cursor = 'pointer';
}
this.setState({ hovered: true });
this.moveGroupToTop();
};

handleMouseLeave = () => {
Expand Down Expand Up @@ -92,7 +113,13 @@ class CircleComponent extends React.Component {
const useHoveredStyle = (hovered || focused) && hoverOutlineColor;

return (
<Group scaleX={scale} scaleY={scale} onMouseLeave={this.handleMouseLeave} onMouseEnter={this.handleMouseEnter}>
<Group
ref={this.groupRef}
scaleX={scale}
scaleY={scale}
onMouseLeave={this.handleMouseLeave}
onMouseEnter={this.handleMouseEnter}
>
<Circle
radius={radius}
fill={selected && selectedHotspotColor ? selectedHotspotColor : hotspotColor}
Expand Down
Loading
Loading