modal progress

Author: ivansfdc

components/SLDSModal/index.jsx

@@ -94,7 +94,6 @@ module.exports = React.createClass( {
           </div>
 
         </div>
-
       </Modal>
     );
   },
@@ -103,13 +102,26 @@ module.exports = React.createClass( {
 
     if(this.state.isOpen !== prevState.isOpen){
       if(window && document && document.body){
-        document.body.style.overflow = this.state.isOpen?'hidden':'inherit';
+        if(this.state.isOpen){
+          document.body.style.overflow = 'hidden';
+        }
+        else{
+          if(document.body.className && document.body.className.indexOf('ReactModal__Body--open')<0){
+            document.body.style.overflow = 'inherit';
+          }
+        }
+      }
+      if(!this.state.isOpen){
+        if(this.isMounted()){
+          const el = this.getDOMNode().parentNode;
+          if(el && el.getAttribute('data-slds-modal')){
+            React.unmountComponentAtNode(el);
+            document.body.removeChild(el);
+          }
+        }
       }
     }
 
-    if(this.props.isOpen !== prevProps.isOpen){
-      this.setState({isOpen:this.props.isOpen});
-    }
 
   }
 

components/SLDSModal/manager.jsx

@@ -0,0 +1,25 @@
+/*
+Copyright (c) 2015, salesforce.com, inc. All rights reserved.
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+Neither the name of salesforce.com, inc. nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+
+'use strict';
+
+import React from 'react';
+import {EventUtil} from '../utils';
+import SLDSModal from '../index';
+
+const SLDSModalManager = {
+  trigger: (comp) => {
+    const el = document.createElement('span');
+    el.setAttribute('data-slds-modal', true);
+    document.body.appendChild(el);
+    React.render(comp, el);
+  }
+};
+
+module.exports = SLDSModalManager;

components/index.js

@@ -12,9 +12,13 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 import SLDSPicklistBase from './SLDSPicklistBase';
 import SLDSSettings from './SLDSSettings';
 import SLDSButton from './SLDSButton';
+import SLDSModal from './SLDSModal';
+import SLDSModalManager from './SLDSModal/manager';
 
 module.exports = {
   SLDSPicklistBase: SLDSPicklistBase,
   SLDSSettings: SLDSSettings,
-  SLDSButton: SLDSButton
+  SLDSButton: SLDSButton,
+  SLDSModal: SLDSModal,
+  SLDSModalManager: SLDSModalManager
 };

demo/pages/HomePage/ModalSection.jsx

@@ -17,13 +17,11 @@ import {EventUtil} from '../../../components/utils';
 import SLDSDateInput from '../../../components/SLDSDateInput';
 
 import SLDSModal from '../../../components/SLDSModal';
+import {SLDSModalManager} from '../../../components';
 
 
-const items = ['Paddy\'s Pub', 'Tyrell Corp', 'Paper St. Soap Company', 'Nakatomi Investments', 'Acme Landscaping', 'Acme Construction'];
 
 
-import Modal from 'react-modal';
-
 
 
 const customStyles = {
@@ -60,6 +58,7 @@ module.exports = React.createClass( {
 
   openModal () {
     this.setState({modalIsOpen: true});
+    SLDSModalManager.trigger(this.getModal());
   },
 
   closeModal () {
@@ -78,33 +77,14 @@ module.exports = React.createClass( {
 //    EventUtil.trap(e);
   },
 
-  render() {
-    return (
-
-
-            <div className='slds-p-around--medium'>
-
-              <h3 className='slds-text-heading--medium slds-truncate'>
-                Modal (Work in progress)
-              </h3>
-{/*
-              <PrismCode className='language-markup'>
-                {require("raw-loader!../../code-snippets/SLDSLookupPage.txt")}
-              </PrismCode>
-*/}
-
-              <div className='slds-p-vertical--large'>
-                <SLDSButton flavor='brand' onClick={this.openModal}>
-                  Open Modal
-                </SLDSButton>
-
-                <SLDSModal 
+  getModal () {
+    return (<SLDSModal 
                   title={<span>Super Stuff</span>}
                   footer={[
                     <button className='slds-button slds-button--neutral' onClick={this.closeModal}>Cancel</button>,
                     <button className='slds-button slds-button--neutral slds-button--brand' onClick={this.handleSubmitModal}>Save</button>
                   ]}
-                  isOpen={this.state.modalIsOpen}>
+                  isOpen={true}>
 
                         <SLDSButton flavor='brand' onClick={this.handleButtonClick}>
                           Test Button
@@ -116,22 +96,38 @@ module.exports = React.createClass( {
                           <p>Dolor eiusmod sunt ex incididunt cillum quis nostrud velit duis sit officia. Lorem aliqua enim laboris do dolor eiusmod officia. Mollit incididunt nisi consectetur esse laborum eiusmod pariatur proident. Eiusmod et adipisicing culpa deserunt
                             nostrud ad veniam nulla aute est. Labore esse esse cupidatat amet velit id elit consequat minim ullamco mollit enim excepteur ea.</p>
                         </div>
-
+{/*
                         <SLDSModal 
                           title={<span>Super Stuff</span>}
                           isOpen={true}>
+                            AAA
+                            AAA
+                          </SLDSModal>
+*/}
+                </SLDSModal>);
+  },
 
-                          AAA
+  render() {
+    return (
 
-                                                  <SLDSModal 
-                          title={<span>Super Stuff</span>}
-                          isOpen={true}>BBB</SLDSModal>
 
-                          AAA
+            <div className='slds-p-around--medium'>
 
-                          </SLDSModal>
+              <h3 className='slds-text-heading--medium slds-truncate'>
+                Modal (Work in progress)
+              </h3>
+{/*
+              <PrismCode className='language-markup'>
+                {require("raw-loader!../../code-snippets/SLDSLookupPage.txt")}
+              </PrismCode>
+*/}
+
+              <div className='slds-p-vertical--large'>
+                <SLDSButton flavor='brand' onClick={this.openModal}>
+                  Open Modal
+                </SLDSButton>
 
-                </SLDSModal>
+                {this.getModal()}
 
               </div>
             </div>