Skip to content

chore: Memoize Floating UI options in TableHandlesController #2222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
matthewlipski wants to merge 2 commits into
base: main
Choose a base branch
from
Open

chore: Memoize Floating UI options in TableHandlesController #2222

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5543c56
Memoized Floating UI options in `TableHandlesController`
matthewlipski Dec 3, 2025
f33f157
Fixed extend button positions not updating when dragging in some cases
matthewlipski Dec 5, 2025
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
254 changes: 142 additions & 112 deletions packages/react/src/components/TableHandles/TableHandlesController.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { FC, useMemo, useState } from "react";
import { offset, size } from "@floating-ui/react";
import { useBlockNoteEditor } from "../../hooks/useBlockNoteEditor.js";
import { useExtensionState } from "../../hooks/useExtension.js";
import { FloatingUIOptions } from "../Popovers/FloatingUIOptions.js";
import {
GenericPopover,
GenericPopoverReference,
Expand Down Expand Up @@ -44,25 +45,20 @@ export const TableHandlesController = <

const state = useExtensionState(TableHandlesExtension);

const references = useMemo<
| {
tableReference: undefined;
cellReference: undefined;
rowReference: undefined;
columnReference: undefined;
}
| {
tableReference: GenericPopoverReference;
cellReference: GenericPopoverReference;
rowReference: GenericPopoverReference;
columnReference: GenericPopoverReference;
}
>(() => {
if (
state === undefined ||
state.rowIndex === undefined ||
state.colIndex === undefined
) {
const references = useMemo<{
tableReference?: GenericPopoverReference;
cellReference?: GenericPopoverReference;
rowReference?: GenericPopoverReference;
columnReference?: GenericPopoverReference;
}>(() => {
const references: {
tableReference?: GenericPopoverReference;
cellReference?: GenericPopoverReference;
rowReference?: GenericPopoverReference;
columnReference?: GenericPopoverReference;
} = {};

if (state === undefined) {
return {};
}

Expand All @@ -84,7 +80,11 @@ export const TableHandlesController = <
return {};
}

const tableReference = { element: tableElement };
references.tableReference = { element: tableElement };

if (state.rowIndex === undefined || state.colIndex === undefined) {
return references;
}

const rowBeforePos = editor.prosemirrorState.doc
.resolve(tableBeforePos + 1)
Expand All @@ -98,9 +98,8 @@ export const TableHandlesController = <
return {};
}

const cellReference = { element: cellElement };

const rowReference = {
references.cellReference = { element: cellElement };
references.rowReference = {
element: tableElement,
getBoundingClientRect: () => {
const tableBoundingRect = tableElement.getBoundingClientRect();
Expand All @@ -117,7 +116,7 @@ export const TableHandlesController = <
);
},
};
const columnReference = {
references.columnReference = {
element: tableElement,
getBoundingClientRect: () => {
const tableBoundingRect = tableElement.getBoundingClientRect();
Expand All @@ -135,14 +134,122 @@ export const TableHandlesController = <
},
};

return {
tableReference,
cellReference,
rowReference,
columnReference,
};
return references;
}, [editor, state]);

const floatingUIOptions = useMemo<
| {
rowTableHandle: FloatingUIOptions;
columnTableHandle: FloatingUIOptions;
tableCellHandle: FloatingUIOptions;
extendRowsButton: FloatingUIOptions;
extendColumnsButton: FloatingUIOptions;
}
| undefined
>(
() =>
state !== undefined
? {
rowTableHandle: {
useFloatingOptions: {
open:
state.show &&
state.rowIndex !== undefined &&
(!onlyShownElement || onlyShownElement === "rowTableHandle"),
placement: "left",
middleware: [offset(-10)],
},
elementProps: {
style: {
zIndex: 10,
},
},
},
columnTableHandle: {
useFloatingOptions: {
open:
state.show &&
state.colIndex !== undefined &&
(!onlyShownElement ||
onlyShownElement === "columnTableHandle"),
placement: "top",
middleware: [offset(-12)],
},
elementProps: {
style: {
zIndex: 10,
},
},
},
tableCellHandle: {
useFloatingOptions: {
open:
state.show &&
state.rowIndex !== undefined &&
state.colIndex !== undefined &&
(!onlyShownElement || onlyShownElement === "tableCellHandle"),
placement: "top-end",
middleware: [offset({ mainAxis: -15, crossAxis: -1 })],
},
elementProps: {
style: {
zIndex: 10,
},
},
},
extendRowsButton: {
useFloatingOptions: {
open:
state.show &&
state.showAddOrRemoveRowsButton &&
(!onlyShownElement ||
onlyShownElement === "extendRowsButton"),
placement: "bottom",
middleware: [
size({
apply({ rects, elements }) {
Object.assign(elements.floating.style, {
width: `${rects.reference.width}px`,
});
},
}),
],
},
elementProps: {
style: {
zIndex: 10,
},
},
},
extendColumnsButton: {
useFloatingOptions: {
open:
state.show &&
state.showAddOrRemoveColumnsButton &&
(!onlyShownElement ||
onlyShownElement === "extendColumnsButton"),
placement: "right",
middleware: [
size({
apply({ rects, elements }) {
Object.assign(elements.floating.style, {
height: `${rects.reference.height}px`,
});
},
}),
],
},
elementProps: {
style: {
zIndex: 10,
},
},
},
}
: undefined,
[onlyShownElement, state],
);

if (!state) {
return null;
}
Expand All @@ -155,19 +262,7 @@ export const TableHandlesController = <
<>
<GenericPopover
reference={references?.rowReference}
useFloatingOptions={{
open:
state.show &&
state.rowIndex !== undefined &&
(!onlyShownElement || onlyShownElement === "rowTableHandle"),
placement: "left",
middleware: [offset(-10)],
}}
elementProps={{
style: {
zIndex: 10,
},
}}
{...floatingUIOptions?.rowTableHandle}
>
{state.show &&
state.rowIndex !== undefined &&
Expand All @@ -182,19 +277,7 @@ export const TableHandlesController = <
</GenericPopover>
<GenericPopover
reference={references?.columnReference}
useFloatingOptions={{
open:
state.show &&
state.colIndex !== undefined &&
(!onlyShownElement || onlyShownElement === "columnTableHandle"),
placement: "top",
middleware: [offset(-12)],
}}
elementProps={{
style: {
zIndex: 10,
},
}}
{...floatingUIOptions?.columnTableHandle}
>
{state.show &&
state.colIndex !== undefined &&
Expand All @@ -209,20 +292,7 @@ export const TableHandlesController = <
</GenericPopover>
<GenericPopover
reference={references?.cellReference}
useFloatingOptions={{
open:
state.show &&
state.rowIndex !== undefined &&
state.colIndex !== undefined &&
(!onlyShownElement || onlyShownElement === "tableCellHandle"),
placement: "top-end",
middleware: [offset({ mainAxis: -15, crossAxis: -1 })],
}}
elementProps={{
style: {
zIndex: 10,
},
}}
{...floatingUIOptions?.tableCellHandle}
>
{state.show &&
state.rowIndex !== undefined &&
Expand All @@ -237,27 +307,7 @@ export const TableHandlesController = <
</GenericPopover>
<GenericPopover
reference={references?.tableReference}
useFloatingOptions={{
open:
state.show &&
state.showAddOrRemoveRowsButton &&
(!onlyShownElement || onlyShownElement === "extendRowsButton"),
placement: "bottom",
middleware: [
size({
apply({ rects, elements }) {
Object.assign(elements.floating.style, {
width: `${rects.reference.width}px`,
});
},
}),
],
}}
elementProps={{
style: {
zIndex: 10,
},
}}
{...floatingUIOptions?.extendRowsButton}
>
{state.show &&
state.showAddOrRemoveRowsButton &&
Expand All @@ -272,27 +322,7 @@ export const TableHandlesController = <
</GenericPopover>
<GenericPopover
reference={references?.tableReference}
useFloatingOptions={{
open:
state.show &&
state.showAddOrRemoveColumnsButton &&
(!onlyShownElement || onlyShownElement === "extendColumnsButton"),
placement: "right",
middleware: [
size({
apply({ rects, elements }) {
Object.assign(elements.floating.style, {
height: `${rects.reference.height}px`,
});
},
}),
],
}}
elementProps={{
style: {
zIndex: 10,
},
}}
{...floatingUIOptions?.extendColumnsButton}
>
{state.show &&
state.showAddOrRemoveColumnsButton &&
Expand Down
Loading