add window is undefined return, restructure scroll-screen ant-design/ant-design-landing#165

Author: jljsj33

README.md

@@ -191,6 +191,7 @@ Use: scroll a screen window;
 
 | name      | type           | default | description    |
 |-----------|----------------|---------|----------------|
+| location  | array          | []      | llocation of scrolling screen, only element ID is supported in array |
 | duration  | number         | 450     | scroll duration   |
 | ease      | string         | `easeInOutQuad` | easing |
 | docHeight | number         | null    | Custom html height |

examples/scrollScreen.js

@@ -13,11 +13,12 @@ const Link = ScrollAnim.Link;
 const Element = ScrollAnim.Element;
 const ScrollOverPack = ScrollAnim.OverPack;
 const EventListener = ScrollAnim.Event;
-ScrollAnim.scrollScreen.init({ loop: true });
+
 class Demo extends React.Component {
   componentDidMount() {
     // 添加改变窗口事件,可加setTimeout
     EventListener.addEventListener('resize.userResize', this.barAnimate.bind(this));
+    ScrollAnim.scrollScreen.init({ loop: true, location: ['page0', 'page1', 'page2', 'page3'] });
   }
 
   onFocus = (e) => {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rc-scroll-anim",
-  "version": "2.6.3",
+  "version": "2.7.0",
   "description": "scroll-anim anim component for react",
   "keywords": [
     "react",

src/Mapped.jsx

@@ -1,9 +1,8 @@
 import React from 'react';
 import ReactDOM from 'react-dom';
 import PropTypes from 'prop-types';
-import mapped from './Mapped';
 import EventListener from './EventDispatcher';
-import { noop, currentScrollTop, transformArguments, windowHeight } from './util';
+import { noop, currentScrollTop, transformArguments, windowHeight, windowIsUndefined } from './util';
 
 class ScrollElement extends React.Component {
   static propTypes = {
@@ -44,13 +43,10 @@ class ScrollElement extends React.Component {
   }
 
   componentDidMount() {
-    this.dom = ReactDOM.findDOMNode(this);
-    if (this.props.location) {
-      this.dom = document.getElementById(this.props.location);
-      mapped.register(this.props.location, this.dom);
-    } else if (this.props.id) {
-      mapped.register(this.props.id, this.dom);
+    if (windowIsUndefined) {
+      return;
     }
+    this.dom = ReactDOM.findDOMNode(this);
     const date = Date.now();
     this.target = this.props.targetId && document.getElementById(this.props.targetId);
 
@@ -60,7 +56,6 @@ class ScrollElement extends React.Component {
   }
 
   componentWillUnmount() {
-    mapped.unRegister(this.props.id);
     EventListener.removeEventListener(this.eventType, this.scrollEventListener, this.target);
   }
 

src/ScrollElement.jsx

@@ -2,7 +2,7 @@ import React, { createElement } from 'react';
 import PropTypes from 'prop-types';
 import EventListener from './EventDispatcher';
 import ScrollElement from './ScrollElement';
-import { toArrayChildren, noop } from './util';
+import { toArrayChildren, noop, windowIsUndefined } from './util';
 
 class ScrollOverPack extends ScrollElement {
   static propTypes = {
@@ -95,9 +95,9 @@ class ScrollOverPack extends ScrollElement {
   }
 
   render() {
-    const { 
-      playScale, 
-      replay, 
+    const {
+      playScale,
+      replay,
       component,
       always,
       scrollEvent,
@@ -108,7 +108,10 @@ class ScrollOverPack extends ScrollElement {
       onScroll,
       componentProps,
       ...props
-     } = this.props;
+    } = this.props;
+    if (windowIsUndefined) {
+      return createElement(component, { ...props, ...componentProps });
+    }
     let childToRender;
     if (!this.oneEnter) {
       const show = !appear;