@instructure/quiz-core 20.17.2-rc.9 → 20.17.3-rc.0

package/lib/building/components/layout/Sidebar/index.js

@@ -1,41 +1,25 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.BuildingSidebar = exports.mapDispatchToProps = exports.mapStateToProps = void 0;
-
+exports.mapStateToProps = exports.mapDispatchToProps = exports.default = exports.BuildingSidebar = void 0;
 var _redux = require("redux");
-
-var _reactRedux = require("../../../../common/react-redux.js");
-
+var _reactRedux = require("../../../../common/react-redux");
 var _quizCommon = require("@instructure/quiz-common");
-
-var _dragAndDropUtils = require("../../../../common/components/shared/drag_and_drop/dragAndDropUtils.js");
-
-var _dragAndDrop = require("../../../../common/actions/dragAndDrop.js");
-
-var _alerts = require("../../../../common/actions/alerts.js");
-
-var _ui = require("../../../../common/actions/ui.js");
-
-var _modal = require("../../../../common/actions/modal.js");
-
-var _sidebar = require("../../../../common/actions/sidebar.js");
-
-var _scrolling = require("../../../../common/actions/scrolling.js");
-
-var _quizEntries = require("../../../api/quizEntries.js");
-
-var _modifications = require("../../../../common/actions/modifications.js");
-
-var _quizzes = require("../../../../common/selectors/quizzes.js");
-
-var _presenter = _interopRequireDefault(require("./presenter.js"));
-
-var mapStateToProps = function mapStateToProps(state, props) {
+var _dragAndDropUtils = require("../../../../common/components/shared/drag_and_drop/dragAndDropUtils");
+var _dragAndDrop = require("../../../../common/actions/dragAndDrop");
+var _alerts = require("../../../../common/actions/alerts");
+var _ui = require("../../../../common/actions/ui");
+var _modal = require("../../../../common/actions/modal");
+var _sidebar = require("../../../../common/actions/sidebar");
+var _scrolling = require("../../../../common/actions/scrolling");
+var _quizEntries = require("../../../api/quizEntries");
+var _modifications = require("../../../../common/actions/modifications");
+var _quizzes = require("../../../../common/selectors/quizzes");
+var _presenter = _interopRequireDefault(require("./presenter"));
+var mapStateToProps = exports.mapStateToProps = function mapStateToProps(state, props) {
   var activeQuiz = (0, _quizzes.getActiveQuiz)(state);
   var workingQuizEntriesIncludingTemp = activeQuiz.getWorkingQuizEntries();
   var totalPointsPossible = (0, _quizzes.getTotalPointsPossible)(state, activeQuiz.id);
@@ -49,10 +33,7 @@ var mapStateToProps = function mapStateToProps(state, props) {
     totalPointsPossible: totalPointsPossible
   };
 };
-
-exports.mapStateToProps = mapStateToProps;
-
-var mapDispatchToProps = function mapDispatchToProps(dispatch, props) {
+var mapDispatchToProps = exports.mapDispatchToProps = function mapDispatchToProps(dispatch, props) {
   return {
     toggleSidebar: props.toggleSidebar || (0, _redux.bindActionCreators)(_sidebar.toggleSidebar, dispatch),
     moveTemporaryQuizEntry: (0, _redux.bindActionCreators)(_modifications.moveTemporaryQuizEntry, dispatch),
@@ -66,15 +47,11 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch, props) {
     scrollToItem: props.scrollToItem || (0, _redux.bindActionCreators)(_scrolling.scrollToItem, dispatch),
     screenreaderNotification: (0, _redux.bindActionCreators)(_alerts.screenreaderNotification, dispatch),
     setUi: (0, _redux.bindActionCreators)(_ui.set, dispatch) // for DnD
-
   };
-}; // Sidebar is a dropTarget to handle drops that occur on the sidebar,
+};
+
+// Sidebar is a dropTarget to handle drops that occur on the sidebar,
 // but not directly on a sidebarItem (such as at the top or bottom).
 // it also uses the isOver prop to conditionally render dropZones on Build vs Sidebar
-
-
-exports.mapDispatchToProps = mapDispatchToProps;
-var BuildingSidebar = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _dragAndDropUtils.DropTargetCreator)(_quizCommon.SIDEBAR_ITEM_REF))(_presenter.default);
-exports.BuildingSidebar = BuildingSidebar;
-var _default = BuildingSidebar;
-exports.default = _default;
+var BuildingSidebar = exports.BuildingSidebar = (0, _redux.compose)((0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps), (0, _dragAndDropUtils.DropTargetCreator)(_quizCommon.SIDEBAR_ITEM_REF))(_presenter.default);
+var _default = exports.default = BuildingSidebar;

package/lib/building/components/layout/Sidebar/presenter.js

@@ -1,74 +1,51 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.BuildingSidebar = void 0;
-
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
-
 var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
-
+var _callSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/callSuper"));
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
-
-var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/createSuper"));
-
 var _react = require("react");
-
 var _propTypes = _interopRequireDefault(require("prop-types"));
-
 var _reactImmutableProptypes = _interopRequireDefault(require("react-immutable-proptypes"));
-
 var _emotion = require("@instructure/emotion");
-
-var _index = _interopRequireDefault(require("./SidebarItem/index.js"));
-
-var _index2 = _interopRequireDefault(require("./Stimulus/index.js"));
-
-var _index3 = _interopRequireDefault(require("../../../../common/components/layout/sidebar/Sidebar/index.js"));
-
-var _generateDisplayPositions = _interopRequireDefault(require("../../../../common/util/generateDisplayPositions.js"));
-
+var _SidebarItem = _interopRequireDefault(require("./SidebarItem"));
+var _Stimulus = _interopRequireDefault(require("./Stimulus"));
+var _Sidebar = _interopRequireDefault(require("../../../../common/components/layout/sidebar/Sidebar"));
+var _generateDisplayPositions = _interopRequireDefault(require("../../../../common/util/generateDisplayPositions"));
 var _quizInteractions = require("@instructure/quiz-interactions");
-
-var _styles = _interopRequireDefault(require("./styles.js"));
-
-var _theme = _interopRequireDefault(require("./theme.js"));
-
+var _styles = _interopRequireDefault(require("./styles"));
+var _theme = _interopRequireDefault(require("./theme"));
 var _quizCommon = require("@instructure/quiz-common");
-
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
-
-var _dec, _class, _class2, _temp;
-
-var BuildingSidebar = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_Component) {
-  (0, _inherits2.default)(BuildingSidebar, _Component);
-
-  var _super = (0, _createSuper2.default)(BuildingSidebar);
-
+var _dec, _class, _BuildingSidebar;
+/** @jsx jsx */
+/* eslint "array-callback-return": "warn" */
+var BuildingSidebar = exports.BuildingSidebar = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _dec(_class = (_BuildingSidebar = /*#__PURE__*/function (_Component) {
   function BuildingSidebar() {
     var _this;
-
     (0, _classCallCheck2.default)(this, BuildingSidebar);
-
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
-
-    _this = _super.call.apply(_super, [this].concat(args));
-
+    _this = (0, _callSuper2.default)(this, BuildingSidebar, [].concat(args));
+    // NOTE: we use a higher order function here only so that we can match
+    // the props provided to our common interface from the TakingSidebar.
     _this.scrollToItem = function (_) {
       return function (scrollKey) {
         _this.props.scrollToItem(scrollKey);
       };
     };
-
+    // need to pass isOver this way to force a rerender when it changes,
+    // since only this function is passed down for rendering items in stimuli
     _this.renderItem = function () {
       var isOver = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : _this.props.isOver;
       return function (quizEntry, displayPosition, sidebarIsOpen) {
-        return (0, _emotion.jsx)(_index.default, {
+        return (0, _emotion.jsx)(_SidebarItem.default, {
           key: _this.setKey(quizEntry.id),
           ref: _this.setRef(quizEntry.id),
           inStimulus: quizEntry.isInStimulus,
@@ -85,27 +62,22 @@ var BuildingSidebar = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.de
         });
       };
     };
-
     _this.renderBankEntry = function (quizEntry, displayPosition, sidebarIsOpen) {
       if (quizEntry.hasStimulus) {
         return _this.renderStimulus(quizEntry, displayPosition, sidebarIsOpen);
       }
-
       return _this.renderItem()(quizEntry, displayPosition, sidebarIsOpen);
     };
-
     _this.storeStartQuizEntriesRef = function (node) {
       _this.startQuizEntries = node;
     };
-
     _this.storeEndQuizEntriesRef = function (node) {
       _this.endQuizEntries = node;
     };
-
     return _this;
   }
-
-  (0, _createClass2.default)(BuildingSidebar, [{
+  (0, _inherits2.default)(BuildingSidebar, _Component);
+  return (0, _createClass2.default)(BuildingSidebar, [{
     key: "componentDidMount",
     value: function componentDidMount() {
       this.props.makeStyles();
@@ -122,11 +94,9 @@ var BuildingSidebar = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.de
         case 'Item':
         case 'BankEntry':
           return (0, _quizInteractions.extractTextFromHtml)(quizEntry.getItem().getItemBody() || '');
-
         case 'Bank':
           return quizEntry.getEntry().title;
       }
-
       return '';
     }
   }, {
@@ -136,7 +106,6 @@ var BuildingSidebar = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.de
         case 'Item':
         case 'BankEntry':
           return quizEntry.getItem().getInteractionType().name;
-
         case 'Bank':
           return (0, _formatMessage.default)('Banked Content');
       }
@@ -147,7 +116,6 @@ var BuildingSidebar = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.de
       if (quizEntry.entryType !== 'Item') {
         return false;
       }
-
       var item = quizEntry.getEntry();
       return item.getWorkingInstance().isTemporary();
     }
@@ -160,17 +128,14 @@ var BuildingSidebar = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.de
     key: "setRef",
     value: function setRef(quizEntryId) {
       var _this2 = this;
-
       return function (node) {
         _this2[_this2.setKey(quizEntryId)] = node;
       };
-    } // NOTE: we use a higher order function here only so that we can match
-    // the props provided to our common interface from the TakingSidebar.
-
+    }
   }, {
     key: "renderStimulus",
     value: function renderStimulus(quizEntry, displayPosition, sidebarIsOpen) {
-      return (0, _emotion.jsx)(_index2.default, {
+      return (0, _emotion.jsx)(_Stimulus.default, {
         key: this.setKey(quizEntry.id),
         ref: this.setRef(quizEntry.id),
         displayPosition: displayPosition,
@@ -186,25 +151,19 @@ var BuildingSidebar = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.de
     key: "renderSidebarItems",
     value: function renderSidebarItems(sidebarIsOpen) {
       var _this3 = this;
-
       var quizEntries = this.props.quizEntries;
       return (0, _generateDisplayPositions.default)(quizEntries).reduce(function (renderedQuizEntries, quizEntry) {
         var entryType = quizEntry.record.entryType;
-
         if (entryType === 'Item' || entryType === 'Bank') {
           var itemOrBank = _this3.renderItem()(quizEntry.record, quizEntry.displayPosition, sidebarIsOpen);
-
           renderedQuizEntries.push(itemOrBank);
         } else if (entryType === 'BankEntry') {
           var bankEntry = _this3.renderBankEntry(quizEntry.record, quizEntry.displayPosition, sidebarIsOpen);
-
           renderedQuizEntries.push(bankEntry);
         } else if (entryType === 'Stimulus') {
           var stimulus = _this3.renderStimulus(quizEntry.record, quizEntry.displayPosition, sidebarIsOpen);
-
           renderedQuizEntries.push(stimulus);
         }
-
         return renderedQuizEntries;
       }, []);
     }
@@ -213,15 +172,14 @@ var BuildingSidebar = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.de
     value: function render() {
       var openClass = !this.props.sidebarOpen ? 'sidebarIsClosed' : 'sidebarIsOpen';
       var isOverClass = !this.props.isOver ? 'hide' : '';
-      return this.props.connectDropTarget(
-      /* React DnD requires a native element node like our div below */
+      return this.props.connectDropTarget( /* React DnD requires a native element node like our div below */
       (0, _emotion.jsx)("div", {
         style: {
           display: 'flex'
         }
       }, (0, _emotion.jsx)("div", {
         className: openClass
-      }, (0, _emotion.jsx)(_index3.default, {
+      }, (0, _emotion.jsx)(_Sidebar.default, {
         role: this.props.role,
         scrollToItem: this.scrollToItem,
         sidebarOpen: this.props.sidebarOpen,
@@ -243,9 +201,7 @@ var BuildingSidebar = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.de
       })))));
     }
   }]);
-  BuildingSidebar.displayName = "BuildingSidebar";
-  return BuildingSidebar;
-}(_react.Component), _class2.propTypes = {
+}(_react.Component), _BuildingSidebar.propTypes = {
   connectDropTarget: _propTypes.default.func.isRequired,
   isOver: _propTypes.default.bool,
   quizEntries: _reactImmutableProptypes.default.list.isRequired,
@@ -257,10 +213,8 @@ var BuildingSidebar = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.de
   totalPointsPossible: _propTypes.default.number.isRequired,
   styles: _propTypes.default.object,
   makeStyles: _propTypes.default.func
-}, _class2.defaultProps = {
+}, _BuildingSidebar.defaultProps = {
   isOver: false,
   role: 'navigation'
-}, _temp)) || _class);
-exports.BuildingSidebar = BuildingSidebar;
-var _default = BuildingSidebar;
-exports.default = _default;
+}, _BuildingSidebar)) || _class);
+var _default = exports.default = BuildingSidebar;

package/lib/building/components/layout/Sidebar/styles.js

@@ -1,14 +1,11 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var generateStyle = function generateStyle(componentTheme, props) {
   return {
     /* this class is to allow space for dragging an item
@@ -33,6 +30,4 @@ var generateStyle = function generateStyle(componentTheme, props) {
     })
   };
 };
-
-var _default = generateStyle;
-exports.default = _default;
+var _default = exports.default = generateStyle;

package/lib/building/components/layout/Sidebar/theme.js

@@ -4,13 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 var generateComponentTheme = function generateComponentTheme(_ref) {
   var spacing = _ref.spacing;
   return {
     bottomPadding: spacing.xLarge
   };
 };
-
-var _default = generateComponentTheme;
-exports.default = _default;
+var _default = exports.default = generateComponentTheme;

package/lib/building/components/layout/header/BuildingButtons/index.js

@@ -1,39 +1,24 @@
 "use strict";
 
-var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard");
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
-
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.mapStateToProps = mapStateToProps;
 exports.default = exports.BuildingButtons = void 0;
-
+exports.mapStateToProps = mapStateToProps;
 var _redux = require("redux");
-
 var _partial = _interopRequireDefault(require("lodash/partial"));
-
-var _reactRedux = require("../../../../../common/react-redux.js");
-
-var modalActions = _interopRequireWildcard(require("../../../../../common/actions/modal.js"));
-
-var _ui = require("../../../../../common/actions/ui.js");
-
+var _reactRedux = require("../../../../../common/react-redux");
+var modalActions = _interopRequireWildcard(require("../../../../../common/actions/modal"));
+var _ui = require("../../../../../common/actions/ui");
 var _quizCommon = require("@instructure/quiz-common");
-
-var _index = require("../../../../../common/components/ImportModal/index.js");
-
-var _presenter = require("./presenter.js");
-
-var _quizzes = require("../../../../../common/selectors/quizzes.js");
-
-var _featureCheck = require("../../../../../common/util/featureCheck.js");
-
-var _quizExport = require("../../../../../common/actions/quizExport.js");
-
-var _alerts = require("../../../../../common/actions/alerts.js");
-
+var _ImportModal = require("../../../../../common/components/ImportModal");
+var _presenter = require("./presenter");
+var _quizzes = require("../../../../../common/selectors/quizzes");
+var _featureCheck = require("../../../../../common/util/featureCheck");
+var _quizExport = require("../../../../../common/actions/quizExport");
+var _alerts = require("../../../../../common/actions/alerts");
 function mapStateToProps(state) {
   var quiz = (0, _quizzes.getActiveQuiz)(state);
   return {
@@ -47,7 +32,6 @@ function mapStateToProps(state) {
     printingEnabled: (0, _featureCheck.featureOn)('printing')
   };
 }
-
 var mapDispatchToProps = function mapDispatchToProps(dispatch) {
   return {
     addAlert: (0, _redux.bindActionCreators)(_alerts.addAlert, dispatch),
@@ -55,11 +39,8 @@ var mapDispatchToProps = function mapDispatchToProps(dispatch) {
     openBanksTray: (0, _redux.bindActionCreators)(_ui.set.bind(void 0, _quizCommon.BUILD_TRAY_OPEN, true), dispatch),
     setBanksTrayButtonRef: (0, _redux.bindActionCreators)((0, _partial.default)(_ui.set, _quizCommon.BUILD_TRAY_BUTTON_REF), dispatch),
     startExport: (0, _redux.bindActionCreators)(_quizExport.startQuizExportJob, dispatch),
-    openModal: (0, _redux.bindActionCreators)(modalActions.openModal.bind(modalActions, (0, _index.generateImportModalId)('qtiImport')), dispatch)
+    openModal: (0, _redux.bindActionCreators)(modalActions.openModal.bind(modalActions, (0, _ImportModal.generateImportModalId)('qtiImport')), dispatch)
   };
 };
-
-var BuildingButtons = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_presenter.BuildingButtons);
-exports.BuildingButtons = BuildingButtons;
-var _default = BuildingButtons;
-exports.default = _default;
+var BuildingButtons = exports.BuildingButtons = (0, _reactRedux.connect)(mapStateToProps, mapDispatchToProps)(_presenter.BuildingButtons);
+var _default = exports.default = BuildingButtons;