From 2c421458e3c987277127c59fa216a85bc335cf89 Mon Sep 17 00:00:00 2001
From: carlacostea <carlacostea@yahoo.com>
Date: Fri, 4 Jul 2025 09:23:07 +0300
Subject: [PATCH 01/18] fix(ebsr): update heading levels for accessibility
 PD-5112

---
 packages/multiple-choice/src/multiple-choice.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/multiple-choice/src/multiple-choice.jsx b/packages/multiple-choice/src/multiple-choice.jsx
index a78328aa48..10a2d8fe58 100644
--- a/packages/multiple-choice/src/multiple-choice.jsx
+++ b/packages/multiple-choice/src/multiple-choice.jsx
@@ -217,9 +217,9 @@ export class MultipleChoice extends React.Component {
     }
 
     return choiceMode === 'radio' ? (
-      <h2 className={classes.srOnly}>Multiple Choice Question</h2>
+      <h3 className={classes.srOnly}>Multiple Choice Question</h3>
     ) : (
-      <h2 className={classes.srOnly}>Multiple Select Question</h2>
+      <h3 className={classes.srOnly}>Multiple Select Question</h3>
     );
   }
 
@@ -294,7 +294,7 @@ export class MultipleChoice extends React.Component {
 
     return (
       <div id={'main-container'} className={classNames(classes.main, className, 'multiple-choice')}>
-        {partLabel && <h3 className={classes.partLabel}>{partLabel}</h3>}
+        {partLabel && <h2 className={classes.partLabel}>{partLabel}</h2>}
 
         {this.renderHeading()}
 

From eebe9a924fa509a04c0c2618411d42eb376345a5 Mon Sep 17 00:00:00 2001
From: carlacostea <carlacostea@yahoo.com>
Date: Fri, 4 Jul 2025 09:51:57 +0300
Subject: [PATCH 02/18] fix(ebsr): prevent focus override on shift+tab by
 checking tab direction into group PD-4562

---
 packages/multiple-choice/src/multiple-choice.jsx | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/multiple-choice/src/multiple-choice.jsx b/packages/multiple-choice/src/multiple-choice.jsx
index a78328aa48..1e78ba97dd 100644
--- a/packages/multiple-choice/src/multiple-choice.jsx
+++ b/packages/multiple-choice/src/multiple-choice.jsx
@@ -231,8 +231,11 @@ export class MultipleChoice extends React.Component {
       return;
     }
 
-    if (this.firstInputRef?.current) {
-      this.firstInputRef.current.focus();
+    // Only focus the first input if user is tabbing forward
+    if (!e.relatedTarget || fieldset.compareDocumentPosition(e.relatedTarget) & Node.DOCUMENT_POSITION_PRECEDING) {
+      if (this.firstInputRef?.current) {
+        this.firstInputRef.current.focus();
+      }
     }
   };
 

From 592e8d38dda32a4dab1a10b4bd6598977a858bad Mon Sep 17 00:00:00 2001
From: Patricia Romaniuc <romaniucpatricia@yahoo.com>
Date: Fri, 4 Jul 2025 12:58:09 +0300
Subject: [PATCH 03/18] feat(select-text): update Legend component to show only
 correct answers in evaluate mode PD-5100

---
 packages/select-text/src/main.jsx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/select-text/src/main.jsx b/packages/select-text/src/main.jsx
index 3b08193d63..580f2e4624 100644
--- a/packages/select-text/src/main.jsx
+++ b/packages/select-text/src/main.jsx
@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { TextSelect, Legend } from '@pie-lib/pie-toolbox/text-select';
-import {CorrectAnswerToggle} from '@pie-lib/pie-toolbox/correct-answer-toggle';
-import {color, Feedback, Collapsible, hasText, hasMedia, PreviewPrompt, UiLayout} from '@pie-lib/pie-toolbox/render-ui';
+import { CorrectAnswerToggle } from '@pie-lib/pie-toolbox/correct-answer-toggle';
+import { color, Feedback, Collapsible, hasText, hasMedia, PreviewPrompt, UiLayout } from '@pie-lib/pie-toolbox/render-ui';
 import { withStyles } from '@material-ui/core/styles';
 import generateModel from './utils';
 
@@ -113,7 +113,7 @@ export class Main extends React.Component {
           maxNoOfSelections={model.maxSelections}
           animationsDisabled={model.animationsDisabled}
         />
-        {mode === 'evaluate' && <Legend language={model.language} />}
+        {mode === 'evaluate' && <Legend language={model.language} showOnlyCorrect={showCorrectAnswer} />}
 
         {showRationale &&
           (!model.animationsDisabled ? (

From b13764901b21f629a9ebc46bd9fadff5230dad66 Mon Sep 17 00:00:00 2001
From: carlacostea <carlacostea@yahoo.com>
Date: Mon, 7 Jul 2025 16:28:07 +0300
Subject: [PATCH 04/18] fix(categorize): call render in connectedCallback to
 ensure math is rendered, remove redundant renderMath calls PD-5097

---
 packages/categorize/configure/src/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/categorize/configure/src/index.js b/packages/categorize/configure/src/index.js
index 27d4141583..9b9a45c746 100644
--- a/packages/categorize/configure/src/index.js
+++ b/packages/categorize/configure/src/index.js
@@ -102,7 +102,9 @@ export default class CategorizeConfigure extends HTMLElement {
     this.render();
   }
 
-  connectedCallback() {}
+  connectedCallback() {
+    this.render();
+  }
 
   /**
    *

From 540e3a902cd02408d22337484bbe3fdbd1abbcc6 Mon Sep 17 00:00:00 2001
From: carlacostea <carlacostea@yahoo.com>
Date: Tue, 8 Jul 2025 17:12:51 +0300
Subject: [PATCH 05/18] fix: allow math-inline scoring to continue even if one
 alternate answer fails parsing PD-4848

---
 packages/math-inline/controller/src/index.js | 33 +++++++++-----------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/packages/math-inline/controller/src/index.js b/packages/math-inline/controller/src/index.js
index bf9bb38d80..e8a3e77013 100644
--- a/packages/math-inline/controller/src/index.js
+++ b/packages/math-inline/controller/src/index.js
@@ -41,39 +41,36 @@ const getResponseCorrectness = (model, answerItem, isOutcome) => {
   return correctnessObject;
 };
 
-function getIsAnswerCorrect(correctResponseItem, answerItem) {
+function getIsAnswerCorrect(correctResponseItems, answerItem) {
   let answerCorrect = false;
 
-  (correctResponseItem || []).forEach((correctResponse) => {
-    let opts = {
+  (correctResponseItems || []).forEach((correctResponse) => {
+    if (answerCorrect) return;
+
+    const opts = {
       mode: correctResponse.validation || defaults.validationDefault,
     };
 
-    if (opts.mode == 'literal') {
+    if (opts.mode === 'literal') {
       opts.literal = {
         allowTrailingZeros: correctResponse.allowTrailingZeros || false,
         ignoreOrder: correctResponse.ignoreOrder || false,
       };
     }
 
-    if (!answerCorrect) {
-      const acceptedValues =
-        [correctResponse.answer].concat(
-          Object.keys(correctResponse.alternates || {}).map((alternateId) => correctResponse.alternates[alternateId]),
-        ) || [];
+    const acceptedValues = [correctResponse.answer].concat(
+      Object.keys(correctResponse.alternates || {}).map((alternateId) => correctResponse.alternates[alternateId]),
+    );
 
+    for (let i = 0; i < acceptedValues.length; i++) {
       try {
-        for (let i = 0; i < acceptedValues.length; i++) {
-          answerCorrect = mv.latexEqual(answerItem, acceptedValues[i], opts);
-
-          if (answerCorrect) {
-            break;
-          }
+        if (mv.latexEqual(answerItem, acceptedValues[i], opts)) {
+          answerCorrect = true;
+          break;
         }
       } catch (e) {
-        log('Parse failure when evaluating math', e, correctResponse, answerItem);
-
-        answerCorrect = false;
+        log('Parse failure for value:', acceptedValues[i], e);
+        continue;
       }
     }
   });

From 2a3dbab21618eff848dc3430ef0e27457d860a24 Mon Sep 17 00:00:00 2001
From: carlacostea <carlacostea@yahoo.com>
Date: Wed, 9 Jul 2025 16:01:17 +0300
Subject: [PATCH 06/18] refactor

---
 packages/math-inline/controller/src/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/math-inline/controller/src/index.js b/packages/math-inline/controller/src/index.js
index e8a3e77013..e48319854f 100644
--- a/packages/math-inline/controller/src/index.js
+++ b/packages/math-inline/controller/src/index.js
@@ -69,7 +69,7 @@ function getIsAnswerCorrect(correctResponseItems, answerItem) {
           break;
         }
       } catch (e) {
-        log('Parse failure for value:', acceptedValues[i], e);
+        log('Parse failure when evaluating math', acceptedValues[i], answerItem, e);
         continue;
       }
     }

From f970b9955ca76f6d9caa422b61e79fa068e90082 Mon Sep 17 00:00:00 2001
From: arimieandreea <arimie_andreea@yahoo.com>
Date: Thu, 10 Jul 2025 11:44:23 +0300
Subject: [PATCH 07/18] feat(charting): add key legend in evaluate mode PD-5083

---
 packages/charting/controller/src/index.js | 1 +
 packages/charting/src/main.jsx            | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/charting/controller/src/index.js b/packages/charting/controller/src/index.js
index d3f222342e..927f6bb87a 100644
--- a/packages/charting/controller/src/index.js
+++ b/packages/charting/controller/src/index.js
@@ -225,6 +225,7 @@ export function model(question, session, env) {
       base.correctAnswer = correctAnswer;
       base.showToggle = !!correctAnswer?.data?.length && scoreObject.score !== 1;
       base.addCategoryEnabled = false;
+      base.showKeyLegend = true;
     }
 
     if (env.role === 'instructor' && (env.mode === 'view' || env.mode === 'evaluate')) {
diff --git a/packages/charting/src/main.jsx b/packages/charting/src/main.jsx
index bed5d0d354..0592877e96 100644
--- a/packages/charting/src/main.jsx
+++ b/packages/charting/src/main.jsx
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { withStyles } from '@material-ui/core/styles';
 import { color, Collapsible, hasText, PreviewPrompt, UiLayout, hasMedia } from '@pie-lib/pie-toolbox/render-ui';
-import { Chart, chartTypes } from '@pie-lib/pie-toolbox/charting';
+import { Chart, chartTypes, KeyLegend } from '@pie-lib/pie-toolbox/charting';
 import isEqual from 'lodash/isEqual';
 import { CorrectAnswerToggle } from '@pie-lib/pie-toolbox/correct-answer-toggle';
 
@@ -61,6 +61,7 @@ export class Main extends React.Component {
       correctAnswer,
       language,
       env,
+      showKeyLegend,
     } = model;
 
     let { correctedAnswer, extraCSSRules } = model;
@@ -145,7 +146,7 @@ export class Main extends React.Component {
             labelsPlaceholders={{}}
           />
         )}
-
+        {!showingCorrect && showKeyLegend && (<KeyLegend></KeyLegend>)}
         {showRationale && (
           <Collapsible labels={{ hidden: 'Show Rationale', visible: 'Hide Rationale' }}>
             <PreviewPrompt prompt={rationale} />

From aca8eb3336a4111db12537b16d8ca0f4595b08ce Mon Sep 17 00:00:00 2001
From: Andrei Miron <andrei.miron@mcro-e.com>
Date: Fri, 11 Jul 2025 10:13:30 +0300
Subject: [PATCH 08/18] feat(select-text): move tokens into markup and
 implement custom selection POC PD-363

---
 .../configure/src/defaultConfiguration.js     |   5 +
 packages/select-text/configure/src/design.jsx | 490 +++++++++++++++---
 packages/select-text/docs/demo/generate.js    | 152 ++++--
 3 files changed, 538 insertions(+), 109 deletions(-)

diff --git a/packages/select-text/configure/src/defaultConfiguration.js b/packages/select-text/configure/src/defaultConfiguration.js
index a138ca7d50..f08e84d27e 100644
--- a/packages/select-text/configure/src/defaultConfiguration.js
+++ b/packages/select-text/configure/src/defaultConfiguration.js
@@ -83,6 +83,11 @@ export default {
     text: {
       settings: true,
       label: 'Content',
+      inputConfiguration: {
+        audio: { disabled: true },
+        video: { disabled: true },
+        image: { disabled: true },
+      },
     },
     tokens: {
       settings: true,
diff --git a/packages/select-text/configure/src/design.jsx b/packages/select-text/configure/src/design.jsx
index b0e01027a6..3415a9a67a 100644
--- a/packages/select-text/configure/src/design.jsx
+++ b/packages/select-text/configure/src/design.jsx
@@ -4,7 +4,7 @@ import TextField from '@material-ui/core/TextField';
 import { withStyles } from '@material-ui/core/styles';
 import cloneDeep from 'lodash/cloneDeep';
 import debounce from 'lodash/debounce';
-import { Tokenizer } from '@pie-lib/pie-toolbox/text-select';
+import { Tokenizer, Controls } from '@pie-lib/pie-toolbox/text-select';
 import { InputContainer, NumberTextField, FeedbackConfig, settings, layout } from '@pie-lib/pie-toolbox/config-ui';
 import Chip from '@material-ui/core/Chip';
 import Info from '@material-ui/icons/Info';
@@ -12,6 +12,18 @@ import debug from 'debug';
 import { EditableHtml } from '@pie-lib/pie-toolbox/editable-html';
 import Tooltip from '@material-ui/core/Tooltip';
 import { generateValidationMessage } from './utils';
+import {
+  clearSelection,
+  getDOMNodes,
+  getLabelElement,
+  getRangeDetails,
+  isSideLabel,
+  wrapRange,
+} from '@pie-element/extended-text-entry/src/annotation/annotation-utils';
+import classNames from 'classnames';
+
+import Switch from '@material-ui/core/Switch';
+import FormControlLabel from '@material-ui/core/FormControlLabel';
 
 const { Panel, toggle, radio, dropdown } = settings;
 
@@ -39,7 +51,10 @@ export class Design extends React.Component {
     const { model } = this.props;
 
     this.state = {
+      correctMode: false,
+      selectMode: false,
       text: (model && model.text) || '',
+      tokenizedText: (model && model.token) || '',
     };
   }
 
@@ -49,7 +64,25 @@ export class Design extends React.Component {
     if (model && model.text) {
       this.setState({
         text: model.text,
+        tokenizedText: model.text,
       });
+
+      // model.tokens.forEach((annotation) => {
+      //   console.log('annotation', annotation);
+      //   const [domStart, domEnd] = getDOMNodes(annotation.start, annotation.end, this.textRef);
+      //   console.log('domStart, domEnd', domStart, domEnd);
+      //
+      //   if (domStart && domEnd) {
+      //     const range = document.createRange();
+      //
+      //     range.setStart(domStart.node, domStart.offset);
+      //     range.setEnd(domEnd.node, domEnd.offset);
+      //
+      //     const spans = wrapRange(range);
+      //
+      //     this.createDOMAnnotation(spans, annotation);
+      //   }
+      // });
     }
   }
 
@@ -60,7 +93,12 @@ export class Design extends React.Component {
     });
   }, 200);
 
-  changeText = (event) => this.updateText(event.target.value);
+  changeText = (text) => {
+    this.updateText(text);
+    this.clearTokens();
+  };
+
+  changeTextEvent = (event) => this.updateText(event.target.value);
 
   changeTokens = (tokens, mode) => {
     this.apply((u) => {
@@ -120,8 +158,250 @@ export class Design extends React.Component {
     onModelChanged({ ...model, rationale });
   };
 
+  // Highlight functionalities based on extended-text-entry
+
+  createDOMAnnotation = (elems, annotation) => {
+    const { classes } = this.props;
+    const { id } = annotation;
+
+    (elems || []).forEach((elem) => {
+      elem.dataset.id = id;
+      elem.className = classNames(classes.token);
+      // elem.onclick = !disabled && this.handleClick;
+      // elem.onmouseover = this.handleHover;
+      // elem.onmouseout = this.handleCancelHover;
+    });
+  };
+
+  createNewAnnotation = (selectedElems, selectionDetails) => {
+    const annotation = {
+      id: [selectionDetails.start, selectionDetails.end, new Date().getTime()].join('-'),
+      ...selectionDetails,
+    };
+
+    this.createDOMAnnotation(selectedElems, annotation);
+
+    return annotation;
+  };
+
+  addAnnotation = (type) => {
+    const { annotations, onChange } = this.props;
+    const annotation = this.createNewAnnotation('', type);
+    const labelElem = getLabelElement(annotation.id);
+
+    annotations.push(annotation);
+
+    this.setState({
+      openedMenu: false,
+      openedEditor: true,
+      annotationIndex: annotations.length - 1,
+      annotation,
+      labelElem,
+    });
+
+    onChange(annotations);
+  };
+
+  // new functionalities
+
+  wrapWordsInSpans(html, onClick) {
+    const { classes } = this.props;
+    const container = document.createElement('div');
+    container.innerHTML = html;
+
+    const processNode = (node) => {
+      if (node.nodeType === Node.TEXT_NODE) {
+        const words = node.textContent.split(/(\s+|\b)/); // split by word boundaries + spaces
+        const fragment = document.createDocumentFragment();
+
+        for (const word of words) {
+          if (word.trim()) {
+            const span = document.createElement('span');
+
+            span.className = classNames(classes.token);
+            span.addEventListener('click', (e) => onClick(e));
+            span.textContent = word;
+            fragment.appendChild(span);
+          } else {
+            fragment.appendChild(document.createTextNode(word));
+          }
+        }
+
+        node.replaceWith(fragment);
+      } else if (node.nodeType === Node.ELEMENT_NODE) {
+        Array.from(node.childNodes).forEach(processNode);
+      }
+    };
+
+    Array.from(container.childNodes).forEach(processNode);
+
+    return container.innerHTML;
+  }
+
+  wrapSentencesInSpans = (html, onClickHandler = null) => {
+    const { classes } = this.props;
+    const container = document.createElement('div');
+    container.innerHTML = html;
+
+    const splitSentences = (text) => {
+      // Match sentences ending with punctuation:
+      // "." or "!" or "?"
+      const pattern = /([^.!?]+[.!?]+[\s"]*)|([^.!?]+$)/g;
+      const matches = text.match(pattern);
+      return matches || [];
+    };
+
+    const processNode = (node) => {
+      if (node.nodeType === Node.TEXT_NODE) {
+        const sentences = splitSentences(node.textContent);
+        const fragment = document.createDocumentFragment();
+
+        for (const sentence of sentences) {
+          if (sentence.trim()) {
+            const span = document.createElement('span');
+            span.textContent = sentence;
+            span.className = classNames(classes.token);
+
+            if (onClickHandler) {
+              span.addEventListener('click', (e) => {
+                onClickHandler(e, sentence);
+              });
+            }
+
+            fragment.appendChild(span);
+          } else {
+            fragment.appendChild(document.createTextNode(sentence));
+          }
+        }
+
+        node.replaceWith(fragment);
+      } else if (node.nodeType === Node.ELEMENT_NODE) {
+        Array.from(node.childNodes).forEach(processNode);
+      }
+    };
+
+    Array.from(container.childNodes).forEach(processNode);
+
+    return container;
+  };
+
+  wrapParagraphContentInSpan(html) {
+    const { classes } = this.props;
+    const container = document.createElement('div');
+    container.innerHTML = html;
+
+    container.querySelectorAll('p').forEach((p) => {
+      const span = document.createElement('span');
+      span.className = classNames(classes.token);
+      span.addEventListener('click', this.handleTokenClick);
+
+      // Move all children of <p> into the span
+      while (p.firstChild) {
+        span.appendChild(p.firstChild);
+      }
+
+      p.appendChild(span);
+    });
+
+    return container;
+  }
+
+  wrapSelectionInSpan(selection) {
+    const { classes } = this.props;
+    const range = selection.getRangeAt(0);
+
+    if (range.collapsed) {
+      console.log('Selection is collapsed (no text selected).');
+      return;
+    }
+
+    // Extract the contents of the selection
+    const contents = range.extractContents();
+
+    // Create the span wrapper
+    const span = document.createElement('span');
+    span.className = classNames(classes.token);
+    span.addEventListener('click', this.handleTokenClick);
+    span.appendChild(contents);
+
+    // Insert back into the DOM
+    range.insertNode(span);
+
+    // Collapse the selection
+    selection.removeAllRanges();
+  }
+
+  handleSelection = (event) => {
+    const selection = window.getSelection();
+
+    // prevent unwanted selections
+    if (event.detail > 2) {
+      clearSelection();
+      return;
+    }
+
+    if (selection && selection.rangeCount > 0) {
+      this.wrapSelectionInSpan(selection);
+      clearSelection();
+    }
+  };
+
+  handleTokenClick = (event) => {
+    const { correctMode } = this.state;
+
+    if (!correctMode) {
+      return;
+    }
+
+    event.target.classList.toggle('correct');
+  };
+
+  clearTokens = () => {
+    const { text } = this.state;
+
+    this.setState({ tokenizedText: text });
+  };
+
+  selectWords = () => {
+    const { text } = this.state;
+    this.clearTokens();
+    const tokenized = this.wrapWordsInSpans(text, (e) => this.handleTokenClick(e));
+
+    console.log('words:', tokenized);
+
+    this.setState({ tokenizedText: tokenized });
+  };
+
+  selectSentences = () => {
+    const { text } = this.state;
+    this.clearTokens();
+    const container = this.wrapSentencesInSpans(text);
+
+    // Remove all children and add new content
+    this.textRef.innerHTML = '';
+    this.textRef.appendChild(container);
+
+    const tokenized = container.innerHTML;
+    console.log('sentences:', tokenized);
+    // this.setState({ tokenizedText: tokenized });
+  };
+
+  selectParagraphs = () => {
+    const { text } = this.state;
+    this.clearTokens();
+    const container = this.wrapParagraphContentInSpan(text);
+
+    // Remove all children and add new content
+    this.textRef.innerHTML = '';
+    this.textRef.appendChild(container);
+
+    const tokenized = container.innerHTML;
+    console.log('paragraphs:', tokenized);
+    // this.setState({ tokenizedText: tokenized });
+  };
+
   render() {
-    const { text: textValue } = this.state;
+    const { text: textValue, correctMode, selectMode, tokenizedText } = this.state;
     const { classes, configuration, imageSupport, model, onConfigurationChanged, onModelChanged, uploadSoundSupport } =
       this.props;
     const {
@@ -266,68 +546,116 @@ export class Design extends React.Component {
           </InputContainer>
         )}
 
-        {text.settings && (
-          <InputContainer label={text.label || ''} className={classes.promptHolder}>
-            <TextField
-              className={classes.input}
-              multiline
-              defaultValue={textValue}
-              onChange={this.changeText}
-              spellCheck={spellCheckEnabled}
-            />
-          </InputContainer>
+        {/*{text.settings && (*/}
+        {/*  <InputContainer label={text.label || ''} className={classes.promptHolder}>*/}
+        {/*    <TextField*/}
+        {/*      className={classes.input}*/}
+        {/*      multiline*/}
+        {/*      defaultValue={textValue}*/}
+        {/*      onChange={this.changeTextEvent}*/}
+        {/*      spellCheck={spellCheckEnabled}*/}
+        {/*    />*/}
+        {/*  </InputContainer>*/}
+        {/*)}*/}
+
+        {/*{tokens.settings && (*/}
+        {/*  <InputContainer label={tokens.label || ''} className={classes.tokenizerContainer}>*/}
+        {/*    <Tooltip*/}
+        {/*      classes={{ tooltip: classes.tooltip }}*/}
+        {/*      disableFocusListener*/}
+        {/*      disableTouchListener*/}
+        {/*      placement={'right'}*/}
+        {/*      title={validationMessage}*/}
+        {/*    >*/}
+        {/*      <Info fontSize={'small'} color={'primary'} style={{ position: 'absolute', left: '48px', top: '-3px' }} />*/}
+        {/*    </Tooltip>*/}
+
+        {/*    <Tokenizer*/}
+        {/*      className={classes.tokenizer}*/}
+        {/*      text={model.text}*/}
+        {/*      tokens={tokensModel}*/}
+        {/*      onChange={this.changeTokens}*/}
+        {/*    />*/}
+        {/*  </InputContainer>*/}
+        {/*)}*/}
+        {/*{tokensError && <div className={classes.errorText}>{tokensError}</div>}*/}
+        {/*{selectionsError && <div className={classes.errorText}>{selectionsError}</div>}*/}
+
+        {/*<div className={classes.tokensDetails}>*/}
+        {/*  {mode.settings && (*/}
+        {/*    <Chip label={`${mode.label}: ${model.mode ? model.mode : 'None'}`} className={classes.chip} />*/}
+        {/*  )}*/}
+
+        {/*  {selections.settings && (*/}
+        {/*    <Chip label={`${selections.label}: ${tokensModel.length}`} className={classes.chip} />*/}
+        {/*  )}*/}
+
+        {/*  {correctAnswer.settings && (*/}
+        {/*    <Chip*/}
+        {/*      label={`${correctAnswer.label}: ${tokensModel.filter((t) => t.correct).length}`}*/}
+        {/*      className={classes.chip}*/}
+        {/*    />*/}
+        {/*  )}*/}
+
+        {/*  {selectionCount.settings && (*/}
+        {/*    <NumberTextField*/}
+        {/*      min={tokensModel.filter((t) => t.correct).length || 0}*/}
+        {/*      label={`${selectionCount.label} (0:any)`}*/}
+        {/*      max={tokensModel.length}*/}
+        {/*      value={model.maxSelections}*/}
+        {/*      onChange={this.changeMaxSelections}*/}
+        {/*      className={classes.numberField}*/}
+        {/*    />*/}
+        {/*  )}*/}
+        {/*</div>*/}
+
+        <div class={classes.subheader}>
+          NEW functionality
+          <FormControlLabel
+            control={<Switch checked={selectMode} onChange={() => this.setState({ selectMode: !selectMode })} />}
+            label="Select tokens"
+          />
+        </div>
+
+        {selectMode && (
+          <Controls
+            onClear={this.clearTokens}
+            onWords={this.selectWords}
+            onSentences={this.selectSentences}
+            onParagraphs={this.selectParagraphs}
+            setCorrectMode={correctMode}
+            onToggleCorrectMode={() => this.setState({ correctMode: !correctMode })}
+          />
         )}
 
-        {tokens.settings && (
-          <InputContainer label={tokens.label || ''} className={classes.tokenizerContainer}>
-            <Tooltip
-              classes={{ tooltip: classes.tooltip }}
-              disableFocusListener
-              disableTouchListener
-              placement={'right'}
-              title={validationMessage}
-            >
-              <Info fontSize={'small'} color={'primary'} style={{ position: 'absolute', left: '48px', top: '-3px' }} />
-            </Tooltip>
-
-            <Tokenizer
-              className={classes.tokenizer}
-              text={model.text}
-              tokens={tokensModel}
-              onChange={this.changeTokens}
-            />
+        {text.settings && (
+          <InputContainer label={text.label || ''} className={classes.promptHolder}>
+            {selectMode ? (
+              <div
+                className={classes.textContainer}
+                ref={(r) => (this.textRef = r)}
+                onMouseDown={selectMode && !correctMode ? clearSelection : () => {}}
+                onMouseUp={selectMode && !correctMode ? this.handleSelection : () => {}}
+                dangerouslySetInnerHTML={{ __html: tokenizedText }}
+              />
+            ) : (
+              <EditableHtml
+                className={classes.prompt}
+                markup={textValue}
+                onChange={this.changeText}
+                nonEmpty={false}
+                disableUnderline
+                toolbarOpts={toolbarOpts}
+                pluginProps={getPluginProps(text?.inputConfiguration)}
+                spellCheck={spellCheckEnabled}
+                imageSupport={imageSupport}
+                uploadSoundSupport={uploadSoundSupport}
+                languageCharactersProps={[{ language: 'spanish' }, { language: 'special' }]}
+                mathMlOptions={mathMlOptions}
+              />
+            )}
           </InputContainer>
         )}
-        {tokensError && <div className={classes.errorText}>{tokensError}</div>}
-        {selectionsError && <div className={classes.errorText}>{selectionsError}</div>}
-
-        <div className={classes.tokensDetails}>
-          {mode.settings && (
-            <Chip label={`${mode.label}: ${model.mode ? model.mode : 'None'}`} className={classes.chip} />
-          )}
-
-          {selections.settings && (
-            <Chip label={`${selections.label}: ${tokensModel.length}`} className={classes.chip} />
-          )}
-
-          {correctAnswer.settings && (
-            <Chip
-              label={`${correctAnswer.label}: ${tokensModel.filter((t) => t.correct).length}`}
-              className={classes.chip}
-            />
-          )}
-
-          {selectionCount.settings && (
-            <NumberTextField
-              min={tokensModel.filter((t) => t.correct).length || 0}
-              label={`${selectionCount.label} (0:any)`}
-              max={tokensModel.length}
-              value={model.maxSelections}
-              onChange={this.changeMaxSelections}
-              className={classes.numberField}
-            />
-          )}
-        </div>
 
         {rationaleEnabled && (
           <InputContainer label={rationale.label || ''} className={classes.promptHolder}>
@@ -414,4 +742,44 @@ export default withStyles((theme) => ({
     color: theme.palette.error.main,
     paddingTop: theme.spacing.unit,
   },
+
+  subheader: {
+    paddingBottom: '8px',
+    borderBottom: '1px solid grey',
+    marginBottom: '16px',
+    marginTop: '24px',
+    display: 'flex',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+  },
+  textContainer: {
+    padding: '15px 21px',
+    border: '1px solid #ccc',
+    borderRadius: '4px',
+    overflowY: 'scroll',
+    whiteSpace: 'pre-wrap',
+    overflowWrap: 'break-word',
+    '& p': {
+      margin: 0,
+    },
+    '& span[data-latex]': {
+      userSelect: 'none',
+      '-webkit-user-select': 'none',
+      '-moz-user-select': 'none',
+      '-ms-user-select': 'none',
+    },
+  },
+  token: {
+    position: 'relative',
+    cursor: 'pointer',
+    backgroundColor: '#fff9c4',
+
+    '&:hover': {
+      backgroundColor: '#E5E0B0',
+    },
+
+    '&.correct': {
+      backgroundColor: '#4caf50',
+    },
+  },
 }))(Design);
diff --git a/packages/select-text/docs/demo/generate.js b/packages/select-text/docs/demo/generate.js
index 8bb9086f5a..518d592772 100644
--- a/packages/select-text/docs/demo/generate.js
+++ b/packages/select-text/docs/demo/generate.js
@@ -1,11 +1,11 @@
 const tokens = () => [
   {
-    text: 'If \'tweren\'t for sight and sound and smell,',
+    text: "If 'tweren't for sight and sound and smell,",
     start: 0,
     end: 43,
   },
   {
-    text: 'I\'d like the city pretty well,',
+    text: "I'd like the city pretty well,",
     start: 44,
     end: 74,
   },
@@ -25,7 +25,7 @@ const tokens = () => [
     end: 176,
   },
   {
-    text: 'Just quit the city\'s din and dust,',
+    text: "Just quit the city's din and dust,",
     start: 177,
     end: 211,
   },
@@ -212,7 +212,6 @@ exports.htmlAscii = (id, element) => ({
   ],
 });
 
-
 exports.model = (id, element) => {
   return Object.assign(
     {},
@@ -225,52 +224,109 @@ exports.model = (id, element) => {
         '<p>Select the sentence from&#160;&#34;The Gymnast&#34; that <span class="relative-emphasis">best</span> represents the theme.</p>',
       rationale:
         '<p>The final sentence of the passage best exemplifies the theme of the short story because Natasha&#39;s practice and determination finally pays off.</p>',
+      // tokens: [
+      //   {
+      //     text: 'She thought about what she had to do, struggling to rein in her wild, fearful thoughts.',
+      //     end: 90,
+      //     start: 3,
+      //     correct: false,
+      //   },
+      //   {
+      //     start: 449,
+      //     end: 585,
+      //     text: 'Just for a hair of a moment, Natasha wondered if she really wanted a perfect 10, so weary was she of trying for but never achieving one.',
+      //     correct: false,
+      //   },
+      //   {
+      //     end: 627,
+      //     correct: false,
+      //     text: 'At last Natasha\'s moment arrived.',
+      //     start: 594,
+      //   },
+      //   {
+      //     end: 743,
+      //     text: 'The faces of past giants of gymnastics swam before her mind\'s eye, now razor&#8211;sharp with fierce determination.',
+      //     correct: false,
+      //     start: 628,
+      //   },
+      //   {
+      //     text: 'Suddenly, the din of the gymnasium was silent to her.',
+      //     end: 997,
+      //     correct: false,
+      //     start: 944,
+      //   },
+      //   {
+      //     end: 1087,
+      //     start: 998,
+      //     correct: false,
+      //     text: 'Forcing all sound out of her mind, she focused on the gleaming balance beam ahead of her.',
+      //   },
+      //   {
+      //     correct: true,
+      //     start: 1088,
+      //     end: 1225,
+      //     text: 'Taking a deep breath, Natasha made her graceful, yet powerful approach, mounted the beam flawlessly, and...executed her first perfect 10.',
+      //   },
+      // ],
+      // "element": "select-text",
+      // text: '<p>She thought about what she had to do, struggling to rein in her wild, fearful thoughts. Coach Cummings always said that an undisciplined mind never scored a perfect 10. Natasha wanted to please her Coach, yet sometimes his approval wasn\'t as exciting as his anger. The gymnasts were unanimous about one thing: Coach Cummings\'s fits of disapproving rage were much more humorous to witness than his infrequent, backslapping moments of high praise. Just for a hair of a moment, Natasha wondered if she really wanted a perfect 10, so weary was she of trying for but never achieving one.</p>\n\n<p>At last Natasha\'s moment arrived. The faces of past giants of gymnastics swam before her mind\'s eye, now razor&#8211;sharp with fierce determination. "I am talented. I am not afraid. I will make a perfect 10," she spoke aloud to herself, as she approached the mat, dusted her hands with chalk to prevent slippage, and returned to her starting point. Suddenly, the din of the gymnasium was silent to her. Forcing all sound out of her mind, she focused on the gleaming balance beam ahead of her. Taking a deep breath, Natasha made her graceful, yet powerful approach, mounted the beam flawlessly, and...executed her first perfect 10.</p>\n',
       tokens: [
-        {
-          text: 'She thought about what she had to do, struggling to rein in her wild, fearful thoughts.',
-          end: 90,
-          start: 3,
-          correct: false,
-        },
-        {
-          start: 449,
-          end: 585,
-          text: 'Just for a hair of a moment, Natasha wondered if she really wanted a perfect 10, so weary was she of trying for but never achieving one.',
-          correct: false,
-        },
-        {
-          end: 627,
-          correct: false,
-          text: 'At last Natasha\'s moment arrived.',
-          start: 594,
-        },
-        {
-          end: 743,
-          text: 'The faces of past giants of gymnastics swam before her mind\'s eye, now razor&#8211;sharp with fierce determination.',
-          correct: false,
-          start: 628,
-        },
-        {
-          text: 'Suddenly, the din of the gymnasium was silent to her.',
-          end: 997,
-          correct: false,
-          start: 944,
-        },
-        {
-          end: 1087,
-          start: 998,
-          correct: false,
-          text: 'Forcing all sound out of her mind, she focused on the gleaming balance beam ahead of her.',
-        },
-        {
-          correct: true,
-          start: 1088,
-          end: 1225,
-          text: 'Taking a deep breath, Natasha made her graceful, yet powerful approach, mounted the beam flawlessly, and...executed her first perfect 10.',
-        },
+        // {
+        //   id: '0-30-1751440197593',
+        //   quote: 'She thought about what she had',
+        //   start: 0,
+        //   end: 30,
+        // },
+        // {
+        //   id: '185-206-1751440199435',
+        //   quote: 'o please her Coach, y',
+        //   start: 185,
+        //   end: 206,
+        // },
+        // {
+        //   id: '356-379-1751440202337',
+        //   quote: 'e much more humorous to',
+        //   start: 356,
+        //   end: 379,
+        // },
+        // {
+        //   id: '0-88-1751443110733',
+        //   quote: 'She thought about what she had to do, struggling to rein in her wild, fearful thoughts. ',
+        //   start: 0,
+        //   end: 88,
+        // },
+        // {
+        //   id: '590-607-1751443116013',
+        //   quote: "Át last Ñatasha's",
+        //   start: 590,
+        //   end: 607,
+        // },
+        // {
+        //   id: '624-641-1751443118643',
+        //   quote: 'The faces of past',
+        //   start: 624,
+        //   end: 641,
+        // },
+        // {
+        //   id: '1223-1231-1751443121777',
+        //   quote: 'header 2',
+        //   start: 1223,
+        //   end: 1231,
+        // },
+        // {
+        //   id: '358-376-1751443129379',
+        //   quote: '»»» were much more',
+        //   start: 358,
+        //   end: 376,
+        // },
+        // {
+        //   id: '137-154-1751443132310',
+        //   quote: 'mind never scored',
+        //   start: 137,
+        //   end: 154,
+        // },
       ],
-      // "element": "select-text",
-      text: '<p>She thought about what she had to do, struggling to rein in her wild, fearful thoughts. Coach Cummings always said that an undisciplined mind never scored a perfect 10. Natasha wanted to please her Coach, yet sometimes his approval wasn\'t as exciting as his anger. The gymnasts were unanimous about one thing: Coach Cummings\'s fits of disapproving rage were much more humorous to witness than his infrequent, backslapping moments of high praise. Just for a hair of a moment, Natasha wondered if she really wanted a perfect 10, so weary was she of trying for but never achieving one.</p>\n\n<p>At last Natasha\'s moment arrived. The faces of past giants of gymnastics swam before her mind\'s eye, now razor&#8211;sharp with fierce determination. "I am talented. I am not afraid. I will make a perfect 10," she spoke aloud to herself, as she approached the mat, dusted her hands with chalk to prevent slippage, and returned to her starting point. Suddenly, the din of the gymnasium was silent to her. Forcing all sound out of her mind, she focused on the gleaming balance beam ahead of her. Taking a deep breath, Natasha made her graceful, yet powerful approach, mounted the beam flawlessly, and...executed her first perfect 10.</p>\n',
+      text: '<p>She thought about what she had to do, <u>struggling to rein</u> in her wild, <b>fearful thoughts</b>. Coach Cummings always said that an undisciplined mind <sup>never scored </sup>a perfect 10. Natasha  €€€ wanted to please her Coach, yet sometimes his approval wasn&#x27;t as exciting as his anger. The gymnasts were unanimous about one thing: Coach Cummings&#x27;s fits of disapproving rage »»» were much more humorous to witness than his infrequent, backslapping moments of high praise. Just for a hair of a moment, Natasha wondered if she really wanted a perfect 10, so weary was she of trying for but never achieving one</p><p><em>Át last Ñatasha&#x27;s moment arrived.</em> The <s>faces</s> of past giants of gymnastics swam before her mind&#x27;s eye, now razor–sharp with fierce determination. &quot;I am talented. I am not afraid. I will make a perfect 10,&quot; she spoke aloud to herself, as she approached the mat, dusted her hands with chalk to prevent slippage, and returned to her starting point. Suddenly, the din of the gymnasium was silent to her. Forcing all sound out of her mind, she focused on the gleaming balance beam ahead of her. Taking a deep breath, Natasha made her graceful, yet powerful approach, mounted the beam flawlessly, and...executed her first perfect 10.</p><p></p><table border="1"><tbody><tr><td><p>header 1</p></td><td><p>header 2</p></td></tr><tr><td><p>row </p></td><td><p>row</p></td></tr></tbody></table><div></div>',
       rubricEnabled: false,
     }),
   );

From 7ce81e52c279c0f21a405448d1fdedfe9e226654 Mon Sep 17 00:00:00 2001
From: Andrei Miron <andrei.miron@mcro-e.com>
Date: Fri, 11 Jul 2025 10:40:00 +0300
Subject: [PATCH 09/18] fix lint

---
 packages/select-text/configure/src/design.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/select-text/configure/src/design.jsx b/packages/select-text/configure/src/design.jsx
index 3415a9a67a..4b6c164990 100644
--- a/packages/select-text/configure/src/design.jsx
+++ b/packages/select-text/configure/src/design.jsx
@@ -609,7 +609,7 @@ export class Design extends React.Component {
         {/*  )}*/}
         {/*</div>*/}
 
-        <div class={classes.subheader}>
+        <div className={classes.subheader}>
           NEW functionality
           <FormControlLabel
             control={<Switch checked={selectMode} onChange={() => this.setState({ selectMode: !selectMode })} />}

From 0f8fabb0a666e0dfb9bd694e8c0f572ecd8b8143 Mon Sep 17 00:00:00 2001
From: Andrei Miron <andrei.miron@mcro-e.com>
Date: Fri, 11 Jul 2025 10:45:06 +0300
Subject: [PATCH 10/18] update snapshots and fix tests for poc

---
 .../__snapshots__/design.test.jsx.snap        | 428 +++++++++---------
 .../configure/src/__tests__/design.test.jsx   |  12 +-
 2 files changed, 230 insertions(+), 210 deletions(-)

diff --git a/packages/select-text/configure/src/__tests__/__snapshots__/design.test.jsx.snap b/packages/select-text/configure/src/__tests__/__snapshots__/design.test.jsx.snap
index b508b948da..6a8dd96175 100644
--- a/packages/select-text/configure/src/__tests__/__snapshots__/design.test.jsx.snap
+++ b/packages/select-text/configure/src/__tests__/__snapshots__/design.test.jsx.snap
@@ -141,6 +141,17 @@ exports[`design snapshot renders all items except feedback 1`] = `
             "settings": true,
           },
           "text": Object {
+            "inputConfiguration": Object {
+              "audio": Object {
+                "disabled": true,
+              },
+              "image": Object {
+                "disabled": true,
+              },
+              "video": Object {
+                "disabled": true,
+              },
+            },
             "label": "Content",
             "settings": true,
           },
@@ -183,68 +194,73 @@ exports[`design snapshot renders all items except feedback 1`] = `
     />
   }
 >
+  <div>
+    NEW functionality
+    <WithStyles(WithFormControlContext(FormControlLabel))
+      control={
+        <WithStyles(Switch)
+          checked={false}
+          onChange={[Function]}
+        />
+      }
+      label="Select tokens"
+    />
+  </div>
   <Component
     label="Content"
   >
-    <TextField
-      defaultValue=""
-      multiline={true}
+    <EditableHtml
+      allowValidation={false}
+      disableUnderline={true}
+      languageCharactersProps={
+        Array [
+          Object {
+            "language": "spanish",
+          },
+          Object {
+            "language": "special",
+          },
+        ]
+      }
+      markup=""
+      mathMlOptions={
+        Object {
+          "mmlEditing": false,
+          "mmlOutput": false,
+        }
+      }
+      nonEmpty={false}
       onChange={[Function]}
-      required={false}
-      select={false}
-      variant="standard"
-    />
-  </Component>
-  <Component
-    label="Tokens"
-  >
-    <WithStyles(Tooltip)
-      classes={
+      onDone={[Function]}
+      pluginProps={
         Object {
-          "tooltip": undefined,
+          "audio": Object {
+            "disabled": true,
+          },
+          "image": Object {
+            "disabled": true,
+          },
+          "separateParagraphs": Object {
+            "disabled": true,
+          },
+          "showParagraphs": Object {
+            "disabled": false,
+          },
+          "textAlign": Object {
+            "disabled": true,
+          },
+          "video": Object {
+            "disabled": true,
+          },
         }
       }
-      disableFocusListener={true}
-      disableTouchListener={true}
-      placement="right"
-      title="Validation requirements:
-There should be at least 2 tokens defined.
-There should be at least 1 token selected."
-    >
-      <pure(InfoIcon)
-        color="primary"
-        fontSize="small"
-        style={
-          Object {
-            "left": "48px",
-            "position": "absolute",
-            "top": "-3px",
-          }
+      toolbarOpts={
+        Object {
+          "position": "bottom",
         }
-      />
-    </WithStyles(Tooltip)>
-    <WithStyles(Tokenizer)
-      onChange={[Function]}
-      tokens={Array []}
+      }
     />
   </Component>
-  <div>
-    <WithStyles(Chip)
-      label="Mode: None"
-    />
-    <WithStyles(Chip)
-      label="Selections Available: 0"
-    />
-    <WithStyles(Chip)
-      label="Correct Answers: 0"
-    />
-    <Component
-      label="Selection count (0:any)"
-      max={0}
-      min={0}
-      onChange={[Function]}
-    />
-  </div>
 </ConfigLayout>
 `;
 
@@ -389,6 +405,17 @@ exports[`design snapshot renders all items except the content input 1`] = `
             "settings": true,
           },
           "text": Object {
+            "inputConfiguration": Object {
+              "audio": Object {
+                "disabled": true,
+              },
+              "image": Object {
+                "disabled": true,
+              },
+              "video": Object {
+                "disabled": true,
+              },
+            },
             "label": "Content",
             "settings": false,
           },
@@ -431,54 +458,16 @@ exports[`design snapshot renders all items except the content input 1`] = `
     />
   }
 >
-  <Component
-    label="Tokens"
-  >
-    <WithStyles(Tooltip)
-      classes={
-        Object {
-          "tooltip": undefined,
-        }
-      }
-      disableFocusListener={true}
-      disableTouchListener={true}
-      placement="right"
-      title="Validation requirements:
-There should be at least 2 tokens defined.
-There should be at least 1 token selected."
-    >
-      <pure(InfoIcon)
-        color="primary"
-        fontSize="small"
-        style={
-          Object {
-            "left": "48px",
-            "position": "absolute",
-            "top": "-3px",
-          }
-        }
-      />
-    </WithStyles(Tooltip)>
-    <WithStyles(Tokenizer)
-      onChange={[Function]}
-      tokens={Array []}
-    />
-  </Component>
   <div>
-    <WithStyles(Chip)
-      label="Mode: None"
-    />
-    <WithStyles(Chip)
-      label="Selections Available: 0"
-    />
-    <WithStyles(Chip)
-      label="Correct Answers: 0"
-    />
-    <Component
-      label="Selection count (0:any)"
-      max={0}
-      min={0}
-      onChange={[Function]}
+    NEW functionality
+    <WithStyles(WithFormControlContext(FormControlLabel))
+      control={
+        <WithStyles(Switch)
+          checked={false}
+          onChange={[Function]}
+        />
+      }
+      label="Select tokens"
     />
   </div>
 </ConfigLayout>
@@ -625,6 +614,17 @@ exports[`design snapshot renders all items with defaultProps 1`] = `
             "settings": true,
           },
           "text": Object {
+            "inputConfiguration": Object {
+              "audio": Object {
+                "disabled": true,
+              },
+              "image": Object {
+                "disabled": true,
+              },
+              "video": Object {
+                "disabled": true,
+              },
+            },
             "label": "Content",
             "settings": true,
           },
@@ -667,68 +667,73 @@ exports[`design snapshot renders all items with defaultProps 1`] = `
     />
   }
 >
+  <div>
+    NEW functionality
+    <WithStyles(WithFormControlContext(FormControlLabel))
+      control={
+        <WithStyles(Switch)
+          checked={false}
+          onChange={[Function]}
+        />
+      }
+      label="Select tokens"
+    />
+  </div>
   <Component
     label="Content"
   >
-    <TextField
-      defaultValue=""
-      multiline={true}
+    <EditableHtml
+      allowValidation={false}
+      disableUnderline={true}
+      languageCharactersProps={
+        Array [
+          Object {
+            "language": "spanish",
+          },
+          Object {
+            "language": "special",
+          },
+        ]
+      }
+      markup=""
+      mathMlOptions={
+        Object {
+          "mmlEditing": false,
+          "mmlOutput": false,
+        }
+      }
+      nonEmpty={false}
       onChange={[Function]}
-      required={false}
-      select={false}
-      variant="standard"
-    />
-  </Component>
-  <Component
-    label="Tokens"
-  >
-    <WithStyles(Tooltip)
-      classes={
+      onDone={[Function]}
+      pluginProps={
         Object {
-          "tooltip": undefined,
+          "audio": Object {
+            "disabled": true,
+          },
+          "image": Object {
+            "disabled": true,
+          },
+          "separateParagraphs": Object {
+            "disabled": true,
+          },
+          "showParagraphs": Object {
+            "disabled": false,
+          },
+          "textAlign": Object {
+            "disabled": true,
+          },
+          "video": Object {
+            "disabled": true,
+          },
         }
       }
-      disableFocusListener={true}
-      disableTouchListener={true}
-      placement="right"
-      title="Validation requirements:
-There should be at least 2 tokens defined.
-There should be at least 1 token selected."
-    >
-      <pure(InfoIcon)
-        color="primary"
-        fontSize="small"
-        style={
-          Object {
-            "left": "48px",
-            "position": "absolute",
-            "top": "-3px",
-          }
+      toolbarOpts={
+        Object {
+          "position": "bottom",
         }
-      />
-    </WithStyles(Tooltip)>
-    <WithStyles(Tokenizer)
-      onChange={[Function]}
-      tokens={Array []}
+      }
     />
   </Component>
-  <div>
-    <WithStyles(Chip)
-      label="Mode: None"
-    />
-    <WithStyles(Chip)
-      label="Selections Available: 0"
-    />
-    <WithStyles(Chip)
-      label="Correct Answers: 0"
-    />
-    <Component
-      label="Selection count (0:any)"
-      max={0}
-      min={0}
-      onChange={[Function]}
-    />
-  </div>
 </ConfigLayout>
 `;
 
@@ -873,6 +878,17 @@ exports[`design snapshot tokenizer renders with html entities 1`] = `
             "settings": true,
           },
           "text": Object {
+            "inputConfiguration": Object {
+              "audio": Object {
+                "disabled": true,
+              },
+              "image": Object {
+                "disabled": true,
+              },
+              "video": Object {
+                "disabled": true,
+              },
+            },
             "label": "Content",
             "settings": true,
           },
@@ -916,68 +932,72 @@ exports[`design snapshot tokenizer renders with html entities 1`] = `
     />
   }
 >
+  <div>
+    NEW functionality
+    <WithStyles(WithFormControlContext(FormControlLabel))
+      control={
+        <WithStyles(Switch)
+          checked={false}
+          onChange={[Function]}
+        />
+      }
+      label="Select tokens"
+    />
+  </div>
   <Component
     label="Content"
   >
-    <TextField
-      defaultValue="<p>&#8220;Lucy?&#63; Are you using your time wisely to plan your project?&#33;&#33;&#33;&#8221; Mr. Wilson asked.</p><p>Lucy looked a little confused at first. &#195; Then she grinned and proudly stated, &#8220;Why, yes I am! I plan to make a bird feeder for that tree out our window!&#8221;</p>"
-      multiline={true}
+    <EditableHtml
+      allowValidation={false}
+      disableUnderline={true}
+      languageCharactersProps={
+        Array [
+          Object {
+            "language": "spanish",
+          },
+          Object {
+            "language": "special",
+          },
+        ]
+      }
+      markup="<p>&#8220;Lucy?&#63; Are you using your time wisely to plan your project?&#33;&#33;&#33;&#8221; Mr. Wilson asked.</p><p>Lucy looked a little confused at first. &#195; Then she grinned and proudly stated, &#8220;Why, yes I am! I plan to make a bird feeder for that tree out our window!&#8221;</p>"
+      mathMlOptions={
+        Object {
+          "mmlEditing": false,
+          "mmlOutput": false,
+        }
+      }
+      nonEmpty={false}
       onChange={[Function]}
-      required={false}
-      select={false}
-      variant="standard"
-    />
-  </Component>
-  <Component
-    label="Tokens"
-  >
-    <WithStyles(Tooltip)
-      classes={
+      onDone={[Function]}
+      pluginProps={
         Object {
-          "tooltip": undefined,
+          "audio": Object {
+            "disabled": true,
+          },
+          "image": Object {
+            "disabled": true,
+          },
+          "separateParagraphs": Object {
+            "disabled": true,
+          },
+          "showParagraphs": Object {
+            "disabled": false,
+          },
+          "textAlign": Object {
+            "disabled": true,
+          },
+          "video": Object {
+            "disabled": true,
+          },
         }
       }
-      disableFocusListener={true}
-      disableTouchListener={true}
-      placement="right"
-      title="Validation requirements:
-There should be at least 2 tokens defined.
-There should be at least 1 token selected."
-    >
-      <pure(InfoIcon)
-        color="primary"
-        fontSize="small"
-        style={
-          Object {
-            "left": "48px",
-            "position": "absolute",
-            "top": "-3px",
-          }
+      toolbarOpts={
+        Object {
+          "position": "bottom",
         }
-      />
-    </WithStyles(Tooltip)>
-    <WithStyles(Tokenizer)
-      onChange={[Function]}
-      text="<p>&#8220;Lucy?&#63; Are you using your time wisely to plan your project?&#33;&#33;&#33;&#8221; Mr. Wilson asked.</p><p>Lucy looked a little confused at first. &#195; Then she grinned and proudly stated, &#8220;Why, yes I am! I plan to make a bird feeder for that tree out our window!&#8221;</p>"
-      tokens={Array []}
+      }
     />
   </Component>
-  <div>
-    <WithStyles(Chip)
-      label="Mode: None"
-    />
-    <WithStyles(Chip)
-      label="Selections Available: 0"
-    />
-    <WithStyles(Chip)
-      label="Correct Answers: 0"
-    />
-    <Component
-      label="Selection count (0:any)"
-      max={0}
-      min={0}
-      onChange={[Function]}
-    />
-  </div>
 </ConfigLayout>
 `;
diff --git a/packages/select-text/configure/src/__tests__/design.test.jsx b/packages/select-text/configure/src/__tests__/design.test.jsx
index 12b6621cf5..ff991b37d4 100644
--- a/packages/select-text/configure/src/__tests__/design.test.jsx
+++ b/packages/select-text/configure/src/__tests__/design.test.jsx
@@ -121,12 +121,12 @@ describe('design', () => {
       });
     };
 
-    describe('changeText', () => {
-      assert('changeText', [{ target: { value: 'foo' } }], (m) => ({
-        ...m,
-        text: 'foo',
-      }));
-    });
+    // describe('changeText', () => {
+    //   assert('changeText', [{ target: { value: 'foo' } }], (m) => ({
+    //     ...m,
+    //     text: 'foo',
+    //   }));
+    // });
 
     describe('changeTokens', () => {
       assert('changeTokens', [[{ start: 0, end: 1, text: 'f' }], 'words'], (m) => ({

From bd6d706f251ef39b580063100594d81ba2518752 Mon Sep 17 00:00:00 2001
From: carlacostea <carlacostea@yahoo.com>
Date: Fri, 11 Jul 2025 12:30:38 +0300
Subject: [PATCH 11/18] fix: bump math-validation PD-4848

---
 packages/math-inline/controller/package.json    | 2 +-
 packages/math-templated/controller/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/math-inline/controller/package.json b/packages/math-inline/controller/package.json
index 2ebdb081e5..ca0a218fa2 100644
--- a/packages/math-inline/controller/package.json
+++ b/packages/math-inline/controller/package.json
@@ -9,7 +9,7 @@
     "test": "./node_modules/.bin/jest"
   },
   "dependencies": {
-    "@pie-framework/math-validation": "^1.4.0",
+    "@pie-framework/math-validation": "^1.4.1",
     "@pie-lib/pie-toolbox": "2.19.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
diff --git a/packages/math-templated/controller/package.json b/packages/math-templated/controller/package.json
index 2ec3a8815c..b2569b0bd4 100644
--- a/packages/math-templated/controller/package.json
+++ b/packages/math-templated/controller/package.json
@@ -6,7 +6,7 @@
   "main": "lib/index.js",
   "module": "src/index.js",
   "dependencies": {
-    "@pie-framework/math-validation": "^1.4.0",
+    "@pie-framework/math-validation": "^1.4.1",
     "@pie-lib/pie-toolbox": "2.19.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"

From 3e2e0551e32e57f2aed066accbd8a116a9690d9f Mon Sep 17 00:00:00 2001
From: carlacostea <carlacostea@yahoo.com>
Date: Fri, 11 Jul 2025 12:47:27 +0300
Subject: [PATCH 12/18] fix: bump math-validation PD-4848

---
 yarn.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 23a1a959b3..699793d241 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2227,10 +2227,10 @@
     mathjs "^7.0.1"
     numeric "^1.2.6"
 
-"@pie-framework/math-validation@^1.4.0":
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/@pie-framework/math-validation/-/math-validation-1.4.0.tgz#0c4dbabec735f6baf708c511854aef7a78c0d95c"
-  integrity sha512-Fm9DW7FL8KYfYQTqJezEtAPEXpmEWxGwugizODWNFn3AAS5PlrLhn4GEA9bL/6zxb7i7E1E/kEdx+Df2rK4ZtQ==
+"@pie-framework/math-validation@^1.4.1":
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/@pie-framework/math-validation/-/math-validation-1.4.1.tgz#091284ddb850c9486dada9528f4bafc497d989ba"
+  integrity sha512-uUPlJjg9PC2GSbSRYAA21ra1XM3cSlqy2IhK1FX5ziRTxtW6uf1hpqVjKwYSCnLQ6oR8kVztorQaN8ozsJo7Lw==
   dependencies:
     lodash "^4.17.21"
     mathjs "^9.4.2"

From 10ce402bcb1c0c9c24dfc9ecff2e13c4de14a753 Mon Sep 17 00:00:00 2001
From: carlacostea <carlacostea@yahoo.com>
Date: Fri, 11 Jul 2025 13:14:49 +0300
Subject: [PATCH 13/18] fix: update pie-lib/pie-toolbox PD-363

---
 packages/boilerplate-item-type/configure/package.json     | 2 +-
 packages/boilerplate-item-type/controller/package.json    | 2 +-
 packages/boilerplate-item-type/package.json               | 2 +-
 packages/calculator/configure/package.json                | 2 +-
 packages/categorize/configure/package.json                | 2 +-
 packages/categorize/controller/package.json               | 2 +-
 packages/categorize/package.json                          | 2 +-
 packages/charting/configure/package.json                  | 2 +-
 packages/charting/controller/package.json                 | 2 +-
 packages/charting/package.json                            | 2 +-
 packages/complex-rubric/controller/package.json           | 2 +-
 packages/drag-in-the-blank/configure/package.json         | 2 +-
 packages/drag-in-the-blank/controller/package.json        | 2 +-
 packages/drag-in-the-blank/package.json                   | 2 +-
 packages/drawing-response/configure/package.json          | 2 +-
 packages/drawing-response/package.json                    | 2 +-
 packages/ebsr/configure/package.json                      | 2 +-
 packages/ebsr/controller/package.json                     | 2 +-
 packages/ebsr/package.json                                | 2 +-
 .../explicit-constructed-response/configure/package.json  | 2 +-
 .../explicit-constructed-response/controller/package.json | 2 +-
 packages/explicit-constructed-response/package.json       | 2 +-
 packages/extended-text-entry/configure/package.json       | 2 +-
 packages/extended-text-entry/controller/package.json      | 2 +-
 packages/extended-text-entry/package.json                 | 2 +-
 packages/fraction-model/configure/package.json            | 2 +-
 packages/fraction-model/controller/package.json           | 2 +-
 packages/fraction-model/package.json                      | 2 +-
 packages/graphing-solution-set/configure/package.json     | 2 +-
 packages/graphing-solution-set/controller/package.json    | 2 +-
 packages/graphing-solution-set/package.json               | 2 +-
 packages/graphing/configure/package.json                  | 2 +-
 packages/graphing/controller/package.json                 | 2 +-
 packages/graphing/package.json                            | 2 +-
 packages/hotspot/configure/package.json                   | 2 +-
 packages/hotspot/controller/package.json                  | 2 +-
 packages/hotspot/package.json                             | 2 +-
 packages/image-cloze-association/configure/package.json   | 2 +-
 packages/image-cloze-association/controller/package.json  | 2 +-
 packages/image-cloze-association/package.json             | 2 +-
 packages/inline-dropdown/configure/package.json           | 2 +-
 packages/inline-dropdown/controller/package.json          | 2 +-
 packages/inline-dropdown/package.json                     | 2 +-
 packages/likert/configure/package.json                    | 2 +-
 packages/likert/package.json                              | 2 +-
 packages/match-list/controller/package.json               | 2 +-
 packages/match-list/package.json                          | 2 +-
 packages/match/configure/package.json                     | 2 +-
 packages/match/controller/package.json                    | 2 +-
 packages/match/package.json                               | 2 +-
 packages/math-inline/configure/package.json               | 2 +-
 packages/math-inline/controller/package.json              | 2 +-
 packages/math-inline/package.json                         | 2 +-
 packages/math-templated/configure/package.json            | 2 +-
 packages/math-templated/controller/package.json           | 2 +-
 packages/math-templated/package.json                      | 2 +-
 packages/matrix/configure/package.json                    | 2 +-
 packages/matrix/package.json                              | 2 +-
 packages/multi-trait-rubric/configure/package.json        | 2 +-
 packages/multi-trait-rubric/controller/package.json       | 2 +-
 packages/multi-trait-rubric/package.json                  | 2 +-
 packages/multiple-choice/configure/package.json           | 2 +-
 packages/multiple-choice/controller/package.json          | 2 +-
 packages/multiple-choice/package.json                     | 2 +-
 packages/number-line/configure/package.json               | 2 +-
 packages/number-line/controller/package.json              | 2 +-
 packages/number-line/package.json                         | 2 +-
 packages/passage/configure/package.json                   | 2 +-
 packages/passage/package.json                             | 2 +-
 packages/placement-ordering/configure/package.json        | 2 +-
 packages/placement-ordering/controller/package.json       | 2 +-
 packages/placement-ordering/package.json                  | 2 +-
 packages/protractor/package.json                          | 2 +-
 packages/rubric/configure/package.json                    | 2 +-
 packages/rubric/controller/package.json                   | 2 +-
 packages/rubric/package.json                              | 2 +-
 packages/ruler/configure/package.json                     | 2 +-
 packages/ruler/package.json                               | 2 +-
 packages/select-text/configure/package.json               | 2 +-
 packages/select-text/controller/package.json              | 2 +-
 packages/select-text/package.json                         | 2 +-
 pslb/pslb.config.js                                       | 2 +-
 yarn.lock                                                 | 8 ++++----
 83 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/packages/boilerplate-item-type/configure/package.json b/packages/boilerplate-item-type/configure/package.json
index 6ab1e0d350..914dde7b2d 100644
--- a/packages/boilerplate-item-type/configure/package.json
+++ b/packages/boilerplate-item-type/configure/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
diff --git a/packages/boilerplate-item-type/controller/package.json b/packages/boilerplate-item-type/controller/package.json
index 1755a99011..298f56ce29 100644
--- a/packages/boilerplate-item-type/controller/package.json
+++ b/packages/boilerplate-item-type/controller/package.json
@@ -6,7 +6,7 @@
   "main": "lib/index.js",
   "module": "src/index.js",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   },
diff --git a/packages/boilerplate-item-type/package.json b/packages/boilerplate-item-type/package.json
index 9c6fc7438f..ad1592ada7 100644
--- a/packages/boilerplate-item-type/package.json
+++ b/packages/boilerplate-item-type/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
diff --git a/packages/calculator/configure/package.json b/packages/calculator/configure/package.json
index 05e7996c28..1cf45ad44d 100644
--- a/packages/calculator/configure/package.json
+++ b/packages/calculator/configure/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
   },
diff --git a/packages/categorize/configure/package.json b/packages/categorize/configure/package.json
index b28fb9dd62..6d621a4212 100644
--- a/packages/categorize/configure/package.json
+++ b/packages/categorize/configure/package.json
@@ -12,7 +12,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.5",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
diff --git a/packages/categorize/controller/package.json b/packages/categorize/controller/package.json
index d45d6dbfbd..58fbb2afda 100644
--- a/packages/categorize/controller/package.json
+++ b/packages/categorize/controller/package.json
@@ -2,7 +2,7 @@
   "name": "@pie-element/categorize-controller",
   "private": true,
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "lodash": "^4.17.15"
   },
   "version": "7.8.10",
diff --git a/packages/categorize/package.json b/packages/categorize/package.json
index 3202d5f37a..944df0a2f8 100644
--- a/packages/categorize/package.json
+++ b/packages/categorize/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.15",
diff --git a/packages/charting/configure/package.json b/packages/charting/configure/package.json
index 2fa45a8bcf..fb63261a73 100644
--- a/packages/charting/configure/package.json
+++ b/packages/charting/configure/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "prop-types": "^15.6.2",
diff --git a/packages/charting/controller/package.json b/packages/charting/controller/package.json
index 9db38ae03c..6da95af8f1 100644
--- a/packages/charting/controller/package.json
+++ b/packages/charting/controller/package.json
@@ -9,7 +9,7 @@
     "test": "./node_modules/.bin/jest"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^4.1.1",
     "lodash": "^4.17.15"
   },
diff --git a/packages/charting/package.json b/packages/charting/package.json
index 0d27f6ed7b..225b0c4277 100644
--- a/packages/charting/package.json
+++ b/packages/charting/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.15",
diff --git a/packages/complex-rubric/controller/package.json b/packages/complex-rubric/controller/package.json
index 48144ce481..64ac2cf956 100644
--- a/packages/complex-rubric/controller/package.json
+++ b/packages/complex-rubric/controller/package.json
@@ -7,7 +7,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "lodash": "^4.17.15"
   },
   "author": "",
diff --git a/packages/drag-in-the-blank/configure/package.json b/packages/drag-in-the-blank/configure/package.json
index d0055210ce..aa04a4e0b0 100644
--- a/packages/drag-in-the-blank/configure/package.json
+++ b/packages/drag-in-the-blank/configure/package.json
@@ -8,7 +8,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
diff --git a/packages/drag-in-the-blank/controller/package.json b/packages/drag-in-the-blank/controller/package.json
index e54658f0aa..cb3d264f22 100644
--- a/packages/drag-in-the-blank/controller/package.json
+++ b/packages/drag-in-the-blank/controller/package.json
@@ -8,7 +8,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "type-of": "^2.0.1"
diff --git a/packages/drag-in-the-blank/package.json b/packages/drag-in-the-blank/package.json
index 6c40246bbc..0b8175d025 100644
--- a/packages/drag-in-the-blank/package.json
+++ b/packages/drag-in-the-blank/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.5",
     "lodash": "^4.17.10",
     "prop-types": "^15.6.1",
diff --git a/packages/drawing-response/configure/package.json b/packages/drawing-response/configure/package.json
index c9de5631c6..ac8c914c3a 100644
--- a/packages/drawing-response/configure/package.json
+++ b/packages/drawing-response/configure/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.6",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
diff --git a/packages/drawing-response/package.json b/packages/drawing-response/package.json
index 95fb730c20..8f77d6d028 100644
--- a/packages/drawing-response/package.json
+++ b/packages/drawing-response/package.json
@@ -11,7 +11,7 @@
     "@mdi/js": "^3.6.95",
     "@mdi/react": "^1.1.1",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.6",
     "enzyme-to-json": "^3.3.5",
     "konva": "^3.4.1",
diff --git a/packages/ebsr/configure/package.json b/packages/ebsr/configure/package.json
index 9581824394..b2a0a7a542 100644
--- a/packages/ebsr/configure/package.json
+++ b/packages/ebsr/configure/package.json
@@ -10,7 +10,7 @@
     "@material-ui/core": "^3.9.2",
     "@pie-element/multiple-choice": "^9.17.0",
     "@pie-framework/pie-configure-events": "^1.2.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
     "react": "^16.8.1",
diff --git a/packages/ebsr/controller/package.json b/packages/ebsr/controller/package.json
index 6075898bed..ec11306824 100644
--- a/packages/ebsr/controller/package.json
+++ b/packages/ebsr/controller/package.json
@@ -7,7 +7,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "lodash": "^4.17.15"
   },
   "author": "",
diff --git a/packages/ebsr/package.json b/packages/ebsr/package.json
index 66d50a6f4a..925ecd7bff 100644
--- a/packages/ebsr/package.json
+++ b/packages/ebsr/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@pie-element/multiple-choice": "^9.17.0",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.11"
diff --git a/packages/explicit-constructed-response/configure/package.json b/packages/explicit-constructed-response/configure/package.json
index 460f77c9ac..ba07b4e650 100644
--- a/packages/explicit-constructed-response/configure/package.json
+++ b/packages/explicit-constructed-response/configure/package.json
@@ -8,7 +8,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.6",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
diff --git a/packages/explicit-constructed-response/controller/package.json b/packages/explicit-constructed-response/controller/package.json
index d3fe403cb1..52728eaaac 100644
--- a/packages/explicit-constructed-response/controller/package.json
+++ b/packages/explicit-constructed-response/controller/package.json
@@ -8,7 +8,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^3.1.0",
     "he": "^1.2.0",
     "lodash": "^4.17.15",
diff --git a/packages/explicit-constructed-response/package.json b/packages/explicit-constructed-response/package.json
index 22e4593d3e..af65696304 100644
--- a/packages/explicit-constructed-response/package.json
+++ b/packages/explicit-constructed-response/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.5",
     "he": "^1.2.0",
     "lodash": "^4.17.10",
diff --git a/packages/extended-text-entry/configure/package.json b/packages/extended-text-entry/configure/package.json
index a978d18f13..a3d3703a3b 100644
--- a/packages/extended-text-entry/configure/package.json
+++ b/packages/extended-text-entry/configure/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
     "react": "^16.8.1",
diff --git a/packages/extended-text-entry/controller/package.json b/packages/extended-text-entry/controller/package.json
index 906dd2caa8..94e7f88e13 100644
--- a/packages/extended-text-entry/controller/package.json
+++ b/packages/extended-text-entry/controller/package.json
@@ -6,7 +6,7 @@
   "main": "lib/index.js",
   "module": "src/index.js",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.19.0"
+    "@pie-lib/pie-toolbox": "2.20.0"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
diff --git a/packages/extended-text-entry/package.json b/packages/extended-text-entry/package.json
index 58825af2cb..c7dd405f91 100644
--- a/packages/extended-text-entry/package.json
+++ b/packages/extended-text-entry/package.json
@@ -12,7 +12,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.5",
     "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 e28ef5eff1..35dc205628 100644
--- a/packages/fraction-model/configure/package.json
+++ b/packages/fraction-model/configure/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
diff --git a/packages/fraction-model/controller/package.json b/packages/fraction-model/controller/package.json
index 447e737ac5..47ab9248ea 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/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   },
diff --git a/packages/fraction-model/package.json b/packages/fraction-model/package.json
index 0618422b0f..113793dbfa 100644
--- a/packages/fraction-model/package.json
+++ b/packages/fraction-model/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
     "react-dom": "^16.8.1",
diff --git a/packages/graphing-solution-set/configure/package.json b/packages/graphing-solution-set/configure/package.json
index 711d0df725..94fdbcf71a 100644
--- a/packages/graphing-solution-set/configure/package.json
+++ b/packages/graphing-solution-set/configure/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "prop-types": "^15.6.2",
diff --git a/packages/graphing-solution-set/controller/package.json b/packages/graphing-solution-set/controller/package.json
index d38a5f6d75..e8a1e5d91c 100644
--- a/packages/graphing-solution-set/controller/package.json
+++ b/packages/graphing-solution-set/controller/package.json
@@ -9,7 +9,7 @@
     "test": "./node_modules/.bin/jest"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^4.1.1"
   },
   "devDependencies": {
diff --git a/packages/graphing-solution-set/package.json b/packages/graphing-solution-set/package.json
index 7e645a4f6f..f894b63db4 100644
--- a/packages/graphing-solution-set/package.json
+++ b/packages/graphing-solution-set/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "react": "^16.8.1",
diff --git a/packages/graphing/configure/package.json b/packages/graphing/configure/package.json
index 199ae829bd..caffba87d5 100644
--- a/packages/graphing/configure/package.json
+++ b/packages/graphing/configure/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.15",
diff --git a/packages/graphing/controller/package.json b/packages/graphing/controller/package.json
index 915b491417..999e8e34a7 100644
--- a/packages/graphing/controller/package.json
+++ b/packages/graphing/controller/package.json
@@ -9,7 +9,7 @@
     "test": "./node_modules/.bin/jest"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^4.1.1"
   },
   "devDependencies": {
diff --git a/packages/graphing/package.json b/packages/graphing/package.json
index da939cb452..12c4e9a0ef 100644
--- a/packages/graphing/package.json
+++ b/packages/graphing/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "react": "^16.8.1",
diff --git a/packages/hotspot/configure/package.json b/packages/hotspot/configure/package.json
index 23fcc09cfb..dd4380578b 100644
--- a/packages/hotspot/configure/package.json
+++ b/packages/hotspot/configure/package.json
@@ -10,7 +10,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.6",
     "debug": "^3.1.0",
     "konva": "^3.2.4",
diff --git a/packages/hotspot/controller/package.json b/packages/hotspot/controller/package.json
index 635068401a..59c45871d0 100644
--- a/packages/hotspot/controller/package.json
+++ b/packages/hotspot/controller/package.json
@@ -11,7 +11,7 @@
   "main": "lib/index.js",
   "module": "src/index.js",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^4.1.1",
     "lodash": "^4.17.15"
   }
diff --git a/packages/hotspot/package.json b/packages/hotspot/package.json
index 983858d742..43b226aa7a 100644
--- a/packages/hotspot/package.json
+++ b/packages/hotspot/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.3",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "konva": "^3.2.5",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
diff --git a/packages/image-cloze-association/configure/package.json b/packages/image-cloze-association/configure/package.json
index f3be504edc..6b291796cd 100644
--- a/packages/image-cloze-association/configure/package.json
+++ b/packages/image-cloze-association/configure/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^3.1.0",
     "prop-types": "^15.7.2",
     "react": "^16.8.6",
diff --git a/packages/image-cloze-association/controller/package.json b/packages/image-cloze-association/controller/package.json
index 5e45a05340..f3ea650f14 100644
--- a/packages/image-cloze-association/controller/package.json
+++ b/packages/image-cloze-association/controller/package.json
@@ -11,7 +11,7 @@
   "main": "lib/index.js",
   "module": "src/index.js",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^4.1.1",
     "humps": "^2.0.1",
     "lodash": "^4.17.15"
diff --git a/packages/image-cloze-association/package.json b/packages/image-cloze-association/package.json
index cef8c9e5a5..d12405f68f 100644
--- a/packages/image-cloze-association/package.json
+++ b/packages/image-cloze-association/package.json
@@ -10,7 +10,7 @@
     "@material-ui/core": "^3.9.3",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.6",
     "humps": "^2.0.1",
     "prop-types": "^15.6.1",
diff --git a/packages/inline-dropdown/configure/package.json b/packages/inline-dropdown/configure/package.json
index 308968dcfb..40052d3ba8 100644
--- a/packages/inline-dropdown/configure/package.json
+++ b/packages/inline-dropdown/configure/package.json
@@ -8,7 +8,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.6",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
diff --git a/packages/inline-dropdown/controller/package.json b/packages/inline-dropdown/controller/package.json
index 30ef3c1279..0b22bed358 100644
--- a/packages/inline-dropdown/controller/package.json
+++ b/packages/inline-dropdown/controller/package.json
@@ -8,7 +8,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "type-of": "^2.0.1"
diff --git a/packages/inline-dropdown/package.json b/packages/inline-dropdown/package.json
index 2fd58a429f..fc1e29d62d 100644
--- a/packages/inline-dropdown/package.json
+++ b/packages/inline-dropdown/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.5",
     "lodash": "^4.17.10",
     "prop-types": "^15.6.1",
diff --git a/packages/likert/configure/package.json b/packages/likert/configure/package.json
index 646017a3e2..35a3d14ddb 100644
--- a/packages/likert/configure/package.json
+++ b/packages/likert/configure/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^4.1.1",
     "prop-types": "^15.6.2",
     "react": "^16.8.1",
diff --git a/packages/likert/package.json b/packages/likert/package.json
index d1c0f5169d..11cae95e6d 100644
--- a/packages/likert/package.json
+++ b/packages/likert/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.10",
diff --git a/packages/match-list/controller/package.json b/packages/match-list/controller/package.json
index 218cd5dfe3..b71ae9ef31 100644
--- a/packages/match-list/controller/package.json
+++ b/packages/match-list/controller/package.json
@@ -9,7 +9,7 @@
     "test": "./node_modules/.bin/jest"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   },
diff --git a/packages/match-list/package.json b/packages/match-list/package.json
index 16ce946f01..d9740a0c5c 100644
--- a/packages/match-list/package.json
+++ b/packages/match-list/package.json
@@ -14,7 +14,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.10",
diff --git a/packages/match/configure/package.json b/packages/match/configure/package.json
index ebefb97412..184c6b8953 100644
--- a/packages/match/configure/package.json
+++ b/packages/match/configure/package.json
@@ -10,7 +10,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.5",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
diff --git a/packages/match/controller/package.json b/packages/match/controller/package.json
index b2912467a8..7a2c21238b 100644
--- a/packages/match/controller/package.json
+++ b/packages/match/controller/package.json
@@ -9,7 +9,7 @@
     "test": "./node_modules/.bin/jest"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^3.1.0"
   },
   "devDependencies": {
diff --git a/packages/match/package.json b/packages/match/package.json
index d6d5b14266..9982501983 100644
--- a/packages/match/package.json
+++ b/packages/match/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.10",
diff --git a/packages/math-inline/configure/package.json b/packages/math-inline/configure/package.json
index 01eae5e391..c59f919a87 100644
--- a/packages/math-inline/configure/package.json
+++ b/packages/math-inline/configure/package.json
@@ -11,7 +11,7 @@
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/mathquill": "^1.1.3",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.5",
     "debug": "^3.1.0",
     "prop-types": "^15.6.2",
diff --git a/packages/math-inline/controller/package.json b/packages/math-inline/controller/package.json
index 2ebdb081e5..d6b0268460 100644
--- a/packages/math-inline/controller/package.json
+++ b/packages/math-inline/controller/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@pie-framework/math-validation": "^1.4.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   },
diff --git a/packages/math-inline/package.json b/packages/math-inline/package.json
index a9da328b49..b1a9d0e4ba 100644
--- a/packages/math-inline/package.json
+++ b/packages/math-inline/package.json
@@ -14,7 +14,7 @@
     "@material-ui/core": "^3.9.2",
     "@pie-framework/mathquill": "^1.1.3",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.10",
diff --git a/packages/math-templated/configure/package.json b/packages/math-templated/configure/package.json
index c3475ecaee..783be5bafb 100644
--- a/packages/math-templated/configure/package.json
+++ b/packages/math-templated/configure/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
diff --git a/packages/math-templated/controller/package.json b/packages/math-templated/controller/package.json
index 2ec3a8815c..eccf1e2e82 100644
--- a/packages/math-templated/controller/package.json
+++ b/packages/math-templated/controller/package.json
@@ -7,7 +7,7 @@
   "module": "src/index.js",
   "dependencies": {
     "@pie-framework/math-validation": "^1.4.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   },
diff --git a/packages/math-templated/package.json b/packages/math-templated/package.json
index f1df771af5..fc1c0f37dc 100644
--- a/packages/math-templated/package.json
+++ b/packages/math-templated/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
diff --git a/packages/matrix/configure/package.json b/packages/matrix/configure/package.json
index 1073c556b7..859c717bd8 100644
--- a/packages/matrix/configure/package.json
+++ b/packages/matrix/configure/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^4.1.1",
     "prop-types": "^15.6.2",
     "react": "^16.8.1",
diff --git a/packages/matrix/package.json b/packages/matrix/package.json
index d14b8fc8a3..e65117653b 100644
--- a/packages/matrix/package.json
+++ b/packages/matrix/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^4.1.1",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
diff --git a/packages/multi-trait-rubric/configure/package.json b/packages/multi-trait-rubric/configure/package.json
index adac5bf6b4..7c4dd43dfd 100644
--- a/packages/multi-trait-rubric/configure/package.json
+++ b/packages/multi-trait-rubric/configure/package.json
@@ -8,7 +8,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
diff --git a/packages/multi-trait-rubric/controller/package.json b/packages/multi-trait-rubric/controller/package.json
index b0b0175fab..1fac801998 100644
--- a/packages/multi-trait-rubric/controller/package.json
+++ b/packages/multi-trait-rubric/controller/package.json
@@ -8,7 +8,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   }
diff --git a/packages/multi-trait-rubric/package.json b/packages/multi-trait-rubric/package.json
index 45bfd0766e..f45e9f473c 100644
--- a/packages/multi-trait-rubric/package.json
+++ b/packages/multi-trait-rubric/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "clsx": "^1.1.1",
     "enzyme-to-json": "^3.3.5",
     "prop-types": "^15.6.1",
diff --git a/packages/multiple-choice/configure/package.json b/packages/multiple-choice/configure/package.json
index c5b8bd00d9..80ad309ed3 100644
--- a/packages/multiple-choice/configure/package.json
+++ b/packages/multiple-choice/configure/package.json
@@ -8,7 +8,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
diff --git a/packages/multiple-choice/controller/package.json b/packages/multiple-choice/controller/package.json
index 2b738b232d..22e85c01e5 100644
--- a/packages/multiple-choice/controller/package.json
+++ b/packages/multiple-choice/controller/package.json
@@ -8,7 +8,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   }
diff --git a/packages/multiple-choice/package.json b/packages/multiple-choice/package.json
index b0025e46ec..2fefe3f7e4 100644
--- a/packages/multiple-choice/package.json
+++ b/packages/multiple-choice/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "enzyme-to-json": "^3.3.3",
diff --git a/packages/number-line/configure/package.json b/packages/number-line/configure/package.json
index 18f1d535ff..88cccbc40a 100644
--- a/packages/number-line/configure/package.json
+++ b/packages/number-line/configure/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "lodash": "^4.17.15",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
diff --git a/packages/number-line/controller/package.json b/packages/number-line/controller/package.json
index 0d714e4cf7..35bc338cde 100644
--- a/packages/number-line/controller/package.json
+++ b/packages/number-line/controller/package.json
@@ -14,7 +14,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "lodash": "^4.17.15",
     "mathjs": "^7.5.1"
   },
diff --git a/packages/number-line/package.json b/packages/number-line/package.json
index 5c19313be0..3be3143aaa 100644
--- a/packages/number-line/package.json
+++ b/packages/number-line/package.json
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@material-ui/core": "^3.9.2",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.5",
     "d3-scale": "^3.2.1",
     "d3-selection": "^1.4.1",
diff --git a/packages/passage/configure/package.json b/packages/passage/configure/package.json
index feab4c5226..e5a0d5115b 100644
--- a/packages/passage/configure/package.json
+++ b/packages/passage/configure/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
     "react": "^16.8.1",
diff --git a/packages/passage/package.json b/packages/passage/package.json
index b039719193..49d3f045ea 100644
--- a/packages/passage/package.json
+++ b/packages/passage/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.5",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
diff --git a/packages/placement-ordering/configure/package.json b/packages/placement-ordering/configure/package.json
index 1b7e8911ab..b2632c80a8 100644
--- a/packages/placement-ordering/configure/package.json
+++ b/packages/placement-ordering/configure/package.json
@@ -8,7 +8,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "nested-property": "^0.0.7",
diff --git a/packages/placement-ordering/controller/package.json b/packages/placement-ordering/controller/package.json
index ed410736e5..f490fb2101 100644
--- a/packages/placement-ordering/controller/package.json
+++ b/packages/placement-ordering/controller/package.json
@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "module": "src/index.js",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^3.1.0",
     "js-combinatorics": "^0.5.4",
     "lodash": "^4.17.19"
diff --git a/packages/placement-ordering/package.json b/packages/placement-ordering/package.json
index 455d34658e..b7a84c7b35 100644
--- a/packages/placement-ordering/package.json
+++ b/packages/placement-ordering/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^4.1.1",
     "decimal.js": "^10.0.0",
     "lodash": "^4.17.10",
diff --git a/packages/protractor/package.json b/packages/protractor/package.json
index 7b72478cc2..1becb6ab8f 100644
--- a/packages/protractor/package.json
+++ b/packages/protractor/package.json
@@ -10,7 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "@material-ui/core": "^3.9.2",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "classnames": "^2.2.5",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
diff --git a/packages/rubric/configure/package.json b/packages/rubric/configure/package.json
index 4bd8918dcb..55decf8b58 100644
--- a/packages/rubric/configure/package.json
+++ b/packages/rubric/configure/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^4.1.1",
     "react": "^16.8.6",
     "react-dom": "^16.8.6"
diff --git a/packages/rubric/controller/package.json b/packages/rubric/controller/package.json
index 623436822f..db97436764 100644
--- a/packages/rubric/controller/package.json
+++ b/packages/rubric/controller/package.json
@@ -7,7 +7,7 @@
     "test": "./node_modules/.bin/jest"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "lodash": "^4.17.15"
   }
 }
diff --git a/packages/rubric/package.json b/packages/rubric/package.json
index 5f64bc3817..250f8b1d69 100644
--- a/packages/rubric/package.json
+++ b/packages/rubric/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@material-ui/core": "^3.9.2",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "prop-types": "^15.7.2"
   },
   "author": "pie framework developers",
diff --git a/packages/ruler/configure/package.json b/packages/ruler/configure/package.json
index f3a9c9eda3..521d16e8ed 100644
--- a/packages/ruler/configure/package.json
+++ b/packages/ruler/configure/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0"
+    "@pie-lib/pie-toolbox": "2.20.0"
   },
   "author": "",
   "license": "ISC"
diff --git a/packages/ruler/package.json b/packages/ruler/package.json
index 7e34ebde96..f5b5f194a1 100644
--- a/packages/ruler/package.json
+++ b/packages/ruler/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
diff --git a/packages/select-text/configure/package.json b/packages/select-text/configure/package.json
index d4393295f2..09ca96a70b 100644
--- a/packages/select-text/configure/package.json
+++ b/packages/select-text/configure/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
diff --git a/packages/select-text/controller/package.json b/packages/select-text/controller/package.json
index a884947781..c322f6562b 100644
--- a/packages/select-text/controller/package.json
+++ b/packages/select-text/controller/package.json
@@ -6,7 +6,7 @@
   "main": "lib/index.js",
   "module": "src/index.js",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   },
diff --git a/packages/select-text/package.json b/packages/select-text/package.json
index 32298929cf..ecf1cde80a 100644
--- a/packages/select-text/package.json
+++ b/packages/select-text/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.19.0",
+    "@pie-lib/pie-toolbox": "2.20.0",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
diff --git a/pslb/pslb.config.js b/pslb/pslb.config.js
index 4f5714615e..c1abaa8980 100644
--- a/pslb/pslb.config.js
+++ b/pslb/pslb.config.js
@@ -46,7 +46,7 @@ module.exports = {
   libs: {
     repository: 'pie-framework/pie-elements',
     packages: [
-      { name: '@pie-lib/pie-toolbox-module', version: '8.0.3' }
+      { name: '@pie-lib/pie-toolbox-module', version: '8.1.1' }
     ],
   },
 };
diff --git a/yarn.lock b/yarn.lock
index 23a1a959b3..374b26e71c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2276,10 +2276,10 @@
   resolved "https://registry.yarnpkg.com/@pie-framework/pie-player-events/-/pie-player-events-0.1.0.tgz#0150904118fd604559982ab658967811c053ffe3"
   integrity sha512-6H1tlRGmcZ3Wt+8HMqu5KugVcwwyNrMylfI5rIpvOSt0T82QDmjRj+2sPgQG5zos/w6MtwUqn/QZ+8Rq2EXSOA==
 
-"@pie-lib/pie-toolbox@2.19.0":
-  version "2.19.0"
-  resolved "https://registry.yarnpkg.com/@pie-lib/pie-toolbox/-/pie-toolbox-2.19.0.tgz#d2f60f85aec4a4838272f8cae43da8b766953eb5"
-  integrity sha512-jlvL6wd8PBlOETcw8wH0RuHCYQeMSFAchDN3N3jC6GfvEw7dWoIc7Cfz1xDl1rfeUpRVk33WJnLOOMkelCT1xg==
+"@pie-lib/pie-toolbox@2.20.0":
+  version "2.20.0"
+  resolved "https://registry.yarnpkg.com/@pie-lib/pie-toolbox/-/pie-toolbox-2.20.0.tgz#607cd6f2ba8a60f419a7a2ac5b8f2eac8af5169c"
+  integrity sha512-IYptYd4ZwLtZEnwsTNIf+X6nK3JNeCvQZQZn5ow4NQyp6aI5A1vVCNOVHOVzjz5a0kNReDK/5jvyV8mF2ov89g==
   dependencies:
     "@mapbox/point-geometry" "^0.1.0"
     "@material-ui/core" "^3.8.3"

From cd797fae51d47d9eb8ec41dd5c2fc75d4c1ce4f0 Mon Sep 17 00:00:00 2001
From: arimieandreea <arimie_andreea@yahoo.com>
Date: Wed, 16 Jul 2025 12:13:20 +0300
Subject: [PATCH 14/18] feat(charting): send language as props to legend
 PD-5083

---
 packages/charting/src/main.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/charting/src/main.jsx b/packages/charting/src/main.jsx
index 0592877e96..33a57a45d6 100644
--- a/packages/charting/src/main.jsx
+++ b/packages/charting/src/main.jsx
@@ -146,7 +146,7 @@ export class Main extends React.Component {
             labelsPlaceholders={{}}
           />
         )}
-        {!showingCorrect && showKeyLegend && (<KeyLegend></KeyLegend>)}
+        {!showingCorrect && showKeyLegend && (<KeyLegend language={language}></KeyLegend>)}
         {showRationale && (
           <Collapsible labels={{ hidden: 'Show Rationale', visible: 'Hide Rationale' }}>
             <PreviewPrompt prompt={rationale} />

From 1c670962c6281bdc200e39876b3df41a1b946217 Mon Sep 17 00:00:00 2001
From: Andrei Miron <andrei.miron@mcro-e.com>
Date: Wed, 16 Jul 2025 13:03:03 +0300
Subject: [PATCH 15/18] remove extended-text-entry dependencies and fix clear
 tokens method PD-363

---
 packages/select-text/configure/src/design.jsx | 63 ++++++++++---------
 packages/select-text/configure/src/utils.js   | 25 +++++++-
 2 files changed, 58 insertions(+), 30 deletions(-)

diff --git a/packages/select-text/configure/src/design.jsx b/packages/select-text/configure/src/design.jsx
index 4b6c164990..2fd39e60c7 100644
--- a/packages/select-text/configure/src/design.jsx
+++ b/packages/select-text/configure/src/design.jsx
@@ -11,15 +11,15 @@ import Info from '@material-ui/icons/Info';
 import debug from 'debug';
 import { EditableHtml } from '@pie-lib/pie-toolbox/editable-html';
 import Tooltip from '@material-ui/core/Tooltip';
-import { generateValidationMessage } from './utils';
-import {
-  clearSelection,
-  getDOMNodes,
-  getLabelElement,
-  getRangeDetails,
-  isSideLabel,
-  wrapRange,
-} from '@pie-element/extended-text-entry/src/annotation/annotation-utils';
+import { clearSelection, generateValidationMessage } from './utils';
+// import {
+//   clearSelection,
+//   getDOMNodes,
+//   getLabelElement,
+//   getRangeDetails,
+//   isSideLabel,
+//   wrapRange,
+// } from '@pie-element/extended-text-entry/src/annotation/annotation-utils';
 import classNames from 'classnames';
 
 import Switch from '@material-ui/core/Switch';
@@ -184,23 +184,23 @@ export class Design extends React.Component {
     return annotation;
   };
 
-  addAnnotation = (type) => {
-    const { annotations, onChange } = this.props;
-    const annotation = this.createNewAnnotation('', type);
-    const labelElem = getLabelElement(annotation.id);
-
-    annotations.push(annotation);
-
-    this.setState({
-      openedMenu: false,
-      openedEditor: true,
-      annotationIndex: annotations.length - 1,
-      annotation,
-      labelElem,
-    });
-
-    onChange(annotations);
-  };
+  // addAnnotation = (type) => {
+  //   const { annotations, onChange } = this.props;
+  //   const annotation = this.createNewAnnotation('', type);
+  //   const labelElem = getLabelElement(annotation.id);
+  //
+  //   annotations.push(annotation);
+  //
+  //   this.setState({
+  //     openedMenu: false,
+  //     openedEditor: true,
+  //     annotationIndex: annotations.length - 1,
+  //     annotation,
+  //     labelElem,
+  //   });
+  //
+  //   onChange(annotations);
+  // };
 
   // new functionalities
 
@@ -357,9 +357,16 @@ export class Design extends React.Component {
   };
 
   clearTokens = () => {
-    const { text } = this.state;
+    const { model } = this.props;
+
+    const container = document.createElement('div');
+    container.innerHTML = model.text;
+
+    // Remove all children and add new content
+    this.textRef.innerHTML = '';
+    this.textRef.appendChild(container);
 
-    this.setState({ tokenizedText: text });
+    this.setState({ tokenizedText: model.text });
   };
 
   selectWords = () => {
diff --git a/packages/select-text/configure/src/utils.js b/packages/select-text/configure/src/utils.js
index 4f805df257..a250dffad9 100644
--- a/packages/select-text/configure/src/utils.js
+++ b/packages/select-text/configure/src/utils.js
@@ -1,4 +1,3 @@
-
 var createElementFromHTML = function createElementFromHTML() {
   var htmlString = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   var div = document.createElement('div');
@@ -28,7 +27,7 @@ var prepareText = function prepareText(text) {
   var txtDom = createElementFromHTML(text);
 
   var div = document.createElement('div');
-  div.innerHTML = '<div separator=\'true\'>'.concat(txtDom.innerHTML, '</div>');
+  div.innerHTML = "<div separator='true'>".concat(txtDom.innerHTML, '</div>');
   txtDom = div;
 
   var allDomElements = Array.from(txtDom.querySelectorAll('*'));
@@ -111,3 +110,25 @@ export const generateValidationMessage = (config) => {
 
   return message;
 };
+
+// also used in extended-text-entry
+export const clearSelection = () => {
+  if (document.getSelection) {
+    // for all new browsers (IE9+, Chrome, Firefox)
+    document.getSelection().removeAllRanges();
+    document.getSelection().addRange(document.createRange());
+  } else if (window.getSelection) {
+    // equals with the document.getSelection (MSDN info)
+    if (window.getSelection().removeAllRanges) {
+      // for all new browsers (IE9+, Chrome, Firefox)
+      window.getSelection().removeAllRanges();
+      window.getSelection().addRange(document.createRange());
+    } else if (window.getSelection().empty) {
+      // Chrome supports this as well
+      window.getSelection().empty();
+    }
+  } else if (document.selection) {
+    // IE8-
+    document.selection.empty();
+  }
+};

From 95819cd96ae5db2cb9b91916a001bd04cedc87f7 Mon Sep 17 00:00:00 2001
From: Andrei Miron <andrei.miron@mcro-e.com>
Date: Wed, 16 Jul 2025 13:37:31 +0300
Subject: [PATCH 16/18] select-text: revert PD-363 POC

---
 .../__snapshots__/design.test.jsx.snap        | 428 +++++++--------
 .../configure/src/__tests__/design.test.jsx   |  12 +-
 .../configure/src/defaultConfiguration.js     |   5 -
 packages/select-text/configure/src/design.jsx | 499 +++---------------
 packages/select-text/configure/src/utils.js   |  22 -
 packages/select-text/docs/demo/generate.js    | 145 ++---
 6 files changed, 316 insertions(+), 795 deletions(-)

diff --git a/packages/select-text/configure/src/__tests__/__snapshots__/design.test.jsx.snap b/packages/select-text/configure/src/__tests__/__snapshots__/design.test.jsx.snap
index 6a8dd96175..b508b948da 100644
--- a/packages/select-text/configure/src/__tests__/__snapshots__/design.test.jsx.snap
+++ b/packages/select-text/configure/src/__tests__/__snapshots__/design.test.jsx.snap
@@ -141,17 +141,6 @@ exports[`design snapshot renders all items except feedback 1`] = `
             "settings": true,
           },
           "text": Object {
-            "inputConfiguration": Object {
-              "audio": Object {
-                "disabled": true,
-              },
-              "image": Object {
-                "disabled": true,
-              },
-              "video": Object {
-                "disabled": true,
-              },
-            },
             "label": "Content",
             "settings": true,
           },
@@ -194,73 +183,68 @@ exports[`design snapshot renders all items except feedback 1`] = `
     />
   }
 >
-  <div>
-    NEW functionality
-    <WithStyles(WithFormControlContext(FormControlLabel))
-      control={
-        <WithStyles(Switch)
-          checked={false}
-          onChange={[Function]}
-        />
-      }
-      label="Select tokens"
-    />
-  </div>
   <Component
     label="Content"
   >
-    <EditableHtml
-      allowValidation={false}
-      disableUnderline={true}
-      languageCharactersProps={
-        Array [
-          Object {
-            "language": "spanish",
-          },
-          Object {
-            "language": "special",
-          },
-        ]
-      }
-      markup=""
-      mathMlOptions={
-        Object {
-          "mmlEditing": false,
-          "mmlOutput": false,
-        }
-      }
-      nonEmpty={false}
+    <TextField
+      defaultValue=""
+      multiline={true}
       onChange={[Function]}
-      onDone={[Function]}
-      pluginProps={
+      required={false}
+      select={false}
+      variant="standard"
+    />
+  </Component>
+  <Component
+    label="Tokens"
+  >
+    <WithStyles(Tooltip)
+      classes={
         Object {
-          "audio": Object {
-            "disabled": true,
-          },
-          "image": Object {
-            "disabled": true,
-          },
-          "separateParagraphs": Object {
-            "disabled": true,
-          },
-          "showParagraphs": Object {
-            "disabled": false,
-          },
-          "textAlign": Object {
-            "disabled": true,
-          },
-          "video": Object {
-            "disabled": true,
-          },
+          "tooltip": undefined,
         }
       }
-      toolbarOpts={
-        Object {
-          "position": "bottom",
+      disableFocusListener={true}
+      disableTouchListener={true}
+      placement="right"
+      title="Validation requirements:
+There should be at least 2 tokens defined.
+There should be at least 1 token selected."
+    >
+      <pure(InfoIcon)
+        color="primary"
+        fontSize="small"
+        style={
+          Object {
+            "left": "48px",
+            "position": "absolute",
+            "top": "-3px",
+          }
         }
-      }
+      />
+    </WithStyles(Tooltip)>
+    <WithStyles(Tokenizer)
+      onChange={[Function]}
+      tokens={Array []}
     />
   </Component>
+  <div>
+    <WithStyles(Chip)
+      label="Mode: None"
+    />
+    <WithStyles(Chip)
+      label="Selections Available: 0"
+    />
+    <WithStyles(Chip)
+      label="Correct Answers: 0"
+    />
+    <Component
+      label="Selection count (0:any)"
+      max={0}
+      min={0}
+      onChange={[Function]}
+    />
+  </div>
 </ConfigLayout>
 `;
 
@@ -405,17 +389,6 @@ exports[`design snapshot renders all items except the content input 1`] = `
             "settings": true,
           },
           "text": Object {
-            "inputConfiguration": Object {
-              "audio": Object {
-                "disabled": true,
-              },
-              "image": Object {
-                "disabled": true,
-              },
-              "video": Object {
-                "disabled": true,
-              },
-            },
             "label": "Content",
             "settings": false,
           },
@@ -458,16 +431,54 @@ exports[`design snapshot renders all items except the content input 1`] = `
     />
   }
 >
-  <div>
-    NEW functionality
-    <WithStyles(WithFormControlContext(FormControlLabel))
-      control={
-        <WithStyles(Switch)
-          checked={false}
-          onChange={[Function]}
-        />
+  <Component
+    label="Tokens"
+  >
+    <WithStyles(Tooltip)
+      classes={
+        Object {
+          "tooltip": undefined,
+        }
       }
-      label="Select tokens"
+      disableFocusListener={true}
+      disableTouchListener={true}
+      placement="right"
+      title="Validation requirements:
+There should be at least 2 tokens defined.
+There should be at least 1 token selected."
+    >
+      <pure(InfoIcon)
+        color="primary"
+        fontSize="small"
+        style={
+          Object {
+            "left": "48px",
+            "position": "absolute",
+            "top": "-3px",
+          }
+        }
+      />
+    </WithStyles(Tooltip)>
+    <WithStyles(Tokenizer)
+      onChange={[Function]}
+      tokens={Array []}
+    />
+  </Component>
+  <div>
+    <WithStyles(Chip)
+      label="Mode: None"
+    />
+    <WithStyles(Chip)
+      label="Selections Available: 0"
+    />
+    <WithStyles(Chip)
+      label="Correct Answers: 0"
+    />
+    <Component
+      label="Selection count (0:any)"
+      max={0}
+      min={0}
+      onChange={[Function]}
     />
   </div>
 </ConfigLayout>
@@ -614,17 +625,6 @@ exports[`design snapshot renders all items with defaultProps 1`] = `
             "settings": true,
           },
           "text": Object {
-            "inputConfiguration": Object {
-              "audio": Object {
-                "disabled": true,
-              },
-              "image": Object {
-                "disabled": true,
-              },
-              "video": Object {
-                "disabled": true,
-              },
-            },
             "label": "Content",
             "settings": true,
           },
@@ -667,73 +667,68 @@ exports[`design snapshot renders all items with defaultProps 1`] = `
     />
   }
 >
-  <div>
-    NEW functionality
-    <WithStyles(WithFormControlContext(FormControlLabel))
-      control={
-        <WithStyles(Switch)
-          checked={false}
-          onChange={[Function]}
-        />
-      }
-      label="Select tokens"
-    />
-  </div>
   <Component
     label="Content"
   >
-    <EditableHtml
-      allowValidation={false}
-      disableUnderline={true}
-      languageCharactersProps={
-        Array [
-          Object {
-            "language": "spanish",
-          },
-          Object {
-            "language": "special",
-          },
-        ]
-      }
-      markup=""
-      mathMlOptions={
-        Object {
-          "mmlEditing": false,
-          "mmlOutput": false,
-        }
-      }
-      nonEmpty={false}
+    <TextField
+      defaultValue=""
+      multiline={true}
       onChange={[Function]}
-      onDone={[Function]}
-      pluginProps={
+      required={false}
+      select={false}
+      variant="standard"
+    />
+  </Component>
+  <Component
+    label="Tokens"
+  >
+    <WithStyles(Tooltip)
+      classes={
         Object {
-          "audio": Object {
-            "disabled": true,
-          },
-          "image": Object {
-            "disabled": true,
-          },
-          "separateParagraphs": Object {
-            "disabled": true,
-          },
-          "showParagraphs": Object {
-            "disabled": false,
-          },
-          "textAlign": Object {
-            "disabled": true,
-          },
-          "video": Object {
-            "disabled": true,
-          },
+          "tooltip": undefined,
         }
       }
-      toolbarOpts={
-        Object {
-          "position": "bottom",
+      disableFocusListener={true}
+      disableTouchListener={true}
+      placement="right"
+      title="Validation requirements:
+There should be at least 2 tokens defined.
+There should be at least 1 token selected."
+    >
+      <pure(InfoIcon)
+        color="primary"
+        fontSize="small"
+        style={
+          Object {
+            "left": "48px",
+            "position": "absolute",
+            "top": "-3px",
+          }
         }
-      }
+      />
+    </WithStyles(Tooltip)>
+    <WithStyles(Tokenizer)
+      onChange={[Function]}
+      tokens={Array []}
     />
   </Component>
+  <div>
+    <WithStyles(Chip)
+      label="Mode: None"
+    />
+    <WithStyles(Chip)
+      label="Selections Available: 0"
+    />
+    <WithStyles(Chip)
+      label="Correct Answers: 0"
+    />
+    <Component
+      label="Selection count (0:any)"
+      max={0}
+      min={0}
+      onChange={[Function]}
+    />
+  </div>
 </ConfigLayout>
 `;
 
@@ -878,17 +873,6 @@ exports[`design snapshot tokenizer renders with html entities 1`] = `
             "settings": true,
           },
           "text": Object {
-            "inputConfiguration": Object {
-              "audio": Object {
-                "disabled": true,
-              },
-              "image": Object {
-                "disabled": true,
-              },
-              "video": Object {
-                "disabled": true,
-              },
-            },
             "label": "Content",
             "settings": true,
           },
@@ -932,72 +916,68 @@ exports[`design snapshot tokenizer renders with html entities 1`] = `
     />
   }
 >
-  <div>
-    NEW functionality
-    <WithStyles(WithFormControlContext(FormControlLabel))
-      control={
-        <WithStyles(Switch)
-          checked={false}
-          onChange={[Function]}
-        />
-      }
-      label="Select tokens"
-    />
-  </div>
   <Component
     label="Content"
   >
-    <EditableHtml
-      allowValidation={false}
-      disableUnderline={true}
-      languageCharactersProps={
-        Array [
-          Object {
-            "language": "spanish",
-          },
-          Object {
-            "language": "special",
-          },
-        ]
-      }
-      markup="<p>&#8220;Lucy?&#63; Are you using your time wisely to plan your project?&#33;&#33;&#33;&#8221; Mr. Wilson asked.</p><p>Lucy looked a little confused at first. &#195; Then she grinned and proudly stated, &#8220;Why, yes I am! I plan to make a bird feeder for that tree out our window!&#8221;</p>"
-      mathMlOptions={
-        Object {
-          "mmlEditing": false,
-          "mmlOutput": false,
-        }
-      }
-      nonEmpty={false}
+    <TextField
+      defaultValue="<p>&#8220;Lucy?&#63; Are you using your time wisely to plan your project?&#33;&#33;&#33;&#8221; Mr. Wilson asked.</p><p>Lucy looked a little confused at first. &#195; Then she grinned and proudly stated, &#8220;Why, yes I am! I plan to make a bird feeder for that tree out our window!&#8221;</p>"
+      multiline={true}
       onChange={[Function]}
-      onDone={[Function]}
-      pluginProps={
+      required={false}
+      select={false}
+      variant="standard"
+    />
+  </Component>
+  <Component
+    label="Tokens"
+  >
+    <WithStyles(Tooltip)
+      classes={
         Object {
-          "audio": Object {
-            "disabled": true,
-          },
-          "image": Object {
-            "disabled": true,
-          },
-          "separateParagraphs": Object {
-            "disabled": true,
-          },
-          "showParagraphs": Object {
-            "disabled": false,
-          },
-          "textAlign": Object {
-            "disabled": true,
-          },
-          "video": Object {
-            "disabled": true,
-          },
+          "tooltip": undefined,
         }
       }
-      toolbarOpts={
-        Object {
-          "position": "bottom",
+      disableFocusListener={true}
+      disableTouchListener={true}
+      placement="right"
+      title="Validation requirements:
+There should be at least 2 tokens defined.
+There should be at least 1 token selected."
+    >
+      <pure(InfoIcon)
+        color="primary"
+        fontSize="small"
+        style={
+          Object {
+            "left": "48px",
+            "position": "absolute",
+            "top": "-3px",
+          }
         }
-      }
+      />
+    </WithStyles(Tooltip)>
+    <WithStyles(Tokenizer)
+      onChange={[Function]}
+      text="<p>&#8220;Lucy?&#63; Are you using your time wisely to plan your project?&#33;&#33;&#33;&#8221; Mr. Wilson asked.</p><p>Lucy looked a little confused at first. &#195; Then she grinned and proudly stated, &#8220;Why, yes I am! I plan to make a bird feeder for that tree out our window!&#8221;</p>"
+      tokens={Array []}
     />
   </Component>
+  <div>
+    <WithStyles(Chip)
+      label="Mode: None"
+    />
+    <WithStyles(Chip)
+      label="Selections Available: 0"
+    />
+    <WithStyles(Chip)
+      label="Correct Answers: 0"
+    />
+    <Component
+      label="Selection count (0:any)"
+      max={0}
+      min={0}
+      onChange={[Function]}
+    />
+  </div>
 </ConfigLayout>
 `;
diff --git a/packages/select-text/configure/src/__tests__/design.test.jsx b/packages/select-text/configure/src/__tests__/design.test.jsx
index ff991b37d4..12b6621cf5 100644
--- a/packages/select-text/configure/src/__tests__/design.test.jsx
+++ b/packages/select-text/configure/src/__tests__/design.test.jsx
@@ -121,12 +121,12 @@ describe('design', () => {
       });
     };
 
-    // describe('changeText', () => {
-    //   assert('changeText', [{ target: { value: 'foo' } }], (m) => ({
-    //     ...m,
-    //     text: 'foo',
-    //   }));
-    // });
+    describe('changeText', () => {
+      assert('changeText', [{ target: { value: 'foo' } }], (m) => ({
+        ...m,
+        text: 'foo',
+      }));
+    });
 
     describe('changeTokens', () => {
       assert('changeTokens', [[{ start: 0, end: 1, text: 'f' }], 'words'], (m) => ({
diff --git a/packages/select-text/configure/src/defaultConfiguration.js b/packages/select-text/configure/src/defaultConfiguration.js
index f08e84d27e..a138ca7d50 100644
--- a/packages/select-text/configure/src/defaultConfiguration.js
+++ b/packages/select-text/configure/src/defaultConfiguration.js
@@ -83,11 +83,6 @@ export default {
     text: {
       settings: true,
       label: 'Content',
-      inputConfiguration: {
-        audio: { disabled: true },
-        video: { disabled: true },
-        image: { disabled: true },
-      },
     },
     tokens: {
       settings: true,
diff --git a/packages/select-text/configure/src/design.jsx b/packages/select-text/configure/src/design.jsx
index 2fd39e60c7..b0e01027a6 100644
--- a/packages/select-text/configure/src/design.jsx
+++ b/packages/select-text/configure/src/design.jsx
@@ -4,26 +4,14 @@ import TextField from '@material-ui/core/TextField';
 import { withStyles } from '@material-ui/core/styles';
 import cloneDeep from 'lodash/cloneDeep';
 import debounce from 'lodash/debounce';
-import { Tokenizer, Controls } from '@pie-lib/pie-toolbox/text-select';
+import { Tokenizer } from '@pie-lib/pie-toolbox/text-select';
 import { InputContainer, NumberTextField, FeedbackConfig, settings, layout } from '@pie-lib/pie-toolbox/config-ui';
 import Chip from '@material-ui/core/Chip';
 import Info from '@material-ui/icons/Info';
 import debug from 'debug';
 import { EditableHtml } from '@pie-lib/pie-toolbox/editable-html';
 import Tooltip from '@material-ui/core/Tooltip';
-import { clearSelection, generateValidationMessage } from './utils';
-// import {
-//   clearSelection,
-//   getDOMNodes,
-//   getLabelElement,
-//   getRangeDetails,
-//   isSideLabel,
-//   wrapRange,
-// } from '@pie-element/extended-text-entry/src/annotation/annotation-utils';
-import classNames from 'classnames';
-
-import Switch from '@material-ui/core/Switch';
-import FormControlLabel from '@material-ui/core/FormControlLabel';
+import { generateValidationMessage } from './utils';
 
 const { Panel, toggle, radio, dropdown } = settings;
 
@@ -51,10 +39,7 @@ export class Design extends React.Component {
     const { model } = this.props;
 
     this.state = {
-      correctMode: false,
-      selectMode: false,
       text: (model && model.text) || '',
-      tokenizedText: (model && model.token) || '',
     };
   }
 
@@ -64,25 +49,7 @@ export class Design extends React.Component {
     if (model && model.text) {
       this.setState({
         text: model.text,
-        tokenizedText: model.text,
       });
-
-      // model.tokens.forEach((annotation) => {
-      //   console.log('annotation', annotation);
-      //   const [domStart, domEnd] = getDOMNodes(annotation.start, annotation.end, this.textRef);
-      //   console.log('domStart, domEnd', domStart, domEnd);
-      //
-      //   if (domStart && domEnd) {
-      //     const range = document.createRange();
-      //
-      //     range.setStart(domStart.node, domStart.offset);
-      //     range.setEnd(domEnd.node, domEnd.offset);
-      //
-      //     const spans = wrapRange(range);
-      //
-      //     this.createDOMAnnotation(spans, annotation);
-      //   }
-      // });
     }
   }
 
@@ -93,12 +60,7 @@ export class Design extends React.Component {
     });
   }, 200);
 
-  changeText = (text) => {
-    this.updateText(text);
-    this.clearTokens();
-  };
-
-  changeTextEvent = (event) => this.updateText(event.target.value);
+  changeText = (event) => this.updateText(event.target.value);
 
   changeTokens = (tokens, mode) => {
     this.apply((u) => {
@@ -158,257 +120,8 @@ export class Design extends React.Component {
     onModelChanged({ ...model, rationale });
   };
 
-  // Highlight functionalities based on extended-text-entry
-
-  createDOMAnnotation = (elems, annotation) => {
-    const { classes } = this.props;
-    const { id } = annotation;
-
-    (elems || []).forEach((elem) => {
-      elem.dataset.id = id;
-      elem.className = classNames(classes.token);
-      // elem.onclick = !disabled && this.handleClick;
-      // elem.onmouseover = this.handleHover;
-      // elem.onmouseout = this.handleCancelHover;
-    });
-  };
-
-  createNewAnnotation = (selectedElems, selectionDetails) => {
-    const annotation = {
-      id: [selectionDetails.start, selectionDetails.end, new Date().getTime()].join('-'),
-      ...selectionDetails,
-    };
-
-    this.createDOMAnnotation(selectedElems, annotation);
-
-    return annotation;
-  };
-
-  // addAnnotation = (type) => {
-  //   const { annotations, onChange } = this.props;
-  //   const annotation = this.createNewAnnotation('', type);
-  //   const labelElem = getLabelElement(annotation.id);
-  //
-  //   annotations.push(annotation);
-  //
-  //   this.setState({
-  //     openedMenu: false,
-  //     openedEditor: true,
-  //     annotationIndex: annotations.length - 1,
-  //     annotation,
-  //     labelElem,
-  //   });
-  //
-  //   onChange(annotations);
-  // };
-
-  // new functionalities
-
-  wrapWordsInSpans(html, onClick) {
-    const { classes } = this.props;
-    const container = document.createElement('div');
-    container.innerHTML = html;
-
-    const processNode = (node) => {
-      if (node.nodeType === Node.TEXT_NODE) {
-        const words = node.textContent.split(/(\s+|\b)/); // split by word boundaries + spaces
-        const fragment = document.createDocumentFragment();
-
-        for (const word of words) {
-          if (word.trim()) {
-            const span = document.createElement('span');
-
-            span.className = classNames(classes.token);
-            span.addEventListener('click', (e) => onClick(e));
-            span.textContent = word;
-            fragment.appendChild(span);
-          } else {
-            fragment.appendChild(document.createTextNode(word));
-          }
-        }
-
-        node.replaceWith(fragment);
-      } else if (node.nodeType === Node.ELEMENT_NODE) {
-        Array.from(node.childNodes).forEach(processNode);
-      }
-    };
-
-    Array.from(container.childNodes).forEach(processNode);
-
-    return container.innerHTML;
-  }
-
-  wrapSentencesInSpans = (html, onClickHandler = null) => {
-    const { classes } = this.props;
-    const container = document.createElement('div');
-    container.innerHTML = html;
-
-    const splitSentences = (text) => {
-      // Match sentences ending with punctuation:
-      // "." or "!" or "?"
-      const pattern = /([^.!?]+[.!?]+[\s"]*)|([^.!?]+$)/g;
-      const matches = text.match(pattern);
-      return matches || [];
-    };
-
-    const processNode = (node) => {
-      if (node.nodeType === Node.TEXT_NODE) {
-        const sentences = splitSentences(node.textContent);
-        const fragment = document.createDocumentFragment();
-
-        for (const sentence of sentences) {
-          if (sentence.trim()) {
-            const span = document.createElement('span');
-            span.textContent = sentence;
-            span.className = classNames(classes.token);
-
-            if (onClickHandler) {
-              span.addEventListener('click', (e) => {
-                onClickHandler(e, sentence);
-              });
-            }
-
-            fragment.appendChild(span);
-          } else {
-            fragment.appendChild(document.createTextNode(sentence));
-          }
-        }
-
-        node.replaceWith(fragment);
-      } else if (node.nodeType === Node.ELEMENT_NODE) {
-        Array.from(node.childNodes).forEach(processNode);
-      }
-    };
-
-    Array.from(container.childNodes).forEach(processNode);
-
-    return container;
-  };
-
-  wrapParagraphContentInSpan(html) {
-    const { classes } = this.props;
-    const container = document.createElement('div');
-    container.innerHTML = html;
-
-    container.querySelectorAll('p').forEach((p) => {
-      const span = document.createElement('span');
-      span.className = classNames(classes.token);
-      span.addEventListener('click', this.handleTokenClick);
-
-      // Move all children of <p> into the span
-      while (p.firstChild) {
-        span.appendChild(p.firstChild);
-      }
-
-      p.appendChild(span);
-    });
-
-    return container;
-  }
-
-  wrapSelectionInSpan(selection) {
-    const { classes } = this.props;
-    const range = selection.getRangeAt(0);
-
-    if (range.collapsed) {
-      console.log('Selection is collapsed (no text selected).');
-      return;
-    }
-
-    // Extract the contents of the selection
-    const contents = range.extractContents();
-
-    // Create the span wrapper
-    const span = document.createElement('span');
-    span.className = classNames(classes.token);
-    span.addEventListener('click', this.handleTokenClick);
-    span.appendChild(contents);
-
-    // Insert back into the DOM
-    range.insertNode(span);
-
-    // Collapse the selection
-    selection.removeAllRanges();
-  }
-
-  handleSelection = (event) => {
-    const selection = window.getSelection();
-
-    // prevent unwanted selections
-    if (event.detail > 2) {
-      clearSelection();
-      return;
-    }
-
-    if (selection && selection.rangeCount > 0) {
-      this.wrapSelectionInSpan(selection);
-      clearSelection();
-    }
-  };
-
-  handleTokenClick = (event) => {
-    const { correctMode } = this.state;
-
-    if (!correctMode) {
-      return;
-    }
-
-    event.target.classList.toggle('correct');
-  };
-
-  clearTokens = () => {
-    const { model } = this.props;
-
-    const container = document.createElement('div');
-    container.innerHTML = model.text;
-
-    // Remove all children and add new content
-    this.textRef.innerHTML = '';
-    this.textRef.appendChild(container);
-
-    this.setState({ tokenizedText: model.text });
-  };
-
-  selectWords = () => {
-    const { text } = this.state;
-    this.clearTokens();
-    const tokenized = this.wrapWordsInSpans(text, (e) => this.handleTokenClick(e));
-
-    console.log('words:', tokenized);
-
-    this.setState({ tokenizedText: tokenized });
-  };
-
-  selectSentences = () => {
-    const { text } = this.state;
-    this.clearTokens();
-    const container = this.wrapSentencesInSpans(text);
-
-    // Remove all children and add new content
-    this.textRef.innerHTML = '';
-    this.textRef.appendChild(container);
-
-    const tokenized = container.innerHTML;
-    console.log('sentences:', tokenized);
-    // this.setState({ tokenizedText: tokenized });
-  };
-
-  selectParagraphs = () => {
-    const { text } = this.state;
-    this.clearTokens();
-    const container = this.wrapParagraphContentInSpan(text);
-
-    // Remove all children and add new content
-    this.textRef.innerHTML = '';
-    this.textRef.appendChild(container);
-
-    const tokenized = container.innerHTML;
-    console.log('paragraphs:', tokenized);
-    // this.setState({ tokenizedText: tokenized });
-  };
-
   render() {
-    const { text: textValue, correctMode, selectMode, tokenizedText } = this.state;
+    const { text: textValue } = this.state;
     const { classes, configuration, imageSupport, model, onConfigurationChanged, onModelChanged, uploadSoundSupport } =
       this.props;
     const {
@@ -553,117 +266,69 @@ export class Design extends React.Component {
           </InputContainer>
         )}
 
-        {/*{text.settings && (*/}
-        {/*  <InputContainer label={text.label || ''} className={classes.promptHolder}>*/}
-        {/*    <TextField*/}
-        {/*      className={classes.input}*/}
-        {/*      multiline*/}
-        {/*      defaultValue={textValue}*/}
-        {/*      onChange={this.changeTextEvent}*/}
-        {/*      spellCheck={spellCheckEnabled}*/}
-        {/*    />*/}
-        {/*  </InputContainer>*/}
-        {/*)}*/}
-
-        {/*{tokens.settings && (*/}
-        {/*  <InputContainer label={tokens.label || ''} className={classes.tokenizerContainer}>*/}
-        {/*    <Tooltip*/}
-        {/*      classes={{ tooltip: classes.tooltip }}*/}
-        {/*      disableFocusListener*/}
-        {/*      disableTouchListener*/}
-        {/*      placement={'right'}*/}
-        {/*      title={validationMessage}*/}
-        {/*    >*/}
-        {/*      <Info fontSize={'small'} color={'primary'} style={{ position: 'absolute', left: '48px', top: '-3px' }} />*/}
-        {/*    </Tooltip>*/}
-
-        {/*    <Tokenizer*/}
-        {/*      className={classes.tokenizer}*/}
-        {/*      text={model.text}*/}
-        {/*      tokens={tokensModel}*/}
-        {/*      onChange={this.changeTokens}*/}
-        {/*    />*/}
-        {/*  </InputContainer>*/}
-        {/*)}*/}
-        {/*{tokensError && <div className={classes.errorText}>{tokensError}</div>}*/}
-        {/*{selectionsError && <div className={classes.errorText}>{selectionsError}</div>}*/}
-
-        {/*<div className={classes.tokensDetails}>*/}
-        {/*  {mode.settings && (*/}
-        {/*    <Chip label={`${mode.label}: ${model.mode ? model.mode : 'None'}`} className={classes.chip} />*/}
-        {/*  )}*/}
-
-        {/*  {selections.settings && (*/}
-        {/*    <Chip label={`${selections.label}: ${tokensModel.length}`} className={classes.chip} />*/}
-        {/*  )}*/}
-
-        {/*  {correctAnswer.settings && (*/}
-        {/*    <Chip*/}
-        {/*      label={`${correctAnswer.label}: ${tokensModel.filter((t) => t.correct).length}`}*/}
-        {/*      className={classes.chip}*/}
-        {/*    />*/}
-        {/*  )}*/}
-
-        {/*  {selectionCount.settings && (*/}
-        {/*    <NumberTextField*/}
-        {/*      min={tokensModel.filter((t) => t.correct).length || 0}*/}
-        {/*      label={`${selectionCount.label} (0:any)`}*/}
-        {/*      max={tokensModel.length}*/}
-        {/*      value={model.maxSelections}*/}
-        {/*      onChange={this.changeMaxSelections}*/}
-        {/*      className={classes.numberField}*/}
-        {/*    />*/}
-        {/*  )}*/}
-        {/*</div>*/}
-
-        <div className={classes.subheader}>
-          NEW functionality
-          <FormControlLabel
-            control={<Switch checked={selectMode} onChange={() => this.setState({ selectMode: !selectMode })} />}
-            label="Select tokens"
-          />
-        </div>
-
-        {selectMode && (
-          <Controls
-            onClear={this.clearTokens}
-            onWords={this.selectWords}
-            onSentences={this.selectSentences}
-            onParagraphs={this.selectParagraphs}
-            setCorrectMode={correctMode}
-            onToggleCorrectMode={() => this.setState({ correctMode: !correctMode })}
-          />
-        )}
-
         {text.settings && (
           <InputContainer label={text.label || ''} className={classes.promptHolder}>
-            {selectMode ? (
-              <div
-                className={classes.textContainer}
-                ref={(r) => (this.textRef = r)}
-                onMouseDown={selectMode && !correctMode ? clearSelection : () => {}}
-                onMouseUp={selectMode && !correctMode ? this.handleSelection : () => {}}
-                dangerouslySetInnerHTML={{ __html: tokenizedText }}
-              />
-            ) : (
-              <EditableHtml
-                className={classes.prompt}
-                markup={textValue}
-                onChange={this.changeText}
-                nonEmpty={false}
-                disableUnderline
-                toolbarOpts={toolbarOpts}
-                pluginProps={getPluginProps(text?.inputConfiguration)}
-                spellCheck={spellCheckEnabled}
-                imageSupport={imageSupport}
-                uploadSoundSupport={uploadSoundSupport}
-                languageCharactersProps={[{ language: 'spanish' }, { language: 'special' }]}
-                mathMlOptions={mathMlOptions}
-              />
-            )}
+            <TextField
+              className={classes.input}
+              multiline
+              defaultValue={textValue}
+              onChange={this.changeText}
+              spellCheck={spellCheckEnabled}
+            />
           </InputContainer>
         )}
 
+        {tokens.settings && (
+          <InputContainer label={tokens.label || ''} className={classes.tokenizerContainer}>
+            <Tooltip
+              classes={{ tooltip: classes.tooltip }}
+              disableFocusListener
+              disableTouchListener
+              placement={'right'}
+              title={validationMessage}
+            >
+              <Info fontSize={'small'} color={'primary'} style={{ position: 'absolute', left: '48px', top: '-3px' }} />
+            </Tooltip>
+
+            <Tokenizer
+              className={classes.tokenizer}
+              text={model.text}
+              tokens={tokensModel}
+              onChange={this.changeTokens}
+            />
+          </InputContainer>
+        )}
+        {tokensError && <div className={classes.errorText}>{tokensError}</div>}
+        {selectionsError && <div className={classes.errorText}>{selectionsError}</div>}
+
+        <div className={classes.tokensDetails}>
+          {mode.settings && (
+            <Chip label={`${mode.label}: ${model.mode ? model.mode : 'None'}`} className={classes.chip} />
+          )}
+
+          {selections.settings && (
+            <Chip label={`${selections.label}: ${tokensModel.length}`} className={classes.chip} />
+          )}
+
+          {correctAnswer.settings && (
+            <Chip
+              label={`${correctAnswer.label}: ${tokensModel.filter((t) => t.correct).length}`}
+              className={classes.chip}
+            />
+          )}
+
+          {selectionCount.settings && (
+            <NumberTextField
+              min={tokensModel.filter((t) => t.correct).length || 0}
+              label={`${selectionCount.label} (0:any)`}
+              max={tokensModel.length}
+              value={model.maxSelections}
+              onChange={this.changeMaxSelections}
+              className={classes.numberField}
+            />
+          )}
+        </div>
+
         {rationaleEnabled && (
           <InputContainer label={rationale.label || ''} className={classes.promptHolder}>
             <EditableHtml
@@ -749,44 +414,4 @@ export default withStyles((theme) => ({
     color: theme.palette.error.main,
     paddingTop: theme.spacing.unit,
   },
-
-  subheader: {
-    paddingBottom: '8px',
-    borderBottom: '1px solid grey',
-    marginBottom: '16px',
-    marginTop: '24px',
-    display: 'flex',
-    alignItems: 'center',
-    justifyContent: 'space-between',
-  },
-  textContainer: {
-    padding: '15px 21px',
-    border: '1px solid #ccc',
-    borderRadius: '4px',
-    overflowY: 'scroll',
-    whiteSpace: 'pre-wrap',
-    overflowWrap: 'break-word',
-    '& p': {
-      margin: 0,
-    },
-    '& span[data-latex]': {
-      userSelect: 'none',
-      '-webkit-user-select': 'none',
-      '-moz-user-select': 'none',
-      '-ms-user-select': 'none',
-    },
-  },
-  token: {
-    position: 'relative',
-    cursor: 'pointer',
-    backgroundColor: '#fff9c4',
-
-    '&:hover': {
-      backgroundColor: '#E5E0B0',
-    },
-
-    '&.correct': {
-      backgroundColor: '#4caf50',
-    },
-  },
 }))(Design);
diff --git a/packages/select-text/configure/src/utils.js b/packages/select-text/configure/src/utils.js
index a250dffad9..f5680eebae 100644
--- a/packages/select-text/configure/src/utils.js
+++ b/packages/select-text/configure/src/utils.js
@@ -110,25 +110,3 @@ export const generateValidationMessage = (config) => {
 
   return message;
 };
-
-// also used in extended-text-entry
-export const clearSelection = () => {
-  if (document.getSelection) {
-    // for all new browsers (IE9+, Chrome, Firefox)
-    document.getSelection().removeAllRanges();
-    document.getSelection().addRange(document.createRange());
-  } else if (window.getSelection) {
-    // equals with the document.getSelection (MSDN info)
-    if (window.getSelection().removeAllRanges) {
-      // for all new browsers (IE9+, Chrome, Firefox)
-      window.getSelection().removeAllRanges();
-      window.getSelection().addRange(document.createRange());
-    } else if (window.getSelection().empty) {
-      // Chrome supports this as well
-      window.getSelection().empty();
-    }
-  } else if (document.selection) {
-    // IE8-
-    document.selection.empty();
-  }
-};
diff --git a/packages/select-text/docs/demo/generate.js b/packages/select-text/docs/demo/generate.js
index 518d592772..05d88dc71e 100644
--- a/packages/select-text/docs/demo/generate.js
+++ b/packages/select-text/docs/demo/generate.js
@@ -224,109 +224,52 @@ exports.model = (id, element) => {
         '<p>Select the sentence from&#160;&#34;The Gymnast&#34; that <span class="relative-emphasis">best</span> represents the theme.</p>',
       rationale:
         '<p>The final sentence of the passage best exemplifies the theme of the short story because Natasha&#39;s practice and determination finally pays off.</p>',
-      // tokens: [
-      //   {
-      //     text: 'She thought about what she had to do, struggling to rein in her wild, fearful thoughts.',
-      //     end: 90,
-      //     start: 3,
-      //     correct: false,
-      //   },
-      //   {
-      //     start: 449,
-      //     end: 585,
-      //     text: 'Just for a hair of a moment, Natasha wondered if she really wanted a perfect 10, so weary was she of trying for but never achieving one.',
-      //     correct: false,
-      //   },
-      //   {
-      //     end: 627,
-      //     correct: false,
-      //     text: 'At last Natasha\'s moment arrived.',
-      //     start: 594,
-      //   },
-      //   {
-      //     end: 743,
-      //     text: 'The faces of past giants of gymnastics swam before her mind\'s eye, now razor&#8211;sharp with fierce determination.',
-      //     correct: false,
-      //     start: 628,
-      //   },
-      //   {
-      //     text: 'Suddenly, the din of the gymnasium was silent to her.',
-      //     end: 997,
-      //     correct: false,
-      //     start: 944,
-      //   },
-      //   {
-      //     end: 1087,
-      //     start: 998,
-      //     correct: false,
-      //     text: 'Forcing all sound out of her mind, she focused on the gleaming balance beam ahead of her.',
-      //   },
-      //   {
-      //     correct: true,
-      //     start: 1088,
-      //     end: 1225,
-      //     text: 'Taking a deep breath, Natasha made her graceful, yet powerful approach, mounted the beam flawlessly, and...executed her first perfect 10.',
-      //   },
-      // ],
-      // "element": "select-text",
-      // text: '<p>She thought about what she had to do, struggling to rein in her wild, fearful thoughts. Coach Cummings always said that an undisciplined mind never scored a perfect 10. Natasha wanted to please her Coach, yet sometimes his approval wasn\'t as exciting as his anger. The gymnasts were unanimous about one thing: Coach Cummings\'s fits of disapproving rage were much more humorous to witness than his infrequent, backslapping moments of high praise. Just for a hair of a moment, Natasha wondered if she really wanted a perfect 10, so weary was she of trying for but never achieving one.</p>\n\n<p>At last Natasha\'s moment arrived. The faces of past giants of gymnastics swam before her mind\'s eye, now razor&#8211;sharp with fierce determination. "I am talented. I am not afraid. I will make a perfect 10," she spoke aloud to herself, as she approached the mat, dusted her hands with chalk to prevent slippage, and returned to her starting point. Suddenly, the din of the gymnasium was silent to her. Forcing all sound out of her mind, she focused on the gleaming balance beam ahead of her. Taking a deep breath, Natasha made her graceful, yet powerful approach, mounted the beam flawlessly, and...executed her first perfect 10.</p>\n',
       tokens: [
-        // {
-        //   id: '0-30-1751440197593',
-        //   quote: 'She thought about what she had',
-        //   start: 0,
-        //   end: 30,
-        // },
-        // {
-        //   id: '185-206-1751440199435',
-        //   quote: 'o please her Coach, y',
-        //   start: 185,
-        //   end: 206,
-        // },
-        // {
-        //   id: '356-379-1751440202337',
-        //   quote: 'e much more humorous to',
-        //   start: 356,
-        //   end: 379,
-        // },
-        // {
-        //   id: '0-88-1751443110733',
-        //   quote: 'She thought about what she had to do, struggling to rein in her wild, fearful thoughts. ',
-        //   start: 0,
-        //   end: 88,
-        // },
-        // {
-        //   id: '590-607-1751443116013',
-        //   quote: "Át last Ñatasha's",
-        //   start: 590,
-        //   end: 607,
-        // },
-        // {
-        //   id: '624-641-1751443118643',
-        //   quote: 'The faces of past',
-        //   start: 624,
-        //   end: 641,
-        // },
-        // {
-        //   id: '1223-1231-1751443121777',
-        //   quote: 'header 2',
-        //   start: 1223,
-        //   end: 1231,
-        // },
-        // {
-        //   id: '358-376-1751443129379',
-        //   quote: '»»» were much more',
-        //   start: 358,
-        //   end: 376,
-        // },
-        // {
-        //   id: '137-154-1751443132310',
-        //   quote: 'mind never scored',
-        //   start: 137,
-        //   end: 154,
-        // },
+        {
+          text: 'She thought about what she had to do, struggling to rein in her wild, fearful thoughts.',
+          end: 90,
+          start: 3,
+          correct: false,
+        },
+        {
+          start: 449,
+          end: 585,
+          text: 'Just for a hair of a moment, Natasha wondered if she really wanted a perfect 10, so weary was she of trying for but never achieving one.',
+          correct: false,
+        },
+        {
+          end: 627,
+          correct: false,
+          text: "At last Natasha's moment arrived.",
+          start: 594,
+        },
+        {
+          end: 743,
+          text: "The faces of past giants of gymnastics swam before her mind's eye, now razor&#8211;sharp with fierce determination.",
+          correct: false,
+          start: 628,
+        },
+        {
+          text: 'Suddenly, the din of the gymnasium was silent to her.',
+          end: 997,
+          correct: false,
+          start: 944,
+        },
+        {
+          end: 1087,
+          start: 998,
+          correct: false,
+          text: 'Forcing all sound out of her mind, she focused on the gleaming balance beam ahead of her.',
+        },
+        {
+          correct: true,
+          start: 1088,
+          end: 1225,
+          text: 'Taking a deep breath, Natasha made her graceful, yet powerful approach, mounted the beam flawlessly, and...executed her first perfect 10.',
+        },
       ],
-      text: '<p>She thought about what she had to do, <u>struggling to rein</u> in her wild, <b>fearful thoughts</b>. Coach Cummings always said that an undisciplined mind <sup>never scored </sup>a perfect 10. Natasha  €€€ wanted to please her Coach, yet sometimes his approval wasn&#x27;t as exciting as his anger. The gymnasts were unanimous about one thing: Coach Cummings&#x27;s fits of disapproving rage »»» were much more humorous to witness than his infrequent, backslapping moments of high praise. Just for a hair of a moment, Natasha wondered if she really wanted a perfect 10, so weary was she of trying for but never achieving one</p><p><em>Át last Ñatasha&#x27;s moment arrived.</em> The <s>faces</s> of past giants of gymnastics swam before her mind&#x27;s eye, now razor–sharp with fierce determination. &quot;I am talented. I am not afraid. I will make a perfect 10,&quot; she spoke aloud to herself, as she approached the mat, dusted her hands with chalk to prevent slippage, and returned to her starting point. Suddenly, the din of the gymnasium was silent to her. Forcing all sound out of her mind, she focused on the gleaming balance beam ahead of her. Taking a deep breath, Natasha made her graceful, yet powerful approach, mounted the beam flawlessly, and...executed her first perfect 10.</p><p></p><table border="1"><tbody><tr><td><p>header 1</p></td><td><p>header 2</p></td></tr><tr><td><p>row </p></td><td><p>row</p></td></tr></tbody></table><div></div>',
+      // "element": "select-text",
+      text: "<p>She thought about what she had to do, struggling to rein in her wild, fearful thoughts. Coach Cummings always said that an undisciplined mind never scored a perfect 10. Natasha wanted to please her Coach, yet sometimes his approval wasn't as exciting as his anger. The gymnasts were unanimous about one thing: Coach Cummings's fits of disapproving rage were much more humorous to witness than his infrequent, backslapping moments of high praise. Just for a hair of a moment, Natasha wondered if she really wanted a perfect 10, so weary was she of trying for but never achieving one.</p>\n\n<p>At last Natasha's moment arrived. The faces of past giants of gymnastics swam before her mind's eye, now razor&#8211;sharp with fierce determination. \"I am talented. I am not afraid. I will make a perfect 10,\" she spoke aloud to herself, as she approached the mat, dusted her hands with chalk to prevent slippage, and returned to her starting point. Suddenly, the din of the gymnasium was silent to her. Forcing all sound out of her mind, she focused on the gleaming balance beam ahead of her. Taking a deep breath, Natasha made her graceful, yet powerful approach, mounted the beam flawlessly, and...executed her first perfect 10.</p>\n",
       rubricEnabled: false,
     }),
   );

From 92144667464f18c213c7ab1d769595e43b553dab Mon Sep 17 00:00:00 2001
From: carlacostea <carlacostea@yahoo.com>
Date: Wed, 16 Jul 2025 15:52:35 +0300
Subject: [PATCH 17/18] feat: update pie-lib/pie toolbox PD-5082, PD-5081,
 PD-3797, PD-5083, revert PD-363, PD-653

---
 packages/boilerplate-item-type/configure/package.json     | 2 +-
 packages/boilerplate-item-type/controller/package.json    | 2 +-
 packages/boilerplate-item-type/package.json               | 2 +-
 packages/calculator/configure/package.json                | 2 +-
 packages/categorize/configure/package.json                | 2 +-
 packages/categorize/controller/package.json               | 2 +-
 packages/categorize/package.json                          | 2 +-
 packages/charting/configure/package.json                  | 2 +-
 packages/charting/controller/package.json                 | 2 +-
 packages/charting/package.json                            | 2 +-
 packages/complex-rubric/controller/package.json           | 2 +-
 packages/drag-in-the-blank/configure/package.json         | 2 +-
 packages/drag-in-the-blank/controller/package.json        | 2 +-
 packages/drag-in-the-blank/package.json                   | 2 +-
 packages/drawing-response/configure/package.json          | 2 +-
 packages/drawing-response/package.json                    | 2 +-
 packages/ebsr/configure/package.json                      | 2 +-
 packages/ebsr/controller/package.json                     | 2 +-
 packages/ebsr/package.json                                | 2 +-
 .../explicit-constructed-response/configure/package.json  | 2 +-
 .../explicit-constructed-response/controller/package.json | 2 +-
 packages/explicit-constructed-response/package.json       | 2 +-
 packages/extended-text-entry/configure/package.json       | 2 +-
 packages/extended-text-entry/controller/package.json      | 2 +-
 packages/extended-text-entry/package.json                 | 2 +-
 packages/fraction-model/configure/package.json            | 2 +-
 packages/fraction-model/controller/package.json           | 2 +-
 packages/fraction-model/package.json                      | 2 +-
 packages/graphing-solution-set/configure/package.json     | 2 +-
 packages/graphing-solution-set/controller/package.json    | 2 +-
 packages/graphing-solution-set/package.json               | 2 +-
 packages/graphing/configure/package.json                  | 2 +-
 packages/graphing/controller/package.json                 | 2 +-
 packages/graphing/package.json                            | 2 +-
 packages/hotspot/configure/package.json                   | 2 +-
 packages/hotspot/controller/package.json                  | 2 +-
 packages/hotspot/package.json                             | 2 +-
 packages/image-cloze-association/configure/package.json   | 2 +-
 packages/image-cloze-association/controller/package.json  | 2 +-
 packages/image-cloze-association/package.json             | 2 +-
 packages/inline-dropdown/configure/package.json           | 2 +-
 packages/inline-dropdown/controller/package.json          | 2 +-
 packages/inline-dropdown/package.json                     | 2 +-
 packages/likert/configure/package.json                    | 2 +-
 packages/likert/package.json                              | 2 +-
 packages/match-list/controller/package.json               | 2 +-
 packages/match-list/package.json                          | 2 +-
 packages/match/configure/package.json                     | 2 +-
 packages/match/controller/package.json                    | 2 +-
 packages/match/package.json                               | 2 +-
 packages/math-inline/configure/package.json               | 2 +-
 packages/math-inline/controller/package.json              | 2 +-
 packages/math-inline/package.json                         | 2 +-
 packages/math-templated/configure/package.json            | 2 +-
 packages/math-templated/controller/package.json           | 2 +-
 packages/math-templated/package.json                      | 2 +-
 packages/matrix/configure/package.json                    | 2 +-
 packages/matrix/package.json                              | 2 +-
 packages/multi-trait-rubric/configure/package.json        | 2 +-
 packages/multi-trait-rubric/controller/package.json       | 2 +-
 packages/multi-trait-rubric/package.json                  | 2 +-
 packages/multiple-choice/configure/package.json           | 2 +-
 packages/multiple-choice/controller/package.json          | 2 +-
 packages/multiple-choice/package.json                     | 2 +-
 packages/number-line/configure/package.json               | 2 +-
 packages/number-line/controller/package.json              | 2 +-
 packages/number-line/package.json                         | 2 +-
 packages/passage/configure/package.json                   | 2 +-
 packages/passage/package.json                             | 2 +-
 packages/placement-ordering/configure/package.json        | 2 +-
 packages/placement-ordering/controller/package.json       | 2 +-
 packages/placement-ordering/package.json                  | 2 +-
 packages/protractor/package.json                          | 2 +-
 packages/rubric/configure/package.json                    | 2 +-
 packages/rubric/controller/package.json                   | 2 +-
 packages/rubric/package.json                              | 2 +-
 packages/ruler/configure/package.json                     | 2 +-
 packages/ruler/package.json                               | 2 +-
 packages/select-text/configure/package.json               | 2 +-
 packages/select-text/controller/package.json              | 2 +-
 packages/select-text/package.json                         | 2 +-
 pslb/pslb.config.js                                       | 2 +-
 yarn.lock                                                 | 8 ++++----
 83 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/packages/boilerplate-item-type/configure/package.json b/packages/boilerplate-item-type/configure/package.json
index 914dde7b2d..183a41b6ce 100644
--- a/packages/boilerplate-item-type/configure/package.json
+++ b/packages/boilerplate-item-type/configure/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
diff --git a/packages/boilerplate-item-type/controller/package.json b/packages/boilerplate-item-type/controller/package.json
index 298f56ce29..3c07b134c7 100644
--- a/packages/boilerplate-item-type/controller/package.json
+++ b/packages/boilerplate-item-type/controller/package.json
@@ -6,7 +6,7 @@
   "main": "lib/index.js",
   "module": "src/index.js",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   },
diff --git a/packages/boilerplate-item-type/package.json b/packages/boilerplate-item-type/package.json
index ad1592ada7..99f7348f49 100644
--- a/packages/boilerplate-item-type/package.json
+++ b/packages/boilerplate-item-type/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
diff --git a/packages/calculator/configure/package.json b/packages/calculator/configure/package.json
index 1cf45ad44d..8de1226d63 100644
--- a/packages/calculator/configure/package.json
+++ b/packages/calculator/configure/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
   },
diff --git a/packages/categorize/configure/package.json b/packages/categorize/configure/package.json
index 6d621a4212..9f18ed207c 100644
--- a/packages/categorize/configure/package.json
+++ b/packages/categorize/configure/package.json
@@ -12,7 +12,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.5",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
diff --git a/packages/categorize/controller/package.json b/packages/categorize/controller/package.json
index 58fbb2afda..b3b785292e 100644
--- a/packages/categorize/controller/package.json
+++ b/packages/categorize/controller/package.json
@@ -2,7 +2,7 @@
   "name": "@pie-element/categorize-controller",
   "private": true,
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "lodash": "^4.17.15"
   },
   "version": "7.8.10",
diff --git a/packages/categorize/package.json b/packages/categorize/package.json
index 944df0a2f8..485fabcdf0 100644
--- a/packages/categorize/package.json
+++ b/packages/categorize/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.15",
diff --git a/packages/charting/configure/package.json b/packages/charting/configure/package.json
index fb63261a73..0feab6bc6b 100644
--- a/packages/charting/configure/package.json
+++ b/packages/charting/configure/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "prop-types": "^15.6.2",
diff --git a/packages/charting/controller/package.json b/packages/charting/controller/package.json
index 6da95af8f1..3505d5fc04 100644
--- a/packages/charting/controller/package.json
+++ b/packages/charting/controller/package.json
@@ -9,7 +9,7 @@
     "test": "./node_modules/.bin/jest"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^4.1.1",
     "lodash": "^4.17.15"
   },
diff --git a/packages/charting/package.json b/packages/charting/package.json
index 225b0c4277..7483977d8f 100644
--- a/packages/charting/package.json
+++ b/packages/charting/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.15",
diff --git a/packages/complex-rubric/controller/package.json b/packages/complex-rubric/controller/package.json
index 64ac2cf956..301b4b3fc9 100644
--- a/packages/complex-rubric/controller/package.json
+++ b/packages/complex-rubric/controller/package.json
@@ -7,7 +7,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "lodash": "^4.17.15"
   },
   "author": "",
diff --git a/packages/drag-in-the-blank/configure/package.json b/packages/drag-in-the-blank/configure/package.json
index aa04a4e0b0..eecdeb82f2 100644
--- a/packages/drag-in-the-blank/configure/package.json
+++ b/packages/drag-in-the-blank/configure/package.json
@@ -8,7 +8,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
diff --git a/packages/drag-in-the-blank/controller/package.json b/packages/drag-in-the-blank/controller/package.json
index cb3d264f22..1ec7deb0be 100644
--- a/packages/drag-in-the-blank/controller/package.json
+++ b/packages/drag-in-the-blank/controller/package.json
@@ -8,7 +8,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "type-of": "^2.0.1"
diff --git a/packages/drag-in-the-blank/package.json b/packages/drag-in-the-blank/package.json
index 0b8175d025..af85dd6765 100644
--- a/packages/drag-in-the-blank/package.json
+++ b/packages/drag-in-the-blank/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.5",
     "lodash": "^4.17.10",
     "prop-types": "^15.6.1",
diff --git a/packages/drawing-response/configure/package.json b/packages/drawing-response/configure/package.json
index ac8c914c3a..91546bc45c 100644
--- a/packages/drawing-response/configure/package.json
+++ b/packages/drawing-response/configure/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.6",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
diff --git a/packages/drawing-response/package.json b/packages/drawing-response/package.json
index 8f77d6d028..013e03a736 100644
--- a/packages/drawing-response/package.json
+++ b/packages/drawing-response/package.json
@@ -11,7 +11,7 @@
     "@mdi/js": "^3.6.95",
     "@mdi/react": "^1.1.1",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.6",
     "enzyme-to-json": "^3.3.5",
     "konva": "^3.4.1",
diff --git a/packages/ebsr/configure/package.json b/packages/ebsr/configure/package.json
index b2a0a7a542..cfc41c28dd 100644
--- a/packages/ebsr/configure/package.json
+++ b/packages/ebsr/configure/package.json
@@ -10,7 +10,7 @@
     "@material-ui/core": "^3.9.2",
     "@pie-element/multiple-choice": "^9.17.0",
     "@pie-framework/pie-configure-events": "^1.2.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
     "react": "^16.8.1",
diff --git a/packages/ebsr/controller/package.json b/packages/ebsr/controller/package.json
index ec11306824..fd2f899182 100644
--- a/packages/ebsr/controller/package.json
+++ b/packages/ebsr/controller/package.json
@@ -7,7 +7,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "lodash": "^4.17.15"
   },
   "author": "",
diff --git a/packages/ebsr/package.json b/packages/ebsr/package.json
index 925ecd7bff..90c164ead5 100644
--- a/packages/ebsr/package.json
+++ b/packages/ebsr/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@pie-element/multiple-choice": "^9.17.0",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.11"
diff --git a/packages/explicit-constructed-response/configure/package.json b/packages/explicit-constructed-response/configure/package.json
index ba07b4e650..fd1d191df2 100644
--- a/packages/explicit-constructed-response/configure/package.json
+++ b/packages/explicit-constructed-response/configure/package.json
@@ -8,7 +8,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.6",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
diff --git a/packages/explicit-constructed-response/controller/package.json b/packages/explicit-constructed-response/controller/package.json
index 52728eaaac..3d3ee32a03 100644
--- a/packages/explicit-constructed-response/controller/package.json
+++ b/packages/explicit-constructed-response/controller/package.json
@@ -8,7 +8,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^3.1.0",
     "he": "^1.2.0",
     "lodash": "^4.17.15",
diff --git a/packages/explicit-constructed-response/package.json b/packages/explicit-constructed-response/package.json
index af65696304..cfe0f05d94 100644
--- a/packages/explicit-constructed-response/package.json
+++ b/packages/explicit-constructed-response/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.5",
     "he": "^1.2.0",
     "lodash": "^4.17.10",
diff --git a/packages/extended-text-entry/configure/package.json b/packages/extended-text-entry/configure/package.json
index a3d3703a3b..7c4e36af3b 100644
--- a/packages/extended-text-entry/configure/package.json
+++ b/packages/extended-text-entry/configure/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
     "react": "^16.8.1",
diff --git a/packages/extended-text-entry/controller/package.json b/packages/extended-text-entry/controller/package.json
index 94e7f88e13..58c645a85b 100644
--- a/packages/extended-text-entry/controller/package.json
+++ b/packages/extended-text-entry/controller/package.json
@@ -6,7 +6,7 @@
   "main": "lib/index.js",
   "module": "src/index.js",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.20.0"
+    "@pie-lib/pie-toolbox": "2.21.0"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
diff --git a/packages/extended-text-entry/package.json b/packages/extended-text-entry/package.json
index c7dd405f91..fbbe81c57e 100644
--- a/packages/extended-text-entry/package.json
+++ b/packages/extended-text-entry/package.json
@@ -12,7 +12,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.5",
     "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 35dc205628..2b81cdcb9b 100644
--- a/packages/fraction-model/configure/package.json
+++ b/packages/fraction-model/configure/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
diff --git a/packages/fraction-model/controller/package.json b/packages/fraction-model/controller/package.json
index 47ab9248ea..2d8f22571a 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/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   },
diff --git a/packages/fraction-model/package.json b/packages/fraction-model/package.json
index 113793dbfa..b0f6759214 100644
--- a/packages/fraction-model/package.json
+++ b/packages/fraction-model/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
     "react-dom": "^16.8.1",
diff --git a/packages/graphing-solution-set/configure/package.json b/packages/graphing-solution-set/configure/package.json
index 94fdbcf71a..f48930b6f8 100644
--- a/packages/graphing-solution-set/configure/package.json
+++ b/packages/graphing-solution-set/configure/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "prop-types": "^15.6.2",
diff --git a/packages/graphing-solution-set/controller/package.json b/packages/graphing-solution-set/controller/package.json
index e8a1e5d91c..9bb24e45f4 100644
--- a/packages/graphing-solution-set/controller/package.json
+++ b/packages/graphing-solution-set/controller/package.json
@@ -9,7 +9,7 @@
     "test": "./node_modules/.bin/jest"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^4.1.1"
   },
   "devDependencies": {
diff --git a/packages/graphing-solution-set/package.json b/packages/graphing-solution-set/package.json
index f894b63db4..baf70ef1f2 100644
--- a/packages/graphing-solution-set/package.json
+++ b/packages/graphing-solution-set/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "react": "^16.8.1",
diff --git a/packages/graphing/configure/package.json b/packages/graphing/configure/package.json
index caffba87d5..5dfb73aa13 100644
--- a/packages/graphing/configure/package.json
+++ b/packages/graphing/configure/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.15",
diff --git a/packages/graphing/controller/package.json b/packages/graphing/controller/package.json
index 999e8e34a7..35c5ca5ee5 100644
--- a/packages/graphing/controller/package.json
+++ b/packages/graphing/controller/package.json
@@ -9,7 +9,7 @@
     "test": "./node_modules/.bin/jest"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^4.1.1"
   },
   "devDependencies": {
diff --git a/packages/graphing/package.json b/packages/graphing/package.json
index 12c4e9a0ef..77eadcfe87 100644
--- a/packages/graphing/package.json
+++ b/packages/graphing/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "react": "^16.8.1",
diff --git a/packages/hotspot/configure/package.json b/packages/hotspot/configure/package.json
index dd4380578b..ec493bef51 100644
--- a/packages/hotspot/configure/package.json
+++ b/packages/hotspot/configure/package.json
@@ -10,7 +10,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.6",
     "debug": "^3.1.0",
     "konva": "^3.2.4",
diff --git a/packages/hotspot/controller/package.json b/packages/hotspot/controller/package.json
index 59c45871d0..ea196fe89e 100644
--- a/packages/hotspot/controller/package.json
+++ b/packages/hotspot/controller/package.json
@@ -11,7 +11,7 @@
   "main": "lib/index.js",
   "module": "src/index.js",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^4.1.1",
     "lodash": "^4.17.15"
   }
diff --git a/packages/hotspot/package.json b/packages/hotspot/package.json
index 43b226aa7a..f0a3f779cf 100644
--- a/packages/hotspot/package.json
+++ b/packages/hotspot/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.3",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "konva": "^3.2.5",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
diff --git a/packages/image-cloze-association/configure/package.json b/packages/image-cloze-association/configure/package.json
index 6b291796cd..50c9c2b274 100644
--- a/packages/image-cloze-association/configure/package.json
+++ b/packages/image-cloze-association/configure/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^3.1.0",
     "prop-types": "^15.7.2",
     "react": "^16.8.6",
diff --git a/packages/image-cloze-association/controller/package.json b/packages/image-cloze-association/controller/package.json
index f3ea650f14..ba80b7541b 100644
--- a/packages/image-cloze-association/controller/package.json
+++ b/packages/image-cloze-association/controller/package.json
@@ -11,7 +11,7 @@
   "main": "lib/index.js",
   "module": "src/index.js",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^4.1.1",
     "humps": "^2.0.1",
     "lodash": "^4.17.15"
diff --git a/packages/image-cloze-association/package.json b/packages/image-cloze-association/package.json
index d12405f68f..3ebbd6810a 100644
--- a/packages/image-cloze-association/package.json
+++ b/packages/image-cloze-association/package.json
@@ -10,7 +10,7 @@
     "@material-ui/core": "^3.9.3",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.6",
     "humps": "^2.0.1",
     "prop-types": "^15.6.1",
diff --git a/packages/inline-dropdown/configure/package.json b/packages/inline-dropdown/configure/package.json
index 40052d3ba8..53f8a006d4 100644
--- a/packages/inline-dropdown/configure/package.json
+++ b/packages/inline-dropdown/configure/package.json
@@ -8,7 +8,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.6",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
diff --git a/packages/inline-dropdown/controller/package.json b/packages/inline-dropdown/controller/package.json
index 0b22bed358..191868d645 100644
--- a/packages/inline-dropdown/controller/package.json
+++ b/packages/inline-dropdown/controller/package.json
@@ -8,7 +8,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "type-of": "^2.0.1"
diff --git a/packages/inline-dropdown/package.json b/packages/inline-dropdown/package.json
index fc1e29d62d..6e35fc42f8 100644
--- a/packages/inline-dropdown/package.json
+++ b/packages/inline-dropdown/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.5",
     "lodash": "^4.17.10",
     "prop-types": "^15.6.1",
diff --git a/packages/likert/configure/package.json b/packages/likert/configure/package.json
index 35a3d14ddb..b34c495993 100644
--- a/packages/likert/configure/package.json
+++ b/packages/likert/configure/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^4.1.1",
     "prop-types": "^15.6.2",
     "react": "^16.8.1",
diff --git a/packages/likert/package.json b/packages/likert/package.json
index 11cae95e6d..c26362588e 100644
--- a/packages/likert/package.json
+++ b/packages/likert/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.10",
diff --git a/packages/match-list/controller/package.json b/packages/match-list/controller/package.json
index b71ae9ef31..34964724e0 100644
--- a/packages/match-list/controller/package.json
+++ b/packages/match-list/controller/package.json
@@ -9,7 +9,7 @@
     "test": "./node_modules/.bin/jest"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   },
diff --git a/packages/match-list/package.json b/packages/match-list/package.json
index d9740a0c5c..31c5f7f197 100644
--- a/packages/match-list/package.json
+++ b/packages/match-list/package.json
@@ -14,7 +14,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.10",
diff --git a/packages/match/configure/package.json b/packages/match/configure/package.json
index 184c6b8953..bacbf7e4b2 100644
--- a/packages/match/configure/package.json
+++ b/packages/match/configure/package.json
@@ -10,7 +10,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.5",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
diff --git a/packages/match/controller/package.json b/packages/match/controller/package.json
index 7a2c21238b..2f81b031e8 100644
--- a/packages/match/controller/package.json
+++ b/packages/match/controller/package.json
@@ -9,7 +9,7 @@
     "test": "./node_modules/.bin/jest"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^3.1.0"
   },
   "devDependencies": {
diff --git a/packages/match/package.json b/packages/match/package.json
index 9982501983..c18a3b90a8 100644
--- a/packages/match/package.json
+++ b/packages/match/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.10",
diff --git a/packages/math-inline/configure/package.json b/packages/math-inline/configure/package.json
index c59f919a87..fe244db2da 100644
--- a/packages/math-inline/configure/package.json
+++ b/packages/math-inline/configure/package.json
@@ -11,7 +11,7 @@
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/mathquill": "^1.1.3",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.5",
     "debug": "^3.1.0",
     "prop-types": "^15.6.2",
diff --git a/packages/math-inline/controller/package.json b/packages/math-inline/controller/package.json
index d6b0268460..159ff5cd85 100644
--- a/packages/math-inline/controller/package.json
+++ b/packages/math-inline/controller/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@pie-framework/math-validation": "^1.4.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   },
diff --git a/packages/math-inline/package.json b/packages/math-inline/package.json
index b1a9d0e4ba..9055104bc6 100644
--- a/packages/math-inline/package.json
+++ b/packages/math-inline/package.json
@@ -14,7 +14,7 @@
     "@material-ui/core": "^3.9.2",
     "@pie-framework/mathquill": "^1.1.3",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.10",
diff --git a/packages/math-templated/configure/package.json b/packages/math-templated/configure/package.json
index 783be5bafb..ebdc8b76ec 100644
--- a/packages/math-templated/configure/package.json
+++ b/packages/math-templated/configure/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
diff --git a/packages/math-templated/controller/package.json b/packages/math-templated/controller/package.json
index eccf1e2e82..fa5d10d246 100644
--- a/packages/math-templated/controller/package.json
+++ b/packages/math-templated/controller/package.json
@@ -7,7 +7,7 @@
   "module": "src/index.js",
   "dependencies": {
     "@pie-framework/math-validation": "^1.4.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   },
diff --git a/packages/math-templated/package.json b/packages/math-templated/package.json
index fc1c0f37dc..cfd37c0a39 100644
--- a/packages/math-templated/package.json
+++ b/packages/math-templated/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
diff --git a/packages/matrix/configure/package.json b/packages/matrix/configure/package.json
index 859c717bd8..712382660c 100644
--- a/packages/matrix/configure/package.json
+++ b/packages/matrix/configure/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^4.1.1",
     "prop-types": "^15.6.2",
     "react": "^16.8.1",
diff --git a/packages/matrix/package.json b/packages/matrix/package.json
index e65117653b..2482285e3f 100644
--- a/packages/matrix/package.json
+++ b/packages/matrix/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^4.1.1",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
diff --git a/packages/multi-trait-rubric/configure/package.json b/packages/multi-trait-rubric/configure/package.json
index 7c4dd43dfd..40f89eb7bc 100644
--- a/packages/multi-trait-rubric/configure/package.json
+++ b/packages/multi-trait-rubric/configure/package.json
@@ -8,7 +8,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
diff --git a/packages/multi-trait-rubric/controller/package.json b/packages/multi-trait-rubric/controller/package.json
index 1fac801998..f3d2dbabef 100644
--- a/packages/multi-trait-rubric/controller/package.json
+++ b/packages/multi-trait-rubric/controller/package.json
@@ -8,7 +8,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   }
diff --git a/packages/multi-trait-rubric/package.json b/packages/multi-trait-rubric/package.json
index f45e9f473c..063e7f83ac 100644
--- a/packages/multi-trait-rubric/package.json
+++ b/packages/multi-trait-rubric/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "clsx": "^1.1.1",
     "enzyme-to-json": "^3.3.5",
     "prop-types": "^15.6.1",
diff --git a/packages/multiple-choice/configure/package.json b/packages/multiple-choice/configure/package.json
index 80ad309ed3..7610f70c53 100644
--- a/packages/multiple-choice/configure/package.json
+++ b/packages/multiple-choice/configure/package.json
@@ -8,7 +8,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
diff --git a/packages/multiple-choice/controller/package.json b/packages/multiple-choice/controller/package.json
index 22e85c01e5..63798cdd49 100644
--- a/packages/multiple-choice/controller/package.json
+++ b/packages/multiple-choice/controller/package.json
@@ -8,7 +8,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   }
diff --git a/packages/multiple-choice/package.json b/packages/multiple-choice/package.json
index 2fefe3f7e4..16691f96a5 100644
--- a/packages/multiple-choice/package.json
+++ b/packages/multiple-choice/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "enzyme-to-json": "^3.3.3",
diff --git a/packages/number-line/configure/package.json b/packages/number-line/configure/package.json
index 88cccbc40a..87e56eb51f 100644
--- a/packages/number-line/configure/package.json
+++ b/packages/number-line/configure/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "lodash": "^4.17.15",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
diff --git a/packages/number-line/controller/package.json b/packages/number-line/controller/package.json
index 35bc338cde..6830698734 100644
--- a/packages/number-line/controller/package.json
+++ b/packages/number-line/controller/package.json
@@ -14,7 +14,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "lodash": "^4.17.15",
     "mathjs": "^7.5.1"
   },
diff --git a/packages/number-line/package.json b/packages/number-line/package.json
index 3be3143aaa..991d211e46 100644
--- a/packages/number-line/package.json
+++ b/packages/number-line/package.json
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@material-ui/core": "^3.9.2",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.5",
     "d3-scale": "^3.2.1",
     "d3-selection": "^1.4.1",
diff --git a/packages/passage/configure/package.json b/packages/passage/configure/package.json
index e5a0d5115b..a551c6582c 100644
--- a/packages/passage/configure/package.json
+++ b/packages/passage/configure/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
     "react": "^16.8.1",
diff --git a/packages/passage/package.json b/packages/passage/package.json
index 49d3f045ea..75b71aefb3 100644
--- a/packages/passage/package.json
+++ b/packages/passage/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.5",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
diff --git a/packages/placement-ordering/configure/package.json b/packages/placement-ordering/configure/package.json
index b2632c80a8..99b800c1c7 100644
--- a/packages/placement-ordering/configure/package.json
+++ b/packages/placement-ordering/configure/package.json
@@ -8,7 +8,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "nested-property": "^0.0.7",
diff --git a/packages/placement-ordering/controller/package.json b/packages/placement-ordering/controller/package.json
index f490fb2101..099521519a 100644
--- a/packages/placement-ordering/controller/package.json
+++ b/packages/placement-ordering/controller/package.json
@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "module": "src/index.js",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^3.1.0",
     "js-combinatorics": "^0.5.4",
     "lodash": "^4.17.19"
diff --git a/packages/placement-ordering/package.json b/packages/placement-ordering/package.json
index b7a84c7b35..1dd46b955f 100644
--- a/packages/placement-ordering/package.json
+++ b/packages/placement-ordering/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^4.1.1",
     "decimal.js": "^10.0.0",
     "lodash": "^4.17.10",
diff --git a/packages/protractor/package.json b/packages/protractor/package.json
index 1becb6ab8f..cc4f5c6444 100644
--- a/packages/protractor/package.json
+++ b/packages/protractor/package.json
@@ -10,7 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "@material-ui/core": "^3.9.2",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "classnames": "^2.2.5",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
diff --git a/packages/rubric/configure/package.json b/packages/rubric/configure/package.json
index 55decf8b58..148b68859c 100644
--- a/packages/rubric/configure/package.json
+++ b/packages/rubric/configure/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^4.1.1",
     "react": "^16.8.6",
     "react-dom": "^16.8.6"
diff --git a/packages/rubric/controller/package.json b/packages/rubric/controller/package.json
index db97436764..7a193f8d62 100644
--- a/packages/rubric/controller/package.json
+++ b/packages/rubric/controller/package.json
@@ -7,7 +7,7 @@
     "test": "./node_modules/.bin/jest"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "lodash": "^4.17.15"
   }
 }
diff --git a/packages/rubric/package.json b/packages/rubric/package.json
index 250f8b1d69..1b1c1f5d48 100644
--- a/packages/rubric/package.json
+++ b/packages/rubric/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@material-ui/core": "^3.9.2",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "prop-types": "^15.7.2"
   },
   "author": "pie framework developers",
diff --git a/packages/ruler/configure/package.json b/packages/ruler/configure/package.json
index 521d16e8ed..17c25e76c8 100644
--- a/packages/ruler/configure/package.json
+++ b/packages/ruler/configure/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0"
+    "@pie-lib/pie-toolbox": "2.21.0"
   },
   "author": "",
   "license": "ISC"
diff --git a/packages/ruler/package.json b/packages/ruler/package.json
index f5b5f194a1..ab7ecb981b 100644
--- a/packages/ruler/package.json
+++ b/packages/ruler/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
diff --git a/packages/select-text/configure/package.json b/packages/select-text/configure/package.json
index 09ca96a70b..a0cfd9356e 100644
--- a/packages/select-text/configure/package.json
+++ b/packages/select-text/configure/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
diff --git a/packages/select-text/controller/package.json b/packages/select-text/controller/package.json
index c322f6562b..4da1ad6435 100644
--- a/packages/select-text/controller/package.json
+++ b/packages/select-text/controller/package.json
@@ -6,7 +6,7 @@
   "main": "lib/index.js",
   "module": "src/index.js",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   },
diff --git a/packages/select-text/package.json b/packages/select-text/package.json
index ecf1cde80a..cafe28f801 100644
--- a/packages/select-text/package.json
+++ b/packages/select-text/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.20.0",
+    "@pie-lib/pie-toolbox": "2.21.0",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
diff --git a/pslb/pslb.config.js b/pslb/pslb.config.js
index c1abaa8980..15377950fd 100644
--- a/pslb/pslb.config.js
+++ b/pslb/pslb.config.js
@@ -46,7 +46,7 @@ module.exports = {
   libs: {
     repository: 'pie-framework/pie-elements',
     packages: [
-      { name: '@pie-lib/pie-toolbox-module', version: '8.1.1' }
+      { name: '@pie-lib/pie-toolbox-module', version: '8.2.0' }
     ],
   },
 };
diff --git a/yarn.lock b/yarn.lock
index 374b26e71c..5143af91c1 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2276,10 +2276,10 @@
   resolved "https://registry.yarnpkg.com/@pie-framework/pie-player-events/-/pie-player-events-0.1.0.tgz#0150904118fd604559982ab658967811c053ffe3"
   integrity sha512-6H1tlRGmcZ3Wt+8HMqu5KugVcwwyNrMylfI5rIpvOSt0T82QDmjRj+2sPgQG5zos/w6MtwUqn/QZ+8Rq2EXSOA==
 
-"@pie-lib/pie-toolbox@2.20.0":
-  version "2.20.0"
-  resolved "https://registry.yarnpkg.com/@pie-lib/pie-toolbox/-/pie-toolbox-2.20.0.tgz#607cd6f2ba8a60f419a7a2ac5b8f2eac8af5169c"
-  integrity sha512-IYptYd4ZwLtZEnwsTNIf+X6nK3JNeCvQZQZn5ow4NQyp6aI5A1vVCNOVHOVzjz5a0kNReDK/5jvyV8mF2ov89g==
+"@pie-lib/pie-toolbox@2.21.0":
+  version "2.21.0"
+  resolved "https://registry.yarnpkg.com/@pie-lib/pie-toolbox/-/pie-toolbox-2.21.0.tgz#b4f27dd942491e2ededc5dcab8df5381c7652bc1"
+  integrity sha512-g5J51m8FbzfiKYsZBzF6rvzH5lsFV4hdoIu3c66f4tGSbfoyh1Vwa2TwfdLnh1JiZo+24yD/X07xbI6k9h54Vg==
   dependencies:
     "@mapbox/point-geometry" "^0.1.0"
     "@material-ui/core" "^3.8.3"

From dc67b1c735b2adb60943e5d145e739ce4e39a428 Mon Sep 17 00:00:00 2001
From: carlacostea <carlacostea@yahoo.com>
Date: Fri, 18 Jul 2025 15:20:47 +0300
Subject: [PATCH 18/18] feat: update pie-lib/pie-toolbox PD-5082, PD-5081,
 PD-3797, PD-5083, PD-4885, PD-5097, PD-5100, PD-5131, PD-5080

---
 packages/boilerplate-item-type/configure/package.json     | 2 +-
 packages/boilerplate-item-type/controller/package.json    | 2 +-
 packages/boilerplate-item-type/package.json               | 2 +-
 packages/calculator/configure/package.json                | 2 +-
 packages/categorize/configure/package.json                | 2 +-
 packages/categorize/controller/package.json               | 2 +-
 packages/categorize/package.json                          | 2 +-
 packages/charting/configure/package.json                  | 2 +-
 packages/charting/controller/package.json                 | 2 +-
 packages/charting/package.json                            | 2 +-
 packages/complex-rubric/controller/package.json           | 2 +-
 packages/drag-in-the-blank/configure/package.json         | 2 +-
 packages/drag-in-the-blank/controller/package.json        | 2 +-
 packages/drag-in-the-blank/package.json                   | 2 +-
 packages/drawing-response/configure/package.json          | 2 +-
 packages/drawing-response/package.json                    | 2 +-
 packages/ebsr/configure/package.json                      | 2 +-
 packages/ebsr/controller/package.json                     | 2 +-
 packages/ebsr/package.json                                | 2 +-
 .../explicit-constructed-response/configure/package.json  | 2 +-
 .../explicit-constructed-response/controller/package.json | 2 +-
 packages/explicit-constructed-response/package.json       | 2 +-
 packages/extended-text-entry/configure/package.json       | 2 +-
 packages/extended-text-entry/controller/package.json      | 2 +-
 packages/extended-text-entry/package.json                 | 2 +-
 packages/fraction-model/configure/package.json            | 2 +-
 packages/fraction-model/controller/package.json           | 2 +-
 packages/fraction-model/package.json                      | 2 +-
 packages/graphing-solution-set/configure/package.json     | 2 +-
 packages/graphing-solution-set/controller/package.json    | 2 +-
 packages/graphing-solution-set/package.json               | 2 +-
 packages/graphing/configure/package.json                  | 2 +-
 packages/graphing/controller/package.json                 | 2 +-
 packages/graphing/package.json                            | 2 +-
 packages/hotspot/configure/package.json                   | 2 +-
 packages/hotspot/controller/package.json                  | 2 +-
 packages/hotspot/package.json                             | 2 +-
 packages/image-cloze-association/configure/package.json   | 2 +-
 packages/image-cloze-association/controller/package.json  | 2 +-
 packages/image-cloze-association/package.json             | 2 +-
 packages/inline-dropdown/configure/package.json           | 2 +-
 packages/inline-dropdown/controller/package.json          | 2 +-
 packages/inline-dropdown/package.json                     | 2 +-
 packages/likert/configure/package.json                    | 2 +-
 packages/likert/package.json                              | 2 +-
 packages/match-list/controller/package.json               | 2 +-
 packages/match-list/package.json                          | 2 +-
 packages/match/configure/package.json                     | 2 +-
 packages/match/controller/package.json                    | 2 +-
 packages/match/package.json                               | 2 +-
 packages/math-inline/configure/package.json               | 2 +-
 packages/math-inline/controller/package.json              | 2 +-
 packages/math-inline/package.json                         | 2 +-
 packages/math-templated/configure/package.json            | 2 +-
 packages/math-templated/controller/package.json           | 2 +-
 packages/math-templated/package.json                      | 2 +-
 packages/matrix/configure/package.json                    | 2 +-
 packages/matrix/package.json                              | 2 +-
 packages/multi-trait-rubric/configure/package.json        | 2 +-
 packages/multi-trait-rubric/controller/package.json       | 2 +-
 packages/multi-trait-rubric/package.json                  | 2 +-
 packages/multiple-choice/configure/package.json           | 2 +-
 packages/multiple-choice/controller/package.json          | 2 +-
 packages/multiple-choice/package.json                     | 2 +-
 packages/number-line/configure/package.json               | 2 +-
 packages/number-line/controller/package.json              | 2 +-
 packages/number-line/package.json                         | 2 +-
 packages/passage/configure/package.json                   | 2 +-
 packages/passage/package.json                             | 2 +-
 packages/placement-ordering/configure/package.json        | 2 +-
 packages/placement-ordering/controller/package.json       | 2 +-
 packages/placement-ordering/package.json                  | 2 +-
 packages/protractor/package.json                          | 2 +-
 packages/rubric/configure/package.json                    | 2 +-
 packages/rubric/controller/package.json                   | 2 +-
 packages/rubric/package.json                              | 2 +-
 packages/ruler/configure/package.json                     | 2 +-
 packages/ruler/package.json                               | 2 +-
 packages/select-text/configure/package.json               | 2 +-
 packages/select-text/controller/package.json              | 2 +-
 packages/select-text/package.json                         | 2 +-
 pslb/pslb.config.js                                       | 2 +-
 yarn.lock                                                 | 8 ++++----
 83 files changed, 86 insertions(+), 86 deletions(-)

diff --git a/packages/boilerplate-item-type/configure/package.json b/packages/boilerplate-item-type/configure/package.json
index 183a41b6ce..734b99f350 100644
--- a/packages/boilerplate-item-type/configure/package.json
+++ b/packages/boilerplate-item-type/configure/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
diff --git a/packages/boilerplate-item-type/controller/package.json b/packages/boilerplate-item-type/controller/package.json
index 3c07b134c7..bc086e213b 100644
--- a/packages/boilerplate-item-type/controller/package.json
+++ b/packages/boilerplate-item-type/controller/package.json
@@ -6,7 +6,7 @@
   "main": "lib/index.js",
   "module": "src/index.js",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   },
diff --git a/packages/boilerplate-item-type/package.json b/packages/boilerplate-item-type/package.json
index 99f7348f49..8b0f4cdd1f 100644
--- a/packages/boilerplate-item-type/package.json
+++ b/packages/boilerplate-item-type/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
diff --git a/packages/calculator/configure/package.json b/packages/calculator/configure/package.json
index 8de1226d63..049b15b58b 100644
--- a/packages/calculator/configure/package.json
+++ b/packages/calculator/configure/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
   },
diff --git a/packages/categorize/configure/package.json b/packages/categorize/configure/package.json
index 9f18ed207c..ac534b8858 100644
--- a/packages/categorize/configure/package.json
+++ b/packages/categorize/configure/package.json
@@ -12,7 +12,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.5",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
diff --git a/packages/categorize/controller/package.json b/packages/categorize/controller/package.json
index b3b785292e..8f3b602270 100644
--- a/packages/categorize/controller/package.json
+++ b/packages/categorize/controller/package.json
@@ -2,7 +2,7 @@
   "name": "@pie-element/categorize-controller",
   "private": true,
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "lodash": "^4.17.15"
   },
   "version": "7.8.10",
diff --git a/packages/categorize/package.json b/packages/categorize/package.json
index 485fabcdf0..000a6b939d 100644
--- a/packages/categorize/package.json
+++ b/packages/categorize/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.15",
diff --git a/packages/charting/configure/package.json b/packages/charting/configure/package.json
index 0feab6bc6b..c551ca9a06 100644
--- a/packages/charting/configure/package.json
+++ b/packages/charting/configure/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "prop-types": "^15.6.2",
diff --git a/packages/charting/controller/package.json b/packages/charting/controller/package.json
index 3505d5fc04..810b250f0e 100644
--- a/packages/charting/controller/package.json
+++ b/packages/charting/controller/package.json
@@ -9,7 +9,7 @@
     "test": "./node_modules/.bin/jest"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^4.1.1",
     "lodash": "^4.17.15"
   },
diff --git a/packages/charting/package.json b/packages/charting/package.json
index 7483977d8f..71299fa3f4 100644
--- a/packages/charting/package.json
+++ b/packages/charting/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.15",
diff --git a/packages/complex-rubric/controller/package.json b/packages/complex-rubric/controller/package.json
index 301b4b3fc9..2a7acb6b05 100644
--- a/packages/complex-rubric/controller/package.json
+++ b/packages/complex-rubric/controller/package.json
@@ -7,7 +7,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "lodash": "^4.17.15"
   },
   "author": "",
diff --git a/packages/drag-in-the-blank/configure/package.json b/packages/drag-in-the-blank/configure/package.json
index eecdeb82f2..5b191545b7 100644
--- a/packages/drag-in-the-blank/configure/package.json
+++ b/packages/drag-in-the-blank/configure/package.json
@@ -8,7 +8,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
diff --git a/packages/drag-in-the-blank/controller/package.json b/packages/drag-in-the-blank/controller/package.json
index 1ec7deb0be..9e9a9c9f68 100644
--- a/packages/drag-in-the-blank/controller/package.json
+++ b/packages/drag-in-the-blank/controller/package.json
@@ -8,7 +8,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "type-of": "^2.0.1"
diff --git a/packages/drag-in-the-blank/package.json b/packages/drag-in-the-blank/package.json
index af85dd6765..7b9fe1501b 100644
--- a/packages/drag-in-the-blank/package.json
+++ b/packages/drag-in-the-blank/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.5",
     "lodash": "^4.17.10",
     "prop-types": "^15.6.1",
diff --git a/packages/drawing-response/configure/package.json b/packages/drawing-response/configure/package.json
index 91546bc45c..a32b6a2326 100644
--- a/packages/drawing-response/configure/package.json
+++ b/packages/drawing-response/configure/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.6",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
diff --git a/packages/drawing-response/package.json b/packages/drawing-response/package.json
index 013e03a736..121de41f60 100644
--- a/packages/drawing-response/package.json
+++ b/packages/drawing-response/package.json
@@ -11,7 +11,7 @@
     "@mdi/js": "^3.6.95",
     "@mdi/react": "^1.1.1",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.6",
     "enzyme-to-json": "^3.3.5",
     "konva": "^3.4.1",
diff --git a/packages/ebsr/configure/package.json b/packages/ebsr/configure/package.json
index cfc41c28dd..5b5e45f322 100644
--- a/packages/ebsr/configure/package.json
+++ b/packages/ebsr/configure/package.json
@@ -10,7 +10,7 @@
     "@material-ui/core": "^3.9.2",
     "@pie-element/multiple-choice": "^9.17.0",
     "@pie-framework/pie-configure-events": "^1.2.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
     "react": "^16.8.1",
diff --git a/packages/ebsr/controller/package.json b/packages/ebsr/controller/package.json
index fd2f899182..43f8abbab4 100644
--- a/packages/ebsr/controller/package.json
+++ b/packages/ebsr/controller/package.json
@@ -7,7 +7,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "lodash": "^4.17.15"
   },
   "author": "",
diff --git a/packages/ebsr/package.json b/packages/ebsr/package.json
index 90c164ead5..33f9fde0da 100644
--- a/packages/ebsr/package.json
+++ b/packages/ebsr/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@pie-element/multiple-choice": "^9.17.0",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.11"
diff --git a/packages/explicit-constructed-response/configure/package.json b/packages/explicit-constructed-response/configure/package.json
index fd1d191df2..a4489c4e5b 100644
--- a/packages/explicit-constructed-response/configure/package.json
+++ b/packages/explicit-constructed-response/configure/package.json
@@ -8,7 +8,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.6",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
diff --git a/packages/explicit-constructed-response/controller/package.json b/packages/explicit-constructed-response/controller/package.json
index 3d3ee32a03..46fe053a03 100644
--- a/packages/explicit-constructed-response/controller/package.json
+++ b/packages/explicit-constructed-response/controller/package.json
@@ -8,7 +8,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^3.1.0",
     "he": "^1.2.0",
     "lodash": "^4.17.15",
diff --git a/packages/explicit-constructed-response/package.json b/packages/explicit-constructed-response/package.json
index cfe0f05d94..51c87f0b0a 100644
--- a/packages/explicit-constructed-response/package.json
+++ b/packages/explicit-constructed-response/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.5",
     "he": "^1.2.0",
     "lodash": "^4.17.10",
diff --git a/packages/extended-text-entry/configure/package.json b/packages/extended-text-entry/configure/package.json
index 7c4e36af3b..c5df675457 100644
--- a/packages/extended-text-entry/configure/package.json
+++ b/packages/extended-text-entry/configure/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
     "react": "^16.8.1",
diff --git a/packages/extended-text-entry/controller/package.json b/packages/extended-text-entry/controller/package.json
index 58c645a85b..7f5ec15cd7 100644
--- a/packages/extended-text-entry/controller/package.json
+++ b/packages/extended-text-entry/controller/package.json
@@ -6,7 +6,7 @@
   "main": "lib/index.js",
   "module": "src/index.js",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.21.0"
+    "@pie-lib/pie-toolbox": "2.22.0"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
diff --git a/packages/extended-text-entry/package.json b/packages/extended-text-entry/package.json
index fbbe81c57e..4d7f7d0b16 100644
--- a/packages/extended-text-entry/package.json
+++ b/packages/extended-text-entry/package.json
@@ -12,7 +12,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.5",
     "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 2b81cdcb9b..bf98a2a79e 100644
--- a/packages/fraction-model/configure/package.json
+++ b/packages/fraction-model/configure/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
diff --git a/packages/fraction-model/controller/package.json b/packages/fraction-model/controller/package.json
index 2d8f22571a..1eeb9b8b16 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/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   },
diff --git a/packages/fraction-model/package.json b/packages/fraction-model/package.json
index b0f6759214..db0037dd5f 100644
--- a/packages/fraction-model/package.json
+++ b/packages/fraction-model/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
     "react-dom": "^16.8.1",
diff --git a/packages/graphing-solution-set/configure/package.json b/packages/graphing-solution-set/configure/package.json
index f48930b6f8..5d02a846f6 100644
--- a/packages/graphing-solution-set/configure/package.json
+++ b/packages/graphing-solution-set/configure/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "prop-types": "^15.6.2",
diff --git a/packages/graphing-solution-set/controller/package.json b/packages/graphing-solution-set/controller/package.json
index 9bb24e45f4..efd95706ad 100644
--- a/packages/graphing-solution-set/controller/package.json
+++ b/packages/graphing-solution-set/controller/package.json
@@ -9,7 +9,7 @@
     "test": "./node_modules/.bin/jest"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^4.1.1"
   },
   "devDependencies": {
diff --git a/packages/graphing-solution-set/package.json b/packages/graphing-solution-set/package.json
index baf70ef1f2..d5748e8615 100644
--- a/packages/graphing-solution-set/package.json
+++ b/packages/graphing-solution-set/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "react": "^16.8.1",
diff --git a/packages/graphing/configure/package.json b/packages/graphing/configure/package.json
index 5dfb73aa13..aa15c81e4a 100644
--- a/packages/graphing/configure/package.json
+++ b/packages/graphing/configure/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.15",
diff --git a/packages/graphing/controller/package.json b/packages/graphing/controller/package.json
index 35c5ca5ee5..39e3747dd3 100644
--- a/packages/graphing/controller/package.json
+++ b/packages/graphing/controller/package.json
@@ -9,7 +9,7 @@
     "test": "./node_modules/.bin/jest"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^4.1.1"
   },
   "devDependencies": {
diff --git a/packages/graphing/package.json b/packages/graphing/package.json
index 77eadcfe87..c5d5330b7b 100644
--- a/packages/graphing/package.json
+++ b/packages/graphing/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "react": "^16.8.1",
diff --git a/packages/hotspot/configure/package.json b/packages/hotspot/configure/package.json
index ec493bef51..00b65e072c 100644
--- a/packages/hotspot/configure/package.json
+++ b/packages/hotspot/configure/package.json
@@ -10,7 +10,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.6",
     "debug": "^3.1.0",
     "konva": "^3.2.4",
diff --git a/packages/hotspot/controller/package.json b/packages/hotspot/controller/package.json
index ea196fe89e..a5951a44f0 100644
--- a/packages/hotspot/controller/package.json
+++ b/packages/hotspot/controller/package.json
@@ -11,7 +11,7 @@
   "main": "lib/index.js",
   "module": "src/index.js",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^4.1.1",
     "lodash": "^4.17.15"
   }
diff --git a/packages/hotspot/package.json b/packages/hotspot/package.json
index f0a3f779cf..8d528ee83b 100644
--- a/packages/hotspot/package.json
+++ b/packages/hotspot/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.3",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "konva": "^3.2.5",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
diff --git a/packages/image-cloze-association/configure/package.json b/packages/image-cloze-association/configure/package.json
index 50c9c2b274..59c2a576fd 100644
--- a/packages/image-cloze-association/configure/package.json
+++ b/packages/image-cloze-association/configure/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^3.1.0",
     "prop-types": "^15.7.2",
     "react": "^16.8.6",
diff --git a/packages/image-cloze-association/controller/package.json b/packages/image-cloze-association/controller/package.json
index ba80b7541b..fe562491a9 100644
--- a/packages/image-cloze-association/controller/package.json
+++ b/packages/image-cloze-association/controller/package.json
@@ -11,7 +11,7 @@
   "main": "lib/index.js",
   "module": "src/index.js",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^4.1.1",
     "humps": "^2.0.1",
     "lodash": "^4.17.15"
diff --git a/packages/image-cloze-association/package.json b/packages/image-cloze-association/package.json
index 3ebbd6810a..283a15000b 100644
--- a/packages/image-cloze-association/package.json
+++ b/packages/image-cloze-association/package.json
@@ -10,7 +10,7 @@
     "@material-ui/core": "^3.9.3",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.6",
     "humps": "^2.0.1",
     "prop-types": "^15.6.1",
diff --git a/packages/inline-dropdown/configure/package.json b/packages/inline-dropdown/configure/package.json
index 53f8a006d4..7865d46472 100644
--- a/packages/inline-dropdown/configure/package.json
+++ b/packages/inline-dropdown/configure/package.json
@@ -8,7 +8,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.6",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
diff --git a/packages/inline-dropdown/controller/package.json b/packages/inline-dropdown/controller/package.json
index 191868d645..00ddbcab41 100644
--- a/packages/inline-dropdown/controller/package.json
+++ b/packages/inline-dropdown/controller/package.json
@@ -8,7 +8,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "type-of": "^2.0.1"
diff --git a/packages/inline-dropdown/package.json b/packages/inline-dropdown/package.json
index 6e35fc42f8..21b53cb457 100644
--- a/packages/inline-dropdown/package.json
+++ b/packages/inline-dropdown/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.5",
     "lodash": "^4.17.10",
     "prop-types": "^15.6.1",
diff --git a/packages/likert/configure/package.json b/packages/likert/configure/package.json
index b34c495993..ff008fe47d 100644
--- a/packages/likert/configure/package.json
+++ b/packages/likert/configure/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^4.1.1",
     "prop-types": "^15.6.2",
     "react": "^16.8.1",
diff --git a/packages/likert/package.json b/packages/likert/package.json
index c26362588e..ad2c81e261 100644
--- a/packages/likert/package.json
+++ b/packages/likert/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.10",
diff --git a/packages/match-list/controller/package.json b/packages/match-list/controller/package.json
index 34964724e0..62713254a6 100644
--- a/packages/match-list/controller/package.json
+++ b/packages/match-list/controller/package.json
@@ -9,7 +9,7 @@
     "test": "./node_modules/.bin/jest"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   },
diff --git a/packages/match-list/package.json b/packages/match-list/package.json
index 31c5f7f197..d86e0fdd4f 100644
--- a/packages/match-list/package.json
+++ b/packages/match-list/package.json
@@ -14,7 +14,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.10",
diff --git a/packages/match/configure/package.json b/packages/match/configure/package.json
index bacbf7e4b2..9405e66286 100644
--- a/packages/match/configure/package.json
+++ b/packages/match/configure/package.json
@@ -10,7 +10,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.5",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
diff --git a/packages/match/controller/package.json b/packages/match/controller/package.json
index 2f81b031e8..467ac6f879 100644
--- a/packages/match/controller/package.json
+++ b/packages/match/controller/package.json
@@ -9,7 +9,7 @@
     "test": "./node_modules/.bin/jest"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^3.1.0"
   },
   "devDependencies": {
diff --git a/packages/match/package.json b/packages/match/package.json
index c18a3b90a8..b78187eaaa 100644
--- a/packages/match/package.json
+++ b/packages/match/package.json
@@ -13,7 +13,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.10",
diff --git a/packages/math-inline/configure/package.json b/packages/math-inline/configure/package.json
index fe244db2da..87f8716edc 100644
--- a/packages/math-inline/configure/package.json
+++ b/packages/math-inline/configure/package.json
@@ -11,7 +11,7 @@
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/mathquill": "^1.1.3",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.5",
     "debug": "^3.1.0",
     "prop-types": "^15.6.2",
diff --git a/packages/math-inline/controller/package.json b/packages/math-inline/controller/package.json
index 8ac26540db..a3be8d4244 100644
--- a/packages/math-inline/controller/package.json
+++ b/packages/math-inline/controller/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@pie-framework/math-validation": "^1.4.1",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   },
diff --git a/packages/math-inline/package.json b/packages/math-inline/package.json
index 9055104bc6..0c5c0945b3 100644
--- a/packages/math-inline/package.json
+++ b/packages/math-inline/package.json
@@ -14,7 +14,7 @@
     "@material-ui/core": "^3.9.2",
     "@pie-framework/mathquill": "^1.1.3",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "lodash": "^4.17.10",
diff --git a/packages/math-templated/configure/package.json b/packages/math-templated/configure/package.json
index ebdc8b76ec..14aa9174c7 100644
--- a/packages/math-templated/configure/package.json
+++ b/packages/math-templated/configure/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
diff --git a/packages/math-templated/controller/package.json b/packages/math-templated/controller/package.json
index 4133d0a210..dc070c5a88 100644
--- a/packages/math-templated/controller/package.json
+++ b/packages/math-templated/controller/package.json
@@ -7,7 +7,7 @@
   "module": "src/index.js",
   "dependencies": {
     "@pie-framework/math-validation": "^1.4.1",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   },
diff --git a/packages/math-templated/package.json b/packages/math-templated/package.json
index cfd37c0a39..3b4c6e103a 100644
--- a/packages/math-templated/package.json
+++ b/packages/math-templated/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
diff --git a/packages/matrix/configure/package.json b/packages/matrix/configure/package.json
index 712382660c..fe93894a86 100644
--- a/packages/matrix/configure/package.json
+++ b/packages/matrix/configure/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^4.1.1",
     "prop-types": "^15.6.2",
     "react": "^16.8.1",
diff --git a/packages/matrix/package.json b/packages/matrix/package.json
index 2482285e3f..28caf4ace8 100644
--- a/packages/matrix/package.json
+++ b/packages/matrix/package.json
@@ -12,7 +12,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^4.1.1",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
diff --git a/packages/multi-trait-rubric/configure/package.json b/packages/multi-trait-rubric/configure/package.json
index 40f89eb7bc..bbc8b9626c 100644
--- a/packages/multi-trait-rubric/configure/package.json
+++ b/packages/multi-trait-rubric/configure/package.json
@@ -8,7 +8,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
diff --git a/packages/multi-trait-rubric/controller/package.json b/packages/multi-trait-rubric/controller/package.json
index f3d2dbabef..4aa5c2f4f5 100644
--- a/packages/multi-trait-rubric/controller/package.json
+++ b/packages/multi-trait-rubric/controller/package.json
@@ -8,7 +8,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   }
diff --git a/packages/multi-trait-rubric/package.json b/packages/multi-trait-rubric/package.json
index 063e7f83ac..01359abfd4 100644
--- a/packages/multi-trait-rubric/package.json
+++ b/packages/multi-trait-rubric/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "clsx": "^1.1.1",
     "enzyme-to-json": "^3.3.5",
     "prop-types": "^15.6.1",
diff --git a/packages/multiple-choice/configure/package.json b/packages/multiple-choice/configure/package.json
index 7610f70c53..89a760239b 100644
--- a/packages/multiple-choice/configure/package.json
+++ b/packages/multiple-choice/configure/package.json
@@ -8,7 +8,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
diff --git a/packages/multiple-choice/controller/package.json b/packages/multiple-choice/controller/package.json
index 63798cdd49..fe0bff7f7f 100644
--- a/packages/multiple-choice/controller/package.json
+++ b/packages/multiple-choice/controller/package.json
@@ -8,7 +8,7 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   }
diff --git a/packages/multiple-choice/package.json b/packages/multiple-choice/package.json
index 16691f96a5..575b7ea6b7 100644
--- a/packages/multiple-choice/package.json
+++ b/packages/multiple-choice/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.5",
     "debug": "^4.1.1",
     "enzyme-to-json": "^3.3.3",
diff --git a/packages/number-line/configure/package.json b/packages/number-line/configure/package.json
index 87e56eb51f..813f14245f 100644
--- a/packages/number-line/configure/package.json
+++ b/packages/number-line/configure/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "lodash": "^4.17.15",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
diff --git a/packages/number-line/controller/package.json b/packages/number-line/controller/package.json
index 6830698734..a806d5c7c9 100644
--- a/packages/number-line/controller/package.json
+++ b/packages/number-line/controller/package.json
@@ -14,7 +14,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "lodash": "^4.17.15",
     "mathjs": "^7.5.1"
   },
diff --git a/packages/number-line/package.json b/packages/number-line/package.json
index 991d211e46..bb02877d05 100644
--- a/packages/number-line/package.json
+++ b/packages/number-line/package.json
@@ -8,7 +8,7 @@
   },
   "dependencies": {
     "@material-ui/core": "^3.9.2",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.5",
     "d3-scale": "^3.2.1",
     "d3-selection": "^1.4.1",
diff --git a/packages/passage/configure/package.json b/packages/passage/configure/package.json
index a551c6582c..be35d68389 100644
--- a/packages/passage/configure/package.json
+++ b/packages/passage/configure/package.json
@@ -10,7 +10,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
     "react": "^16.8.1",
diff --git a/packages/passage/package.json b/packages/passage/package.json
index 75b71aefb3..2c554c98f8 100644
--- a/packages/passage/package.json
+++ b/packages/passage/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.5",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
diff --git a/packages/placement-ordering/configure/package.json b/packages/placement-ordering/configure/package.json
index 99b800c1c7..b65de2f5d0 100644
--- a/packages/placement-ordering/configure/package.json
+++ b/packages/placement-ordering/configure/package.json
@@ -8,7 +8,7 @@
     "@material-ui/core": "^3.9.2",
     "@material-ui/icons": "^3.0.1",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "nested-property": "^0.0.7",
diff --git a/packages/placement-ordering/controller/package.json b/packages/placement-ordering/controller/package.json
index 099521519a..46f77e0eba 100644
--- a/packages/placement-ordering/controller/package.json
+++ b/packages/placement-ordering/controller/package.json
@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "module": "src/index.js",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^3.1.0",
     "js-combinatorics": "^0.5.4",
     "lodash": "^4.17.19"
diff --git a/packages/placement-ordering/package.json b/packages/placement-ordering/package.json
index 1dd46b955f..9b5e952064 100644
--- a/packages/placement-ordering/package.json
+++ b/packages/placement-ordering/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^4.1.1",
     "decimal.js": "^10.0.0",
     "lodash": "^4.17.10",
diff --git a/packages/protractor/package.json b/packages/protractor/package.json
index cc4f5c6444..d7d422687e 100644
--- a/packages/protractor/package.json
+++ b/packages/protractor/package.json
@@ -10,7 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "@material-ui/core": "^3.9.2",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "classnames": "^2.2.5",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
diff --git a/packages/rubric/configure/package.json b/packages/rubric/configure/package.json
index 148b68859c..2b0684824c 100644
--- a/packages/rubric/configure/package.json
+++ b/packages/rubric/configure/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^4.1.1",
     "react": "^16.8.6",
     "react-dom": "^16.8.6"
diff --git a/packages/rubric/controller/package.json b/packages/rubric/controller/package.json
index 7a193f8d62..c49da8e9bf 100644
--- a/packages/rubric/controller/package.json
+++ b/packages/rubric/controller/package.json
@@ -7,7 +7,7 @@
     "test": "./node_modules/.bin/jest"
   },
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "lodash": "^4.17.15"
   }
 }
diff --git a/packages/rubric/package.json b/packages/rubric/package.json
index 1b1c1f5d48..4f222efc37 100644
--- a/packages/rubric/package.json
+++ b/packages/rubric/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@material-ui/core": "^3.9.2",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "prop-types": "^15.7.2"
   },
   "author": "pie framework developers",
diff --git a/packages/ruler/configure/package.json b/packages/ruler/configure/package.json
index 17c25e76c8..052f7d8793 100644
--- a/packages/ruler/configure/package.json
+++ b/packages/ruler/configure/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0"
+    "@pie-lib/pie-toolbox": "2.22.0"
   },
   "author": "",
   "license": "ISC"
diff --git a/packages/ruler/package.json b/packages/ruler/package.json
index ab7ecb981b..3ac5170798 100644
--- a/packages/ruler/package.json
+++ b/packages/ruler/package.json
@@ -11,7 +11,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
diff --git a/packages/select-text/configure/package.json b/packages/select-text/configure/package.json
index a0cfd9356e..c6fffa00da 100644
--- a/packages/select-text/configure/package.json
+++ b/packages/select-text/configure/package.json
@@ -8,7 +8,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-configure-events": "^1.3.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15",
     "prop-types": "^15.6.2",
diff --git a/packages/select-text/controller/package.json b/packages/select-text/controller/package.json
index 4da1ad6435..9cb8d08e80 100644
--- a/packages/select-text/controller/package.json
+++ b/packages/select-text/controller/package.json
@@ -6,7 +6,7 @@
   "main": "lib/index.js",
   "module": "src/index.js",
   "dependencies": {
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "debug": "^3.1.0",
     "lodash": "^4.17.15"
   },
diff --git a/packages/select-text/package.json b/packages/select-text/package.json
index cafe28f801..3fbf721031 100644
--- a/packages/select-text/package.json
+++ b/packages/select-text/package.json
@@ -9,7 +9,7 @@
   "dependencies": {
     "@material-ui/core": "^3.9.2",
     "@pie-framework/pie-player-events": "^0.1.0",
-    "@pie-lib/pie-toolbox": "2.21.0",
+    "@pie-lib/pie-toolbox": "2.22.0",
     "prop-types": "^15.6.1",
     "react": "^16.8.1",
     "react-dom": "^16.8.1"
diff --git a/pslb/pslb.config.js b/pslb/pslb.config.js
index 15377950fd..856a3c3ca9 100644
--- a/pslb/pslb.config.js
+++ b/pslb/pslb.config.js
@@ -46,7 +46,7 @@ module.exports = {
   libs: {
     repository: 'pie-framework/pie-elements',
     packages: [
-      { name: '@pie-lib/pie-toolbox-module', version: '8.2.0' }
+      { name: '@pie-lib/pie-toolbox-module', version: '8.3.0' }
     ],
   },
 };
diff --git a/yarn.lock b/yarn.lock
index c0484685af..a87a61e957 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2276,10 +2276,10 @@
   resolved "https://registry.yarnpkg.com/@pie-framework/pie-player-events/-/pie-player-events-0.1.0.tgz#0150904118fd604559982ab658967811c053ffe3"
   integrity sha512-6H1tlRGmcZ3Wt+8HMqu5KugVcwwyNrMylfI5rIpvOSt0T82QDmjRj+2sPgQG5zos/w6MtwUqn/QZ+8Rq2EXSOA==
 
-"@pie-lib/pie-toolbox@2.21.0":
-  version "2.21.0"
-  resolved "https://registry.yarnpkg.com/@pie-lib/pie-toolbox/-/pie-toolbox-2.21.0.tgz#b4f27dd942491e2ededc5dcab8df5381c7652bc1"
-  integrity sha512-g5J51m8FbzfiKYsZBzF6rvzH5lsFV4hdoIu3c66f4tGSbfoyh1Vwa2TwfdLnh1JiZo+24yD/X07xbI6k9h54Vg==
+"@pie-lib/pie-toolbox@2.22.0":
+  version "2.22.0"
+  resolved "https://registry.yarnpkg.com/@pie-lib/pie-toolbox/-/pie-toolbox-2.22.0.tgz#38797a0b419b3ae155c5555d2dc64f54d48141c6"
+  integrity sha512-Fe0+YG1Mr13/4Paj8rmN2XKHnVnfZgOrUvRMoYSdBqjcVsA48FuM3B4G5qxx10B1CYGejfBS/Ta5C/5nnqv+Gw==
   dependencies:
     "@mapbox/point-geometry" "^0.1.0"
     "@material-ui/core" "^3.8.3"