v0.0.8 build

salesforce · Oct 1, 2015 · 2c7e47e · 2c7e47e
1 parent 15e3adc
commit 2c7e47e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/lib/SLDSModal/index.js b/lib/SLDSModal/index.js
@@ -62,14 +62,16 @@ module.exports = _react2['default'].createClass({
 
   getInitialState: function getInitialState() {
     return {
-      isOpen: this.props.isOpen,
+      isClosing: false,
       revealed: false
     };
   },
 
   componentDidMount: function componentDidMount() {
     var _this = this;
 
+    console.log('!!! window.activeElement !!! ', document.activeElement);
+    this.setState({ returnFocusTo: document.activeElement });
     if (!this.state.revealed) {
       setTimeout(function () {
         _this.setState({ revealed: true });
@@ -78,12 +80,14 @@ module.exports = _react2['default'].createClass({
     this.updateBodyScroll();
   },
 
-  openModal: function openModal() {
-    this.setState({ isOpen: true });
-  },
-
   closeModal: function closeModal() {
-    this.setState({ isOpen: false });
+    this.setState({ isClosing: true });
+    if (this.state.returnFocusTo && this.state.returnFocusTo.focus) {
+      this.state.returnFocusTo.focus();
+    }
+    if (this.props.onRequestClose) {
+      this.props.onRequestClose();
+    }
   },
 
   handleSubmitModal: function handleSubmitModal() {
@@ -92,7 +96,7 @@ module.exports = _react2['default'].createClass({
 
   updateBodyScroll: function updateBodyScroll() {
     if (window && document && document.body) {
-      if (this.state.isOpen) {
+      if (!this.state.isClosing) {
         document.body.style.overflow = 'hidden';
       } else {
         document.body.style.overflow = 'inherit';
@@ -147,7 +151,7 @@ module.exports = _react2['default'].createClass({
     return _react2['default'].createElement(
       _reactModal2['default'],
       {
-        isOpen: this.state.isOpen,
+        isOpen: this.props.isOpen,
         onRequestClose: this.closeModal,
         style: customStyles,
         overlayClassName: 'slds-modal-backdrop' + (this.state.revealed ? ' slds-modal-backdrop--open' : '') },
@@ -157,14 +161,13 @@ module.exports = _react2['default'].createClass({
 
   componentDidUpdate: function componentDidUpdate(prevProps, prevState) {
 
-    if (this.state.isOpen !== prevState.isOpen) {
+    if (this.state.isClosing !== prevState.isClosing) {
 
       this.updateBodyScroll();
 
-      if (!this.state.isOpen) {
-        if (this.props.returnFocusTo && this.props.returnFocusTo.focus) {
-          this.props.returnFocusTo.focus();
-        }
+      if (this.state.isClosing) {
+        console.log('CLOSING: ');
+
         if (this.isMounted()) {
           var el = this.getDOMNode().parentNode;
           if (el && el.getAttribute('data-slds-modal')) {

diff --git a/lib/SLDSModal/trigger.js b/lib/SLDSModal/trigger.js
@@ -31,7 +31,6 @@ var SLDSModalTrigger = {
       {
         title: cfg.title,
         footer: cfg.footer,
-        returnFocusTo: cfg.returnFocusTo,
         isOpen: true },
       cfg.content
     );

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "design-system-react",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "Salesforce Lightning Design System React components",
   "scripts": {
     "start": "node server.js",