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.

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

perf: large data with tree grid #1916

Merged
merged 4 commits into from
May 23, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
5 changes: 3 additions & 2 deletions packages/toast-ui.grid/cypress/integration/tree.spec.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import { RowKey, CellValue } from '@t/store/data';
import { CellValue, RowKey } from '@t/store/data';
import { OptColumn, OptGrid, OptRow } from '@t/options';
import GridEvent from '@/event/gridEvent';
import { CellRenderer, CellRendererProps } from '@t/renderer';
import { cls } from '../../src/helper/dom';
import {
assertGridHasRightRowNumber,
assertModifiedRowsLength,
assertToggleButtonCollapsed,
assertToggleButtonExpanded,
assertModifiedRowsLength,
} from '../helper/assert';
import { dragAndDropColumn, dragAndDropRow } from '../helper/util';

Expand Down Expand Up @@ -478,6 +478,7 @@ describe('appendTreeRow()', () => {
it('specific parent that internal type.', () => {
cy.gridInstance().invoke('appendTreeRow', appendedData, { parentRowKey: 0 });
cy.gridInstance().invoke('expand', 0, true);
cy.gridInstance().invoke('expand', 5, true);

cy.getCell(5, 'c1').should('have.text', 'a');
cy.getCell(6, 'c1').should('have.text', 'b');
Expand Down
33 changes: 20 additions & 13 deletions packages/toast-ui.grid/src/dispatch/tree.ts
Original file line number Diff line number Diff line change
@@ -1,43 +1,49 @@
import { Row, RowKey } from '@t/store/data';
import { Store } from '@t/store';
import { OptRow, OptAppendTreeRow, OptMoveRow } from '@t/options';
import { OptAppendTreeRow, OptMoveRow, OptRow } from '@t/options';
import { Column, ColumnInfo } from '@t/store/column';
import { ColumnCoords } from '@t/store/columnCoords';
import { Dimension } from '@t/store/dimension';
import { createViewRow } from '../store/data';
import {
getRowHeight,
findIndexByRowKey,
findRowByRowKey,
getLoadingState,
isSorted,
getRowHeight,
isFiltered,
isSorted,
} from '../query/data';
import { notify, batchObserver, getOriginObject, Observable } from '../helper/observable';
import {
batchObserver,
getOriginObject,
notify,
Observable,
unobservable,
} from '../helper/observable';
import { getDataManager } from '../instance';
import {
isUpdatableRowAttr,
setLoadingState,
updateRowNumber,
setCheckedAllRows,
setLoadingState,
uncheck,
updateRowNumber,
} from './data';
import {
getParentRow,
getChildRowKeys,
getDepth,
getDescendantRows,
getParentRow,
getStartIndexToAppendRow,
traverseAncestorRows,
traverseDescendantRows,
getChildRowKeys,
isLeaf,
isExpanded,
isLeaf,
isRootChildRow,
getDepth,
traverseAncestorRows,
traverseDescendantRows,
} from '../query/tree';
import { getEventBus } from '../event/eventBus';
import GridEvent from '../event/gridEvent';
import { flattenTreeData, getTreeIndentWidth } from '../store/helper/tree';
import { findProp, findPropIndex, removeArrayItem, some, silentSplice } from '../helper/common';
import { findProp, findPropIndex, removeArrayItem, silentSplice, some } from '../helper/common';
import { cls, getTextWidth } from '../helper/dom';
import { fillMissingColumnData } from './lazyObservable';
import { getColumnSide } from '../query/column';
Expand Down Expand Up @@ -218,6 +224,7 @@ function collapse(store: Store, row: Row, recursive?: boolean) {
}

changeHiddenAttr(childRow, true);
unobservable(childRow._attributes.tree!, ['hidden']);

if (!isLeaf(childRow)) {
if (recursive) {
Expand Down
18 changes: 16 additions & 2 deletions packages/toast-ui.grid/src/helper/observable.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Dictionary } from '@t/options';
import { hasOwnProp, isObject, forEachObject, last, isEmpty, isFunction, isNull } from './common';
import { forEachObject, hasOwnProp, isEmpty, isFunction, isNull, isObject, last } from './common';
import { patchArrayMethods } from './array';

type BooleanSet = Dictionary<boolean>;
Expand Down Expand Up @@ -184,6 +184,20 @@ export function partialObservable<T extends Dictionary<any>>(obj: T, key: string
makeObservableData(obj, obj, key, storage, propObserverIdSetMap);
}

export function unobservable<T extends Dictionary<any>>(obj: T, keys: Array<keyof T> = []) {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

์ด ํ•จ์ˆ˜๊ฐ€ ํ•˜๋Š” ์—ญํ• ์ด ๊ธฐ์กด ๊ฐ์ฒด๋ฅผ getOriginObject๋ฅผ ํ˜ธ์ถœํ•ด์„œ ๋ฐ˜ํ™˜๋œ ์ผ๋ฐ˜ ๊ฐ์ฒด์™€ ์–ด๋–ป๊ฒŒ ๋‹ค๋ฅด์ฃ ?

์ฒ˜์Œ์—๋Š” ์ฃผ์–ด์ง„ ํ‚ค๋งŒ observable์„ ํ•ด์ œํ•œ๋‹ค๊ณ  ์ดํ•ดํ•  ์ˆ˜๋Š” ์žˆ๊ฒ ๋Š”๋ฐ, obj.__storage__๊นŒ์ง€ ํ†ต์œผ๋กœ ๋‚ ๋ฆฌ๋ฉด ๋ฌธ์ œ๊ฐ€ ์—†๋‚˜์š”?

์œ„์˜ ์˜๋ฌธ์ด ๋“ค๋‹ค ๋ณด๋‹ˆ ์ด ํ•จ์ˆ˜๋Š” ๋™์ž‘์ด ๋ถ€์ •ํ™•ํ•ด๋ณด์ž…๋‹ˆ๋‹ค. ํ•ด๋‹น ์†์„ฑ์„ observerInfoMap์—์„œ ์ œ๊ฑฐํ•˜๋Š” ๋™์ž‘์ด ๋ณด์ด์ง€ ์•Š๊ธฐ ๋•Œ๋ฌธ์ž…๋‹ˆ๋‹ค. ๊ทธ๋Ÿฌ๋ฉด ์ ์  ๋ถˆํ•„์š”ํ•œ ๋ฉ”๋ชจ๋ฆฌ ๋‚ญ๋น„๊ฐ€ ๋ฐœ์ƒํ•  ์ˆ˜ ์žˆ์Šต๋‹ˆ๋‹ค.

๋งŒ์•ฝ getOriginObject๋ฅผ ํ™œ์šฉํ•˜๋Š” ๋ฐฉ์‹์œผ๋กœ ๋Œ€์ฒดํ•  ์ˆ˜ ์žˆ์„์ง€ ์•„๋‹ˆ๋ฉด observe ํ•จ์ˆ˜๋ฅผ ํ˜ธ์ถœํ•˜๊ณ  ๋ฆฌํ„ด๋˜๋Š” unobserve ํ•จ์ˆ˜ ๋“ฑ์„ ํ™œ์šฉํ•  ๋ฐฉ๋ฒ•์€ ์—†์„์ง€ ๊ถ๊ธˆํ•˜๋„ค์š”.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getOriginObject๋ฅผ ์‚ฌ์šฉํ•˜๋„๋ก ๋ณ€๊ฒฝํ–ˆ์Šต๋‹ˆ๋‹ค.
๊ทธ๋ฆฌ๊ณ  __storage__๋ฅผ ์‚ญ์ œํ•˜์ง€ ์•Š๋„๋ก ์ˆ˜์ •ํ•ด์„œ obj๋ฅผ ๋‹ค์‹œ observable๋กœ ๋ณ€๊ฒฝํ•˜์ง€ ์•Š์œผ๋ฏ€๋กœ observerInfoMap์— ๋ถˆํ•„์š”ํ•œ ๋ฐ์ดํ„ฐ๊ฐ€ ์ถ•์ ๋˜์ง€ ์•Š์Šต๋‹ˆ๋‹ค. ๋‹จ์ง€ obj์— ์ฃผ์–ด์ง„ ์†์„ฑ๋งŒ unobservable๋กœ ๋ณ€๊ฒฝํ•˜๋Š” ์ •ํ™•ํ•œ ๋™์ž‘์„ ์ˆ˜ํ–‰ํ•˜๋Š” ํ•จ์ˆ˜๋กœ ๋Œ€์ฒด ํ–ˆ์Šต๋‹ˆ๋‹ค.

if (isObservable(obj)) {
keys.forEach((key) => {
const value = obj[key];

delete obj[key];

obj[key] = value;
});

delete obj.__storage__;
}
}

export function observable<T extends Dictionary<any>>(obj: T, sync = false): Observable<T> {
if (Array.isArray(obj)) {
throw new Error('Array object cannot be Reactive');
Expand All @@ -198,7 +212,7 @@ export function observable<T extends Dictionary<any>>(obj: T, sync = false): Obs
const resultObj = {} as T;

Object.defineProperties(resultObj, {
__storage__: { value: storage },
__storage__: { value: storage, configurable: true },
__propObserverIdSetMap__: { value: propObserverIdSetMap },
});

Expand Down
9 changes: 6 additions & 3 deletions packages/toast-ui.grid/src/view/bodyRow.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { h, Component } from 'preact';
import { ViewRow, RowKey } from '@t/store/data';
import { Component, h } from 'preact';
import { RowKey, ViewRow } from '@t/store/data';
import { ColumnInfo } from '@t/store/column';
import { connect } from './hoc';
import { cls } from '../helper/dom';
Expand All @@ -12,6 +12,7 @@ interface OwnProps {
rowIndex: number;
viewRow: ViewRow;
columns: ColumnInfo[];
isVisible: boolean;
}

interface StoreProps {
Expand Down Expand Up @@ -52,11 +53,13 @@ class BodyRowComp extends Component<Props> {
autoRowHeight,
hoveredRowKey,
focusedRowKey,
isVisible,
}: Props) {
const isOddRow = rowIndex % 2 === 0;

return (
rowHeight > 0 && (
rowHeight > 0 &&
isVisible && (
<tr
style={{
height: rowHeight,
Expand Down
30 changes: 26 additions & 4 deletions packages/toast-ui.grid/src/view/bodyRows.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { h, Component } from 'preact';
import { Component, h } from 'preact';
import { Side } from '@t/store/focus';
import { ViewRow } from '@t/store/data';
import { Row, RowKey, ViewRow } from '@t/store/data';
import { ColumnInfo } from '@t/store/column';
import { BodyRow } from './bodyRow';
import { BodyDummyRow } from './bodyDummyRow';
import { shallowEqual, range } from '../helper/common';
import { range, shallowEqual } from '../helper/common';
import { connect } from './hoc';
import { DispatchProps } from '../dispatch/create';

Expand All @@ -13,21 +13,40 @@ interface OwnProps {
}

interface StoreProps {
rawData: Row[];
rows: ViewRow[];
rowIndexOffset: number;
columns: ColumnInfo[];
dummyRowCount: number;
hasTreeColumn: boolean;
}

type Props = OwnProps & StoreProps & DispatchProps;

class BodyRowsComp extends Component<Props> {
private getVisibleStateOfRows({ rawData, rows }: Pick<Props, 'rows' | 'rawData'>) {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

์ด ๋กœ์ง์„ ๋ทฐ ๋ ˆ์ด์–ด์—์„œ ํ™•์ธํ•˜๋Š”๊ฒŒ ์•„๋‹ˆ๋ผ collapse๋ฅผ dispatchํ•  ๋•Œ ํ•ด๋‹น Row๊ฐ€ ๋ณด์—ฌ๋„ ๋˜๋Š”์ง€ ์ˆจ๊ฒจ์•ผ ๋˜๋Š”์ง€๋ฅผ ๋ฏธ๋ฆฌ ๊ฐ€์ง€๊ณ  ์žˆ๋„๋ก ๋งŒ๋“ค ์ˆ˜ ์—†๋‚˜์š”?

๋ทฐ ๋ ˆ์ด์–ด์˜ ๋ณต์žก๋„๊ฐ€ ๋ถˆํ•„์š”ํ•˜๊ฒŒ ์˜ฌ๋ผ๊ฐ€๋Š” ๋™์ž‘์œผ๋กœ ๋ณด์ž…๋‹ˆ๋‹ค.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

์Šคํฌ๋Ÿผ ๋•Œ ๋ง์”€๋“œ๋ฆฐ ๊ฒƒ๊ณผ ๊ฐ™์ด, Row์˜ hidden ์ •๋ณด๋ฅผ rawData์— ๊ฐ€์ง€๊ณ  ์žˆ์–ด์„œ ์ด๋ฅผ ํ™•์ธํ•˜๋Š” ๋กœ์ง์ด ์ˆ˜ํ–‰๋˜๊ฒŒ ๋ฉ๋‹ˆ๋‹ค. browserStack ๋“ฑ๊ณผ ๊ฐ™์ด ์ €์‚ฌ์–‘ ํ™˜๊ฒฝ์—์„œ ํ™•์ธํ•ด๋ณธ ๊ฒฐ๊ณผ, ๋™์ž‘ ์ˆ˜ํ–‰์˜ ๋”œ๋ ˆ์ด๊ฐ€ ์™„์ „ํžˆ ์‚ฌ๋ผ์ง€์ง€๋Š” ์•Š์•˜์ง€๋งŒ ํ…Œ์ŠคํŠธ ํ™˜๊ฒฝ๊ณผ ๋งˆ์ฐฌ๊ฐ€์ง€๋กœ ์•ฝ 2000๋ฐฐ ๊ฐ€๋Ÿ‰์˜ ์„ฑ๋Šฅ ํ–ฅ์ƒ์ด ์žˆ๋Š” ๊ฒƒ์œผ๋กœ ํ™•์ธ ๋˜์—ˆ์Šต๋‹ˆ๋‹ค.

์ด์™€ ๊ด€๋ จํ•ด์„œ๋Š” ์šฐ์„  ๋ฐฐํฌ ํ›„, ๊ด€๋ จํ•ด์„œ ์ถ”๊ฐ€ ๊ฐœ์„ ์ด ํ•„์š”ํ•˜๊ฒŒ ๋˜๋ฉด ์ถ”ํ›„ ๊ตฌ์กฐ ๋“ฑ์„ ๊ฐœ์„ ํ•˜๋„๋ก ํ•˜๊ฒ ์Šต๋‹ˆ๋‹ค.

const rowKeys = rows.map(({ rowKey }) => rowKey);

return rawData.reduce((acc, { rowKey, _attributes }) => {
if (!rowKeys.includes(rowKey)) {
return acc;
}

acc[rowKey] = !_attributes.tree?.hidden;

return acc;
}, {} as Record<RowKey, boolean>);
}

public shouldComponentUpdate(nextProps: Props) {
return !shallowEqual(nextProps, this.props);
}

public render({ rows, rowIndexOffset, columns, dummyRowCount }: Props) {
public render({ rawData, rows, rowIndexOffset, columns, dummyRowCount, hasTreeColumn }: Props) {
const columnNames = columns.map(({ name }) => name);

const visibleStateOfRows = hasTreeColumn ? this.getVisibleStateOfRows({ rows, rawData }) : null;

return (
<tbody>
{rows.map((row, index) => (
Expand All @@ -36,6 +55,7 @@ class BodyRowsComp extends Component<Props> {
rowIndex={index + rowIndexOffset}
viewRow={row}
columns={columns}
isVisible={visibleStateOfRows?.[row.rowKey] ?? true}
/>
))}
{range(dummyRowCount).map((index) => (
Expand All @@ -51,8 +71,10 @@ class BodyRowsComp extends Component<Props> {
}

export const BodyRows = connect<StoreProps, OwnProps>(({ viewport, column, data }, { side }) => ({
rawData: data.filteredRawData,
rowIndexOffset: viewport.rowRange[0] - data.pageRowRange[0],
rows: viewport.rows,
columns: side === 'L' ? column.visibleColumnsBySideWithRowHeader.L : viewport.columns,
dummyRowCount: viewport.dummyRowCount,
hasTreeColumn: !!column.treeColumnName,
}))(BodyRowsComp);