@hpcc-js/other 2.17.1 → 2.17.3

package/src/Legend.css

@@ -1,86 +1,86 @@
-.other_Legend .colorBlock{
-    width:10px;
-    height:10px;
-}
-.other_Legend > table, .other_Legend > table td,.other_Legend > table th {
-    border-collapse: collapse;
-    border-spacing: 0px;
-}
-.other_Table.other_Legend  table {
-    border-spacing: 0;
-}
-.other_Table.other_Legend th, .labels-wrapper th {
-    padding: 2px 5px;
-    background-color: transparent;
-    border-width: 1px;
-    border-style: solid;
-    border-color: transparent;
-    color: #333;
-    white-space: nowrap;
-    cursor: default;
-    font-weight:normal;
-    text-align:left;
-}
-.other_Table.other_Legend  tr {
-    background-color: transparent;
-    color: #333;
-}
-
-.other_Table.other_Legend .tableDiv tbody > tr:nth-child(odd) {
-    background-color: unset;
-    color:black;
-}
-.other_Table.other_Legend .tableDiv tbody > tr:hover, 
-.other_Table.other_Legend .tableDiv tbody > tr.hover, 
-.rows-wrapper table tbody tr.hover {
-    background-color: #bfd7e7;
-    color: white;
-}
-
-
-.other_Table.other_Legend thead > tr:hover {
-    background-color: transparent;
-}
-.other_Table.other_Legend tbody > tr:hover, .other_Table.other_Legend tbody > tr.hover, .rows-wrapper tbody tr.hover {
-    background-color: #EEE;
-}
-.other_Table.other_Legend td, .rows-wrapper td {
-    border-width: 0px;
-    padding: 2px 5px;
-    white-space: nowrap;
-    box-sizing: border-box;
-}
-.other_Legend > .tableDiv > table > tbody > tr:hover{
-    cursor:pointer;
-    color:#000;
-    background-color:#DDD;
-}
-.other_Legend.horiz-legend .tableDiv {
-    width: 100%!important;
-    text-align: left;
-}
-.other_Legend.horiz-legend .tableDiv > table {
-    display:inline-block;
-    width:100%!important;
-    top:0px!important;
-    left:0px!important;
-}
-.other_Legend.horiz-legend thead,
-.other_Legend.horiz-legend tbody,
-.other_Legend.horiz-legend tr
-{
-    display: inline-block;
-}
-.other_Legend.horiz-legend td,
-.other_Legend.horiz-legend td > div {
-    display:inline-block;
-    white-space:nowrap;
-}
-.other_Legend.horiz-legend tr{
-    white-space: nowrap;
-}
-.other_Legend.horiz-legend tbody{
-    display:inline-block;
-    width:100%!important;
-    text-align:center;
+.other_Legend .colorBlock{
+    width:10px;
+    height:10px;
+}
+.other_Legend > table, .other_Legend > table td,.other_Legend > table th {
+    border-collapse: collapse;
+    border-spacing: 0px;
+}
+.other_Table.other_Legend  table {
+    border-spacing: 0;
+}
+.other_Table.other_Legend th, .labels-wrapper th {
+    padding: 2px 5px;
+    background-color: transparent;
+    border-width: 1px;
+    border-style: solid;
+    border-color: transparent;
+    color: #333;
+    white-space: nowrap;
+    cursor: default;
+    font-weight:normal;
+    text-align:left;
+}
+.other_Table.other_Legend  tr {
+    background-color: transparent;
+    color: #333;
+}
+
+.other_Table.other_Legend .tableDiv tbody > tr:nth-child(odd) {
+    background-color: unset;
+    color:black;
+}
+.other_Table.other_Legend .tableDiv tbody > tr:hover, 
+.other_Table.other_Legend .tableDiv tbody > tr.hover, 
+.rows-wrapper table tbody tr.hover {
+    background-color: #bfd7e7;
+    color: white;
+}
+
+
+.other_Table.other_Legend thead > tr:hover {
+    background-color: transparent;
+}
+.other_Table.other_Legend tbody > tr:hover, .other_Table.other_Legend tbody > tr.hover, .rows-wrapper tbody tr.hover {
+    background-color: #EEE;
+}
+.other_Table.other_Legend td, .rows-wrapper td {
+    border-width: 0px;
+    padding: 2px 5px;
+    white-space: nowrap;
+    box-sizing: border-box;
+}
+.other_Legend > .tableDiv > table > tbody > tr:hover{
+    cursor:pointer;
+    color:#000;
+    background-color:#DDD;
+}
+.other_Legend.horiz-legend .tableDiv {
+    width: 100%!important;
+    text-align: left;
+}
+.other_Legend.horiz-legend .tableDiv > table {
+    display:inline-block;
+    width:100%!important;
+    top:0px!important;
+    left:0px!important;
+}
+.other_Legend.horiz-legend thead,
+.other_Legend.horiz-legend tbody,
+.other_Legend.horiz-legend tr
+{
+    display: inline-block;
+}
+.other_Legend.horiz-legend td,
+.other_Legend.horiz-legend td > div {
+    display:inline-block;
+    white-space:nowrap;
+}
+.other_Legend.horiz-legend tr{
+    white-space: nowrap;
+}
+.other_Legend.horiz-legend tbody{
+    display:inline-block;
+    width:100%!important;
+    text-align:center;
 }

package/src/Legend.ts

@@ -1,220 +1,220 @@
-import { Palette, Platform } from "@hpcc-js/common";
-import { format as d3Format } from "d3-format";
-import { select as d3Select } from "d3-selection";
-import { Table } from "./Table";
-
-import "../src/Legend.css";
-
-function _htmlColorBlock(hexColor) {
-    return "<div class=\"colorBlock\" style=\"background-color:" + hexColor + ";\"></div>";
-}
-
-export class Legend extends Table {
-    _targetWidget;
-    _targetWidgetMonitor;
-
-    constructor() {
-        super();
-
-        this.showHeader(false);
-        this.pagination(false);
-    }
-
-    isRainbow() {
-        const widget = this.getWidget();
-        return widget && widget._palette && widget._palette.type() === "rainbow";
-    }
-
-    targetWidget(): any;
-    targetWidget(_: any): this;
-    targetWidget(_?: any): any | this {
-        if (!arguments.length) return this._targetWidget;
-        this._targetWidget = _;
-        if (this._targetWidgetMonitor) {
-            this._targetWidgetMonitor.remove();
-            delete this._targetWidgetMonitor;
-        }
-        const context = this;
-        this._targetWidgetMonitor = this._targetWidget.monitor(function (key, newProp, oldProp, source) {
-            switch (key) {
-                case "chart":
-                case "columns":
-                case "data":
-                case "paletteID":
-                    context.lazyRender();
-                    break;
-            }
-        });
-        return this;
-    }
-
-    getWidget() {
-        if (this._targetWidget) {
-            switch (this._targetWidget.classID()) {
-                case "chart_MultiChart":
-                    return this._targetWidget.chart();
-            }
-        }
-        return this._targetWidget;
-    }
-
-    getPalette() {
-        const widget = this.getWidget();
-        if (widget && widget._palette) {
-            switch (widget._palette.type()) {
-                case "ordinal":
-                    return Palette.ordinal(widget._palette.id());
-                case "rainbow":
-                    return Palette.rainbow(widget._palette.id());
-            }
-        }
-        return Palette.ordinal("default");
-    }
-
-    enter(domNode, element) {
-        super.enter(domNode, element);
-        d3Select(domNode.parentNode).style("overflow-y", "auto");
-
-        this.renderHtmlDataCells(true);
-        this.fixedHeader(false);
-        this.fixedSize(true);
-        element.classed("other_Legend", true);
-    }
-
-    update(domNode, element) {
-        const colArr = ["Key", "Label"];
-        let dataArr = [];
-        if (this._targetWidget) {
-            const _palette = this.getPalette();
-            switch (_palette.type()) {
-                case "ordinal":
-                    const oPalette = _palette as Palette.OrdinalPaletteFunc;
-                    switch (this.dataFamily()) {
-                        case "2D":
-                            dataArr = this._targetWidget.data().map(function (n) {
-                                return [_htmlColorBlock(oPalette(n[0])), n[0]];
-                            }, this);
-                            break;
-                        case "ND":
-                            const widgetColumns = this._targetWidget.columns();
-                            dataArr = widgetColumns.filter(function (n, i) { return i > 0; }).map(function (n) {
-                                return [_htmlColorBlock(oPalette(n)), n];
-                            }, this);
-                            break;
-                    }
-                    break;
-                case "rainbow":
-                    const rPalette = _palette as Palette.RainbowPaletteFunc;
-                    const format = d3Format(this.rainbowFormat());
-                    const widget = this.getWidget();
-                    const steps = this.rainbowBins();
-                    const weightMin = widget._dataMinWeight;
-                    const weightMax = widget._dataMaxWeight;
-                    const stepWeightDiff = (weightMax - weightMin) / (steps - 1);
-                    dataArr.push([_htmlColorBlock(rPalette(weightMin, weightMin, weightMax)), format(weightMin)]);
-                    for (let x = 1; x < steps - 1; ++x) {
-                        const mid = stepWeightDiff * x;
-                        dataArr.push([_htmlColorBlock(rPalette(mid, weightMin, weightMax)), format(Math.floor(mid))]);
-                    }
-                    dataArr.push([_htmlColorBlock(rPalette(weightMax, weightMin, weightMax)), format(weightMax)]);
-                    break;
-            }
-        }
-        this.columns(colArr);
-        this.data(dataArr);
-        super.update(domNode, element);
-
-        element.classed("horiz-legend", this.orientation() === "horizontal");
-
-        const table = element.select(".tableDiv > table");
-        const tableRect = table.node().getBoundingClientRect();
-        const elementRect = this._placeholderElement.node().getBoundingClientRect();
-
-        element.select(".tableDiv").style("overflow", "visible");
-
-        const top = elementRect.height / 2 - tableRect.height / 2;
-        const left = elementRect.width / 2 - tableRect.width / 2;
-        table
-            .style("position", "absolute")
-            .style("top", top + "px")
-            .style("left", left + "px")
-            ;
-
-        const startIndex = this.pageNumber() - 1;
-        const itemsOnPage = this.itemsPerPage();
-
-        const start = startIndex * itemsOnPage;
-        const end = startIndex * parseInt(itemsOnPage) + parseInt(itemsOnPage);
-
-        let tData = null;
-        if (this.pagination()) {
-            tData = this.data().slice(start, end);
-        } else {
-            tData = this.data();
-        }
-
-        const rows = this.tbody.selectAll("tr").data(tData);
-        const context = this;
-        rows
-            .on("click", function (d, i) {
-                context.onClick(d, i);
-            })
-            .on("dblclick", function (d, i) {
-                context.onDblClick(d, i);
-            })
-            .on("mouseover", function (d, i) {
-                context.onMouseOver(d, i);
-            })
-            ;
-    }
-
-    exit(domNode, element) {
-        if (this._targetWidgetMonitor) {
-            this._targetWidgetMonitor.remove();
-            delete this._targetWidgetMonitor;
-        }
-        super.exit(domNode, element);
-    }
-
-    onClick(rowData, rowIdx) {
-    }
-
-    onDblClick(rowData, rowIdx) {
-    }
-
-    onMouseOver(rowData, rowIdx) {
-    }
-
-    dataFamily: { (): string; (_: string): Legend };
-    dataFamily_exists: () => boolean;
-    orientation: { (): string; (_: string): Legend };
-    orientation_exists: () => boolean;
-    rainbowFormat: { (): string; (_: string): Legend };
-    rainbowFormat_exists: () => boolean;
-    rainbowBins: { (): number; (_: number): Legend };
-    rainbowBins_exists: () => boolean;
-}
-Legend.prototype._class += " other_Legend";
-
-Legend.prototype.publish("dataFamily", "ND", "set", "Type of data", ["1D", "2D", "ND", "map", "any", "other"], { tags: ["Private"] });
-Legend.prototype.publish("orientation", "vertical", "set", "Orientation of Legend rows", ["vertical", "horizontal"], { tags: ["Private"] });
-Legend.prototype.publish("rainbowFormat", ",", "string", "Rainbow number formatting", null, { tags: ["Private"], optional: true, disable: w => !w.isRainbow() });
-Legend.prototype.publish("rainbowBins", 8, "number", "Number of rainbow bins", null, { tags: ["Private"], disable: w => !w.isRainbow() });
-
-const origGetBBox = Table.prototype.getBBox;
-Legend.prototype.getBBox = function (refresh, round) {
-    const retVal = origGetBBox.apply(this, arguments);
-    const table = this.element().select(".tableDiv > table");
-    if (!table.empty()) {
-        const tableRect = table.node().getBoundingClientRect();
-        const width = tableRect.width + 8 + (this.hasVScroll(this._placeholderElement) ? Platform.getScrollbarWidth() : 0);
-        const height = tableRect.height + 8 + (this.hasHScroll(this._placeholderElement) ? Platform.getScrollbarWidth() : 0);
-        return {
-            x: retVal.x,
-            y: retVal.y,
-            width: (round ? Math.round(width) : width) * this._scale,
-            height: (round ? Math.round(height) : height) * this._scale
-        };
-    }
-    return retVal;
-};
+import { Palette, Platform } from "@hpcc-js/common";
+import { format as d3Format } from "d3-format";
+import { select as d3Select } from "d3-selection";
+import { Table } from "./Table";
+
+import "../src/Legend.css";
+
+function _htmlColorBlock(hexColor) {
+    return "<div class=\"colorBlock\" style=\"background-color:" + hexColor + ";\"></div>";
+}
+
+export class Legend extends Table {
+    _targetWidget;
+    _targetWidgetMonitor;
+
+    constructor() {
+        super();
+
+        this.showHeader(false);
+        this.pagination(false);
+    }
+
+    isRainbow() {
+        const widget = this.getWidget();
+        return widget && widget._palette && widget._palette.type() === "rainbow";
+    }
+
+    targetWidget(): any;
+    targetWidget(_: any): this;
+    targetWidget(_?: any): any | this {
+        if (!arguments.length) return this._targetWidget;
+        this._targetWidget = _;
+        if (this._targetWidgetMonitor) {
+            this._targetWidgetMonitor.remove();
+            delete this._targetWidgetMonitor;
+        }
+        const context = this;
+        this._targetWidgetMonitor = this._targetWidget.monitor(function (key, newProp, oldProp, source) {
+            switch (key) {
+                case "chart":
+                case "columns":
+                case "data":
+                case "paletteID":
+                    context.lazyRender();
+                    break;
+            }
+        });
+        return this;
+    }
+
+    getWidget() {
+        if (this._targetWidget) {
+            switch (this._targetWidget.classID()) {
+                case "chart_MultiChart":
+                    return this._targetWidget.chart();
+            }
+        }
+        return this._targetWidget;
+    }
+
+    getPalette() {
+        const widget = this.getWidget();
+        if (widget && widget._palette) {
+            switch (widget._palette.type()) {
+                case "ordinal":
+                    return Palette.ordinal(widget._palette.id());
+                case "rainbow":
+                    return Palette.rainbow(widget._palette.id());
+            }
+        }
+        return Palette.ordinal("default");
+    }
+
+    enter(domNode, element) {
+        super.enter(domNode, element);
+        d3Select(domNode.parentNode).style("overflow-y", "auto");
+
+        this.renderHtmlDataCells(true);
+        this.fixedHeader(false);
+        this.fixedSize(true);
+        element.classed("other_Legend", true);
+    }
+
+    update(domNode, element) {
+        const colArr = ["Key", "Label"];
+        let dataArr = [];
+        if (this._targetWidget) {
+            const _palette = this.getPalette();
+            switch (_palette.type()) {
+                case "ordinal":
+                    const oPalette = _palette as Palette.OrdinalPaletteFunc;
+                    switch (this.dataFamily()) {
+                        case "2D":
+                            dataArr = this._targetWidget.data().map(function (n) {
+                                return [_htmlColorBlock(oPalette(n[0])), n[0]];
+                            }, this);
+                            break;
+                        case "ND":
+                            const widgetColumns = this._targetWidget.columns();
+                            dataArr = widgetColumns.filter(function (n, i) { return i > 0; }).map(function (n) {
+                                return [_htmlColorBlock(oPalette(n)), n];
+                            }, this);
+                            break;
+                    }
+                    break;
+                case "rainbow":
+                    const rPalette = _palette as Palette.RainbowPaletteFunc;
+                    const format = d3Format(this.rainbowFormat());
+                    const widget = this.getWidget();
+                    const steps = this.rainbowBins();
+                    const weightMin = widget._dataMinWeight;
+                    const weightMax = widget._dataMaxWeight;
+                    const stepWeightDiff = (weightMax - weightMin) / (steps - 1);
+                    dataArr.push([_htmlColorBlock(rPalette(weightMin, weightMin, weightMax)), format(weightMin)]);
+                    for (let x = 1; x < steps - 1; ++x) {
+                        const mid = stepWeightDiff * x;
+                        dataArr.push([_htmlColorBlock(rPalette(mid, weightMin, weightMax)), format(Math.floor(mid))]);
+                    }
+                    dataArr.push([_htmlColorBlock(rPalette(weightMax, weightMin, weightMax)), format(weightMax)]);
+                    break;
+            }
+        }
+        this.columns(colArr);
+        this.data(dataArr);
+        super.update(domNode, element);
+
+        element.classed("horiz-legend", this.orientation() === "horizontal");
+
+        const table = element.select(".tableDiv > table");
+        const tableRect = table.node().getBoundingClientRect();
+        const elementRect = this._placeholderElement.node().getBoundingClientRect();
+
+        element.select(".tableDiv").style("overflow", "visible");
+
+        const top = elementRect.height / 2 - tableRect.height / 2;
+        const left = elementRect.width / 2 - tableRect.width / 2;
+        table
+            .style("position", "absolute")
+            .style("top", top + "px")
+            .style("left", left + "px")
+            ;
+
+        const startIndex = this.pageNumber() - 1;
+        const itemsOnPage = this.itemsPerPage();
+
+        const start = startIndex * itemsOnPage;
+        const end = startIndex * parseInt(itemsOnPage) + parseInt(itemsOnPage);
+
+        let tData = null;
+        if (this.pagination()) {
+            tData = this.data().slice(start, end);
+        } else {
+            tData = this.data();
+        }
+
+        const rows = this.tbody.selectAll("tr").data(tData);
+        const context = this;
+        rows
+            .on("click", function (d, i) {
+                context.onClick(d, i);
+            })
+            .on("dblclick", function (d, i) {
+                context.onDblClick(d, i);
+            })
+            .on("mouseover", function (d, i) {
+                context.onMouseOver(d, i);
+            })
+            ;
+    }
+
+    exit(domNode, element) {
+        if (this._targetWidgetMonitor) {
+            this._targetWidgetMonitor.remove();
+            delete this._targetWidgetMonitor;
+        }
+        super.exit(domNode, element);
+    }
+
+    onClick(rowData, rowIdx) {
+    }
+
+    onDblClick(rowData, rowIdx) {
+    }
+
+    onMouseOver(rowData, rowIdx) {
+    }
+
+    dataFamily: { (): string; (_: string): Legend };
+    dataFamily_exists: () => boolean;
+    orientation: { (): string; (_: string): Legend };
+    orientation_exists: () => boolean;
+    rainbowFormat: { (): string; (_: string): Legend };
+    rainbowFormat_exists: () => boolean;
+    rainbowBins: { (): number; (_: number): Legend };
+    rainbowBins_exists: () => boolean;
+}
+Legend.prototype._class += " other_Legend";
+
+Legend.prototype.publish("dataFamily", "ND", "set", "Type of data", ["1D", "2D", "ND", "map", "any", "other"], { tags: ["Private"] });
+Legend.prototype.publish("orientation", "vertical", "set", "Orientation of Legend rows", ["vertical", "horizontal"], { tags: ["Private"] });
+Legend.prototype.publish("rainbowFormat", ",", "string", "Rainbow number formatting", null, { tags: ["Private"], optional: true, disable: w => !w.isRainbow() });
+Legend.prototype.publish("rainbowBins", 8, "number", "Number of rainbow bins", null, { tags: ["Private"], disable: w => !w.isRainbow() });
+
+const origGetBBox = Table.prototype.getBBox;
+Legend.prototype.getBBox = function (refresh, round) {
+    const retVal = origGetBBox.apply(this, arguments);
+    const table = this.element().select(".tableDiv > table");
+    if (!table.empty()) {
+        const tableRect = table.node().getBoundingClientRect();
+        const width = tableRect.width + 8 + (this.hasVScroll(this._placeholderElement) ? Platform.getScrollbarWidth() : 0);
+        const height = tableRect.height + 8 + (this.hasHScroll(this._placeholderElement) ? Platform.getScrollbarWidth() : 0);
+        return {
+            x: retVal.x,
+            y: retVal.y,
+            width: (round ? Math.round(width) : width) * this._scale,
+            height: (round ? Math.round(height) : height) * this._scale
+        };
+    }
+    return retVal;
+};

package/src/MorphText.css

@@ -1,11 +1,11 @@
-.other_MorphText .enter {
-  fill: green;
-}
-
-.other_MorphText .update {
-  fill: #333;
-}
-
-.other_MorphText .exit {
-  fill: brown;
-}
+.other_MorphText .enter {
+  fill: green;
+}
+
+.other_MorphText .update {
+  fill: #333;
+}
+
+.other_MorphText .exit {
+  fill: brown;
+}