From 2358c3d13df805ba8ad57bc67aadc3a461660197 Mon Sep 17 00:00:00 2001 From: Tom Moor Date: Mon, 4 Sep 2023 21:12:28 -0400 Subject: [PATCH] refactor --- app/components/{ => ContextMenu}/MenuIconWrapper.ts | 3 ++- app/components/ContextMenu/MenuItem.tsx | 2 +- app/components/ContextMenu/Template.tsx | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) rename app/components/{ => ContextMenu}/MenuIconWrapper.ts (73%) diff --git a/app/components/MenuIconWrapper.ts b/app/components/ContextMenu/MenuIconWrapper.ts similarity index 73% rename from app/components/MenuIconWrapper.ts rename to app/components/ContextMenu/MenuIconWrapper.ts index 761cf833a..385e8291d 100644 --- a/app/components/MenuIconWrapper.ts +++ b/app/components/ContextMenu/MenuIconWrapper.ts @@ -1,11 +1,12 @@ import styled from "styled-components"; +import { s } from "@shared/styles"; const MenuIconWrapper = styled.span` width: 24px; height: 24px; margin-right: 6px; margin-left: -4px; - color: ${({ theme }) => theme.textSecondary}; + color: ${s("textSecondary")}; `; export default MenuIconWrapper; diff --git a/app/components/ContextMenu/MenuItem.tsx b/app/components/ContextMenu/MenuItem.tsx index 858cc43b3..9fbf7c2bb 100644 --- a/app/components/ContextMenu/MenuItem.tsx +++ b/app/components/ContextMenu/MenuItem.tsx @@ -5,7 +5,7 @@ import { mergeRefs } from "react-merge-refs"; import { MenuItem as BaseMenuItem } from "reakit/Menu"; import styled, { css } from "styled-components"; import breakpoint from "styled-components-breakpoint"; -import MenuIconWrapper from "../MenuIconWrapper"; +import MenuIconWrapper from "./MenuIconWrapper"; type Props = { id?: string; diff --git a/app/components/ContextMenu/Template.tsx b/app/components/ContextMenu/Template.tsx index c66a24088..42306b551 100644 --- a/app/components/ContextMenu/Template.tsx +++ b/app/components/ContextMenu/Template.tsx @@ -9,8 +9,8 @@ import { MenuStateReturn, } from "reakit/Menu"; import styled, { useTheme } from "styled-components"; +import MenuIconWrapper from "~/components/ContextMenu/MenuIconWrapper"; import Flex from "~/components/Flex"; -import MenuIconWrapper from "~/components/MenuIconWrapper"; import { actionToMenuItem } from "~/actions"; import useActionContext from "~/hooks/useActionContext"; import {