@pie-element/ebsr 7.0.22 → 7.0.24-next.2

package/{module → configure/node_modules/@pie-element/multiple-choice/module}/print.js

@@ -1,5 +1,5 @@
-import {_dll_prop_types, _dll_react_dom, _dll_react, _dll_material_ui__core_styles, _dll_pie_lib__render_ui, _dll_material_ui__core, _dll_classnames, _dll_pie_lib__correct_answer_toggle, _dll_lodash, _dll_debug} from "../../../@pie-lib/shared-module@^1.4.13/module/index.js";
-import {_dll_pie_lib__math_rendering} from "../../../@pie-lib/math-rendering-module@^1.1.1/module/index.js";
+import {_dll_prop_types, _dll_react_dom, _dll_react, _dll_material_ui__core_styles, _dll_pie_lib__render_ui, _dll_material_ui__core, _dll_classnames, _dll_pie_lib__correct_answer_toggle, _dll_lodash, _dll_debug} from "../../../@pie-lib/shared-module@^1.4.17/module/index.js";
+import {_dll_pie_lib__math_rendering} from "../../../@pie-lib/math-rendering-module@^1.1.5/module/index.js";
 function getDefaultExportFromCjs(x) {
   return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
 }
@@ -1259,6 +1259,7 @@ const {color: color$1} = _dll_pie_lib__render_ui;
 const {PreviewPrompt: PreviewPrompt$1} = _dll_pie_lib__render_ui;
 const classNames$3 = _dll_classnames;
 const _jsxFileName$3 = "/home/circleci/repo/packages/multiple-choice/src/choice-input.jsx";
+const CLASS_NAME = 'multiple-choice-component';
 const styleSheet = () => ({
   row: {
     display: 'flex',
@@ -1273,6 +1274,11 @@ const styleSheet = () => ({
     '& label': {
       color: color$1.text()
     }
+  },
+  horizontalLayout: {
+    [`& .${CLASS_NAME}`]: {
+      paddingRight: '8px'
+    }
   }
 });
 const formStyleSheet = {
@@ -1291,10 +1297,9 @@ const StyledFormControlLabel = withStyles$3(formStyleSheet, {
   __self: undefined,
   __source: {
     fileName: _jsxFileName$3,
-    lineNumber: 39
+    lineNumber: 46
   }
 }));
-const CLASS_NAME = 'multiple-choice-component';
 const colorStyle = (varName, fallback) => ({
   [`&.${CLASS_NAME}`]: {
     color: `var(--choice-input-${varName}, ${fallback}) !important`
@@ -1346,7 +1351,7 @@ const StyledCheckbox = withStyles$3(inputStyles)(props => {
     __self: undefined,
     __source: {
       fileName: _jsxFileName$3,
-      lineNumber: 92
+      lineNumber: 97
     }
   });
 });
@@ -1375,7 +1380,7 @@ const StyledRadio = withStyles$3(inputStyles)(props => {
     __self: undefined,
     __source: {
       fileName: _jsxFileName$3,
-      lineNumber: 125
+      lineNumber: 130
     }
   });
 });
@@ -1396,7 +1401,8 @@ class ChoiceInput extends React$4.Component {
       classes: PropTypes$3.object,
       className: PropTypes$3.string,
       hideTick: PropTypes$3.bool,
-      isEvaluateMode: PropTypes$3.bool
+      isEvaluateMode: PropTypes$3.bool,
+      choicesLayout: PropTypes$3.oneOf(['vertical', 'grid', 'horizontal'])
     };
   }
   static __initStatic2() {
@@ -1418,36 +1424,39 @@ class ChoiceInput extends React$4.Component {
     });
   }
   render() {
-    const {choiceMode, disabled, displayKey, feedback, label, checked, correctness, classes, className, rationale, accessibility, hideTick, isEvaluateMode} = this.props;
+    const {choiceMode, disabled, displayKey, feedback, label, checked, correctness, classes, className, rationale, accessibility, hideTick, isEvaluateMode, choicesLayout} = this.props;
     const Tag = choiceMode === 'checkbox' ? StyledCheckbox : StyledRadio;
     const classSuffix = choiceMode === 'checkbox' ? 'checkbox' : 'radio-button';
+    const holderClassNames = classNames$3(classes.checkboxHolder, {
+      [classes.horizontalLayout]: choicesLayout === 'horizontal'
+    });
     return React$4.createElement('div', {
       className: classNames$3(className, 'corespring-' + classSuffix, 'choice-input'),
       __self: this,
       __source: {
         fileName: _jsxFileName$3,
-        lineNumber: 197
+        lineNumber: 208
       }
     }, React$4.createElement('div', {
       className: classes.row,
       __self: this,
       __source: {
         fileName: _jsxFileName$3,
-        lineNumber: 198
+        lineNumber: 209
       }
     }, !hideTick && isEvaluateMode && React$4.createElement(FeedbackTick$1, {
       correctness: correctness,
       __self: this,
       __source: {
         fileName: _jsxFileName$3,
-        lineNumber: 199
+        lineNumber: 210
       }
     }), React$4.createElement('div', {
-      className: classNames$3(classes.checkboxHolder, 'checkbox-holder'),
+      className: classNames$3(holderClassNames, 'checkbox-holder'),
       __self: this,
       __source: {
         fileName: _jsxFileName$3,
-        lineNumber: 200
+        lineNumber: 211
       }
     }, React$4.createElement(StyledFormControlLabel, {
       disabled: disabled,
@@ -1460,13 +1469,13 @@ class ChoiceInput extends React$4.Component {
         __self: this,
         __source: {
           fileName: _jsxFileName$3,
-          lineNumber: 205
+          lineNumber: 216
         }
       }),
       __self: this,
       __source: {
         fileName: _jsxFileName$3,
-        lineNumber: 201
+        lineNumber: 212
       }
     }), React$4.createElement(PreviewPrompt$1, {
       className: "label",
@@ -1476,7 +1485,7 @@ class ChoiceInput extends React$4.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$3,
-        lineNumber: 213
+        lineNumber: 224
       }
     }))), rationale && React$4.createElement(PreviewPrompt$1, {
       className: "rationale",
@@ -1485,7 +1494,7 @@ class ChoiceInput extends React$4.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$3,
-        lineNumber: 222
+        lineNumber: 233
       }
     }), React$4.createElement(Feedback, {
       feedback: feedback,
@@ -1493,7 +1502,7 @@ class ChoiceInput extends React$4.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$3,
-        lineNumber: 224
+        lineNumber: 235
       }
     }));
   }
@@ -1537,7 +1546,8 @@ class Choice extends React$3.Component {
       isEvaluateMode
     };
     const names = classNames$2(classes.choice, {
-      [classes.noBorder]: index === choicesLength - 1 || choicesLayout !== 'vertical'
+      [classes.noBorder]: index === choicesLength - 1 || choicesLayout !== 'vertical',
+      [classes.horizontalLayout]: choicesLayout === 'horizontal'
     });
     return React$3.createElement('div', {
       className: choiceClass,
@@ -1545,7 +1555,7 @@ class Choice extends React$3.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$2,
-        lineNumber: 56
+        lineNumber: 57
       }
     }, React$3.createElement(ChoiceInput$1, {
       ...choiceProps,
@@ -1553,7 +1563,7 @@ class Choice extends React$3.Component {
       __self: this,
       __source: {
         fileName: _jsxFileName$2,
-        lineNumber: 57
+        lineNumber: 58
       }
     }));
   }
@@ -1582,6 +1592,12 @@ var StyledChoice = withStyles$2({
   },
   noBorder: {
     borderBottom: 'none'
+  },
+  horizontalLayout: {
+    paddingRight: '20px',
+    '& label': {
+      marginRight: '8px'
+    }
   }
 })(Choice);
 const React$2 = _dll_react;
@@ -1615,7 +1631,7 @@ const styles = {
     } : undefined;
   }
 };
-class MultipleChoice$1 extends React$2.Component {
+class MultipleChoice extends React$2.Component {
   static __initStatic() {
     this.propTypes = {
       mode: PropTypes$1.oneOf(['gather', 'view', 'evaluate']),
@@ -1638,7 +1654,7 @@ class MultipleChoice$1 extends React$2.Component {
   }
   constructor(props) {
     super(props);
-    MultipleChoice$1.prototype.__init.call(this);
+    MultipleChoice.prototype.__init.call(this);
     this.state = {
       showCorrect: this.props.alwaysShowCorrect || false
     };
@@ -1811,13 +1827,13 @@ class MultipleChoice$1 extends React$2.Component {
     }))));
   }
 }
-MultipleChoice$1.__initStatic();
-MultipleChoice$1.defaultProps = {
+MultipleChoice.__initStatic();
+MultipleChoice.defaultProps = {
   session: {
     value: []
   }
 };
-var MultipleChoice$2 = withStyles$1(styles)(MultipleChoice$1);
+var MultipleChoice$1 = withStyles$1(styles)(MultipleChoice);
 const React$1 = _dll_react;
 const PropTypes = _dll_prop_types;
 const {withStyles: withStyles} = _dll_material_ui__core_styles;
@@ -1865,7 +1881,7 @@ class Main extends React$1.Component {
         fileName: _jsxFileName,
         lineNumber: 32
       }
-    }, React$1.createElement(MultipleChoice$2, {
+    }, React$1.createElement(MultipleChoice$1, {
       ...model,
       session: session,
       onChoiceChanged: onChoiceChanged,
@@ -1902,154 +1918,20 @@ const Root = props => React$1.createElement(MuiThemeProvider, {
     lineNumber: 54
   }
 }));
-const {concat: concat} = _dll_lodash;
-const {uniq: uniq} = _dll_lodash;
-const {without: without} = _dll_lodash;
-function updateSessionValue(session, choiceMode, data) {
-  session.value = session.value || [];
-  if (choiceMode === 'checkbox') {
-    if (data.selected) {
-      session.value = uniq(concat(session.value, [data.value]));
-    } else {
-      session.value = without(session.value, data.value);
-    }
-  }
-  if (choiceMode === 'radio') {
-    if (data.selected) {
-      session.value = [data.value];
-    } else {
-      session.value = [];
-    }
-  }
-}
 const React = _dll_react;
 const ReactDOM = _dll_react_dom;
 const {debounce: debounce} = _dll_lodash;
-const debug$1 = _dll_debug;
-const {renderMath: renderMath} = _dll_pie_lib__math_rendering;
-const log$1 = debug$1('pie-ui:multiple-choice');
-const isComplete = session => !!(session && session.value && session.value.length);
-class MultipleChoice extends HTMLElement {
-  constructor() {
-    super();
-    this._model = null;
-    this._session = null;
-    this._rerender = debounce(() => {
-      if (this._model && this._session) {
-        var element = React.createElement(Root, {
-          model: this._model,
-          session: this._session,
-          onChoiceChanged: this._onChange.bind(this)
-        });
-        ReactDOM.render(element, this, () => {
-          log$1('render complete - render math');
-          renderMath(this);
-        });
-      } else {
-        log$1('skip');
-      }
-    }, 50, {
-      leading: false,
-      trailing: true
-    });
-    this._dispatchResponseChanged = debounce(() => {
-      var event = new CustomEvent('session-changed', {
-        bubbles: true,
-        composed: true,
-        detail: {
-          complete: isComplete(this._session),
-          component: this.tagName.toLowerCase()
-        }
-      });
-      this.dispatchEvent(event);
-    });
-    this._dispatchModelSet = debounce(() => {
-      this.dispatchEvent(new CustomEvent('model-set', {
-        bubbles: true,
-        composed: true,
-        detail: {
-          complete: isComplete(this._session),
-          component: this.tagName.toLowerCase(),
-          hasModel: this._model !== undefined
-        }
-      }));
-    }, 50, {
-      leading: false,
-      trailing: true
-    });
-  }
-  set model(s) {
-    this._model = s;
-    this._rerender();
-    this._dispatchModelSet();
-  }
-  get session() {
-    return this._session;
-  }
-  set session(s) {
-    this._session = s;
-    this._rerender();
-    this._dispatchResponseChanged();
-  }
-  _onChange(data) {
-    updateSessionValue(this._session, this._model.choiceMode, data);
-    this._dispatchResponseChanged();
-    this._rerender();
-  }
-  connectedCallback() {
-    this._rerender();
-  }
-}
-var lib = {};
-Object.defineProperty(lib, "__esModule", {
-  value: true
-});
-class ModelSetEvent extends CustomEvent {
-  constructor(component, complete, hasModel) {
-    super(ModelSetEvent.TYPE, {
-      bubbles: true,
-      composed: true,
-      detail: {
-        complete,
-        component,
-        hasModel
-      }
-    });
-    this.component = component;
-    this.complete = complete;
-  }
-}
-ModelSetEvent.TYPE = 'model-set';
-lib.ModelSetEvent = ModelSetEvent;
-class SessionChangedEvent extends CustomEvent {
-  constructor(component, complete) {
-    super(SessionChangedEvent.TYPE, {
-      bubbles: true,
-      composed: true,
-      detail: {
-        complete,
-        component
-      }
-    });
-    this.component = component;
-    this.complete = complete;
-  }
-}
-SessionChangedEvent.TYPE = 'session-changed';
-var SessionChangedEvent_1 = lib.SessionChangedEvent = SessionChangedEvent;
 const {cloneDeep: cloneDeep} = _dll_lodash;
-const {get: get} = _dll_lodash;
 const debug = _dll_debug;
-const MC_TAG_NAME = 'ebsr-multiple-choice';
-const SESSION_CHANGED = SessionChangedEvent_1.TYPE;
-const log = debug('pie-element:ebsr:print');
+const {renderMath: renderMath} = _dll_pie_lib__math_rendering;
+const log = debug('pie-element:multiple-choice:print');
 const preparePrintModel = (model, opts) => {
   const instr = opts.role === 'instructor';
   model.prompt = model.promptEnabled !== false ? model.prompt : undefined;
   model.teacherInstructions = instr && model.teacherInstructionsEnabled !== false ? model.teacherInstructions : undefined;
   model.showTeacherInstructions = instr;
   model.alwaysShowCorrect = instr;
-  model.mode = instr ? 'evaluate' : 'gather';
+  model.mode = instr ? 'evaluate' : model.mode;
   model.disabled = true;
   model.animationsDisabled = true;
   model.lockChoiceOrder = true;
@@ -2064,109 +1946,38 @@ const preparePrintModel = (model, opts) => {
   model.keyMode = model.choicePrefix || 'letters';
   return model;
 };
-class EbsrMC extends MultipleChoice {}
-const defineMultipleChoice = () => {
-  if (!customElements.get(MC_TAG_NAME)) {
-    customElements.define(MC_TAG_NAME, EbsrMC);
-  }
-};
-defineMultipleChoice();
-const isNonEmptyArray = a => Array.isArray(a) && a.length > 0;
-const isSessionComplete = session => {
-  const a = get(session, 'value.partA.value');
-  const b = get(session, 'value.partB.value');
-  return isNonEmptyArray(a) && isNonEmptyArray(b);
-};
-class Ebsr extends HTMLElement {
+class MultipleChoicePrint extends HTMLElement {
   constructor() {
     super();
-    Ebsr.prototype.__init.call(this);
-    this._model = {};
-    this._session = {};
     this._options = null;
-  }
-  __init() {
-    this.onSessionUpdated = e => {
-      if (e.target === this) {
-        return;
-      }
-      e.preventDefault();
-      e.stopImmediatePropagation();
-      const id = e.target.getAttribute('id');
-      if (id) {
-        const key = `part${id.toUpperCase()}`;
-        if (e.update) {
-          this._model[key] = e.update;
-        }
-        this.dispatchSessionChanged(e.srcElement._session, key);
+    this._model = null;
+    this._session = [];
+    this._rerender = debounce(() => {
+      if (this._model && this._session) {
+        const printModel = preparePrintModel(this._model, this._options);
+        const element = this._options && React.createElement(Root, {
+          model: printModel,
+          session: {}
+        });
+        ReactDOM.render(element, this, () => {
+          log('render complete - render math');
+          renderMath(this);
+        });
+      } else {
+        log('skip');
       }
-    };
-  }
-  set model(m) {
-    this._model = m;
-    customElements.whenDefined(MC_TAG_NAME).then(() => {
-      this.setPartModel(this.partA, 'partA');
-      this.setPartModel(this.partB, 'partB');
-    });
-  }
-  set session(s) {
-    this._session = s;
-    customElements.whenDefined(MC_TAG_NAME).then(() => {
-      this.setPartSession(this.partA, 'partA');
-      this.setPartSession(this.partB, 'partB');
+    }, 50, {
+      leading: false,
+      trailing: true
     });
   }
-  setPartModel(part, key) {
-    if (this._model && this._model[key]) {
-      part.model = {
-        ...preparePrintModel(this._model[key], this._options),
-        keyMode: this._model[key].choicePrefix
-      };
-      if (!part._session) {
-        part.session = {};
-      }
-    }
-  }
   set options(o) {
     this._options = o;
   }
-  setPartSession(part, key) {
-    if (this._session && this._model) {
-      const {value} = this._session;
-      part.session = value && value[key] ? value[key] : {
-        id: key
-      };
-    }
-  }
-  dispatchSessionChanged(partSession, key) {
-    this._session.value = {
-      ...this._session.value,
-      [key]: partSession
-    };
-    log('[onSessionChanged] session: ', this._session);
-    const complete = isSessionComplete(this._session);
-    this.dispatchEvent(new SessionChangedEvent_1(this.tagName.toLowerCase(), complete));
-  }
-  get partA() {
-    return this.querySelector(`${MC_TAG_NAME}#a`);
-  }
-  get partB() {
-    return this.querySelector(`${MC_TAG_NAME}#b`);
-  }
-  connectedCallback() {
-    this._render();
-    this.addEventListener(SESSION_CHANGED, this.onSessionUpdated);
-  }
-  disconnectedCallback() {
-    this.removeEventListener(SESSION_CHANGED, this.onSessionUpdated);
-  }
-  _render() {
-    this.innerHTML = `
-      <div>
-        <${MC_TAG_NAME} id="a"></${MC_TAG_NAME}>
-        <${MC_TAG_NAME} id="b"></${MC_TAG_NAME}>
-      </div>
-    `;
+  set model(s) {
+    this._model = s;
+    this._rerender();
   }
+  connectedCallback() {}
 }
-export {Ebsr as default, isSessionComplete};
+export {MultipleChoicePrint as default};

package/configure/node_modules/@pie-element/multiple-choice/package.json

@@ -0,0 +1,34 @@
+{
+  "name": "@pie-element/multiple-choice",
+  "repository": "pie-framework/pie-elements",
+  "version": "6.3.2",
+  "publishConfig": {
+    "access": "public"
+  },
+  "dependencies": {
+    "@material-ui/core": "^3.9.2",
+    "@pie-lib/config-ui": "^10.13.0",
+    "@pie-lib/correct-answer-toggle": "^2.3.36",
+    "@pie-lib/math-rendering": "^2.4.0",
+    "@pie-lib/render-ui": "^4.12.6",
+    "classnames": "^2.2.5",
+    "debug": "^4.1.1",
+    "enzyme-to-json": "^3.3.3",
+    "lodash": "^4.17.10",
+    "prop-types": "^15.6.1",
+    "react": "^16.8.1",
+    "react-dom": "^16.8.1",
+    "react-test-renderer": "^16.3.2",
+    "react-transition-group": "^2.3.1"
+  },
+  "gitHead": "8ea971e13e74d785cd35a04fd9fe1abe1fa2dabf",
+  "scripts": {
+    "postpublish": "../../scripts/postpublish"
+  },
+  "main": "lib/index.js",
+  "module": "src/index.js",
+  "exports": {
+    ".": "./src/index.js",
+    "./print": "./src/print.js"
+  }
+}