diff --git a/package.json b/package.json index 055ed01089..0ead1bab0f 100644 --- a/package.json +++ b/package.json @@ -89,32 +89,32 @@ "@jest/test-sequencer": "29.7.0", "@types/d3-array": "3.0.3", "@pie-lib/categorize": "2.0.2", - "@pie-lib/charting": "7.0.6", - "@pie-lib/config-ui": "13.0.6", + "@pie-lib/charting": "7.0.7", + "@pie-lib/config-ui": "13.0.7", "@pie-lib/controller-utils": "2.0.2", - "@pie-lib/correct-answer-toggle": "4.0.3", - "@pie-lib/drag": "4.0.3", - "@pie-lib/editable-html": "13.0.3", - "@pie-lib/editable-html-tip-tap": "2.1.4", + "@pie-lib/correct-answer-toggle": "4.0.4", + "@pie-lib/drag": "4.0.4", + "@pie-lib/editable-html": "13.0.4", + "@pie-lib/editable-html-tip-tap": "2.1.5", "@pie-lib/feedback": "2.0.2", - "@pie-lib/graphing-solution-set": "4.0.6", + "@pie-lib/graphing-solution-set": "4.0.7", "@pie-lib/graphing-utils": "3.0.2", - "@pie-lib/graphing": "4.0.7", - "@pie-lib/icons": "4.0.2", - "@pie-lib/mask-markup": "3.0.6", + "@pie-lib/graphing": "4.0.8", + "@pie-lib/icons": "4.0.3", + "@pie-lib/mask-markup": "3.0.7", "@pie-lib/math-evaluator": "4.0.2", - "@pie-lib/math-input": "8.1.0", + "@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.3", - "@pie-lib/plot": "4.0.6", - "@pie-lib/render-ui": "6.1.1", - "@pie-lib/rubric": "2.0.6", - "@pie-lib/scoring-config": "5.0.2", + "@pie-lib/math-toolbar": "3.0.4", + "@pie-lib/plot": "4.0.7", + "@pie-lib/render-ui": "6.1.2", + "@pie-lib/rubric": "2.0.7", + "@pie-lib/scoring-config": "5.0.3", "@pie-lib/style-utils": "2.0.2", "@pie-lib/test-utils": "2.0.2", - "@pie-lib/text-select": "3.0.3", - "@pie-lib/tools": "2.0.2", + "@pie-lib/text-select": "3.0.4", + "@pie-lib/tools": "2.0.3", "@pie-lib/translator": "4.0.2", "@pie-framework/mathquill": "1.2.1-beta.1", "@tiptap/core": "3.20.0", diff --git a/packages/boilerplate-item-type/configure/package.json b/packages/boilerplate-item-type/configure/package.json index 2139f36cc4..58e710da29 100644 --- a/packages/boilerplate-item-type/configure/package.json +++ b/packages/boilerplate-item-type/configure/package.json @@ -11,9 +11,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.6", - "@pie-lib/editable-html-tip-tap": "2.1.4", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/editable-html-tip-tap": "2.1.5", + "@pie-lib/render-ui": "6.1.2", "debug": "^4.1.1", "lodash-es": "^4.17.23", "prop-types": "^15.8.1", diff --git a/packages/boilerplate-item-type/package.json b/packages/boilerplate-item-type/package.json index 80d561dc12..9dd3af6d2c 100644 --- a/packages/boilerplate-item-type/package.json +++ b/packages/boilerplate-item-type/package.json @@ -13,7 +13,7 @@ "@mui/material": "^7.3.4", "@pie-framework/pie-player-events": "^0.1.0", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/render-ui": "6.1.2", "prop-types": "^15.8.1", "react": "18.3.1", "react-dom": "18.3.1" diff --git a/packages/calculator/configure/package.json b/packages/calculator/configure/package.json index cc61cfb03e..d258d452d8 100644 --- a/packages/calculator/configure/package.json +++ b/packages/calculator/configure/package.json @@ -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.6", + "@pie-lib/config-ui": "13.0.7", "react": "18.3.1", "react-dom": "18.3.1" }, diff --git a/packages/categorize/configure/package.json b/packages/categorize/configure/package.json index db925924b8..e751c98720 100644 --- a/packages/categorize/configure/package.json +++ b/packages/categorize/configure/package.json @@ -16,11 +16,11 @@ "@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.6", - "@pie-lib/drag": "4.0.3", - "@pie-lib/editable-html-tip-tap": "2.1.4", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/drag": "4.0.4", + "@pie-lib/editable-html-tip-tap": "2.1.5", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/render-ui": "6.1.2", "@pie-lib/translator": "4.0.2", "debug": "^4.1.1", "lodash-es": "^4.17.23", diff --git a/packages/categorize/controller/src/index.js b/packages/categorize/controller/src/index.js index 2a20440df8..8cac3f3a07 100644 --- a/packages/categorize/controller/src/index.js +++ b/packages/categorize/controller/src/index.js @@ -6,7 +6,7 @@ import Translator from '@pie-lib/translator'; const { translator } = Translator; import defaults from './defaults'; -import { getCompleteResponseDetails, isAlternateDuplicated, isCorrectResponseDuplicated } from './utils'; +import { getCompleteResponseDetails, isAlternateDuplicated, isCorrectResponseDuplicated, multiplePlacements } from './utils'; // eslint-disable-next-line no-console @@ -154,6 +154,18 @@ export const model = async (question, session, env, updateSession) => { choices = await getShuffledChoices(choices, session, updateSession, 'id'); } + choices = (choices || []).map((c) => { + let categoryCount; + if (normalizedQuestion.allowMultiplePlacementsEnabled === multiplePlacements.enabled) { + categoryCount = 0; + } else if (normalizedQuestion.allowMultiplePlacementsEnabled === multiplePlacements.disabled) { + categoryCount = 1; + } else { + categoryCount = c.categoryCount || 0; + } + return { ...c, categoryCount }; + }); + if (!note) { note = translator.t('common:commonCorrectAnswerWithAlternates', { lng: language }); } @@ -235,7 +247,7 @@ export const getLogTrace = (model, session, env) => { if (draggedChoices > 0) { traceLog.push(`Student placed ${draggedChoices} choice(s) into categories.`); - (categories || []).forEach((category, categoryIndex) => { + (categories || []).forEach((category) => { const categoryId = category.id; const builtCategory = builtCategories.find(c => c.id === categoryId); const studentChoices = builtCategory ? builtCategory.choices || [] : []; @@ -268,11 +280,11 @@ export const getLogTrace = (model, session, env) => { } if (hasAlternates) { - traceLog.push(`Score calculated using all-or-nothing scoring (alternate responses disable partial scoring).`); - traceLog.push(`Student must get all categories completely correct to receive full credit.`); + traceLog.push('Score calculated using all-or-nothing scoring (alternate responses disable partial scoring).'); + traceLog.push('Student must get all categories completely correct to receive full credit.'); } else if (partialScoringEnabled) { - traceLog.push(`Score calculated using partial scoring.`); - traceLog.push(`Student receives credit for each correct placement, with deductions for incorrect placements beyond required amount.`); + traceLog.push('Score calculated using partial scoring.'); + traceLog.push('Student receives credit for each correct placement, with deductions for incorrect placements beyond required amount.'); if (draggedChoices > 0) { const totalCorrect = builtCategories.reduce((sum, cat) => @@ -289,8 +301,8 @@ export const getLogTrace = (model, session, env) => { } } } else { - traceLog.push(`Score calculated using all-or-nothing scoring.`); - traceLog.push(`Student must get all categories completely correct to receive full credit.`); + traceLog.push('Score calculated using all-or-nothing scoring.'); + traceLog.push('Student must get all categories completely correct to receive full credit.'); } const score = getTotalScore(model, session, env); diff --git a/packages/categorize/package.json b/packages/categorize/package.json index b96f0c3c94..070099053f 100644 --- a/packages/categorize/package.json +++ b/packages/categorize/package.json @@ -16,11 +16,11 @@ "@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.6", - "@pie-lib/correct-answer-toggle": "4.0.3", - "@pie-lib/drag": "4.0.3", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/correct-answer-toggle": "4.0.4", + "@pie-lib/drag": "4.0.4", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/render-ui": "6.1.2", "@pie-lib/translator": "4.0.2", "debug": "^4.1.1", "lodash-es": "^4.17.23", diff --git a/packages/charting/configure/package.json b/packages/charting/configure/package.json index bf78b525fa..f8ce2c5fee 100644 --- a/packages/charting/configure/package.json +++ b/packages/charting/configure/package.json @@ -12,11 +12,11 @@ "@mui/icons-material": "^7.3.4", "@mui/material": "^7.3.4", "@pie-framework/pie-configure-events": "^1.3.0", - "@pie-lib/charting": "7.0.6", - "@pie-lib/config-ui": "13.0.6", - "@pie-lib/editable-html-tip-tap": "2.1.4", + "@pie-lib/charting": "7.0.7", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/editable-html-tip-tap": "2.1.5", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/render-ui": "6.1.2", "debug": "^4.1.1", "prop-types": "^15.8.1", "react": "18.3.1", diff --git a/packages/charting/package.json b/packages/charting/package.json index 541e927505..bfd32e8f5c 100644 --- a/packages/charting/package.json +++ b/packages/charting/package.json @@ -15,10 +15,10 @@ "@mui/icons-material": "^7.3.4", "@mui/material": "^7.3.4", "@pie-framework/pie-player-events": "^0.1.0", - "@pie-lib/charting": "7.0.6", - "@pie-lib/correct-answer-toggle": "4.0.3", + "@pie-lib/charting": "7.0.7", + "@pie-lib/correct-answer-toggle": "4.0.4", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/render-ui": "6.1.2", "debug": "^4.1.1", "lodash-es": "^4.17.23", "react": "18.3.1", diff --git a/packages/complex-rubric/configure/package.json b/packages/complex-rubric/configure/package.json index 1d25ecca12..9319db767e 100644 --- a/packages/complex-rubric/configure/package.json +++ b/packages/complex-rubric/configure/package.json @@ -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.6", - "@pie-lib/render-ui": "6.1.1", - "@pie-lib/rubric": "2.0.6", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/render-ui": "6.1.2", + "@pie-lib/rubric": "2.0.7", "debug": "^4.1.1", "lodash-es": "^4.17.23", "prop-types": "^15.8.1", diff --git a/packages/complex-rubric/package.json b/packages/complex-rubric/package.json index d00138f3e1..85c954b84f 100644 --- a/packages/complex-rubric/package.json +++ b/packages/complex-rubric/package.json @@ -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.6", + "@pie-lib/rubric": "2.0.7", "classnames": "^2.2.6", "debug": "^4.1.1", "lodash-es": "^4.17.23", diff --git a/packages/drag-in-the-blank/configure/package.json b/packages/drag-in-the-blank/configure/package.json index 3698932185..7aeb141ca9 100644 --- a/packages/drag-in-the-blank/configure/package.json +++ b/packages/drag-in-the-blank/configure/package.json @@ -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.6", - "@pie-lib/drag": "4.0.3", - "@pie-lib/editable-html-tip-tap": "2.1.4", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/drag": "4.0.4", + "@pie-lib/editable-html-tip-tap": "2.1.5", "@pie-lib/math-rendering": "5.0.2", "debug": "^4.1.1", "lodash-es": "^4.17.23", diff --git a/packages/drag-in-the-blank/package.json b/packages/drag-in-the-blank/package.json index 956413b458..0bd06dd993 100644 --- a/packages/drag-in-the-blank/package.json +++ b/packages/drag-in-the-blank/package.json @@ -15,11 +15,11 @@ "@mui/icons-material": "^7.3.4", "@mui/material": "^7.3.4", "@pie-framework/pie-player-events": "^0.1.0", - "@pie-lib/correct-answer-toggle": "4.0.3", - "@pie-lib/drag": "4.0.3", - "@pie-lib/mask-markup": "3.0.6", + "@pie-lib/correct-answer-toggle": "4.0.4", + "@pie-lib/drag": "4.0.4", + "@pie-lib/mask-markup": "3.0.7", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/render-ui": "6.1.2", "lodash-es": "^4.17.23", "prop-types": "^15.8.1", "react": "18.3.1", diff --git a/packages/drawing-response/configure/package.json b/packages/drawing-response/configure/package.json index 8e27e2cf39..19fa2993e9 100644 --- a/packages/drawing-response/configure/package.json +++ b/packages/drawing-response/configure/package.json @@ -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.6", - "@pie-lib/editable-html-tip-tap": "2.1.4", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/editable-html-tip-tap": "2.1.5", "debug": "^4.1.1", "lodash-es": "^4.17.23", "prop-types": "^15.8.1", diff --git a/packages/drawing-response/package.json b/packages/drawing-response/package.json index 8c05c19d95..f10ab1b647 100644 --- a/packages/drawing-response/package.json +++ b/packages/drawing-response/package.json @@ -15,7 +15,7 @@ "@mui/material": "^7.3.4", "@pie-framework/pie-player-events": "^0.1.0", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/render-ui": "6.1.2", "@pie-lib/translator": "4.0.2", "konva": "8.3.0", "lodash-es": "^4.17.23", diff --git a/packages/ebsr/configure/package.json b/packages/ebsr/configure/package.json index 45f28bf550..a67e97c045 100644 --- a/packages/ebsr/configure/package.json +++ b/packages/ebsr/configure/package.json @@ -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.6", + "@pie-lib/config-ui": "13.0.7", "lodash-es": "^4.17.23", "prop-types": "^15.8.1", "react": "18.3.1", diff --git a/packages/explicit-constructed-response/configure/package.json b/packages/explicit-constructed-response/configure/package.json index 66a895783c..558e528c60 100644 --- a/packages/explicit-constructed-response/configure/package.json +++ b/packages/explicit-constructed-response/configure/package.json @@ -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.6", - "@pie-lib/editable-html-tip-tap": "2.1.4", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/editable-html-tip-tap": "2.1.5", "classnames": "^2.2.6", "debug": "^4.1.1", "lodash-es": "^4.17.23", diff --git a/packages/explicit-constructed-response/package.json b/packages/explicit-constructed-response/package.json index 68ce32f7ff..806c5278e8 100644 --- a/packages/explicit-constructed-response/package.json +++ b/packages/explicit-constructed-response/package.json @@ -15,10 +15,10 @@ "@mui/icons-material": "^7.3.4", "@mui/material": "^7.3.4", "@pie-framework/pie-player-events": "^0.1.0", - "@pie-lib/correct-answer-toggle": "4.0.3", - "@pie-lib/mask-markup": "3.0.6", + "@pie-lib/correct-answer-toggle": "4.0.4", + "@pie-lib/mask-markup": "3.0.7", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/render-ui": "6.1.2", "@pie-lib/translator": "4.0.2", "classnames": "^2.2.6", "he": "^1.2.0", diff --git a/packages/extended-text-entry/configure/package.json b/packages/extended-text-entry/configure/package.json index 4152469543..ebd55b21f4 100644 --- a/packages/extended-text-entry/configure/package.json +++ b/packages/extended-text-entry/configure/package.json @@ -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.6", - "@pie-lib/editable-html-tip-tap": "2.1.4", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/editable-html-tip-tap": "2.1.5", "lodash-es": "^4.17.23", "prop-types": "^15.8.1", "react": "18.3.1", diff --git a/packages/extended-text-entry/package.json b/packages/extended-text-entry/package.json index 0a7cf9b63e..ad63519d96 100644 --- a/packages/extended-text-entry/package.json +++ b/packages/extended-text-entry/package.json @@ -14,10 +14,10 @@ "@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.6", - "@pie-lib/editable-html-tip-tap": "2.1.4", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/editable-html-tip-tap": "2.1.5", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/render-ui": "6.1.2", "classnames": "^2.2.6", "debug": "^4.1.1", "lodash.throttle": "^4.1.1", diff --git a/packages/fraction-model/configure/package.json b/packages/fraction-model/configure/package.json index 37c1214e3c..c6cbd2db62 100644 --- a/packages/fraction-model/configure/package.json +++ b/packages/fraction-model/configure/package.json @@ -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.6", - "@pie-lib/editable-html-tip-tap": "2.1.4", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/editable-html-tip-tap": "2.1.5", "debug": "^4.1.1", "lodash-es": "^4.17.23", "prop-types": "^15.8.1", diff --git a/packages/fraction-model/controller/package.json b/packages/fraction-model/controller/package.json index af44841b4d..8d2a76edcf 100644 --- a/packages/fraction-model/controller/package.json +++ b/packages/fraction-model/controller/package.json @@ -6,7 +6,7 @@ "main": "lib/index.js", "module": "src/index.js", "dependencies": { - "@pie-lib/text-select": "3.0.3", + "@pie-lib/text-select": "3.0.4", "debug": "^4.1.1", "lodash-es": "^4.17.23" }, diff --git a/packages/fraction-model/package.json b/packages/fraction-model/package.json index ca35b81d85..834207bd08 100644 --- a/packages/fraction-model/package.json +++ b/packages/fraction-model/package.json @@ -12,10 +12,10 @@ "@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.6", - "@pie-lib/correct-answer-toggle": "4.0.3", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/correct-answer-toggle": "4.0.4", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/render-ui": "6.1.2", "@pie-lib/test-utils": "2.0.2", "prop-types": "^15.8.1", "react": "18.3.1", diff --git a/packages/graphing-solution-set/configure/package.json b/packages/graphing-solution-set/configure/package.json index 0f092bb54f..adce2cb02d 100644 --- a/packages/graphing-solution-set/configure/package.json +++ b/packages/graphing-solution-set/configure/package.json @@ -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.6", - "@pie-lib/editable-html-tip-tap": "2.1.4", - "@pie-lib/graphing-solution-set": "4.0.6", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/editable-html-tip-tap": "2.1.5", + "@pie-lib/graphing-solution-set": "4.0.7", "@pie-lib/math-rendering": "5.0.2", "classnames": "^2.2.6", "debug": "^4.1.1", diff --git a/packages/graphing-solution-set/package.json b/packages/graphing-solution-set/package.json index 2d69b661b2..2a86bf7612 100644 --- a/packages/graphing-solution-set/package.json +++ b/packages/graphing-solution-set/package.json @@ -16,11 +16,11 @@ "@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.6", - "@pie-lib/correct-answer-toggle": "4.0.3", - "@pie-lib/graphing-solution-set": "4.0.6", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/correct-answer-toggle": "4.0.4", + "@pie-lib/graphing-solution-set": "4.0.7", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/render-ui": "6.1.2", "classnames": "^2.2.6", "debug": "^4.1.1", "react": "18.3.1", diff --git a/packages/graphing/configure/package.json b/packages/graphing/configure/package.json index aa2220428c..ebc715ad41 100644 --- a/packages/graphing/configure/package.json +++ b/packages/graphing/configure/package.json @@ -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.6", - "@pie-lib/editable-html-tip-tap": "2.1.4", - "@pie-lib/graphing": "4.0.7", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/editable-html-tip-tap": "2.1.5", + "@pie-lib/graphing": "4.0.8", "@pie-lib/math-rendering": "5.0.2", "classnames": "^2.2.6", "debug": "^4.1.1", diff --git a/packages/graphing/package.json b/packages/graphing/package.json index 902fd7ae9d..0e63b53b32 100644 --- a/packages/graphing/package.json +++ b/packages/graphing/package.json @@ -15,10 +15,10 @@ "@mui/icons-material": "^7.3.4", "@mui/material": "^7.3.4", "@pie-framework/pie-player-events": "^0.1.0", - "@pie-lib/correct-answer-toggle": "4.0.3", - "@pie-lib/graphing": "4.0.7", + "@pie-lib/correct-answer-toggle": "4.0.4", + "@pie-lib/graphing": "4.0.8", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/render-ui": "6.1.2", "classnames": "^2.2.6", "debug": "^4.1.1", "react": "18.3.1", diff --git a/packages/hotspot/configure/package.json b/packages/hotspot/configure/package.json index 408ecaf356..3303d967b0 100644 --- a/packages/hotspot/configure/package.json +++ b/packages/hotspot/configure/package.json @@ -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.6", - "@pie-lib/editable-html-tip-tap": "2.1.4", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/editable-html-tip-tap": "2.1.5", "debug": "^4.1.1", "konva": "8.3.0", "lodash-es": "^4.17.23", diff --git a/packages/hotspot/package.json b/packages/hotspot/package.json index e9c4dc8a6e..1e53d2a54f 100644 --- a/packages/hotspot/package.json +++ b/packages/hotspot/package.json @@ -12,9 +12,9 @@ "@mui/icons-material": "^7.3.4", "@mui/material": "^7.3.4", "@pie-framework/pie-player-events": "^0.1.0", - "@pie-lib/correct-answer-toggle": "4.0.3", + "@pie-lib/correct-answer-toggle": "4.0.4", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/render-ui": "6.1.2", "@pie-lib/test-utils": "2.0.2", "konva": "8.3.0", "prop-types": "^15.8.1", diff --git a/packages/image-cloze-association/configure/package.json b/packages/image-cloze-association/configure/package.json index 0d47605cc8..5dbbc4f3b9 100644 --- a/packages/image-cloze-association/configure/package.json +++ b/packages/image-cloze-association/configure/package.json @@ -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.6", - "@pie-lib/editable-html-tip-tap": "2.1.4", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/editable-html-tip-tap": "2.1.5", "debug": "^4.1.1", "prop-types": "^15.8.1", "react": "18.3.1", diff --git a/packages/image-cloze-association/package.json b/packages/image-cloze-association/package.json index 7edf310cf4..94e769c0e7 100644 --- a/packages/image-cloze-association/package.json +++ b/packages/image-cloze-association/package.json @@ -13,10 +13,10 @@ "@mui/icons-material": "^7.3.4", "@mui/material": "^7.3.4", "@pie-framework/pie-player-events": "^0.1.0", - "@pie-lib/correct-answer-toggle": "4.0.3", - "@pie-lib/drag": "4.0.3", + "@pie-lib/correct-answer-toggle": "4.0.4", + "@pie-lib/drag": "4.0.4", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/render-ui": "6.1.2", "@pie-lib/translator": "4.0.2", "classnames": "^2.2.6", "humps": "^2.0.1", diff --git a/packages/inline-dropdown/configure/package.json b/packages/inline-dropdown/configure/package.json index b888ab8938..7379c1d6da 100644 --- a/packages/inline-dropdown/configure/package.json +++ b/packages/inline-dropdown/configure/package.json @@ -10,10 +10,10 @@ "@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.6", - "@pie-lib/editable-html-tip-tap": "2.1.4", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/editable-html-tip-tap": "2.1.5", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/render-ui": "6.1.2", "classnames": "^2.2.6", "debug": "^4.1.1", "lodash-es": "^4.17.23", diff --git a/packages/inline-dropdown/package.json b/packages/inline-dropdown/package.json index a1e39616de..e5f8bdccc7 100644 --- a/packages/inline-dropdown/package.json +++ b/packages/inline-dropdown/package.json @@ -15,10 +15,10 @@ "@mui/icons-material": "^7.3.4", "@mui/material": "^7.3.4", "@pie-framework/pie-player-events": "^0.1.0", - "@pie-lib/correct-answer-toggle": "4.0.3", - "@pie-lib/mask-markup": "3.0.6", + "@pie-lib/correct-answer-toggle": "4.0.4", + "@pie-lib/mask-markup": "3.0.7", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/render-ui": "6.1.2", "lodash-es": "^4.17.23", "prop-types": "^15.8.1", "react": "18.3.1", diff --git a/packages/likert/configure/package.json b/packages/likert/configure/package.json index 7f4af996fd..8c2311c928 100644 --- a/packages/likert/configure/package.json +++ b/packages/likert/configure/package.json @@ -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.6", - "@pie-lib/editable-html-tip-tap": "2.1.4", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/editable-html-tip-tap": "2.1.5", + "@pie-lib/render-ui": "6.1.2", "debug": "^4.1.1", "prop-types": "^15.8.1", "react": "18.3.1", diff --git a/packages/likert/package.json b/packages/likert/package.json index a9b765bdc0..f9a7cee3e9 100644 --- a/packages/likert/package.json +++ b/packages/likert/package.json @@ -16,7 +16,7 @@ "@mui/material": "^7.3.4", "@pie-framework/pie-player-events": "^0.1.0", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/render-ui": "6.1.2", "classnames": "^2.2.6", "debug": "^4.1.1", "lodash-es": "^4.17.23", diff --git a/packages/match-list/package.json b/packages/match-list/package.json index 1972282634..f058c5f03a 100644 --- a/packages/match-list/package.json +++ b/packages/match-list/package.json @@ -18,10 +18,10 @@ "@mui/icons-material": "^7.3.4", "@mui/material": "^7.3.4", "@pie-framework/pie-player-events": "^0.1.0", - "@pie-lib/correct-answer-toggle": "4.0.3", - "@pie-lib/drag": "4.0.3", + "@pie-lib/correct-answer-toggle": "4.0.4", + "@pie-lib/drag": "4.0.4", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/render-ui": "6.1.2", "debug": "^4.1.1", "lodash-es": "^4.17.23", "prop-types": "^15.8.1", diff --git a/packages/match/configure/package.json b/packages/match/configure/package.json index 50a2cbb7ed..b139b160e9 100644 --- a/packages/match/configure/package.json +++ b/packages/match/configure/package.json @@ -13,10 +13,10 @@ "@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.6", - "@pie-lib/drag": "4.0.3", - "@pie-lib/editable-html-tip-tap": "2.1.4", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/drag": "4.0.4", + "@pie-lib/editable-html-tip-tap": "2.1.5", + "@pie-lib/render-ui": "6.1.2", "@pie-lib/test-utils": "2.0.2", "classnames": "^2.2.6", "debug": "^4.1.1", diff --git a/packages/match/package.json b/packages/match/package.json index fc15dac03f..c422cbfd2a 100644 --- a/packages/match/package.json +++ b/packages/match/package.json @@ -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/correct-answer-toggle": "4.0.3", + "@pie-lib/correct-answer-toggle": "4.0.4", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/render-ui": "6.1.2", "@pie-lib/test-utils": "2.0.2", "classnames": "^2.2.6", "debug": "^4.1.1", diff --git a/packages/math-inline/configure/package.json b/packages/math-inline/configure/package.json index 00f9d1a405..d861400099 100644 --- a/packages/math-inline/configure/package.json +++ b/packages/math-inline/configure/package.json @@ -12,12 +12,12 @@ "@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.6", - "@pie-lib/editable-html-tip-tap": "2.1.4", - "@pie-lib/math-input": "8.1.0", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/editable-html-tip-tap": "2.1.5", + "@pie-lib/math-input": "8.1.1", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/math-toolbar": "3.0.3", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/math-toolbar": "3.0.4", + "@pie-lib/render-ui": "6.1.2", "@pie-lib/test-utils": "2.0.2", "classnames": "^2.2.6", "debug": "^4.1.1", diff --git a/packages/math-inline/package.json b/packages/math-inline/package.json index 8d83822ed0..5ec6f2c2e4 100644 --- a/packages/math-inline/package.json +++ b/packages/math-inline/package.json @@ -16,11 +16,11 @@ "@mui/icons-material": "^7.3.4", "@mui/material": "^7.3.4", "@pie-framework/pie-player-events": "^0.1.0", - "@pie-lib/correct-answer-toggle": "4.0.3", - "@pie-lib/math-input": "8.1.0", + "@pie-lib/correct-answer-toggle": "4.0.4", + "@pie-lib/math-input": "8.1.1", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/math-toolbar": "3.0.3", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/math-toolbar": "3.0.4", + "@pie-lib/render-ui": "6.1.2", "@pie-lib/translator": "4.0.2", "classnames": "^2.2.6", "debug": "^4.1.1", diff --git a/packages/math-templated/configure/package.json b/packages/math-templated/configure/package.json index e5007de33c..8f04dcc545 100644 --- a/packages/math-templated/configure/package.json +++ b/packages/math-templated/configure/package.json @@ -11,10 +11,10 @@ "@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.6", - "@pie-lib/editable-html-tip-tap": "2.1.4", - "@pie-lib/math-toolbar": "3.0.3", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/editable-html-tip-tap": "2.1.5", + "@pie-lib/math-toolbar": "3.0.4", + "@pie-lib/render-ui": "6.1.2", "debug": "^4.1.1", "lodash-es": "^4.17.23", "prop-types": "^15.8.1", diff --git a/packages/math-templated/package.json b/packages/math-templated/package.json index bf20da411a..d545b37b5b 100644 --- a/packages/math-templated/package.json +++ b/packages/math-templated/package.json @@ -12,11 +12,11 @@ "@mui/icons-material": "^7.3.4", "@mui/material": "^7.3.4", "@pie-framework/pie-player-events": "^0.1.0", - "@pie-lib/correct-answer-toggle": "4.0.3", - "@pie-lib/mask-markup": "3.0.6", - "@pie-lib/math-input": "8.1.0", + "@pie-lib/correct-answer-toggle": "4.0.4", + "@pie-lib/mask-markup": "3.0.7", + "@pie-lib/math-input": "8.1.1", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/render-ui": "6.1.2", "prop-types": "^15.8.1", "react": "18.3.1", "react-dom": "18.3.1" diff --git a/packages/matrix/configure/package.json b/packages/matrix/configure/package.json index c7adbbcd30..255d915d0b 100644 --- a/packages/matrix/configure/package.json +++ b/packages/matrix/configure/package.json @@ -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.6", - "@pie-lib/editable-html-tip-tap": "2.1.4", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/editable-html-tip-tap": "2.1.5", + "@pie-lib/render-ui": "6.1.2", "debug": "^4.1.1", "prop-types": "^15.8.1", "react": "18.3.1", diff --git a/packages/matrix/package.json b/packages/matrix/package.json index b73673aa55..6452d278fa 100644 --- a/packages/matrix/package.json +++ b/packages/matrix/package.json @@ -16,7 +16,7 @@ "@mui/material": "^7.3.4", "@pie-framework/pie-player-events": "^0.1.0", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/render-ui": "6.1.2", "debug": "^4.1.1", "prop-types": "^15.8.1", "react": "18.3.1", diff --git a/packages/multi-trait-rubric/configure/package.json b/packages/multi-trait-rubric/configure/package.json index 030628ed01..80a86c3842 100644 --- a/packages/multi-trait-rubric/configure/package.json +++ b/packages/multi-trait-rubric/configure/package.json @@ -11,10 +11,10 @@ "@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.6", - "@pie-lib/drag": "4.0.3", - "@pie-lib/editable-html-tip-tap": "2.1.4", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/drag": "4.0.4", + "@pie-lib/editable-html-tip-tap": "2.1.5", + "@pie-lib/render-ui": "6.1.2", "debug": "^4.1.1", "lodash-es": "^4.17.23", "prop-types": "^15.8.1", diff --git a/packages/multi-trait-rubric/package.json b/packages/multi-trait-rubric/package.json index f0f97fd064..1cbec2d1ed 100644 --- a/packages/multi-trait-rubric/package.json +++ b/packages/multi-trait-rubric/package.json @@ -12,7 +12,7 @@ "@mui/material": "^7.3.4", "@pie-framework/pie-player-events": "^0.1.0", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/render-ui": "6.1.2", "clsx": "^1.1.1", "prop-types": "^15.8.1", "react": "18.3.1", diff --git a/packages/multiple-choice/configure/package.json b/packages/multiple-choice/configure/package.json index 78c59a3ba2..ef31ed319e 100644 --- a/packages/multiple-choice/configure/package.json +++ b/packages/multiple-choice/configure/package.json @@ -10,9 +10,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.6", - "@pie-lib/editable-html-tip-tap": "2.1.4", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/editable-html-tip-tap": "2.1.5", + "@pie-lib/render-ui": "6.1.2", "debug": "^4.1.1", "lodash-es": "^4.17.23", "prop-types": "^15.8.1", diff --git a/packages/multiple-choice/package.json b/packages/multiple-choice/package.json index ac1c8b4504..193c446bdb 100644 --- a/packages/multiple-choice/package.json +++ b/packages/multiple-choice/package.json @@ -11,9 +11,9 @@ "@mui/icons-material": "^7.3.4", "@mui/material": "^7.3.4", "@pie-framework/pie-player-events": "^0.1.0", - "@pie-lib/correct-answer-toggle": "4.0.3", + "@pie-lib/correct-answer-toggle": "4.0.4", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/render-ui": "6.1.2", "@pie-lib/translator": "4.0.2", "classnames": "^2.2.6", "debug": "^4.1.1", diff --git a/packages/multiple-choice/src/choice-input.jsx b/packages/multiple-choice/src/choice-input.jsx index 751146234e..cb7cf6d225 100644 --- a/packages/multiple-choice/src/choice-input.jsx +++ b/packages/multiple-choice/src/choice-input.jsx @@ -78,9 +78,6 @@ const getInputStyles = (correctness) => { return { [key('root')]: { ...colorStyle('color', color.text()), - ...(correctness ? {} : { - '&:hover': { color: `${color.primaryLight()} !important` }, - }), ...(correctness === 'correct' ? colorStyle('correct-color', color.text()) : {}), ...(correctness === 'incorrect' ? colorStyle('incorrect-color', color.incorrect()) : {}), }, @@ -119,6 +116,10 @@ const StyledCheckboxBase = styled(Checkbox, { ...styles[key('root')], '&.Mui-checked': styles[key('checked')], '&.Mui-disabled': correctness ? {} : styles[key('disabled')], + '&:hover:not(.Mui-disabled) svg': { + boxShadow: `0px 0px 0px 2px ${color.keyBoardFocusIndicator()}`, + borderRadius: '4px', + }, }, '&.Mui-focusVisible': { '&:not(.Mui-checked)': styles.focusVisibleUnchecked, @@ -156,11 +157,16 @@ const StyledRadioBase = styled(Radio, { ...styles[key('root')], '&.Mui-checked': styles[key('checked')], '&.Mui-disabled': correctness ? {} : styles[key('disabled')], + '&.Mui-focusVisible:not(.Mui-checked)': styles.focusVisibleUnchecked, + '&.Mui-focusVisible.Mui-checked': styles.focusVisibleChecked, + '&:hover:not(.Mui-disabled) svg': { + boxShadow: `0px 0px 0px 2px ${color.keyBoardFocusIndicator()}`, + borderRadius: '50%', + }, }, '&.Mui-focusVisible': { '& input': { outline: 0 }, - '&:not(.Mui-checked)': styles.focusVisibleUnchecked, - '&.Mui-checked': styles.focusVisibleChecked, + '& .MuiTouchRipple-root': { display: 'none' }, }, }; }); diff --git a/packages/number-line/configure/package.json b/packages/number-line/configure/package.json index bface5dd4c..6db47a37f7 100644 --- a/packages/number-line/configure/package.json +++ b/packages/number-line/configure/package.json @@ -10,9 +10,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.6", - "@pie-lib/editable-html-tip-tap": "2.1.4", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/editable-html-tip-tap": "2.1.5", + "@pie-lib/render-ui": "6.1.2", "lodash-es": "^4.17.23", "react": "18.3.1", "react-dom": "18.3.1" diff --git a/packages/number-line/package.json b/packages/number-line/package.json index 9ced41fa5c..cacb467996 100644 --- a/packages/number-line/package.json +++ b/packages/number-line/package.json @@ -12,10 +12,10 @@ "@emotion/style": "^0.8.0", "@mui/icons-material": "^7.3.4", "@mui/material": "^7.3.4", - "@pie-lib/correct-answer-toggle": "4.0.3", - "@pie-lib/icons": "4.0.2", + "@pie-lib/correct-answer-toggle": "4.0.4", + "@pie-lib/icons": "4.0.3", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/render-ui": "6.1.2", "@pie-lib/translator": "4.0.2", "classnames": "^2.2.6", "d3-scale": "^4.0.2", diff --git a/packages/passage/configure/package.json b/packages/passage/configure/package.json index 17efbc9265..0cc20605a3 100644 --- a/packages/passage/configure/package.json +++ b/packages/passage/configure/package.json @@ -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.6", - "@pie-lib/editable-html-tip-tap": "2.1.4", + "@pie-lib/config-ui": "13.0.7", + "@pie-lib/editable-html-tip-tap": "2.1.5", "lodash-es": "^4.17.23", "prop-types": "^15.8.1", "react": "18.3.1", diff --git a/packages/passage/package.json b/packages/passage/package.json index 8c5efc94b6..09b392d721 100644 --- a/packages/passage/package.json +++ b/packages/passage/package.json @@ -15,7 +15,7 @@ "@mui/material": "^7.3.4", "@pie-framework/pie-player-events": "^0.1.0", "@pie-lib/math-rendering": "5.0.2", - "@pie-lib/render-ui": "6.1.1", + "@pie-lib/render-ui": "6.1.2", "prop-types": "^15.8.1", "react": "18.3.1", "react-dom": "18.3.1" diff --git a/packages/passage/src/stimulus-tabs.jsx b/packages/passage/src/stimulus-tabs.jsx index 72f8f3eaea..92756da395 100644 --- a/packages/passage/src/stimulus-tabs.jsx +++ b/packages/passage/src/stimulus-tabs.jsx @@ -5,6 +5,13 @@ import Tab from '@mui/material/Tab'; import { styled } from '@mui/material/styles'; import { Collapsible, color, PreviewPrompt, Purpose, UiLayout, transformDataHeadings } from '@pie-lib/render-ui'; +// Must match the breakpoint Quiz Engine passes to the PIE section player for +// switching from the side-by-side passage/question layout to the tabbed layout. +// Below (and at) this width the passage tabs scroll with the passage content +// instead of being locked to the top of the panel, so that they do not lock up +// space needed for the passage text (WCAG 1.4.10 Reflow, 400% zoom / 320px). +const STICKY_TABS_BREAKPOINT = 840; + const PassagesContainer = styled('div')({ flexGrow: 1, backgroundColor: color.background(), @@ -75,13 +82,13 @@ const TabStyled = styled(Tab)(({ theme }) => ({ opacity: 1, }, '.passage-label-underline': { - backgroundColor: '#146EB3', + backgroundColor: color.tertiary(), }, }, '&:hover': { '.passage-label-underline': { - backgroundColor: '#D0E2F0', + backgroundColor: color.tertiaryLight(), }, }, @@ -273,16 +280,27 @@ class StimulusTabs extends React.Component { <>