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: Dropdown height was not limited to 6 lines #134

Merged
merged 1 commit into from Jan 12, 2022
Merged

FIX: Dropdown height was not limited to 6 lines #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
71 changes: 35 additions & 36 deletions frontend-html/src/modules/Editors/DropdownEditor/DropdownEditorBody.tsx
View file
Open in desktop
Expand Up @@ -80,8 +80,9 @@ export class DropdownEditorTable extends React.Component<{
scrollbarSize = { horiz: 0, vert: 0 };
hasHeader: boolean;
hoveredRowIndex= - 1;
width = 0;
columnCount = 0;
readonly cellPadding = 20;
readonly maxHeight = 150;

get rowCount(){
return this.props.dataTable.rowCount + (this.hasHeader ? 1 : 0);
Expand All @@ -92,12 +93,9 @@ export class DropdownEditorTable extends React.Component<{
for (let i = 0; i < this.rowCount; i++) {
height = height + rowHeight;
}
return Math.min(height, 300) + this.scrollbarSize.horiz;
return Math.min(height, this.maxHeight) + this.scrollbarSize.horiz;
}

@observable
widths: Array<number> = [];

constructor(props: any) {
super(props);
this.columnCount = this.props.drivers.driverCount;
Expand All @@ -115,34 +113,6 @@ export class DropdownEditorTable extends React.Component<{
};
}

componentDidMount() {
let columnWidthSum = 0;
for (let columnIndex = 0; columnIndex < this.columnCount; columnIndex++) {
let cellWidth = 100;
for (let rowIndex = 0; rowIndex < this.rowCount - 1; rowIndex++) {
const cellText = this.props.drivers.getDriver(columnIndex).bodyCellDriver.formattedText(rowIndex);
const currentCellWidth = Math.round(getTextWidth(cellText, getCanvasFontSize()));
if(currentCellWidth > cellWidth){
cellWidth = currentCellWidth;
}
}

this.width = this.width + cellWidth;
this.widths.push(cellWidth);
columnWidthSum = columnWidthSum + cellWidth;
if (this.width >= window.innerWidth - 100) {
this.width = window.innerWidth - 100;
break;
}
}

this.width = Math.max(this.width + this.scrollbarSize.vert, this.props.rectCtrl.width!);
let columnGrowFactor = 1;
if (columnWidthSum > 0 && columnWidthSum < this.props.rectCtrl.width!) {
columnGrowFactor = (this.width - this.scrollbarSize.vert) / columnWidthSum;
}
this.widths = this.widths.map((w) => w * columnGrowFactor);
}

renderTableCell({columnIndex, key, parent, rowIndex, style}: GridCellProps) {
const Prov = CtxCell.Provider as any;
Expand Down Expand Up @@ -185,7 +155,36 @@ export class DropdownEditorTable extends React.Component<{
}

render(){
if(this.width === 0){
let columnWidthSum = 0;
let width = 0;
let widths: number[] = [];
for (let columnIndex = 0; columnIndex < this.columnCount; columnIndex++) {
let cellWidth = 100;
for (let rowIndex = 0; rowIndex < this.rowCount - 1; rowIndex++) {
const cellText = this.props.drivers.getDriver(columnIndex).bodyCellDriver.formattedText(rowIndex);
const currentCellWidth = Math.round(getTextWidth(cellText, getCanvasFontSize())) + this.cellPadding;
if(currentCellWidth > cellWidth){
cellWidth = currentCellWidth;
}
}

width = width + cellWidth;
widths.push(cellWidth);
columnWidthSum = columnWidthSum + cellWidth;
if (width >= window.innerWidth - 100) {
width = window.innerWidth - 100;
break;
}
}

width = Math.max(width + this.scrollbarSize.vert, this.props.rectCtrl.width!);
let columnGrowFactor = 1;
if (columnWidthSum > 0 && columnWidthSum < this.props.rectCtrl.width!) {
columnGrowFactor = (width - this.scrollbarSize.vert) / columnWidthSum;
}
widths = widths.map((w) => w * columnGrowFactor);

if(width === 0){
return null;
}

Expand All @@ -199,11 +198,11 @@ export class DropdownEditorTable extends React.Component<{
classNameBottomRightGrid={S.table}
columnCount={this.columnCount}
rowCount={this.rowCount}
columnWidth={({ index }) => this.widths[index]}
columnWidth={({ index }) => widths[index]}
rowHeight={rowHeight}
fixedRowCount={this.hasHeader ? 1 : 0}
height={this.height}
width={this.width}
width={width}
cellRenderer={args => this.renderTableCell(args)}
onScroll={this.props.beh.handleScroll}
/>
Expand Down
2 changes: 1 addition & 1 deletion frontend-html/yarn.lock
View file
Open in desktop
Expand Up @@ -1593,7 +1593,7 @@
mkdirp "^1.0.4"
rimraf "^3.0.2"

"@origam/components@^1.0.0", "@origam/components@^1.4.2":
"@origam/components@^1.0.0":
version "1.4.2"
resolved "https://registry.yarnpkg.com/@origam/components/-/components-1.4.2.tgz#a62adb76fe667b667d69f0790675014fa0d64446"
integrity sha512-Q+xyI7sO9AnEOTXAYFbzvOo5oEFoalYpgMS4uukDI0+ctK90AjsY071ndbk/lmp9OdioBoaZaEd/K07o1TZlyw==
Expand Down