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

fix(heatmap): HeatmapCell properties other than value should be optional #870

Merged
merged 7 commits into from
Jul 28, 2023
Merged

fix(heatmap): HeatmapCell properties other than value should be optional #870

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8047f57
fix(heatmap): `HeatmapCell` properties other than `value` should be o…
wsuwt Jul 28, 2023
dc41112
docs: modernise heatmap demo page
wsuwt Jul 28, 2023
69bef51
refactor: remove if
wsuwt Jul 28, 2023
b459dda
refactor: remove invalid `type: Function`
wsuwt Jul 28, 2023
3639e0e
Update packages/elements/src/heatmap/index.ts
wsuwt Jul 28, 2023
0c86b9c
refactor: remove unused css selectors
wsuwt Jul 28, 2023
ae6a25c
Merge branch 'fix-heatmap-data-type-v6' of https://github.com/Refinit…
wsuwt Jul 28, 2023
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
28 changes: 13 additions & 15 deletions packages/elements/src/heatmap/__demo__/color.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,40 +74,38 @@ <h3>EF Heatmap - Colors</h3>
</demo-block>

<script>
var hosts = document.getElementsByTagName('demo-block');
const hosts = document.getElementsByTagName('demo-block');
customElements.whenDefined('demo-block').then(() => {
for (let index = 0; index < hosts.length; index++) {
var demoBlockElement = hosts[index];
var style = document.createElement('style');
const demoBlockElement = hosts[index];
const style = document.createElement('style');
style.innerHTML = '#demo { min-height: 0; }';
demoBlockElement.shadowRoot.appendChild(style);
}
});

var el;

var generateSequentialData = function (start = -1, count = 21, step = 0.1) {
var rows = [];
var columns = [];
const generateSequentialData = function (start = -1, count = 21, step = 0.1) {
const rows = [];
const columns = [];
for (let i = 0; i < count; i++) {
columns.push({ value: start + step * i });
}
rows.push(columns);
return rows;
};

var generateSparkline = function () {
var result = [];
for (var i = 0; i < 10; i++) {
const generateSparkline = function () {
const result = [];
for (let i = 0; i < 10; i++) {
result.push(Math.random());
}
return result;
};
var initEl = function (id, rows, columns) {
el = document.getElementById(id);
const initEl = function (id, rows, columns) {
const el = document.getElementById(id);
el.tooltipCallback = function (cell) {
var tooltip = document.createElement('div');
var template = `
const tooltip = document.createElement('div');
const template = `
<div style="font-weight: 600">Actual value:</div>
<div style="color:${cell.color}">${cell.value}</div>
<ef-sparkline data="[${generateSparkline().join()}]" style="width: 100%;margin-top:5px;"></ef-sparkline>
Expand Down
35 changes: 17 additions & 18 deletions packages/elements/src/heatmap/__demo__/custom-cell.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,13 @@ <h3>EF Heatmap - Custom cell</h3>
</demo-block>

<script>
var el;
var generateData = function (r, c, withHeader) {
var rows = Array(r);
const generateData = function (r, c, withHeader) {
const rows = Array(r);
for (let i = 0; i < rows.length; i++) {
var columns = Array(c);
const columns = Array(c);
for (let ii = 0; ii < columns.length; ii++) {
var shift = (i * ii) / (c * r);
var value = -1 + shift + (Math.random() / 2 + 0.5 * shift) * (2 - shift) * 1;
const shift = (i * ii) / (c * r);
const value = -1 + shift + (Math.random() / 2 + 0.5 * shift) * (2 - shift) * 1;
columns[ii] = {
header: withHeader ? Math.random().toString(36).substring(2, 5).toUpperCase() : null,
value
Expand All @@ -67,13 +66,13 @@ <h3>EF Heatmap - Custom cell</h3>
return rows;
};

var generateDataWithDiagonalLine = function (r, c) {
var rows = Array(r);
const generateDataWithDiagonalLine = function (r, c) {
const rows = Array(r);
for (let i = 0; i < rows.length; i++) {
var columns = Array(c);
const columns = Array(c);
for (let ii = 0; ii < columns.length; ii++) {
var shift = (Math.random(1) * 1.5) / (c * r);
var value = -0.75 + shift + (Math.random() / 2 + 0.75 * shift) * (2 - shift) * 1.5;
const shift = (Math.random(1) * 1.5) / (c * r);
const value = -0.75 + shift + (Math.random() / 2 + 0.75 * shift) * (2 - shift) * 1.5;

if (i === ii) {
columns[ii] = null;
Expand All @@ -86,18 +85,18 @@ <h3>EF Heatmap - Custom cell</h3>
return rows;
};

var generateSparkline = function () {
var result = [];
for (var i = 0; i < 10; i++) {
const generateSparkline = function () {
const result = [];
for (let i = 0; i < 10; i++) {
result.push(Math.random());
}
return result;
};
var initEl = function (id, rows, columns) {
el = document.getElementById(id);
const initEl = function (id, rows, columns) {
const el = document.getElementById(id);
el.tooltipCallback = function (cell) {
var tooltip = document.createElement('div');
var template = `
const tooltip = document.createElement('div');
const template = `
<div style="font-weight: 600">Actual value:</div>
<div style="color:${cell.color}">${cell.value}</div>
<ef-sparkline data="[${generateSparkline().join()}]" style="width: 100%;margin-top:5px;"></ef-sparkline>
Expand Down
42 changes: 15 additions & 27 deletions packages/elements/src/heatmap/__demo__/event.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,9 @@
max-width: none !important;
width: 100% !important;
}

#spacing {
--spacing: 12px;
}

ef-heatmap {
height: 400px;
}

#normal {
height: inherit;
}

#large {
height: 1900px;
}
</style>
</shady-css-scoped>

Expand Down Expand Up @@ -73,13 +60,13 @@ <h3>Sapphire Heatmap</h3>
<script>
const isIE = /Trident/g.test(navigator.userAgent);

var generateData = function (r, c, minPoint = -1, maxPoint = 1) {
var rows = Array(r);
const generateData = function (r, c, minPoint = -1, maxPoint = 1) {
const rows = Array(r);
for (let i = 0; i < rows.length; i++) {
var columns = Array(c);
const columns = Array(c);
for (let ii = 0; ii < columns.length; ii++) {
var shift = (i * ii) / (c * r);
var value = -1 + shift + (Math.random() / 2 + 0.5 * shift) * (2 - shift) * maxPoint;
const shift = (i * ii) / (c * r);
const value = -1 + shift + (Math.random() / 2 + 0.5 * shift) * (2 - shift) * maxPoint;

columns[ii] = {
value: minPoint >= 0 ? Math.abs(value) : value
Expand All @@ -91,22 +78,23 @@ <h3>Sapphire Heatmap</h3>
return rows;
};

var generateSparkline = function () {
var result = [];
for (var i = 0; i < 10; i++) {
const generateSparkline = function () {
const result = [];
for (let i = 0; i < 10; i++) {
result.push(Math.random());
}
return result;
};

var dlg = document.getElementById('dlg');
var menu = document.getElementById('menu');
const dlg = document.getElementById('dlg');
const menu = document.getElementById('menu');

let dlgTemplate;
var initEl = function (id, rows, columns) {
var el = document.getElementById(id);
const initEl = function (id, rows, columns) {
const el = document.getElementById(id);
el.tooltipCallback = function (cell) {
var tooltip = document.createElement('div');
var template = `
const tooltip = document.createElement('div');
const template = `
<div style="font-weight: 600">Actual value:</div>
<div style="color:${cell.color}">${cell.value}</div>
<ef-sparkline data="[${generateSparkline().join()}]" style="width: 100%;margin-top:5px;"></ef-sparkline>
Expand Down
24 changes: 11 additions & 13 deletions packages/elements/src/heatmap/__demo__/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,15 +65,13 @@ <h3>EF Heatmap</h3>
</demo-block>

<script>
var el;

var generateData = function (r, c, minPoint = -1, maxPoint = 1) {
var rows = Array(r);
const generateData = function (r, c, minPoint = -1, maxPoint = 1) {
const rows = Array(r);
for (let i = 0; i < rows.length; i++) {
var columns = Array(c);
const columns = Array(c);
for (let ii = 0; ii < columns.length; ii++) {
var shift = (i * ii) / (c * r);
var value = -1 + shift + (Math.random() / 2 + 0.5 * shift) * (2 - shift) * maxPoint;
const shift = (i * ii) / (c * r);
const value = -1 + shift + (Math.random() / 2 + 0.5 * shift) * (2 - shift) * maxPoint;

columns[ii] = {
value: minPoint >= 0 ? Math.abs(value) : value
Expand All @@ -84,18 +82,18 @@ <h3>EF Heatmap</h3>
return rows;
};

var generateSparkline = function () {
var result = [];
for (var i = 0; i < 10; i++) {
const generateSparkline = function () {
const result = [];
for (let i = 0; i < 10; i++) {
result.push(Math.random());
}
return result;
};
var initEl = function (id, rows, columns) {
const initEl = function (id, rows, columns) {
el = document.getElementById(id);
el.tooltipCallback = function (cell) {
var tooltip = document.createElement('div');
var template = `
const tooltip = document.createElement('div');
const template = `
<div style="font-weight: 600">Actual value:</div>
<div style="color:${cell.color}">${cell.value}</div>
<ef-sparkline data="[${generateSparkline().join()}]" style="width: 100%;margin-top:5px;"></ef-sparkline>
Expand Down
20 changes: 10 additions & 10 deletions packages/elements/src/heatmap/helpers/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
type HeatmapConfig = {
data: Array<HeatmapCell[]>;
data: HeatmapCell[][];
yAxis?: HeatmapYAxis;
xAxis?: HeatmapXAxis;
};
Expand All @@ -16,18 +16,18 @@ type HeatmapYAxis = {
};

type HeatmapCell = {
rowIndex: number;
colIndex: number;
x: number;
y: number;
width: number;
height: number;
rowIndex?: number;
colIndex?: number;
x?: number;
y?: number;
width?: number;
height?: number;
value: number | null;
header?: string;
label?: string;
foregroundColor: string;
defaultBackground: string;
backgroundColor: string;
foregroundColor?: string;
defaultBackground?: string;
backgroundColor?: string;
animationFrame?: number;
customLabel?: string;
customBackgroundColor?: string;
Expand Down
Loading