modal progress

Author: ivansfdc

components/SLDSModal/index.jsx

@@ -10,10 +10,10 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 'use strict';
 
 import React from 'react';
-import SLDSButton from './SLDSButton';
-import {Icon} from './SLDSIcons';
-import {EventUtil} from './utils';
-import SLDSDateInput from './SLDSDateInput';
+import SLDSButton from '../SLDSButton';
+import {Icon} from '../SLDSIcons';
+import {EventUtil} from '../utils';
+import SLDSDateInput from '../SLDSDateInput';
 
 
 import Modal from 'react-modal';
@@ -43,7 +43,10 @@ const customStyles = {
 module.exports = React.createClass( {
 
   getDefaultProps () {
-    return {isOpen:false};
+    return {
+      title:'',
+      isOpen:false
+    };
   },
 
   getInitialState () {
@@ -75,15 +78,23 @@ module.exports = React.createClass( {
           onClick={this.closeModal}>
           <div className='slds-modal__container' onClick={(e)=>{EventUtil.trap(e);}}>
             <div className='slds-modal__header'>
-              <h2 className='slds-text-heading--medium'>Modal Header</h2>
+              <h2 className='slds-text-heading--medium'>{this.props.title}</h2>
               <SLDSButton className='slds-button slds-modal__close' onClick={this.closeModal}>
                 <Icon name='close' category='utility' size='small'/>
                 <span className='slds-assistive-text'>Close</span>
               </SLDSButton>
+              {this.props.children}
+
+            </div>
+
+            <div className='slds-modal__footer'>
+              {this.props.footer}
             </div>
-            {this.props.children}
+
           </div>
+
         </div>
+
       </Modal>
     );
   },

demo/pages/HomePage/ModalSection.jsx

@@ -16,6 +16,9 @@ import {default as PrismCode} from 'react-prism/lib/PrismCode';
 import {EventUtil} from '../../../components/utils';
 import SLDSDateInput from '../../../components/SLDSDateInput';
 
+import SLDSModal from '../../../components/SLDSModal';
+
+
 const items = ['Paddy\'s Pub', 'Tyrell Corp', 'Paper St. Soap Company', 'Nakatomi Investments', 'Acme Landscaping', 'Acme Construction'];
 
 
@@ -95,25 +98,13 @@ module.exports = React.createClass( {
                   Open Modal
                 </SLDSButton>
 
-                <Modal
-                  isOpen={this.state.modalIsOpen}
-                  onRequestClose={this.closeModal}
-                  style={customStyles}
-                  overlayClassName='slds-modal-backdrop slds-modal-backdrop--open' >
-
-                  <div className='slds-modal slds-fade-in-open' 
-                    onClick={this.closeModal}>
-                    <div className='slds-modal__container' onClick={(e)=>{EventUtil.trap(e);}}>
-                      <div className='slds-modal__header'>
-                        <h2 className='slds-text-heading--medium'>Modal Header</h2>
-                        <SLDSButton className='slds-button slds-modal__close' onClick={this.closeModal}>
-
-                          <Icon name='close' category='utility' size='small'/>
-
-                          <span className='slds-assistive-text'>Close</span>
-                        </SLDSButton>
-                      </div>
-                      <div className='slds-modal__content'>
+                <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}>
 
                         <SLDSButton flavor='brand' onClick={this.handleButtonClick}>
                           Test Button
@@ -126,28 +117,21 @@ module.exports = React.createClass( {
                             nostrud ad veniam nulla aute est. Labore esse esse cupidatat amet velit id elit consequat minim ullamco mollit enim excepteur ea.</p>
                         </div>
 
-                        <SLDSDateInput />
-
-                        <div>
-                          <p>Sit nulla est ex deserunt exercitation anim occaecat. Nostrud ullamco deserunt aute id consequat veniam incididunt duis in sint irure nisi. Mollit officia cillum Lorem ullamco minim nostrud elit officia tempor esse quis. Cillum sunt ad dolore
-                            quis aute consequat ipsum magna exercitation reprehenderit magna. Tempor cupidatat consequat elit dolor adipisicing.</p>
-                          <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>
-
-                      </div>
+                        <SLDSModal 
+                          title={<span>Super Stuff</span>}
+                          isOpen={true}>
 
+                          AAA
 
-                      <div className='slds-modal__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>
-                      </div>
+                                                  <SLDSModal 
+                          title={<span>Super Stuff</span>}
+                          isOpen={true}>BBB</SLDSModal>
 
-                    </div>
+                          AAA
 
-                  </div>
-                </Modal>
+                          </SLDSModal>
 
+                </SLDSModal>
 
               </div>
             </div>