fix appears (#376)

kenwheeler · web-flow · commit c5fbf2993135 · 2017-10-20T09:27:28.000-04:00
* fix appears

* Move one-page links to unpkg.

* disabling silly no setState in mount lint rule. SILLY
diff --git a/one-page.html b/one-page.html
@@ -8,7 +8,7 @@
     <link href="https://fonts.googleapis.com/css?family=Open+Sans+Condensed:300,700" rel="stylesheet" type="text/css">
     <link href="https://unpkg.com/prismjs@1/themes/prism-tomorrow.css" rel="stylesheet" type="text/css">
     <link href="https://unpkg.com/normalize.css@7/normalize.css" rel="stylesheet" type="text/css">
-    <link href="./lib/themes/default/index.css" rel="stylesheet" type="text/css">
+    <link href="https://unpkg.com/spectacle/lib/themes/default/index.css" rel="stylesheet" type="text/css">
 </head>
 <body>
     <div id="root"></div>
diff --git a/src/components/appear.js b/src/components/appear.js
@@ -1,3 +1,5 @@
+/* eslint-disable react/no-did-mount-set-state */
+
 import React, { Component } from 'react';
 import PropTypes from 'prop-types';
 import { findDOMNode } from 'react-dom';
@@ -10,6 +12,17 @@ class Appear extends Component {
     active: false,
   };
 
+  componentDidMount() {
+    const shouldDisableAnimation =
+      this.props.route.params.indexOf('export') !== -1 ||
+      this.props.route.params.indexOf('overview') !== -1;
+
+    if (shouldDisableAnimation) {
+      this.setState({ active: true });
+      return;
+    }
+  }
+
   componentWillReceiveProps(nextProps) {
     const state = nextProps.fragment;
     const slide = this.props.route.slide;
@@ -19,8 +32,8 @@ class Appear extends Component {
     });
 
     const shouldDisableAnimation =
-      this.props.route.params.indexOf('export') !== -1 ||
-      this.props.route.params.indexOf('overview') !== -1;
+    nextProps.route.params.indexOf('export') !== -1 ||
+    nextProps.route.params.indexOf('overview') !== -1;
 
     if (shouldDisableAnimation) {
       this.setState({ active: true });
diff --git a/src/components/manager.js b/src/components/manager.js
@@ -659,7 +659,7 @@ export default class Manager extends Component {
           : ''}
 
         {this.props.globalStyles &&
-          <Style rules={Object.assign(this.context.styles.global, globals)} />}
+          <Style rules={Object.assign({}, this.context.styles.global, globals)} />}
       </div>
     );
   }

Original file line number	Diff line number	Diff line change
`@@ -659,7 +659,7 @@ export default class Manager extends Component {`
`659`	`659`	`: ''}`
`660`	`660`
`661`	`661`	`{this.props.globalStyles &&`
`662`		`- <Style rules={Object.assign(this.context.styles.global, globals)} />}`
	`662`	`+ <Style rules={Object.assign({}, this.context.styles.global, globals)} />}`
`663`	`663`	`</div>`
`664`	`664`	`);`
`665`	`665`	`}`