Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

feat(drive): add New menu beside the list header's sort and filter controls (#8023)

teofff68d680719
diff --git a/apps/web/src/features/drive-view/drive-create-menu.test.tsx b/apps/web/src/features/drive-view/drive-create-menu.test.tsx
index 687dee81a0..27a641ea24 100644
--- a/apps/web/src/features/drive-view/drive-create-menu.test.tsx
+++ b/apps/web/src/features/drive-view/drive-create-menu.test.tsx
@@ -94,6 +94,26 @@ it('opens a folder composer inside the current folder', async () => {
});
});
+it('offers the same menu from the list header toolbar', async () => {
+ render(() => <DriveCreateMenu presentation="toolbar" />);
+ const trigger = screen.getByRole('button', {
+ name: 'New file or folder in Wireframes',
+ });
+ expect(trigger.textContent).toContain('New');
+ fireEvent.keyDown(trigger, { key: 'Enter' });
+ const menu = await screen.findByRole('menu');
+ expect(menu.textContent).toContain('Wireframes');
+ fireEvent.keyDown(screen.getByRole('menuitem', { name: 'Document' }), {
+ key: 'Enter',
+ });
+
+ expect(host.runCreateAction).toHaveBeenCalledWith('md', {
+ projectId: 'child',
+ source: 'drive',
+ destination: 'Wireframes',
+ });
+});
+
it('opens a folder composer at the Drive root outside a folder', async () => {
setProjectId(undefined);
render(() => <DriveCreateMenu />);
diff --git a/apps/web/src/features/drive-view/drive-create-menu.tsx b/apps/web/src/features/drive-view/drive-create-menu.tsx
index f4597a372d..bf458d62f7 100644
--- a/apps/web/src/features/drive-view/drive-create-menu.tsx
+++ b/apps/web/src/features/drive-view/drive-create-menu.tsx
@@ -10,20 +10,51 @@ import FolderIcon from '@phosphor/folder.svg';
import PlusIcon from '@phosphor/plus.svg';
import UploadIcon from '@phosphor/upload-simple.svg';
import { Dropdown } from '@ui';
-import { For } from 'solid-js';
+import { For, Show } from 'solid-js';
import { Dynamic } from 'solid-js/web';
import { useDriveView } from './context/drive-context';
import { driveCreateDestinationLabel } from './core/location-label';
+function SidebarTrigger(props: { label: string }) {
+ return (
+ <Dropdown.Trigger as={ViewSidebar.Action} aria-label={props.label}>
+ <ViewSidebar.Icon>
+ <PlusIcon class="size-4" />
+ </ViewSidebar.Icon>
+ <span class="truncate">New</span>
+ <ViewSidebar.Trailing>
+ <CaretDownIcon class="size-3 shrink-0" />
+ </ViewSidebar.Trailing>
+ </Dropdown.Trigger>
+ );
+}
+
+function ToolbarTrigger(props: { label: string }) {
+ return (
+ <Dropdown.Trigger variant="outline" size="md" aria-label={props.label}>
+ <PlusIcon class="size-4" />
+ <span>New</span>
+ <CaretDownIcon class="size-3" />
+ </Dropdown.Trigger>
+ );
+}
+
/** Launcher integration for the current Drive folder. */
-export function DriveCreateMenu() {
+export function DriveCreateMenu(props: {
+ /** `toolbar` is a compact button for the list header's control row. */
+ presentation?: 'sidebar' | 'toolbar';
+}) {
const { state, sidebar, actions } = useDriveView();
const isEnabled = useCreatableEnabled();
+ const isToolbar = () => props.presentation === 'toolbar';
+
const destination = () =>
driveCreateDestinationLabel(state.projectId(), sidebar.folders());
+ const label = () => `New file or folder in ${destination()}`;
+
const options = () =>
CREATABLE_BLOCKS.filter(
(block) =>
@@ -52,19 +83,10 @@ export function DriveCreateMenu() {
};
return (
- <Dropdown placement="bottom-start">
- <Dropdown.Trigger
- as={ViewSidebar.Action}
- aria-label={`New file or folder in ${destination()}`}
- >
- <ViewSidebar.Icon>
- <PlusIcon class="size-4" />
- </ViewSidebar.Icon>
- <span class="truncate">New</span>
- <ViewSidebar.Trailing>
- <CaretDownIcon class="size-3 shrink-0" />
- </ViewSidebar.Trailing>
- </Dropdown.Trigger>
+ <Dropdown placement={isToolbar() ? 'bottom-end' : 'bottom-start'}>
+ <Show when={isToolbar()} fallback={<SidebarTrigger label={label()} />}>
+ <ToolbarTrigger label={label()} />
+ </Show>
<Dropdown.Content class="min-w-48 max-w-72">
<Dropdown.Group>
<Dropdown.GroupLabel class="min-w-0 gap-1.5">
diff --git a/apps/web/src/features/drive-view/views/drive-header.tsx b/apps/web/src/features/drive-view/views/drive-header.tsx
index ed5d65e129..4c4ff63062 100644
--- a/apps/web/src/features/drive-view/views/drive-header.tsx
+++ b/apps/web/src/features/drive-view/views/drive-header.tsx
@@ -101,6 +101,9 @@ export function DriveHeader() {
<DriveFilterMenu />
</Suspense>
</Show>
+ <div class="shrink-0 @max-[720px]/view-shell:hidden">
+ <DriveCreateMenu presentation="toolbar" />
+ </div>
</div>
</div>
</>
diff --git a/docs/AGENT_GUIDE/navigation.md b/docs/AGENT_GUIDE/navigation.md
index d77f72ca63..0625bb7748 100644
--- a/docs/AGENT_GUIDE/navigation.md
+++ b/docs/AGENT_GUIDE/navigation.md
@@ -213,7 +213,8 @@ headings. Tags and folders have a separate disclosure button on the **right** of
the row: clicking the label selects the destination; clicking Expand/Collapse
only opens or closes its children. Selecting a Drive folder or tab closes an
inline detail into that destination; it does not navigate back to Drive's root.
-Drive's **New** menu (sidebar, or the header in narrow layouts) is headed
+Drive's **New** menu (in the sidebar and after the header's Sort and Filter
+buttons; beside the title in narrow layouts) is headed
**Create in &lt;folder&gt;** and creates everything in the open folder; on a tab or
the Drive root it reads **Create in Drive**. **Folder** opens a **New folder**
dialog with `Untitled folder` preselected; creating keeps Drive where it is, adds