Skip to content

Commit 8e30789

Browse files
authored
fix: Exception when selecting text on destroyed component (#285)
Fixes anomalyco/opencode#4099.
1 parent c480996 commit 8e30789

3 files changed

Lines changed: 51 additions & 1 deletion

File tree

‎packages/core/src/lib/selection.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ export class Selection {
122122
}
123123
return a.x - b.x
124124
})
125+
.filter((renderable) => !renderable.isDestroyed)
125126
.map((renderable) => renderable.getSelectedText())
126127
.filter((text) => text)
127128
return selectedTexts.join("\n")

‎packages/core/src/renderer.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1672,7 +1672,7 @@ export class CliRenderer extends EventEmitter implements RenderContext {
16721672
)
16731673

16741674
for (const renderable of this.currentSelection.touchedRenderables) {
1675-
if (!touchedRenderables.includes(renderable)) {
1675+
if (!touchedRenderables.includes(renderable) && !renderable.isDestroyed) {
16761676
renderable.onSelectionChanged(null)
16771677
}
16781678
}
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
import { test, expect, beforeEach, afterEach } from "bun:test"
2+
import { createTestRenderer, type TestRenderer } from "../testing/test-renderer"
3+
import { TextRenderable } from "../renderables/Text"
4+
5+
let renderer: TestRenderer
6+
let renderOnce: () => void
7+
8+
beforeEach(async () => {
9+
;({ renderer, renderOnce } = await createTestRenderer({}))
10+
})
11+
12+
afterEach(() => {
13+
renderer.destroy()
14+
})
15+
16+
test("selection on destroyed renderable should not throw", () => {
17+
const text = new TextRenderable(renderer, {
18+
content: "Hello World",
19+
width: 20,
20+
height: 1,
21+
})
22+
23+
renderer.root.add(text)
24+
renderOnce()
25+
26+
// Start selection
27+
renderer.startSelection(text, 0, 0)
28+
29+
// Update selection - this should not throw
30+
renderer.updateSelection(text, 5, 1)
31+
32+
expect(renderer.getSelection()).not.toBeNull()
33+
34+
// Destroy the text renderable
35+
text.destroy()
36+
37+
expect(text.isDestroyed).toBe(true)
38+
39+
// Get selection - this should not throw
40+
expect(renderer.getSelection()!.getSelectedText()).toBe("")
41+
42+
// Update selection - this should not throw
43+
renderer.updateSelection(text, 8, 1)
44+
45+
// Clear selection - this should not throw
46+
renderer.clearSelection()
47+
48+
expect(renderer.getSelection()).toBeNull()
49+
})

0 commit comments

Comments
 (0)