Skip to content

Commit 7783abd

Browse files
committed
fix: small issues with table extend button logic
1 parent 00483ea commit 7783abd

File tree

1 file changed

+15
-9
lines changed

1 file changed

+15
-9
lines changed

packages/core/src/extensions/TableHandles/TableHandlesPlugin.ts

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -83,15 +83,18 @@ function domCellAround(target: Element) {
8383
currentTarget.nodeName !== "TH" &&
8484
!currentTarget.classList.contains("tableWrapper")
8585
) {
86-
currentTarget =
87-
currentTarget.classList && currentTarget.classList.contains("ProseMirror")
88-
? undefined
89-
: (currentTarget.parentNode as Element);
90-
}
91-
if (!currentTarget) {
92-
return undefined;
86+
if (currentTarget.classList.contains("ProseMirror")) {
87+
return undefined;
88+
}
89+
const parent: ParentNode | null = currentTarget.parentNode;
90+
91+
if (!parent || !(parent instanceof Element)) {
92+
return undefined;
93+
}
94+
currentTarget = parent;
9395
}
94-
return currentTarget?.nodeName === "TD" || currentTarget?.nodeName === "TH"
96+
97+
return currentTarget.nodeName === "TD" || currentTarget.nodeName === "TH"
9598
? {
9699
type: "cell",
97100
domNode: currentTarget,
@@ -177,7 +180,10 @@ export class TableHandlesView<
177180
return;
178181
}
179182

180-
if (!(event.target instanceof Element)) {
183+
if (
184+
!(event.target instanceof Element) ||
185+
!this.pmView.dom.contains(event.target)
186+
) {
181187
return;
182188
}
183189

0 commit comments

Comments
 (0)