Merge pull request #1034 from metasfresh/dev-999

grid view: use keyboard + and - to expand/collapse included rows #999
metasfresh · Jul 17, 2017 · db9289a · db9289a
2 parents bdbaf24 + b7ad2ba
commit db9289a
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 6 deletions.
diff --git a/src/components/shortcuts/DocumentListContextShortcuts.js b/src/components/shortcuts/DocumentListContextShortcuts.js
@@ -7,7 +7,8 @@ class DocumentListContextShortcuts extends Component {
     }
     handleShortcuts = (action, event) => {
         const {
-            handleAdvancedEdit, handleOpenNewTab, handleDelete, getAllLeafs
+            handleAdvancedEdit, handleOpenNewTab, handleDelete, getAllLeafs,
+            handleIndent
         } = this.props;
 
         switch (action) {
@@ -16,23 +17,29 @@ class DocumentListContextShortcuts extends Component {
             if(handleOpenNewTab) {
             handleOpenNewTab();
             }
-            break
+            break;
         case 'REMOVE_SELECTED':
             event.preventDefault();
             if(handleDelete){
             handleDelete();
             }
-            break
+            break;
         case 'ADVANCED_EDIT':
             event.preventDefault();
             if(handleAdvancedEdit){
             handleAdvancedEdit();
             }
-            break
+            break;
         case 'SELECT_ALL_LEAFS':
             event.preventDefault();
             getAllLeafs();
-            break
+            break;
+        case 'EXPAND_INDENT':
+            handleIndent(true);
+            break;
+        case 'COLLAPSE_INDENT':
+            handleIndent(false);
+            break;
         }
     }
 

diff --git a/src/components/table/Table.js b/src/components/table/Table.js
@@ -685,6 +685,31 @@ class Table extends Component {
         })
     }
 
+    handleShortcutIndent = (expand) => {
+        const {selected, rows, collapsedParentsRows} = this.state;
+        const {keyProperty} = this.props;
+
+        let node = "";
+        let isCollapsed = "";
+        selected.length === 1 && rows.map((item)=>{
+            if(item.id === selected[0]){
+                if(item.includedDocuments){
+                    node = item;
+                    isCollapsed = collapsedParentsRows.indexOf(item[keyProperty]) > -1;
+                }
+            }
+        });
+
+        if(node){
+            if(isCollapsed && expand) {
+                this.handleRowCollapse(node, expand);
+            } else if(!isCollapsed && !expand) {
+                this.handleRowCollapse(node, expand);
+            } 
+        }
+
+    }
+
     renderTableBody = () => {
         const {
             tabid, cols, type, docId, readonly, keyProperty, onDoubleClick,
@@ -917,6 +942,8 @@ class Table extends Component {
                         () => this.handleDelete() : ''
                     }
                     getAllLeafs={this.getAllLeafs}
+
+                    handleIndent = {this.handleShortcutIndent}
                 />
 
                 {!readonly &&

diff --git a/src/keymap.js b/src/keymap.js
@@ -30,7 +30,9 @@ export default {
         REMOVE_SELECTED: mod + '+' + 'y',
         ADVANCED_EDIT: mod + '+' + 'a',
         //===================  POS  ======================
-        SELECT_ALL_LEAFS: mod + '+' + 's'
+        SELECT_ALL_LEAFS: mod + '+' + 's',
+        EXPAND_INDENT: '+',
+        COLLAPSE_INDENT: '-'
 
     },
     TABLE_CONTEXT: {