@khanacademy/wonder-blocks-icon-button 3.3.13 → 3.4.2

package/CHANGELOG.md

@@ -0,0 +1,7 @@
+# @khanacademy/wonder-blocks-icon-button
+
+## 3.4.2
+### Patch Changes
+
+- Updated dependencies [901bfe82]
+  - @khanacademy/wonder-blocks-clickable@2.2.2

package/dist/es/index.js

@@ -1,7 +1,7 @@
 import _extends from '@babel/runtime/helpers/extends';
 import _objectWithoutPropertiesLoose from '@babel/runtime/helpers/objectWithoutPropertiesLoose';
-import { Component, createElement } from 'react';
-import { any } from 'prop-types';
+import * as React from 'react';
+import { __RouterContext } from 'react-router';
 import { isClientSideUrl, getClickableBehavior } from '@khanacademy/wonder-blocks-clickable';
 import { StyleSheet } from 'aphrodite';
 import { Link } from 'react-router-dom';
@@ -9,12 +9,12 @@ import Color, { SemanticColor, mix, fade } from '@khanacademy/wonder-blocks-colo
 import { addStyle } from '@khanacademy/wonder-blocks-core';
 import Icon from '@khanacademy/wonder-blocks-icon';
 
-const _excluded = ["skipClientNav", "color", "disabled", "focused", "hovered", "href", "icon", "kind", "light", "pressed", "style", "testId", "waiting"];
+const _excluded$1 = ["skipClientNav", "color", "disabled", "focused", "hovered", "href", "icon", "kind", "light", "pressed", "style", "testId", "waiting"];
 const StyledAnchor = addStyle("a");
 const StyledButton = addStyle("button");
 const StyledLink = addStyle(Link);
-class IconButtonCore extends Component {
-  render() {
+class IconButtonCore extends React.Component {
+  renderInner(router) {
     const _this$props = this.props,
           {
       skipClientNav,
@@ -30,17 +30,14 @@ class IconButtonCore extends Component {
       style,
       testId
     } = _this$props,
-          restProps = _objectWithoutPropertiesLoose(_this$props, _excluded);
+          restProps = _objectWithoutPropertiesLoose(_this$props, _excluded$1);
 
-    const {
-      router
-    } = this.context;
     const buttonColor = color === "destructive" ? SemanticColor.controlDestructive : SemanticColor.controlDefault;
 
     const buttonStyles = _generateStyles(buttonColor, kind, light);
 
     const defaultStyle = [sharedStyles.shared, disabled && sharedStyles.disabled, buttonStyles.default, disabled && buttonStyles.disabled, !disabled && (pressed ? buttonStyles.active : (hovered || focused) && buttonStyles.focus)];
-    const child = /*#__PURE__*/createElement(Icon, {
+    const child = /*#__PURE__*/React.createElement(Icon, {
       size: "medium",
       color: "currentColor",
       icon: icon
@@ -52,13 +49,13 @@ class IconButtonCore extends Component {
     }, restProps);
 
     if (href && !disabled) {
-      return router && !skipClientNav && isClientSideUrl(href) ? /*#__PURE__*/createElement(StyledLink, _extends({}, commonProps, {
+      return router && !skipClientNav && isClientSideUrl(href) ? /*#__PURE__*/React.createElement(StyledLink, _extends({}, commonProps, {
         to: href
-      }), child) : /*#__PURE__*/createElement(StyledAnchor, _extends({}, commonProps, {
+      }), child) : /*#__PURE__*/React.createElement(StyledAnchor, _extends({}, commonProps, {
         href: href
       }), child);
     } else {
-      return /*#__PURE__*/createElement(StyledButton, _extends({
+      return /*#__PURE__*/React.createElement(StyledButton, _extends({
         type: "button"
       }, commonProps, {
         disabled: disabled
@@ -66,10 +63,11 @@ class IconButtonCore extends Component {
     }
   }
 
+  render() {
+    return /*#__PURE__*/React.createElement(__RouterContext.Consumer, null, router => this.renderInner(router));
+  }
+
 }
-IconButtonCore.contextTypes = {
-  router: any
-};
 const sharedStyles = StyleSheet.create({
   shared: {
     position: "relative",
@@ -159,7 +157,7 @@ const _generateStyles = (color, kind, light) => {
   return styles[buttonType];
 };
 
-const _excluded$1 = ["onClick", "href", "skipClientNav", "tabIndex", "target"],
+const _excluded = ["onClick", "href", "skipClientNav", "tabIndex", "target"],
       _excluded2 = ["tabIndex"];
 
 /**
@@ -198,8 +196,8 @@ const _excluded$1 = ["onClick", "href", "skipClientNav", "tabIndex", "target"],
  * />
  * ```
  */
-class IconButton extends Component {
-  render() {
+class IconButton extends React.Component {
+  renderClickableBehavior(router) {
     const _this$props = this.props,
           {
       onClick,
@@ -208,10 +206,10 @@ class IconButton extends Component {
       tabIndex,
       target
     } = _this$props,
-          sharedProps = _objectWithoutPropertiesLoose(_this$props, _excluded$1);
+          sharedProps = _objectWithoutPropertiesLoose(_this$props, _excluded);
 
-    const ClickableBehavior = getClickableBehavior(href, skipClientNav, this.context.router);
-    return /*#__PURE__*/createElement(ClickableBehavior, {
+    const ClickableBehavior = getClickableBehavior(href, skipClientNav, router);
+    return /*#__PURE__*/React.createElement(ClickableBehavior, {
       disabled: sharedProps.disabled,
       href: href,
       onClick: onClick,
@@ -223,7 +221,7 @@ class IconButton extends Component {
       } = _ref,
           childrenProps = _objectWithoutPropertiesLoose(_ref, _excluded2);
 
-      return /*#__PURE__*/createElement(IconButtonCore, _extends({}, sharedProps, state, childrenProps, {
+      return /*#__PURE__*/React.createElement(IconButtonCore, _extends({}, sharedProps, state, childrenProps, {
         skipClientNav: skipClientNav,
         href: href,
         target: target // If tabIndex is provide to the component we allow
@@ -235,10 +233,11 @@ class IconButton extends Component {
     });
   }
 
+  render() {
+    return /*#__PURE__*/React.createElement(__RouterContext.Consumer, null, router => this.renderClickableBehavior(router));
+  }
+
 }
-IconButton.contextTypes = {
-  router: any
-};
 IconButton.defaultProps = {
   color: "default",
   kind: "primary",
@@ -246,4 +245,4 @@ IconButton.defaultProps = {
   disabled: false
 };
 
-export default IconButton;
+export { IconButton as default };

package/dist/index.js

@@ -89,147 +89,163 @@ module.exports =
 /* 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) {
 
-function _extends() {
-  module.exports = _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;
-  };
-
-  module.exports["default"] = module.exports, module.exports.__esModule = true;
-  return _extends.apply(this, arguments);
-}
-
-module.exports = _extends;
-module.exports["default"] = module.exports, module.exports.__esModule = true;
+module.exports = require("react-router");
 
 /***/ }),
 /* 3 */
 /***/ (function(module, exports) {
 
-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;
-}
-
-module.exports = _objectWithoutPropertiesLoose;
-module.exports["default"] = module.exports, module.exports.__esModule = true;
-
-/***/ }),
-/* 4 */
-/***/ (function(module, exports) {
-
-module.exports = require("prop-types");
-
-/***/ }),
-/* 5 */
-/***/ (function(module, exports) {
-
 module.exports = require("@khanacademy/wonder-blocks-clickable");
 
 /***/ }),
-/* 6 */
+/* 4 */
 /***/ (function(module, exports) {
 
 module.exports = require("@khanacademy/wonder-blocks-core");
 
 /***/ }),
-/* 7 */
+/* 5 */
 /***/ (function(module, exports) {
 
 module.exports = require("aphrodite");
 
 /***/ }),
-/* 8 */
-/***/ (function(module, exports) {
-
-module.exports = require("react-router-dom");
-
-/***/ }),
-/* 9 */
-/***/ (function(module, exports) {
-
-module.exports = require("@khanacademy/wonder-blocks-icon");
-
-/***/ }),
-/* 10 */
+/* 6 */
 /***/ (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 */ icon_button_IconButton; });
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return IconButton; });
+/* 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 _icon_button_core_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(7);
+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); }
 
-// EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/extends.js
-var helpers_extends = __webpack_require__(2);
-var extends_default = /*#__PURE__*/__webpack_require__.n(helpers_extends);
 
-// EXTERNAL MODULE: ./node_modules/@babel/runtime/helpers/objectWithoutPropertiesLoose.js
-var objectWithoutPropertiesLoose = __webpack_require__(3);
-var objectWithoutPropertiesLoose_default = /*#__PURE__*/__webpack_require__.n(objectWithoutPropertiesLoose);
 
-// EXTERNAL MODULE: external "react"
-var external_react_ = __webpack_require__(1);
 
-// EXTERNAL MODULE: external "prop-types"
-var external_prop_types_ = __webpack_require__(4);
 
-// EXTERNAL MODULE: external "@khanacademy/wonder-blocks-clickable"
-var wonder_blocks_clickable_ = __webpack_require__(5);
 
-// EXTERNAL MODULE: external "aphrodite"
-var external_aphrodite_ = __webpack_require__(7);
-
-// EXTERNAL MODULE: external "react-router-dom"
-var external_react_router_dom_ = __webpack_require__(8);
-
-// 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_);
+/**
+ * An IconButton is a button whose contents are an SVG image.
+ *
+ * To use, supply an onClick function, a wonder-blocks icon asset (see
+ * the Icon section) and an aria-label to describe the button functionality.
+ * Optionally specify href (URL), clientSideNav, color
+ * (Wonder Blocks Blue or Red), kind ("primary", "secondary", or "tertiary"),
+ * light (whether the IconButton will be rendered on a dark background),
+ * disabled , test ID, and custom styling.
+ *
+ * The size of an IconButton matches the size of icon it wraps which is 24x24
+ * pixels.  The focus ring which is displayed on hover and focus is much
+ * larger but does not affect its size.  This matches the behavior of Button.
+ *
+ * IconButtons require a certain amount of space between them to ensure the
+ * focus rings don't overlap.  The minimum amount of spacing is 16px, but
+ * you should refer to the mocks provided by design.  Using a Strut in between
+ * IconButtons is the preferred way to for adding this spacing.
+ *
+ * Many layouts require alignment of visual left (or right) side of an
+ * IconButton.  This requires a little bit of pixel nudging since each icon
+ * as a different amount of internal padding.
+ *
+ * See the Toolbar documentation for examples of IconButton use that follow
+ * the best practices described above.
+ *
+ * ```js
+ * import {icons} from "@khanacademy/wonder-blocks-icon";
+ *
+ * <IconButton
+ *     icon={icons.anIcon}
+ *     aria-label="An Icon"
+ *     onClick={(e) => console.log("Hello, world!")}
+ * />
+ * ```
+ */
+class IconButton extends react__WEBPACK_IMPORTED_MODULE_0__["Component"] {
+  renderClickableBehavior(router) {
+    const {
+      onClick,
+      href,
+      skipClientNav,
+      tabIndex,
+      target,
+      ...sharedProps
+    } = this.props;
+    const ClickableBehavior = Object(_khanacademy_wonder_blocks_clickable__WEBPACK_IMPORTED_MODULE_2__["getClickableBehavior"])(href, skipClientNav, router);
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__["createElement"](ClickableBehavior, {
+      disabled: sharedProps.disabled,
+      href: href,
+      onClick: onClick,
+      role: "button",
+      target: target
+    }, (state, {
+      tabIndex: clickableTabIndex,
+      ...childrenProps
+    }) => {
+      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_icon_button_core_js__WEBPACK_IMPORTED_MODULE_3__[/* default */ "a"], _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
+      }));
+    });
+  }
 
-// EXTERNAL MODULE: external "@khanacademy/wonder-blocks-core"
-var wonder_blocks_core_ = __webpack_require__(6);
+  render() {
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react_router__WEBPACK_IMPORTED_MODULE_1__["__RouterContext"].Consumer, null, router => this.renderClickableBehavior(router));
+  }
 
-// EXTERNAL MODULE: external "@khanacademy/wonder-blocks-icon"
-var wonder_blocks_icon_ = __webpack_require__(9);
-var wonder_blocks_icon_default = /*#__PURE__*/__webpack_require__.n(wonder_blocks_icon_);
+}
+IconButton.defaultProps = {
+  color: "default",
+  kind: "primary",
+  light: false,
+  disabled: false
+};
 
-// CONCATENATED MODULE: ./packages/wonder-blocks-icon-button/src/components/icon-button-core.js
+/***/ }),
+/* 7 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
+/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return IconButtonCore; });
+/* 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_color__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(1);
+/* harmony import */ var _khanacademy_wonder_blocks_color__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_khanacademy_wonder_blocks_color__WEBPACK_IMPORTED_MODULE_4__);
+/* harmony import */ var _khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(4);
+/* harmony import */ var _khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_5___default = /*#__PURE__*/__webpack_require__.n(_khanacademy_wonder_blocks_core__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__);
+/* harmony import */ var _khanacademy_wonder_blocks_icon__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(9);
+/* harmony import */ var _khanacademy_wonder_blocks_icon__WEBPACK_IMPORTED_MODULE_7___default = /*#__PURE__*/__webpack_require__.n(_khanacademy_wonder_blocks_icon__WEBPACK_IMPORTED_MODULE_7__);
+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); }
 
-const _excluded = ["skipClientNav", "color", "disabled", "focused", "hovered", "href", "icon", "kind", "light", "pressed", "style", "testId", "waiting"];
 
 
 
@@ -238,13 +254,12 @@ const _excluded = ["skipClientNav", "color", "disabled", "focused", "hovered", "
 
 
 
-const StyledAnchor = Object(wonder_blocks_core_["addStyle"])("a");
-const StyledButton = Object(wonder_blocks_core_["addStyle"])("button");
-const StyledLink = Object(wonder_blocks_core_["addStyle"])(external_react_router_dom_["Link"]);
-class icon_button_core_IconButtonCore extends external_react_["Component"] {
-  render() {
-    const _this$props = this.props,
-          {
+const StyledAnchor = Object(_khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_5__["addStyle"])("a");
+const StyledButton = Object(_khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_5__["addStyle"])("button");
+const StyledLink = Object(_khanacademy_wonder_blocks_core__WEBPACK_IMPORTED_MODULE_5__["addStyle"])(react_router_dom__WEBPACK_IMPORTED_MODULE_2__["Link"]);
+class IconButtonCore extends react__WEBPACK_IMPORTED_MODULE_0__["Component"] {
+  renderInner(router) {
+    const {
       skipClientNav,
       color,
       disabled,
@@ -256,37 +271,34 @@ class icon_button_core_IconButtonCore extends external_react_["Component"] {
       light,
       pressed,
       style,
-      testId
-    } = _this$props,
-          restProps = objectWithoutPropertiesLoose_default()(_this$props, _excluded);
-
-    const {
-      router
-    } = this.context;
-    const buttonColor = color === "destructive" ? wonder_blocks_color_["SemanticColor"].controlDestructive : wonder_blocks_color_["SemanticColor"].controlDefault;
+      testId,
+      waiting: _,
+      ...restProps
+    } = this.props;
+    const buttonColor = color === "destructive" ? _khanacademy_wonder_blocks_color__WEBPACK_IMPORTED_MODULE_4__["SemanticColor"].controlDestructive : _khanacademy_wonder_blocks_color__WEBPACK_IMPORTED_MODULE_4__["SemanticColor"].controlDefault;
 
     const buttonStyles = _generateStyles(buttonColor, kind, light);
 
     const defaultStyle = [sharedStyles.shared, disabled && sharedStyles.disabled, buttonStyles.default, disabled && buttonStyles.disabled, !disabled && (pressed ? buttonStyles.active : (hovered || focused) && buttonStyles.focus)];
-    const child = /*#__PURE__*/external_react_["createElement"](wonder_blocks_icon_default.a, {
+    const child = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__["createElement"](_khanacademy_wonder_blocks_icon__WEBPACK_IMPORTED_MODULE_7___default.a, {
       size: "medium",
       color: "currentColor",
       icon: icon
     });
-
-    const commonProps = extends_default()({
+    const commonProps = {
       "data-test-id": testId,
-      style: [defaultStyle, style]
-    }, restProps);
+      style: [defaultStyle, style],
+      ...restProps
+    };
 
     if (href && !disabled) {
-      return router && !skipClientNav && Object(wonder_blocks_clickable_["isClientSideUrl"])(href) ? /*#__PURE__*/external_react_["createElement"](StyledLink, extends_default()({}, commonProps, {
+      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
-      }), child) : /*#__PURE__*/external_react_["createElement"](StyledAnchor, extends_default()({}, commonProps, {
+      }), child) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__["createElement"](StyledAnchor, _extends({}, commonProps, {
         href: href
       }), child);
     } else {
-      return /*#__PURE__*/external_react_["createElement"](StyledButton, extends_default()({
+      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__["createElement"](StyledButton, _extends({
         type: "button"
       }, commonProps, {
         disabled: disabled
@@ -294,11 +306,12 @@ class icon_button_core_IconButtonCore extends external_react_["Component"] {
     }
   }
 
+  render() {
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react_router__WEBPACK_IMPORTED_MODULE_3__["__RouterContext"].Consumer, null, router => this.renderInner(router));
+  }
+
 }
-icon_button_core_IconButtonCore.contextTypes = {
-  router: external_prop_types_["any"]
-};
-const sharedStyles = external_aphrodite_["StyleSheet"].create({
+const sharedStyles = aphrodite__WEBPACK_IMPORTED_MODULE_1__["StyleSheet"].create({
   shared: {
     position: "relative",
     display: "inline-flex",
@@ -344,7 +357,7 @@ const _generateStyles = (color, kind, light) => {
     offBlack32,
     offBlack64,
     offBlack
-  } = wonder_blocks_color_default.a;
+  } = _khanacademy_wonder_blocks_color__WEBPACK_IMPORTED_MODULE_4___default.a;
   const newStyles = {
     default: {},
     focus: {
@@ -355,14 +368,14 @@ const _generateStyles = (color, kind, light) => {
       borderRadius: 4
     },
     active: {
-      color: light ? Object(wonder_blocks_color_["mix"])(Object(wonder_blocks_color_["fade"])(color, 0.32), white) : Object(wonder_blocks_color_["mix"])(offBlack32, color),
+      color: light ? Object(_khanacademy_wonder_blocks_color__WEBPACK_IMPORTED_MODULE_4__["mix"])(Object(_khanacademy_wonder_blocks_color__WEBPACK_IMPORTED_MODULE_4__["fade"])(color, 0.32), white) : Object(_khanacademy_wonder_blocks_color__WEBPACK_IMPORTED_MODULE_4__["mix"])(offBlack32, color),
       borderWidth: 2,
-      borderColor: light ? Object(wonder_blocks_color_["mix"])(Object(wonder_blocks_color_["fade"])(color, 0.32), white) : Object(wonder_blocks_color_["mix"])(offBlack32, color),
+      borderColor: light ? Object(_khanacademy_wonder_blocks_color__WEBPACK_IMPORTED_MODULE_4__["mix"])(Object(_khanacademy_wonder_blocks_color__WEBPACK_IMPORTED_MODULE_4__["fade"])(color, 0.32), white) : Object(_khanacademy_wonder_blocks_color__WEBPACK_IMPORTED_MODULE_4__["mix"])(offBlack32, color),
       borderStyle: "solid",
       borderRadius: 4
     },
     disabled: {
-      color: light ? Object(wonder_blocks_color_["mix"])(Object(wonder_blocks_color_["fade"])(white, 0.32), color) : offBlack32,
+      color: light ? Object(_khanacademy_wonder_blocks_color__WEBPACK_IMPORTED_MODULE_4__["mix"])(Object(_khanacademy_wonder_blocks_color__WEBPACK_IMPORTED_MODULE_4__["fade"])(white, 0.32), color) : offBlack32,
       cursor: "default"
     }
   };
@@ -383,103 +396,31 @@ const _generateStyles = (color, kind, light) => {
     throw new Error("IconButton kind not recognized");
   }
 
-  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-icon-button/src/components/icon-button.js
-
-
-const icon_button_excluded = ["onClick", "href", "skipClientNav", "tabIndex", "target"],
-      _excluded2 = ["tabIndex"];
-
 
+/***/ }),
+/* 8 */
+/***/ (function(module, exports) {
 
+module.exports = require("react-router-dom");
 
+/***/ }),
+/* 9 */
+/***/ (function(module, exports) {
 
-/**
- * An IconButton is a button whose contents are an SVG image.
- *
- * To use, supply an onClick function, a wonder-blocks icon asset (see
- * the Icon section) and an aria-label to describe the button functionality.
- * Optionally specify href (URL), clientSideNav, color
- * (Wonder Blocks Blue or Red), kind ("primary", "secondary", or "tertiary"),
- * light (whether the IconButton will be rendered on a dark background),
- * disabled , test ID, and custom styling.
- *
- * The size of an IconButton matches the size of icon it wraps which is 24x24
- * pixels.  The focus ring which is displayed on hover and focus is much
- * larger but does not affect its size.  This matches the behavior of Button.
- *
- * IconButtons require a certain amount of space between them to ensure the
- * focus rings don't overlap.  The minimum amount of spacing is 16px, but
- * you should refer to the mocks provided by design.  Using a Strut in between
- * IconButtons is the preferred way to for adding this spacing.
- *
- * Many layouts require alignment of visual left (or right) side of an
- * IconButton.  This requires a little bit of pixel nudging since each icon
- * as a different amount of internal padding.
- *
- * See the Toolbar documentation for examples of IconButton use that follow
- * the best practices described above.
- *
- * ```js
- * import {icons} from "@khanacademy/wonder-blocks-icon";
- *
- * <IconButton
- *     icon={icons.anIcon}
- *     aria-label="An Icon"
- *     onClick={(e) => console.log("Hello, world!")}
- * />
- * ```
- */
-class icon_button_IconButton extends external_react_["Component"] {
-  render() {
-    const _this$props = this.props,
-          {
-      onClick,
-      href,
-      skipClientNav,
-      tabIndex,
-      target
-    } = _this$props,
-          sharedProps = objectWithoutPropertiesLoose_default()(_this$props, icon_button_excluded);
+module.exports = require("@khanacademy/wonder-blocks-icon");
 
-    const ClickableBehavior = Object(wonder_blocks_clickable_["getClickableBehavior"])(href, skipClientNav, this.context.router);
-    return /*#__PURE__*/external_react_["createElement"](ClickableBehavior, {
-      disabled: sharedProps.disabled,
-      href: href,
-      onClick: onClick,
-      role: "button",
-      target: target
-    }, (state, _ref) => {
-      let {
-        tabIndex: clickableTabIndex
-      } = _ref,
-          childrenProps = objectWithoutPropertiesLoose_default()(_ref, _excluded2);
+/***/ }),
+/* 10 */
+/***/ (function(module, __webpack_exports__, __webpack_require__) {
 
-      return /*#__PURE__*/external_react_["createElement"](icon_button_core_IconButtonCore, extends_default()({}, 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
-      }));
-    });
-  }
+"use strict";
+__webpack_require__.r(__webpack_exports__);
+/* harmony import */ var _components_icon_button_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(6);
+/* harmony reexport (safe) */ __webpack_require__.d(__webpack_exports__, "default", function() { return _components_icon_button_js__WEBPACK_IMPORTED_MODULE_0__["a"]; });
 
-}
-icon_button_IconButton.contextTypes = {
-  router: external_prop_types_["any"]
-};
-icon_button_IconButton.defaultProps = {
-  color: "default",
-  kind: "primary",
-  light: false,
-  disabled: false
-};
-// CONCATENATED MODULE: ./packages/wonder-blocks-icon-button/src/index.js
 
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@khanacademy/wonder-blocks-icon-button",
-  "version": "3.3.13",
+  "version": "3.4.2",
   "design": "v1",
   "publishConfig": {
     "access": "public"
@@ -15,20 +15,19 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.13.10",
-    "@khanacademy/wonder-blocks-clickable": "^2.1.2",
-    "@khanacademy/wonder-blocks-color": "^1.1.18",
-    "@khanacademy/wonder-blocks-core": "^3.1.4",
-    "@khanacademy/wonder-blocks-icon": "^1.2.21"
+    "@babel/runtime": "^7.16.3",
+    "@khanacademy/wonder-blocks-clickable": "^2.2.2",
+    "@khanacademy/wonder-blocks-color": "^1.1.20",
+    "@khanacademy/wonder-blocks-core": "^4.0.0",
+    "@khanacademy/wonder-blocks-icon": "^1.2.24"
   },
   "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.1.0"
-  },
-  "gitHead": "8022bb419eed74be37f71f71c7621854794a731c"
+    "wb-dev-build-settings": "^0.2.0"
+  }
 }

package/src/__tests__/__snapshots__/generated-snapshot.test.js.snap

@@ -335,7 +335,7 @@ exports[`wonder-blocks-icon-button example 1 1`] = `
         "width": 40,
       }
     }
-    tabIndex={-1}
+    tabIndex={0}
     type="button"
   >
     <svg
@@ -427,7 +427,7 @@ exports[`wonder-blocks-icon-button example 1 1`] = `
         "width": 40,
       }
     }
-    tabIndex={-1}
+    tabIndex={0}
     type="button"
   >
     <svg

package/src/components/__tests__/icon-button.test.js

@@ -1,6 +1,7 @@
 // @flow
 import * as React from "react";
-import {mount, shallow} from "enzyme";
+import {mount} from "enzyme";
+import "jest-enzyme";
 
 import {MemoryRouter, Route, Switch} from "react-router-dom";
 import {icons} from "@khanacademy/wonder-blocks-icon";
@@ -9,8 +10,19 @@ import expectRenderError from "../../../../../utils/testing/expect-render-error.
 import IconButton from "../icon-button.js";
 
 describe("IconButton", () => {
+    const {location} = window;
+
+    beforeAll(() => {
+        delete window.location;
+        window.location = {assign: jest.fn()};
+    });
+
+    afterAll(() => {
+        window.location = location;
+    });
+
     test("render an icon", (done) => {
-        const wrapper = shallow(
+        const wrapper = mount(
             <IconButton
                 icon={icons.search}
                 aria-label="search"

package/src/components/icon-button-core.js

@@ -2,7 +2,7 @@
 import * as React from "react";
 import {StyleSheet} from "aphrodite";
 import {Link} from "react-router-dom";
-import * as PropTypes from "prop-types";
+import {__RouterContext} from "react-router";
 
 import Color, {
     SemanticColor,
@@ -33,18 +33,12 @@ type Props = {|
     href?: string,
 |};
 
-type ContextTypes = {|
-    router: $FlowFixMe,
-|};
-
 const StyledAnchor = addStyle("a");
 const StyledButton = addStyle("button");
 const StyledLink = addStyle(Link);
 
 export default class IconButtonCore extends React.Component<Props> {
-    static contextTypes: ContextTypes = {router: PropTypes.any};
-
-    render(): React.Node {
+    renderInner(router: any): React.Node {
         const {
             skipClientNav,
             color,
@@ -61,7 +55,6 @@ export default class IconButtonCore extends React.Component<Props> {
             waiting: _,
             ...restProps
         } = this.props;
-        const {router} = this.context;
 
         const buttonColor =
             color === "destructive"
@@ -111,6 +104,14 @@ export default class IconButtonCore extends React.Component<Props> {
             );
         }
     }
+
+    render(): React.Node {
+        return (
+            <__RouterContext.Consumer>
+                {(router) => this.renderInner(router)}
+            </__RouterContext.Consumer>
+        );
+    }
 }
 
 const sharedStyles = StyleSheet.create({

package/src/components/icon-button.js

@@ -1,6 +1,6 @@
 // @flow
 import * as React from "react";
-import * as PropTypes from "prop-types";
+import {__RouterContext} from "react-router";
 
 import {getClickableBehavior} from "@khanacademy/wonder-blocks-clickable";
 import type {IconAsset} from "@khanacademy/wonder-blocks-icon";
@@ -126,10 +126,6 @@ export type SharedProps = {|
     onClick?: (e: SyntheticEvent<>) => mixed,
 |};
 
-type ContextTypes = {|
-    router: $FlowFixMe,
-|};
-
 type DefaultProps = {|
     color: $PropertyType<SharedProps, "color">,
     kind: $PropertyType<SharedProps, "kind">,
@@ -174,7 +170,6 @@ type DefaultProps = {|
  * ```
  */
 export default class IconButton extends React.Component<SharedProps> {
-    static contextTypes: ContextTypes = {router: PropTypes.any};
     static defaultProps: DefaultProps = {
         color: "default",
         kind: "primary",
@@ -182,20 +177,14 @@ export default class IconButton extends React.Component<SharedProps> {
         disabled: false,
     };
 
-    render(): React.Node {
-        const {
-            onClick,
-            href,
-            skipClientNav,
-            tabIndex,
-            target,
-            ...sharedProps
-        } = this.props;
+    renderClickableBehavior(router: any): React.Node {
+        const {onClick, href, skipClientNav, tabIndex, target, ...sharedProps} =
+            this.props;
 
         const ClickableBehavior = getClickableBehavior(
             href,
             skipClientNav,
-            this.context.router,
+            router,
         );
 
         return (
@@ -225,4 +214,12 @@ export default class IconButton extends React.Component<SharedProps> {
             </ClickableBehavior>
         );
     }
+
+    render(): React.Node {
+        return (
+            <__RouterContext.Consumer>
+                {(router) => this.renderClickableBehavior(router)}
+            </__RouterContext.Consumer>
+        );
+    }
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 Khan Academy
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.