Merge pull request #15 from AKolodeev/bugfix

Fixed modals status field
AKolodeev · Sep 27, 2017 · 92f1467 · 92f1467
2 parents 51fab35 + 8369b60
commit 92f1467
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 14 deletions.
diff --git a/example/src/App.js b/example/src/App.js
@@ -29,21 +29,19 @@ class App extends Component {
 
     handleEditFileBtnClick() {
         this.props.pushModalWindow(EDIT_FILE_DIALOG, { initialFileName: 'my_file.txt' })
-            .then(({ type, newFileName }) => {
-                // got modal exit status as *type* and newFileName
+            .then(({ status, newFileName }) => {
                 // ToDo: ajax request and processing
-                if (type === MODAL_TYPE_CONFIRM) {
+                if (status === MODAL_TYPE_CONFIRM) {
                     console.log('OK. New name: %s', newFileName);
                 }
             });
     }
 
     handleRemoveFileBtnClick() {
         this.props.pushModalWindow(REMOVE_FILE_DIALOG, { fileName: 'my_file.txt' })
-            .then(({ type }) => {
-                // got modal exit status as *type*
+            .then(({ status }) => {
                 // ToDo: ajax request and processing
-                if (type === MODAL_TYPE_CONFIRM) {
+                if (status === MODAL_TYPE_CONFIRM) {
                     console.log('OK, file removed');
                 }
             });

diff --git a/example/src/components/EditFileDialog.js b/example/src/components/EditFileDialog.js
@@ -38,17 +38,17 @@ export default class EditFileDialog extends Component {
     }
 
     handleConfirmBtnClick() {
-        const { resultTypes: { CONFIRM }, popModalWindow } = this.props;
+        const { resultTypes: { MODAL_TYPE_CONFIRM }, popModalWindow } = this.props;
         const { newFileName } = this.state;
 
-        // Close the modal with "CONFIRM" status and provide new file name
-        popModalWindow({ status: CONFIRM, newFileName });
+        // Close the modal with confirm status and provide new file name
+        popModalWindow({ status: MODAL_TYPE_CONFIRM, newFileName });
     }
 
     handleCancelBtnClick() {
-        const { resultTypes: { CANCEL }, popModalWindow } = this.props;
+        const { resultTypes: { MODAL_TYPE_CANCEL }, popModalWindow } = this.props;
 
         // Just closing the modal
-        popModalWindow({ status: CANCEL });
+        popModalWindow({ status: MODAL_TYPE_CANCEL });
     }
 }
diff --git a/example/src/components/RemoveFileDialog.js b/example/src/components/RemoveFileDialog.js
@@ -2,13 +2,13 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 const RemoveFileDialog = props => {
-    const { fileName, resultTypes: { CONFIRM, CANCEL }, popModalWindow } = props;
+    const { fileName, resultTypes: { MODAL_TYPE_CONFIRM, MODAL_TYPE_CANCEL }, popModalWindow } = props;
 
     return (
         <div>
             <p>Remove {fileName}?</p>
-            <button type="button" onClick={() => popModalWindow({ type: CONFIRM })}>Confirm</button>
-            <button type="button" onClick={() => popModalWindow({ type: CANCEL })}>Cancel</button>
+            <button type="button" onClick={() => popModalWindow({ status: MODAL_TYPE_CONFIRM })}>Confirm</button>
+            <button type="button" onClick={() => popModalWindow({ status: MODAL_TYPE_CANCEL })}>Cancel</button>
         </div>
     );
 };