@pie-element/select-text 6.5.3-next.583 → 6.5.3-next.598

package/lib/main.js

@@ -68,7 +68,7 @@ var Main = /*#__PURE__*/function (_React$Component) {
       });
     });
     (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "correctAnswer", function () {
-      var model = _this.props.model;
+      var model = _this.state.model;
       return model.tokens.filter(function (t) {
         return t.correct;
       });
@@ -97,8 +97,7 @@ var Main = /*#__PURE__*/function (_React$Component) {
           classes = _this$props.classes;
       var _this$state = this.state,
           showCorrectAnswer = _this$state.showCorrectAnswer,
-          model = _this$state.model; // const model = generateTokens(this.props.model)
-
+          model = _this$state.model;
       var selectedTokens = showCorrectAnswer ? this.correctAnswer() : session.selectedTokens;
       log('[render] selectedTokens:', selectedTokens);
       return /*#__PURE__*/_react["default"].createElement("div", {
@@ -127,7 +126,22 @@ var Main = /*#__PURE__*/function (_React$Component) {
         text: model.text,
         tokens: model.tokens,
         selectedTokens: selectedTokens,
-        onChange: onSelectionChange,
+        onChange: function onChange(selection) {
+          var newSelections = selection.map(function (select) {
+            var token = model.tokens.find(function (_ref) {
+              var start = _ref.start,
+                  end = _ref.end;
+              return select.start === start && select.end === end;
+            }); // needed for getScore when tokens position is recalculated, to keep oldStart and oldEnd
+
+            if (token) {
+              return token;
+            }
+
+            return select;
+          });
+          onSelectionChange(newSelections);
+        },
         highlightChoices: model.highlightChoices,
         maxNoOfSelections: model.maxSelections,
         animationsDisabled: model.animationsDisabled

package/lib/main.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/main.jsx"],"names":["log","Types","model","PropTypes","object","session","onSelectionChange","func","isRequired","Main","props","setState","showCorrectAnswer","state","tokens","filter","t","correct","alwaysShowCorrect","nextProps","classes","selectedTokens","correctAnswer","mainContainer","teacherInstructions","animationsDisabled","hidden","visible","collapsible","prompt","disabled","incorrect","toggleShowCorrect","textSelect","text","highlightChoices","maxSelections","rationale","correctness","feedback","React","Component","StyledMain","theme","paddingLeft","spacing","unit","paddingRight","paddingBottom","color","backgroundColor","background","marginBottom","marginTop","whiteSpace","verticalAlign","paddingTop","Stateful","change"],"mappings":"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","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { TextSelect } from '@pie-lib/text-select';\nimport CorrectAnswerToggle from '@pie-lib/correct-answer-toggle';\nimport { color, Feedback, Collapsible, hasText, PreviewPrompt } from '@pie-lib/render-ui';\nimport { withStyles } from '@material-ui/core/styles';\nimport generateModel from './utils';\n\nimport debug from 'debug';\n\nconst log = debug('@pie-ui:select-text');\n\nconst Types = {\n  model: PropTypes.object,\n  session: PropTypes.object,\n  onSelectionChange: PropTypes.func.isRequired\n};\n\nexport class Main extends React.Component {\n  static propTypes = { ...Types, classes: PropTypes.object.isRequired };\n\n  static defaultProps = {};\n\n  constructor(props) {\n    super(props);\n\n    this.state = {\n      showCorrectAnswer: this.props.model.alwaysShowCorrect || false,\n      model: generateModel(props.model)\n    };\n  }\n\n  UNSAFE_componentWillReceiveProps(nextProps) {\n    this.setState({\n      showCorrectAnswer: !!nextProps.model.alwaysShowCorrect,\n      model: generateModel(nextProps.model)\n    });\n  }\n\n  toggleShowCorrect = () => {\n    this.setState({ showCorrectAnswer: !this.state.showCorrectAnswer });\n  };\n\n  correctAnswer = () => {\n    const { model } = this.props;\n\n    return model.tokens.filter(t => t.correct);\n  };\n\n  render() {\n    const { session, onSelectionChange, classes } = this.props;\n    const { showCorrectAnswer, model } = this.state;\n\n    // const model = generateTokens(this.props.model)\n\n    const selectedTokens = showCorrectAnswer\n      ? this.correctAnswer()\n      : session.selectedTokens;\n\n    log('[render] selectedTokens:', selectedTokens);\n\n    return (\n      <div className={classes.mainContainer}>\n        {\n          model.teacherInstructions && hasText(model.teacherInstructions) && (\n            <React.Fragment>\n              {!model.animationsDisabled ? <Collapsible\n                  labels={{hidden: 'Show Teacher Instructions', visible: 'Hide Teacher Instructions'}}\n                  className={classes.collapsible}\n                >\n                  <PreviewPrompt prompt={model.teacherInstructions}/>\n\n                </Collapsible>\n                : <PreviewPrompt prompt={model.teacherInstructions}/>}\n\n                <br />\n                </React.Fragment>\n          )\n        }\n        <div className={classes.prompt}>\n          <PreviewPrompt prompt={model.prompt}/>\n        </div>\n        {!model.alwaysShowCorrect && (\n          <CorrectAnswerToggle\n            show={model.disabled && model.incorrect}\n            toggled={showCorrectAnswer}\n            onToggle={this.toggleShowCorrect}\n          />\n        )}\n        <TextSelect\n          className={classes.textSelect}\n          disabled={model.disabled}\n          text={model.text}\n          tokens={model.tokens}\n          selectedTokens={selectedTokens}\n          onChange={onSelectionChange}\n          highlightChoices={model.highlightChoices}\n          maxNoOfSelections={model.maxSelections}\n          animationsDisabled={model.animationsDisabled}\n        />\n        {\n          model.rationale && hasText(model.rationale) && (\n            <React.Fragment>\n              {!model.animationsDisabled ? <Collapsible\n                  labels={{hidden: 'Show Rationale', visible: 'Hide Rationale'}} className={classes.collapsible}\n                  className={classes.collapsible}\n                >\n                  <PreviewPrompt prompt={model.rationale}/>\n                </Collapsible>\n                : <PreviewPrompt prompt={model.rationale}/>\n              }\n            </React.Fragment>)\n        }\n        {model.correctness && model.feedback && !showCorrectAnswer && (\n          <Feedback correctness={model.correctness} feedback={model.feedback}/>\n        )}\n      </div>\n    );\n  }\n}\n\nconst StyledMain = withStyles(theme => ({\n  mainContainer: {\n    paddingLeft: theme.spacing.unit,\n    paddingRight: theme.spacing.unit,\n    paddingBottom: theme.spacing.unit,\n    color: color.text(),\n    backgroundColor: color.background()\n  },\n  textSelect: {\n    marginBottom: theme.spacing.unit,\n    marginTop: theme.spacing.unit,\n    whiteSpace: 'normal'\n  },\n  prompt: {\n    verticalAlign: 'middle',\n    marginBottom: theme.spacing.unit\n  },\n  collapsible: {\n    paddingTop: theme.spacing.unit * 2,\n    paddingBottom: theme.spacing.unit * 3\n  }\n}))(Main);\n\nexport default class Stateful extends React.Component {\n  static propTypes = Types;\n\n  constructor(props) {\n    super(props);\n    this.state = {\n      model: props.model,\n      session: props.session\n    };\n  }\n\n  UNSAFE_componentWillReceiveProps(nextProps) {\n    this.setState({ model: nextProps.model, session: nextProps.session });\n  }\n\n  change = selectedTokens => {\n    const session = { ...this.state.session, selectedTokens };\n    this.setState({ session }, () => {\n      this.props.onSelectionChange(this.state.session.selectedTokens);\n    });\n  };\n\n  render() {\n    const { model, session } = this.state;\n    return (\n      <StyledMain\n        model={model}\n        session={session}\n        onSelectionChange={this.change}\n      />\n    );\n  }\n}\n"],"file":"main.js"}
+{"version":3,"sources":["../src/main.jsx"],"names":["log","Types","model","PropTypes","object","session","onSelectionChange","func","isRequired","Main","props","setState","showCorrectAnswer","state","tokens","filter","t","correct","alwaysShowCorrect","nextProps","classes","selectedTokens","correctAnswer","mainContainer","teacherInstructions","animationsDisabled","hidden","visible","collapsible","prompt","disabled","incorrect","toggleShowCorrect","textSelect","text","selection","newSelections","map","select","token","find","start","end","highlightChoices","maxSelections","rationale","correctness","feedback","React","Component","StyledMain","theme","paddingLeft","spacing","unit","paddingRight","paddingBottom","color","backgroundColor","background","marginBottom","marginTop","whiteSpace","verticalAlign","paddingTop","Stateful","change"],"mappings":"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","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { TextSelect } from '@pie-lib/text-select';\nimport CorrectAnswerToggle from '@pie-lib/correct-answer-toggle';\nimport { color, Feedback, Collapsible, hasText, PreviewPrompt } from '@pie-lib/render-ui';\nimport { withStyles } from '@material-ui/core/styles';\nimport generateModel from './utils';\n\nimport debug from 'debug';\n\nconst log = debug('@pie-ui:select-text');\n\nconst Types = {\n  model: PropTypes.object,\n  session: PropTypes.object,\n  onSelectionChange: PropTypes.func.isRequired\n};\n\nexport class Main extends React.Component {\n  static propTypes = { ...Types, classes: PropTypes.object.isRequired };\n\n  static defaultProps = {};\n\n  constructor(props) {\n    super(props);\n\n    this.state = {\n      showCorrectAnswer: this.props.model.alwaysShowCorrect || false,\n      model: generateModel(props.model)\n    };\n  }\n\n  UNSAFE_componentWillReceiveProps(nextProps) {\n    this.setState({\n      showCorrectAnswer: !!nextProps.model.alwaysShowCorrect,\n      model: generateModel(nextProps.model)\n    });\n  }\n\n  toggleShowCorrect = () => {\n    this.setState({ showCorrectAnswer: !this.state.showCorrectAnswer });\n  };\n\n  correctAnswer = () => {\n    const { model } = this.state;\n\n    return model.tokens.filter(t => t.correct);\n  };\n\n  render() {\n    const { session, onSelectionChange, classes } = this.props;\n    const { showCorrectAnswer, model } = this.state;\n\n    const selectedTokens = showCorrectAnswer\n      ? this.correctAnswer()\n      : session.selectedTokens;\n\n    log('[render] selectedTokens:', selectedTokens);\n\n    return (\n      <div className={classes.mainContainer}>\n        {\n          model.teacherInstructions && hasText(model.teacherInstructions) && (\n            <React.Fragment>\n              {!model.animationsDisabled ? <Collapsible\n                  labels={{ hidden: 'Show Teacher Instructions', visible: 'Hide Teacher Instructions' }}\n                  className={classes.collapsible}\n                >\n                  <PreviewPrompt prompt={model.teacherInstructions}/>\n\n                </Collapsible>\n                : <PreviewPrompt prompt={model.teacherInstructions}/>}\n\n              <br/>\n            </React.Fragment>\n          )\n        }\n        <div className={classes.prompt}>\n          <PreviewPrompt prompt={model.prompt}/>\n        </div>\n        {!model.alwaysShowCorrect && (\n          <CorrectAnswerToggle\n            show={model.disabled && model.incorrect}\n            toggled={showCorrectAnswer}\n            onToggle={this.toggleShowCorrect}\n          />\n        )}\n        <TextSelect\n          className={classes.textSelect}\n          disabled={model.disabled}\n          text={model.text}\n          tokens={model.tokens}\n          selectedTokens={selectedTokens}\n          onChange={selection => {\n            const newSelections = selection.map(select => {\n              const token = model.tokens.find(({ start, end }) => select.start === start && select.end === end);\n\n              // needed for getScore when tokens position is recalculated, to keep oldStart and oldEnd\n              if (token) {\n                return token;\n              }\n\n              return select;\n            })\n\n            onSelectionChange(newSelections);\n          }}\n          highlightChoices={model.highlightChoices}\n          maxNoOfSelections={model.maxSelections}\n          animationsDisabled={model.animationsDisabled}\n        />\n        {\n          model.rationale && hasText(model.rationale) && (\n            <React.Fragment>\n              {!model.animationsDisabled ? <Collapsible\n                  labels={{ hidden: 'Show Rationale', visible: 'Hide Rationale' }} className={classes.collapsible}\n                  className={classes.collapsible}\n                >\n                  <PreviewPrompt prompt={model.rationale}/>\n                </Collapsible>\n                : <PreviewPrompt prompt={model.rationale}/>\n              }\n            </React.Fragment>)\n        }\n        {model.correctness && model.feedback && !showCorrectAnswer && (\n          <Feedback correctness={model.correctness} feedback={model.feedback}/>\n        )}\n      </div>\n    );\n  }\n}\n\nconst StyledMain = withStyles(theme => ({\n  mainContainer: {\n    paddingLeft: theme.spacing.unit,\n    paddingRight: theme.spacing.unit,\n    paddingBottom: theme.spacing.unit,\n    color: color.text(),\n    backgroundColor: color.background()\n  },\n  textSelect: {\n    marginBottom: theme.spacing.unit,\n    marginTop: theme.spacing.unit,\n    whiteSpace: 'normal'\n  },\n  prompt: {\n    verticalAlign: 'middle',\n    marginBottom: theme.spacing.unit\n  },\n  collapsible: {\n    paddingTop: theme.spacing.unit * 2,\n    paddingBottom: theme.spacing.unit * 3\n  }\n}))(Main);\n\nexport default class Stateful extends React.Component {\n  static propTypes = Types;\n\n  constructor(props) {\n    super(props);\n    this.state = {\n      model: props.model,\n      session: props.session\n    };\n  }\n\n  UNSAFE_componentWillReceiveProps(nextProps) {\n    this.setState({ model: nextProps.model, session: nextProps.session });\n  }\n\n  change = selectedTokens => {\n    const session = { ...this.state.session, selectedTokens };\n    this.setState({ session }, () => {\n      this.props.onSelectionChange(this.state.session.selectedTokens);\n    });\n  };\n\n  render() {\n    const { model, session } = this.state;\n    return (\n      <StyledMain\n        model={model}\n        session={session}\n        onSelectionChange={this.change}\n      />\n    );\n  }\n}\n"],"file":"main.js"}

package/lib/utils.js

@@ -90,7 +90,10 @@ var _default = function _default(model) {
     return [].concat((0, _toConsumableArray2["default"])(acc), [_objectSpread(_objectSpread({}, token), {}, {
       text: tokenText,
       start: newStart,
-      end: newEnd
+      end: newEnd,
+      // needed for getScore when tokens position is recalculated
+      oldStart: token.start,
+      oldEnd: token.end
     })]);
   }, []);
   return _objectSpread(_objectSpread({}, model), {}, {

package/lib/utils.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/utils.js"],"names":["createElementFromHTML","htmlString","arguments","length","undefined","div","document","createElement","innerHTML","trim","parseParagraph","paragraph","end","concat","parseParagraphs","dom","paragraphs","querySelectorAll","str","forEach","par","index","prepareText","text","txtDom","allDomElements","Array","from","model","modelText","newTokens","tokens","reduce","acc","token","tokenText","slice","start","getStartIndex","newStartIndex","indexOf","lastToken","newStart","newEnd"],"mappings":"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","sourcesContent":["import React from 'react';\n\nvar createElementFromHTML = function createElementFromHTML() {\n  var htmlString = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';\n  var div = document.createElement('div');\n  div.innerHTML = htmlString.trim();\n  return div;\n};\n\nvar parseParagraph = function parseParagraph(paragraph, end) {\n  if (end) {\n    return paragraph.innerHTML;\n  }\n\n  return ''.concat(paragraph.innerHTML, '\\n\\n');\n};\n\nvar parseParagraphs = function parseParagraphs(dom) {\n  var paragraphs = dom.querySelectorAll('div[separator=true]'); // separate variable for easily debugging, if needed\n\n  var str = '';\n  paragraphs.forEach(function (par, index) {\n    str += parseParagraph(par, index === paragraphs.length - 1);\n  });\n  return str || null;\n};\n\nvar prepareText = function prepareText(text) {\n  var txtDom = createElementFromHTML(text);\n\n  var div = document.createElement('div');\n  div.innerHTML = '<div separator=\\'true\\'>'.concat(txtDom.innerHTML, '</div>');\n  txtDom = div;\n\n  var allDomElements = Array.from(txtDom.querySelectorAll('*'));\n\n  if (allDomElements.length === 0) {\n    return text;\n  }\n\n  return parseParagraphs(txtDom);\n};\n\nexport default (model) => {\n  if (!model) return model;\n\n  // parsing\n  const modelText = prepareText(model.text || '');\n\n  const newTokens = (model.tokens || []).reduce((acc, token = {}) => {\n    const tokenText = prepareText((model.text || '').slice(token.start, token.end));\n\n    if (!tokenText) {\n      return [...acc, token];\n    }\n\n    const getStartIndex = (start) => {\n      let length = start;\n\n      while (length >= 0) {\n        let newStartIndex = modelText.slice(length).indexOf(tokenText);\n\n        if (newStartIndex >= 0) {\n          return newStartIndex + length;\n        }\n\n        length--;\n      }\n\n      return 0;\n    };\n\n    const lastToken = acc[acc.length - 1];\n    const newStart = getStartIndex(lastToken ? lastToken.end : token.start);\n    const newEnd = newStart + tokenText.length;\n\n    return [\n      ...acc,\n      {\n        ...token,\n        text: tokenText,\n        start: newStart,\n        end: newEnd\n      }\n    ];\n  }, []);\n\n\n  return {\n    ...model,\n    tokens: newTokens,\n    text: modelText\n  }\n}\n"],"file":"utils.js"}
+{"version":3,"sources":["../src/utils.js"],"names":["createElementFromHTML","htmlString","arguments","length","undefined","div","document","createElement","innerHTML","trim","parseParagraph","paragraph","end","concat","parseParagraphs","dom","paragraphs","querySelectorAll","str","forEach","par","index","prepareText","text","txtDom","allDomElements","Array","from","model","modelText","newTokens","tokens","reduce","acc","token","tokenText","slice","start","getStartIndex","newStartIndex","indexOf","lastToken","newStart","newEnd","oldStart","oldEnd"],"mappings":"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","sourcesContent":["import React from 'react';\n\nvar createElementFromHTML = function createElementFromHTML() {\n  var htmlString = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';\n  var div = document.createElement('div');\n  div.innerHTML = htmlString.trim();\n  return div;\n};\n\nvar parseParagraph = function parseParagraph(paragraph, end) {\n  if (end) {\n    return paragraph.innerHTML;\n  }\n\n  return ''.concat(paragraph.innerHTML, '\\n\\n');\n};\n\nvar parseParagraphs = function parseParagraphs(dom) {\n  var paragraphs = dom.querySelectorAll('div[separator=true]'); // separate variable for easily debugging, if needed\n\n  var str = '';\n  paragraphs.forEach(function (par, index) {\n    str += parseParagraph(par, index === paragraphs.length - 1);\n  });\n  return str || null;\n};\n\nvar prepareText = function prepareText(text) {\n  var txtDom = createElementFromHTML(text);\n\n  var div = document.createElement('div');\n  div.innerHTML = '<div separator=\\'true\\'>'.concat(txtDom.innerHTML, '</div>');\n  txtDom = div;\n\n  var allDomElements = Array.from(txtDom.querySelectorAll('*'));\n\n  if (allDomElements.length === 0) {\n    return text;\n  }\n\n  return parseParagraphs(txtDom);\n};\n\nexport default (model) => {\n  if (!model) return model;\n\n  // parsing\n  const modelText = prepareText(model.text || '');\n\n  const newTokens = (model.tokens || []).reduce((acc, token = {}) => {\n    const tokenText = prepareText((model.text || '').slice(token.start, token.end));\n\n    if (!tokenText) {\n      return [...acc, token];\n    }\n\n    const getStartIndex = (start) => {\n      let length = start;\n\n      while (length >= 0) {\n        let newStartIndex = modelText.slice(length).indexOf(tokenText);\n\n        if (newStartIndex >= 0) {\n          return newStartIndex + length;\n        }\n\n        length--;\n      }\n\n      return 0;\n    };\n\n    const lastToken = acc[acc.length - 1];\n    const newStart = getStartIndex(lastToken ? lastToken.end : token.start);\n    const newEnd = newStart + tokenText.length;\n\n    return [\n      ...acc,\n      {\n        ...token,\n        text: tokenText,\n        start: newStart,\n        end: newEnd,\n        // needed for getScore when tokens position is recalculated\n        oldStart: token.start,\n        oldEnd: token.end\n      }\n    ];\n  }, []);\n\n\n  return {\n    ...model,\n    tokens: newTokens,\n    text: modelText\n  };\n};\n"],"file":"utils.js"}

package/module/configure.js

@@ -2650,7 +2650,9 @@ var generateModel = model => {
       ...token,
       text: tokenText,
       start: newStart,
-      end: newEnd
+      end: newEnd,
+      oldStart: token.start,
+      oldEnd: token.end
     }];
   }, []);
   return {

package/module/controller.js

@@ -18993,7 +18993,12 @@ const getCorrectness = (tokens, selected) => {
 const getCorrectSelected = (tokens, selected) => {
   return (selected || []).filter((s) => {
     const index = tokens.findIndex((c) => {
-      return c.correct && c.start === s.start && c.end === s.end;
+      return c.correct &&
+        (
+          (c.start === s.start && c.end === s.end) ||
+          // this case is used for the cases when the token's start & end were recalculated
+          (c.start === s.oldStart && c.end === s.oldEnd)
+        );
     });
     return index !== -1;
   });

package/module/demo.js

@@ -61,7 +61,7 @@ const base = extras =>
   Object.assign(
     {},
     {
-      highlightChoices: true,
+      // highlightChoices: true,
       feedback: {
         correct: {
           type: 'default',
@@ -211,375 +211,57 @@ generate.htmlAscii = (id, element) => ({
 
 generate.model = (id, element) => {
   return Object.assign({}, { id, element }, base(     {
+    // "id": "8a808081701d693801703174fb900421",
+    "teacherInstructions": "",
     "partialScoring": true,
+    "prompt": "<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": [
       {
-        "correct": false,
+        "text": "She thought about what she had to do, struggling to rein in her wild, fearful thoughts.",
+        "end": 90,
         "start": 3,
-        "end": 6,
-        "text": "Our"
-      },
-      {
-        "correct": false,
-        "start": 7,
-        "end": 16,
-        "text": "challenge"
+        "correct": false
       },
       {
-        "correct": false,
-        "start": 18,
-        "end": 21,
-        "text": "not"
-      },
-      {
-        "correct": false,
-        "start": 22,
-        "end": 30,
-        "text": "tomorrow"
-      },
-      {
-        "correct": false,
-        "start": 31,
-        "end": 34,
-        "text": "but"
-      },
-      {
-        "correct": false,
-        "start": 35,
-        "end": 40,
-        "text": "today"
-      },
-      {
-        "correct": false,
-        "start": 42,
-        "end": 44,
-        "text": "is"
-      },
-      {
-        "correct": false,
-        "start": 45,
-        "end": 47,
-        "text": "to"
-      },
-      {
-        "correct": false,
-        "start": 48,
-        "end": 58,
-        "text": "accomplish"
-      },
-      {
-        "correct": false,
-        "start": 59,
-        "end": 69,
-        "text": "objectives"
-      },
-      {
-        "correct": false,
-        "start": 70,
-        "end": 75,
-        "text": "which"
-      },
-      {
-        "correct": false,
-        "start": 76,
-        "end": 80,
-        "text": "have"
-      },
-      {
-        "correct": false,
-        "start": 81,
-        "end": 87,
-        "text": "eluded"
-      },
-      {
-        "correct": false,
-        "start": 88,
-        "end": 95,
-        "text": "mankind"
-      },
-      {
-        "correct": false,
-        "start": 96,
-        "end": 101,
-        "text": "since"
+        "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,
-        "start": 102,
-        "end": 105,
-        "text": "the"
+        "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": 106,
-        "end": 115,
-        "text": "beginning"
+        "start": 628
       },
       {
+        "text": "Suddenly, the din of the gymnasium was silent to her.",
+        "end": 997,
         "correct": false,
-        "start": 116,
-        "end": 118,
-        "text": "of"
+        "start": 944
       },
       {
+        "end": 1087,
+        "start": 998,
         "correct": false,
-        "start": 119,
-        "end": 123,
-        "text": "time"
-      },
-      {
-        "correct": false,
-        "start": 125,
-        "end": 127,
-        "text": "We"
-      },
-      {
-        "correct": false,
-        "start": 128,
-        "end": 132,
-        "text": "must"
-      },
-      {
-        "correct": false,
-        "start": 133,
-        "end": 138,
-        "text": "bring"
-      },
-      {
-        "correct": false,
-        "start": 139,
-        "end": 144,
-        "text": "equal"
-      },
-      {
-        "correct": false,
-        "start": 145,
-        "end": 152,
-        "text": "justice"
-      },
-      {
-        "correct": false,
-        "start": 153,
-        "end": 155,
-        "text": "to"
-      },
-      {
-        "correct": false,
-        "start": 156,
-        "end": 159,
-        "text": "all"
-      },
-      {
-        "correct": false,
-        "start": 160,
-        "end": 163,
-        "text": "our"
-      },
-      {
-        "correct": false,
-        "start": 164,
-        "end": 172,
-        "text": "citizens"
-      },
-      {
-        "correct": false,
-        "start": 174,
-        "end": 176,
-        "text": "We"
-      },
-      {
-        "correct": false,
-        "start": 177,
-        "end": 181,
-        "text": "must"
-      },
-      {
-        "correct": false,
-        "start": 182,
-        "end": 189,
-        "text": "abolish"
-      },
-      {
-        "correct": false,
-        "start": 190,
-        "end": 195,
-        "text": "human"
+        "text": "Forcing all sound out of her mind, she focused on the gleaming balance beam ahead of her."
       },
       {
         "correct": true,
-        "start": 196,
-        "end": 203,
-        "text": "poverty"
-      },
-      {
-        "correct": false,
-        "start": 205,
-        "end": 207,
-        "text": "We"
-      },
-      {
-        "correct": false,
-        "start": 208,
-        "end": 212,
-        "text": "must"
-      },
-      {
-        "correct": false,
-        "start": 213,
-        "end": 222,
-        "text": "eradicate"
-      },
-      {
-        "correct": false,
-        "start": 223,
-        "end": 230,
-        "text": "killing"
-      },
-      {
-        "correct": false,
-        "start": 231,
-        "end": 234,
-        "text": "and"
-      },
-      {
-        "correct": false,
-        "start": 235,
-        "end": 244,
-        "text": "crippling"
-      },
-      {
-        "correct": true,
-        "start": 245,
-        "end": 252,
-        "text": "disease"
-      },
-      {
-        "correct": false,
-        "start": 253,
-        "end": 256,
-        "text": "and"
-      },
-      {
-        "correct": false,
-        "start": 257,
-        "end": 265,
-        "text": "lengthen"
-      },
-      {
-        "correct": false,
-        "start": 266,
-        "end": 269,
-        "text": "the"
-      },
-      {
-        "correct": false,
-        "start": 270,
-        "end": 274,
-        "text": "span"
-      },
-      {
-        "correct": false,
-        "start": 275,
-        "end": 277,
-        "text": "of"
-      },
-      {
-        "correct": false,
-        "start": 278,
-        "end": 282,
-        "text": "life"
-      },
-      {
-        "correct": false,
-        "start": 283,
-        "end": 285,
-        "text": "to"
-      },
-      {
-        "correct": false,
-        "start": 286,
-        "end": 289,
-        "text": "100"
-      },
-      {
-        "correct": false,
-        "start": 290,
-        "end": 292,
-        "text": "or"
-      },
-      {
-        "correct": false,
-        "start": 293,
-        "end": 296,
-        "text": "200"
-      },
-      {
-        "correct": false,
-        "start": 297,
-        "end": 302,
-        "text": "years"
-      },
-      {
-        "correct": false,
-        "start": 304,
-        "end": 306,
-        "text": "We"
-      },
-      {
-        "correct": false,
-        "start": 307,
-        "end": 311,
-        "text": "must"
-      },
-      {
-        "correct": false,
-        "start": 312,
-        "end": 321,
-        "text": "eliminate"
-      },
-      {
-        "correct": true,
-        "start": 322,
-        "end": 332,
-        "text": "illiteracy"
-      },
-      {
-        "correct": false,
-        "start": 333,
-        "end": 338,
-        "text": "among"
-      },
-      {
-        "correct": false,
-        "start": 339,
-        "end": 342,
-        "text": "all"
-      },
-      {
-        "correct": false,
-        "start": 343,
-        "end": 345,
-        "text": "of"
-      },
-      {
-        "correct": false,
-        "start": 346,
-        "end": 349,
-        "text": "our"
-      },
-      {
-        "correct": false,
-        "start": 350,
-        "end": 356,
-        "text": "people"
+        "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",
-    "text": "<p>Our challenge, not tomorrow but today, is to accomplish objectives which have eluded mankind since the beginning of time. We must bring equal justice to all our citizens. We must abolish human poverty. We must eradicate killing and crippling disease and lengthen the span of life to 100 or 200 years. We must eliminate illiteracy among all of our people.</p>\n",
-    "prompt": "<p>Select the <span class=\"relative-emphasis\">three</span> words from below that specifically describe the &#8220;enemies&#8221; which Johnson wants to eliminate.</p>",
-    "rationale": "<p>In paragraph 6, Johnson refers to the &#8220;ancient enemies&#8221;&#8212;which he defines as poverty, disease, illiteracy, strife, and bigotry. In paragraph 3, he talks about this idea by explaining that he wants to &#8220;accomplish objectives which have eluded mankind;&#8221; that is, to eliminate these enemies.</p>",
     // "element": "select-text",
-    "maxSelections": 3
+    "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"
   }  ));
 };