@instructure/quiz-core 22.17.0 → 22.18.0

package/lib/common/components/resources/entry/EntrySave/presenter.js

@@ -1,8 +1,10 @@
-function _assert_this_initialized(self) {
-    if (self === void 0) {
-        throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
-    }
-    return self;
+function _array_like_to_array(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
+    return arr2;
+}
+function _array_with_holes(arr) {
+    if (Array.isArray(arr)) return arr;
 }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     try {
@@ -33,85 +35,43 @@ function _async_to_generator(fn) {
         });
     };
 }
-function _call_super(_this, derived, args) {
-    derived = _get_prototype_of(derived);
-    return _possible_constructor_return(_this, _is_native_reflect_construct() ? Reflect.construct(derived, args || [], _get_prototype_of(_this).constructor) : derived.apply(_this, args));
-}
-function _class_call_check(instance, Constructor) {
-    if (!(instance instanceof Constructor)) {
-        throw new TypeError("Cannot call a class as a function");
-    }
-}
-function _defineProperties(target, props) {
-    for(var i = 0; i < props.length; i++){
-        var descriptor = props[i];
-        descriptor.enumerable = descriptor.enumerable || false;
-        descriptor.configurable = true;
-        if ("value" in descriptor) descriptor.writable = true;
-        Object.defineProperty(target, descriptor.key, descriptor);
-    }
-}
-function _create_class(Constructor, protoProps, staticProps) {
-    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
-    if (staticProps) _defineProperties(Constructor, staticProps);
-    return Constructor;
-}
-function _define_property(obj, key, value) {
-    if (key in obj) {
-        Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-    } else {
-        obj[key] = value;
-    }
-    return obj;
-}
-function _get_prototype_of(o) {
-    _get_prototype_of = Object.setPrototypeOf ? Object.getPrototypeOf : function getPrototypeOf(o) {
-        return o.__proto__ || Object.getPrototypeOf(o);
-    };
-    return _get_prototype_of(o);
-}
-function _inherits(subClass, superClass) {
-    if (typeof superClass !== "function" && superClass !== null) {
-        throw new TypeError("Super expression must either be null or a function");
-    }
-    subClass.prototype = Object.create(superClass && superClass.prototype, {
-        constructor: {
-            value: subClass,
-            writable: true,
-            configurable: true
+function _iterable_to_array_limit(arr, i) {
+    var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"];
+    if (_i == null) return;
+    var _arr = [];
+    var _n = true;
+    var _d = false;
+    var _s, _e;
+    try {
+        for(_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true){
+            _arr.push(_s.value);
+            if (i && _arr.length === i) break;
+        }
+    } catch (err) {
+        _d = true;
+        _e = err;
+    } finally{
+        try {
+            if (!_n && _i["return"] != null) _i["return"]();
+        } finally{
+            if (_d) throw _e;
         }
-    });
-    if (superClass) _set_prototype_of(subClass, superClass);
-}
-function _possible_constructor_return(self, call) {
-    if (call && (_type_of(call) === "object" || typeof call === "function")) {
-        return call;
     }
-    return _assert_this_initialized(self);
+    return _arr;
 }
-function _set_prototype_of(o, p) {
-    _set_prototype_of = Object.setPrototypeOf || function setPrototypeOf(o, p) {
-        o.__proto__ = p;
-        return o;
-    };
-    return _set_prototype_of(o, p);
+function _non_iterable_rest() {
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _type_of(obj) {
-    "@swc/helpers - typeof";
-    return obj && typeof Symbol !== "undefined" && obj.constructor === Symbol ? "symbol" : typeof obj;
+function _sliced_to_array(arr, i) {
+    return _array_with_holes(arr) || _iterable_to_array_limit(arr, i) || _unsupported_iterable_to_array(arr, i) || _non_iterable_rest();
 }
-function _is_native_reflect_construct() {
-    try {
-        var result = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
-    } catch (_) {}
-    return (_is_native_reflect_construct = function() {
-        return !!result;
-    })();
+function _unsupported_iterable_to_array(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _array_like_to_array(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
 function _ts_generator(thisArg, body) {
     var f, y, t, _ = {
@@ -204,173 +164,147 @@ function _ts_generator(thisArg, body) {
         };
     }
 }
-import React, { Component } from 'react';
+import React, { useState, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import ReactDOM from 'react-dom';
 import { Button } from '@instructure/ui-buttons';
 import { View } from '@instructure/ui-view';
-import { API_INPUT_VALIDATION_ERROR } from '@instructure/quiz-common';
+import { API_INPUT_VALIDATION_ERROR } from '@instructure/quiz-common/constants';
 import t from '@instructure/quiz-i18n/format-message';
 import noop from '../../../../util/noop';
-export var EntrySave = /*#__PURE__*/ function(Component) {
-    "use strict";
-    _inherits(EntrySave, Component);
-    function EntrySave() {
-        _class_call_check(this, EntrySave);
-        var _this;
-        var _this1;
-        _this = _call_super(this, EntrySave, arguments), _this1 = _this, _define_property(_this1, "state", {
-            canSubmit: true
-        }), _define_property(_this1, "createScreenReaderNotification", function() {
-            var displayPosition = _this1.props.displayPosition;
-            var msg = displayPosition === null ? t('This question cannot be saved due to invalid input data.') : t('Question {displayPosition} cannot be saved due to invalid input data.', {
-                displayPosition: displayPosition
-            });
-            _this1.props.screenreaderNotification(msg);
-        }), _define_property(_this1, "onSubmit", function(e) {
-            return _async_to_generator(function() {
-                return _ts_generator(this, function(_state) {
-                    switch(_state.label){
-                        case 0:
-                            e.preventDefault();
-                            if (!_this1.props.isValid) return [
-                                3,
-                                1
-                            ];
-                            _this1.successfulSubmit();
-                            return [
-                                3,
-                                3
-                            ];
-                        case 1:
-                            _this1.createScreenReaderNotification();
-                            return [
-                                4,
-                                _this1.props.showError(_this1.props.guid)
-                            ];
-                        case 2:
-                            _state.sent();
-                            _this1.props.clearNextQuizEntry();
-                            _this1.focusFirstErrorField();
-                            _state.label = 3;
-                        case 3:
-                            return [
-                                2
-                            ];
-                    }
-                });
-            })();
-        }), _define_property(_this1, "focusFirstErrorField", function() {
-            var itemEditArea = _this1.props.itemEditArea;
-            if (itemEditArea) {
-                var editArea = ReactDOM.findDOMNode(itemEditArea);
-                var firstErrorField = editArea === null || editArea === void 0 ? void 0 : editArea.querySelector('[aria-invalid="true"]');
-                firstErrorField && firstErrorField.focus();
-            }
-        }), _define_property(_this1, "clearChanges", function() {
-            var fromCancel = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : false;
-            _this1.props.switchOffEditing();
-            _this1.props.hideError(_this1.props.guid);
-            _this1.props.clearChanges(fromCancel);
-        }), _define_property(_this1, "onCancel", function() {
-            _this1.clearChanges(true);
-            _this1.props.cancelHandler();
+export function EntrySave(props) {
+    var cancelHandler = props.cancelHandler, clearChangesProp = props.clearChanges, clearNextQuizEntry = props.clearNextQuizEntry, disableSubmit = props.disableSubmit, displayPosition = props.displayPosition, guid = props.guid, hideError = props.hideError, initialFocusId = props.initialFocusId, isValid = props.isValid, itemEditArea = props.itemEditArea, showError = props.showError, screenreaderNotification = props.screenreaderNotification, submitHandler = props.submitHandler, switchOnEditing = props.switchOnEditing, switchOffEditing = props.switchOffEditing;
+    var _useState = _sliced_to_array(useState(true), 2), canSubmit = _useState[0], setCanSubmit = _useState[1];
+    useEffect(function() {
+        switchOnEditing(initialFocusId);
+        return function() {
+            clearChanges();
+            var msg = t('Question editing mode turned off.');
+            screenreaderNotification(msg);
+        };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
+    function createScreenReaderNotification() {
+        var msg = displayPosition === null ? t('This question cannot be saved due to invalid input data.') : t('Question {displayPosition} cannot be saved due to invalid input data.', {
+            displayPosition: displayPosition
         });
-        return _this;
+        screenreaderNotification(msg);
     }
-    _create_class(EntrySave, [
-        {
-            key: "UNSAFE_componentWillMount",
-            value: function UNSAFE_componentWillMount() {
-                this.props.switchOnEditing(this.props.initialFocusId);
-            }
-        },
-        {
-            key: "componentWillUnmount",
-            value: function componentWillUnmount() {
-                this.clearChanges();
-                var msg = t('Question editing mode turned off.');
-                this.props.screenreaderNotification(msg);
-            }
-        },
-        {
-            key: "successfulSubmit",
-            value: function successfulSubmit() {
-                return _async_to_generator(function() {
-                    var validationResult, e;
-                    return _ts_generator(this, function(_state) {
-                        switch(_state.label){
-                            case 0:
-                                this.setState({
-                                    canSubmit: false
-                                });
-                                _state.label = 1;
-                            case 1:
-                                _state.trys.push([
-                                    1,
-                                    3,
-                                    ,
-                                    4
-                                ]);
-                                return [
-                                    4,
-                                    this.props.submitHandler()
-                                ];
-                            case 2:
-                                validationResult = _state.sent();
-                                if (validationResult === API_INPUT_VALIDATION_ERROR) {
-                                    this.createScreenReaderNotification();
-                                    throw new Error('User input validation error received from API.');
-                                }
-                                return [
-                                    3,
-                                    4
-                                ];
-                            case 3:
-                                e = _state.sent();
-                                this.setState({
-                                    canSubmit: true
-                                });
-                                return [
-                                    2
-                                ];
-                            case 4:
-                                this.props.switchOffEditing();
-                                this.props.hideError(this.props.guid);
-                                this.props.screenreaderNotification(t('Changes to question saved.'));
-                                return [
-                                    2
-                                ];
-                        }
-                    });
-                }).call(this);
-            }
-        },
-        {
-            key: "render",
-            value: function render() {
-                return /*#__PURE__*/ React.createElement(View, {
-                    as: "div",
-                    display: "flex"
-                }, /*#__PURE__*/ React.createElement(View, null, /*#__PURE__*/ React.createElement(Button, {
-                    type: "button",
-                    onClick: this.onCancel,
-                    "data-automation": "sdk-cancel-button"
-                }, t('Cancel'))), /*#__PURE__*/ React.createElement(View, {
-                    margin: "none none none x-small"
-                }, /*#__PURE__*/ React.createElement(Button, {
-                    type: "button",
-                    color: "primary",
-                    onClick: this.onSubmit,
-                    disabled: !this.state.canSubmit || this.props.disableSubmit,
-                    "data-automation": "sdk-done-button"
-                }, t('Done'))));
-            }
+    function onSubmit(e) {
+        return _async_to_generator(function() {
+            return _ts_generator(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        e.preventDefault();
+                        if (!isValid) return [
+                            3,
+                            1
+                        ];
+                        successfulSubmit();
+                        return [
+                            3,
+                            3
+                        ];
+                    case 1:
+                        createScreenReaderNotification();
+                        return [
+                            4,
+                            showError(guid)
+                        ];
+                    case 2:
+                        _state.sent();
+                        clearNextQuizEntry();
+                        focusFirstErrorField();
+                        _state.label = 3;
+                    case 3:
+                        return [
+                            2
+                        ];
+                }
+            });
+        })();
+    }
+    function focusFirstErrorField() {
+        if (itemEditArea) {
+            var editArea = ReactDOM.findDOMNode(itemEditArea);
+            var firstErrorField = editArea === null || editArea === void 0 ? void 0 : editArea.querySelector('[aria-invalid="true"]');
+            firstErrorField && firstErrorField.focus();
         }
-    ]);
-    return EntrySave;
-}(Component);
-_define_property(EntrySave, "propTypes", {
+    }
+    function successfulSubmit() {
+        return _async_to_generator(function() {
+            var validationResult, e;
+            return _ts_generator(this, function(_state) {
+                switch(_state.label){
+                    case 0:
+                        setCanSubmit(false);
+                        _state.label = 1;
+                    case 1:
+                        _state.trys.push([
+                            1,
+                            3,
+                            ,
+                            4
+                        ]);
+                        return [
+                            4,
+                            submitHandler()
+                        ];
+                    case 2:
+                        validationResult = _state.sent();
+                        if (validationResult === API_INPUT_VALIDATION_ERROR) {
+                            createScreenReaderNotification();
+                            throw new Error('User input validation error received from API.');
+                        }
+                        return [
+                            3,
+                            4
+                        ];
+                    case 3:
+                        e = _state.sent();
+                        setCanSubmit(true);
+                        return [
+                            2
+                        ];
+                    case 4:
+                        switchOffEditing();
+                        hideError(guid);
+                        screenreaderNotification(t('Changes to question saved.'));
+                        return [
+                            2
+                        ];
+                }
+            });
+        })();
+    }
+    function clearChanges() {
+        var fromCancel = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : false;
+        switchOffEditing();
+        hideError(guid);
+        clearChangesProp(fromCancel);
+    }
+    function onCancel() {
+        clearChanges(true);
+        cancelHandler();
+    }
+    return /*#__PURE__*/ React.createElement(View, {
+        as: "div",
+        display: "flex"
+    }, /*#__PURE__*/ React.createElement(View, null, /*#__PURE__*/ React.createElement(Button, {
+        type: "button",
+        onClick: onCancel,
+        "data-automation": "sdk-cancel-button"
+    }, t('Cancel'))), /*#__PURE__*/ React.createElement(View, {
+        margin: "none none none x-small"
+    }, /*#__PURE__*/ React.createElement(Button, {
+        type: "button",
+        color: "primary",
+        onClick: onSubmit,
+        disabled: !canSubmit || disableSubmit,
+        "data-automation": "sdk-done-button"
+    }, t('Done'))));
+}
+EntrySave.propTypes = {
     cancelHandler: PropTypes.func,
     clearChanges: PropTypes.func.isRequired,
     // From connected component
@@ -388,13 +322,13 @@ _define_property(EntrySave, "propTypes", {
     // from makescrollable / from props being passed in occasionally
     switchOnEditing: PropTypes.func.isRequired,
     switchOffEditing: PropTypes.func.isRequired
-});
-_define_property(EntrySave, "defaultProps", {
+};
+EntrySave.defaultProps = {
     cancelHandler: noop,
     disableSubmit: false,
     displayPosition: null,
     guid: null,
     initialFocusId: null,
     itemEditArea: null
-});
+};
 export default EntrySave;

package/lib/common/components/resources/item/ItemEdit/index.js

@@ -1,5 +1,5 @@
 import { bindActionCreators } from 'redux';
-import { Map } from 'immutable';
+import { Map, Set } from 'immutable';
 import { connect } from '../../../../react-redux';
 import ItemEdit from './presenter';
 import makeEditable from '../../../shared/functionality/makeEditable';
@@ -12,53 +12,42 @@ import * as modificationActions from '../../../../actions/modifications';
 import { addError, screenreaderNotification } from '../../../../actions/alerts';
 import { updateItem } from '../../../../../building/api/items';
 import { interactionFileUpload, setOneAtATimeType } from '../../../../../building/api/quizzes';
-import { featureOn } from '../../../../util/featureCheck';
 import { getActiveQuiz, isActiveQuizWorkingInstanceOneQuestionAtATime } from '../../../../selectors/quizzes';
 export function mapStateToProps(state, props) {
     // Error Related:
     var workingItem = props.entry.getWorkingInstance();
     var isValid = workingItem.isValid();
-    var errorsShowing = state.get('errorsShowing', Map());
+    var _state_errorsShowing;
+    var errorsShowing = (_state_errorsShowing = state.errorsShowing) !== null && _state_errorsShowing !== void 0 ? _state_errorsShowing : Map();
     var errorsAreShowing = errorsShowing.get(props.guid);
     // Null must always be passed to contextUuid when working with banks
-    var contextUuid = props.contextUuid === void 0 ? state.getIn([
-        'outcomes',
-        'contextUuid'
-    ]) : props.contextUuid;
+    var contextUuid = props.contextUuid === void 0 ? state.outcomes.get('contextUuid') : props.contextUuid;
     var quiz = getActiveQuiz(state);
+    var _state_features;
+    var features = (_state_features = state.features) !== null && _state_features !== void 0 ? _state_features : Set();
     var _props_showCalculator;
     return {
-        answerFeedbackEnabled: featureOn('answer_level_feedback'),
-        appContainer: state.getIn([
-            'ui',
-            'appContainer'
-        ]),
+        answerFeedbackEnabled: features.includes('answer_level_feedback'),
+        appContainer: state.ui.get('appContainer'),
         errorsAreShowing: errorsAreShowing,
         workingItem: workingItem,
         isValid: isValid,
         isEditing: true,
-        fitbCommonWordbankEnabled: featureOn('fitb_common_wordbank'),
+        fitbCommonWordbankEnabled: features.includes('fitb_common_wordbank'),
+        multipleAnswerFeedbackEnabled: features.includes('multiple_answer_feedback'),
         editable: true,
         contextUuid: contextUuid,
         oneQuestionAtATime: isActiveQuizWorkingInstanceOneQuestionAtATime(state),
-        outcomesEndpoint: state.getIn([
-            'outcomes',
-            'outcomesEndpoint'
-        ]),
-        outcomesToken: state.getIn([
-            'outcomes',
-            'outcomesToken'
-        ]),
-        partialDeepScoringEnabled: featureOn('partial_deep_scoring'),
-        partialScoringEnabled: featureOn('partial_scoring'),
+        outcomesEndpoint: state.outcomes.get('outcomesEndpoint'),
+        outcomesToken: state.outcomes.get('outcomesToken'),
+        partialDeepScoringEnabled: features.includes('partial_deep_scoring'),
+        partialScoringEnabled: features.includes('partial_scoring'),
         quizId: quiz.id,
         scope: props.scope,
-        rootAccountUuid: state.getIn([
-            'outcomes',
-            'externalAccountUuid'
-        ]),
+        rootAccountUuid: state.outcomes.get('externalAccountUuid'),
         showCalculatorOption: (_props_showCalculator = props.showCalculator) !== null && _props_showCalculator !== void 0 ? _props_showCalculator : true,
-        isSurvey: quiz.isSurvey()
+        isSurvey: quiz.isSurvey(),
+        multipleHotSpotEnabled: features.includes('multiple_hotspot_selections')
     };
 }
 function mapDispatchToProps(dispatch) {

package/lib/common/components/resources/item/ItemEdit/presenter.js

@@ -131,7 +131,9 @@ import OutcomeCount from '@instructure/outcomes-ui/es/containers/OutcomeCount';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import CustomPropTypes from '../../../../../common/util/CustomPropTypes';
 import componentForItem from '../../../../util/componentForItem';
-import { liveRegion, COMPONENT_EDIT, FormFieldGroup } from '@instructure/quiz-common';
+import { liveRegion } from '@instructure/quiz-common/alertHelpers';
+import { COMPONENT_EDIT } from '@instructure/quiz-common/constants';
+import { FormFieldGroup } from '@instructure/quiz-common/components/FormFieldGroup/index';
 import t from '@instructure/quiz-i18n/format-message';
 import { propsForInteractionEdit } from '../../../../util/interactionTypePropsHelper';
 import { toErrors } from '../../../../util/instUIMessages';

package/lib/common/components/resources/item/ItemOverride/index.js

@@ -1,4 +1,4 @@
-import { Map } from 'immutable';
+import { Map, Set } from 'immutable';
 import { connect } from '../../../../react-redux';
 import ItemOverride from './presenter';
 import makeEditable from '../../../shared/functionality/makeEditable';
@@ -6,17 +6,20 @@ import * as modificationActions from '../../../../actions/modifications';
 import { occludeQuizEntries } from '../../../../actions/ui';
 import { addError, screenreaderNotification } from '../../../../actions/alerts';
 import { interactionFileUpload, setOneAtATimeType } from '../../../../../building/api/quizzes';
-import { featureOn } from '../../../../util/featureCheck';
 import { getActiveQuizId, isActiveQuizWorkingInstanceOneQuestionAtATime } from '../../../../selectors/quizzes';
 function mapStateToProps(state, props) {
-    var errorsShowing = state.get('errorsShowing', Map());
+    var _state_errorsShowing;
+    var errorsShowing = (_state_errorsShowing = state.errorsShowing) !== null && _state_errorsShowing !== void 0 ? _state_errorsShowing : Map();
     var errorsAreShowing = errorsShowing.get(props.guid);
+    var _state_features;
+    var features = (_state_features = state.features) !== null && _state_features !== void 0 ? _state_features : Set();
     return {
         entry: props.quizEntry.getWorkingInstance().getItem(),
         errorsAreShowing: errorsAreShowing,
         oneQuestionAtATime: isActiveQuizWorkingInstanceOneQuestionAtATime(state),
-        partialDeepScoringEnabled: featureOn('partial_deep_scoring'),
-        partialScoringEnabled: featureOn('partial_scoring'),
+        partialDeepScoringEnabled: features.includes('partial_deep_scoring'),
+        partialScoringEnabled: features.includes('partial_scoring'),
+        multipleHotSpotEnabled: features.includes('multiple_hotspot_selections'),
         quizId: getActiveQuizId(state)
     };
 }

package/lib/common/components/resources/item/ItemOverride/presenter.js

@@ -127,7 +127,7 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import componentForItem from '../../../../util/componentForItem';
-import { COMPONENT_EDIT } from '@instructure/quiz-common';
+import { COMPONENT_EDIT } from '@instructure/quiz-common/constants';
 import { propsForInteractionEdit } from '../../../../util/interactionTypePropsHelper';
 export var ItemOverride = /*#__PURE__*/ function(Component) {
     "use strict";

package/lib/common/components/resources/item/ItemShow/index.js

@@ -128,7 +128,7 @@ import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import makeEditable from '../../../shared/functionality/makeEditable';
 import componentForItem from '../../../../util/componentForItem';
-import { COMPONENT_SHOW } from '@instructure/quiz-common';
+import { COMPONENT_SHOW } from '@instructure/quiz-common/constants';
 import { propsForInteractionShow } from '../../../../util/interactionTypePropsHelper';
 var ItemShow = /*#__PURE__*/ function(Component) {
     "use strict";

package/lib/common/components/resources/positionBox/PositionBox.js

@@ -97,7 +97,7 @@ import { ScreenReaderContent, PresentationContent } from '@instructure/ui-a11y-c
 import { jsx } from '@instructure/emotion';
 import generateStyle from './styles';
 import generateComponentTheme from './theme';
-import { withStyleOverrides } from '@instructure/quiz-common';
+import { withStyleOverrides } from '@instructure/quiz-common/util/withStyleOverrides';
 export var PositionBox = /*#__PURE__*/ function(Component) {
     "use strict";
     _inherits(PositionBox, Component);

package/lib/common/components/resources/quiz/AddContent/Body/presenter.js

@@ -1,5 +1,6 @@
 /** @jsx jsx */ import { jsx } from '@instructure/emotion';
-import { BUILD_TRAY_OPEN, BUILD_TRAY_POSITION, BUILD_TRAY_STIMULUS_ID, withStyleOverrides } from '@instructure/quiz-common';
+import { BUILD_TRAY_OPEN, BUILD_TRAY_POSITION, BUILD_TRAY_STIMULUS_ID } from '@instructure/quiz-common/constants';
+import { withStyleOverrides } from '@instructure/quiz-common/util/withStyleOverrides';
 import t from '@instructure/quiz-i18n/format-message';
 import { Button, IconButton, CloseButton } from '@instructure/ui-buttons';
 import { Grid } from '@instructure/ui-grid';

package/lib/common/components/resources/quiz/AddContent/Button/index.js

@@ -99,7 +99,8 @@ import { jsx } from '@instructure/emotion';
 import t from '@instructure/quiz-i18n/format-message';
 import generateStyle from './styles';
 import generateComponentTheme from './theme';
-import { END_EDITING_TRIGGER_CLASSNAME, withStyleOverrides } from '@instructure/quiz-common';
+import { END_EDITING_TRIGGER_CLASSNAME } from '@instructure/quiz-common/constants';
+import { withStyleOverrides } from '@instructure/quiz-common/util/withStyleOverrides';
 export var AddContentButton = /*#__PURE__*/ function(Component) {
     "use strict";
     _inherits(AddContentButton, Component);

package/lib/common/components/resources/quiz/AddContent/Modal/index.js

@@ -2,16 +2,10 @@ import { Map } from 'immutable';
 import { connect } from '../../../../../react-redux';
 import { closeModal } from '../../../../../actions/modal';
 import { AddContentModal as AddContentModalPresenter } from './presenter';
-import { ADD_CONTENT_MODAL, OPEN_ADD_CONTENT_MODAL_DATA } from '@instructure/quiz-common';
+import { ADD_CONTENT_MODAL, OPEN_ADD_CONTENT_MODAL_DATA } from '@instructure/quiz-common/constants';
 var mapStateToProps = function(state) {
-    var _state_getIn_toJS = state.getIn([
-        'modal',
-        OPEN_ADD_CONTENT_MODAL_DATA
-    ], Map()).toJS(), allowStimulusCreation = _state_getIn_toJS.allowStimulusCreation, parentEntryId = _state_getIn_toJS.parentEntryId, position = _state_getIn_toJS.position, quizId = _state_getIn_toJS.quizId, stimulusId = _state_getIn_toJS.stimulusId;
-    var modalOpen = state.getIn([
-        'modal',
-        'isOpen'
-    ]) === ADD_CONTENT_MODAL;
+    var _state_modal_get_toJS = state.modal.get(OPEN_ADD_CONTENT_MODAL_DATA, Map()).toJS(), allowStimulusCreation = _state_modal_get_toJS.allowStimulusCreation, parentEntryId = _state_modal_get_toJS.parentEntryId, position = _state_modal_get_toJS.position, quizId = _state_modal_get_toJS.quizId, stimulusId = _state_modal_get_toJS.stimulusId;
+    var modalOpen = state.modal.get('isOpen') === ADD_CONTENT_MODAL;
     return {
         allowStimulusCreation: allowStimulusCreation,
         modalOpen: modalOpen,