feat(electron): finish canvas-first shell chrome #6
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,233 @@ | ||
| /** | ||
| * @vitest-environment jsdom | ||
| */ | ||
|
|
||
| import { fireEvent, render, screen } from '@testing-library/react' | ||
| import React from 'react' | ||
| import { describe, beforeEach, expect, it, vi } from 'vitest' | ||
| import * as Y from 'yjs' | ||
| import { DatabaseView } from './DatabaseView' | ||
|
|
||
| const mockUpdate = vi.fn() | ||
| const mockCreate = vi.fn() | ||
|
|
||
| const mockUseNode = vi.fn() | ||
| const mockUseIdentity = vi.fn() | ||
| const mockUseMutate = vi.fn() | ||
| const mockUseQuery = vi.fn() | ||
| const mockUseDatabaseComments = vi.fn() | ||
|
|
||
| vi.mock('@xnetjs/data', () => ({ | ||
| DatabaseSchema: { | ||
| schema: { | ||
| '@id': 'xnet://schema/database' | ||
| } | ||
| }, | ||
| decodeAnchor: vi.fn(() => ({})), | ||
| buildDatabaseSchema: vi.fn((docId: string) => ({ | ||
| '@id': `xnet://schema/${docId}` | ||
| })), | ||
| createInitialSchemaMetadata: vi.fn((name: string) => ({ | ||
| version: 1, | ||
| name, | ||
| createdAt: 0, | ||
| updatedAt: 0, | ||
| history: [] | ||
| })), | ||
| bumpSchemaVersion: vi.fn((metadata: { version: number }) => ({ | ||
| ...metadata, | ||
| version: metadata.version + 1 | ||
| })), | ||
| getVersionBumpType: vi.fn(() => 'minor'), | ||
| cloneSchema: vi.fn((columns: unknown[]) => columns), | ||
| createVersionEntry: vi.fn(() => ({ | ||
| version: 1, | ||
| timestamp: 0, | ||
| changes: [] | ||
| })), | ||
| pruneVersionHistory: vi.fn((history: unknown[]) => history) | ||
| })) | ||
|
|
||
| vi.mock('@xnetjs/react', () => ({ | ||
| useNode: (...args: unknown[]) => mockUseNode(...args), | ||
| useIdentity: (...args: unknown[]) => mockUseIdentity(...args), | ||
| useMutate: (...args: unknown[]) => mockUseMutate(...args), | ||
| useQuery: (...args: unknown[]) => mockUseQuery(...args) | ||
| })) | ||
|
|
||
| vi.mock('@xnetjs/views', () => ({ | ||
| TableView: () => <div data-testid="table-view">table view</div>, | ||
| BoardView: () => <div data-testid="board-view">board view</div>, | ||
| CardDetailModal: () => null, | ||
| AddColumnModal: () => null, | ||
| SchemaInfoModal: () => null, | ||
| CloneSchemaModal: () => null, | ||
| useDatabaseComments: (...args: unknown[]) => mockUseDatabaseComments(...args) | ||
| })) | ||
|
|
||
| vi.mock('@xnetjs/ui', async () => { | ||
| const ReactModule = await import('react') | ||
|
|
||
| function Menu({ | ||
| trigger, | ||
| children | ||
| }: { | ||
| trigger: React.ReactNode | ||
| children: React.ReactNode | ||
| }): React.ReactElement { | ||
| const [open, setOpen] = ReactModule.useState(false) | ||
|
|
||
| if (!ReactModule.isValidElement(trigger)) { | ||
| return <div>{children}</div> | ||
| } | ||
|
|
||
| return ( | ||
| <div> | ||
| {ReactModule.cloneElement(trigger, { | ||
| onClick: () => setOpen((prev) => !prev) | ||
| })} | ||
| {open ? <div data-testid="mock-menu">{children}</div> : null} | ||
| </div> | ||
| ) | ||
| } | ||
|
|
||
| return { | ||
| CommentPopover: () => null, | ||
| CommentsSidebar: ({ open }: { open: boolean }) => ( | ||
| <div data-testid="comments-sidebar">{open ? 'open' : 'closed'}</div> | ||
| ), | ||
| Menu, | ||
| MenuItem: ({ children, onSelect }: { children: React.ReactNode; onSelect?: () => void }) => ( | ||
| <button type="button" onClick={onSelect}> | ||
| {children} | ||
| </button> | ||
| ), | ||
| MenuLabel: ({ children }: { children: React.ReactNode }) => <div>{children}</div>, | ||
| MenuSeparator: () => <hr /> | ||
| } | ||
| }) | ||
|
|
||
| vi.mock('./ShareButton', () => ({ | ||
| ShareButton: ({ docId }: { docId: string }) => ( | ||
| <button type="button" data-testid="share-button"> | ||
| Share {docId} | ||
| </button> | ||
| ) | ||
| })) | ||
|
|
||
| vi.mock('./PresenceAvatars', () => ({ | ||
| PresenceAvatars: () => <div data-testid="presence-avatars">presence</div> | ||
| })) | ||
|
|
||
| function createAwarenessMock() { | ||
| return { | ||
| clientID: 1, | ||
| getStates: () => new Map<number, Record<string, unknown>>(), | ||
| setLocalStateField: vi.fn(), | ||
| on: vi.fn(), | ||
| off: vi.fn() | ||
| } | ||
| } | ||
|
|
||
| function createDatabaseDoc(): Y.Doc { | ||
| const doc = new Y.Doc() | ||
| const dataMap = doc.getMap('data') | ||
|
|
||
| dataMap.set('columns', [ | ||
| { | ||
| id: 'title', | ||
| name: 'Title', | ||
| type: 'text' | ||
| }, | ||
| { | ||
| id: 'status', | ||
| name: 'Status', | ||
| type: 'select', | ||
| options: ['Todo', 'Done'] | ||
| } | ||
| ]) | ||
| dataMap.set('rows', [ | ||
| { | ||
| id: 'row-1', | ||
| values: { | ||
| title: 'First row', | ||
| status: 'Todo' | ||
| } | ||
| } | ||
| ]) | ||
| dataMap.set('schema', { | ||
| version: 1, | ||
| name: 'Focus DB', | ||
| createdAt: 0, | ||
| updatedAt: 0, | ||
| history: [] | ||
| }) | ||
|
|
||
| return doc | ||
| } | ||
|
|
||
| describe('DatabaseView minimal chrome', () => { | ||
| beforeEach(() => { | ||
| mockUpdate.mockReset() | ||
| mockCreate.mockReset() | ||
|
|
||
| mockUseIdentity.mockReturnValue({ did: 'did:xnet:test' }) | ||
| mockUseMutate.mockReturnValue({ create: mockCreate }) | ||
| mockUseQuery.mockReturnValue({ data: [] }) | ||
| mockUseDatabaseComments.mockReturnValue({ | ||
| threads: [], | ||
| cellCommentCounts: new Map(), | ||
| unresolvedCount: 2, | ||
| commentOnCell: vi.fn(), | ||
| getThreadsForCell: vi.fn(() => []), | ||
| replyTo: vi.fn(), | ||
| resolveThread: vi.fn(), | ||
| reopenThread: vi.fn(), | ||
| deleteComment: vi.fn(), | ||
| editComment: vi.fn() | ||
| }) | ||
| mockUseNode.mockReturnValue({ | ||
| data: { title: 'Focus DB' }, | ||
| doc: createDatabaseDoc(), | ||
| loading: false, | ||
| update: mockUpdate, | ||
| presence: [{ did: 'did:xnet:peer', color: '#22c55e' }], | ||
| awareness: createAwarenessMock() | ||
| }) | ||
| }) | ||
|
|
||
| it('renders the compact focus controls and moves sharing into the overflow menu', async () => { | ||
| render(<DatabaseView docId="db-1" minimalChrome />) | ||
|
|
||
| expect(await screen.findByDisplayValue('Focus DB')).toBeTruthy() | ||
| expect(screen.getByTestId('presence-avatars')).toBeTruthy() | ||
| expect(screen.getByRole('button', { name: /add row/i })).toBeTruthy() | ||
| expect(screen.getByRole('button', { name: /comments/i })).toBeTruthy() | ||
| expect(screen.getByRole('button', { name: /open database actions/i })).toBeTruthy() | ||
| expect(screen.queryByTestId('share-button')).toBeNull() | ||
|
|
||
| fireEvent.click(screen.getByRole('button', { name: /open database actions/i })) | ||
|
|
||
| expect(screen.getByText('Schema info')).toBeTruthy() | ||
| expect(screen.getByText('Clone schema')).toBeTruthy() | ||
| expect(screen.getByTestId('share-button')).toBeTruthy() | ||
| }) | ||
|
|
||
| it('keeps comments accessible from the compact toolbar', async () => { | ||
| render(<DatabaseView docId="db-1" minimalChrome />) | ||
|
|
||
| expect((await screen.findByTestId('comments-sidebar')).textContent).toContain('closed') | ||
|
|
||
| fireEvent.click(screen.getByRole('button', { name: /comments/i })) | ||
|
|
||
| expect(screen.getByTestId('comments-sidebar').textContent).toContain('open') | ||
| }) | ||
|
|
||
| it('preserves the richer header outside focused mode', async () => { | ||
| render(<DatabaseView docId="db-1" />) | ||
|
|
||
| expect(await screen.findByDisplayValue('Focus DB')).toBeTruthy() | ||
| expect(screen.getByTestId('share-button')).toBeTruthy() | ||
| expect(screen.queryByRole('button', { name: /open database actions/i })).toBeNull() | ||
| }) | ||
| }) |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Type mismatch will crash at runtime for
'canvas'-type documentsdocumentis typed asLinkedDocumentItem, whosetypefield isLinkedDocType = 'page' | 'database' | 'canvas'.getLinkedDocumentPlacementwas purposefully declared withtype: Exclude<LinkedDocType, 'canvas'>(i.e.'page' | 'database'), so TypeScript should already flag this line as a type error.More critically, if
addLinkedDocumentNodeis ever called with a document whosetype === 'canvas',LINKED_DOCUMENT_SIZES['canvas']returnsundefined, and the subsequentsize.widthaccess will throw aTypeErrorat runtime.A straightforward fix is to guard against the
'canvas'case before the call:Or more safely, add an explicit guard: