Skip to content

Commit

Permalink
rename and move
Browse files Browse the repository at this point in the history
  • Loading branch information
jimniels committed Sep 12, 2024
1 parent 1e7aa27 commit 34fb53a
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 108 deletions.
4 changes: 2 additions & 2 deletions quadratic-client/src/app/ui/menus/TopBar/TopBar.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import TopBarMenus from '@/app/ui/menus/TopBar/TopBarMenus';
import TopBarFileMenu from '@/app/ui/menus/TopBar/TopBarFileMenu';
import { isElectron } from '@/shared/utils/isElectron';
import { electronMaximizeCurrentWindow } from '../../../helpers/electronMaximizeCurrentWindow';
import { isEmbed } from '../../../helpers/isEmbed';
Expand Down Expand Up @@ -39,7 +39,7 @@ export const TopBar = () => {
WebkitAppRegion: 'no-drag',
}}
>
<TopBarMenus />
<TopBarFileMenu />
</div>

<TopBarFileNameAndLocationMenu />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Action } from '@/app/actions/actions';
import { MenubarItemAction } from '@/app/ui/menus/TopBar/TopBarMenus/MenubarItemAction';
import { MenubarItemAction } from '@/app/ui/menus/TopBar/TopBarFileMenu/MenubarItemAction';
import { MenubarContent, MenubarMenu, MenubarSeparator, MenubarTrigger } from '@/shared/shadcn/ui/menubar';

export const EditMenubarMenu = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { createNewFileAction, deleteFile, downloadFileAction, duplicateFileActio
import { Action } from '@/app/actions/actions';
import { editorInteractionStateAtom } from '@/app/atoms/editorInteractionStateAtom';
import { useFileContext } from '@/app/ui/components/FileProvider';
import { MenubarItemAction } from '@/app/ui/menus/TopBar/TopBarMenus/MenubarItemAction';
import { MenubarItemAction } from '@/app/ui/menus/TopBar/TopBarFileMenu/MenubarItemAction';
import { useRootRouteLoaderData } from '@/routes/_root';
import { useGlobalSnackbar } from '@/shared/components/GlobalSnackbarProvider';
import { DeleteIcon, DownloadIcon, DraftIcon, FileCopyIcon } from '@/shared/components/Icons';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Action } from '@/app/actions/actions';
import { MenubarItemAction } from '@/app/ui/menus/TopBar/TopBarMenus/MenubarItemAction';
import { MenubarItemAction } from '@/app/ui/menus/TopBar/TopBarFileMenu/MenubarItemAction';
import { MenubarContent, MenubarMenu, MenubarTrigger } from '@/shared/shadcn/ui/menubar';

export const HelpMenubarMenu = () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Action } from '@/app/actions/actions';
import { editorInteractionStateAtom } from '@/app/atoms/editorInteractionStateAtom';
import { MenubarItemAction } from '@/app/ui/menus/TopBar/TopBarMenus/MenubarItemAction';
import { MenubarItemAction } from '@/app/ui/menus/TopBar/TopBarFileMenu/MenubarItemAction';
import { useGlobalSnackbar } from '@/shared/components/GlobalSnackbarProvider';
import { CodeIcon, DataObjectIcon, InsertChartIcon } from '@/shared/components/Icons';
import { IMPORT_MESSAGE } from '@/shared/constants/appConstants';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ export const MenubarItemAction = <T extends Action>({

const { label, run } = actionSpec;
const Icon = 'Icon' in actionSpec ? actionSpec.Icon : undefined;
const labelVerbose = 'labelVerbose' in actionSpec ? actionSpec.labelVerbose ?? label : label;
const keyboardShortcut = shortcutOverride ? shortcutOverride : keyboardShortcutEnumToDisplay(action);
const isAvailable = 'isAvailable' in actionSpec ? actionSpec.isAvailable : undefined;

Expand All @@ -39,7 +38,7 @@ export const MenubarItemAction = <T extends Action>({
// TODO: (jimniels) implement isAvailable
return (
<MenubarItem onClick={() => run(actionArgs)}>
{Icon && <Icon />} {labelVerbose}
{Icon && <Icon />} {label}
{keyboardShortcut && <MenubarShortcut>{keyboardShortcut}</MenubarShortcut>}
</MenubarItem>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Action } from '@/app/actions/actions';
import { KeyboardSymbols } from '@/app/helpers/keyboardSymbols';
import { useGridSettings } from '@/app/ui/hooks/useGridSettings';
import { MenubarItemAction } from '@/app/ui/menus/TopBar/TopBarMenus/MenubarItemAction';
import { MenubarItemAction } from '@/app/ui/menus/TopBar/TopBarFileMenu/MenubarItemAction';
import { CheckSmallIcon, CropFreeIcon, ZoomInIcon } from '@/shared/components/Icons';
import {
MenubarContent,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { editorInteractionStateAtom } from '@/app/atoms/editorInteractionStateAtom';
import { EditMenubarMenu } from '@/app/ui/menus/TopBar/TopBarMenus/EditMenubarMenu';
import { FileMenubarMenu } from '@/app/ui/menus/TopBar/TopBarMenus/FileMenubarMenu';
import { FormatMenubarMenu } from '@/app/ui/menus/TopBar/TopBarMenus/FormatMenubarMenu';
import { HelpMenubarMenu } from '@/app/ui/menus/TopBar/TopBarMenus/HelpMenubarMenu';
import { InsertMenubarMenu } from '@/app/ui/menus/TopBar/TopBarMenus/InsertMenubarMenu';
import { ViewMenubarMenu } from '@/app/ui/menus/TopBar/TopBarMenus/ViewMenubarMenu';
import { EditMenubarMenu } from '@/app/ui/menus/TopBar/TopBarFileMenu/EditMenubarMenu';
import { FileMenubarMenu } from '@/app/ui/menus/TopBar/TopBarFileMenu/FileMenubarMenu';
import { FormatMenubarMenu } from '@/app/ui/menus/TopBar/TopBarFileMenu/FormatMenubarMenu';
import { HelpMenubarMenu } from '@/app/ui/menus/TopBar/TopBarFileMenu/HelpMenubarMenu';
import { InsertMenubarMenu } from '@/app/ui/menus/TopBar/TopBarFileMenu/InsertMenubarMenu';
import { ViewMenubarMenu } from '@/app/ui/menus/TopBar/TopBarFileMenu/ViewMenubarMenu';
import { Menubar } from '@/shared/shadcn/ui/menubar';
import { useRecoilValue } from 'recoil';
import './styles.css';
Expand Down

This file was deleted.

0 comments on commit 34fb53a

Please sign in to comment.