fix(atoms): remove state from the modal

8base · Aug 23, 2018 · e998a4b · e998a4b
1 parent 5749210
commit e998a4b
Showing 1 changed file with 7 additions and 19 deletions.
diff --git a/src/atoms/Modal/Modal.js b/src/atoms/Modal/Modal.js
@@ -7,7 +7,6 @@ import { createStyledTag, createTheme } from '../../utils';
 type ModalProps = {
   children: React$Node,
   isOpen?: boolean,
-  onOpen?: (any) => void,
   onClose?: (any) => void,
   shouldCloseOnOverlayClick?: boolean,
 };
@@ -36,18 +35,18 @@ const theme = createTheme(name, {
   },
 });
 
-const OverlayTag = createStyledTag(name, {
+const OverlayTag = createStyledTag(name, (props): * => ({
   alignItems: 'center',
-  background: 'rgba(0, 0, 0, 0.5)',
   bottom: 0,
   display: 'flex',
   justifyContent: 'center',
   left: 0,
   position: 'fixed',
   right: 0,
   top: 0,
-  zIndex: 1000,
-});
+  background: 'rgba(0, 0, 0, 0.5)',
+  zIndex: props.theme.Z_INDEX.MODAL,
+}));
 
 const ModalTag = createStyledTag(name, {});
 
@@ -59,10 +58,6 @@ class Modal extends PureComponent<ModalProps, ModalState> {
     isOpen: false,
   };
 
-  state = {
-    isOpen: false,
-  };
-
   componentDidMount() {
     if (this.props.isOpen) {
       this.openModal();
@@ -82,21 +77,15 @@ class Modal extends PureComponent<ModalProps, ModalState> {
   }
 
   openModal() {
-    if (!this.state.isOpen) {
+    if (!this.props.isOpen) {
       Modal.openedModals += 1;
 
-      this.setState({ isOpen: true });
-
-      if (typeof this.props.onOpen === 'function') {
-        this.props.onOpen();
-      }
-
       this.updateBlurClass();
     }
   }
 
   closeModal() {
-    if (this.state.isOpen) {
+    if (this.props.isOpen) {
       Modal.openedModals -= 1;
 
       this.setState({ isOpen: false });
@@ -140,8 +129,7 @@ class Modal extends PureComponent<ModalProps, ModalState> {
   };
 
   render() {
-    const { children } = this.props;
-    const { isOpen } = this.state;
+    const { children, isOpen } = this.props;
 
     return (
       <If condition={ isOpen }>