Skip to content

Commit

Permalink
fix: render nodeLabel formatted text into the nodes (opensearch-proje…
Browse files Browse the repository at this point in the history
  • Loading branch information
monfera authored May 27, 2021
1 parent ccd72c3 commit 0de9688
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export function renderLinearPartitionCanvas2d(
diskCenter,
width: panelWidth,
height: panelHeight,
layers,
}: ShapeViewModel,
{ currentFocusX0, currentFocusX1, prevFocusX0, prevFocusX1 }: ContinuousDomainFocus,
chartId: ChartId,
Expand Down Expand Up @@ -88,14 +89,16 @@ export function renderLinearPartitionCanvas2d(
ctx.translate(diskCenter.x, diskCenter.y);
ctx.clearRect(0, 0, width, height);

quadViewModel.forEach(({ fillColor, x0, x1, y0px: y0, y1px: y1, dataName: label, textColor }) => {
quadViewModel.forEach(({ fillColor, x0, x1, y0px: y0, y1px: y1, dataName, textColor, depth }) => {
if (y1 - y0 <= padding) return;

const fx0 = Math.max((x0 - focusX0) * scale, 0);
const fx1 = Math.min((x1 - focusX0) * scale, width);

if (fx1 < 0 || fx0 > width) return;

const formatter = layers[depth]?.nodeLabel ?? String;
const label = formatter(dataName);
const fWidth = fx1 - fx0;
const fPadding = Math.min(padding, MAX_PADDING_RATIO * fWidth);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const color = palette.slice().reverse();
const getLayerSpec = (maxDepth: number = 30) =>
[...new Array(maxDepth + 1)].map((_, depth) => ({
groupByRollup: (d: Datum) => data.dictionary[d.layers[depth]],
nodeLabel: (d: PrimitiveValue) => String(d),
nodeLabel: (d: PrimitiveValue) => `${String(d)}/`,
showAccessor: (d: PrimitiveValue) => d !== undefined,
shape: {
fillColor: () => discreteColor(color, 0.8)(depth),
Expand Down

0 comments on commit 0de9688

Please sign in to comment.