Merge branch '21128-toolbar-context-menu'

[arvados-workbench2.git] / src / components / breadcrumbs / breadcrumbs.tsx

diff --git a/src/components/breadcrumbs/breadcrumbs.tsx b/src/components/breadcrumbs/breadcrumbs.tsx
index 1d4b7b272ab3d311e662e9c2bf0526b7be5f7e92..baf84d1da253fd2ac266eac6ba7b2215d004a1a2 100644 (file)
--- a/src/components/breadcrumbs/breadcrumbs.tsx
+++ b/src/components/breadcrumbs/breadcrumbs.tsx
@@ -19,23 +19,31 @@ export interface Breadcrumb {
     uuid: string;
 }
 
-type CssRules = "item" | "label" | "icon" | "frozenIcon";
+type CssRules = "item" | "chevron" | "label" | "buttonLabel" | "icon" | "frozenIcon";
 
 const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
     item: {
         borderRadius: '16px',
         height: '32px',
+        minWidth: '36px',
         color: theme.customs.colors.grey700,
         '&.parentItem': {
             color: `${theme.palette.primary.main}`,
         },
     },
+    chevron: {
+        color: grey["600"],
+    },
     label: {
         textTransform: "none",
         paddingRight: '3px',
         paddingLeft: '3px',
         lineHeight: '1.4',
     },
+    buttonLabel: {
+        overflow: 'hidden',
+        justifyContent: 'flex-start',
+    },
     icon: {
         fontSize: 20,
         color: grey["600"],
@@ -57,7 +65,7 @@ export interface BreadcrumbsProps {
 
 export const Breadcrumbs = withStyles(styles)(
     ({ classes, onClick, onContextMenu, items, resources }: BreadcrumbsProps & WithStyles<CssRules>) =>
-    <Grid container data-cy='breadcrumbs' alignItems="center">
+    <Grid container data-cy='breadcrumbs' alignItems="center" wrap="nowrap">
     {
         items.map((item, index) => {
             const isLastItem = index === items.length - 1;
@@ -78,6 +86,9 @@ export const Breadcrumbs = withStyles(styles)(
                                 isLastItem ? null : 'parentItem',
                                 classes.item
                             )}
+                            classes={{
+                                label: classes.buttonLabel
+                            }}
                             color="inherit"
                             onClick={() => onClick(item)}
                             onContextMenu={event => onContextMenu(event, item)}>
@@ -93,7 +104,7 @@ export const Breadcrumbs = withStyles(styles)(
                             }
                         </Button>
                     </Tooltip>
-                    {!isLastItem && <ChevronRightIcon color="inherit" className={'parentItem'} />}
+                    {!isLastItem && <ChevronRightIcon color="inherit" className={classNames('parentItem', classes.chevron)} />}
                 </React.Fragment>
             );
         })