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

FEATURE: Increased number of visible rows in combo box to 8, 2023.1 #2127

Merged
merged 2 commits into from Nov 3, 2023
Merged

FEATURE: Increased number of visible rows in combo box to 8, 2023.1 #2127

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
562f528
Increased number of visible rows in combo box to 8
JindrichSusen Nov 2, 2023
039fe31
Specified dropdown height to be 8 rows
JindrichSusen Nov 3, 2023
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
17 changes: 3 additions & 14 deletions frontend-html/src/modules/Editors/DropdownEditor/DropdownEditorBody.tsx
View file
Open in desktop
Expand Up @@ -63,6 +63,7 @@ export function DropdownEditorBody() {
rectCtrl={rectCtrl}
beh={beh}
rowHeight={rowHeight}
height={8 * rowHeight}
/>
</div>
)}
Expand All @@ -77,7 +78,7 @@ export class DropdownEditorTable extends React.Component<{
rectCtrl: BoundingRect,
beh: IDropdownEditorBehavior,
rowHeight: number,
height?: number
height: number
}> {
refMultiGrid = createRef<MultiGrid>();
@observable
Expand All @@ -86,7 +87,6 @@ export class DropdownEditorTable extends React.Component<{
hoveredRowIndex= - 1;
columnCount = 0;
readonly cellPadding = 20;
readonly maxHeight = 150;
disposer: any;

componentDidMount() {
Expand All @@ -97,17 +97,6 @@ export class DropdownEditorTable extends React.Component<{
return this.props.dataTable.rowCount + (this.hasHeader ? 1 : 0);
}

get height(){
if(this.props.height){
return this.props.height;
}
let height = 0;
for (let i = 0; i < this.rowCount; i++) {
height = height + this.props.rowHeight;
}
return Math.min(height, this.maxHeight) + this.scrollbarSize.horiz;
}

constructor(props: any) {
super(props);
this.columnCount = this.props.drivers.driverCount;
Expand Down Expand Up @@ -188,7 +177,7 @@ export class DropdownEditorTable extends React.Component<{
columnWidth={({ index }) => widths[index]}
rowHeight={this.props.rowHeight}
fixedRowCount={this.hasHeader ? 1 : 0}
height={this.height}
height={this.props.height}
width={windowWidth}
cellRenderer={args => this.renderTableCell(args)}
onScroll={this.props.beh.handleScroll}
Expand Down