Merge pull request #98 from bootstrap-styled/dev

Dev

Author: kopax

.travis.yml

@@ -53,7 +53,7 @@ jobs:
           organization: $(echo $TRAVIS_REPO_SLUG | awk -F '/' '{print $1}')
       script:
         - npm run test
-        - if [[ "$TRAVIS_BRANCH" != greenkeeper* ]]; then sonar-scanner -Dsonar.projectVersion=${SONAR_VERSION}; fi
+        - if [[ "$TRAVIS_BRANCH" != greenkeeper* && -z "$SONAR_TOKEN" ]]; then sonar-scanner -Dsonar.projectVersion=${SONAR_VERSION}; fi
 
     # Job: Release
     - stage: release

package.json

@@ -36,7 +36,7 @@
     "jsdoc": "jsdoc-documentation --file",
     "prestyleguide": "npm run jsdoc",
     "styleguide": "styleguidist server",
-    "prestyleguide:build": "npm run jsdoc",
+    "prestyleguide:build": "npm run jsdoc && ./styleguide/prepare.sh",
     "styleguide:build": "styleguidist build"
   },
   "repository": {
@@ -63,29 +63,29 @@
   "license": "MIT",
   "devDependencies": {
     "@babel/cli": "^7.2.3",
-    "@babel/core": "^7.2.2",
+    "@babel/core": "^7.3.4",
     "@babel/plugin-external-helpers": "^7.2.0",
-    "@babel/plugin-proposal-class-properties": "^7.3.0",
+    "@babel/plugin-proposal-class-properties": "^7.3.4",
     "@babel/plugin-proposal-decorators": "^7.3.0",
     "@babel/plugin-proposal-json-strings": "^7.2.0",
-    "@babel/plugin-proposal-object-rest-spread": "^7.3.2",
+    "@babel/plugin-proposal-object-rest-spread": "^7.3.4",
     "@babel/plugin-syntax-dynamic-import": "^7.2.0",
     "@babel/plugin-syntax-import-meta": "^7.2.0",
     "@babel/plugin-transform-modules-commonjs": "^7.2.0",
     "@babel/plugin-transform-react-constant-elements": "^7.2.0",
     "@babel/plugin-transform-react-inline-elements": "^7.2.0",
-    "@babel/preset-env": "^7.3.1",
+    "@babel/preset-env": "^7.3.4",
     "@babel/preset-react": "^7.0.0",
     "@bootstrap-styled/documentation": "^1.2.4",
     "@bootstrap-styled/provider": "^1.4.2",
-    "@rollup-umd/documentation": "^1.3.13",
-    "@rollup-umd/rollup": "^1.0.1",
+    "@rollup-umd/documentation": "^1.3.20",
+    "@rollup-umd/rollup": "^1.0.7",
     "@semantic-release/changelog": "^3.0.2",
     "@semantic-release/git": "^7.0.8",
     "@semantic-release/github": "^5.2.10",
     "@semantic-release/npm": "^5.1.4",
     "babel-eslint": "^10.0.1",
-    "babel-jest": "^24.1.0",
+    "babel-jest": "^24.3.1",
     "babel-loader": "^8.0.5",
     "babel-plugin-add-module-exports": "^1.0.0",
     "babel-plugin-array-includes": "^2.0.3",
@@ -96,34 +96,34 @@
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
     "babel-preset-react-hmre": "^1.1.1",
     "cz-conventional-changelog": "^2.1.0",
-    "enzyme": "^3.8.0",
-    "enzyme-adapter-react-16": "^1.9.1",
-    "eslint": "^5.13.0",
+    "enzyme": "^3.9.0",
+    "enzyme-adapter-react-16": "^1.10.0",
+    "eslint": "^5.15.1",
     "eslint-config-airbnb": "^17.1.0",
     "eslint-plugin-import": "^2.16.0",
     "eslint-plugin-jsx-a11y": "^6.2.1",
     "eslint-plugin-react": "^7.12.4",
     "immutable": "^4.0.0-rc.12",
-    "jest-cli": "^24.1.0",
+    "jest-cli": "^24.3.1",
     "jest-sonar-reporter": "^2.0.0",
-    "lint-staged": "^8.1.3",
+    "lint-staged": "^8.1.5",
     "mini-html-webpack-plugin": "^0.2.3",
     "pre-commit": "^1.2.2",
     "raf": "^3.4.1",
-    "react": "^16.8.0",
-    "react-dom": "^16.8.0",
+    "react": "^16.8.4",
+    "react-dom": "^16.8.4",
     "react-styleguidist": "^8.0.6",
-    "react-test-renderer": "^16.8.0",
+    "react-test-renderer": "^16.8.4",
     "rimraf": "^2.6.3",
-    "rollup": "^1.1.2",
+    "rollup": "^1.6.0",
     "semantic-release": "^15.13.3",
     "styled-components": "^4.1.3",
     "stylelint": "^9.10.1",
     "stylelint-config-recommended": "^2.1.0",
     "stylelint-config-styled-components": "^0.1.1",
     "stylelint-processor-styled-components": "^1.5.2",
     "toctoc": "^0.3.2",
-    "webpack": "^4.29.2"
+    "webpack": "^4.29.6"
   },
   "jest": {
     "roots": [
@@ -182,20 +182,20 @@
     "@bootstrap-styled/css-mixins": "^2.0.6",
     "@bootstrap-styled/css-utils": "^1.2.6",
     "@bootstrap-styled/utils": "^1.7.1",
-    "@rollup-umd/documentation-cli": "^1.1.1",
+    "@rollup-umd/documentation-cli": "^1.1.3",
     "basic-math-utils": "^0.3.4",
-    "bootstrap-styled": "^2.4.10",
+    "bootstrap-styled": "^2.4.12",
     "classnames": "^2.2.6",
     "lodash.omit": "^4.5.0",
     "map-to-css-modules": "^1.0.6",
-    "prop-types": "^15.6.2",
+    "prop-types": "^15.7.2",
     "react-portal": "^4.2.0",
-    "react-transition-group": "^2.5.3",
+    "react-transition-group": "^2.6.0",
     "tether-fix": "^1.4.0-fix-es"
   },
   "peerDependencies": {
-    "react": "^16.8.0",
-    "react-dom": "^16.8.0",
+    "react": "^16.8.4",
+    "react-dom": "^16.8.4",
     "styled-components": "^4.1.3"
   },
   "publishConfig": {

src/TetherContent/index.js

@@ -37,16 +37,19 @@ class TetherContent extends React.Component {// eslint-disable-line react/prefer
 
   static defaultProps = defaultProps;
 
+  constructor(props) {
+    super(props);
+
+    this.element = document.createElement('div');
+  }
+
   componentDidMount = () => {
     this.handleProps();
   }
 
   componentDidUpdate = (prevProps) => {
     if (this.props.isOpen !== prevProps.isOpen) {
       this.handleProps();
-    } else if (this.element) {
-      // rerender
-      this.renderIntoSubtree();
     }
   }
 
@@ -92,10 +95,8 @@ class TetherContent extends React.Component {// eslint-disable-line react/prefer
   hide = () => {
     document.removeEventListener('click', this.handleDocumentClick, true);
 
-    if (this.element) {
+    if (this.element.parentElement === document.body) {
       document.body.removeChild(this.element);
-      ReactDOM.unmountComponentAtNode(this.element);
-      this.element = null;
     }
 
     if (this.tether) {
@@ -110,10 +111,8 @@ class TetherContent extends React.Component {// eslint-disable-line react/prefer
   show = () => {
     document.addEventListener('click', this.handleDocumentClick, true);
 
-    this.element = document.createElement('div');
     this.element.className = this.props.className;
     document.body.appendChild(this.element);
-    this.renderIntoSubtree();
     this.tether = new Tether(this.getTetherConfig());
     if (this.props.tetherRef) {
       this.props.tetherRef(this.tether);
@@ -129,14 +128,6 @@ class TetherContent extends React.Component {// eslint-disable-line react/prefer
     return this.props.toggle();
   }
 
-  renderIntoSubtree = () => {
-    ReactDOM.unstable_renderSubtreeIntoContainer(
-      this,
-      this.renderChildren(),
-      this.element
-    );
-  }
-
   renderChildren = () => {
     const { children, style } = this.props;
     return React.cloneElement(
@@ -146,8 +137,13 @@ class TetherContent extends React.Component {// eslint-disable-line react/prefer
   }
 
   render() {
-    return (
-      null
+    if (!this.props.isOpen) {
+      return null;
+    }
+
+    return ReactDOM.createPortal(
+      this.renderChildren(),
+      this.element
     );
   }
 }