Skip to content

Commit 47c007a

Browse files
Thomas DraierAKarmanov
andcommitted
BACKLOG-12097 : Moved out navigation (#69)
* BACKLOG-11702 Make sure proper namespace can me used, make CMM 100% width * BACKLOG-11705 Remove burger menu * BACKLOG-11705 Remove empty element * BACKLOG-12112 Remove unused prop Co-authored-by: Alex Karmanov <alexandrk_@hotmail.com>
1 parent 91d9740 commit 47c007a

File tree

2 files changed

+4
-20
lines changed

2 files changed

+4
-20
lines changed

packages/design-system-kit/src/components/LeftNavigation/LeftNavigation.jsx

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
import PropTypes from 'prop-types';
22
import React from 'react';
3-
import {Drawer, List, ListItem, withStyles} from '@material-ui/core';
3+
import {List, withStyles} from '@material-ui/core';
44
import classNames from 'classnames';
5-
import BurgerMenuButton from './BurgerMenuButton';
65
import {DisplayActions} from '@jahia/react-material';
76
import LeftMenuItem from './LeftMenuItem';
87
import {compose} from 'recompose';
@@ -57,7 +56,7 @@ const styles = theme => ({
5756
}
5857
});
5958

60-
export const LeftNavigation = ({context, classes, actionsTarget, secondaryActionsTarget, drawer, burgerIconTitle}) => {
59+
export const LeftNavigation = ({context, classes, actionsTarget, secondaryActionsTarget, drawer}) => {
6160
let actionContext = {
6261
...context,
6362
drawer
@@ -70,9 +69,6 @@ export const LeftNavigation = ({context, classes, actionsTarget, secondaryAction
7069
})}
7170
>
7271
<List className={classes.list} component="nav">
73-
<ListItem button className={classes.menuBurger}>
74-
<BurgerMenuButton title={burgerIconTitle} isDrawerOpen={drawer.drawerOpen}/>
75-
</ListItem>
7672
<DisplayActions target={actionsTarget}
7773
context={actionContext}
7874
render={({context}) => (
@@ -89,18 +85,6 @@ export const LeftNavigation = ({context, classes, actionsTarget, secondaryAction
8985
)}
9086
/>
9187
</List>
92-
<Drawer
93-
variant="persistent"
94-
classes={{
95-
paper: classNames(classes.drawerPaper, !drawer.drawerOpen && classes.drawerPaperClose)
96-
}}
97-
open={drawer.drawerOpen}
98-
>
99-
<div className={classes.drawerTree}>
100-
{drawer.drawerContent &&
101-
drawer.drawerContent.content}
102-
</div>
103-
</Drawer>
10488
</div>
10589
);
10690
};
@@ -110,7 +94,6 @@ LeftNavigation.propTypes = {
11094
secondaryActionsTarget: PropTypes.string.isRequired,
11195
context: PropTypes.object.isRequired,
11296
drawer: PropTypes.object.isRequired,
113-
burgerIconTitle: PropTypes.string.isRequired,
11497
classes: PropTypes.object.isRequired
11598
};
11699

packages/design-system-kit/src/layouts/page/AppLayout.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ const styles = theme => ({
1010
position: 'relative',
1111
display: 'flex',
1212
flexDirection: 'row',
13-
height: '100vh'
13+
height: '100vh',
14+
width: '100%'
1415
},
1516
main: {
1617
flex: '1 1 0%',

0 commit comments

Comments
 (0)