Skip to content

Add font options to the controller #48

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 4 commits into from
Sep 1, 2021
Merged

Add font options to the controller #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6a849a
add font options to the controller
stockiNail Sep 1, 2021
4911c82
fixes access to the right font instance in me.options and not dataset
stockiNail Sep 1, 2021
70b9403
uses toFont (normalizing also lineHeight) instead of toFontString
stockiNail Sep 1, 2021
5663ee9
uses font.lineHeight instead of font.size to set the text height
stockiNail Sep 1, 2021
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
10 changes: 7 additions & 3 deletions src/controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

import {DatasetController} from 'chart.js';
import {valueOrDefault, isNullOrUndef} from 'chart.js/helpers';
import {valueOrDefault, toFont, isNullOrUndef} from 'chart.js/helpers';
import {layout} from './layout';

/**
Expand Down Expand Up @@ -228,11 +228,15 @@ export default class SankeyController extends DatasetController {
* @private
*/
_drawLabel(label, y, height, ctx, textX) {
const lines = isNullOrUndef(label) ? [] : this.toTextLines(label);
const me = this;
const font = toFont(me.options.font, me.chart.options.font);
const lines = isNullOrUndef(label) ? [] : me.toTextLines(label);
const linesLength = lines.length;
const middle = y + height / 2;
const padding = 7.5;
const textHeight = 15;
const textHeight = font.lineHeight;

ctx.font = font.string;

if (linesLength > 1) {
const top = middle - (textHeight * linesLength / 2) + padding;
Expand Down
Binary file modified test/fixtures/labels-multiline.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion types/index.esm.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ import {
Chart,
ChartComponent,
DatasetController,
Element
Element,
FontSpec
} from 'chart.js';

declare module 'chart.js' {
Expand Down Expand Up @@ -30,6 +31,7 @@ declare module 'chart.js' {
nodeWidth?: number /* defaults to 10 */
color?: string /* defaults to 'black' */
borderColor?: string /* defaults to 'black' */
font: FontSpec /* defaults to chart.options.font */
}

type FromToElement = {
Expand Down