Merge pull request #120 from react-component/refactor-switch-scrollin…

…g-effect

refactor: use rc-util Portal switchScrollingEffect

package.json

@@ -72,7 +72,7 @@
   "dependencies": {
     "babel-runtime": "^6.26.0",
     "classnames": "^2.2.6",
-    "rc-util": "^4.11.2",
+    "rc-util": "^4.16.1",
     "react-lifecycles-compat": "^3.0.4"
   }
 }

src/DrawerChild.tsx

@@ -1,7 +1,6 @@
 import classnames from 'classnames';
 import getScrollBarSize from 'rc-util/lib/getScrollBarSize';
 import KeyCode from 'rc-util/lib/KeyCode';
-import switchScrollingEffect from 'rc-util/lib/switchScrollingEffect';
 import * as React from 'react';
 import { polyfill } from 'react-lifecycles-compat';
 
@@ -121,7 +120,7 @@ class DrawerChild extends React.Component<IDrawerChildProps, IState> {
   }
 
   public componentWillUnmount() {
-    const { getOpenCount, open } = this.props;
+    const { getOpenCount, open, switchScrollingEffect } = this.props;
     const openCount = typeof getOpenCount === 'function' && getOpenCount()
     delete currentDrawer[this.drawerId];
     if (open) {
@@ -306,7 +305,7 @@ class DrawerChild extends React.Component<IDrawerChildProps, IState> {
   }
 
   private addScrollingEffect = (right: number) => {
-    const { placement, duration, ease, getOpenCount } = this.props;
+    const { placement, duration, ease, getOpenCount, switchScrollingEffect } = this.props;
     const openCount = getOpenCount && getOpenCount();
     if (openCount === 1) {
       switchScrollingEffect();
@@ -337,7 +336,7 @@ class DrawerChild extends React.Component<IDrawerChildProps, IState> {
   }
 
   private remScrollingEffect = (right: number) => {
-    const { placement, duration, ease, getOpenCount } = this.props;
+    const { placement, duration, ease, getOpenCount, switchScrollingEffect } = this.props;
     const openCount = getOpenCount && getOpenCount();
     if (!openCount) {
       switchScrollingEffect(true);
@@ -456,6 +455,7 @@ class DrawerChild extends React.Component<IDrawerChildProps, IState> {
       onHandleClick,
       keyboard,
       getOpenCount,
+      switchScrollingEffect,
       ...props
     } = this.props;
     // 首次渲染都将是关闭状态。

src/IDrawerPropTypes.ts

@@ -44,4 +44,5 @@ export interface IDrawerProps extends IProps {
 export interface IDrawerChildProps extends IProps {
   getContainer?: () => HTMLElement;
   getOpenCount?: () => number;
+  switchScrollingEffect?: (close?: boolean) => void;
 }