Skip to content

Commit

Permalink
fix: escape Quotes in tooltip title (#9019)
Browse files Browse the repository at this point in the history
Co-authored-by: GitHub Actions Bot <vega-actions-bot@users.noreply.github.com>
  • Loading branch information
lsh and GitHub Actions Bot committed Jul 19, 2023
1 parent d535812 commit f7f7735
Show file tree
Hide file tree
Showing 7 changed files with 155 additions and 2 deletions.
Binary file added examples/compiled/bar_axis_title_quoted.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions examples/compiled/bar_axis_title_quoted.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
123 changes: 123 additions & 0 deletions examples/compiled/bar_axis_title_quoted.vg.json
@@ -0,0 +1,123 @@
{
"$schema": "https://vega.github.io/schema/vega/v5.json",
"background": "white",
"padding": 5,
"height": 200,
"title": {"text": "A Simple Bar Chart", "frame": "group"},
"style": "cell",
"data": [
{
"name": "source_0",
"values": [
{"a": "A", "b": 28},
{"a": "B", "b": 55},
{"a": "C", "b": 43},
{"a": "D", "b": 91},
{"a": "E", "b": 81},
{"a": "F", "b": 53},
{"a": "G", "b": 19},
{"a": "H", "b": 87},
{"a": "I", "b": 52}
]
},
{
"name": "data_0",
"source": "source_0",
"transform": [
{
"type": "stack",
"groupby": ["a"],
"field": "b",
"sort": {"field": [], "order": []},
"as": ["b_start", "b_end"],
"offset": "zero"
},
{
"type": "filter",
"expr": "isValid(datum[\"b\"]) && isFinite(+datum[\"b\"])"
}
]
}
],
"signals": [
{"name": "x_step", "value": 20},
{
"name": "width",
"update": "bandspace(domain('x').length, 0.1, 0.05) * x_step"
}
],
"marks": [
{
"name": "marks",
"type": "rect",
"style": ["bar"],
"from": {"data": "data_0"},
"encode": {
"update": {
"fill": {"value": "#4c78a8"},
"ariaRoleDescription": {"value": "bar"},
"description": {
"signal": "\"\\\"Quoted\\\" Title: \" + (isValid(datum[\"a\"]) ? datum[\"a\"] : \"\"+datum[\"a\"]) + \"; b: \" + (format(datum[\"b\"], \"\"))"
},
"x": {"scale": "x", "field": "a"},
"width": {"signal": "max(0.25, bandwidth('x'))"},
"y": {"scale": "y", "field": "b_end"},
"y2": {"scale": "y", "field": "b_start"}
}
}
}
],
"scales": [
{
"name": "x",
"type": "band",
"domain": {"data": "data_0", "field": "a", "sort": true},
"range": {"step": {"signal": "x_step"}},
"paddingInner": 0.1,
"paddingOuter": 0.05
},
{
"name": "y",
"type": "linear",
"domain": {"data": "data_0", "fields": ["b_start", "b_end"]},
"range": [{"signal": "height"}, 0],
"nice": true,
"zero": true
}
],
"axes": [
{
"scale": "y",
"orient": "left",
"gridScale": "x",
"grid": true,
"tickCount": {"signal": "ceil(height/40)"},
"domain": false,
"labels": false,
"aria": false,
"maxExtent": 0,
"minExtent": 0,
"ticks": false,
"zindex": 0
},
{
"scale": "x",
"orient": "bottom",
"grid": false,
"title": "\"Quoted\" Title",
"labelAlign": "right",
"labelAngle": 270,
"labelBaseline": "middle",
"zindex": 0
},
{
"scale": "y",
"orient": "left",
"grid": false,
"title": "b",
"labelOverlap": true,
"tickCount": {"signal": "ceil(height/40)"},
"zindex": 0
}
]
}
16 changes: 16 additions & 0 deletions examples/specs/bar_axis_title_quoted.vl.json
@@ -0,0 +1,16 @@
{
"$schema": "https://vega.github.io/schema/vega-lite/v5.json",
"title": "A Simple Bar Chart",
"data": {
"values": [
{"a": "A", "b": 28}, {"a": "B", "b": 55}, {"a": "C", "b": 43},
{"a": "D", "b": 91}, {"a": "E", "b": 81}, {"a": "F", "b": 53},
{"a": "G", "b": 19}, {"a": "H", "b": 87}, {"a": "I", "b": 52}
]
},
"mark": "bar",
"encoding": {
"x": {"field": "a", "type": "nominal", "title": "\"Quoted\" Title"},
"y": {"field": "b", "type": "quantitative"}
}
}
2 changes: 1 addition & 1 deletion src/compile/mark/encode/tooltip.ts
Expand Up @@ -88,7 +88,7 @@ export function tooltipData(
};

const title = fieldDef.title || defaultTitle(fieldDef, formatConfig);
const key = array(title).join(', ');
const key = array(title).join(', ').replaceAll(/"/g, '\\"');

let value: string;

Expand Down
13 changes: 13 additions & 0 deletions test/compile/mark/encode/tooltip.test.ts
Expand Up @@ -152,6 +152,19 @@ describe('compile/mark/encode/tooltip', () => {
signal: '{"baz": isValid(datum["Foobar"]) ? datum["Foobar"] : ""+datum["Foobar"]}'
});
});

it('generates correct keys and values for channels with title with quotes', () => {
const model = parseUnitModelWithScaleAndLayoutSize({
mark: {type: 'point', tooltip: true},
encoding: {
color: {field: 'Foobar', type: 'nominal', title: '"baz"'}
}
});
const props = tooltip(model);
expect(props.tooltip).toEqual({
signal: '{"\\"baz\\"": isValid(datum["Foobar"]) ? datum["Foobar"] : ""+datum["Foobar"]}'
});
});
});

describe('tooltipForEncoding', () => {
Expand Down
2 changes: 1 addition & 1 deletion tsconfig.json
Expand Up @@ -15,7 +15,7 @@
"resolveJsonModule": true,
"suppressImplicitAnyIndexErrors": true,
"isolatedModules": true,
"lib": ["ESNext.Array", "DOM", "DOM.Iterable"],
"lib": ["ESNext.Array", "DOM", "DOM.Iterable", "ES2021.String"],
"noEmit": true
},
"files": ["src/index.ts"],
Expand Down

0 comments on commit f7f7735

Please sign in to comment.