@khanacademy/wonder-blocks-link 3.7.12 → 3.8.1

package/dist/index.js

@@ -82,26 +82,26 @@ module.exports =
 /******/
 /******/
 /******/ 	// Load entry module and return exports
-/******/ 	return __webpack_require__(__webpack_require__.s = 7);
+/******/ 	return __webpack_require__(__webpack_require__.s = 9);
 /******/ })
 /************************************************************************/
 /******/ ([
 /* 0 */
 /***/ (function(module, exports) {
 
-module.exports = require("@khanacademy/wonder-blocks-color");
+module.exports = require("react");
 
 /***/ }),
 /* 1 */
 /***/ (function(module, exports) {
 
-module.exports = require("react");
+module.exports = require("@khanacademy/wonder-blocks-color");
 
 /***/ }),
 /* 2 */
 /***/ (function(module, exports) {
 
-module.exports = require("prop-types");
+module.exports = require("react-router");
 
 /***/ }),
 /* 3 */
@@ -111,158 +111,75 @@ module.exports = require("@khanacademy/wonder-blocks-clickable");
 
 /***/ }),
 /* 4 */
-/***/ (function(module, exports) {
-
-module.exports = require("aphrodite");
-
-/***/ }),
-/* 5 */
-/***/ (function(module, exports) {
-
-module.exports = require("@khanacademy/wonder-blocks-core");
-
-/***/ }),
-/* 6 */
-/***/ (function(module, exports) {
-
-module.exports = require("react-router-dom");
-
-/***/ }),
-/* 7 */
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-// ESM COMPAT FLAG
-__webpack_require__.r(__webpack_exports__);
-
-// EXPORTS
-__webpack_require__.d(__webpack_exports__, "default", function() { return /* reexport */ link_Link; });
-
-// EXTERNAL MODULE: external "react"
-var external_react_ = __webpack_require__(1);
-
-// EXTERNAL MODULE: external "prop-types"
-var external_prop_types_ = __webpack_require__(2);
-
-// EXTERNAL MODULE: external "@khanacademy/wonder-blocks-clickable"
-var wonder_blocks_clickable_ = __webpack_require__(3);
-
-// EXTERNAL MODULE: external "aphrodite"
-var external_aphrodite_ = __webpack_require__(4);
-
-// EXTERNAL MODULE: external "react-router-dom"
-var external_react_router_dom_ = __webpack_require__(6);
-
-// EXTERNAL MODULE: external "@khanacademy/wonder-blocks-core"
-var wonder_blocks_core_ = __webpack_require__(5);
-
-// EXTERNAL MODULE: external "@khanacademy/wonder-blocks-color"
-var wonder_blocks_color_ = __webpack_require__(0);
-var wonder_blocks_color_default = /*#__PURE__*/__webpack_require__.n(wonder_blocks_color_);
-
-// CONCATENATED MODULE: ./packages/wonder-blocks-link/src/components/link-core.js
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return LinkCore; });
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var aphrodite__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(5);
+/* harmony import */ var aphrodite__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(aphrodite__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(8);
+/* harmony import */ var react_router_dom__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(react_router_dom__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var react_router__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(2);
+/* harmony import */ var react_router__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(react_router__WEBPACK_IMPORTED_MODULE_3__);
+/* harmony import */ var _khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(6);
+/* harmony import */ var _khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var _khanacademy_wonder_blocks_color__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(1);
+/* harmony import */ var _khanacademy_wonder_blocks_color__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_khanacademy_wonder_blocks_color__WEBPACK_IMPORTED_MODULE_5__);
+/* harmony import */ var _khanacademy_wonder_blocks_clickable__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(3);
+/* harmony import */ var _khanacademy_wonder_blocks_clickable__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(_khanacademy_wonder_blocks_clickable__WEBPACK_IMPORTED_MODULE_6__);
 function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
-
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
-function _classCallCheck(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 _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
-
-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 } }); if (superClass) _setPrototypeOf(subClass, superClass); }
-
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
-
-function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
-
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
-
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
-
-function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
-
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
-
-function _defineProperty(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; }
-
-
-
 
 
 
 
 
-var StyledAnchor = Object(wonder_blocks_core_["addStyle"])("a");
-var StyledLink = Object(wonder_blocks_core_["addStyle"])(external_react_router_dom_["Link"]);
 
-var link_core_LinkCore = /*#__PURE__*/function (_React$Component) {
-  _inherits(LinkCore, _React$Component);
 
-  var _super = _createSuper(LinkCore);
+const StyledAnchor = Object(_khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_4__["addStyle"])("a");
+const StyledLink = Object(_khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_4__["addStyle"])(react_router_dom__WEBPACK_IMPORTED_MODULE_2__["Link"]);
+class LinkCore extends react__WEBPACK_IMPORTED_MODULE_0__["Component"] {
+  renderInner(router) {
+    const {
+      children,
+      skipClientNav,
+      focused,
+      hovered,
+      href,
+      kind,
+      light,
+      visitable,
+      pressed,
+      style,
+      testId,
+      waiting: _,
+      ...restProps
+    } = this.props;
 
-  function LinkCore() {
-    _classCallCheck(this, LinkCore);
+    const linkStyles = _generateStyles(kind, light, visitable);
 
-    return _super.apply(this, arguments);
+    const defaultStyles = [sharedStyles.shared, !(hovered || focused || pressed) && linkStyles.default, pressed ? linkStyles.active : (hovered || focused) && linkStyles.focus];
+    const commonProps = {
+      "data-test-id": testId,
+      style: [defaultStyles, style],
+      ...restProps
+    };
+    return router && !skipClientNav && Object(_khanacademy_wonder_blocks_clickable__WEBPACK_IMPORTED_MODULE_6__["isClientSideUrl"])(href) ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__["createElement"](StyledLink, _extends({}, commonProps, {
+      to: href
+    }), children) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__["createElement"](StyledAnchor, _extends({}, commonProps, {
+      href: href
+    }), children);
   }
 
-  _createClass(LinkCore, [{
-    key: "render",
-    value: function render() {
-      var _this$props = this.props,
-          children = _this$props.children,
-          skipClientNav = _this$props.skipClientNav,
-          focused = _this$props.focused,
-          hovered = _this$props.hovered,
-          href = _this$props.href,
-          kind = _this$props.kind,
-          light = _this$props.light,
-          visitable = _this$props.visitable,
-          pressed = _this$props.pressed,
-          style = _this$props.style,
-          testId = _this$props.testId,
-          _ = _this$props.waiting,
-          restProps = _objectWithoutProperties(_this$props, ["children", "skipClientNav", "focused", "hovered", "href", "kind", "light", "visitable", "pressed", "style", "testId", "waiting"]);
-
-      var router = this.context.router;
-
-      var linkStyles = link_core_generateStyles(kind, light, visitable);
-
-      var defaultStyles = [sharedStyles.shared, !(hovered || focused || pressed) && linkStyles.default, pressed ? linkStyles.active : (hovered || focused) && linkStyles.focus];
-
-      var commonProps = _objectSpread({
-        "data-test-id": testId,
-        style: [defaultStyles, style]
-      }, restProps);
-
-      return router && !skipClientNav && Object(wonder_blocks_clickable_["isClientSideUrl"])(href) ? /*#__PURE__*/external_react_["createElement"](StyledLink, _extends({}, commonProps, {
-        to: href
-      }), children) : /*#__PURE__*/external_react_["createElement"](StyledAnchor, _extends({}, commonProps, {
-        href: href
-      }), children);
-    }
-  }]);
-
-  return LinkCore;
-}(external_react_["Component"]);
-
-_defineProperty(link_core_LinkCore, "contextTypes", {
-  router: external_prop_types_["any"]
-});
-
+  render() {
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react_router__WEBPACK_IMPORTED_MODULE_3__["__RouterContext"].Consumer, null, router => this.renderInner(router));
+  }
 
-var styles = {};
-var sharedStyles = external_aphrodite_["StyleSheet"].create({
+}
+const styles = {};
+const sharedStyles = aphrodite__WEBPACK_IMPORTED_MODULE_1__["StyleSheet"].create({
   shared: {
     cursor: "pointer",
     textDecoration: "none",
@@ -270,8 +187,8 @@ var sharedStyles = external_aphrodite_["StyleSheet"].create({
   }
 });
 
-var link_core_generateStyles = function _generateStyles(kind, light, visitable) {
-  var buttonType = kind + light.toString() + visitable.toString();
+const _generateStyles = (kind, light, visitable) => {
+  const buttonType = kind + light.toString() + visitable.toString();
 
   if (styles[buttonType]) {
     return styles[buttonType];
@@ -285,71 +202,73 @@ var link_core_generateStyles = function _generateStyles(kind, light, visitable)
     throw new Error("Only primary (not light) link is visitable");
   }
 
-  var blue = wonder_blocks_color_default.a.blue,
-      purple = wonder_blocks_color_default.a.purple,
-      white = wonder_blocks_color_default.a.white,
-      offBlack = wonder_blocks_color_default.a.offBlack,
-      offBlack32 = wonder_blocks_color_default.a.offBlack32;
-  var linkPurple = Object(wonder_blocks_color_["mix"])(Object(wonder_blocks_color_["fade"])(offBlack, 0.08), purple);
-  var defaultTextColor = kind === "primary" ? light ? white : blue : offBlack;
-  var focusColor = light ? white : blue;
-  var activeColor = light ? Object(wonder_blocks_color_["mix"])(Object(wonder_blocks_color_["fade"])(blue, 0.32), white) : Object(wonder_blocks_color_["mix"])(offBlack32, blue);
-  var defaultVisited = visitable ? {
+  const {
+    blue,
+    purple,
+    white,
+    offBlack,
+    offBlack32
+  } = _khanacademy_wonder_blocks_color__WEBPACK_IMPORTED_MODULE_5___default.a;
+  const linkPurple = Object(_khanacademy_wonder_blocks_color__WEBPACK_IMPORTED_MODULE_5__["mix"])(Object(_khanacademy_wonder_blocks_color__WEBPACK_IMPORTED_MODULE_5__["fade"])(offBlack, 0.08), purple);
+  const defaultTextColor = kind === "primary" ? light ? white : blue : offBlack;
+  const focusColor = light ? white : blue;
+  const activeColor = light ? Object(_khanacademy_wonder_blocks_color__WEBPACK_IMPORTED_MODULE_5__["mix"])(Object(_khanacademy_wonder_blocks_color__WEBPACK_IMPORTED_MODULE_5__["fade"])(blue, 0.32), white) : Object(_khanacademy_wonder_blocks_color__WEBPACK_IMPORTED_MODULE_5__["mix"])(offBlack32, blue);
+  const defaultVisited = visitable ? {
     ":visited": {
       color: linkPurple
     }
   } : Object.freeze({});
-  var activeVisited = visitable ? {
+  const activeVisited = visitable ? {
     ":visited": {
-      color: Object(wonder_blocks_color_["mix"])(offBlack32, linkPurple)
+      color: Object(_khanacademy_wonder_blocks_color__WEBPACK_IMPORTED_MODULE_5__["mix"])(offBlack32, linkPurple)
     }
   } : Object.freeze({});
-  var newStyles = {
-    default: _objectSpread({
-      color: defaultTextColor
-    }, defaultVisited),
-    focus: _objectSpread({
+  const newStyles = {
+    default: {
+      color: defaultTextColor,
+      ...defaultVisited
+    },
+    focus: {
       textDecoration: "underline currentcolor solid",
-      color: focusColor
-    }, defaultVisited),
-    active: _objectSpread({
+      color: focusColor,
+      ...defaultVisited
+    },
+    active: {
       color: activeColor,
-      textDecoration: "underline currentcolor solid"
-    }, activeVisited)
+      textDecoration: "underline currentcolor solid",
+      ...activeVisited
+    }
   };
-  styles[buttonType] = external_aphrodite_["StyleSheet"].create(newStyles);
+  styles[buttonType] = aphrodite__WEBPACK_IMPORTED_MODULE_1__["StyleSheet"].create(newStyles);
   return styles[buttonType];
 };
-// CONCATENATED MODULE: ./packages/wonder-blocks-link/src/components/link.js
-function link_typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { link_typeof = function _typeof(obj) { return typeof obj; }; } else { link_typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return link_typeof(obj); }
-
-function link_extends() { link_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return link_extends.apply(this, arguments); }
-
-function link_objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = link_objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function link_objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
-function link_classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
-
-function link_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 link_createClass(Constructor, protoProps, staticProps) { if (protoProps) link_defineProperties(Constructor.prototype, protoProps); if (staticProps) link_defineProperties(Constructor, staticProps); return Constructor; }
-
-function link_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 } }); if (superClass) link_setPrototypeOf(subClass, superClass); }
-
-function link_setPrototypeOf(o, p) { link_setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return link_setPrototypeOf(o, p); }
-
-function link_createSuper(Derived) { var hasNativeReflectConstruct = link_isNativeReflectConstruct(); return function _createSuperInternal() { var Super = link_getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = link_getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return link_possibleConstructorReturn(this, result); }; }
+/***/ }),
+/* 5 */
+/***/ (function(module, exports) {
 
-function link_possibleConstructorReturn(self, call) { if (call && (link_typeof(call) === "object" || typeof call === "function")) { return call; } return link_assertThisInitialized(self); }
+module.exports = require("aphrodite");
 
-function link_assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+/***/ }),
+/* 6 */
+/***/ (function(module, exports) {
 
-function link_isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Date.prototype.toString.call(Reflect.construct(Date, [], function () {})); return true; } catch (e) { return false; } }
+module.exports = require("@khanacademy/wonder-blocks-core");
 
-function link_getPrototypeOf(o) { link_getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return link_getPrototypeOf(o); }
+/***/ }),
+/* 7 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-function link_defineProperty(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; }
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return Link; });
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(0);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var react_router__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2);
+/* harmony import */ var react_router__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react_router__WEBPACK_IMPORTED_MODULE_1__);
+/* harmony import */ var _khanacademy_wonder_blocks_clickable__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(3);
+/* harmony import */ var _khanacademy_wonder_blocks_clickable__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_khanacademy_wonder_blocks_clickable__WEBPACK_IMPORTED_MODULE_2__);
+/* harmony import */ var _link_core_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(4);
+function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 
 
 
@@ -373,104 +292,100 @@ function link_defineProperty(obj, key, value) { if (key in obj) { Object.defineP
  * </Link>
  * ```
  */
-var link_Link = /*#__PURE__*/function (_React$Component) {
-  link_inherits(Link, _React$Component);
-
-  var _super = link_createSuper(Link);
-
-  function Link() {
-    link_classCallCheck(this, Link);
-
-    return _super.apply(this, arguments);
-  }
-
-  link_createClass(Link, [{
-    key: "render",
-    value: function render() {
-      var _this$props = this.props,
-          onClick = _this$props.onClick,
-          _this$props$beforeNav = _this$props.beforeNav,
-          beforeNav = _this$props$beforeNav === void 0 ? undefined : _this$props$beforeNav,
-          safeWithNav = _this$props.safeWithNav,
-          href = _this$props.href,
-          skipClientNav = _this$props.skipClientNav,
-          children = _this$props.children,
-          tabIndex = _this$props.tabIndex,
-          onKeyDown = _this$props.onKeyDown,
-          onKeyUp = _this$props.onKeyUp,
-          _this$props$target = _this$props.target,
-          target = _this$props$target === void 0 ? undefined : _this$props$target,
-          sharedProps = link_objectWithoutProperties(_this$props, ["onClick", "beforeNav", "safeWithNav", "href", "skipClientNav", "children", "tabIndex", "onKeyDown", "onKeyUp", "target"]);
-
-      var ClickableBehavior = Object(wonder_blocks_clickable_["getClickableBehavior"])(href, skipClientNav, this.context.router);
-
-      if (beforeNav) {
-        return /*#__PURE__*/external_react_["createElement"](ClickableBehavior, {
-          disabled: false,
+class Link extends react__WEBPACK_IMPORTED_MODULE_0__["Component"] {
+  renderClickableBehavior(router) {
+    const {
+      onClick,
+      beforeNav = undefined,
+      safeWithNav,
+      href,
+      skipClientNav,
+      children,
+      tabIndex,
+      onKeyDown,
+      onKeyUp,
+      target = undefined,
+      ...sharedProps
+    } = this.props;
+    const ClickableBehavior = Object(_khanacademy_wonder_blocks_clickable__WEBPACK_IMPORTED_MODULE_2__["getClickableBehavior"])(href, skipClientNav, router);
+
+    if (beforeNav) {
+      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ClickableBehavior, {
+        disabled: false,
+        href: href,
+        role: "link",
+        onClick: onClick,
+        beforeNav: beforeNav,
+        safeWithNav: safeWithNav,
+        onKeyDown: onKeyDown,
+        onKeyUp: onKeyUp
+      }, (state, {
+        tabIndex: clickableTabIndex,
+        ...childrenProps
+      }) => {
+        return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_link_core_js__WEBPACK_IMPORTED_MODULE_3__[/* default */ "a"], _extends({}, sharedProps, state, childrenProps, {
+          skipClientNav: skipClientNav,
           href: href,
-          role: "link",
-          onClick: onClick,
-          beforeNav: beforeNav,
-          safeWithNav: safeWithNav,
-          onKeyDown: onKeyDown,
-          onKeyUp: onKeyUp
-        }, function (state, _ref) {
-          var clickableTabIndex = _ref.tabIndex,
-              childrenProps = link_objectWithoutProperties(_ref, ["tabIndex"]);
-
-          return /*#__PURE__*/external_react_["createElement"](link_core_LinkCore, link_extends({}, sharedProps, state, childrenProps, {
-            skipClientNav: skipClientNav,
-            href: href,
-            target: target // If tabIndex is provide to the component we allow
-            // it to override the tabIndex provide to use by
-            // ClickableBehavior.
-            ,
-            tabIndex: tabIndex || clickableTabIndex
-          }), children);
-        });
-      } else {
-        return /*#__PURE__*/external_react_["createElement"](ClickableBehavior, {
-          disabled: false,
+          target: target // If tabIndex is provide to the component we allow
+          // it to override the tabIndex provide to use by
+          // ClickableBehavior.
+          ,
+          tabIndex: tabIndex || clickableTabIndex
+        }), children);
+      });
+    } else {
+      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ClickableBehavior, {
+        disabled: false,
+        href: href,
+        role: "link",
+        onClick: onClick,
+        safeWithNav: safeWithNav,
+        target: target,
+        onKeyDown: onKeyDown,
+        onKeyUp: onKeyUp
+      }, (state, {
+        tabIndex: clickableTabIndex,
+        ...childrenProps
+      }) => {
+        return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_link_core_js__WEBPACK_IMPORTED_MODULE_3__[/* default */ "a"], _extends({}, sharedProps, state, childrenProps, {
+          skipClientNav: skipClientNav,
           href: href,
-          role: "link",
-          onClick: onClick,
-          safeWithNav: safeWithNav,
-          target: target,
-          onKeyDown: onKeyDown,
-          onKeyUp: onKeyUp
-        }, function (state, _ref2) {
-          var clickableTabIndex = _ref2.tabIndex,
-              childrenProps = link_objectWithoutProperties(_ref2, ["tabIndex"]);
-
-          return /*#__PURE__*/external_react_["createElement"](link_core_LinkCore, link_extends({}, sharedProps, state, childrenProps, {
-            skipClientNav: skipClientNav,
-            href: href,
-            target: target // If tabIndex is provide to the component we allow
-            // it to override the tabIndex provide to use by
-            // ClickableBehavior.
-            ,
-            tabIndex: tabIndex || clickableTabIndex
-          }), children);
-        });
-      }
+          target: target // If tabIndex is provide to the component we allow
+          // it to override the tabIndex provide to use by
+          // ClickableBehavior.
+          ,
+          tabIndex: tabIndex || clickableTabIndex
+        }), children);
+      });
     }
-  }]);
-
-  return Link;
-}(external_react_["Component"]);
+  }
 
-link_defineProperty(link_Link, "contextTypes", {
-  router: external_prop_types_["any"]
-});
+  render() {
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react_router__WEBPACK_IMPORTED_MODULE_1__["__RouterContext"].Consumer, null, router => this.renderClickableBehavior(router));
+  }
 
-link_defineProperty(link_Link, "defaultProps", {
+}
+Link.defaultProps = {
   kind: "primary",
   light: false,
   visitable: false
-});
+};
+
+/***/ }),
+/* 8 */
+/***/ (function(module, exports) {
+
+module.exports = require("react-router-dom");
+
+/***/ }),
+/* 9 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _components_link_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(7);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "default", function() { return _components_link_js__WEBPACK_IMPORTED_MODULE_0__["a"]; });
 
-// CONCATENATED MODULE: ./packages/wonder-blocks-link/src/index.js
 
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@khanacademy/wonder-blocks-link",
-  "version": "3.7.12",
+  "version": "3.8.1",
   "design": "v1",
   "publishConfig": {
     "access": "public"
@@ -15,18 +15,19 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@khanacademy/wonder-blocks-clickable": "^2.1.1",
-    "@khanacademy/wonder-blocks-color": "^1.1.17",
-    "@khanacademy/wonder-blocks-core": "^3.1.3"
+    "@babel/runtime": "^7.16.3",
+    "@khanacademy/wonder-blocks-clickable": "^2.2.1",
+    "@khanacademy/wonder-blocks-color": "^1.1.20",
+    "@khanacademy/wonder-blocks-core": "^4.0.0"
   },
   "peerDependencies": {
     "aphrodite": "^1.2.5",
-    "prop-types": "^15.6.2",
-    "react": "^16.4.1",
-    "react-router-dom": "^4.2.2"
+    "react": "16.14.0",
+    "react-router": "5.2.1",
+    "react-router-dom": "5.3.0"
   },
   "devDependencies": {
-    "wb-dev-build-settings": "^0.0.4"
+    "wb-dev-build-settings": "^0.2.0"
   },
-  "gitHead": "b7d7425c7f2e02cd9b9ac6ac7e9fe12ead2bd8ab"
+  "gitHead": "9ebea88533e702011165072f090a377e02fa3f0f"
 }

package/src/components/__tests__/link.test.js

@@ -15,7 +15,8 @@ describe("Link", () => {
     beforeEach(() => {
         // Note: window.location.assign needs a mock function in the testing
         // environment.
-        window.location.assign = jest.fn();
+        delete window.location;
+        window.location = {assign: jest.fn()};
     });
 
     afterEach(() => {