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

add arrow handles #315

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

add arrow handles #315

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
126 changes: 103 additions & 23 deletions packages/nightingale-navigation/src/nightingale-navigation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ import NightingaleElement, {
withHighlight,
} from "@nightingale-elements/nightingale-new-core";

const HANDLE_SIZE = 6;
const HANDLE_WIDTH = 20;

@customElement("nightingale-navigation")
class NightingaleNavigation extends withManager(
withResizable(
withMargin(withPosition(withDimensions(withHighlight(NightingaleElement)))),
),
withMargin(withPosition(withDimensions(withHighlight(NightingaleElement))))
)
) {
#x: ScaleLinear<number, number> | null;
#dontDispatch: boolean;
Expand All @@ -49,6 +49,18 @@ class NightingaleNavigation extends withManager(
#axis?: Selection<SVGGElement, unknown, HTMLElement | null, unknown>;
#brushG?: Selection<SVGGElement, unknown, HTMLElement | null, unknown>;
#polygon?: Selection<SVGPolygonElement, unknown, HTMLElement | null, unknown>;
#handleLeft?: Selection<
SVGPolygonElement,
unknown,
HTMLElement | null,
unknown
>;
#handleRight?: Selection<
SVGPolygonElement,
unknown,
HTMLElement | null,
unknown
>;
#xAxis?: Axis<NumberValue>;
#viewport?: BrushBehavior<unknown>;
#highlighted?: Selection<
Expand All @@ -73,6 +85,8 @@ class NightingaleNavigation extends withManager(
"scale-factor"?: number = (this.length || 0) / 5 || 10;
@property({ type: Boolean })
"show-highlight"?: boolean = false;
@property({ type: String })
"handles"?: "rectangle" | "arrows" = "rectangle";

constructor() {
super();
Expand Down Expand Up @@ -122,9 +136,9 @@ class NightingaleNavigation extends withManager(
this.#viewport = brushX()
.extent([
[this["margin-left"] + (this["ruler-padding"] as number), 0],
[limit, this.height * 0.5 + HANDLE_SIZE / 2],
[limit, this.height * 0.5],
])
.handleSize(HANDLE_SIZE)
.handleSize(HANDLE_WIDTH)
.on("end", ({ selection }) => {
// In case is a click outside the brush, reset brush to previous position
if (
Expand Down Expand Up @@ -153,29 +167,65 @@ class NightingaleNavigation extends withManager(
},
bubbles: true,
cancelable: true,
}),
})
);
this.updateLabels();
this.updatePolygon();
this.updateHandles();
}
});

this.#polygon = this.#svg
.append("polygon")
.attr("class", "zoom-polygon")
.attr("fill", "#777")
.attr("fill-opacity", "0.3");

this.#brushG = this.#svg.append("g").attr("class", "brush");

if (limit > 0) {
// Section to add arrows to handles
const arrowWidth = HANDLE_WIDTH;
const arrowHeight = 0.75 * arrowWidth;

this.#handleLeft = this.#brushG.append("polygon");
this.#handleRight = this.#brushG.append("polygon");

for (const [handle, side] of [
[this.#handleLeft, "left"],
[this.#handleRight, "right"],
] as const) {
handle
.attr("class", `custom-handle handle-${side}`)
.attr("stroke", "#fff")
.attr("fill", "#000")
// Draws a ↔
.attr(
"points",
`${-arrowWidth / 2} ${this.height / 4}
${-arrowWidth / 5} ${this.height / 4 - arrowHeight / 2}
${-arrowWidth / 5} ${this.height / 4 - arrowHeight / 6}
${arrowWidth / 5} ${this.height / 4 - arrowHeight / 6}
${arrowWidth / 5} ${this.height / 4 - arrowHeight / 2}
${arrowWidth / 2} ${this.height / 4}
${arrowWidth / 5} ${this.height / 4 + arrowHeight / 2}
${arrowWidth / 5} ${this.height / 4 + arrowHeight / 6}
${-arrowWidth / 5} ${this.height / 4 + arrowHeight / 6}
${-arrowWidth / 4} ${this.height / 4 + arrowHeight / 2}`
);
}
// End of section to add arrows to handles

this.#brushG.call(this.#viewport);

this.#brushG.call(this.#viewport.move, [
this.#x(this.getStart()),
this.#x(this.getEnd()),
]);
}

this.#polygon = this.#svg
.append("polygon")
.attr("class", "zoom-polygon")
.attr("fill", "#777")
.attr("fill-opacity", "0.3");
// Hides the D3 native brush area, as we'll use our own this.#polygon
this.#brushG.select(".selection").attr("opacity", "0");
}

this.#margins = this.#svg.append("g").attr("class", "margin");
this.createHighlight();
Expand All @@ -199,7 +249,7 @@ class NightingaleNavigation extends withManager(
[this["margin-left"] + (this["ruler-padding"] as number), 0],
[
this.width - this["margin-right"] - (this["ruler-padding"] as number),
this.height * 0.5 + HANDLE_SIZE / 2,
this.height * 0.5 + HANDLE_WIDTH / 2,
],
]);
if (this.#viewport) this.#brushG?.call(this.#viewport);
Expand Down Expand Up @@ -247,22 +297,22 @@ class NightingaleNavigation extends withManager(
this.locate(
Math.max(
(this["ruler-start"] as number) || 1,
this.getStart() - (this["scale-factor"] as number),
this.getStart() - (this["scale-factor"] as number)
),
Math.min(
(this.length || 1) + (this["ruler-start"] as number) - 1,
this.getEnd() + (this["scale-factor"] as number),
),
this.getEnd() + (this["scale-factor"] as number)
)
);
}
zoomIn() {
const newStart = Math.min(
this.getStart() + (this["scale-factor"] as number),
this.getEnd() - 1,
this.getEnd() - 1
);
this.locate(
newStart,
Math.max(this.getEnd() - (this["scale-factor"] as number), newStart + 1),
Math.max(this.getEnd() - (this["scale-factor"] as number), newStart + 1)
);
}
protected updateHighlight() {
Expand Down Expand Up @@ -337,13 +387,14 @@ class NightingaleNavigation extends withManager(
"width",
(segment) =>
s2(Math.min(this.length || 1, segment.end) + 1) -
s2(Math.max(1, segment.start)),
s2(Math.max(1, segment.start))
)
.attr("y", this["margin-top"])
.attr("height", this.height / 2);

highlighsRect.exit().remove();
}

private updateLabels() {
if (this.#displaystartLabel)
this.#displaystartLabel
Expand All @@ -356,15 +407,44 @@ class NightingaleNavigation extends withManager(
}

private updatePolygon() {
if (this.#polygon && this.#x)
if (this.#polygon && this.#x) {
const start = this.#x(this.getStart());
const end = this.#x(this.getEnd());
/**
* Draws a polygon showing the zoom area in the overview with respect to
* the visible area in the visualisation below
* ╭────╮
* │ │
* ╱ │
* ╱ │
* ╱ │
* ╰────────╯
*/
this.#polygon.attr(
"points",
`${this.#x(this.getStart())},${this.height / 2}
${this.#x(this.getEnd())},${this.height / 2}
`${start},${this.height / 2}
${start},0
${end},0
${end},${this.height / 2}
${this.width - this["margin-right"]},${this.height}
${this["margin-left"]},${this.height}`,
${this["margin-left"]},${this.height}`
);
}
}

private updateHandles() {
if (this.#handleLeft && this.#handleRight && this.#x) {
this.#handleLeft.attr(
"transform",
`translate(${this.#x(this.getStart())})`
);
this.#handleRight.attr(
"transform",
`translate(${this.#x(this.getEnd())})`
);
}
}

private getStart(): number {
return this["display-start"] || 1;
}
Expand Down
Loading