Skip to content

chore: add selected in treemap #2084

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

Merged
merged 1 commit into from
Aug 8, 2025
Merged

chore: add selected in treemap #2084

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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions packages/f2/src/components/treemap/withTreemap.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,21 +89,14 @@ const withTreemap = <IProps extends TreemapProps = TreemapProps>(View: Component
return false;
}

getSelectionStyle(record) {
const { state, props } = this;
const { selected } = state;
if (!selected || !selected.length) {
generateSelectionStyle(record: Record<string, unknown>, isSelected: boolean) {
if (!this.state.selected?.length) {
return null;
}
const { selection } = props;
const { selectedStyle, unSelectedStyle } = selection;

const isSelected = this.isSelected(record);

if (isSelected) {
return isFunction(selectedStyle) ? selectedStyle(record) : selectedStyle;
}
return isFunction(unSelectedStyle) ? unSelectedStyle(record) : unSelectedStyle;
const { selectedStyle, unSelectedStyle } = this.props.selection || {};
const style = isSelected ? selectedStyle : unSelectedStyle;
return isFunction(style) ? style(record) : style;
}
Copy link
Contributor

Choose a reason for hiding this comment

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

是不是不用做 非功能上的优化和改动，原来函数里加一个入参


willMount() {
Expand Down Expand Up @@ -162,14 +155,16 @@ const withTreemap = <IProps extends TreemapProps = TreemapProps>(View: Component
yMax: y1,
};

const style = this.getSelectionStyle(data);
const selected = this.isSelected(data);
const style = this.generateSelectionStyle(data, selected);

return {
key: data.key,
origin: data,
color,
...rect,
style,
selected,
};
});
}
Expand Down
5 changes: 5 additions & 0 deletions packages/f2/test/components/treemap/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,9 +112,11 @@ describe('Treemap', () => {
canvas.destroy();
});
it('select ', async () => {
const treemapRef = { current: null };
const { props } = (
<Canvas context={context} pixelRatio={1}>
<Treemap
ref={treemapRef}
data={data}
color={{
field: 'name',
Expand Down Expand Up @@ -147,10 +149,12 @@ describe('Treemap', () => {

await delay(1000);
expect(context).toMatchImageSnapshot();
expect(treemapRef.current?.records[0]?.selected).toBe(true);

const { props: nextProps } = (
<Canvas context={context} pixelRatio={1}>
<Treemap
ref={treemapRef}
data={data}
color={{
field: 'name',
Expand Down Expand Up @@ -181,6 +185,7 @@ describe('Treemap', () => {
canvas.update(nextProps);
await delay(1000);
expect(context).toMatchImageSnapshot();
expect(treemapRef.current?.records[2]?.selected).toBe(true);
await delay(100);
canvas.destroy();
});
Expand Down
Loading