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

Add new align 'inner' for X axis #10106

Merged
merged 8 commits into from Feb 12, 2022
Merged

Add new align 'inner' for X axis #10106

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
393dbba
Add new align for X axis
Jan 27, 2022
932b5b5
corrected name of aligment to "inner", documentation and add test for…
Talla2XLC Jan 31, 2022
3fd05ec
delete unnecessary changes
Talla2XLC Jan 31, 2022
84a0637
corrected logic for reverse axis, add tests for reverse axis and with…
Feb 7, 2022
4278d5b
corrected chart paddings for "inner" tick align
Feb 7, 2022
a7c1f93
Merge branch 'master' into leftRightAlignForHorizontalAxis
kurkle Feb 7, 2022
4def5af
code clearness
Feb 8, 2022
d4bb967
Update types/index.esm.d.ts
Talla2XLC Feb 10, 2022
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
14 changes: 13 additions & 1 deletion src/core/core.scale.js
View file
Open in desktop
Expand Up @@ -1206,9 +1206,19 @@ export default class Scale extends Element {
const color = optsAtIndex.color;
const strokeColor = optsAtIndex.textStrokeColor;
const strokeWidth = optsAtIndex.textStrokeWidth;
let tickTextAlign = textAlign;

if (isHorizontal) {
x = pixel;

if (textAlign === 'left-right') {
Talla2XLC marked this conversation as resolved.
Show resolved Hide resolved
if (i === ilen - 1) {
tickTextAlign = 'right';
} else {
tickTextAlign = 'left';
}
Talla2XLC marked this conversation as resolved.
Show resolved Hide resolved
}

if (position === 'top') {
if (crossAlign === 'near' || rotation !== 0) {
textOffset = -lineCount * lineHeight + lineHeight / 2;
Expand Down Expand Up @@ -1285,7 +1295,7 @@ export default class Scale extends Element {
strokeColor,
strokeWidth,
textOffset,
textAlign,
textAlign: tickTextAlign,
textBaseline,
translation: [x, y],
backdrop,
Expand All @@ -1309,6 +1319,8 @@ export default class Scale extends Element {
align = 'left';
} else if (ticks.align === 'end') {
align = 'right';
} else if (ticks.align === 'left-right') {
align = 'left-right';
Talla2XLC marked this conversation as resolved.
Show resolved Hide resolved
}

return align;
Expand Down