@instructure/quiz-core 20.9.1-rc.7 → 20.10.0

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

@@ -25,6 +25,12 @@ var _uiPropTypes = require("@instructure/ui-prop-types");
 
 var _ReturnButton = require("../../../common/components/shared/return_button/ReturnButton.js");
 
+var _index = require("../../../common/components/layout/navbar/index.js");
+
+var _index2 = require("../../../common/components/layout/navbar/SecondaryNavBarButton/index.js");
+
+var _index3 = require("../HeaderBreadCrumb/index.js");
+
 var _uiButtons = require("@instructure/ui-buttons");
 
 var _uiBreadcrumb = require("@instructure/ui-breadcrumb");
@@ -43,10 +49,6 @@ var _theme = _interopRequireDefault(require("./theme.js"));
 
 var _dec, _class, _class2, _temp;
 
-var _ref = (0, _emotion.jsx)(_uiIcons.IconBankLine, {
-  size: "x-small"
-});
-
 var NavWrapper = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default), _dec(_class = (_temp = _class2 = /*#__PURE__*/function (_Component) {
   (0, _inherits2.default)(NavWrapper, _Component);
 
@@ -86,43 +88,29 @@ var NavWrapper = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default
         _reactDom.default.findDOMNode(this.itemBanksRef).focus();
       }
     }
-  }, {
-    key: "renderBreadcrumbLinks",
-    value: function renderBreadcrumbLinks() {
-      var _this$props = this.props,
-          returnToUrl = _this$props.returnToUrl,
-          canvasReferrerLinkText = _this$props.canvasReferrerLinkText;
-      var canvasReferrerLink = returnToUrl && canvasReferrerLinkText && (0, _emotion.jsx)(_uiBreadcrumb.BreadcrumbLink, {
-        key: "Context",
-        href: returnToUrl,
-        target: "_top"
-      }, canvasReferrerLinkText);
-      var banksLinks = (0, _emotion.jsx)(_uiBreadcrumb.BreadcrumbLink, {
-        ref: this.setItemBanksRef,
-        renderIcon: _ref,
-        key: "Banks",
-        onClick: this.props.navigateToBanks
-      }, (0, _formatMessage.default)('Item Banks')); // If Breadcrumb has multiple children (even if 2nd is null), it will
-      // render the `>` icon, which we don't want if there are no children.
-
-      var breadCrumbLinks = [banksLinks];
-      if (this.props.children) breadCrumbLinks.push(this.props.children);
-      if (canvasReferrerLink) breadCrumbLinks.unshift(canvasReferrerLink);
-      return breadCrumbLinks;
-    }
   }, {
     key: "renderReturnButton",
     value: function renderReturnButton() {
-      var _this$props2 = this.props,
-          navigateToBuild = _this$props2.navigateToBuild,
-          closeTray = _this$props2.closeTray,
-          returnToUrl = _this$props2.returnToUrl;
+      var _this$props = this.props,
+          navigateToBuild = _this$props.navigateToBuild,
+          closeTray = _this$props.closeTray,
+          returnToUrl = _this$props.returnToUrl,
+          iceTopNavBarEnabled = _this$props.iceTopNavBarEnabled;
 
       if (!closeTray && returnToUrl) {
         return (0, _emotion.jsx)(_ReturnButton.ReturnButton, {
-          returnToUrl: returnToUrl
+          returnToUrl: returnToUrl,
+          iceTopNavBarEnabled: iceTopNavBarEnabled
         });
       } else if (navigateToBuild) {
+        if (iceTopNavBarEnabled) {
+          return (0, _emotion.jsx)(_index2.SecondaryNavBarButton, {
+            id: "ReturnButton",
+            variant: "button",
+            onClick: navigateToBuild
+          }, (0, _formatMessage.default)('Return'));
+        }
+
         return (0, _emotion.jsx)(_uiButtons.Button, {
           onClick: navigateToBuild
         }, (0, _formatMessage.default)('Return'));
@@ -143,6 +131,16 @@ var NavWrapper = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default
   }, {
     key: "render",
     value: function render() {
+      if (this.props.iceTopNavBarEnabled) {
+        return (0, _emotion.jsx)(_index.NavBar, {
+          menuItems: [{
+            path: this.props.menuItemPath,
+            text: 'Item Banks'
+          }],
+          actionItems: [this.renderReturnButton()]
+        });
+      }
+
       return (0, _emotion.jsx)(_uiView.View, null, (0, _emotion.jsx)(_emotion.Global, {
         styles: {
           'body.tox-fullscreen .nav': {
@@ -153,10 +151,17 @@ var NavWrapper = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default
         css: this.props.styles.nav
       }, this.renderCloseButton(), (0, _emotion.jsx)("div", {
         css: this.props.styles.crumbs
-      }, (0, _emotion.jsx)(_uiBreadcrumb.Breadcrumb, {
-        size: "small",
-        label: (0, _formatMessage.default)('You are here:')
-      }, this.renderBreadcrumbLinks())), this.renderReturnButton(), this.props.renderHeaderMenu()));
+      }, (0, _emotion.jsx)(_index3.HeaderBreadCrumb, {
+        returnToUrl: this.props.returnToUrl,
+        navigateToBanks: this.props.navigateToBanks,
+        navigateToBuild: this.props.navigateToBuild,
+        scope: this.props.scope,
+        isCompact: this.props.isCompact,
+        setItemBanksRef: this.setItemBanksRef,
+        renderIcon: (0, _emotion.jsx)(_uiIcons.IconBankLine, {
+          size: this.props.isCompact ? 'x-small' : null
+        })
+      }, this.props.children)), this.renderReturnButton(), this.props.renderHeaderMenu()));
     }
   }]);
   NavWrapper.displayName = "NavWrapper";
@@ -169,7 +174,14 @@ var NavWrapper = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default
   renderHeaderMenu: _propTypes.default.func,
   trayOpen: _propTypes.default.bool.isRequired,
   returnToUrl: _propTypes.default.string,
-  canvasReferrerLinkText: _propTypes.default.string,
+  scope: _propTypes.default.shape({
+    type: _propTypes.default.string,
+    uuid: _propTypes.default.string,
+    title: _propTypes.default.string
+  }).isRequired,
+  isCompact: _propTypes.default.bool,
+  iceTopNavBarEnabled: _propTypes.default.bool,
+  menuItemPath: _propTypes.default.string,
   // eslint-disable-next-line react/require-default-props,react/forbid-prop-types
   styles: _propTypes.default.object
 }, _class2.defaultProps = {
@@ -179,7 +191,9 @@ var NavWrapper = (_dec = (0, _emotion.withStyle)(_styles.default, _theme.default
   navigateToBuild: null,
   renderHeaderMenu: Function.prototype,
   returnToUrl: null,
-  canvasReferrerLinkText: null
+  isCompact: false,
+  iceTopNavBarEnabled: false,
+  menuItemPath: ''
 }, _temp)) || _class);
 var _default = NavWrapper;
 exports.default = _default;

package/lib/common/components/shared/return_button/ReturnButton.js

@@ -25,6 +25,8 @@ var _uiButtons = require("@instructure/ui-buttons");
 
 var _formatMessage = _interopRequireDefault(require("@instructure/quiz-i18n/es/format-message"));
 
+var _index = require("../../layout/navbar/SecondaryNavBarButton/index.js");
+
 var ReturnButton = /*#__PURE__*/function (_Component) {
   (0, _inherits2.default)(ReturnButton, _Component);
 
@@ -42,6 +44,16 @@ var ReturnButton = /*#__PURE__*/function (_Component) {
         return null;
       }
 
+      if (this.props.iceTopNavBarEnabled) {
+        return /*#__PURE__*/_react.default.createElement(_index.SecondaryNavBarButton, {
+          id: "ReturnButton",
+          variant: "button",
+          "data-automation": "sdk-return-button",
+          href: this.props.returnToUrl,
+          target: "_top"
+        }, this.props.text);
+      }
+
       return /*#__PURE__*/_react.default.createElement(_uiButtons.Button, {
         "data-automation": "sdk-return-button",
         href: this.props.returnToUrl,
@@ -56,11 +68,13 @@ var ReturnButton = /*#__PURE__*/function (_Component) {
 exports.ReturnButton = ReturnButton;
 ReturnButton.propTypes = {
   returnToUrl: _propTypes.default.string,
-  text: _propTypes.default.string
+  text: _propTypes.default.string,
+  iceTopNavBarEnabled: _propTypes.default.bool
 };
 ReturnButton.defaultProps = {
   returnToUrl: void 0,
-  text: (0, _formatMessage.default)('Return')
+  text: (0, _formatMessage.default)('Return'),
+  iceTopNavBarEnabled: false
 };
 var _default = ReturnButton;
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@instructure/quiz-core",
-  "version": "20.9.1-rc.7+7d9df0379",
+  "version": "20.10.0",
   "license": "MIT",
   "description": "The Quiz React SDK by Instructure Inc.",
   "author": "Instructure, Inc. Engineering and Product Design",
@@ -44,11 +44,11 @@
     "@instructure/emotion": "^8.51.0",
     "@instructure/grading-utils": "^1.0.0",
     "@instructure/outcomes-ui": "^3.1.0",
-    "@instructure/quiz-common": "20.9.1-rc.7+7d9df0379",
-    "@instructure/quiz-i18n": "20.9.1-rc.7+7d9df0379",
-    "@instructure/quiz-interactions": "20.9.1-rc.7+7d9df0379",
-    "@instructure/quiz-number-input": "20.9.1-rc.7+7d9df0379",
-    "@instructure/quiz-rce": "20.9.1-rc.7+7d9df0379",
+    "@instructure/quiz-common": "^20.10.0",
+    "@instructure/quiz-i18n": "^20.10.0",
+    "@instructure/quiz-interactions": "^20.10.0",
+    "@instructure/quiz-number-input": "^20.10.0",
+    "@instructure/quiz-rce": "^20.10.0",
     "@instructure/ui-a11y-content": "^8.51.0",
     "@instructure/ui-alerts": "^8.51.0",
     "@instructure/ui-avatar": "^8.51.0",
@@ -112,7 +112,7 @@
     "file-saver": "~2.0.5",
     "humps": "^2.0.0",
     "immutable": "^3.8.1",
-    "instructure-validations": "20.9.1-rc.7+7d9df0379",
+    "instructure-validations": "^20.10.0",
     "ipaddr.js": "^1.5.4",
     "isomorphic-fetch": "^2.2.0",
     "isuuid": "^0.1.0",
@@ -143,7 +143,7 @@
     "uuid": "^3.2.1"
   },
   "devDependencies": {
-    "@instructure/quiz-scripts": "20.9.0",
+    "@instructure/quiz-scripts": "^20.10.0",
     "@instructure/ui-axe-check": "^8.51.0",
     "@instructure/ui-babel-preset": "^7.22.1",
     "@instructure/ui-karma-config": "^7.22.1",
@@ -163,7 +163,7 @@
     "intl": "^1.2.4",
     "jquery": "^2.2.3",
     "most-subject": "^5.3.0",
-    "quiz-presets": "20.9.1-rc.7+7d9df0379",
+    "quiz-presets": "^20.10.0",
     "react": "^16.8.6",
     "react-addons-test-utils": "^15.6.2",
     "react-dom": "^16.8.6",
@@ -179,5 +179,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "7d9df037951d6e2565087a758c70b5daafed5eed"
+  "gitHead": "bfab54e6bcf1812fe3b695aeda7de71fc6dc5ff1"
 }