-
Notifications
You must be signed in to change notification settings - Fork 10.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(editor): Fix Code node bug erasing and overwriting code when swit…
…ching between nodes (#12637) Co-authored-by: Elias Meire <[email protected]>
- Loading branch information
1 parent
0b0f532
commit 02d953d
Showing
4 changed files
with
143 additions
and
5 deletions.
There are no files selected for viewing
This file contains 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
103 changes: 103 additions & 0 deletions
103
packages/editor-ui/src/composables/useCodeEditor.test.ts
This file contains 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,103 @@ | ||
import { renderComponent } from '@/__tests__/render'; | ||
import { EditorView } from '@codemirror/view'; | ||
import { createTestingPinia } from '@pinia/testing'; | ||
import { waitFor } from '@testing-library/vue'; | ||
import { setActivePinia } from 'pinia'; | ||
import { beforeEach, describe, vi } from 'vitest'; | ||
import { defineComponent, h, ref, toValue } from 'vue'; | ||
import { useCodeEditor } from './useCodeEditor'; | ||
import userEvent from '@testing-library/user-event'; | ||
|
||
describe('useCodeEditor', () => { | ||
const defaultOptions: Omit<Parameters<typeof useCodeEditor>[0], 'editorRef'> = { | ||
language: 'javaScript', | ||
}; | ||
|
||
const renderCodeEditor = async (options: Partial<typeof defaultOptions> = defaultOptions) => { | ||
let codeEditor!: ReturnType<typeof useCodeEditor>; | ||
const renderResult = renderComponent( | ||
defineComponent({ | ||
setup() { | ||
const root = ref<HTMLElement>(); | ||
codeEditor = useCodeEditor({ ...defaultOptions, ...options, editorRef: root }); | ||
|
||
return () => h('div', { ref: root, 'data-test-id': 'editor-root' }); | ||
}, | ||
}), | ||
{ props: { options } }, | ||
); | ||
expect(renderResult.getByTestId('editor-root')).toBeInTheDocument(); | ||
await waitFor(() => toValue(codeEditor.editor)); | ||
return { renderResult, codeEditor }; | ||
}; | ||
|
||
beforeEach(() => { | ||
setActivePinia(createTestingPinia()); | ||
}); | ||
|
||
afterEach(() => { | ||
vi.clearAllMocks(); | ||
vi.useRealTimers(); | ||
}); | ||
|
||
it('should create an editor', async () => { | ||
const { codeEditor } = await renderCodeEditor(); | ||
|
||
await waitFor(() => expect(toValue(codeEditor.editor)).toBeInstanceOf(EditorView)); | ||
}); | ||
|
||
it('should focus editor', async () => { | ||
const { renderResult, codeEditor } = await renderCodeEditor({}); | ||
|
||
const root = renderResult.getByTestId('editor-root'); | ||
const input = root.querySelector('.cm-line') as HTMLDivElement; | ||
|
||
await userEvent.click(input); | ||
|
||
expect(codeEditor.editor.value?.hasFocus).toBe(true); | ||
}); | ||
|
||
it('should emit changes', async () => { | ||
vi.useFakeTimers(); | ||
|
||
const user = userEvent.setup({ | ||
advanceTimers: vi.advanceTimersByTime, | ||
}); | ||
|
||
const onChange = vi.fn(); | ||
const { renderResult } = await renderCodeEditor({ | ||
onChange, | ||
}); | ||
|
||
const root = renderResult.getByTestId('editor-root'); | ||
const input = root.querySelector('.cm-line') as HTMLDivElement; | ||
|
||
await user.type(input, 'test'); | ||
|
||
vi.advanceTimersByTime(300); | ||
|
||
expect(onChange.mock.calls[0][0].state.doc.toString()).toEqual('test'); | ||
}); | ||
|
||
it('should emit debounced changes before unmount', async () => { | ||
vi.useFakeTimers(); | ||
|
||
const user = userEvent.setup({ | ||
advanceTimers: vi.advanceTimersByTime, | ||
}); | ||
|
||
const onChange = vi.fn(); | ||
const { renderResult } = await renderCodeEditor({ | ||
onChange, | ||
}); | ||
|
||
const root = renderResult.getByTestId('editor-root'); | ||
const input = root.querySelector('.cm-line') as HTMLDivElement; | ||
|
||
await user.type(input, 'test'); | ||
|
||
renderResult.unmount(); | ||
|
||
expect(onChange.mock.calls[0][0].state.doc.toString()).toEqual('test'); | ||
}); | ||
}); |
This file contains 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 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 |
---|---|---|
@@ -1,14 +1,19 @@ | ||
import { Annotation } from '@codemirror/state'; | ||
import type { EditorView } from '@codemirror/view'; | ||
|
||
export const ignoreUpdateAnnotation = Annotation.define<boolean>(); | ||
|
||
/** | ||
* Simulate user action to force parser to catch up during scroll. | ||
*/ | ||
export function forceParse(view: EditorView) { | ||
view.dispatch({ | ||
changes: { from: view.viewport.to, insert: '_' }, | ||
annotations: [ignoreUpdateAnnotation.of(true)], | ||
}); | ||
|
||
view.dispatch({ | ||
changes: { from: view.viewport.to - 1, to: view.viewport.to, insert: '' }, | ||
annotations: [ignoreUpdateAnnotation.of(true)], | ||
}); | ||
} |