From 8686e6aa3ba0f53b524898f8ef3a7214561cc6a4 Mon Sep 17 00:00:00 2001 From: Michal Klobukowski Date: Fri, 13 Jul 2018 16:27:16 +0200 Subject: [PATCH] Make use of a new Icon component in ContextMenu Feature #13805 Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski --- src/components/context-menu/context-menu.tsx | 5 ++-- .../context-menu/project-item-set.ts | 26 +++---------------- .../context-menu/root-project-item-set.ts | 3 ++- 3 files changed, 9 insertions(+), 25 deletions(-) diff --git a/src/components/context-menu/context-menu.tsx b/src/components/context-menu/context-menu.tsx index 49b65927..a7b83bcf 100644 --- a/src/components/context-menu/context-menu.tsx +++ b/src/components/context-menu/context-menu.tsx @@ -4,10 +4,11 @@ import * as React from "react"; import { Popover, List, ListItem, ListItemIcon, ListItemText, Divider } from "@material-ui/core"; import { DefaultTransformOrigin } from "../popover/helpers"; +import IconBase, { IconTypes } from "../icon/icon"; export interface ContextMenuItem { name: string; - icon: string; + icon: IconTypes; } export type ContextMenuItemGroup = ContextMenuItem[]; @@ -38,7 +39,7 @@ export default class ContextMenu extends React.PureComponent { key={actionIndex} onClick={() => onItemClick(item)}> - + {item.name} diff --git a/src/views-components/context-menu/project-item-set.ts b/src/views-components/context-menu/project-item-set.ts index 583bbaaa..e205339f 100644 --- a/src/views-components/context-menu/project-item-set.ts +++ b/src/views-components/context-menu/project-item-set.ts @@ -5,6 +5,7 @@ import { ContextMenuItemGroup } from "../../components/context-menu/context-menu"; import { ContextMenuItemSet } from "./context-menu-item-set"; import actions from "../../store/project/project-action"; +import { IconTypes } from "../../components/icon/icon"; export const projectItemSet: ContextMenuItemSet = { getItems: () => items, @@ -16,28 +17,9 @@ export const projectItemSet: ContextMenuItemSet = { }; const items: ContextMenuItemGroup[] = [[{ - icon: "fas fa-plus fa-fw", + icon: IconTypes.FOLDER, name: "New project" }, { - icon: "fas fa-users fa-fw", + icon: IconTypes.ANNOUNCEMENT, name: "Share" -}, { - icon: "fas fa-sign-out-alt fa-fw", - name: "Move to" -}, { - icon: "fas fa-star fa-fw", - name: "Add to favourite" -}, { - icon: "fas fa-edit fa-fw", - name: "Rename" -}, { - icon: "fas fa-copy fa-fw", - name: "Make a copy" -}, { - icon: "fas fa-download fa-fw", - name: "Download" -}], [{ - icon: "fas fa-trash-alt fa-fw", - name: "Remove" -} -]]; \ No newline at end of file +}]]; \ No newline at end of file diff --git a/src/views-components/context-menu/root-project-item-set.ts b/src/views-components/context-menu/root-project-item-set.ts index ae760f0f..51068818 100644 --- a/src/views-components/context-menu/root-project-item-set.ts +++ b/src/views-components/context-menu/root-project-item-set.ts @@ -5,6 +5,7 @@ import { ContextMenuItemGroup } from "../../components/context-menu/context-menu"; import { ContextMenuItemSet } from "./context-menu-item-set"; import actions from "../../store/project/project-action"; +import { IconTypes } from "../../components/icon/icon"; export const rootProjectItemSet: ContextMenuItemSet = { getItems: () => items, @@ -16,6 +17,6 @@ export const rootProjectItemSet: ContextMenuItemSet = { }; const items: ContextMenuItemGroup[] = [[{ - icon: "fas fa-plus fa-fw", + icon: IconTypes.FOLDER, name: "New project" }]]; \ No newline at end of file -- 2.39.5