@genome-spy/core 0.59.0 → 0.60.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/bundle/index.es.js +6100 -5545
- package/dist/bundle/index.js +144 -119
- package/dist/schema.json +304 -22
- package/dist/src/data/collector.d.ts.map +1 -1
- package/dist/src/data/collector.js +1 -0
- package/dist/src/data/sources/dataUtils.d.ts +2 -1
- package/dist/src/data/sources/dataUtils.d.ts.map +1 -1
- package/dist/src/data/sources/dataUtils.js +3 -4
- package/dist/src/data/sources/inlineSource.d.ts +8 -0
- package/dist/src/data/sources/inlineSource.d.ts.map +1 -1
- package/dist/src/data/sources/inlineSource.js +17 -1
- package/dist/src/data/sources/urlSource.d.ts +1 -0
- package/dist/src/data/sources/urlSource.d.ts.map +1 -1
- package/dist/src/data/sources/urlSource.js +33 -4
- package/dist/src/encoder/encoder.d.ts +1 -1
- package/dist/src/genomeSpy.d.ts.map +1 -1
- package/dist/src/genomeSpy.js +39 -6
- package/dist/src/gl/colorUtils.d.ts +4 -0
- package/dist/src/gl/colorUtils.d.ts.map +1 -1
- package/dist/src/gl/colorUtils.js +8 -0
- package/dist/src/gl/glslScaleGenerator.d.ts +1 -1
- package/dist/src/gl/glslScaleGenerator.d.ts.map +1 -1
- package/dist/src/gl/glslScaleGenerator.js +1 -9
- package/dist/src/gl/includes/common.glsl.js +1 -1
- package/dist/src/marks/link.d.ts.map +1 -1
- package/dist/src/marks/link.js +8 -0
- package/dist/src/marks/mark.d.ts +8 -0
- package/dist/src/marks/mark.d.ts.map +1 -1
- package/dist/src/marks/mark.js +101 -3
- package/dist/src/marks/point.fragment.glsl.js +1 -1
- package/dist/src/marks/point.vertex.glsl.js +1 -1
- package/dist/src/marks/rect.common.glsl.js +1 -1
- package/dist/src/marks/rect.d.ts.map +1 -1
- package/dist/src/marks/rect.fragment.glsl.js +1 -1
- package/dist/src/marks/rect.js +41 -0
- package/dist/src/marks/rect.vertex.glsl.js +1 -1
- package/dist/src/selection/selection.d.ts +27 -2
- package/dist/src/selection/selection.d.ts.map +1 -1
- package/dist/src/selection/selection.js +53 -3
- package/dist/src/spec/data.d.ts +18 -1
- package/dist/src/spec/mark.d.ts +58 -1
- package/dist/src/spec/parameter.d.ts +71 -31
- package/dist/src/spec/view.d.ts +9 -2
- package/dist/src/styles/genome-spy.css.d.ts +1 -1
- package/dist/src/styles/genome-spy.css.d.ts.map +1 -1
- package/dist/src/styles/genome-spy.css.js +12 -1
- package/dist/src/styles/genome-spy.scss +19 -1
- package/dist/src/types/selectionTypes.d.ts +4 -7
- package/dist/src/utils/expression.d.ts.map +1 -1
- package/dist/src/utils/expression.js +4 -0
- package/dist/src/utils/ui/tooltip.d.ts +6 -10
- package/dist/src/utils/ui/tooltip.d.ts.map +1 -1
- package/dist/src/utils/ui/tooltip.js +74 -42
- package/dist/src/view/concatView.d.ts +1 -1
- package/dist/src/view/concatView.d.ts.map +1 -1
- package/dist/src/view/concatView.js +1 -1
- package/dist/src/view/gridView/gridChild.d.ts +53 -0
- package/dist/src/view/gridView/gridChild.d.ts.map +1 -0
- package/dist/src/view/gridView/gridChild.js +758 -0
- package/dist/src/view/gridView/gridView.d.ts +64 -0
- package/dist/src/view/gridView/gridView.d.ts.map +1 -0
- package/dist/src/view/{gridView.js → gridView/gridView.js} +40 -595
- package/dist/src/view/gridView/scrollbar.d.ts +32 -0
- package/dist/src/view/gridView/scrollbar.d.ts.map +1 -0
- package/dist/src/view/gridView/scrollbar.js +186 -0
- package/dist/src/view/gridView/selectionRect.d.ts +10 -0
- package/dist/src/view/gridView/selectionRect.d.ts.map +1 -0
- package/dist/src/view/gridView/selectionRect.js +182 -0
- package/dist/src/view/layout/rectangle.d.ts +11 -1
- package/dist/src/view/layout/rectangle.d.ts.map +1 -1
- package/dist/src/view/layout/rectangle.js +22 -2
- package/dist/src/view/layout/rectangle.test.js +12 -0
- package/dist/src/view/paramMediator.d.ts.map +1 -1
- package/dist/src/view/paramMediator.js +9 -0
- package/dist/src/view/scaleResolution.d.ts +1 -0
- package/dist/src/view/scaleResolution.d.ts.map +1 -1
- package/dist/src/view/scaleResolution.js +43 -33
- package/dist/src/view/view.d.ts +6 -0
- package/dist/src/view/view.d.ts.map +1 -1
- package/dist/src/view/view.js +19 -0
- package/dist/src/view/viewFactory.d.ts.map +1 -1
- package/dist/src/view/viewFactory.js +13 -1
- package/package.json +2 -2
- package/dist/src/view/gridView.d.ts +0 -135
- package/dist/src/view/gridView.d.ts.map +0 -1
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @typedef {"horizontal" | "vertical"} ScrollDirection
|
|
3
|
+
*/
|
|
4
|
+
export default class Scrollbar extends UnitView {
|
|
5
|
+
/**
|
|
6
|
+
* @param {import("./gridChild.js").default} gridChild
|
|
7
|
+
* @param {ScrollDirection} scrollDirection
|
|
8
|
+
*/
|
|
9
|
+
constructor(gridChild: import("./gridChild.js").default, scrollDirection: ScrollDirection);
|
|
10
|
+
viewportOffset: number;
|
|
11
|
+
config: {
|
|
12
|
+
scrollbarSize: number;
|
|
13
|
+
scrollbarPadding: number;
|
|
14
|
+
};
|
|
15
|
+
interpolateViewportOffset: ((target: {
|
|
16
|
+
x: number;
|
|
17
|
+
}) => void) & {
|
|
18
|
+
stop: () => void;
|
|
19
|
+
};
|
|
20
|
+
get scrollOffset(): number;
|
|
21
|
+
/**
|
|
22
|
+
*
|
|
23
|
+
* @param {Rectangle} viewportCoords
|
|
24
|
+
* @param {Rectangle} coords
|
|
25
|
+
*/
|
|
26
|
+
updateScrollbar(viewportCoords: Rectangle, coords: Rectangle): void;
|
|
27
|
+
#private;
|
|
28
|
+
}
|
|
29
|
+
export type ScrollDirection = "horizontal" | "vertical";
|
|
30
|
+
import UnitView from "../unitView.js";
|
|
31
|
+
import Rectangle from "../layout/rectangle.js";
|
|
32
|
+
//# sourceMappingURL=scrollbar.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"scrollbar.d.ts","sourceRoot":"","sources":["../../../../src/view/gridView/scrollbar.js"],"names":[],"mappings":"AAKA;;GAEG;AACH;IAeI;;;OAGG;IACH,uBAHW,OAAO,gBAAgB,EAAE,OAAO,mBAChC,eAAe,EA4FzB;IAhGD,uBAAmB;IAsCf;;;MAAoB;IAIpB;;;;MAQC;IAgDL,2BAKC;IAWD;;;;OAIG;IACH,gCAHW,SAAS,UACT,SAAS,QA8CnB;;CACJ;8BAnLY,YAAY,GAAG,UAAU;qBAHjB,gBAAgB;sBADf,wBAAwB"}
|
|
@@ -0,0 +1,186 @@
|
|
|
1
|
+
import clamp from "../../utils/clamp.js";
|
|
2
|
+
import { makeLerpSmoother } from "../../utils/animator.js";
|
|
3
|
+
import Rectangle from "../layout/rectangle.js";
|
|
4
|
+
import UnitView from "../unitView.js";
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* @typedef {"horizontal" | "vertical"} ScrollDirection
|
|
8
|
+
*/
|
|
9
|
+
export default class Scrollbar extends UnitView {
|
|
10
|
+
/** @type {ScrollDirection} */
|
|
11
|
+
#scrollDirection;
|
|
12
|
+
|
|
13
|
+
#scrollbarCoords = Rectangle.ZERO;
|
|
14
|
+
|
|
15
|
+
#maxScrollOffset = 0;
|
|
16
|
+
|
|
17
|
+
#maxViewportOffset = 0;
|
|
18
|
+
|
|
19
|
+
// This is the actual state of the scrollbar. It's better to keep track of
|
|
20
|
+
// the viewport offset rather than the scrollbar offset because the former
|
|
21
|
+
// is more stable when the viewport size changes.
|
|
22
|
+
viewportOffset = 0;
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* @param {import("./gridChild.js").default} gridChild
|
|
26
|
+
* @param {ScrollDirection} scrollDirection
|
|
27
|
+
*/
|
|
28
|
+
constructor(gridChild, scrollDirection) {
|
|
29
|
+
// TODO: Configurable
|
|
30
|
+
const config = {
|
|
31
|
+
scrollbarSize: 8,
|
|
32
|
+
scrollbarPadding: 2,
|
|
33
|
+
// TODO: inside/outside view
|
|
34
|
+
};
|
|
35
|
+
|
|
36
|
+
super(
|
|
37
|
+
{
|
|
38
|
+
data: { values: [{}] },
|
|
39
|
+
mark: {
|
|
40
|
+
type: "rect",
|
|
41
|
+
fill: "#b0b0b0",
|
|
42
|
+
fillOpacity: 0.6,
|
|
43
|
+
stroke: "white",
|
|
44
|
+
strokeWidth: 1,
|
|
45
|
+
strokeOpacity: 1,
|
|
46
|
+
cornerRadius: 5,
|
|
47
|
+
clip: false,
|
|
48
|
+
},
|
|
49
|
+
configurableVisibility: false,
|
|
50
|
+
},
|
|
51
|
+
gridChild.layoutParent.context,
|
|
52
|
+
gridChild.layoutParent,
|
|
53
|
+
gridChild.view,
|
|
54
|
+
"scrollbar-" + scrollDirection, // TODO: Serial
|
|
55
|
+
{
|
|
56
|
+
blockEncodingInheritance: true,
|
|
57
|
+
}
|
|
58
|
+
);
|
|
59
|
+
|
|
60
|
+
this.config = config;
|
|
61
|
+
this.#scrollDirection = scrollDirection;
|
|
62
|
+
|
|
63
|
+
// Make it smooth!
|
|
64
|
+
this.interpolateViewportOffset = makeLerpSmoother(
|
|
65
|
+
this.context.animator,
|
|
66
|
+
(value) => {
|
|
67
|
+
this.viewportOffset = value.x;
|
|
68
|
+
},
|
|
69
|
+
50,
|
|
70
|
+
0.4,
|
|
71
|
+
{ x: this.viewportOffset }
|
|
72
|
+
);
|
|
73
|
+
|
|
74
|
+
this.addInteractionEventListener("mousedown", (coords, event) => {
|
|
75
|
+
event.stopPropagation();
|
|
76
|
+
|
|
77
|
+
if (this.#maxScrollOffset <= 0) {
|
|
78
|
+
return;
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
const getMouseOffset = (/** @type {MouseEvent} */ mouseEvent) =>
|
|
82
|
+
scrollDirection == "vertical"
|
|
83
|
+
? mouseEvent.clientY
|
|
84
|
+
: mouseEvent.clientX;
|
|
85
|
+
|
|
86
|
+
const mouseEvent = /** @type {MouseEvent} */ (event.uiEvent);
|
|
87
|
+
mouseEvent.preventDefault();
|
|
88
|
+
|
|
89
|
+
const initialScrollOffset = this.scrollOffset;
|
|
90
|
+
const initialOffset = getMouseOffset(mouseEvent);
|
|
91
|
+
|
|
92
|
+
const onMousemove = /** @param {MouseEvent} moveEvent */ (
|
|
93
|
+
moveEvent
|
|
94
|
+
) => {
|
|
95
|
+
const scrollOffset = clamp(
|
|
96
|
+
getMouseOffset(moveEvent) -
|
|
97
|
+
initialOffset +
|
|
98
|
+
initialScrollOffset,
|
|
99
|
+
0,
|
|
100
|
+
this.#maxScrollOffset
|
|
101
|
+
);
|
|
102
|
+
|
|
103
|
+
this.interpolateViewportOffset({
|
|
104
|
+
x:
|
|
105
|
+
(scrollOffset / this.#maxScrollOffset) *
|
|
106
|
+
this.#maxViewportOffset,
|
|
107
|
+
});
|
|
108
|
+
};
|
|
109
|
+
|
|
110
|
+
const onMouseup = () => {
|
|
111
|
+
document.removeEventListener("mousemove", onMousemove);
|
|
112
|
+
document.removeEventListener("mouseup", onMouseup);
|
|
113
|
+
};
|
|
114
|
+
|
|
115
|
+
document.addEventListener("mouseup", onMouseup, false);
|
|
116
|
+
document.addEventListener("mousemove", onMousemove, false);
|
|
117
|
+
});
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
get scrollOffset() {
|
|
121
|
+
return (
|
|
122
|
+
(this.viewportOffset / this.#maxViewportOffset) *
|
|
123
|
+
this.#maxScrollOffset
|
|
124
|
+
);
|
|
125
|
+
}
|
|
126
|
+
|
|
127
|
+
/**
|
|
128
|
+
* @param {import("../renderingContext/viewRenderingContext.js").default} context
|
|
129
|
+
* @param {import("../layout/rectangle.js").default} coords
|
|
130
|
+
* @param {import("../../types/rendering.js").RenderingOptions} [options]
|
|
131
|
+
*/
|
|
132
|
+
render(context, coords, options) {
|
|
133
|
+
super.render(context, this.#scrollbarCoords, options);
|
|
134
|
+
}
|
|
135
|
+
|
|
136
|
+
/**
|
|
137
|
+
*
|
|
138
|
+
* @param {Rectangle} viewportCoords
|
|
139
|
+
* @param {Rectangle} coords
|
|
140
|
+
*/
|
|
141
|
+
updateScrollbar(viewportCoords, coords) {
|
|
142
|
+
const sPad = this.config.scrollbarPadding;
|
|
143
|
+
const sSize = this.config.scrollbarSize;
|
|
144
|
+
|
|
145
|
+
const dimension =
|
|
146
|
+
this.#scrollDirection == "horizontal" ? "width" : "height";
|
|
147
|
+
|
|
148
|
+
const visibleFraction = Math.min(
|
|
149
|
+
1,
|
|
150
|
+
viewportCoords[dimension] / coords[dimension]
|
|
151
|
+
);
|
|
152
|
+
const maxScrollLength = viewportCoords[dimension] - 2 * sPad;
|
|
153
|
+
const scrollLength = visibleFraction * maxScrollLength;
|
|
154
|
+
|
|
155
|
+
this.#maxScrollOffset = maxScrollLength - scrollLength;
|
|
156
|
+
this.#maxViewportOffset = coords[dimension] - viewportCoords[dimension];
|
|
157
|
+
this.viewportOffset = clamp(
|
|
158
|
+
this.viewportOffset,
|
|
159
|
+
0,
|
|
160
|
+
this.#maxViewportOffset
|
|
161
|
+
);
|
|
162
|
+
|
|
163
|
+
this.#scrollbarCoords =
|
|
164
|
+
this.#scrollDirection == "vertical"
|
|
165
|
+
? new Rectangle(
|
|
166
|
+
() =>
|
|
167
|
+
viewportCoords.x +
|
|
168
|
+
viewportCoords.width -
|
|
169
|
+
sSize -
|
|
170
|
+
sPad,
|
|
171
|
+
() => viewportCoords.y + sPad + this.scrollOffset,
|
|
172
|
+
() => sSize,
|
|
173
|
+
() => scrollLength
|
|
174
|
+
)
|
|
175
|
+
: new Rectangle(
|
|
176
|
+
() => viewportCoords.x + sPad + this.scrollOffset,
|
|
177
|
+
() =>
|
|
178
|
+
viewportCoords.y +
|
|
179
|
+
viewportCoords.height -
|
|
180
|
+
sSize -
|
|
181
|
+
sPad,
|
|
182
|
+
() => scrollLength,
|
|
183
|
+
() => sSize
|
|
184
|
+
);
|
|
185
|
+
}
|
|
186
|
+
}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
export default class SelectionRect extends LayerView {
|
|
2
|
+
/**
|
|
3
|
+
* @param {import("./gridChild.js").default} gridChild
|
|
4
|
+
* @param {import("../paramMediator.js").ExprRefFunction} selectionExpr
|
|
5
|
+
* @param {import("../../spec/parameter.js").BrushConfig} [brushConfig]
|
|
6
|
+
*/
|
|
7
|
+
constructor(gridChild: import("./gridChild.js").default, selectionExpr: import("../paramMediator.js").ExprRefFunction, brushConfig?: import("../../spec/parameter.js").BrushConfig);
|
|
8
|
+
}
|
|
9
|
+
import LayerView from "../layerView.js";
|
|
10
|
+
//# sourceMappingURL=selectionRect.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"selectionRect.d.ts","sourceRoot":"","sources":["../../../../src/view/gridView/selectionRect.js"],"names":[],"mappings":"AAEA;IACI;;;;OAIG;IACH,uBAJW,OAAO,gBAAgB,EAAE,OAAO,iBAChC,OAAO,qBAAqB,EAAE,eAAe,gBAC7C,OAAO,yBAAyB,EAAE,WAAW,EAkJvD;CACJ;sBAzJqB,iBAAiB"}
|
|
@@ -0,0 +1,182 @@
|
|
|
1
|
+
import LayerView from "../layerView.js";
|
|
2
|
+
|
|
3
|
+
export default class SelectionRect extends LayerView {
|
|
4
|
+
/**
|
|
5
|
+
* @param {import("./gridChild.js").default} gridChild
|
|
6
|
+
* @param {import("../paramMediator.js").ExprRefFunction} selectionExpr
|
|
7
|
+
* @param {import("../../spec/parameter.js").BrushConfig} [brushConfig]
|
|
8
|
+
*/
|
|
9
|
+
constructor(gridChild, selectionExpr, brushConfig = {}) {
|
|
10
|
+
const initialSelection =
|
|
11
|
+
/** @type {import("../../types/selectionTypes.js").IntervalSelection} */ (
|
|
12
|
+
selectionExpr()
|
|
13
|
+
);
|
|
14
|
+
const channels = Object.keys(initialSelection.intervals);
|
|
15
|
+
|
|
16
|
+
if (
|
|
17
|
+
/** @type {import("../../spec/channel.js").ChannelWithScale[]} */ ([
|
|
18
|
+
"x",
|
|
19
|
+
"y",
|
|
20
|
+
]).every((c) => !channels.includes(c))
|
|
21
|
+
) {
|
|
22
|
+
throw new Error(
|
|
23
|
+
"SelectionRect requires at least one of the channels 'x' or 'y' to be present in the selection."
|
|
24
|
+
);
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
/** @type {import("../../spec/view.js").LayerSpec} */
|
|
28
|
+
const layerSpec = {
|
|
29
|
+
name: "selectionRect",
|
|
30
|
+
configurableVisibility: false,
|
|
31
|
+
resolve: {
|
|
32
|
+
scale: {
|
|
33
|
+
x: "forced",
|
|
34
|
+
y: "forced",
|
|
35
|
+
},
|
|
36
|
+
},
|
|
37
|
+
data: { values: selectionToData(selectionExpr()) },
|
|
38
|
+
encoding: {},
|
|
39
|
+
layer: [],
|
|
40
|
+
};
|
|
41
|
+
|
|
42
|
+
if (channels.includes("x")) {
|
|
43
|
+
layerSpec.encoding.x = { field: "_x", type: null, title: null };
|
|
44
|
+
layerSpec.encoding.x2 = { field: "_x2" };
|
|
45
|
+
}
|
|
46
|
+
if (channels.includes("y")) {
|
|
47
|
+
layerSpec.encoding.y = { field: "_y", type: null, title: null };
|
|
48
|
+
layerSpec.encoding.y2 = { field: "_y2" };
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
layerSpec.layer.push({
|
|
52
|
+
name: "selectionRectRect",
|
|
53
|
+
mark: {
|
|
54
|
+
type: "rect",
|
|
55
|
+
clip: true,
|
|
56
|
+
...{
|
|
57
|
+
fill: "#808080",
|
|
58
|
+
fillOpacity: 0.05,
|
|
59
|
+
stroke: "black",
|
|
60
|
+
strokeWidth: 1,
|
|
61
|
+
strokeOpacity: 0.2,
|
|
62
|
+
...brushConfig,
|
|
63
|
+
},
|
|
64
|
+
},
|
|
65
|
+
});
|
|
66
|
+
|
|
67
|
+
const makeExpr = (
|
|
68
|
+
/** @type {import("../../spec/channel.js").PrimaryPositionalChannel} */ channel
|
|
69
|
+
) => {
|
|
70
|
+
const resolution = gridChild.view.getScaleResolution(channel);
|
|
71
|
+
return (
|
|
72
|
+
`format(datum._${channel}2 - datum._${channel}, '.3s')` +
|
|
73
|
+
(resolution.type === "locus" ? " + 'b'" : "")
|
|
74
|
+
);
|
|
75
|
+
};
|
|
76
|
+
|
|
77
|
+
const labelOffset =
|
|
78
|
+
brushConfig.measure == "inside"
|
|
79
|
+
? 9
|
|
80
|
+
: brushConfig.measure == "outside"
|
|
81
|
+
? -9
|
|
82
|
+
: 0;
|
|
83
|
+
|
|
84
|
+
if (channels.includes("x") && labelOffset != 0) {
|
|
85
|
+
layerSpec.layer.push({
|
|
86
|
+
name: "selectionRectTextX",
|
|
87
|
+
mark: {
|
|
88
|
+
type: "text",
|
|
89
|
+
align: "center",
|
|
90
|
+
paddingX: 5,
|
|
91
|
+
dy: labelOffset,
|
|
92
|
+
tooltip: null,
|
|
93
|
+
},
|
|
94
|
+
encoding: {
|
|
95
|
+
text: { expr: makeExpr("x") },
|
|
96
|
+
y: channels.includes("y")
|
|
97
|
+
? {
|
|
98
|
+
field: "_y2",
|
|
99
|
+
type: null,
|
|
100
|
+
title: null,
|
|
101
|
+
}
|
|
102
|
+
: {
|
|
103
|
+
value: 1,
|
|
104
|
+
},
|
|
105
|
+
y2: null,
|
|
106
|
+
},
|
|
107
|
+
});
|
|
108
|
+
}
|
|
109
|
+
|
|
110
|
+
if (channels.includes("y") && labelOffset != 0) {
|
|
111
|
+
layerSpec.layer.push({
|
|
112
|
+
name: "selectionRectTextY",
|
|
113
|
+
mark: {
|
|
114
|
+
type: "text",
|
|
115
|
+
align: "center",
|
|
116
|
+
paddingY: 5,
|
|
117
|
+
dy: labelOffset,
|
|
118
|
+
tooltip: null,
|
|
119
|
+
angle: -90,
|
|
120
|
+
},
|
|
121
|
+
encoding: {
|
|
122
|
+
text: { expr: makeExpr("y") },
|
|
123
|
+
x2: null,
|
|
124
|
+
},
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
|
|
128
|
+
super(
|
|
129
|
+
layerSpec,
|
|
130
|
+
gridChild.layoutParent.context,
|
|
131
|
+
gridChild.layoutParent,
|
|
132
|
+
gridChild.view,
|
|
133
|
+
"selectionRect", // TODO: Serial
|
|
134
|
+
{
|
|
135
|
+
blockEncodingInheritance: true,
|
|
136
|
+
contributesToScaleDomain: false,
|
|
137
|
+
}
|
|
138
|
+
);
|
|
139
|
+
|
|
140
|
+
selectionExpr.addListener(() => {
|
|
141
|
+
const selection =
|
|
142
|
+
/** @type {import("../../types/selectionTypes.js").IntervalSelection} */ (
|
|
143
|
+
selectionExpr()
|
|
144
|
+
);
|
|
145
|
+
|
|
146
|
+
const datasource =
|
|
147
|
+
/** @type {import("../../data/sources/inlineSource.js").default} */ (
|
|
148
|
+
this.context.dataFlow.findDataSourceByKey(this)
|
|
149
|
+
);
|
|
150
|
+
|
|
151
|
+
datasource.updateDynamicData(selectionToData(selection));
|
|
152
|
+
});
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
|
|
156
|
+
/**
|
|
157
|
+
* @param {import("../../types/selectionTypes.js").IntervalSelection} selection
|
|
158
|
+
*/
|
|
159
|
+
function selectionToData(selection) {
|
|
160
|
+
const x = selection.intervals.x;
|
|
161
|
+
const y = selection.intervals.y;
|
|
162
|
+
|
|
163
|
+
if (!x && !y) {
|
|
164
|
+
return [];
|
|
165
|
+
} else {
|
|
166
|
+
return [
|
|
167
|
+
{
|
|
168
|
+
// Using a hack here. All properties are prefixed with an underscore
|
|
169
|
+
// to prevent them from being visible in the tooltip.
|
|
170
|
+
// No properties, no tooltip. This still enables picking, masking
|
|
171
|
+
// elements under the selection rect and preventing them being
|
|
172
|
+
// selected or tooltipped.
|
|
173
|
+
// An alternative solution would necessitate adding more flags or
|
|
174
|
+
// logic to force picking in the absence of tooltips.
|
|
175
|
+
_x: x?.[0],
|
|
176
|
+
_x2: x?.[1],
|
|
177
|
+
_y: y?.[0],
|
|
178
|
+
_y2: y?.[1],
|
|
179
|
+
},
|
|
180
|
+
];
|
|
181
|
+
}
|
|
182
|
+
}
|
|
@@ -122,8 +122,18 @@ export default class Rectangle {
|
|
|
122
122
|
*
|
|
123
123
|
* @param {number} x
|
|
124
124
|
* @param {number} y
|
|
125
|
+
* @param {boolean} [flipY]
|
|
125
126
|
*/
|
|
126
|
-
normalizePoint(x: number, y: number): {
|
|
127
|
+
normalizePoint(x: number, y: number, flipY?: boolean): {
|
|
128
|
+
x: number;
|
|
129
|
+
y: number;
|
|
130
|
+
};
|
|
131
|
+
/**
|
|
132
|
+
* @param {number} x
|
|
133
|
+
* @param {number} y
|
|
134
|
+
* @param {boolean} flipY
|
|
135
|
+
*/
|
|
136
|
+
denormalizePoint(x: number, y: number, flipY?: boolean): {
|
|
127
137
|
x: number;
|
|
128
138
|
y: number;
|
|
129
139
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rectangle.d.ts","sourceRoot":"","sources":["../../../../src/view/layout/rectangle.js"],"names":[],"mappings":"AAQA;;;;;;;GAOG;AACH;IACI;;;;;;OAMG;IACH,iBALW,MAAM,KACN,MAAM,SACN,MAAM,UACN,MAAM,aAShB;IAED,uBAA2C;IA+B3C;;;;;;OAMG;IACH,eALW,QAAQ,KACR,QAAQ,SACR,QAAQ,UACR,QAAQ,EAOlB;IAzCD;;;;OAIG;IACH,cAJW,IAAI,SACJ,MAAM,IAAG,MAAW,MAAM,CAAA,GACxB,QAAQ,CAiBpB;IAED;;OAEG;IACH,mBAFW,IAAI,YAId;IAUG,gBAAgB,CAAC,sBAAW;IAC5B,gBAAgB,CAAC,sBAAW;IAC5B,gBAAgB,CAAC,0BAAmB;IACpC,gBAAgB,CAAC,2BAAqB;IAG1C;;OAEG;IACH,SAFa,MAAM,CAIlB;IAED;;OAEG;IACH,SAFa,MAAM,CAIlB;IAED;;OAEG;IACH,aAFa,MAAM,CAIlB;IAED;;OAEG;IACH,cAFa,MAAM,CAIlB;IAED,iBAEC;IAED,iBAEC;IAED;;;;OAIG;IACH,kBAFW,SAAS,WAcnB;IAED;;;OAGG;IACH,cAFW,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,IAAG,MAAW,MAAM,CAAA,CAAC,CAAC,aAkB3D;IAED;;;;OAIG;IACH,aAHW,MAAM,IAAG,MAAW,MAAM,CAAA,KAC1B,MAAM,IAAG,MAAW,MAAM,CAAA,aAapC;IAED;;;;OAIG;IACH,uBAFW,SAAS,aAKnB;IAED;;;OAGG;IACH,gBAFW,OAAO,iCA0BjB;IAED;;;OAGG;IACH,gBAFW,OAAO,aAIjB;IAED;;;;OAIG;IACH,qBAFW,SAAS,aAenB;IAED;;;;OAIG;IACH,iBAFW,SAAS,aAenB;IAED;;OAEG;IACH,qBAEC;IAED;;;OAGG;IACH,qBAOC;IAED;;;;;OAKG;IACH,iBAHW,MAAM,KACN,MAAM,WAIhB;IAED
|
|
1
|
+
{"version":3,"file":"rectangle.d.ts","sourceRoot":"","sources":["../../../../src/view/layout/rectangle.js"],"names":[],"mappings":"AAQA;;;;;;;GAOG;AACH;IACI;;;;;;OAMG;IACH,iBALW,MAAM,KACN,MAAM,SACN,MAAM,UACN,MAAM,aAShB;IAED,uBAA2C;IA+B3C;;;;;;OAMG;IACH,eALW,QAAQ,KACR,QAAQ,SACR,QAAQ,UACR,QAAQ,EAOlB;IAzCD;;;;OAIG;IACH,cAJW,IAAI,SACJ,MAAM,IAAG,MAAW,MAAM,CAAA,GACxB,QAAQ,CAiBpB;IAED;;OAEG;IACH,mBAFW,IAAI,YAId;IAUG,gBAAgB,CAAC,sBAAW;IAC5B,gBAAgB,CAAC,sBAAW;IAC5B,gBAAgB,CAAC,0BAAmB;IACpC,gBAAgB,CAAC,2BAAqB;IAG1C;;OAEG;IACH,SAFa,MAAM,CAIlB;IAED;;OAEG;IACH,SAFa,MAAM,CAIlB;IAED;;OAEG;IACH,aAFa,MAAM,CAIlB;IAED;;OAEG;IACH,cAFa,MAAM,CAIlB;IAED,iBAEC;IAED,iBAEC;IAED;;;;OAIG;IACH,kBAFW,SAAS,WAcnB;IAED;;;OAGG;IACH,cAFW,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,IAAG,MAAW,MAAM,CAAA,CAAC,CAAC,aAkB3D;IAED;;;;OAIG;IACH,aAHW,MAAM,IAAG,MAAW,MAAM,CAAA,KAC1B,MAAM,IAAG,MAAW,MAAM,CAAA,aAapC;IAED;;;;OAIG;IACH,uBAFW,SAAS,aAKnB;IAED;;;OAGG;IACH,gBAFW,OAAO,iCA0BjB;IAED;;;OAGG;IACH,gBAFW,OAAO,aAIjB;IAED;;;;OAIG;IACH,qBAFW,SAAS,aAenB;IAED;;;;OAIG;IACH,iBAFW,SAAS,aAenB;IAED;;OAEG;IACH,qBAEC;IAED;;;OAGG;IACH,qBAOC;IAED;;;;;OAKG;IACH,iBAHW,MAAM,KACN,MAAM,WAIhB;IAED;;;;;;OAMG;IACH,kBAJW,MAAM,KACN,MAAM,UACN,OAAO;;;MAWjB;IAED;;;;OAIG;IACH,oBAJW,MAAM,KACN,MAAM,UACN,OAAO;;;MAUjB;IAED,mBAEC;IAED,0BAMC;CACJ;;;;;mBAnUY,CAAC,GAAG,GAAG,GAAG,GAAG,OAAO,GAAG,QAAQ,CAAC;;;;;sBAChC,OAAO,cAAc,EAAE,OAAO;;;;;uBAC9B,MAAM,MAAM"}
|
|
@@ -294,12 +294,32 @@ export default class Rectangle {
|
|
|
294
294
|
*
|
|
295
295
|
* @param {number} x
|
|
296
296
|
* @param {number} y
|
|
297
|
+
* @param {boolean} [flipY]
|
|
297
298
|
*/
|
|
298
|
-
normalizePoint(x, y) {
|
|
299
|
-
|
|
299
|
+
normalizePoint(x, y, flipY = false) {
|
|
300
|
+
const point = {
|
|
300
301
|
x: (x - this.x) / this.width,
|
|
301
302
|
y: (y - this.y) / this.height,
|
|
302
303
|
};
|
|
304
|
+
if (flipY) {
|
|
305
|
+
point.y = 1 - point.y;
|
|
306
|
+
}
|
|
307
|
+
return point;
|
|
308
|
+
}
|
|
309
|
+
|
|
310
|
+
/**
|
|
311
|
+
* @param {number} x
|
|
312
|
+
* @param {number} y
|
|
313
|
+
* @param {boolean} flipY
|
|
314
|
+
*/
|
|
315
|
+
denormalizePoint(x, y, flipY = false) {
|
|
316
|
+
if (flipY) {
|
|
317
|
+
y = 1 - y;
|
|
318
|
+
}
|
|
319
|
+
return {
|
|
320
|
+
x: this.x + x * this.width,
|
|
321
|
+
y: this.y + y * this.height,
|
|
322
|
+
};
|
|
303
323
|
}
|
|
304
324
|
|
|
305
325
|
toString() {
|
|
@@ -177,4 +177,16 @@ test("normalizePoint", () => {
|
|
|
177
177
|
expect(r.normalizePoint(1, 2)).toEqual({ x: 0, y: 0 });
|
|
178
178
|
expect(r.normalizePoint(7, 2)).toEqual({ x: 1, y: 0 });
|
|
179
179
|
expect(r.normalizePoint(4, 4)).toEqual({ x: 0.5, y: 0.5 });
|
|
180
|
+
|
|
181
|
+
expect(r.normalizePoint(1, 6, true)).toEqual({ x: 0, y: 0 });
|
|
182
|
+
});
|
|
183
|
+
|
|
184
|
+
test("denormalizePoint", () => {
|
|
185
|
+
const r = Rectangle.create(1, 2, 6, 4);
|
|
186
|
+
|
|
187
|
+
expect(r.denormalizePoint(0, 0)).toEqual({ x: 1, y: 2 });
|
|
188
|
+
expect(r.denormalizePoint(1, 0)).toEqual({ x: 7, y: 2 });
|
|
189
|
+
expect(r.denormalizePoint(0.5, 0.5)).toEqual({ x: 4, y: 4 });
|
|
190
|
+
|
|
191
|
+
expect(r.denormalizePoint(0, 0, true)).toEqual({ x: 1, y: 6 });
|
|
180
192
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"paramMediator.d.ts","sourceRoot":"","sources":["../../../src/view/paramMediator.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"paramMediator.d.ts","sourceRoot":"","sources":["../../../src/view/paramMediator.js"],"names":[],"mappings":"AAmVA;;;GAGG;AACH,6BAHW,GAAG,GACD,CAAC,IAAI,OAAO,sBAAsB,EAAE,OAAO,CAIvD;AAED;;;;;;;GAOG;AACH,+BAHa,CAAC,KADH,CAAC,GAAG,OAAO,sBAAsB,EAAE,OAAO,GAExC,CAAC,CAWb;AAED;;;GAGG;AACH,sFAFa,KAAK,IAAI,OAAO,sBAAsB,EAAE,iBAAiB,CAIrE;AAED;;;GAGG;AACH,uFAFa,KAAK,IAAI,OAAO,sBAAsB,EAAE,kBAAkB,CAItE;AAED;;;;;;;;;;GAUG;AACH,qCAF4E,CAAC,SAA/D,MAAM,CAAC,MAAM,EAAE,GAAG,GAAG,OAAO,sBAAsB,EAAE,OAAO,CAAE,iBAJhE,aAAa,SACb,CAAC,aACD,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,IAAI,GAuCjB,CAAC,CACtB;AAED;;;;;;GAMG;AACH,4CAHW,MAAM,GACJ,MAAM,CAUlB;AAED;;;;;;;GAOG;AACH,2CAHW,GAAG,GACD,eAAe,CAW3B;AAtcD;;;;;;;;GAQG;AACH;IA2BI;;;;;OAKG;IACH,2BALW,MAAM,aAAa,EAU7B;IA7BD;;;OAGG;IACH,0BAHU,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,IAAI,CAAC,CAAC,CAGvB;IA2Bf;;;OAGG;IACH,wEAzCqB,GAAG,KAAK,IAAI,CA2GhC;IAED;;;;;;;OAOG;IACH,eAFa,CAAC,aAJH,MAAM,gBACN,CAAC,YACD,OAAO,GACL,CAAC,KAAK,EAAE,CAAC,KAAK,IAAI,CAgC9B;IAED;;;OAGG;IACH,qBAFW,MAAM,WA1Ic,GAAG,KAAK,IAAI,CAkJ1C;IAED;;;OAGG;IACH,oBAFW,MAAM,OAIhB;IAED;;;OAGG;IACH,qBAFW,MAAM,OAKhB;IAED;;OAEG;IACH,oBACsB,WAAW,CAAC,MAAM,2CAAY,CAGnD;IAED;;;;OAIG;IACH,gCAHW,MAAM,GACJ,aAAa,CAQzB;IAID;;;;OAIG;IACH,uBAFW,MAAM,mBA4EhB;IAED;;;;OAIG;IACH,qBAFW,MAAM,OAKhB;IAED;;;;;OAKG;IACH,sBAFa,OAAO,CAiBnB;;CACJ;;;;;;;;8BA/TY,OAAO,wBAAwB,EAAE,kBAAkB,GAAG;IAAE,WAAW,EAAE,CAAC,QAAQ,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC;IAAC,UAAU,EAAE,MAAM,IAAI,CAAC;IAAC,UAAU,EAAE,MAAM,MAAM,CAAA;CAAC"}
|
|
@@ -2,8 +2,10 @@ import { isString } from "vega-util";
|
|
|
2
2
|
import createFunction from "../utils/expression.js";
|
|
3
3
|
import {
|
|
4
4
|
asSelectionConfig,
|
|
5
|
+
createIntervalSelection,
|
|
5
6
|
createMultiPointSelection,
|
|
6
7
|
createSinglePointSelection,
|
|
8
|
+
isIntervalSelectionConfig,
|
|
7
9
|
isPointSelectionConfig,
|
|
8
10
|
} from "../selection/selection.js";
|
|
9
11
|
|
|
@@ -113,6 +115,13 @@ export default class ParamMediator {
|
|
|
113
115
|
? createMultiPointSelection()
|
|
114
116
|
: createSinglePointSelection(null)
|
|
115
117
|
);
|
|
118
|
+
} else if (isIntervalSelectionConfig(select)) {
|
|
119
|
+
if (!select.encodings) {
|
|
120
|
+
throw new Error(
|
|
121
|
+
`Interval selection "${name}" must have encodings defined!`
|
|
122
|
+
);
|
|
123
|
+
}
|
|
124
|
+
setter(createIntervalSelection(select.encodings));
|
|
116
125
|
}
|
|
117
126
|
}
|
|
118
127
|
|
|
@@ -44,6 +44,7 @@ export default class ScaleResolution implements ScaleResolutionApi {
|
|
|
44
44
|
type: import("../spec/channel.js").Type;
|
|
45
45
|
/** @type {string} An optional unique identifier for the scale */
|
|
46
46
|
name: string;
|
|
47
|
+
get zoomExtent(): number[];
|
|
47
48
|
/**
|
|
48
49
|
* Adds a listener that is called when the scale domain is changed,
|
|
49
50
|
* e.g., zoomed. The call is synchronous and happens before the views
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scaleResolution.d.ts","sourceRoot":"","sources":["../../../src/view/scaleResolution.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"scaleResolution.d.ts","sourceRoot":"","sources":["../../../src/view/scaleResolution.js"],"names":[],"mappings":"AA4+BA;;;;;;;;;;GAUG;AACH,6CAFW,OAAO,WAAW,EAAE,OAAO,GAAG,OAAO,WAAW,EAAE,OAAO,EAAE,QA4BrE;AAp+BD,2BAA4B,cAAc,CAAC;AAC3C,sBAAuB,SAAS,CAAC;AACjC,sBAAuB,SAAS,CAAC;AACjC,oBAAqB,OAAO,CAAC;AAC7B,oBAAqB,OAAO,CAAC;AAE7B;;;;;;;;GAQG;AACH;;;;;;;GAOG;AACH;IA4CI;;OAEG;IACH,2DASC;IARG,8CAAsB;IACtB,yDAAyD;IACzD,SADW,qBAAqB,EAAE,CACjB;IACjB,0FAA0F;IAC1F,MADW,OAAO,oBAAoB,EAAE,IAAI,CAC5B;IAEhB,iEAAiE;IACjE,MADW,MAAM,CACI;IAWzB,2BAMC;IAED;;;;;;;OAOG;IACH,4KAEC;IAED;;;OAGG;IACH,+KAEC;IAcD;;;;;OAKG;IACH,qBAFW,qBAAqB,QAqD/B;IA8MD;;;;OAIG;IACH,+DAOC;IAED;;OAEG;IACH,oBAsCC;IAED;;OAEG;IACH;eA7ZkC,OAAO,kBAAkB,EAAE,KAAK;MAqcjE;IAED,mBAEC;IAED;;OAEG;IACH,oBAFa,mFAA6B,CAOzC;IAED;;;;OAIG;IACH,oBAKC;IAED;;OAEG;IACH,sBAGC;IAUD;;;;;;;OAOG;IACH,kBALW,MAAM,eACN,MAAM,OACN,MAAM,GACJ,OAAO,CAmEnB;IAED;;;;;;OAMG;IACH,eAJW,mFAA6B,aAC7B,OAAO,GAAG,MAAM,iBA0D1B;IAED;;;;OAIG;IACH,qBAcC;IAED;;;;;OAKG;IACH,uBAOC;IAED;;;;;;;OAOG;IACH,wBAoBC;IAiED;;;OAGG;IACH,aAFa,OAAO,qBAAqB,EAAE,OAAO,CAajD;IAID;;;;;OAKG;IACH,uBAFW,MAAM,yDAUhB;IAED;;OAEG;IACH,iBAFW,MAAM,yDAKhB;IAED;;;OAGG;IACH,qBAHW,MAAM,+CAAmB,GACvB,MAAM,CAQlB;IAED;;;OAGG;IACH,8BAHW,kFAA4B,GAC1B,MAAM,EAAE,CAOpB;;CACJ;kCA91B+B,CAAC,SAApB,6CAAkB;;;;UAGrB,OAAO,eAAe,EAAE,OAAO;aAC/B,CAAC;gBACD,OAAO,oBAAoB,EAAE,mBAAmB;sBAChD,CAAC,OAAO,+CAAkB,EAAE,IAAI,EAAE,OAAO,oBAAoB,EAAE,IAAI,kDAAgB"}
|