Merge pull request #168 from xiaoTuiMao/xiaoTuiMao/use-window-after-o…

…nload -serverside rendering bug
weui · Dec 20, 2016 · b80d442 · b80d442
2 parents fdfe2a1 + e9dd4d2
commit b80d442
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/src/components/actionsheet/actionsheet.js b/src/components/actionsheet/actionsheet.js
@@ -1,7 +1,6 @@
 import React, { Component, PropTypes } from 'react';
 import classNames from 'classnames';
 import Mask from '../mask/index';
-import { isAndroid } from '../../utils/mobile_detect';
 import './actionsheet.less';
 
 /**
@@ -51,8 +50,8 @@ class ActionSheet extends Component {
         super(props);
 
         this.state = {
-            isAndroid: isAndroid
-        }
+            isAndroid: ''
+        };
 
         this.handleMaskClick = this.handleMaskClick.bind(this)
     }
@@ -89,6 +88,13 @@ class ActionSheet extends Component {
         if(this.props.onRequestClose) this.props.onRequestClose(e)
     }
 
+    componentDidMount(){
+        const { isAndroid } = require('../../utils/mobile_detect');
+        this.setState({
+            isAndroid,
+        });
+    }
+
     render() {
         const {show, autoDectect, type, onRequestClose, menus, actions, ...others} = this.props;
         const cls = classNames({
@@ -120,4 +126,4 @@ class ActionSheet extends Component {
     }
 };
 
-export default ActionSheet;
+export default ActionSheet;
diff --git a/src/components/dialog/dialog.js b/src/components/dialog/dialog.js
@@ -1,7 +1,6 @@
 import React, { Component, PropTypes } from 'react';
 import classNames from 'classnames';
 import Mask from '../mask/index';
-import { isAndroid } from '../../utils/mobile_detect';
 
 /**
  * Modals provide feedback to user
@@ -48,7 +47,7 @@ class Dialog extends Component {
         super(props)
 
         this.state = {
-            isAndroid: isAndroid
+            isAndroid: ''
         }
     }
 
@@ -67,6 +66,13 @@ class Dialog extends Component {
         });
     }
 
+    componentDidMount(){
+        const { isAndroid } = require('../../utils/mobile_detect');
+        this.setState({
+            isAndroid,
+        });
+    }
+
     render() {
         const {title, show, className, children, buttons, type, autoDectect, ...others} = this.props;
         const styleType = type ? type : 'ios';
@@ -95,4 +101,4 @@ class Dialog extends Component {
     }
 }
 
-export default Dialog;
+export default Dialog;