Merge pull request #90 from webdev-dev/master

Revert

Author: culturedbarbarian

lib/CascadingPane/CascadingPane.js

@@ -258,6 +258,9 @@ CascadingPane.defaultProps = {
     getCascadingMainView: function getCascadingMainView(f) {
         return f;
     },
+    getCascadingSubView: function getCascadingSubView(f) {
+        return f;
+    },
     navData: [],
     mainData: [],
     subData: {},

lib/CascadingPane/CascadingPaneSubView.js

@@ -57,9 +57,7 @@ var CascadingPaneSubView = function (_React$Component) {
                 cascSelect = _props.cascSelect,
                 getCascadingSubView = _props.getCascadingSubView;
 
-            if (getCascadingSubView) {
-                if (cascSelect) getCascadingSubView(cascSelect);
-            }
+            if (cascSelect) getCascadingSubView(cascSelect);
         }
     }, {
         key: 'componentWillReceiveProps',
@@ -88,15 +86,11 @@ var CascadingPaneSubView = function (_React$Component) {
             if (cascSelect) {
                 if (!nextProps.cascSelect || cascSelect !== nextProps.cascSelect) {
                     newState.navSelect = nextProps.cascSelect || '';
-                    if (getCascadingSubView) {
-                        if (nextProps.cascSelect) getCascadingSubView(nextProps.cascSelect);
-                    }
+                    if (nextProps.cascSelect) getCascadingSubView(nextProps.cascSelect);
                 }
             } else if (nextProps.cascSelect) {
                 newState.navSelect = nextProps.cascSelect;
-                if (getCascadingSubView) {
-                    getCascadingSubView(nextProps.cascSelect);
-                }
+                getCascadingSubView(nextProps.cascSelect);
             }
             if (Object.keys(newState).length > 0) {
                 this.setState(_extends({}, newState));
@@ -129,7 +123,7 @@ var CascadingPaneSubView = function (_React$Component) {
                 _react2.default.createElement(
                     _LoadingComponent2.default,
                     mainViewFetch,
-                    getCascadingSubview ? _react2.default.createElement(
+                    _react2.default.createElement(
                         _LoadingComponent2.default,
                         subViewFetch,
                         fetchedSub && fetchedMain && _react2.default.cloneElement(contentDisplay, {
@@ -141,14 +135,7 @@ var CascadingPaneSubView = function (_React$Component) {
                             navSelect: navSelect,
                             mainSelect: mainSelect
                         })
-                    ) : _react2.default.cloneElement(contentDisplay, {
-                        groupData: groupData,
-                        memberData: memberData,
-                        data: data,
-                        reloadMainView: reloadMainView,
-                        navSelect: navSelect,
-                        mainSelect: mainSelect
-                    })
+                    )
                 )
             );
         }
@@ -189,6 +176,9 @@ CascadingPaneSubView.defaultProps = {
     groupData: {},
     memberData: {},
     data: {},
+    getCascadingSubView: function getCascadingSubView(f) {
+        return f;
+    },
     subViewFetch: {
         status: '',
         isFetching: false

src/CascadingPane/CascadingPane.jsx

@@ -183,6 +183,7 @@ CascadingPane.defaultProps = {
     splitClassName: '',
     getCascadingNav: f => f,
     getCascadingMainView: f => f,
+    getCascadingSubView: f => f,
     navData: [],
     mainData: [],
     subData: {},

src/CascadingPane/CascadingPaneSubView.jsx

@@ -19,9 +19,7 @@ class CascadingPaneSubView extends React.Component {
 
     componentWillMount() {
         const { cascSelect, getCascadingSubView } = this.props;
-        if (getCascadingSubView) {
-            if (cascSelect) getCascadingSubView(cascSelect);
-        }
+        if (cascSelect) getCascadingSubView(cascSelect);
     }
 
     componentWillReceiveProps(nextProps) {
@@ -49,15 +47,11 @@ class CascadingPaneSubView extends React.Component {
         if (cascSelect) {
             if (!nextProps.cascSelect || cascSelect !== nextProps.cascSelect) {
                 newState.navSelect = nextProps.cascSelect || '';
-                if (getCascadingSubView) {
-                    if (nextProps.cascSelect) getCascadingSubView(nextProps.cascSelect);
-                }
+                if (nextProps.cascSelect) getCascadingSubView(nextProps.cascSelect);
             }
         } else if (nextProps.cascSelect) {
             newState.navSelect = nextProps.cascSelect;
-            if (getCascadingSubView) {
-                getCascadingSubView(nextProps.cascSelect);
-            }
+            getCascadingSubView(nextProps.cascSelect);
         }
         if (Object.keys(newState).length > 0) {
             this.setState({ ...newState });
@@ -82,30 +76,19 @@ class CascadingPaneSubView extends React.Component {
         return (
             <div className={classNames(className, 'cascading-pane-subview')} key={key}>
                 <LoadingComponent {...mainViewFetch}>
-                    {getCascadingSubview ? (
-                        <LoadingComponent {...subViewFetch}>
-                            {fetchedSub &&
-                                fetchedMain &&
-                                React.cloneElement(contentDisplay, {
-                                    groupData,
-                                    memberData,
-                                    data,
-                                    reloadMainView,
-                                    reloadSubView: getCascadingSubView,
-                                    navSelect,
-                                    mainSelect,
-                                })}
-                        </LoadingComponent>
-                    ) : (
-                        React.cloneElement(contentDisplay, {
-                            groupData,
-                            memberData,
-                            data,
-                            reloadMainView,
-                            navSelect,
-                            mainSelect,
-                        })
-                    )}
+                    <LoadingComponent {...subViewFetch}>
+                        {fetchedSub &&
+                            fetchedMain &&
+                            React.cloneElement(contentDisplay, {
+                                groupData,
+                                memberData,
+                                data,
+                                reloadMainView,
+                                reloadSubView: getCascadingSubView,
+                                navSelect,
+                                mainSelect,
+                            })}
+                    </LoadingComponent>
                 </LoadingComponent>
             </div>
         );
@@ -144,6 +127,7 @@ CascadingPaneSubView.defaultProps = {
     groupData: {},
     memberData: {},
     data: {},
+    getCascadingSubView: f => f,
     subViewFetch: {
         status: '',
         isFetching: false,