@khanacademy/wonder-blocks-link 3.7.14 → 3.8.3

package/CHANGELOG.md

@@ -0,0 +1,15 @@
+# @khanacademy/wonder-blocks-link
+
+## 3.8.3
+
+### Patch Changes
+
+-   @khanacademy/wonder-blocks-clickable@2.2.3
+-   @khanacademy/wonder-blocks-core@4.2.1
+
+## 3.8.2
+
+### Patch Changes
+
+-   Updated dependencies [901bfe82]
+    -   @khanacademy/wonder-blocks-clickable@2.2.2

package/dist/es/index.js

@@ -1,18 +1,18 @@
 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 as Link$1 } from 'react-router-dom';
 import { addStyle } from '@khanacademy/wonder-blocks-core';
 import Color, { mix, fade } from '@khanacademy/wonder-blocks-color';
 
-const _excluded = ["children", "skipClientNav", "focused", "hovered", "href", "kind", "light", "visitable", "pressed", "style", "testId", "waiting"];
+const _excluded$1 = ["children", "skipClientNav", "focused", "hovered", "href", "kind", "light", "visitable", "pressed", "style", "testId", "waiting"];
 const StyledAnchor = addStyle("a");
 const StyledLink = addStyle(Link$1);
-class LinkCore extends Component {
-  render() {
+class LinkCore extends React.Component {
+  renderInner(router) {
     const _this$props = this.props,
           {
       children,
@@ -27,11 +27,7 @@ class LinkCore extends Component {
       style,
       testId
     } = _this$props,
-          restProps = _objectWithoutPropertiesLoose(_this$props, _excluded);
-
-    const {
-      router
-    } = this.context;
+          restProps = _objectWithoutPropertiesLoose(_this$props, _excluded$1);
 
     const linkStyles = _generateStyles(kind, light, visitable);
 
@@ -42,17 +38,18 @@ class LinkCore extends Component {
       style: [defaultStyles, style]
     }, restProps);
 
-    return router && !skipClientNav && isClientSideUrl(href) ? /*#__PURE__*/createElement(StyledLink, _extends({}, commonProps, {
+    return router && !skipClientNav && isClientSideUrl(href) ? /*#__PURE__*/React.createElement(StyledLink, _extends({}, commonProps, {
       to: href
-    }), children) : /*#__PURE__*/createElement(StyledAnchor, _extends({}, commonProps, {
+    }), children) : /*#__PURE__*/React.createElement(StyledAnchor, _extends({}, commonProps, {
       href: href
     }), children);
   }
 
+  render() {
+    return /*#__PURE__*/React.createElement(__RouterContext.Consumer, null, router => this.renderInner(router));
+  }
+
 }
-LinkCore.contextTypes = {
-  router: any
-};
 const styles = {};
 const sharedStyles = StyleSheet.create({
   shared: {
@@ -115,7 +112,7 @@ const _generateStyles = (kind, light, visitable) => {
   return styles[buttonType];
 };
 
-const _excluded$1 = ["onClick", "beforeNav", "safeWithNav", "href", "skipClientNav", "children", "tabIndex", "onKeyDown", "onKeyUp", "target"],
+const _excluded = ["onClick", "beforeNav", "safeWithNav", "href", "skipClientNav", "children", "tabIndex", "onKeyDown", "onKeyUp", "target"],
       _excluded2 = ["tabIndex"],
       _excluded3 = ["tabIndex"];
 
@@ -136,8 +133,8 @@ const _excluded$1 = ["onClick", "beforeNav", "safeWithNav", "href", "skipClientN
  * </Link>
  * ```
  */
-class Link extends Component {
-  render() {
+class Link extends React.Component {
+  renderClickableBehavior(router) {
     const _this$props = this.props,
           {
       onClick,
@@ -151,12 +148,12 @@ class Link extends Component {
       onKeyUp,
       target = undefined
     } = _this$props,
-          sharedProps = _objectWithoutPropertiesLoose(_this$props, _excluded$1);
+          sharedProps = _objectWithoutPropertiesLoose(_this$props, _excluded);
 
-    const ClickableBehavior = getClickableBehavior(href, skipClientNav, this.context.router);
+    const ClickableBehavior = getClickableBehavior(href, skipClientNav, router);
 
     if (beforeNav) {
-      return /*#__PURE__*/createElement(ClickableBehavior, {
+      return /*#__PURE__*/React.createElement(ClickableBehavior, {
         disabled: false,
         href: href,
         role: "link",
@@ -171,7 +168,7 @@ class Link extends Component {
         } = _ref,
             childrenProps = _objectWithoutPropertiesLoose(_ref, _excluded2);
 
-        return /*#__PURE__*/createElement(LinkCore, _extends({}, sharedProps, state, childrenProps, {
+        return /*#__PURE__*/React.createElement(LinkCore, _extends({}, sharedProps, state, childrenProps, {
           skipClientNav: skipClientNav,
           href: href,
           target: target // If tabIndex is provide to the component we allow
@@ -182,7 +179,7 @@ class Link extends Component {
         }), children);
       });
     } else {
-      return /*#__PURE__*/createElement(ClickableBehavior, {
+      return /*#__PURE__*/React.createElement(ClickableBehavior, {
         disabled: false,
         href: href,
         role: "link",
@@ -197,7 +194,7 @@ class Link extends Component {
         } = _ref2,
             childrenProps = _objectWithoutPropertiesLoose(_ref2, _excluded3);
 
-        return /*#__PURE__*/createElement(LinkCore, _extends({}, sharedProps, state, childrenProps, {
+        return /*#__PURE__*/React.createElement(LinkCore, _extends({}, sharedProps, state, childrenProps, {
           skipClientNav: skipClientNav,
           href: href,
           target: target // If tabIndex is provide to the component we allow
@@ -210,14 +207,15 @@ class Link extends Component {
     }
   }
 
+  render() {
+    return /*#__PURE__*/React.createElement(__RouterContext.Consumer, null, router => this.renderClickableBehavior(router));
+  }
+
 }
-Link.contextTypes = {
-  router: any
-};
 Link.defaultProps = {
   kind: "primary",
   light: false,
   visitable: false
 };
 
-export default Link;
+export { Link as default };

package/dist/index.js

@@ -101,7 +101,7 @@ module.exports = require("@khanacademy/wonder-blocks-color");
 /* 2 */
 /***/ (function(module, exports) {
 
-module.exports = require("prop-types");
+module.exports = require("react-router");
 
 /***/ }),
 /* 3 */
@@ -121,8 +121,8 @@ module.exports = require("@khanacademy/wonder-blocks-clickable");
 /* 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 prop_types__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(2);
-/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_3__);
+/* 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);
@@ -141,7 +141,7 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
 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"] {
-  render() {
+  renderInner(router) {
     const {
       children,
       skipClientNav,
@@ -157,9 +157,6 @@ class LinkCore extends react__WEBPACK_IMPORTED_MODULE_0__["Component"] {
       waiting: _,
       ...restProps
     } = this.props;
-    const {
-      router
-    } = this.context;
 
     const linkStyles = _generateStyles(kind, light, visitable);
 
@@ -176,10 +173,11 @@ class LinkCore extends react__WEBPACK_IMPORTED_MODULE_0__["Component"] {
     }), children);
   }
 
+  render() {
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react_router__WEBPACK_IMPORTED_MODULE_3__["__RouterContext"].Consumer, null, router => this.renderInner(router));
+  }
+
 }
-LinkCore.contextTypes = {
-  router: prop_types__WEBPACK_IMPORTED_MODULE_3__["any"]
-};
 const styles = {};
 const sharedStyles = aphrodite__WEBPACK_IMPORTED_MODULE_1__["StyleSheet"].create({
   shared: {
@@ -265,8 +263,8 @@ module.exports = require("@khanacademy/wonder-blocks-core");
 /* 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 prop_types__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(2);
-/* harmony import */ var prop_types__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(prop_types__WEBPACK_IMPORTED_MODULE_1__);
+/* 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);
@@ -295,7 +293,7 @@ function _extends() { _extends = Object.assign || function (target) { for (var i
  * ```
  */
 class Link extends react__WEBPACK_IMPORTED_MODULE_0__["Component"] {
-  render() {
+  renderClickableBehavior(router) {
     const {
       onClick,
       beforeNav = undefined,
@@ -309,7 +307,7 @@ class Link extends react__WEBPACK_IMPORTED_MODULE_0__["Component"] {
       target = undefined,
       ...sharedProps
     } = this.props;
-    const ClickableBehavior = Object(_khanacademy_wonder_blocks_clickable__WEBPACK_IMPORTED_MODULE_2__["getClickableBehavior"])(href, skipClientNav, this.context.router);
+    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, {
@@ -362,10 +360,11 @@ class Link extends react__WEBPACK_IMPORTED_MODULE_0__["Component"] {
     }
   }
 
+  render() {
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0__["createElement"](react_router__WEBPACK_IMPORTED_MODULE_1__["__RouterContext"].Consumer, null, router => this.renderClickableBehavior(router));
+  }
+
 }
-Link.contextTypes = {
-  router: prop_types__WEBPACK_IMPORTED_MODULE_1__["any"]
-};
 Link.defaultProps = {
   kind: "primary",
   light: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@khanacademy/wonder-blocks-link",
-  "version": "3.7.14",
+  "version": "3.8.3",
   "design": "v1",
   "publishConfig": {
     "access": "public"
@@ -15,19 +15,18 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@babel/runtime": "^7.13.10",
-    "@khanacademy/wonder-blocks-clickable": "^2.1.3",
-    "@khanacademy/wonder-blocks-color": "^1.1.19",
-    "@khanacademy/wonder-blocks-core": "^3.1.5"
+    "@babel/runtime": "^7.16.3",
+    "@khanacademy/wonder-blocks-clickable": "^2.2.3",
+    "@khanacademy/wonder-blocks-color": "^1.1.20",
+    "@khanacademy/wonder-blocks-core": "^4.2.1"
   },
   "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.2"
-  },
-  "gitHead": "9a9cc04bf2bbfb425f991a347b4f8b0d0d56e120"
+    "wb-dev-build-settings": "^0.3.0"
+  }
 }

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

@@ -2,6 +2,7 @@
 import * as React from "react";
 import {MemoryRouter, Route, Switch} from "react-router-dom";
 import {mount} from "enzyme";
+import "jest-enzyme";
 
 import Link from "../link.js";
 
@@ -15,7 +16,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(() => {

package/src/components/link-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 {addStyle} from "@khanacademy/wonder-blocks-core";
 import Color, {mix, fade} from "@khanacademy/wonder-blocks-color";
@@ -22,17 +22,11 @@ type Props = {|
     href: string,
 |};
 
-type ContextTypes = {|
-    router: $FlowFixMe,
-|};
-
 const StyledAnchor = addStyle<"a">("a");
 const StyledLink = addStyle<typeof Link>(Link);
 
 export default class LinkCore extends React.Component<Props> {
-    static contextTypes: ContextTypes = {router: PropTypes.any};
-
-    render(): React.Node {
+    renderInner(router: any): React.Node {
         const {
             children,
             skipClientNav,
@@ -48,7 +42,6 @@ export default class LinkCore extends React.Component<Props> {
             waiting: _,
             ...restProps
         } = this.props;
-        const {router} = this.context;
 
         const linkStyles = _generateStyles(kind, light, visitable);
 
@@ -76,6 +69,14 @@ export default class LinkCore extends React.Component<Props> {
             </StyledAnchor>
         );
     }
+
+    render(): React.Node {
+        return (
+            <__RouterContext.Consumer>
+                {(router) => this.renderInner(router)}
+            </__RouterContext.Consumer>
+        );
+    }
 }
 
 const styles = {};

package/src/components/link.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 {AriaProps, StyleType} from "@khanacademy/wonder-blocks-core";
@@ -156,10 +156,6 @@ export type SharedProps =
           beforeNav?: () => Promise<mixed>,
       |};
 
-type ContextTypes = {|
-    router: $FlowFixMe,
-|};
-
 type DefaultProps = {|
     kind: $PropertyType<SharedProps, "kind">,
     light: $PropertyType<SharedProps, "light">,
@@ -184,14 +180,13 @@ type DefaultProps = {|
  * ```
  */
 export default class Link extends React.Component<SharedProps> {
-    static contextTypes: ContextTypes = {router: PropTypes.any};
     static defaultProps: DefaultProps = {
         kind: "primary",
         light: false,
         visitable: false,
     };
 
-    render(): React.Node {
+    renderClickableBehavior(router: any): React.Node {
         const {
             onClick,
             beforeNav = undefined,
@@ -209,7 +204,7 @@ export default class Link extends React.Component<SharedProps> {
         const ClickableBehavior = getClickableBehavior(
             href,
             skipClientNav,
-            this.context.router,
+            router,
         );
 
         if (beforeNav) {
@@ -284,4 +279,12 @@ export default class Link extends React.Component<SharedProps> {
             );
         }
     }
+
+    render(): React.Node {
+        return (
+            <__RouterContext.Consumer>
+                {(router) => this.renderClickableBehavior(router)}
+            </__RouterContext.Consumer>
+        );
+    }
 }

package/src/components/link.md

@@ -35,3 +35,9 @@ import Link from "@khanacademy/wonder-blocks-link";
     </Link>
 </View>
 ```
+
+### Running callbacks on navigation
+
+The `onClick`, `beforeNav`, and `safeWithNav` props can be used to run callbacks
+when navigating to the new URL. Which prop to use depends on the use case. See
+the [Button](#section-button) documentation for details.

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.