From 05257017a90a1e57d40eff7f49a80a55efafbc88 Mon Sep 17 00:00:00 2001
From: Gilad Gray <ggray@palantir.com>
Date: Mon, 23 Apr 2018 16:47:15 -0700
Subject: [PATCH 01/22] REACT=15 env variable support, test-react15 package for
 deps

---
 packages/test-commons/bootstrap.js            |  9 ++-
 packages/test-commons/package.json            |  3 +-
 packages/test-react15/package.json            | 14 +++++
 .../webpack.config.karma.js                   | 11 ++++
 yarn.lock                                     | 56 ++++++++++++++++++-
 5 files changed, 87 insertions(+), 6 deletions(-)
 create mode 100644 packages/test-react15/package.json

diff --git a/packages/test-commons/bootstrap.js b/packages/test-commons/bootstrap.js
index a1ee139fc1..d1ed4dfe4a 100644
--- a/packages/test-commons/bootstrap.js
+++ b/packages/test-commons/bootstrap.js
@@ -2,9 +2,12 @@
  * Copyright 2017 Palantir Technologies, Inc. All rights reserved.
  */
 
-import "./polyfill";
+require("./polyfill");
 
-import * as Enzyme from "enzyme";
-import * as Adapter from "enzyme-adapter-react-16";
+const Enzyme = require("enzyme");
+// REACT env variable should be 15 or 16.
+const Adapter = require(`enzyme-adapter-react-${process.env.REACT}`);
 
 Enzyme.configure({ adapter: new Adapter() });
+// tslint:disable-next-line:no-console
+console.info(`Enzyme configured with ${adapter.name}.`);
diff --git a/packages/test-commons/package.json b/packages/test-commons/package.json
index e7ba2c9b49..d239e3fb53 100644
--- a/packages/test-commons/package.json
+++ b/packages/test-commons/package.json
@@ -15,10 +15,11 @@
     "chai": "^4.1.2",
     "core-js": "^2.5.3",
     "enzyme": "^3.3.0",
+    "enzyme-adapter-react-15": "^1.0.5",
     "enzyme-adapter-react-16": "^1.1.1"
   },
   "peerDependencies": {
-    "react": "^16.2.0"
+    "react": "^15.3.0 || ^16.2.0"
   },
   "devDependencies": {
     "react": "^16.2.0",
diff --git a/packages/test-react15/package.json b/packages/test-react15/package.json
new file mode 100644
index 0000000000..279e18c6e1
--- /dev/null
+++ b/packages/test-react15/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "test-react15",
+  "version": "1.0.0",
+  "description": "React 15 dependencies for testing",
+  "main": "index.js",
+  "license": "MIT",
+  "private": true,
+  "dependencies": {
+    "enzyme-adapter-react-15": "^1.0.5",
+    "react": "^15.6.0",
+    "react-dom": "^15.6.0",
+    "react-test-renderer": "^15.6.0"
+  }
+}
diff --git a/packages/webpack-build-scripts/webpack.config.karma.js b/packages/webpack-build-scripts/webpack.config.karma.js
index f52edc3cda..6226a3c69b 100644
--- a/packages/webpack-build-scripts/webpack.config.karma.js
+++ b/packages/webpack-build-scripts/webpack.config.karma.js
@@ -7,6 +7,8 @@ const CircularDependencyPlugin = require("circular-dependency-plugin");
 const path = require("path");
 const webpack = require("webpack");
 
+const REACT = process.env.REACT || "16";
+
 /**
  * This differs significantly from the base webpack config, so we don't even end up extending from it.
  */
@@ -16,6 +18,14 @@ module.exports = {
     devtool: "inline-source-map",
 
     resolve: {
+        // swap versions of React packages when this env variable is set
+        alias: REACT === "15" ? {
+            // use path.resolve for directory (require.resolve returns main file)
+            "prop-types": path.resolve(__dirname, "../test-react15/node_modules/prop-types"),
+            "react": path.resolve(__dirname, "../test-react15/node_modules/react"),
+            "react-dom": path.resolve(__dirname, "../test-react15/node_modules/react-dom"),
+            "react-test-renderer": path.resolve(__dirname, "../test-react15/node_modules/react-test-renderer"),
+        } : {},
         extensions: [".css", ".js", ".ts", ".tsx"],
     },
 
@@ -58,6 +68,7 @@ module.exports = {
         new webpack.DefinePlugin({
             "process.env": {
                 NODE_ENV: JSON.stringify("test"),
+                REACT: JSON.stringify(REACT),
             },
         }),
 
diff --git a/yarn.lock b/yarn.lock
index 38081dfbc5..5fd854ec91 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1659,6 +1659,14 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+create-react-class@^15.6.0:
+  version "15.6.3"
+  resolved "https://registry.yarnpkg.com/create-react-class/-/create-react-class-15.6.3.tgz#2d73237fb3f970ae6ebe011a9e66f46dbca80036"
+  dependencies:
+    fbjs "^0.8.9"
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
 cross-env@^5.1.3:
   version "5.1.3"
   resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-5.1.3.tgz#f8ae18faac87692b0a8b4d2f7000d4ec3a85dfd7"
@@ -2333,6 +2341,16 @@ entities@^1.1.1, entities@~1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
 
+enzyme-adapter-react-15@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/enzyme-adapter-react-15/-/enzyme-adapter-react-15-1.0.5.tgz#99f9a03ff2c2303e517342935798a6bdfbb75fac"
+  dependencies:
+    enzyme-adapter-utils "^1.1.0"
+    lodash "^4.17.4"
+    object.assign "^4.0.4"
+    object.values "^1.0.4"
+    prop-types "^15.5.10"
+
 enzyme-adapter-react-16@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.1.1.tgz#a8f4278b47e082fbca14f5bfb1ee50ee650717b4"
@@ -2345,7 +2363,7 @@ enzyme-adapter-react-16@^1.1.1:
     react-reconciler "^0.7.0"
     react-test-renderer "^16.0.0-0"
 
-enzyme-adapter-utils@^1.3.0:
+enzyme-adapter-utils@^1.1.0, enzyme-adapter-utils@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.3.0.tgz#d6c85756826c257a8544d362cc7a67e97ea698c7"
   dependencies:
@@ -2791,7 +2809,7 @@ faye-websocket@~0.11.0:
   dependencies:
     websocket-driver ">=0.5.1"
 
-fbjs@^0.8.16:
+fbjs@^0.8.16, fbjs@^0.8.9:
   version "0.8.16"
   resolved "https://registry.yarnpkg.com/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
   dependencies:
@@ -6258,6 +6276,14 @@ promise@^7.1.1:
   dependencies:
     asap "~2.0.3"
 
+prop-types@^15.5.10:
+  version "15.6.1"
+  resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.1.tgz#36644453564255ddda391191fb3a125cbdf654ca"
+  dependencies:
+    fbjs "^0.8.16"
+    loose-envify "^1.3.1"
+    object-assign "^4.1.1"
+
 prop-types@^15.5.8, prop-types@^15.6.0:
   version "15.6.0"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.0.tgz#ceaf083022fc46b4a35f69e13ef75aed0d639856"
@@ -6455,6 +6481,15 @@ react-day-picker@^7.0.7:
     object-assign "^4.1.1"
     prop-types "^15.6.0"
 
+react-dom@^15.6.0:
+  version "15.6.2"
+  resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730"
+  dependencies:
+    fbjs "^0.8.9"
+    loose-envify "^1.1.0"
+    object-assign "^4.1.0"
+    prop-types "^15.5.10"
+
 react-dom@^16.2.0:
   version "16.2.0"
   resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
@@ -6480,6 +6515,13 @@ react-reconciler@^0.7.0:
     object-assign "^4.1.1"
     prop-types "^15.6.0"
 
+react-test-renderer@^15.6.0:
+  version "15.6.2"
+  resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-15.6.2.tgz#d0333434fc2c438092696ca770da5ed48037efa8"
+  dependencies:
+    fbjs "^0.8.9"
+    object-assign "^4.1.0"
+
 react-test-renderer@^16.0.0-0, react-test-renderer@^16.2.0:
   version "16.2.0"
   resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.2.0.tgz#bddf259a6b8fcd8555f012afc8eacc238872a211"
@@ -6499,6 +6541,16 @@ react-transition-group@^2.2.1:
     prop-types "^15.5.8"
     warning "^3.0.0"
 
+react@^15.6.0:
+  version "15.6.2"
+  resolved "https://registry.yarnpkg.com/react/-/react-15.6.2.tgz#dba0434ab439cfe82f108f0f511663908179aa72"
+  dependencies:
+    create-react-class "^15.6.0"
+    fbjs "^0.8.9"
+    loose-envify "^1.1.0"
+    object-assign "^4.1.0"
+    prop-types "^15.5.10"
+
 react@^16.2.0:
   version "16.2.0"
   resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"

From 0bd01004d7a6d974a52b13adafcaba88a3ccb08e Mon Sep 17 00:00:00 2001
From: Gilad Gray <ggray@palantir.com>
Date: Mon, 23 Apr 2018 16:49:48 -0700
Subject: [PATCH 02/22] remove isomorphic from main test-commons import because
 it only supports React 16

---
 packages/core/test/isotest.js       | 5 ++---
 packages/datetime/test/isotest.js   | 2 +-
 packages/select/test/isotest.js     | 2 +-
 packages/table/test/isotest.js      | 2 +-
 packages/test-commons/isomorphic.js | 8 ++++++++
 packages/test-commons/src/index.ts  | 1 -
 packages/timezone/test/isotest.js   | 2 +-
 7 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 packages/test-commons/isomorphic.js

diff --git a/packages/core/test/isotest.js b/packages/core/test/isotest.js
index 6e0ee4b150..2753dcb646 100644
--- a/packages/core/test/isotest.js
+++ b/packages/core/test/isotest.js
@@ -4,15 +4,14 @@
  */
 
 // @ts-check
-const { generateIsomorphicTests } = require("@blueprintjs/test-commons");
+const { generateIsomorphicTests } = require("@blueprintjs/test-commons/isomorphic");
 const React = require("react");
-// TODO: get this to work with require("@std/esm")(module)("../lib/esm")
 const Core = require("../lib/cjs");
 
 const tooltipContent = { content: React.createElement("h1", {}, "content") };
 const customProps = {
     Hotkey: { combo: "mod+s", global: true, label: "save" },
-    Icon: { iconName: "pt-icon-build" },
+    Icon: { iconName: "build" },
     KeyCombo: { combo: "?" },
     Overlay: { lazy: false, usePortal: false },
     SVGTooltip: tooltipContent,
diff --git a/packages/datetime/test/isotest.js b/packages/datetime/test/isotest.js
index e5618f6a6c..d3dfff668a 100644
--- a/packages/datetime/test/isotest.js
+++ b/packages/datetime/test/isotest.js
@@ -3,7 +3,7 @@
  * Licensed under the terms of the LICENSE file distributed with this project.
  */
 
-const { generateIsomorphicTests } = require("@blueprintjs/test-commons");
+const { generateIsomorphicTests } = require("@blueprintjs/test-commons/isomorphic");
 const React = require("react");
 const DateTime = require("../lib/cjs");
 
diff --git a/packages/select/test/isotest.js b/packages/select/test/isotest.js
index f376cdebf9..047084e917 100644
--- a/packages/select/test/isotest.js
+++ b/packages/select/test/isotest.js
@@ -4,7 +4,7 @@
  */
 
 // @ts-check
-const { generateIsomorphicTests } = require("@blueprintjs/test-commons");
+const { generateIsomorphicTests } = require("@blueprintjs/test-commons/isomorphic");
 const React = require("react");
 const Select = require("../lib/cjs");
 
diff --git a/packages/table/test/isotest.js b/packages/table/test/isotest.js
index 99d00b8790..2e815364eb 100644
--- a/packages/table/test/isotest.js
+++ b/packages/table/test/isotest.js
@@ -4,7 +4,7 @@
  */
 
 // @ts-check
-const { generateIsomorphicTests } = require("@blueprintjs/test-commons");
+const { generateIsomorphicTests } = require("@blueprintjs/test-commons/isomorphic");
 const React = require("react");
 const Table = require("../lib/cjs");
 
diff --git a/packages/test-commons/isomorphic.js b/packages/test-commons/isomorphic.js
new file mode 100644
index 0000000000..e505bc8507
--- /dev/null
+++ b/packages/test-commons/isomorphic.js
@@ -0,0 +1,8 @@
+/*
+ * Copyright 2017 Palantir Technologies, Inc. All rights reserved.
+ *
+ * This module has its own root so it is not included when tests import this package,
+ * as this module only uses React 16 -- no support for React 15 isotests.
+ */
+
+module.exports = require("./lib/cjs/generateIsomorphicTests");
diff --git a/packages/test-commons/src/index.ts b/packages/test-commons/src/index.ts
index c82150e8d3..7fbaa204ec 100644
--- a/packages/test-commons/src/index.ts
+++ b/packages/test-commons/src/index.ts
@@ -3,6 +3,5 @@
  * Licensed under the terms of the LICENSE file distributed with this project.
  */
 
-export * from "./generateIsomorphicTests";
 export * from "./testErrorBoundary";
 export * from "./utils";
diff --git a/packages/timezone/test/isotest.js b/packages/timezone/test/isotest.js
index 1a48a7b24f..dc557a3e2e 100644
--- a/packages/timezone/test/isotest.js
+++ b/packages/timezone/test/isotest.js
@@ -4,7 +4,7 @@
  */
 
 // @ts-check
-const { generateIsomorphicTests } = require("@blueprintjs/test-commons");
+const { generateIsomorphicTests } = require("@blueprintjs/test-commons/isomorphic");
 const React = require("react");
 const Timezone = require("../lib/cjs");
 

From 4ae639682d4362eb0bad287bce9677c6d139a1e8 Mon Sep 17 00:00:00 2001
From: Gilad Gray <ggray@palantir.com>
Date: Mon, 23 Apr 2018 17:10:03 -0700
Subject: [PATCH 03/22] fix message

---
 packages/test-commons/bootstrap.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/test-commons/bootstrap.js b/packages/test-commons/bootstrap.js
index d1ed4dfe4a..92ad15e196 100644
--- a/packages/test-commons/bootstrap.js
+++ b/packages/test-commons/bootstrap.js
@@ -10,4 +10,4 @@ const Adapter = require(`enzyme-adapter-react-${process.env.REACT}`);
 
 Enzyme.configure({ adapter: new Adapter() });
 // tslint:disable-next-line:no-console
-console.info(`Enzyme configured with ${adapter.name}.`);
+console.info(`Enzyme configured with ${Adapter.name}.`);

From a1d4e08b4298a882c8bd5045145a74f0b754f5d9 Mon Sep 17 00:00:00 2001
From: Gilad Gray <ggray@palantir.com>
Date: Mon, 23 Apr 2018 17:10:16 -0700
Subject: [PATCH 04/22] fix core tests

---
 .../src/components/button/abstractButton.tsx  | 24 +++++++--------
 .../core/src/components/portal/portal.tsx     | 30 +++++++++++++++++--
 packages/core/test/alert/alertTests.tsx       |  5 ++--
 packages/core/test/buttons/buttonTests.tsx    |  4 +--
 .../test/editable-text/editableTextTests.tsx  | 12 +++-----
 packages/core/test/menu/menuItemTests.tsx     |  2 +-
 packages/core/test/overlay/overlayTests.tsx   |  7 +++--
 packages/core/test/popover/popoverTests.tsx   |  4 +--
 packages/core/test/utils.ts                   | 24 +++++++++++++++
 9 files changed, 78 insertions(+), 34 deletions(-)
 create mode 100644 packages/core/test/utils.ts

diff --git a/packages/core/src/components/button/abstractButton.tsx b/packages/core/src/components/button/abstractButton.tsx
index c917adf25f..ae901b3d01 100644
--- a/packages/core/src/components/button/abstractButton.tsx
+++ b/packages/core/src/components/button/abstractButton.tsx
@@ -144,19 +144,17 @@ export abstract class AbstractButton<H extends React.HTMLAttributes<any>> extend
 
     protected renderChildren(): React.ReactNode {
         const { children, icon, loading, rightIcon, text } = this.props;
-        return (
-            <>
-                {loading && <Spinner className={classNames(Classes.SMALL, Classes.BUTTON_SPINNER)} />}
-                <Icon icon={icon} />
-                {(text || children) && (
-                    <span className={Classes.BUTTON_TEXT}>
-                        {text}
-                        {children}
-                    </span>
-                )}
-                <Icon icon={rightIcon} />
-            </>
-        );
+        return [
+            loading && <Spinner key="loading" className={classNames(Classes.SMALL, Classes.BUTTON_SPINNER)} />,
+            <Icon key="leftIcon" icon={icon} />,
+            (text || children) && (
+                <span key="text" className={Classes.BUTTON_TEXT}>
+                    {text}
+                    {children}
+                </span>
+            ),
+            <Icon key="rightIcon" icon={rightIcon} />,
+        ];
     }
 }
 
diff --git a/packages/core/src/components/portal/portal.tsx b/packages/core/src/components/portal/portal.tsx
index 52deed5ec5..24c95bcb24 100644
--- a/packages/core/src/components/portal/portal.tsx
+++ b/packages/core/src/components/portal/portal.tsx
@@ -9,9 +9,11 @@ import * as ReactDOM from "react-dom";
 
 import * as Classes from "../../common/classes";
 import * as Errors from "../../common/errors";
-import { HTMLDivProps, IProps } from "../../common/props";
+import { IProps } from "../../common/props";
 
-export interface IPortalProps extends IProps, HTMLDivProps {
+const isReact15 = typeof ReactDOM.createPortal === "undefined";
+
+export interface IPortalProps extends IProps {
     /**
      * Callback invoked when the children of this `Portal` have been added to the DOM.
      */
@@ -54,17 +56,25 @@ export class Portal extends React.Component<IPortalProps, IPortalState> {
         // Only render `children` once this component has mounted in a browser environment, so they are
         // immediately attached to the DOM tree and can do DOM things like measuring or `autoFocus`.
         // See long comment on componentDidMount in https://reactjs.org/docs/portals.html#event-bubbling-through-portals
-        if (typeof document === "undefined" || !this.state.hasMounted) {
+        if (isReact15 || typeof document === "undefined" || !this.state.hasMounted) {
             return null;
         } else {
+            console.log("Creating portal");
             return ReactDOM.createPortal(this.props.children, this.portalElement);
         }
     }
 
+    public componentDidCatch(e: any) {
+        console.log(e);
+    }
+
     public componentDidMount() {
         this.portalElement = this.createContainerElement();
         document.body.appendChild(this.portalElement);
         this.setState({ hasMounted: true }, this.props.onChildrenMount);
+        if (isReact15) {
+            this.renderReact15();
+        }
     }
 
     public componentDidUpdate(prevProps: IPortalProps) {
@@ -73,10 +83,16 @@ export class Portal extends React.Component<IPortalProps, IPortalState> {
             this.portalElement.classList.remove(prevProps.className);
             maybeAddClass(this.portalElement.classList, this.props.className);
         }
+        if (isReact15) {
+            this.renderReact15();
+        }
     }
 
     public componentWillUnmount() {
         if (this.portalElement != null) {
+            if (isReact15) {
+                ReactDOM.unmountComponentAtNode(this.portalElement);
+            }
             this.portalElement.remove();
         }
     }
@@ -90,6 +106,14 @@ export class Portal extends React.Component<IPortalProps, IPortalState> {
         }
         return container;
     }
+
+    private renderReact15() {
+        ReactDOM.unstable_renderSubtreeIntoContainer(
+            /* parentComponent */ this,
+            <div>{this.props.children}</div>,
+            this.portalElement,
+        );
+    }
 }
 
 function maybeAddClass(classList: DOMTokenList, className?: string) {
diff --git a/packages/core/test/alert/alertTests.tsx b/packages/core/test/alert/alertTests.tsx
index 5a3bc545bb..795382c26d 100644
--- a/packages/core/test/alert/alertTests.tsx
+++ b/packages/core/test/alert/alertTests.tsx
@@ -11,6 +11,7 @@ import { SinonStub, spy, stub } from "sinon";
 
 import * as Errors from "../../src/common/errors";
 import { Alert, Button, Classes, IAlertProps, IButtonProps, Icon, Intent, Keys } from "../../src/index";
+import { findInPortal } from "../utils";
 
 describe("<Alert>", () => {
     it("renders its content correctly", () => {
@@ -136,7 +137,7 @@ describe("<Alert>", () => {
                     <p>There is no going back.</p>
                 </Alert>,
             );
-            const overlay = alert.find("." + Classes.OVERLAY).hostNodes();
+            const overlay = findInPortal(alert, "." + Classes.OVERLAY).first();
 
             overlay.simulate("keydown", { which: Keys.ESCAPE });
             assert.isTrue(onCancel.notCalled);
@@ -155,7 +156,7 @@ describe("<Alert>", () => {
                     <p>There is no going back.</p>
                 </Alert>,
             );
-            const backdrop = alert.find("." + Classes.OVERLAY_BACKDROP).hostNodes();
+            const backdrop = findInPortal(alert, "." + Classes.OVERLAY_BACKDROP).hostNodes();
 
             backdrop.simulate("mousedown");
             assert.isTrue(onCancel.notCalled);
diff --git a/packages/core/test/buttons/buttonTests.tsx b/packages/core/test/buttons/buttonTests.tsx
index ed2b03a319..e2ac748e02 100644
--- a/packages/core/test/buttons/buttonTests.tsx
+++ b/packages/core/test/buttons/buttonTests.tsx
@@ -28,8 +28,8 @@ function buttonTestSuite(component: React.ComponentClass<any>, tagName: string)
 
         it('icon="style" renders Icon as first child', () => {
             const wrapper = button({ icon: "style" });
-            const firstChild = wrapper.children().childAt(0);
-            assert.isTrue(firstChild.is(Icon));
+            const firstChild = wrapper.find(Icon).at(0);
+            assert.strictEqual(firstChild.prop("icon"), "style");
         });
 
         it("renders the button text prop", () => {
diff --git a/packages/core/test/editable-text/editableTextTests.tsx b/packages/core/test/editable-text/editableTextTests.tsx
index deb732e143..f89b88a465 100644
--- a/packages/core/test/editable-text/editableTextTests.tsx
+++ b/packages/core/test/editable-text/editableTextTests.tsx
@@ -61,14 +61,10 @@ describe("<EditableText>", () => {
 
         it("calls onChange when escape key pressed and value is unconfirmed", () => {
             const changeSpy = spy();
-            const input = mount(
-                <EditableText isEditing={true} onChange={changeSpy} placeholder="Edit..." defaultValue="alphabet" />,
-            ).find("input");
-
-            input.simulate("keydown", { which: Keys.ESCAPE });
-            assert.equal(changeSpy.callCount, 0, "onChange called incorrectly"); // no change so no invoke
-
-            input.simulate("change", { target: { value: "hello" } }).simulate("keydown", { which: Keys.ESCAPE });
+            mount(<EditableText isEditing={true} onChange={changeSpy} placeholder="Edit..." defaultValue="alphabet" />)
+                .find("input")
+                .simulate("change", { target: { value: "hello" } })
+                .simulate("keydown", { which: Keys.ESCAPE });
             assert.equal(changeSpy.callCount, 2, "onChange not called twice"); // change & escape
             assert.deepEqual(changeSpy.args[1], ["alphabet"], `unexpected argument "${changeSpy.args[1][0]}"`);
         });
diff --git a/packages/core/test/menu/menuItemTests.tsx b/packages/core/test/menu/menuItemTests.tsx
index e96d1f3792..0889df4191 100644
--- a/packages/core/test/menu/menuItemTests.tsx
+++ b/packages/core/test/menu/menuItemTests.tsx
@@ -89,7 +89,7 @@ describe("MenuItem", () => {
         const handleClose = spy();
         const menu = <MenuItem text="Graph" shouldDismissPopover={false} />;
         const wrapper = mount(
-            <Popover content={menu} isOpen={true} onInteraction={handleClose}>
+            <Popover content={menu} isOpen={true} onInteraction={handleClose} usePortal={false}>
                 <Button />
             </Popover>,
         );
diff --git a/packages/core/test/overlay/overlayTests.tsx b/packages/core/test/overlay/overlayTests.tsx
index c86fd80751..60f165e355 100644
--- a/packages/core/test/overlay/overlayTests.tsx
+++ b/packages/core/test/overlay/overlayTests.tsx
@@ -10,9 +10,9 @@ import * as React from "react";
 import { spy } from "sinon";
 
 import { dispatchMouseEvent } from "@blueprintjs/test-commons";
-
 import * as Keys from "../../src/common/keys";
 import { Classes, IOverlayProps, Overlay, Portal, Utils } from "../../src/index";
+import { findInPortal } from "../utils";
 
 const BACKDROP_SELECTOR = `.${Classes.OVERLAY_BACKDROP}`;
 
@@ -215,7 +215,7 @@ describe("<Overlay>", () => {
             const onClose = spy();
             mountWrapper(
                 <Overlay isOpen={true} onClose={onClose}>
-                    <div>
+                    <div id="outer-element">
                         {createOverlayContents()}
                         <Overlay isOpen={true}>
                             <div id="inner-element">{createOverlayContents()}</div>
@@ -223,7 +223,8 @@ describe("<Overlay>", () => {
                     </div>
                 </Overlay>,
             );
-            wrapper.find("#inner-element").simulate("mousedown");
+            // this hackery is necessary for React 15 support, where Portals break trees.
+            findInPortal(findInPortal(wrapper, "#outer-element"), "#inner-element").simulate("mousedown");
             assert.isTrue(onClose.notCalled);
         });
 
diff --git a/packages/core/test/popover/popoverTests.tsx b/packages/core/test/popover/popoverTests.tsx
index a64af4ff33..d99355b6a0 100644
--- a/packages/core/test/popover/popoverTests.tsx
+++ b/packages/core/test/popover/popoverTests.tsx
@@ -147,12 +147,12 @@ describe("<Popover>", () => {
 
     it("renders Portal when usePortal=true", () => {
         wrapper = renderPopover({ isOpen: true, usePortal: true });
-        assert.lengthOf(wrapper.find(Portal).find(`.${Classes.POPOVER}`), 1);
+        assert.lengthOf(wrapper.find(Portal), 1);
     });
 
     it("does not render Portal when usePortal=false", () => {
         wrapper = renderPopover({ isOpen: true, usePortal: false });
-        assert.lengthOf(wrapper.find(Portal).find(`.${Classes.POPOVER}`), 0);
+        assert.lengthOf(wrapper.find(Portal), 0);
     });
 
     it("empty content disables it and warns", () => {
diff --git a/packages/core/test/utils.ts b/packages/core/test/utils.ts
new file mode 100644
index 0000000000..15a2a2a2d2
--- /dev/null
+++ b/packages/core/test/utils.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2018 Palantir Technologies, Inc. All rights reserved.
+ * 
+ * Licensed under the terms of the LICENSE file distributed with this project.
+ */
+
+import { ReactWrapper } from "enzyme";
+import { Portal } from "../src";
+
+export function findInPortal(overlay: ReactWrapper, selector: string) {
+    // React 16: createPortal preserves React tree so simple find works.
+    const element = overlay.find(Portal).find(selector);
+    if (element.exists()) {
+        return element;
+    }
+
+    // React 15: unstable_renderSubtree does not preserve tree so we must create new wrapper.
+    const portal = overlay.find(Portal).instance();
+    const portalChildren = new ReactWrapper(portal.props.children as JSX.Element[]);
+    if (portalChildren.is(selector)) {
+        return portalChildren;
+    }
+    return portalChildren.find(selector);
+}

From 85e984fb8ddc668571bdd554c5e7814757fb2125 Mon Sep 17 00:00:00 2001
From: Gilad Gray <ggray@palantir.com>
Date: Mon, 23 Apr 2018 17:18:56 -0700
Subject: [PATCH 05/22] add circle job `test-15`

---
 .circleci/config.yml | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 23c6ac126d..eac4500742 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -93,6 +93,27 @@ jobs:
               3) yarn lerna run test --scope '@blueprintjs/{icons,labs,select}' ;; \
               esac
 
+  test-15:
+    docker:
+      - image: circleci/node:8.10.0-browsers
+        environment:
+            CHROME_BIN: "/usr/bin/google-chrome"
+    parallelism: 4
+    steps:
+      - checkout
+      - attach_workspace:
+          at: '.'
+      - restore_cache:
+          key: v7-dependency-cache-{{ checksum "yarn.lock" }}
+      - run:
+          command: |
+              case $CIRCLE_NODE_INDEX in \
+              0) yarn lerna run test15 --scope '@blueprintjs/core' ;; \
+              1) yarn lerna run test15 --scope '@blueprintjs/{datetime,timezone}' ;; \
+              2) yarn lerna run test15 --scope '@blueprintjs/table' ;; \
+              3) yarn lerna run test15 --scope '@blueprintjs/{icons,labs,select}' ;; \
+              esac
+
   deploy-preview:
     docker:
       - image: circleci/node:8.10.0
@@ -136,6 +157,8 @@ workflows:
           requires: [compile]
       - test:
           requires: [compile]
+      - test-15:
+          requires: [compile]
       - deploy-preview:
           requires: [dist]
       - deploy-npm:

From 05ee82c88d8b71fe1404be95271329db35c84dfc Mon Sep 17 00:00:00 2001
From: Gilad Gray <ggray@palantir.com>
Date: Mon, 23 Apr 2018 17:22:49 -0700
Subject: [PATCH 06/22] remove portal logs

---
 packages/core/src/components/portal/portal.tsx | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/core/src/components/portal/portal.tsx b/packages/core/src/components/portal/portal.tsx
index 24c95bcb24..240ecf5125 100644
--- a/packages/core/src/components/portal/portal.tsx
+++ b/packages/core/src/components/portal/portal.tsx
@@ -59,15 +59,10 @@ export class Portal extends React.Component<IPortalProps, IPortalState> {
         if (isReact15 || typeof document === "undefined" || !this.state.hasMounted) {
             return null;
         } else {
-            console.log("Creating portal");
             return ReactDOM.createPortal(this.props.children, this.portalElement);
         }
     }
 
-    public componentDidCatch(e: any) {
-        console.log(e);
-    }
-
     public componentDidMount() {
         this.portalElement = this.createContainerElement();
         document.body.appendChild(this.portalElement);

From 3b31c6f6ab4f521d9c7911e84cf4697915990c3f Mon Sep 17 00:00:00 2001
From: Gilad Gray <ggray@palantir.com>
Date: Mon, 23 Apr 2018 17:35:03 -0700
Subject: [PATCH 07/22] REACT env var in circle

---
 .circleci/config.yml | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index eac4500742..880f29036a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -98,6 +98,8 @@ jobs:
       - image: circleci/node:8.10.0-browsers
         environment:
             CHROME_BIN: "/usr/bin/google-chrome"
+    environment:
+      REACT: 15 # use React 15 for these tests
     parallelism: 4
     steps:
       - checkout
@@ -108,10 +110,10 @@ jobs:
       - run:
           command: |
               case $CIRCLE_NODE_INDEX in \
-              0) yarn lerna run test15 --scope '@blueprintjs/core' ;; \
-              1) yarn lerna run test15 --scope '@blueprintjs/{datetime,timezone}' ;; \
-              2) yarn lerna run test15 --scope '@blueprintjs/table' ;; \
-              3) yarn lerna run test15 --scope '@blueprintjs/{icons,labs,select}' ;; \
+              0) yarn lerna run test --scope '@blueprintjs/core' ;; \
+              1) yarn lerna run test --scope '@blueprintjs/{datetime,timezone}' ;; \
+              2) yarn lerna run test --scope '@blueprintjs/table' ;; \
+              3) yarn lerna run test --scope '@blueprintjs/{icons,labs,select}' ;; \
               esac
 
   deploy-preview:

From 2c2e6ee4ee21c01758ae42706219bb471da5c0f1 Mon Sep 17 00:00:00 2001
From: Gilad Gray <ggray@palantir.com>
Date: Tue, 24 Apr 2018 11:11:17 -0700
Subject: [PATCH 08/22] icons isotest

---
 packages/icons/test/isotest.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/icons/test/isotest.js b/packages/icons/test/isotest.js
index 0e8764198b..b65969ad61 100644
--- a/packages/icons/test/isotest.js
+++ b/packages/icons/test/isotest.js
@@ -4,7 +4,7 @@
  */
 
 // @ts-check
-const { generateIsomorphicTests } = require("@blueprintjs/test-commons");
+const { generateIsomorphicTests } = require("@blueprintjs/test-commons/isomorphic");
 const React = require("react");
 const Icons = require("../lib/cjs");
 

From aae2809a62c0885eee26dae35f54e74561b1f07e Mon Sep 17 00:00:00 2001
From: Gilad Gray <ggray@palantir.com>
Date: Tue, 24 Apr 2018 16:25:36 -0700
Subject: [PATCH 09/22] isotests run in 15 or 16, test-commons scripts use
 require imports

---
 packages/test-commons/bootstrap.js                   | 9 ++++++---
 packages/test-commons/polyfill.js                    | 8 ++++----
 packages/test-commons/src/generateIsomorphicTests.ts | 9 +++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/packages/test-commons/bootstrap.js b/packages/test-commons/bootstrap.js
index 92ad15e196..5f22625d6c 100644
--- a/packages/test-commons/bootstrap.js
+++ b/packages/test-commons/bootstrap.js
@@ -4,10 +4,13 @@
 
 require("./polyfill");
 
-const Enzyme = require("enzyme");
 // REACT env variable should be 15 or 16.
-const Adapter = require(`enzyme-adapter-react-${process.env.REACT}`);
+const { REACT = 16 } = process.env;
+
+const Enzyme = require("enzyme");
+const Adapter = require(`enzyme-adapter-react-${REACT}`);
 
 Enzyme.configure({ adapter: new Adapter() });
+
 // tslint:disable-next-line:no-console
-console.info(`Enzyme configured with ${Adapter.name}.`);
+console.info(`Enzyme configured with \x1b[35m${Adapter.name}\x1b[0m`);
diff --git a/packages/test-commons/polyfill.js b/packages/test-commons/polyfill.js
index 1f37e47619..4a8dd41896 100644
--- a/packages/test-commons/polyfill.js
+++ b/packages/test-commons/polyfill.js
@@ -7,7 +7,7 @@
  * Require the minimal set of ES2015+ polyfills from `core-js` library.
  * See "NPM Installation" section of docs homepage for more information.
  */
-import "core-js/fn/array/fill";
-import "core-js/fn/array/from";
-import "core-js/fn/map";
-import "core-js/fn/set";
+require("core-js/fn/array/fill");
+require("core-js/fn/array/from");
+require("core-js/fn/map");
+require("core-js/fn/set");
diff --git a/packages/test-commons/src/generateIsomorphicTests.ts b/packages/test-commons/src/generateIsomorphicTests.ts
index 620575db01..f23ba951d0 100755
--- a/packages/test-commons/src/generateIsomorphicTests.ts
+++ b/packages/test-commons/src/generateIsomorphicTests.ts
@@ -1,18 +1,15 @@
 /*
  * Copyright 2017 Palantir Technologies, Inc. All rights reserved.
  *
- * Generates isomorphic tests for React components
+ * Generates isomorphic tests for React components.
  */
 
-// TODO: make this an executable script that takes configuration from CLI arguments so we don't need
-// to use the `mocha` CLI and write an isotest.js file in every project
+// tslint:disable-next-line:no-var-requires
+require("../../bootstrap");
 
 import * as Enzyme from "enzyme";
-import React16Adapter from "enzyme-adapter-react-16";
 import * as React from "react";
 
-Enzyme.configure({ adapter: new React16Adapter() });
-
 /**
  * Determines if the passed Component is a React Class or not
  * `TestUtils.isElement()`

From 8e57b13cc542dec4f124bc109e2b51fdb4635498 Mon Sep 17 00:00:00 2001
From: Gilad Gray <ggray@palantir.com>
Date: Tue, 24 Apr 2018 16:26:05 -0700
Subject: [PATCH 10/22] revert isomorphic entry change

---
 packages/core/test/isotest.js       | 2 +-
 packages/datetime/test/isotest.js   | 2 +-
 packages/icons/test/isotest.js      | 2 +-
 packages/select/test/isotest.js     | 2 +-
 packages/table/test/isotest.js      | 2 +-
 packages/test-commons/isomorphic.js | 8 --------
 packages/test-commons/src/index.ts  | 1 +
 packages/timezone/test/isotest.js   | 2 +-
 8 files changed, 7 insertions(+), 14 deletions(-)
 delete mode 100644 packages/test-commons/isomorphic.js

diff --git a/packages/core/test/isotest.js b/packages/core/test/isotest.js
index 2753dcb646..4716800797 100644
--- a/packages/core/test/isotest.js
+++ b/packages/core/test/isotest.js
@@ -4,7 +4,7 @@
  */
 
 // @ts-check
-const { generateIsomorphicTests } = require("@blueprintjs/test-commons/isomorphic");
+const { generateIsomorphicTests } = require("@blueprintjs/test-commons");
 const React = require("react");
 const Core = require("../lib/cjs");
 
diff --git a/packages/datetime/test/isotest.js b/packages/datetime/test/isotest.js
index d3dfff668a..e5618f6a6c 100644
--- a/packages/datetime/test/isotest.js
+++ b/packages/datetime/test/isotest.js
@@ -3,7 +3,7 @@
  * Licensed under the terms of the LICENSE file distributed with this project.
  */
 
-const { generateIsomorphicTests } = require("@blueprintjs/test-commons/isomorphic");
+const { generateIsomorphicTests } = require("@blueprintjs/test-commons");
 const React = require("react");
 const DateTime = require("../lib/cjs");
 
diff --git a/packages/icons/test/isotest.js b/packages/icons/test/isotest.js
index b65969ad61..0e8764198b 100644
--- a/packages/icons/test/isotest.js
+++ b/packages/icons/test/isotest.js
@@ -4,7 +4,7 @@
  */
 
 // @ts-check
-const { generateIsomorphicTests } = require("@blueprintjs/test-commons/isomorphic");
+const { generateIsomorphicTests } = require("@blueprintjs/test-commons");
 const React = require("react");
 const Icons = require("../lib/cjs");
 
diff --git a/packages/select/test/isotest.js b/packages/select/test/isotest.js
index 047084e917..f376cdebf9 100644
--- a/packages/select/test/isotest.js
+++ b/packages/select/test/isotest.js
@@ -4,7 +4,7 @@
  */
 
 // @ts-check
-const { generateIsomorphicTests } = require("@blueprintjs/test-commons/isomorphic");
+const { generateIsomorphicTests } = require("@blueprintjs/test-commons");
 const React = require("react");
 const Select = require("../lib/cjs");
 
diff --git a/packages/table/test/isotest.js b/packages/table/test/isotest.js
index 2e815364eb..99d00b8790 100644
--- a/packages/table/test/isotest.js
+++ b/packages/table/test/isotest.js
@@ -4,7 +4,7 @@
  */
 
 // @ts-check
-const { generateIsomorphicTests } = require("@blueprintjs/test-commons/isomorphic");
+const { generateIsomorphicTests } = require("@blueprintjs/test-commons");
 const React = require("react");
 const Table = require("../lib/cjs");
 
diff --git a/packages/test-commons/isomorphic.js b/packages/test-commons/isomorphic.js
deleted file mode 100644
index e505bc8507..0000000000
--- a/packages/test-commons/isomorphic.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright 2017 Palantir Technologies, Inc. All rights reserved.
- *
- * This module has its own root so it is not included when tests import this package,
- * as this module only uses React 16 -- no support for React 15 isotests.
- */
-
-module.exports = require("./lib/cjs/generateIsomorphicTests");
diff --git a/packages/test-commons/src/index.ts b/packages/test-commons/src/index.ts
index 7fbaa204ec..c82150e8d3 100644
--- a/packages/test-commons/src/index.ts
+++ b/packages/test-commons/src/index.ts
@@ -3,5 +3,6 @@
  * Licensed under the terms of the LICENSE file distributed with this project.
  */
 
+export * from "./generateIsomorphicTests";
 export * from "./testErrorBoundary";
 export * from "./utils";
diff --git a/packages/timezone/test/isotest.js b/packages/timezone/test/isotest.js
index dc557a3e2e..1a48a7b24f 100644
--- a/packages/timezone/test/isotest.js
+++ b/packages/timezone/test/isotest.js
@@ -4,7 +4,7 @@
  */
 
 // @ts-check
-const { generateIsomorphicTests } = require("@blueprintjs/test-commons/isomorphic");
+const { generateIsomorphicTests } = require("@blueprintjs/test-commons");
 const React = require("react");
 const Timezone = require("../lib/cjs");
 

From 81288084eb02a3d18c5c56fe2740b9993f85ca6a Mon Sep 17 00:00:00 2001
From: Gilad Gray <ggray@palantir.com>
Date: Wed, 25 Apr 2018 15:41:38 -0700
Subject: [PATCH 11/22] fix test imports

---
 packages/test-commons/bootstrap.js                |  6 ++----
 .../test-commons/src/generateIsomorphicTests.ts   | 15 ++++-----------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/packages/test-commons/bootstrap.js b/packages/test-commons/bootstrap.js
index 5f22625d6c..582526e568 100644
--- a/packages/test-commons/bootstrap.js
+++ b/packages/test-commons/bootstrap.js
@@ -4,11 +4,9 @@
 
 require("./polyfill");
 
-// REACT env variable should be 15 or 16.
-const { REACT = 16 } = process.env;
-
 const Enzyme = require("enzyme");
-const Adapter = require(`enzyme-adapter-react-${REACT}`);
+// test against React 15 with REACT=15 env variable.
+const Adapter = require(`enzyme-adapter-react-${process.env.REACT || 16}`);
 
 Enzyme.configure({ adapter: new Adapter() });
 
diff --git a/packages/test-commons/src/generateIsomorphicTests.ts b/packages/test-commons/src/generateIsomorphicTests.ts
index f23ba951d0..b9c4a6ab90 100755
--- a/packages/test-commons/src/generateIsomorphicTests.ts
+++ b/packages/test-commons/src/generateIsomorphicTests.ts
@@ -4,18 +4,12 @@
  * Generates isomorphic tests for React components.
  */
 
-// tslint:disable-next-line:no-var-requires
-require("../../bootstrap");
+import "../../bootstrap";
 
 import * as Enzyme from "enzyme";
 import * as React from "react";
 
-/**
- * Determines if the passed Component is a React Class or not
- * `TestUtils.isElement()`
- * @returns {boolean}
- */
-function isReactClass(Component: any): boolean {
+function isReactClass(Component: any): Component is React.ComponentClass<any> {
     return (
         typeof Component !== "undefined" &&
         typeof Component.prototype !== "undefined" &&
@@ -26,7 +20,7 @@ function isReactClass(Component: any): boolean {
 
 /**
  * Tests that each ComponentClass in Components can be isomorphically rendered on the server.
- * @param Components  main export from package
+ * @param Components namespace export from package
  * @param props custom props per component
  * @param children custom children per component
  * @param skipList array of component names to skip
@@ -46,11 +40,10 @@ export function generateIsomorphicTests(
                     it.skip(`<${componentName}>`);
                 } else {
                     it(`<${componentName}>`, () => {
-                        const element = React.createElement(Component, props[componentName], children[componentName]);
                         // render to static HTML, just as a server would.
                         // we care merely that `render()` succeeds: it can be server-rendered.
                         // errors will fail the test and log full stack traces to the console. nifty!
-                        Enzyme.render(element);
+                        Enzyme.render(React.createElement(Component, props[componentName], children[componentName]));
                     });
                 }
             }

From cf113236aea7a8b4a2a1db89be7b9d6b50a891b8 Mon Sep 17 00:00:00 2001
From: Gilad Gray <ggray@palantir.com>
Date: Wed, 25 Apr 2018 15:57:15 -0700
Subject: [PATCH 12/22] react >=15.3.0 peer dependency (for PureComponent)

---
 packages/core/package.json         |  4 ++--
 packages/test-commons/package.json |  2 +-
 packages/test-react15/package.json | 10 +++++++---
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 0ee05f9d90..0a81859482 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -45,8 +45,8 @@
     "tslib": "^1.9.0"
   },
   "peerDependencies": {
-    "react": "^16.2.0",
-    "react-dom": "^16.0.0",
+    "react": ">=15.3.0",
+    "react-dom": ">=15.3.0",
     "react-transition-group": "^2.2.1"
   },
   "devDependencies": {
diff --git a/packages/test-commons/package.json b/packages/test-commons/package.json
index d239e3fb53..7d61a4fe1d 100644
--- a/packages/test-commons/package.json
+++ b/packages/test-commons/package.json
@@ -19,7 +19,7 @@
     "enzyme-adapter-react-16": "^1.1.1"
   },
   "peerDependencies": {
-    "react": "^15.3.0 || ^16.2.0"
+    "react": ">=15.3.0"
   },
   "devDependencies": {
     "react": "^16.2.0",
diff --git a/packages/test-react15/package.json b/packages/test-react15/package.json
index 279e18c6e1..170687b293 100644
--- a/packages/test-react15/package.json
+++ b/packages/test-react15/package.json
@@ -2,13 +2,17 @@
   "name": "test-react15",
   "version": "1.0.0",
   "description": "React 15 dependencies for testing",
-  "main": "index.js",
-  "license": "MIT",
   "private": true,
   "dependencies": {
     "enzyme-adapter-react-15": "^1.0.5",
     "react": "^15.6.0",
     "react-dom": "^15.6.0",
     "react-test-renderer": "^15.6.0"
-  }
+  },
+  "repository": {
+    "type": "git",
+    "url": "git@github.com:palantir/blueprint.git"
+  },
+  "author": "Palantir Technologies",
+  "license": "Apache-2.0"
 }

From d69d9b63e226b35fec4f8ecd2291691857fc5e58 Mon Sep 17 00:00:00 2001
From: Gilad Gray <ggray@palantir.com>
Date: Wed, 25 Apr 2018 16:59:05 -0700
Subject: [PATCH 13/22] update docs about react version

---
 packages/docs-app/src/getting-started.md | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/docs-app/src/getting-started.md b/packages/docs-app/src/getting-started.md
index 144ef6853a..a5076b03fd 100644
--- a/packages/docs-app/src/getting-started.md
+++ b/packages/docs-app/src/getting-started.md
@@ -4,8 +4,8 @@
 
 @### NPM packages
 
-Blueprint is available as a collection of NPM packages under the `@blueprintjs` scope. The full
-package list and their latest versions appear under the _Releases_ dropdown above.
+Blueprint is available as a collection of NPM packages under the `@blueprintjs` scope.
+Each package appears at the top level of the sidebar, along with its current version.
 
 Each package contains a CSS file and a collection of CommonJS modules exposing React components.
 The `main` module exports all symbols from all modules so you don't have to import individual files
@@ -19,7 +19,7 @@ The `main` module exports all symbols from all modules so you don't have to impo
     yarn add @blueprintjs/core
     ```
 
-1. If you see `UNMET PEER DEPENDENCY` errors, you should manually install React:
+1. If you see `UNMET PEER DEPENDENCY` errors, you should manually install React (v15.3 or greater):
 
     ```sh
     yarn add react react-dom react-transition-group
@@ -70,8 +70,8 @@ Blueprint supports the venerable [unpkg CDN](https://unpkg.com). Each package pr
 library on the `Blueprint` global variable: `Blueprint.Core`, `Blueprint.Datetime`, etc.
 
 These bundles _do not include_ external dependencies; your application will need to ensure that
-`normalize.css`, `react`, `react-dom`, `react-transition-group`, `classnames`, `popper.js`, and
-`react-popper`are available at runtime.
+`normalize.css`, `classnames`, `dom4`, `react`, `react-dom`, `react-transition-group`, `popper.js`, and
+`react-popper` are available at runtime.
 
 ```html
 <!DOCTYPE html>
@@ -98,7 +98,7 @@ These bundles _do not include_ external dependencies; your application will need
     <div id="btn"></div>
     <script>
       const button = React.createElement(Blueprint.Core.Button, {
-        icon: "predictive-analysis",
+        icon: "cloud",
         text: "CDN Blueprint is go!",
       });
       ReactDOM.render(button, document.querySelector("#btn"));
@@ -139,8 +139,8 @@ install typings for Blueprint's dependencies before you can consume it:
 # required for all @blueprintjs packages:
 npm install --save @types/react @types/react-dom @types/react-transition-group
 
-# @blueprintjs/datetime requires:
-npm install --save @types/moment
+# @blueprintjs/timezone requires:
+npm install --save @types/moment-timezone
 ```
 
 Blueprint's declaration files require **TypeScript 2.3+** for default generic parameter arguments: `<P = {}>`.
@@ -181,7 +181,7 @@ ReactDOM.unmountComponentAtNode(myContainerElement);
 
 Check out the [React API docs](https://facebook.github.io/react/docs/react-api.html) for more details.
 
-You'll need to install **React 16.2+** alongside Blueprint.
+You'll need to install React v15.3 or greater alongside Blueprint.
 
 ```sh
 npm install --save @blueprintjs/core react react-dom react-transition-group

From a28fb0cf87efd03f96a2a987291fae82d91bad73 Mon Sep 17 00:00:00 2001
From: Gilad Gray <ggray@palantir.com>
Date: Thu, 26 Apr 2018 10:48:54 -0700
Subject: [PATCH 14/22] Portal docs section about React 15

---
 packages/core/src/components/portal/portal.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/core/src/components/portal/portal.md b/packages/core/src/components/portal/portal.md
index d10c25f77e..e2a2688d86 100644
--- a/packages/core/src/components/portal/portal.md
+++ b/packages/core/src/components/portal/portal.md
@@ -30,4 +30,18 @@ application.
 `Portal` supports the following options on its [React context](https://facebook.github.io/react/docs/context.html).
 To use them, supply a child context to a subtree that contains the Portals you want to customize.
 
+<div class="@ns-callout @ns-intent-primary @ns-icon-info-sign">
+    Blueprint uses the React 15-compatible `getChildContext()` API instead of the newer React 16.3 `React.createContext()` API.
+</div>
+
 @interface IPortalContext
+
+@### React 15
+
+In a **React 15** environment, `Portal` will use `ReactDOM.unstable_renderSubtreeIntoContainer` to achieve the teleportation effect, which has a few caveats:
+
+1. `Portal` `children` are wrapped in an extra `<div>` inside the portal container element.
+1. Test harnesses such as `enzyme` cannot trivially find elements "through" Portals as they're not in the same React tree.
+1. React `context` _is_ preserved (this one's a good thing).
+
+In a **React 16+** environment, the `Portal` component will use [`ReactDOM.createPortal`](https://reactjs.org/docs/portals.html) which preserves the React tree perfectly and does not require any of the above caveats.

From 001b89dda0b385a1eed4498efd0bc65360d8d5e7 Mon Sep 17 00:00:00 2001
From: Gilad Gray <ggray@palantir.com>
Date: Thu, 26 Apr 2018 11:35:53 -0700
Subject: [PATCH 15/22] rename circle jobs

---
 .circleci/config.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 880f29036a..de8dbd8ed8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -72,11 +72,13 @@ jobs:
             - packages/*/dist
             - packages/*/lib
 
-  test:
+  test-react-15:
     docker:
       - image: circleci/node:8.10.0-browsers
         environment:
             CHROME_BIN: "/usr/bin/google-chrome"
+    environment:
+      REACT: 15 # use React 15 for this job
     parallelism: 4
     steps:
       - checkout
@@ -93,13 +95,11 @@ jobs:
               3) yarn lerna run test --scope '@blueprintjs/{icons,labs,select}' ;; \
               esac
 
-  test-15:
+  test-react-16:
     docker:
       - image: circleci/node:8.10.0-browsers
         environment:
             CHROME_BIN: "/usr/bin/google-chrome"
-    environment:
-      REACT: 15 # use React 15 for these tests
     parallelism: 4
     steps:
       - checkout
@@ -157,9 +157,9 @@ workflows:
           requires: [install-dependencies]
       - dist:
           requires: [compile]
-      - test:
+      - test-react-15:
           requires: [compile]
-      - test-15:
+      - test-react-16:
           requires: [compile]
       - deploy-preview:
           requires: [dist]

From 4862ced5776c698703d0be3c97efe5bc4574f93c Mon Sep 17 00:00:00 2001
From: Gilad Gray <ggray@palantir.com>
Date: Thu, 26 Apr 2018 18:23:34 -0700
Subject: [PATCH 16/22] isReact15 => cannotCreatePortal

---
 packages/core/src/components/portal/portal.tsx | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/core/src/components/portal/portal.tsx b/packages/core/src/components/portal/portal.tsx
index 240ecf5125..15d177e625 100644
--- a/packages/core/src/components/portal/portal.tsx
+++ b/packages/core/src/components/portal/portal.tsx
@@ -10,8 +10,10 @@ import * as ReactDOM from "react-dom";
 import * as Classes from "../../common/classes";
 import * as Errors from "../../common/errors";
 import { IProps } from "../../common/props";
+import { isFunction } from "../../common/utils";
 
-const isReact15 = typeof ReactDOM.createPortal === "undefined";
+/** Detect if `React.createPortal()` API method does not exist. */
+const cannotCreatePortal = !isFunction(ReactDOM.createPortal);
 
 export interface IPortalProps extends IProps {
     /**
@@ -56,7 +58,7 @@ export class Portal extends React.Component<IPortalProps, IPortalState> {
         // Only render `children` once this component has mounted in a browser environment, so they are
         // immediately attached to the DOM tree and can do DOM things like measuring or `autoFocus`.
         // See long comment on componentDidMount in https://reactjs.org/docs/portals.html#event-bubbling-through-portals
-        if (isReact15 || typeof document === "undefined" || !this.state.hasMounted) {
+        if (cannotCreatePortal || typeof document === "undefined" || !this.state.hasMounted) {
             return null;
         } else {
             return ReactDOM.createPortal(this.props.children, this.portalElement);
@@ -67,8 +69,8 @@ export class Portal extends React.Component<IPortalProps, IPortalState> {
         this.portalElement = this.createContainerElement();
         document.body.appendChild(this.portalElement);
         this.setState({ hasMounted: true }, this.props.onChildrenMount);
-        if (isReact15) {
-            this.renderReact15();
+        if (cannotCreatePortal) {
+            this.unstableRenderNoPortal();
         }
     }
 
@@ -78,14 +80,14 @@ export class Portal extends React.Component<IPortalProps, IPortalState> {
             this.portalElement.classList.remove(prevProps.className);
             maybeAddClass(this.portalElement.classList, this.props.className);
         }
-        if (isReact15) {
-            this.renderReact15();
+        if (cannotCreatePortal) {
+            this.unstableRenderNoPortal();
         }
     }
 
     public componentWillUnmount() {
         if (this.portalElement != null) {
-            if (isReact15) {
+            if (cannotCreatePortal) {
                 ReactDOM.unmountComponentAtNode(this.portalElement);
             }
             this.portalElement.remove();
@@ -102,7 +104,7 @@ export class Portal extends React.Component<IPortalProps, IPortalState> {
         return container;
     }
 
-    private renderReact15() {
+    private unstableRenderNoPortal() {
         ReactDOM.unstable_renderSubtreeIntoContainer(
             /* parentComponent */ this,
             <div>{this.props.children}</div>,

From abae6de651d270a33b4d826bfeb6659b83b9be0d Mon Sep 17 00:00:00 2001
From: Gilad Gray <ggray@palantir.com>
Date: Thu, 26 Apr 2018 18:25:20 -0700
Subject: [PATCH 17/22] revert require() syntax where possible

---
 packages/test-commons/bootstrap.js | 4 ++--
 packages/test-commons/polyfill.js  | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/test-commons/bootstrap.js b/packages/test-commons/bootstrap.js
index 582526e568..4ef6a04fe5 100644
--- a/packages/test-commons/bootstrap.js
+++ b/packages/test-commons/bootstrap.js
@@ -2,12 +2,12 @@
  * Copyright 2017 Palantir Technologies, Inc. All rights reserved.
  */
 
-require("./polyfill");
+import "./polyfill";
 
-const Enzyme = require("enzyme");
 // test against React 15 with REACT=15 env variable.
 const Adapter = require(`enzyme-adapter-react-${process.env.REACT || 16}`);
 
+import * as Enzyme from "enzyme";
 Enzyme.configure({ adapter: new Adapter() });
 
 // tslint:disable-next-line:no-console
diff --git a/packages/test-commons/polyfill.js b/packages/test-commons/polyfill.js
index 4a8dd41896..1f37e47619 100644
--- a/packages/test-commons/polyfill.js
+++ b/packages/test-commons/polyfill.js
@@ -7,7 +7,7 @@
  * Require the minimal set of ES2015+ polyfills from `core-js` library.
  * See "NPM Installation" section of docs homepage for more information.
  */
-require("core-js/fn/array/fill");
-require("core-js/fn/array/from");
-require("core-js/fn/map");
-require("core-js/fn/set");
+import "core-js/fn/array/fill";
+import "core-js/fn/array/from";
+import "core-js/fn/map";
+import "core-js/fn/set";

From e9688cdb688e7eecd6451c9b86e0ee4973f186cc Mon Sep 17 00:00:00 2001
From: Gilad Gray <ggray@palantir.com>
Date: Thu, 26 Apr 2018 18:26:39 -0700
Subject: [PATCH 18/22] peer dependency `^15.3.0 || 16`

---
 packages/core/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index dc76eadbd9..8611732258 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -45,8 +45,8 @@
     "tslib": "^1.9.0"
   },
   "peerDependencies": {
-    "react": ">=15.3.0",
-    "react-dom": ">=15.3.0",
+    "react": "^15.3.0 || 16",
+    "react-dom": "^15.3.0 || 16",
     "react-transition-group": "^2.2.1"
   },
   "devDependencies": {

From 38579eb5dcadbe3b99bb29fa7dea8e06b53fc969 Mon Sep 17 00:00:00 2001
From: Gilad Gray <ggray@palantir.com>
Date: Thu, 26 Apr 2018 18:34:43 -0700
Subject: [PATCH 19/22] revert to commonjs syntax with a comment

---
 packages/test-commons/bootstrap.js |  5 +++--
 packages/test-commons/polyfill.js  | 10 ++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/packages/test-commons/bootstrap.js b/packages/test-commons/bootstrap.js
index 4ef6a04fe5..b10612aac2 100644
--- a/packages/test-commons/bootstrap.js
+++ b/packages/test-commons/bootstrap.js
@@ -2,12 +2,13 @@
  * Copyright 2017 Palantir Technologies, Inc. All rights reserved.
  */
 
-import "./polyfill";
+// Note: using CommonJS syntax here so this can be used in the isomorphic tests, which must run in a server environment.
+require("./polyfill");
 
+const Enzyme = require("enzyme");
 // test against React 15 with REACT=15 env variable.
 const Adapter = require(`enzyme-adapter-react-${process.env.REACT || 16}`);
 
-import * as Enzyme from "enzyme";
 Enzyme.configure({ adapter: new Adapter() });
 
 // tslint:disable-next-line:no-console
diff --git a/packages/test-commons/polyfill.js b/packages/test-commons/polyfill.js
index 1f37e47619..9323f02383 100644
--- a/packages/test-commons/polyfill.js
+++ b/packages/test-commons/polyfill.js
@@ -3,11 +3,13 @@
  * Licensed under the terms of the LICENSE file distributed with this project.
  */
 
+// Note: using CommonJS syntax here so this can be used in the isomorphic tests, which must run in a server environment.
+
 /**
  * Require the minimal set of ES2015+ polyfills from `core-js` library.
  * See "NPM Installation" section of docs homepage for more information.
  */
-import "core-js/fn/array/fill";
-import "core-js/fn/array/from";
-import "core-js/fn/map";
-import "core-js/fn/set";
+require("core-js/fn/array/fill");
+require("core-js/fn/array/from");
+require("core-js/fn/map");
+require("core-js/fn/set");

From ab8d1f4630dd8bc86e55e86ed75485ac41d934bb Mon Sep 17 00:00:00 2001
From: Gilad Gray <ggray@palantir.com>
Date: Tue, 1 May 2018 12:13:40 -0700
Subject: [PATCH 20/22] semantic merge circle config

---
 .circleci/config.yml | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 08d3b3726d..4c47444eae 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -104,7 +104,8 @@ jobs:
         environment:
             CHROME_BIN: "/usr/bin/google-chrome"
     environment:
-      REACT: 15 # use React 15 for this job
+        JUNIT_REPORT_PATH: reports
+        REACT: 15 # use React 15 for this job
     parallelism: 4
     steps:
       - checkout
@@ -112,20 +113,27 @@ jobs:
           at: '.'
       - restore_cache:
           key: v7-dependency-cache-{{ checksum "yarn.lock" }}
+      - run: mkdir ./reports
       - run:
           command: |
               case $CIRCLE_NODE_INDEX in \
-              0) yarn lerna run test --scope '@blueprintjs/core' ;; \
-              1) yarn lerna run test --scope '@blueprintjs/{datetime,timezone}' ;; \
-              2) yarn lerna run test --scope '@blueprintjs/table' ;; \
-              3) yarn lerna run test --scope '@blueprintjs/{icons,labs,select}' ;; \
+              0) yarn lerna run --parallel test:pre ;; \
+              1) yarn lerna run --parallel test:iso ;; \
+              2) yarn lerna run --parallel test:karma ;; \
               esac
+          when: always
+      - store_test_results:
+          path: ./reports
+      - store_artifacts:
+          path: ./reports
 
   test-react-16:
     docker:
       - image: circleci/node:8.10.0-browsers
         environment:
             CHROME_BIN: "/usr/bin/google-chrome"
+    environment:
+        JUNIT_REPORT_PATH: reports
     parallelism: 4
     steps:
       - checkout
@@ -141,8 +149,6 @@ jobs:
               1) yarn lerna run --parallel test:iso ;; \
               2) yarn lerna run --parallel test:karma ;; \
               esac
-          environment:
-            JUNIT_REPORT_PATH: reports
           when: always
       - store_test_results:
           path: ./reports

From f03de654416a224747d8fc9c98d0018a84889ea4 Mon Sep 17 00:00:00 2001
From: Gilad Gray <ggray@palantir.com>
Date: Tue, 1 May 2018 12:26:56 -0700
Subject: [PATCH 21/22] circle cache

---
 .circleci/config.yml                              | 12 ++++++------
 packages/karma-build-scripts/createKarmaConfig.js |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 4c47444eae..03bedf9301 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -104,15 +104,15 @@ jobs:
         environment:
             CHROME_BIN: "/usr/bin/google-chrome"
     environment:
-        JUNIT_REPORT_PATH: reports
-        REACT: 15 # use React 15 for this job
-    parallelism: 4
+      JUNIT_REPORT_PATH: reports
+      REACT: 15 # use React 15 for this job
+    parallelism: 3
     steps:
       - checkout
       - attach_workspace:
           at: '.'
       - restore_cache:
-          key: v7-dependency-cache-{{ checksum "yarn.lock" }}
+          key: v9-dependency-cache-{{ checksum "yarn.lock" }}
       - run: mkdir ./reports
       - run:
           command: |
@@ -133,8 +133,8 @@ jobs:
         environment:
             CHROME_BIN: "/usr/bin/google-chrome"
     environment:
-        JUNIT_REPORT_PATH: reports
-    parallelism: 4
+      JUNIT_REPORT_PATH: reports
+    parallelism: 3
     steps:
       - checkout
       - attach_workspace:
diff --git a/packages/karma-build-scripts/createKarmaConfig.js b/packages/karma-build-scripts/createKarmaConfig.js
index fab0b16ade..7c13d95931 100644
--- a/packages/karma-build-scripts/createKarmaConfig.js
+++ b/packages/karma-build-scripts/createKarmaConfig.js
@@ -95,7 +95,7 @@ module.exports = function createKarmaConfig(
 
     // enable JUnit reporter only if env variable is set (such as on Circle)
     if (process.env.JUNIT_REPORT_PATH) {
-        const outputDir = path.resolve(
+        const outputDir = path.join(
             __dirname,
             "../..",
             process.env.JUNIT_REPORT_PATH,

From d844b0f7ba9101a9ef4cb9e8ca314c4614b2909c Mon Sep 17 00:00:00 2001
From: Gilad Gray <ggray@palantir.com>
Date: Tue, 1 May 2018 13:03:42 -0700
Subject: [PATCH 22/22] remove console color from enzyme message

seems to bork karma-junit-reorter
https://github.com/karma-runner/karma-junit-reporter/issues/116
---
 packages/test-commons/bootstrap.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/test-commons/bootstrap.js b/packages/test-commons/bootstrap.js
index b10612aac2..1e90cbd3ed 100644
--- a/packages/test-commons/bootstrap.js
+++ b/packages/test-commons/bootstrap.js
@@ -12,4 +12,4 @@ const Adapter = require(`enzyme-adapter-react-${process.env.REACT || 16}`);
 Enzyme.configure({ adapter: new Adapter() });
 
 // tslint:disable-next-line:no-console
-console.info(`Enzyme configured with \x1b[35m${Adapter.name}\x1b[0m`);
+console.info(`Enzyme configured with *${Adapter.name}*`);