@instructure/quiz-core 20.36.1-rc.9 → 20.36.2

package/lib/banks/components/SharingModal/index.js

@@ -11,12 +11,14 @@ var _reactRedux = require("../../../common/react-redux.js");
 var _banks = require("../../api/banks.js");
 var _sharedBanks = require("../../../common/actions/sharedBanks.js");
 var _modal = require("../../../common/actions/modal.js");
+var _featureCheck = require("../../../common/util/featureCheck.js");
 var _presenter = _interopRequireDefault(require("./presenter.js"));
 function mapStateToProps(state, ownProps) {
   var sharedBanks = state.get('sharedBanks', (0, _immutable.Map)()).filter(function (sharedBank) {
     return sharedBank.get('bankId') === ownProps.bank.id;
   }).toList();
   return {
+    subAccountBankSharingEnabled: (0, _featureCheck.featureOn)('sub_account_bank_sharing'),
     sharedBanks: sharedBanks
   };
 }

package/lib/banks/components/SharingModal/presenter.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.SharingModalPresenter = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
@@ -27,6 +27,7 @@ var _uiView = require("@instructure/ui-view");
 var _uiGrid = require("@instructure/ui-grid");
 var _uiTabs = require("@instructure/ui-tabs");
 var _uiText = require("@instructure/ui-text");
+var _uiSimpleSelect = require("@instructure/ui-simple-select");
 var _emotion = require("@instructure/emotion");
 var _ElementsForSelectors = _interopRequireDefault(require("../../../common/util/ElementsForSelectors.js"));
 var _CustomPropTypes = _interopRequireDefault(require("../../../common/util/CustomPropTypes.js"));
@@ -184,7 +185,27 @@ var SharingModalPresenter = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.
       return originalEntity.get('permission', _quizCommon.CAN_EDIT);
     };
     _this.handleEntityRemove = function (entity, undoRemove) {
-      _this.confirmPermissionChange(entity, _quizCommon.REMOVED_ACCESS);
+      if (_this.props.subAccountBankSharingEnabled) {
+        _this.confirmPermissionChange(entity, _quizCommon.REMOVED_ACCESS);
+      } else {
+        var permission = undoRemove ? _this.originalPermissionForEntity(entity) : _quizCommon.REMOVED_ACCESS;
+        _this.setState(function (prevState) {
+          var sharesIndex = prevState.shares.findIndex(function (e) {
+            return e.get('id') == entity.get('id');
+          });
+          var newEntitiesIndex = prevState.newEntities.findIndex(function (e) {
+            return e.get('id') == entity.get('id');
+          });
+          var removedNewEntity = newEntitiesIndex > -1;
+          var newShares = removedNewEntity ? prevState.shares.delete(sharesIndex) : prevState.shares.setIn([sharesIndex, 'permission'], permission);
+          var newEntities = removedNewEntity ? prevState.newEntities.delete(newEntitiesIndex) : prevState.newEntities;
+          return {
+            shares: newShares,
+            newEntities: newEntities,
+            entitiesWithChangedPermission: Object.assign({}, prevState.entitiesWithChangedPermission, (0, _defineProperty2.default)({}, entity.get('id'), permission))
+          };
+        }, _this.updateEntitiesCount);
+      }
     };
     _this.handleSearchPermissionChange = function (e, _ref4) {
       var value = _ref4.value;
@@ -211,13 +232,21 @@ var SharingModalPresenter = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.
           permission: _this.state.searchPermission
         });
       }));
-      newEntities.forEach(function (entity) {
-        _this.props.onShare(entity.toJS());
-        _this.props.shareBank(_this.sharedBankForEntity(entity), _this.props.getUserInfo);
-      });
-      _this.setState({
-        searchSelection: []
-      });
+      if (_this.props.subAccountBankSharingEnabled) {
+        newEntities.forEach(function (entity) {
+          _this.props.onShare(entity.toJS());
+          _this.props.shareBank(_this.sharedBankForEntity(entity), _this.props.getUserInfo);
+        });
+        _this.setState({
+          searchSelection: []
+        });
+      } else {
+        _this.setState({
+          searchSelection: [],
+          shares: newEntities.concat(_this.state.shares),
+          newEntities: newEntities.concat(_this.state.newEntities)
+        }, _this.updateEntitiesCount);
+      }
     };
     _this.updatePermission = /*#__PURE__*/function () {
       var _ref5 = (0, _asyncToGenerator2.default)(/*#__PURE__*/_regenerator.default.mark(function _callee(entity, permission) {
@@ -262,7 +291,19 @@ var SharingModalPresenter = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.
       });
     };
     _this.handleEntityPermissionChange = function (entity, permission) {
-      _this.confirmPermissionChange(entity, permission);
+      if (_this.props.subAccountBankSharingEnabled) {
+        _this.confirmPermissionChange(entity, permission);
+      } else {
+        _this.setState(function (prevState) {
+          var index = prevState.shares.findIndex(function (share) {
+            return share.get('id') === entity.get('id');
+          });
+          return {
+            shares: prevState.shares.setIn([index, 'permission'], permission),
+            entitiesWithChangedPermission: Object.assign({}, prevState.entitiesWithChangedPermission, (0, _defineProperty2.default)({}, entity.get('id'), permission))
+          };
+        });
+      }
     };
     _this.toggleAccountShare = function (event) {
       _this.setState(function (prevState) {
@@ -299,14 +340,14 @@ var SharingModalPresenter = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.
           selectionFilter: _this.handleSearchFilter
         })), (0, _emotion.jsx)(_uiGrid.Grid.Col, {
           width: "auto"
-        }, (0, _emotion.jsx)(_quizCommon.SimpleSelect, {
+        }, (0, _emotion.jsx)(_uiSimpleSelect.SimpleSelect, {
           onChange: _this.handleSearchPermissionChange,
           value: _this.state.searchPermission,
           renderLabel: (0, _formatMessage.default)('Access')
-        }, (0, _emotion.jsx)(_quizCommon.SimpleSelect.Option, {
+        }, (0, _emotion.jsx)(_uiSimpleSelect.SimpleSelect.Option, {
           id: "sharing-modal-search-section-select-option-can-view",
           value: _quizCommon.READ_ONLY
-        }, (0, _formatMessage.default)('Can view')), (0, _emotion.jsx)(_quizCommon.SimpleSelect.Option, {
+        }, (0, _formatMessage.default)('Can view')), (0, _emotion.jsx)(_uiSimpleSelect.SimpleSelect.Option, {
           id: "sharing-modal-search-section-select-option-can-edit",
           value: _quizCommon.CAN_EDIT
         }, (0, _formatMessage.default)('Can edit')))), (0, _emotion.jsx)(_uiGrid.Grid.Col, {
@@ -351,7 +392,7 @@ var SharingModalPresenter = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.
   }, {
     key: "componentDidUpdate",
     value: function componentDidUpdate(prevProps, prevState) {
-      if (this.state.accountPermission !== prevState.accountPermission && this.state.accountPermission !== this.props.bank.accountPermission) {
+      if (this.props.subAccountBankSharingEnabled && this.state.accountPermission !== prevState.accountPermission && this.state.accountPermission !== this.props.bank.accountPermission) {
         var updatedBank = this.props.bank.set('accountPermission', this.state.accountPermission);
         this.props.updateBank(updatedBank, false);
       }
@@ -470,20 +511,37 @@ var SharingModalPresenter = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.
       var existingAccounts = existingShares.filter(function (s) {
         return s.get('entityType') === _quizCommon.SHARED_WITH_ACCOUNT;
       });
-      return this.renderSubaccountSharingEnabledEntities(existingPeople, existingCourses, existingAccounts);
+      if (this.props.subAccountBankSharingEnabled) {
+        return this.renderSubaccountSharingEnabledEntities(existingPeople, existingCourses, existingAccounts);
+      }
+      return this.renderOriginalDesignEntities(existingPeople, existingCourses);
     }
   }, {
     key: "renderFooter",
     value: function renderFooter() {
-      return (0, _emotion.jsx)(_uiButtons.Button, {
+      if (this.props.subAccountBankSharingEnabled) {
+        return (0, _emotion.jsx)(_uiButtons.Button, {
+          color: "primary",
+          margin: "0 x-small 0 0",
+          onClick: this.handleDismiss
+        }, (0, _formatMessage.default)('Close'));
+      }
+      return (0, _emotion.jsx)(_react.default.Fragment, null, (0, _emotion.jsx)(_uiButtons.Button, {
+        "data-automation": "sdk-shared-bank-cancel-button",
+        color: "primary-inverse",
+        onClick: this.handleDismiss,
+        margin: "0 x-small 0 0"
+      }, (0, _formatMessage.default)('Cancel')), (0, _emotion.jsx)(_uiButtons.Button, {
+        "data-automation": "sdk-shared-bank-done-button",
         color: "primary",
-        margin: "0 x-small 0 0",
-        onClick: this.handleDismiss
-      }, (0, _formatMessage.default)('Close'));
+        onClick: this.handleSubmit,
+        margin: "0 x-small 0 0"
+      }, (0, _formatMessage.default)('Done')));
     }
   }, {
     key: "render",
     value: function render() {
+      var subAccountBankSharingEnabled = this.props.subAccountBankSharingEnabled;
       return (0, _emotion.jsx)(_quizCommon.Modal, {
         open: this.props.isOpen,
         onDismiss: this.handleDismiss,
@@ -496,7 +554,7 @@ var SharingModalPresenter = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.
         placement: "end",
         offset: "medium",
         screenReaderLabel: (0, _formatMessage.default)('Close')
-      })), (0, _emotion.jsx)(_quizCommon.ModalBody, null, this.state.shares.size >= 0 ? this.renderEntitiesSection() : _ref7), (0, _emotion.jsx)(_quizCommon.ModalFooter, null, this.renderFooter()));
+      })), (0, _emotion.jsx)(_quizCommon.ModalBody, null, !subAccountBankSharingEnabled && this.renderRootAccountSharing(), !subAccountBankSharingEnabled && this.renderSearchSection(), this.state.shares.size >= 0 ? this.renderEntitiesSection() : _ref7), (0, _emotion.jsx)(_quizCommon.ModalFooter, null, this.renderFooter()));
     }
   }]);
   SharingModalPresenter.displayName = "SharingModalPresenter";
@@ -531,6 +589,7 @@ var SharingModalPresenter = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.
   removeSharedBank: _propTypes.default.func.isRequired,
   shareBank: _propTypes.default.func.isRequired,
   sharedBanks: _reactImmutableProptypes.default.list,
+  subAccountBankSharingEnabled: _propTypes.default.bool,
   updateBank: _propTypes.default.func.isRequired,
   updateSharedBankPermission: _propTypes.default.func.isRequired,
   updateSharedCount: _propTypes.default.func,
@@ -545,6 +604,7 @@ var SharingModalPresenter = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.
   onDismiss: noop,
   onShare: function onShare() {},
   sharedBanks: (0, _immutable.List)(),
+  subAccountBankSharingEnabled: false,
   updateSharedCount: Function.prototype
 }, _SharingModalPresenter)) || _class);
 exports.SharingModalPresenter = SharingModalPresenter;

package/lib/building/components/resources/quizEntry/QuizEntryEdit/Header/index.js

@@ -17,6 +17,7 @@ var _reactImmutableProptypes = _interopRequireDefault(require("react-immutable-p
 var _partial = _interopRequireDefault(require("lodash/partial"));
 var _uiA11yContent = require("@instructure/ui-a11y-content");
 var _uiButtons = require("@instructure/ui-buttons");
+var _uiTextInput = require("@instructure/ui-text-input");
 var _emotion = require("@instructure/emotion");
 var _quizInteractions = require("@instructure/quiz-interactions");
 var _uiIcons = require("@instructure/ui-icons");
@@ -221,7 +222,7 @@ var QuizEntryHeader = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defaul
         css: this.props.styles.titleHolder
       }, (0, _emotion.jsx)("span", {
         css: this.props.styles.titleInput
-      }, (0, _emotion.jsx)(_quizCommon.TextInput, {
+      }, (0, _emotion.jsx)(_uiTextInput.TextInput, {
         ref: this.storeTitleRef,
         renderLabel: (0, _emotion.jsx)(_uiA11yContent.ScreenReaderContent, null, titleLabelText),
         type: "text",

package/lib/common/components/ImportModal/presenter.js

@@ -19,6 +19,7 @@ var _uiProgress = require("@instructure/ui-progress");
 var _uiHeading = require("@instructure/ui-heading");
 var _uiTabs = require("@instructure/ui-tabs");
 var _uiToggleDetails = require("@instructure/ui-toggle-details");
+var _uiTextInput = require("@instructure/ui-text-input");
 var _emotion = require("@instructure/emotion");
 var _quizCommon = require("@instructure/quiz-common");
 var _styles = _interopRequireDefault(require("./styles.js"));
@@ -199,7 +200,7 @@ var ImportModal = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.default, _
         "data-automation": "sdk-import-file-selector"
       }), fileType === 'image/*' && (0, _emotion.jsx)("div", {
         css: this.props.styles.altTextWrapper
-      }, (0, _emotion.jsx)(_quizCommon.TextInput, {
+      }, (0, _emotion.jsx)(_uiTextInput.TextInput, {
         ref: this.setRef('altTextInput'),
         onChange: this.onAltTextChange,
         value: this.props.altText,

package/lib/common/components/layout/Page/styles.js

@@ -26,7 +26,7 @@ var generateStyle = function generateStyle(componentTheme, props) {
       transition: componentTheme.contentTransition,
       width: '100%',
       '.user_content p': {
-        margin: "".concat(componentTheme.userContentMargin, " 0"),
+        margin: componentTheme.userContentMargin,
         '&:first-of-type': {
           marginTop: componentTheme.userContentZeroMargin
         },

package/lib/common/components/layout/header/Calculator/presenter.js

@@ -30,8 +30,8 @@ var CalculatorButton = function CalculatorButton(_ref) {
       variant: "icon",
       renderIcon: _ref2,
       disabled: !enabled,
-      tooltip: (0, _formatMessage.default)('This calculator has accessibility limitations.')
-    }, (0, _formatMessage.default)('Calculator'), /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('Use the arrow keys to move the calculator after selecting "Move". Screen readers may not announce the launch clearly.')));
+      tooltip: (0, _formatMessage.default)('Calculator')
+    }, (0, _formatMessage.default)('Calculator'));
   }
   return /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {
     renderIcon: _uiIcons.IconCalculatorLine,

package/lib/common/components/layout/navbar/styles.js

@@ -1,17 +1,17 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _externalStyles = require("./externalStyles.js");
 var generateStyle = function generateStyle(componentTheme) {
-  return (0, _objectSpread2.default)({
+  return {
+    showBrandIcon: true,
+    desktopBottomBorder: true,
+    desktopBottomBorderInverse: true,
     backgroundColor: componentTheme.backgroundColor,
     phoneBreakPoint: componentTheme.phoneBreakPoint
-  }, (0, _externalStyles.generateExternalStyle)());
+  };
 };
 var _default = generateStyle;
 exports.default = _default;

package/lib/common/components/layout/sidebar/Sidebar/styles.js

@@ -7,17 +7,19 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _merge = _interopRequireDefault(require("lodash/merge"));
-var _externalStyles = require("./externalStyles.js");
 var generateStyle = function generateStyle(componentTheme, props) {
   var _commonContainer;
   var mq = "@media screen and (".concat(componentTheme.phoneBreakPoint, ")");
   var mp = '@media print';
-  return (0, _merge.default)({
+  return {
     sidebar: (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _defineProperty2.default)({
       boxSizing: 'border-box',
       width: componentTheme.sidebarWidthClosed,
       backgroundColor: componentTheme.sidebarBackgroundColor,
+      borderTop: "".concat(componentTheme.sidebarBorderWidth, " solid ").concat(componentTheme.sidebarBorderColor),
+      borderRight: "".concat(componentTheme.sidebarBorderWidth, " solid ").concat(componentTheme.sidebarBorderColor),
+      borderBottom: "".concat(componentTheme.sidebarBorderWidth, " solid ").concat(componentTheme.sidebarBorderColor),
+      borderLeft: "".concat(componentTheme.sidebarBorderWidth, " solid ").concat(componentTheme.sidebarBorderColor),
       color: componentTheme.sidebarColor,
       height: '100%',
       overflow: 'hidden',
@@ -116,7 +118,7 @@ var generateStyle = function generateStyle(componentTheme, props) {
     }), (0, _defineProperty2.default)(_commonContainer, mp, {
       display: 'none'
     }), _commonContainer)
-  }, (0, _externalStyles.generateExternalStyle)(componentTheme));
+  };
 };
 var _default = generateStyle;
 exports.default = _default;

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

@@ -15,6 +15,7 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactImmutableProptypes = _interopRequireDefault(require("react-immutable-proptypes"));
 var _OutcomeAlignments = _interopRequireDefault(require("@instructure/outcomes-ui/es/containers/OutcomeAlignments"));
 var _OutcomeCount = _interopRequireDefault(require("@instructure/outcomes-ui/es/containers/OutcomeCount"));
+var _uiFormField = require("@instructure/ui-form-field");
 var _uiA11yContent = require("@instructure/ui-a11y-content");
 var _CustomPropTypes = _interopRequireDefault(require("../../../../../common/util/CustomPropTypes.js"));
 var _componentForItem = _interopRequireDefault(require("../../../../util/componentForItem.js"));
@@ -23,6 +24,7 @@ var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/f
 var _interactionTypePropsHelper = require("../../../../util/interactionTypePropsHelper.js");
 var _ElementsForSelectors = _interopRequireDefault(require("../../../../../common/util/ElementsForSelectors.js"));
 var _instUIMessages = require("../../../../util/instUIMessages.js");
+var _featureCheck = require("../../../../../common/util/featureCheck.js");
 var ItemEdit = /*#__PURE__*/function (_Component) {
   (0, _inherits2.default)(ItemEdit, _Component);
   var _super = (0, _createSuper2.default)(ItemEdit);
@@ -70,7 +72,7 @@ var ItemEdit = /*#__PURE__*/function (_Component) {
       var launchContextUuid = this.props.scope.launch_context_uuid;
       var launchContextTitle = this.props.scope.title;
       // If editing within a quiz, there is no account launch context
-      if (rootAccountName) {
+      if ((0, _featureCheck.featureOn)('sub_account_bank_sharing') && rootAccountName) {
         launchContexts.push({
           uuid: this.props.rootAccountUuid,
           name: rootAccountName
@@ -134,7 +136,7 @@ var ItemEdit = /*#__PURE__*/function (_Component) {
       var interactionType = item.getInteractionType().slug;
       var Interaction = (0, _componentForItem.default)(interactionType, _quizCommon.COMPONENT_EDIT);
       var propsForInteraction = (0, _interactionTypePropsHelper.propsForInteractionEdit)(this.props, this.additionalEditOptions());
-      return /*#__PURE__*/_react.default.createElement(_quizCommon.FormFieldGroup, {
+      return /*#__PURE__*/_react.default.createElement(_uiFormField.FormFieldGroup, {
         messages: this.getError('onSelf'),
         description: /*#__PURE__*/_react.default.createElement(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('Edit question:')),
         name: "edit_item_".concat(this.props.guid)

package/lib/common/components/resources/quiz/instructions/styles.js

@@ -18,7 +18,7 @@ var generateStyle = function generateStyle(componentTheme) {
         display: 'table'
       },
       '.user_content p': {
-        margin: "".concat(componentTheme.userContentMargin, " 0"),
+        margin: componentTheme.userContentMargin,
         '&:first-of-type': {
           marginTop: componentTheme.userContentZeroMargin
         },

package/lib/common/components/resources/stimulus/StimulusEditInfo/presenter.js

@@ -13,11 +13,13 @@ var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _reactImmutableProptypes = _interopRequireDefault(require("react-immutable-proptypes"));
 var _uiA11yContent = require("@instructure/ui-a11y-content");
+var _uiTextInput = require("@instructure/ui-text-input");
 var _uiFormField = require("@instructure/ui-form-field");
 var _emotion = require("@instructure/emotion");
 var _uiHeading = require("@instructure/ui-heading");
 var _quizRce = require("@instructure/quiz-rce");
 var _instUIMessages = require("../../../../util/instUIMessages.js");
+var _uiSimpleSelect = require("@instructure/ui-simple-select");
 var _uiIcons = require("@instructure/ui-icons");
 var _uiToggleDetails = require("@instructure/ui-toggle-details");
 var _quizCommon = require("@instructure/quiz-common");
@@ -83,18 +85,18 @@ var StimulusEditInfo = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defau
       var stimulusOrientation = this.props.workingStimulus.get('orientation');
       return (0, _emotion.jsx)("div", {
         css: this.props.styles.section
-      }, (0, _emotion.jsx)(_quizCommon.SimpleSelect, {
+      }, (0, _emotion.jsx)(_uiSimpleSelect.SimpleSelect, {
         renderLabel: (0, _formatMessage.default)('Orientation'),
         onChange: this.onOrientationChange,
         value: stimulusOrientation,
         renderBeforeInput: (0, _emotion.jsx)(_uiIcons.IconUpdownLine, {
           rotate: stimulusOrientation === _quizCommon.TOP ? '0' : '90'
         })
-      }, (0, _emotion.jsx)(_quizCommon.SimpleSelect.Option, {
+      }, (0, _emotion.jsx)(_uiSimpleSelect.SimpleSelect.Option, {
         renderBeforeLabel: _ref3,
         id: "stimulus-orientation-select-option-left",
         value: "left"
-      }, (0, _formatMessage.default)('Questions to the right')), (0, _emotion.jsx)(_quizCommon.SimpleSelect.Option, {
+      }, (0, _formatMessage.default)('Questions to the right')), (0, _emotion.jsx)(_uiSimpleSelect.SimpleSelect.Option, {
         renderBeforeLabel: _ref4,
         id: "stimulus-orientation-select-option-top",
         value: "top"
@@ -106,7 +108,7 @@ var StimulusEditInfo = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defau
       var stimulus = this.props.workingStimulus;
       var textAreaId = "stimulusBodyEdit_".concat(stimulus.id, "_").concat(this.props.isBankedContent);
       var stimulusBodyId = "stimulusBodyEdit_".concat(stimulus.id, "_body");
-      return (0, _emotion.jsx)(_quizCommon.FormFieldGroup, {
+      return (0, _emotion.jsx)(_uiFormField.FormFieldGroup, {
         messages: this.inputErrors('onSelf'),
         description: (0, _emotion.jsx)(_uiA11yContent.ScreenReaderContent, null, (0, _formatMessage.default)('Edit Stimulus'))
       }, (0, _emotion.jsx)(_uiHeading.Heading, {
@@ -114,7 +116,7 @@ var StimulusEditInfo = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defau
         as: "h2"
       }, this.headerText()), (0, _emotion.jsx)("div", {
         css: this.props.styles.section
-      }, (0, _emotion.jsx)(_quizCommon.TextInput, {
+      }, (0, _emotion.jsx)(_uiTextInput.TextInput, {
         messages: this.inputErrors('title'),
         renderLabel: (0, _formatMessage.default)('Title'),
         type: "text",
@@ -124,7 +126,7 @@ var StimulusEditInfo = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defau
         "data-automation": "sdk-stimulus-title-input"
       })), (0, _emotion.jsx)("div", {
         css: this.props.styles.section
-      }, (0, _emotion.jsx)(_quizCommon.TextInput, {
+      }, (0, _emotion.jsx)(_uiTextInput.TextInput, {
         renderLabel: this.renderOptionalLabel((0, _formatMessage.default)('Instructions')),
         type: "text",
         onChange: this.onTextInputChange('instructions'),
@@ -155,7 +157,7 @@ var StimulusEditInfo = (_dec = (0, _quizCommon.withStyleOverrides)(_styles.defau
         summary: (0, _formatMessage.default)('Options')
       }, this.props.stimulusOrientationEnabled ? this.renderStimulusOrientationSelect() : null, (0, _emotion.jsx)("div", {
         css: this.props.styles.section
-      }, (0, _emotion.jsx)(_quizCommon.TextInput, {
+      }, (0, _emotion.jsx)(_uiTextInput.TextInput, {
         renderLabel: this.renderOptionalLabel((0, _formatMessage.default)('Source URL'), (0, _formatMessage.default)('(optional - not visible to students)')),
         type: "text",
         onChange: this.onTextInputChange('sourceUrl'),

package/lib/common/components/shared/GenericAsyncSearch/GenericAsyncSearch.js

@@ -13,6 +13,7 @@ var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/creat
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _debounce = _interopRequireDefault(require("lodash/fp/debounce"));
+var _uiSelect = require("@instructure/ui-select");
 var _uiSpinner = require("@instructure/ui-spinner");
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 var _quizCommon = require("@instructure/quiz-common");
@@ -90,7 +91,7 @@ var GenericAsyncSearch = /*#__PURE__*/function (_Component) {
     };
     _this.actualOptions = function () {
       return _this.state.options.map(function (option) {
-        return /*#__PURE__*/_react.default.createElement(_quizCommon.Select.Option, {
+        return /*#__PURE__*/_react.default.createElement(_uiSelect.Select.Option, {
           id: option.id,
           key: option.id,
           isHighlighted: option.id === _this.state.highlightedOptionId
@@ -106,7 +107,7 @@ var GenericAsyncSearch = /*#__PURE__*/function (_Component) {
       return _this.state.inputValue === '' ? (0, _formatMessage.default)('Write to search') : (0, _formatMessage.default)('No Results');
     };
     _this.emptyOrLoadingOption = function () {
-      return /*#__PURE__*/_react.default.createElement(_quizCommon.Select.Option, {
+      return /*#__PURE__*/_react.default.createElement(_uiSelect.Select.Option, {
         id: _quizCommon.SELECT_EMPTY_OPTION,
         key: _quizCommon.SELECT_EMPTY_OPTION
       }, _this.state.isLoading ? /*#__PURE__*/_react.default.createElement(_uiSpinner.Spinner, {
@@ -140,7 +141,7 @@ var GenericAsyncSearch = /*#__PURE__*/function (_Component) {
   }, {
     key: "render",
     value: function render() {
-      return /*#__PURE__*/_react.default.createElement(_quizCommon.Select, {
+      return /*#__PURE__*/_react.default.createElement(_uiSelect.Select, {
         "data-automation": this.props.selectAutomation,
         renderLabel: this.props.label,
         placeholder: this.props.placeholder,

package/lib/common/components/shared/TagSelect/presenter.js

@@ -13,6 +13,7 @@ var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits
 var _createSuper2 = _interopRequireDefault(require("@babel/runtime/helpers/createSuper"));
 var _react = _interopRequireWildcard(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
+var _uiSelect = require("@instructure/ui-select");
 var _index = _interopRequireDefault(require("../TagWrapper/index.js"));
 var _differenceBy = _interopRequireDefault(require("lodash/differenceBy"));
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
@@ -180,7 +181,7 @@ var TagSelect = /*#__PURE__*/function (_Component) {
         tagSuggestions = _this$props2.tagSuggestions;
       var notSelectedTagSuggestions = (0, _differenceBy.default)(tagSuggestions, tags, 'value');
       var options = notSelectedTagSuggestions.map(function (tag) {
-        return /*#__PURE__*/_react.default.createElement(_quizCommon.Select.Option, {
+        return /*#__PURE__*/_react.default.createElement(_uiSelect.Select.Option, {
           key: _this3.encodeTag(tag),
           id: _this3.encodeTag(tag),
           isHighlighted: _this3.encodeTag(tag) === _this3.state.highlightedOptionId
@@ -192,7 +193,7 @@ var TagSelect = /*#__PURE__*/function (_Component) {
         return tag.value === inputValue;
       })) {
         if (allowNewTags && inputValue.length > 0) {
-          options.push(/*#__PURE__*/_react.default.createElement(_quizCommon.Select.Option, {
+          options.push(/*#__PURE__*/_react.default.createElement(_uiSelect.Select.Option, {
             id: this.encodeTag({
               value: inputValue
             }),
@@ -206,7 +207,7 @@ var TagSelect = /*#__PURE__*/function (_Component) {
         }
       }
       if (options.length === 0) {
-        options.push(/*#__PURE__*/_react.default.createElement(_quizCommon.Select.Option, {
+        options.push(/*#__PURE__*/_react.default.createElement(_uiSelect.Select.Option, {
           id: _quizCommon.SELECT_EMPTY_OPTION,
           key: _quizCommon.SELECT_EMPTY_OPTION
         }, this.emptyOption()));
@@ -219,7 +220,7 @@ var TagSelect = /*#__PURE__*/function (_Component) {
       var _this$state = this.state,
         inputValue = _this$state.inputValue,
         isShowingOptions = _this$state.isShowingOptions;
-      return /*#__PURE__*/_react.default.createElement(_quizCommon.Select, {
+      return /*#__PURE__*/_react.default.createElement(_uiSelect.Select, {
         renderLabel: (0, _formatMessage.default)('Tags and Metadata'),
         inputValue: inputValue,
         isShowingOptions: isShowingOptions,

package/lib/common/components/shared/TimeUnitsInput/index.js

@@ -144,8 +144,7 @@ var TimeUnitsInput = /*#__PURE__*/function (_Component) {
         newHours = _breakdownSeconds4.hours,
         newMinutes = _breakdownSeconds4.minutes;
       if (_this.state.shouldResetOnNormalize) {
-        var _this$props$onReset, _this$props;
-        (_this$props$onReset = (_this$props = _this.props).onReset) === null || _this$props$onReset === void 0 ? void 0 : _this$props$onReset.call(_this$props);
+        _this.props.onReset();
       }
       _this.setState({
         days: newDays,

package/lib/index.js

@@ -82,8 +82,6 @@ var _exportNames = {
   TagWrapper: true,
   RetryGradePassbackButton: true,
   GenericAsyncSearch: true,
-  MaskedTextInput: true,
-  AccessCodeTextInput: true,
   config: true,
   Fetcher: true,
   httpHeaders: true,
@@ -675,18 +673,6 @@ Object.defineProperty(exports, "GenericAsyncSearch", {
     return _GenericAsyncSearch.GenericAsyncSearch;
   }
 });
-Object.defineProperty(exports, "MaskedTextInput", {
-  enumerable: true,
-  get: function get() {
-    return _index58.MaskedTextInput;
-  }
-});
-Object.defineProperty(exports, "AccessCodeTextInput", {
-  enumerable: true,
-  get: function get() {
-    return _index59.AccessCodeTextInput;
-  }
-});
 Object.defineProperty(exports, "config", {
   enumerable: true,
   get: function get() {
@@ -798,7 +784,7 @@ Object.defineProperty(exports, "formatTime", {
 Object.defineProperty(exports, "generateImportModalId", {
   enumerable: true,
   get: function get() {
-    return _index60.generateImportModalId;
+    return _index58.generateImportModalId;
   }
 });
 Object.defineProperty(exports, "TimerService", {
@@ -1547,8 +1533,6 @@ var _index55 = require("./common/components/shared/FormattedDuration/index.js");
 var _index56 = _interopRequireDefault(require("./common/components/shared/TagWrapper/index.js"));
 var _index57 = require("./moderating/components/resources/RetryGradePassbackButton/index.js");
 var _GenericAsyncSearch = require("./common/components/shared/GenericAsyncSearch/GenericAsyncSearch.js");
-var _index58 = require("./common/components/MaskedTextInput/index.js");
-var _index59 = require("./common/components/AccessCodeTextInput/index.js");
 var _config = require("./config.js");
 var _Fetcher = require("./common/util/Fetcher.js");
 var _httpHeaders = require("./common/util/httpHeaders.js");
@@ -1561,7 +1545,7 @@ var _interactionTypePropsHelper = require("./common/util/interactionTypePropsHel
 var _generateDisplayPositions = require("./common/util/generateDisplayPositions.js");
 var _makeScrollable = require("./common/components/shared/functionality/makeScrollable.js");
 var _formatTimespan = require("./common/util/formatTimespan.js");
-var _index60 = require("./common/components/ImportModal/index.js");
+var _index58 = require("./common/components/ImportModal/index.js");
 var _TimerService = require("./common/util/TimerService.js");
 var _TimeRecordingService = require("./common/util/TimeRecordingService.js");
 var _windowChecks = require("./common/util/windowChecks.js");
@@ -1608,15 +1592,15 @@ var _rce2 = require("./common/selectors/rce.js");
 var _quizSessions4 = require("./common/selectors/quizSessions.js");
 var _sessionItems = require("./common/selectors/sessionItems.js");
 var _sessionItemResults = require("./common/selectors/sessionItemResults.js");
-var _index61 = require("./common/records/index.js");
-Object.keys(_index61).forEach(function (key) {
+var _index59 = require("./common/records/index.js");
+Object.keys(_index59).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
-  if (key in exports && exports[key] === _index61[key]) return;
+  if (key in exports && exports[key] === _index59[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
-      return _index61[key];
+      return _index59[key];
     }
   });
 });