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

fix: 修复非滚动引起的渲染也会触发滚动事件的问题 #2692

Merged
merged 2 commits into from
Apr 30, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
30 changes: 29 additions & 1 deletion packages/s2-core/__tests__/spreadsheet/scroll-spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
/* eslint-disable jest/expect-expect */
/* eslint-disable jest/no-conditional-expect */
import * as mockDataConfig from 'tests/data/simple-data.json';
import { createMockCellInfo, getContainer, sleep } from 'tests/util/helpers';
import { cloneDeep } from 'lodash';
import { ScrollBar, ScrollType } from '../../src/ui/scrollbar';
import type { CellScrollPosition } from './../../src/common/interface/scroll';
import { PivotSheet, SpreadSheet } from '@/sheet-type';
Expand Down Expand Up @@ -909,7 +911,7 @@ describe('Scroll Tests', () => {
new MouseEvent('click', {
clientX: x + scrollbar.position.x,
// 在滚动条内点击
clientY: y + scrollbar.position.y + scrollbar.theme.size - 2,
clientY: y + scrollbar.position.y + scrollbar.theme.size! - 2,
} as MouseEventInit),
);

Expand All @@ -928,4 +930,30 @@ describe('Scroll Tests', () => {
containsMock.mockReset();
},
);

test('should not trigger scroll event when first rendered', () => {
const expectScroll = getScrollExpect();

expectScroll();
});

test('should not trigger scroll event when options changed', () => {
const expectScroll = getScrollExpect();

s2.setOptions({
hierarchyType: 'tree',
});
s2.render();

expectScroll();
});

test('should not trigger scroll event when data config changed', () => {
const expectScroll = getScrollExpect();

s2.setDataCfg(cloneDeep(mockDataConfig));
s2.render();

expectScroll();
});
});
14 changes: 7 additions & 7 deletions packages/s2-core/src/facet/base-facet.ts
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ export abstract class BaseFacet {
this.renderHeaders();
this.renderScrollBars();
this.renderBackground();
this.dynamicRenderCell();
this.dynamicRenderCell(true);
}

/**
Expand Down Expand Up @@ -641,24 +641,24 @@ export abstract class BaseFacet {

this.hRowScrollBar.on(ScrollType.ScrollChange, ({ offset }) => {
const newOffset = this.getValidScrollBarOffset(offset, maxOffset);
const rowHeaderScrollX = Math.floor(newOffset);
this.setScrollOffset({ rowHeaderScrollX });
const newRowHeaderScrollX = Math.floor(newOffset);
this.setScrollOffset({ rowHeaderScrollX: newRowHeaderScrollX });

this.rowHeader?.onRowScrollX(
rowHeaderScrollX,
newRowHeaderScrollX,
KEY_GROUP_ROW_RESIZE_AREA,
);
this.rowIndexHeader?.onRowScrollX(
rowHeaderScrollX,
newRowHeaderScrollX,
KEY_GROUP_ROW_INDEX_RESIZE_AREA,
);
this.cornerHeader.onRowScrollX(
rowHeaderScrollX,
newRowHeaderScrollX,
KEY_GROUP_CORNER_RESIZE_AREA,
);

const scrollBarOffsetX = this.getScrollBarOffset(
rowHeaderScrollX,
newRowHeaderScrollX,
this.hRowScrollBar,
);

Expand Down
Loading