Merge branch 'main' into main

src/components/tolariaBlockNoteSideMenu.test.tsx

@@ -6,20 +6,14 @@ import { TolariaSideMenu } from './tolariaBlockNoteSideMenu'
 let capturedDragHandleMenu: ComponentType | null = null
 
 vi.mock('@blocknote/react', () => ({
-  AddBlockButton: () => <button type="button">Add block</button>,
   DragHandleMenu: ({ children }: PropsWithChildren) => (
     <div data-testid="drag-handle-menu">{children}</div>
   ),
-  DragHandleButton: ({ dragHandleMenu }: { dragHandleMenu?: ComponentType }) => {
-    capturedDragHandleMenu = dragHandleMenu ?? null
-    return (
-      <button type="button" draggable>
-        Open block menu
-      </button>
-    )
-  },
   RemoveBlockItem: ({ children }: PropsWithChildren) => <div>{children}</div>,
-  SideMenu: ({ children }: PropsWithChildren) => <div data-testid="side-menu">{children}</div>,
+  SideMenu: ({ dragHandleMenu }: { dragHandleMenu?: ComponentType }) => {
+    capturedDragHandleMenu = dragHandleMenu ?? null
+    return <div data-testid="side-menu" />
+  },
   TableColumnHeaderItem: ({ children }: PropsWithChildren) => <div>{children}</div>,
   TableRowHeaderItem: ({ children }: PropsWithChildren) => <div>{children}</div>,
   useDictionary: () => ({
@@ -38,10 +32,6 @@ describe('TolariaSideMenu', () => {
 
     expect(screen.getByTestId('side-menu')).toBeInTheDocument()
     expect(capturedDragHandleMenu).not.toBeNull()
-    expect(screen.getAllByRole('button').map((button) => button.textContent)).toEqual([
-      'Open block menu',
-      'Add block',
-    ])
 
     const DragHandleMenuComponent = capturedDragHandleMenu!
     render(<DragHandleMenuComponent />)

src/components/tolariaBlockNoteSideMenu.tsx

@@ -1,7 +1,5 @@
 import {
-  AddBlockButton,
   DragHandleMenu,
-  DragHandleButton,
   RemoveBlockItem,
   SideMenu,
   TableColumnHeaderItem,
@@ -23,10 +21,5 @@ function TolariaDragHandleMenu() {
 }
 
 export function TolariaSideMenu(props: SideMenuProps) {
-  return (
-    <SideMenu {...props}>
-      <DragHandleButton dragHandleMenu={TolariaDragHandleMenu} />
-      <AddBlockButton />
-    </SideMenu>
-  )
+  return <SideMenu {...props} dragHandleMenu={TolariaDragHandleMenu} />
 }

tests/smoke/editor-block-reorder.spec.ts

@@ -19,11 +19,10 @@ async function blockOuterForText(page: Page, text: string): Promise<Locator> {
   return textNode.locator('xpath=ancestor::*[contains(concat(" ", normalize-space(@class), " "), " bn-block-outer ")][1]')
 }
 
-async function visibleLeftBlockHandle(page: Page, block: Locator): Promise<Locator> {
+async function visibleDragHandle(page: Page, block: Locator): Promise<Locator> {
   await block.hover()
-  const handle = page.locator('.bn-side-menu button').first()
+  const handle = page.locator('.bn-side-menu [draggable="true"]').first()
   await expect(handle).toBeVisible({ timeout: 5_000 })
-  await expect(handle).toHaveAttribute('draggable', 'true')
   return handle
 }
 
@@ -60,7 +59,7 @@ test('dragging the left block handle reorders editor blocks', async ({ page }) =
 
   await expect.poll(async () => editor.textContent()).toMatch(/Alpha Project[\s\S]*This is a test project[\s\S]*Notes/)
 
-  const handle = await visibleLeftBlockHandle(page, notesHeading)
+  const handle = await visibleDragHandle(page, notesHeading)
   await dragHandleToBlock(page, handle, paragraph)
 
   await expect.poll(async () => editor.textContent()).toMatch(/Alpha Project[\s\S]*Notes[\s\S]*This is a test project/)