Preserve focus inside grid editors
This commit is contained in:
@@ -27,6 +27,7 @@ import {
|
||||
deviceFieldKeys,
|
||||
formatPhaseTypeLabel,
|
||||
formatValue,
|
||||
isGridEditorControlTarget,
|
||||
} from "../utils/circuit-grid-model";
|
||||
import {
|
||||
buildCircuitDeviceRowInsertSnapshot,
|
||||
@@ -3398,6 +3399,9 @@ export function CircuitTreeEditor(props: { projectId: string; circuitListId: str
|
||||
setCircuitReorderIntent(null);
|
||||
}}
|
||||
onClick={(event) => {
|
||||
if (isGridEditorControlTarget(event.target)) {
|
||||
return;
|
||||
}
|
||||
if (cell.editable) {
|
||||
handleRowSelectionClick(row, column.key, {
|
||||
ctrlKey: event.ctrlKey,
|
||||
@@ -3406,7 +3410,10 @@ export function CircuitTreeEditor(props: { projectId: string; circuitListId: str
|
||||
});
|
||||
}
|
||||
}}
|
||||
onDoubleClick={() => {
|
||||
onDoubleClick={(event) => {
|
||||
if (isGridEditorControlTarget(event.target)) {
|
||||
return;
|
||||
}
|
||||
if (cell.editable) {
|
||||
startEdit({ rowKey: row.rowKey, cellKey: column.key }, "selectExisting");
|
||||
}
|
||||
|
||||
@@ -230,6 +230,18 @@ export function formatPhaseTypeLabel(value: string): string {
|
||||
return value;
|
||||
}
|
||||
|
||||
export function isGridEditorControlTarget(target: unknown): boolean {
|
||||
if (
|
||||
target === null ||
|
||||
typeof target !== "object" ||
|
||||
!("closest" in target) ||
|
||||
typeof target.closest !== "function"
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
return Boolean(target.closest("input, select, textarea"));
|
||||
}
|
||||
|
||||
export function parseNumeric(cellKey: CellKey, draft: string): number | undefined {
|
||||
const trimmed = draft.trim();
|
||||
if (trimmed === "") {
|
||||
|
||||
Reference in New Issue
Block a user