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.

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

revert: adding back "Table rendering support for databars (#1212)" #1365

Merged
merged 4 commits into from
Jun 12, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
5 changes: 5 additions & 0 deletions packages/code-studio/src/styleguide/Grids.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import StaticExample from './grid-examples/StaticExample';
import QuadrillionExample from './grid-examples/QuadrillionExample';
import TreeExample from './grid-examples/TreeExample';
import AsyncExample from './grid-examples/AsyncExample';
import DataBarExample from './grid-examples/DataBarExample';

function Grids(): ReactElement {
const dh = useApi();
Expand All @@ -34,6 +35,10 @@ function Grids(): ReactElement {
<div style={{ height: 200 }}>
<StaticExample />
</div>
<h2 className="ui-title">Data Bar</h2>
<div style={{ height: 500 }}>
<DataBarExample />
</div>
<h2 className="ui-title">Quadrillion rows and columns</h2>
<div style={{ height: 500, position: 'relative' }}>
<QuadrillionExample />
Expand Down
123 changes: 123 additions & 0 deletions packages/code-studio/src/styleguide/grid-examples/DataBarExample.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
import React, { useState } from 'react';
import { Grid, MockDataBarGridModel } from '@deephaven/grid';
import { ColorMap } from 'packages/grid/src/DataBarGridModel';

function DataBarExample() {
const columnData = [100, 50, 20, 10, -10, -20, -50, -30, 100, 0, 1];
const data: number[][] = [];
const columnAxes = new Map([
[0, 'proportional'],
[1, 'middle'],
[2, 'directional'],
[6, 'directional'],
[7, 'directional'],
[8, 'directional'],
[9, 'directional'],
[10, 'directional'],
]);
const positiveColors: ColorMap = new Map([
[3, '#72d7df'],
[4, '#ac9cf4'],
]);
positiveColors.set(5, ['#f3cd5b', '#9edc6f']);
positiveColors.set(19, ['#42f54b', '#42b9f5', '#352aa8']);

const negativeColors: ColorMap = new Map([
[3, '#f3cd5b'],
[4, '#ac9cf4'],
]);
negativeColors.set(5, ['#f95d84', '#f3cd5b']);
negativeColors.set(19, ['#e05536', '#e607de', '#e6e207']);

const valuePlacements = new Map([
[6, 'hide'],
[7, 'overlap'],
[8, 'overlap'],
[9, 'overlap'],
]);
const opacities = new Map([
[7, 0.5],
[8, 0.5],
[9, 0.5],
]);
const directions = new Map([
[8, 'RTL'],
[10, 'RTL'],
[16, 'RTL'],
[19, 'RTL'],
]);
const textAlignments = new Map([
[9, 'left'],
[11, 'left'],
]);
const markers = new Map([
[
12,
[
{ column: 13, color: 'white' },
{ column: 14, color: 'gray' },
],
],
]);
for (let i = 0; i < 13; i += 1) {
data.push(columnData.slice());
}
data.push([70, 60, 30, 20, -10, -30, -20, -50, 80, 50, 10]);
data.push([50, 20, 10, 0, 0, -10, -30, 10, 90, 20, 40]);
data.push([-100, -90, -80, -70, -60, -50, -40, -30, -20, -10, 0]);
data.push(columnData.slice());
// Decimals
data.push([
100,
10.5,
11.234,
-20.5,
-50,
-2.5,
-15.1234,
94.254,
25,
44.4444,
-50.5,
]);

// Big values
data.push([
1000000,
10,
200,
-20000,
-2000000,
-25,
-900000,
800000,
100000,
450000,
1,
]);

// RTL gradient with multiple colors
data.push(columnData.slice());

// Both data bar and text
data.push(columnData.slice());
data.push(columnData.slice());
const [model] = useState(
() =>
new MockDataBarGridModel(
data,
columnAxes,
positiveColors,
negativeColors,
valuePlacements,
opacities,
directions,
textAlignments,
markers
)
);

return <Grid model={model} />;
}

export default DataBarExample;
104 changes: 104 additions & 0 deletions packages/grid/src/CellRenderer.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
/* eslint-disable class-methods-use-this */
import { getOrThrow } from '@deephaven/utils';
import { isExpandableGridModel } from './ExpandableGridModel';
import { VisibleIndex, Coordinate, BoxCoordinates } from './GridMetrics';
import GridRenderer from './GridRenderer';
import { GridRenderState } from './GridRendererTypes';
import { GridColor } from './GridTheme';
import memoizeClear from './memoizeClear';

export type CellRenderType = 'text' | 'dataBar';

abstract class CellRenderer {
abstract drawCellContent(
context: CanvasRenderingContext2D,
state: GridRenderState,
column: VisibleIndex,
row: VisibleIndex
): void;

drawCellRowTreeMarker(
context: CanvasRenderingContext2D,
state: GridRenderState,
row: VisibleIndex
): void {
const { metrics, model, mouseX, mouseY, theme } = state;
const {
firstColumn,
gridX,
gridY,
allColumnXs,
allColumnWidths,
allRowYs,
allRowHeights,
visibleRowTreeBoxes,
} = metrics;
const { treeMarkerColor, treeMarkerHoverColor } = theme;
const columnX = getOrThrow(allColumnXs, firstColumn);
const columnWidth = getOrThrow(allColumnWidths, firstColumn);
const rowY = getOrThrow(allRowYs, row);
const rowHeight = getOrThrow(allRowHeights, row);
if (!isExpandableGridModel(model) || !model.isRowExpandable(row)) {
return;
}

const treeBox = getOrThrow(visibleRowTreeBoxes, row);
const color =
mouseX != null &&
mouseY != null &&
mouseX >= gridX + columnX &&
mouseX <= gridX + columnX + columnWidth &&
mouseY >= gridY + rowY &&
mouseY <= gridY + rowY + rowHeight
? treeMarkerHoverColor
: treeMarkerColor;

this.drawTreeMarker(
context,
state,
columnX,
rowY,
treeBox,
color,
model.isRowExpanded(row)
);
}

drawTreeMarker(
context: CanvasRenderingContext2D,
state: GridRenderState,
columnX: Coordinate,
rowY: Coordinate,
treeBox: BoxCoordinates,
color: GridColor,
isExpanded: boolean
): void {
const { x1, y1, x2, y2 } = treeBox;
const markerText = isExpanded ? '⊟' : '⊞';
const textX = columnX + (x1 + x2) * 0.5 + 0.5;
const textY = rowY + (y1 + y2) * 0.5 + 0.5;
context.fillStyle = color;
context.textAlign = 'center';
context.fillText(markerText, textX, textY);
}

getCachedTruncatedString = memoizeClear(
(
context: CanvasRenderingContext2D,
text: string,
width: number,
fontWidth: number,
truncationChar?: string
): string =>
GridRenderer.truncateToWidth(
context,
text,
width,
fontWidth,
truncationChar
),
{ max: 10000 }
);
}

export default CellRenderer;
Loading