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

package/es/banks/components/AddToBankModal/presenter.js

@@ -6,12 +6,13 @@ import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Button, CloseButton } from '@instructure/ui-buttons';
 import { Heading } from '@instructure/ui-heading';
+import { TextInput } from '@instructure/ui-text-input';
 import { RadioInputGroup, RadioInput } from '@instructure/ui-radio-input';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import Bank from "../../../common/records/Bank.js";
 import BankSelection from "../../../common/components/resources/BankSelection/presenter.js";
 import t from '@instructure/quiz-i18n/es/format-message';
-import { Modal, ModalHeader, ModalBody, ModalFooter, TextInput, XSMALL_SIDE_MARGIN } from '@instructure/quiz-common';
+import { Modal, ModalHeader, ModalBody, ModalFooter, XSMALL_SIDE_MARGIN } from '@instructure/quiz-common';
 import { featureOn } from "../../../common/util/featureCheck.js";
 var _ref = /*#__PURE__*/React.createElement("br", null);
 export var AddToBankModal = /*#__PURE__*/function (_Component) {

package/es/banks/components/AsyncSearch/index.js

@@ -9,9 +9,10 @@ import PropTypes from 'prop-types';
 import debounce from 'lodash/fp/debounce';
 import find from 'lodash/fp/find';
 import t from '@instructure/quiz-i18n/es/format-message';
+import { Select } from '@instructure/ui-select';
 import { Spinner } from '@instructure/ui-spinner';
 import TagWrapper from "../../../common/components/shared/TagWrapper/index.js";
-import { SHARED_WITH_USER, SHARED_WITH_COURSE, SHARED_WITH_ACCOUNT, SELECT_EMPTY_OPTION, Select } from '@instructure/quiz-common';
+import { SHARED_WITH_USER, SHARED_WITH_COURSE, SHARED_WITH_ACCOUNT, SELECT_EMPTY_OPTION } from '@instructure/quiz-common';
 export var AsyncSearch = /*#__PURE__*/function (_Component) {
   _inherits(AsyncSearch, _Component);
   var _super = _createSuper(AsyncSearch);

package/es/banks/components/BankEntry/presenter.js

@@ -23,6 +23,7 @@ import { Text } from '@instructure/ui-text';
 import { Heading } from '@instructure/ui-heading';
 import { IconDiscussionLine, IconDiscussionSolid } from '@instructure/ui-icons';
 import { PresentationContent, ScreenReaderContent } from '@instructure/ui-a11y-content';
+import { TextInput } from '@instructure/ui-text-input';
 import { jsx } from '@instructure/emotion';
 import { HeaderBreadCrumb } from "../HeaderBreadCrumb/index.js";
 import EntrySave from "../../../common/components/resources/entry/EntrySave/index.js";
@@ -40,7 +41,7 @@ import { createItem } from "../../../building/api/items.js";
 import { createStimulus } from "../../../building/api/stimuli.js";
 import { propsForItemVersioningWrapper, propsForStimulusVersioningWrapper } from "../../../common/util/warningHelpers.js";
 import NavWrapper from "../NavWrapper/index.js";
-import { API_INPUT_VALIDATION_ERROR, CLEAR_ALL_INPUT_VALIDATION_ERRORS, ITEM_FEEDBACK_MODAL, ITEM_FEEDBACK_MODAL_ITEM, ITEM_FEEDBACK_MODAL_FEEDBACK, PARENT_TYPE_BANK, TextInput, withStyleOverrides } from '@instructure/quiz-common';
+import { API_INPUT_VALIDATION_ERROR, CLEAR_ALL_INPUT_VALIDATION_ERRORS, ITEM_FEEDBACK_MODAL, ITEM_FEEDBACK_MODAL_ITEM, ITEM_FEEDBACK_MODAL_FEEDBACK, PARENT_TYPE_BANK, withStyleOverrides } from '@instructure/quiz-common';
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
 var _ref3 = jsx(Spinner, null);

package/es/banks/components/BankSearch/presenter.js

@@ -10,6 +10,7 @@ import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { IconPlusLine } from '@instructure/ui-icons';
 import { Button, CondensedButton } from '@instructure/ui-buttons';
+import { TextInput } from '@instructure/ui-text-input';
 import { Checkbox } from '@instructure/ui-checkbox';
 import { View } from '@instructure/ui-view';
 import { Flex } from '@instructure/ui-flex';
@@ -21,7 +22,7 @@ import TagSuggestSelect from "../../../common/components/shared/TagSuggestSelect
 import { interactionTypesNameDictionary } from "../../../common/util/interactionTypeMetadata.js";
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
-import { TextInput, withStyleOverrides } from '@instructure/quiz-common';
+import { withStyleOverrides } from '@instructure/quiz-common';
 var tagShape = PropTypes.shape({
   tag: PropTypes.shape({
     id: PropTypes.string,

package/es/banks/components/Banks/index.js

@@ -19,6 +19,7 @@ function mapStateToProps(state, props) {
   return {
     itemBankSearchTableEnabled: featureOn('item_bank_search_table'),
     usedByCourseEnabled: featureOn('filter_item_banks_used_by_course'),
+    subAccountBankSharingEnabled: featureOn('sub_account_bank_sharing'),
     scopeType: scopeType,
     sortBy: sortBy,
     sortOrder: sortOrder,

package/es/banks/components/Banks/presenter.js

@@ -14,6 +14,8 @@ import { AccessibleContent, ScreenReaderContent } from '@instructure/ui-a11y-con
 import { IconPlusLine, IconArrowUpLine, IconArrowDownLine } from '@instructure/ui-icons';
 import { Billboard } from '@instructure/ui-billboard';
 import { Button } from '@instructure/ui-buttons';
+import { TextInput } from '@instructure/ui-text-input';
+import { SimpleSelect } from '@instructure/ui-simple-select';
 import { jsx } from '@instructure/emotion';
 import { Grid } from '@instructure/ui-grid';
 import { View } from '@instructure/ui-view';
@@ -22,7 +24,7 @@ import Page from "../../../common/components/layout/Page/index.js";
 import { HeaderBreadCrumb } from "../HeaderBreadCrumb/index.js";
 import PaginatedCollection from "../../../common/components/shared/PaginatedCollection/index.js";
 import t from '@instructure/quiz-i18n/es/format-message';
-import { BANKS_BANK_FILTERS, BANKS_BANK_PAGINATION, CREATE_BANK_MODAL, SHARED_WITH_ACCOUNT, withStyleOverrides, SimpleSelect, TextInput } from '@instructure/quiz-common';
+import { BANKS_BANK_FILTERS, BANKS_BANK_PAGINATION, CREATE_BANK_MODAL, SHARED_WITH_ACCOUNT, withStyleOverrides } from '@instructure/quiz-common';
 import BanksList from "../../../banks/components/BanksList/index.js";
 import CreateBankModal from "../../../banks/components/CreateBankModal/index.js";
 import NavWrapper from "../NavWrapper/index.js";
@@ -222,7 +224,7 @@ export var Banks = (_dec = withStyleOverrides(generateStyle, generateComponentTh
   }, {
     key: "topLevelBankFilterName",
     value: function topLevelBankFilterName() {
-      return t('Shared with Me');
+      return this.props.subAccountBankSharingEnabled ? t('Shared with Me') : t('All Banks');
     }
   }, {
     key: "renderFilters",
@@ -235,7 +237,7 @@ export var Banks = (_dec = withStyleOverrides(generateStyle, generateComponentTh
         translation: t('Institution Banks')
       }, {
         slug: 'courses',
-        translation: t('Shared with Courses')
+        translation: this.props.subAccountBankSharingEnabled ? t('Shared with Courses') : t('Banks Shared to Course')
       }];
       if (this.props.scope.uuid) {
         scopeOptions.push({
@@ -243,7 +245,7 @@ export var Banks = (_dec = withStyleOverrides(generateStyle, generateComponentTh
           translation: t('This Course')
         });
       }
-      if (this.isSubAccountLaunch()) {
+      if (this.props.subAccountBankSharingEnabled && this.isSubAccountLaunch()) {
         // Put this option below "Insitution Banks"
         scopeOptions.splice(2, 0, {
           slug: 'this_account',
@@ -302,7 +304,7 @@ export var Banks = (_dec = withStyleOverrides(generateStyle, generateComponentTh
         onChange: this.handleSearchInputChange,
         placeholder: t('Search Banks'),
         "data-automation": "sdk-search-bank-textinput"
-      })), !this.hideAccountSearch() && jsx(Grid.Col, {
+      })), this.props.subAccountBankSharingEnabled && !this.hideAccountSearch() && jsx(Grid.Col, {
         width: 4
       }, jsx(AsyncSearch, {
         getShareableSubaccounts: this.props.getShareableSubaccounts,
@@ -488,6 +490,7 @@ export var Banks = (_dec = withStyleOverrides(generateStyle, generateComponentTh
   usedByCourseEnabled: PropTypes.bool,
   itemBankSearchTableEnabled: PropTypes.bool,
   setUI: PropTypes.func.isRequired,
+  subAccountBankSharingEnabled: PropTypes.bool,
   iceTopNavBarEnabled: PropTypes.bool,
   styles: PropTypes.object,
   rootAccountUuid: PropTypes.string
@@ -514,6 +517,7 @@ export var Banks = (_dec = withStyleOverrides(generateStyle, generateComponentTh
   searchSelection: [],
   usedByCourseEnabled: false,
   itemBankSearchTableEnabled: false,
+  subAccountBankSharingEnabled: false,
   iceTopNavBarEnabled: false,
   rootAccountUuid: null
 }, _Banks.contextTypes = {

package/es/banks/components/CopyMoveBankEntryModal/presenter.js

@@ -5,6 +5,7 @@ import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Button, CloseButton } from '@instructure/ui-buttons';
+import { TextInput } from '@instructure/ui-text-input';
 import { RadioInputGroup, RadioInput } from '@instructure/ui-radio-input';
 import { Checkbox } from '@instructure/ui-checkbox';
 import { Heading } from '@instructure/ui-heading';
@@ -12,7 +13,7 @@ import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import t from '@instructure/quiz-i18n/es/format-message';
 import Bank from "../../../common/records/Bank.js";
 import BankSelection from "../../../common/components/resources/BankSelection/presenter.js";
-import { Modal, ModalHeader, ModalBody, ModalFooter, COPY_MOVE_BANK_ENTRY_MODAL_KEEP_COPY, TextInput, XSMALL_SIDE_MARGIN } from '@instructure/quiz-common';
+import { Modal, ModalHeader, ModalBody, ModalFooter, COPY_MOVE_BANK_ENTRY_MODAL_KEEP_COPY, XSMALL_SIDE_MARGIN } from '@instructure/quiz-common';
 import { featureOn } from "../../../common/util/featureCheck.js";
 var _ref = /*#__PURE__*/React.createElement("br", null);
 var _ref2 = /*#__PURE__*/React.createElement("br", null);

package/es/banks/components/CreateBankModal/presenter.js

@@ -9,12 +9,13 @@ import PropTypes from 'prop-types';
 import { Button, CloseButton } from '@instructure/ui-buttons';
 import { Checkbox } from '@instructure/ui-checkbox';
 import { View } from '@instructure/ui-view';
+import { TextInput } from '@instructure/ui-text-input';
 import { Heading } from '@instructure/ui-heading';
 import { jsx } from '@instructure/emotion';
 import t from '@instructure/quiz-i18n/es/format-message';
 import Bank from "../../../common/records/Bank.js";
 import { toErrors } from "../../../common/util/instUIMessages.js";
-import { Modal, ModalHeader, ModalBody, ModalFooter, TextInput, XSMALL_SIDE_MARGIN, withStyleOverrides } from '@instructure/quiz-common';
+import { Modal, ModalHeader, ModalBody, ModalFooter, XSMALL_SIDE_MARGIN, withStyleOverrides } from '@instructure/quiz-common';
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
 export var CreateBankModal = (_dec = withStyleOverrides(generateStyle, generateComponentTheme), _dec(_class = (_CreateBankModal = /*#__PURE__*/function (_Component) {

package/es/banks/components/EditBankModal/presenter.js

@@ -7,11 +7,12 @@ var _dec, _class, _EditBankModal;
 import { Component } from 'react';
 import PropTypes from 'prop-types';
 import { Button, CloseButton } from '@instructure/ui-buttons';
+import { TextInput } from '@instructure/ui-text-input';
 import { Heading } from '@instructure/ui-heading';
 import { jsx } from '@instructure/emotion';
 import t from '@instructure/quiz-i18n/es/format-message';
 import { toErrors } from "../../../common/util/instUIMessages.js";
-import { Modal, ModalHeader, ModalBody, ModalFooter, TextInput, XSMALL_SIDE_MARGIN, withStyleOverrides } from '@instructure/quiz-common';
+import { Modal, ModalHeader, ModalBody, ModalFooter, XSMALL_SIDE_MARGIN, withStyleOverrides } from '@instructure/quiz-common';
 import Bank from "../../../common/records/Bank.js";
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";

package/es/banks/components/NavWrapper/styles.js

@@ -1,7 +1,6 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { generateExternalStyle } from "./externalStyles.js";
 var generateStyle = function generateStyle(componentTheme) {
-  return _objectSpread({
+  return {
+    showReturnButton: true,
     nav: {
       display: 'flex',
       flexDirection: 'row',
@@ -26,6 +25,6 @@ var generateStyle = function generateStyle(componentTheme) {
     crumbs: {
       flex: 1
     }
-  }, generateExternalStyle());
+  };
 };
 export default generateStyle;

package/es/banks/components/SharingModal/RootAccountSharing.js

@@ -5,12 +5,13 @@ import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 var _dec, _class, _RootAccountSharing;
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
-import { withStyleOverrides, CAN_EDIT, READ_ONLY, SimpleSelect } from '@instructure/quiz-common';
+import { withStyleOverrides, CAN_EDIT, READ_ONLY } from '@instructure/quiz-common';
 import { IconAdminLine } from '@instructure/ui-icons';
 import { Checkbox } from '@instructure/ui-checkbox';
 import { View } from '@instructure/ui-view';
 import { Grid } from '@instructure/ui-grid';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
+import { SimpleSelect } from '@instructure/ui-simple-select';
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
 import t from '@instructure/quiz-i18n/es/format-message';

package/es/banks/components/SharingModal/ShareList/index.js

@@ -11,9 +11,10 @@ import { Map } from 'immutable';
 import { IconCoursesLine, IconTrashLine, IconResetLine } from '@instructure/ui-icons';
 import { Grid } from '@instructure/ui-grid';
 import { Avatar } from '@instructure/ui-avatar';
+import { SimpleSelect } from '@instructure/ui-simple-select';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import { jsx } from '@instructure/emotion';
-import { CAN_EDIT, READ_ONLY, REMOVED_ACCESS, SHARED_WITH_COURSE, SimpleSelect, withStyleOverrides } from '@instructure/quiz-common';
+import { CAN_EDIT, READ_ONLY, REMOVED_ACCESS, SHARED_WITH_COURSE, withStyleOverrides } from '@instructure/quiz-common';
 import t from '@instructure/quiz-i18n/es/format-message';
 import { ContextualIconButton } from "../ContextualIconButton/index.js";
 import generateStyle from "./styles.js";

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

@@ -4,12 +4,14 @@ import { connect } from "../../../common/react-redux.js";
 import { shareBank, getSharedBanks, updateSharedBankPermission, getBank, updateBank } from "../../api/banks.js";
 import { removeSharedBank } from "../../../common/actions/sharedBanks.js";
 import { withConfirm } from "../../../common/actions/modal.js";
+import { featureOn } from "../../../common/util/featureCheck.js";
 import SharingModal from "./presenter.js";
 function mapStateToProps(state, ownProps) {
   var sharedBanks = state.get('sharedBanks', Map()).filter(function (sharedBank) {
     return sharedBank.get('bankId') === ownProps.bank.id;
   }).toList();
   return {
+    subAccountBankSharingEnabled: featureOn('sub_account_bank_sharing'),
     sharedBanks: sharedBanks
   };
 }

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

@@ -1,6 +1,6 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
@@ -14,13 +14,14 @@ import PropTypes from 'prop-types';
 import { List, Map } from 'immutable';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import partial from 'lodash/partial';
-import { Modal, ModalHeader, ModalBody, ModalFooter, CAN_EDIT, READ_ONLY, REMOVED_ACCESS, SHARED_WITH_USER, SHARED_WITH_COURSE, SHARED_WITH_ACCOUNT, SimpleSelect, withStyleOverrides } from '@instructure/quiz-common';
+import { Modal, ModalHeader, ModalBody, ModalFooter, CAN_EDIT, READ_ONLY, REMOVED_ACCESS, SHARED_WITH_USER, SHARED_WITH_COURSE, SHARED_WITH_ACCOUNT, withStyleOverrides } from '@instructure/quiz-common';
 import { Heading } from '@instructure/ui-heading';
 import { Button, CloseButton } from '@instructure/ui-buttons';
 import { View } from '@instructure/ui-view';
 import { Grid } from '@instructure/ui-grid';
 import { Tabs } from '@instructure/ui-tabs';
 import { Text } from '@instructure/ui-text';
+import { SimpleSelect } from '@instructure/ui-simple-select';
 import { jsx } from '@instructure/emotion';
 import elementsForSelectors from "../../../common/util/ElementsForSelectors.js";
 import CustomPropTypes from "../../../common/util/CustomPropTypes.js";
@@ -176,7 +177,27 @@ export var SharingModalPresenter = (_dec = withStyleOverrides(generateStyle, gen
       return originalEntity.get('permission', CAN_EDIT);
     };
     _this.handleEntityRemove = function (entity, undoRemove) {
-      _this.confirmPermissionChange(entity, REMOVED_ACCESS);
+      if (_this.props.subAccountBankSharingEnabled) {
+        _this.confirmPermissionChange(entity, REMOVED_ACCESS);
+      } else {
+        var permission = undoRemove ? _this.originalPermissionForEntity(entity) : 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, _defineProperty({}, entity.get('id'), permission))
+          };
+        }, _this.updateEntitiesCount);
+      }
     };
     _this.handleSearchPermissionChange = function (e, _ref4) {
       var value = _ref4.value;
@@ -203,13 +224,21 @@ export var SharingModalPresenter = (_dec = withStyleOverrides(generateStyle, gen
           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 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(entity, permission) {
@@ -254,7 +283,19 @@ export var SharingModalPresenter = (_dec = withStyleOverrides(generateStyle, gen
       });
     };
     _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, _defineProperty({}, entity.get('id'), permission))
+          };
+        });
+      }
     };
     _this.toggleAccountShare = function (event) {
       _this.setState(function (prevState) {
@@ -343,7 +384,7 @@ export var SharingModalPresenter = (_dec = withStyleOverrides(generateStyle, gen
   }, {
     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);
       }
@@ -462,20 +503,37 @@ export var SharingModalPresenter = (_dec = withStyleOverrides(generateStyle, gen
       var existingAccounts = existingShares.filter(function (s) {
         return s.get('entityType') === 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 jsx(Button, {
+      if (this.props.subAccountBankSharingEnabled) {
+        return jsx(Button, {
+          color: "primary",
+          margin: "0 x-small 0 0",
+          onClick: this.handleDismiss
+        }, t('Close'));
+      }
+      return jsx(React.Fragment, null, jsx(Button, {
+        "data-automation": "sdk-shared-bank-cancel-button",
+        color: "primary-inverse",
+        onClick: this.handleDismiss,
+        margin: "0 x-small 0 0"
+      }, t('Cancel')), jsx(Button, {
+        "data-automation": "sdk-shared-bank-done-button",
         color: "primary",
-        margin: "0 x-small 0 0",
-        onClick: this.handleDismiss
-      }, t('Close'));
+        onClick: this.handleSubmit,
+        margin: "0 x-small 0 0"
+      }, t('Done')));
     }
   }, {
     key: "render",
     value: function render() {
+      var subAccountBankSharingEnabled = this.props.subAccountBankSharingEnabled;
       return jsx(Modal, {
         open: this.props.isOpen,
         onDismiss: this.handleDismiss,
@@ -488,7 +546,7 @@ export var SharingModalPresenter = (_dec = withStyleOverrides(generateStyle, gen
         placement: "end",
         offset: "medium",
         screenReaderLabel: t('Close')
-      })), jsx(ModalBody, null, this.state.shares.size >= 0 ? this.renderEntitiesSection() : _ref7), jsx(ModalFooter, null, this.renderFooter()));
+      })), jsx(ModalBody, null, !subAccountBankSharingEnabled && this.renderRootAccountSharing(), !subAccountBankSharingEnabled && this.renderSearchSection(), this.state.shares.size >= 0 ? this.renderEntitiesSection() : _ref7), jsx(ModalFooter, null, this.renderFooter()));
     }
   }]);
   SharingModalPresenter.displayName = "SharingModalPresenter";
@@ -523,6 +581,7 @@ export var SharingModalPresenter = (_dec = withStyleOverrides(generateStyle, gen
   removeSharedBank: PropTypes.func.isRequired,
   shareBank: PropTypes.func.isRequired,
   sharedBanks: ImmutablePropTypes.list,
+  subAccountBankSharingEnabled: PropTypes.bool,
   updateBank: PropTypes.func.isRequired,
   updateSharedBankPermission: PropTypes.func.isRequired,
   updateSharedCount: PropTypes.func,
@@ -537,6 +596,7 @@ export var SharingModalPresenter = (_dec = withStyleOverrides(generateStyle, gen
   onDismiss: noop,
   onShare: function onShare() {},
   sharedBanks: List(),
+  subAccountBankSharingEnabled: false,
   updateSharedCount: Function.prototype
 }, _SharingModalPresenter)) || _class);
 export default SharingModalPresenter;

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

@@ -12,6 +12,7 @@ import ImmutablePropTypes from 'react-immutable-proptypes';
 import partial from 'lodash/partial';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import { CondensedButton } from '@instructure/ui-buttons';
+import { TextInput } from '@instructure/ui-text-input';
 import { jsx, Global } from '@instructure/emotion';
 import { FillBlankInteractionType } from '@instructure/quiz-interactions';
 import { IconBankLine } from '@instructure/ui-icons';
@@ -20,7 +21,7 @@ import { convertFITBtoRich } from "../../../../../../common/util/fitbCopyHelper.
 import PositionBox from "../../../../../../common/components/resources/positionBox/PositionBox.js";
 import Item from "../../../../../../common/records/Item.js";
 import ActionButtons from "../../../ActionButtons/index.js";
-import { DELETED_QUIZ_ENTRY, API_INPUT_VALIDATION_ERROR, BUILD_TRAY_OPEN, TextInput, withStyleOverrides } from '@instructure/quiz-common';
+import { DELETED_QUIZ_ENTRY, API_INPUT_VALIDATION_ERROR, BUILD_TRAY_OPEN, withStyleOverrides } from '@instructure/quiz-common';
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
 var _ref2 = jsx(IconBankLine, null);

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

@@ -14,8 +14,9 @@ import { ProgressBar } from '@instructure/ui-progress';
 import { Heading } from '@instructure/ui-heading';
 import { Tabs } from '@instructure/ui-tabs';
 import { ToggleDetails } from '@instructure/ui-toggle-details';
+import { TextInput } from '@instructure/ui-text-input';
 import { jsx } from '@instructure/emotion';
-import { ImportantModal, ModalHeader, ModalBody, ModalFooter, FILE_UPLOAD_SELECT, FILE_UPLOAD_IMPORTING, FILE_UPLOAD_SUCCESS, FILE_UPLOAD_FAILURE, FILE_UPLOAD_ERROR, TextInput, XSMALL_SIDE_MARGIN, withStyleOverrides } from '@instructure/quiz-common';
+import { ImportantModal, ModalHeader, ModalBody, ModalFooter, FILE_UPLOAD_SELECT, FILE_UPLOAD_IMPORTING, FILE_UPLOAD_SUCCESS, FILE_UPLOAD_FAILURE, FILE_UPLOAD_ERROR, XSMALL_SIDE_MARGIN, withStyleOverrides } from '@instructure/quiz-common';
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";
 import ImportFileSelector from "./ImportFileSelector/index.js";

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

@@ -19,7 +19,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/es/common/components/layout/header/Calculator/presenter.js

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

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

@@ -1,9 +1,10 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { generateExternalStyle } from "./externalStyles.js";
 var generateStyle = function generateStyle(componentTheme) {
-  return _objectSpread({
+  return {
+    showBrandIcon: true,
+    desktopBottomBorder: true,
+    desktopBottomBorderInverse: true,
     backgroundColor: componentTheme.backgroundColor,
     phoneBreakPoint: componentTheme.phoneBreakPoint
-  }, generateExternalStyle());
+  };
 };
 export default generateStyle;

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

@@ -1,16 +1,18 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import merge from 'lodash/merge';
-import { generateExternalStyle } from "./externalStyles.js";
 var generateStyle = function generateStyle(componentTheme, props) {
   var _commonContainer;
   var mq = "@media screen and (".concat(componentTheme.phoneBreakPoint, ")");
   var mp = '@media print';
-  return merge({
+  return {
     sidebar: _objectSpread(_objectSpread(_defineProperty({
       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',
@@ -109,6 +111,6 @@ var generateStyle = function generateStyle(componentTheme, props) {
     }), _defineProperty(_commonContainer, mp, {
       display: 'none'
     }), _commonContainer)
-  }, generateExternalStyle(componentTheme));
+  };
 };
 export default generateStyle;

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

@@ -7,14 +7,16 @@ import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import OutcomeAlignments from '@instructure/outcomes-ui/es/containers/OutcomeAlignments';
 import OutcomeCount from '@instructure/outcomes-ui/es/containers/OutcomeCount';
+import { FormFieldGroup } from '@instructure/ui-form-field';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
 import CustomPropTypes from "../../../../../common/util/CustomPropTypes.js";
 import componentForItem from "../../../../util/componentForItem.js";
-import { liveRegion, COMPONENT_EDIT, FormFieldGroup } from '@instructure/quiz-common';
+import { liveRegion, COMPONENT_EDIT } from '@instructure/quiz-common';
 import t from '@instructure/quiz-i18n/es/format-message';
 import { propsForInteractionEdit } from "../../../../util/interactionTypePropsHelper.js";
 import elementsForSelectors from "../../../../../common/util/ElementsForSelectors.js";
 import { toErrors } from "../../../../util/instUIMessages.js";
+import { featureOn } from "../../../../../common/util/featureCheck.js";
 export var ItemEdit = /*#__PURE__*/function (_Component) {
   _inherits(ItemEdit, _Component);
   var _super = _createSuper(ItemEdit);
@@ -62,7 +64,7 @@ export 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 (featureOn('sub_account_bank_sharing') && rootAccountName) {
         launchContexts.push({
           uuid: this.props.rootAccountUuid,
           name: rootAccountName

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

@@ -12,7 +12,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/es/common/components/resources/stimulus/StimulusEditInfo/presenter.js

@@ -8,14 +8,16 @@ import { Component } from 'react';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import { ScreenReaderContent } from '@instructure/ui-a11y-content';
-import { FormField } from '@instructure/ui-form-field';
+import { TextInput } from '@instructure/ui-text-input';
+import { FormField, FormFieldGroup } from '@instructure/ui-form-field';
 import { jsx } from '@instructure/emotion';
 import { Heading } from '@instructure/ui-heading';
 import { RichContentInput, RCE_SINGLE_LINE_HEIGHT } from '@instructure/quiz-rce';
 import { toErrors } from "../../../../util/instUIMessages.js";
+import { SimpleSelect } from '@instructure/ui-simple-select';
 import { IconUpdownLine } from '@instructure/ui-icons';
 import { ToggleDetails } from '@instructure/ui-toggle-details';
-import { SimpleSelect, TextInput, TOP, withStyleOverrides, FormFieldGroup } from '@instructure/quiz-common';
+import { TOP, withStyleOverrides } from '@instructure/quiz-common';
 import t from '@instructure/quiz-i18n/es/format-message';
 import generateStyle from "./styles.js";
 import generateComponentTheme from "./theme.js";

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

@@ -5,9 +5,10 @@ import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import debounce from 'lodash/fp/debounce';
+import { Select } from '@instructure/ui-select';
 import { Spinner } from '@instructure/ui-spinner';
 import t from '@instructure/quiz-i18n/es/format-message';
-import { SELECT_EMPTY_OPTION, Select } from '@instructure/quiz-common';
+import { SELECT_EMPTY_OPTION } from '@instructure/quiz-common';
 export var GenericAsyncSearch = /*#__PURE__*/function (_Component) {
   _inherits(GenericAsyncSearch, _Component);
   var _super = _createSuper(GenericAsyncSearch);

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

@@ -5,10 +5,11 @@ import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
+import { Select } from '@instructure/ui-select';
 import TagWrapper from "../TagWrapper/index.js";
 import differenceBy from 'lodash/differenceBy';
 import t from '@instructure/quiz-i18n/es/format-message';
-import { SELECT_EMPTY_OPTION, Select } from '@instructure/quiz-common';
+import { SELECT_EMPTY_OPTION } from '@instructure/quiz-common';
 var tagShape = PropTypes.shape({
   id: PropTypes.string,
   value: PropTypes.string.isRequired