Skip to content
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

Jump to bottom

FIX: Pressing enter in a child grid did not focus editor on the next row 2024.5 #2656

Merged
merged 3 commits into from
May 13, 2024
Merged

FIX: Pressing enter in a child grid did not focus editor on the next row 2024.5 #2656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba87ca9
Redundant property removed
JindrichSusen May 11, 2024
62492ef
Pressing enter in a child grid did not focus editor on the next row
JindrichSusen May 11, 2024
2d7467f
Imports fixed
JindrichSusen May 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion frontend-html/src/gui/Components/ScreenElements/Editors/DateTimeEditor/DateTimeEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ export class DateTimeEditor extends React.Component<{
onKeyDown?: (event: any) => void;
onMount?(onChange?: (value: any) => void): void;
onEditorBlur?: (event: any) => Promise<void>;
refocuser?: (cb: () => void) => () => void;
subscribeToFocusManager?: (obj: IFocusable, onBlur: ()=> Promise<void>) => void;
className?: string;
}> {
Expand Down
26 changes: 15 additions & 11 deletions frontend-html/src/gui/Components/ScreenElements/Table/Table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@ import { getTableViewProperties } from "model/selectors/TablePanelView/getTableV
import * as React from "react";
import ReactDOM from "react-dom";
import Measure, { BoundingRect } from "react-measure";
import { Canvas } from "./Canvas";
import { HeaderRow } from "./HeaderRow";
import { PositionedField } from "./PositionedField";
import Scrollee from "./Scrollee";
import Scroller from "./Scroller";
import S from "./Table.module.scss";
import { getTooltip, handleTableClick, handleTableMouseMove } from "./TableRendering/onClick";
import { renderTable } from "./TableRendering/renderTable";
import { IClickSubsItem, IMouseOverSubsItem, ITableRow, ITooltipData } from "./TableRendering/types";
import { IGridDimensions, ITableProps } from "./types";
import { Canvas } from "gui/Components/ScreenElements/Table/Canvas";
import { HeaderRow } from "gui/Components/ScreenElements/Table/HeaderRow";
import { PositionedField } from "gui/Components/ScreenElements/Table/PositionedField";
import Scrollee from "gui/Components/ScreenElements/Table/Scrollee";
import Scroller from "gui/Components/ScreenElements/Table/Scroller";
import S from "gui/Components/ScreenElements/Table/Table.module.scss";
import { getTooltip, handleTableClick, handleTableMouseMove } from "gui/Components/ScreenElements/Table/TableRendering/onClick";
import { renderTable } from "gui/Components/ScreenElements/Table/TableRendering/renderTable";
import { IClickSubsItem, IMouseOverSubsItem, ITableRow, ITooltipData } from "gui/Components/ScreenElements/Table/TableRendering/types";
import { IGridDimensions, ITableProps } from "gui/Components/ScreenElements/Table/types";
import { DragDropContext, Droppable } from "react-beautiful-dnd";
import { onColumnOrderChangeFinished } from "model/actions-ui/DataView/TableView/onColumnOrderChangeFinished";
import { getDataView } from "model/selectors/DataView/getDataView";
Expand All @@ -52,6 +52,7 @@ import { getRecordInfo } from "model/selectors/RecordInfo/getRecordInfo";
import { getTablePanelView } from "model/selectors/TablePanelView/getTablePanelView";
import cx from 'classnames';
import { getGridFocusManager } from "model/entities/GridFocusManager";
import { getFormScreen } from "model/selectors/FormScreen/getFormScreen";

function createTableRenderer(ctx: any, gridDimensions: IGridDimensions) {
const groupedColumnSettings = computed(
Expand Down Expand Up @@ -435,7 +436,10 @@ export class RawTable extends React.Component<ITableProps & { isVisible: boolean
}

canFocus(){
return getGridFocusManager(this.context.tablePanelView).canFocusTable;
const formScreen = getFormScreen(this.tablePanelView);
const childBindings = formScreen.rootDataViews[0].childBindings;
const noEditorInChildViewsOpen = childBindings.every(x => x.childDataView.gridFocusManager.canFocusTable)
return getGridFocusManager(this.context.tablePanelView).canFocusTable && noEditorInChildViewsOpen;
}

render() {
Expand Down