Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/CodeEditor.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,8 @@ export const CodeEditor = forwardRef<CodeEditorRef, CodeEditorProps>(function Co
onEditorBlur={onBlurCallback}
onContentSizeChange={onContentSizeChangeCallback}
decorations={nativeDecorations}
decorationsRevision={decorationsRevision}
// A removed prop clears for the current text, since a revision older than the edit log is ignored.
decorationsRevision={decorations ? decorationsRevision : -1}
onGapLayout={gapsListened.current ? onGapLayoutCallback : undefined}
hybridRef={hybridRef}
/>
Expand Down
8 changes: 8 additions & 0 deletions src/__tests__/CodeEditor.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,14 @@ describe('CodeEditor', () => {
expect(empty.decorationsRevision).toBe(-1);
});

it('clears removed decorations for the current text, whatever decorationsRevision says', async () => {
const decorations: Decoration[] = [{ kind: 'gap', line: 1, rows: 2 }];
const api = await render(<CodeEditor decorations={decorations} decorationsRevision={3} />);
await api.rerender(<CodeEditor decorationsRevision={3} />);
expect(host(api).decorations).toEqual([]);
expect(host(api).decorationsRevision).toBe(-1);
});

it('wires onGapLayout once a handler was set', async () => {
const api = await render(<CodeEditor />);
expect(host(api).onGapLayout).toBeUndefined();
Expand Down
Loading