Skip to content
This repository has been archived by the owner on Oct 7, 2023. It is now read-only.

fix(animation): title #295

Merged
merged 1 commit into from
Jul 5, 2023
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
2 changes: 1 addition & 1 deletion src/ui/axis/guides/labels.ts
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ export function renderLabels(
}),
(exit) =>
exit.transition(function () {
const animation = fadeOut(this, animate.exit);
const animation = fadeOut(this.childNodes[0], animate.exit);
onAnimateFinished(animation, () => select(this).remove());
return animation;
})
Expand Down
2 changes: 1 addition & 1 deletion src/ui/axis/guides/ticks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ export function renderTicks(
}),
(exit) =>
exit.transition(function () {
const animation = fadeOut(this, animate.exit);
const animation = fadeOut(this.childNodes[0], animate.exit);
onAnimateFinished(animation, () => this.remove());
return animation;
})
Expand Down
19 changes: 16 additions & 3 deletions src/ui/axis/guides/title.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ import type { DisplayObject } from '../../../shapes';
import {
normalize,
parseSeriesAttr,
percentTransform,
renderExtDo,
scale,
select,
splitStyle,
subStyleProps,
type Selection,
percentTransform,
} from '../../../util';
import { parsePosition } from '../../title';
import { CLASS_NAMES } from '../constant';
Expand Down Expand Up @@ -55,6 +55,18 @@ function getTitlePosition(
return { x, y };
}

function inferTransform(n: DisplayObject, direction: string, position: string): string {
const node = n.cloneNode(true);
node.style.transform = 'scale(1, 1)';
node.style.transform = 'none';
const { height } = node.getBBox();
if (direction === 'vertical') {
if (position === 'left') return `rotate(-90) translate(0, ${height / 2})`;
if (position === 'right') return `rotate(-90) translate(0, -${height / 2})`;
}
return '';
}

function applyTitleStyle(
title: Selection,
group: Selection,
Expand All @@ -63,11 +75,12 @@ function applyTitleStyle(
animate: GenericAnimation
) {
const style = subStyleProps(attr, 'title');
const [titleStyle, { transform = '', ...groupStyle }] = splitStyle(style);
const [titleStyle, { transform: specified, ...groupStyle }] = splitStyle(style);

title.styles(titleStyle);
group.styles(groupStyle);
// the transform of g has some limitation, so we need to apply the transform to the title twice

const transform = specified || inferTransform(title.node(), titleStyle.direction, titleStyle.position);
percentTransform(title.node(), transform);

const { x, y } = getTitlePosition(
Expand Down
1 change: 1 addition & 0 deletions src/ui/axis/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ export type LabelOverlapCfg =

export type AxisTitleStyleProps = Omit<TitleStyleProps, 'position'> & {
position: TitleStyleProps['position'] | 'start' | 'end';
direction: 'horizontal' | 'vertical';
};

export type AxisTruncateStyleProps = {
Expand Down