Merge pull request #699 from metasfresh/dev-682

#682 Sidelist nav stick to top
metasfresh · Apr 28, 2017 · 3890155 · 3890155
2 parents 1255d3e + d99bfb3
commit 3890155
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 15 deletions.
diff --git a/src/assets/css/styles.css b/src/assets/css/styles.css
@@ -154,6 +154,10 @@ body {
     overflow-x: hidden;
 }
 
+.order-list-body{
+    margin-top: 41px;
+}
+
 @media (max-width: $breakpoint) {
     .order-list-panel {
         width: 100%;
@@ -182,7 +186,11 @@ body {
 }
 
 .order-list-nav {
-    width: 100%;
+    position: fixed;
+    z-index: 201;
+    width: 472px;
+    background: #fff;
+    top: 55px;
     display: flex;
     flex-direction: row;
     flex-wrap: nowrap;

diff --git a/src/components/app/DocumentList.js b/src/components/app/DocumentList.js
@@ -62,7 +62,7 @@ class DocumentList extends Component {
     }
 
     componentDidMount = () => {
-        this.mounted = true;
+        this.mounted = true
     }
 
     componentWillUnmount() {
@@ -426,7 +426,7 @@ class DocumentList extends Component {
             windowType, open, closeOverlays, selected, inBackground,
             fetchQuickActionsOnInit, isModal, processStatus, readonly,
             includedView, children, isIncluded, disablePaginationShortcuts,
-            notfound, disconnectFromState
+            notfound, disconnectFromState, autofocus
         } = this.props;
 
         const hasIncluded = layout && layout.supportIncludedView &&
@@ -513,15 +513,9 @@ class DocumentList extends Component {
                                 cachedSelection : selected}
                             queryLimitHit={data.queryLimitHit}
                             doesSelectionExist={this.doesSelectionExist}
-                            disconnectFromState={disconnectFromState}
-                            isIncluded={isIncluded}
-                            isModal={isModal}
-                            disablePaginationShortcuts={
-                                disablePaginationShortcuts}
-                            inBackground={inBackground}
-                            closeOverlays={closeOverlays}
-                            open={open}
-                            page={page}
+                            {...{isIncluded, disconnectFromState, autofocus,
+                                open, page, closeOverlays, inBackground,
+                                disablePaginationShortcuts, isModal}}
                         >
                             {layout.supportAttributes && !isIncluded &&
                                 !hasIncluded &&

diff --git a/src/components/header/SideList.js b/src/components/header/SideList.js
@@ -33,7 +33,7 @@ class SideList extends Component {
 
     renderBody = () => {
         const {
-            open, windowType, closeOverlays, closeSideList, isSideListShow,
+            windowType, closeOverlays, closeSideList, isSideListShow,
             docId, pagination, sorting, viewId
         } = this.props;
 
@@ -60,7 +60,8 @@ class SideList extends Component {
                     }
                     selected={[docId]}
                     disconnectFromState={true}
-                    {...{open, windowType, closeOverlays, closeSideList,
+                    autofocus={true}
+                    {...{windowType, closeOverlays, closeSideList,
                     isSideListShow}}
                 />
             case 1:
@@ -127,7 +128,9 @@ class SideList extends Component {
                             }
                         </div>)}
                     </div>
-                    {this.renderBody()}
+                    <div className="order-list-body">
+                        {this.renderBody()}
+                    </div>
                 </div>
             </div>
         )

diff --git a/src/components/table/Table.js b/src/components/table/Table.js
@@ -54,6 +54,10 @@ class Table extends Component {
 
     componentDidMount(){
         this.getIndentData(true);
+
+        const {autofocus} = this.props;
+
+        autofocus && this.table.focus();
     }
 
     componentDidUpdate(prevProps, prevState) {