@hpcc-js/common 2.65.0 → 2.68.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/common",
-    "version": "2.65.0",
+    "version": "2.68.0",
     "description": "hpcc-js - Viz Common",
     "main": "dist/index.js",
     "module": "dist/index.es6",
@@ -34,38 +34,32 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "npm run compile-es6 && npm run copy-resources && npm run bundle",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node node_modules/@hpcc-js/bundle/src/stamp.js",
-        "lint": "eslint src/**/*.ts",
+        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
+        "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
         "update": "npx npm-check-updates -u -t minor"
     },
     "dependencies": {
-        "@hpcc-js/util": "^2.45.0",
-        "@types/d3-array": "1.2.6",
-        "@types/d3-brush": "1.0.10",
-        "@types/d3-collection": "1.0.8",
-        "@types/d3-color": "1.2.2",
-        "@types/d3-dispatch": "1.0.7",
-        "@types/d3-drag": "1.2.3",
-        "@types/d3-dsv": "1.0.36",
-        "@types/d3-ease": "1.0.8",
-        "@types/d3-format": "1.3.1",
-        "@types/d3-interpolate": "1.3.1",
-        "@types/d3-scale": "1.0.14",
-        "@types/d3-selection": "1.4.1",
-        "@types/d3-time-format": "2.1.1",
+        "@hpcc-js/util": "^2.47.0",
+        "@types/d3-array": "1.2.9",
+        "@types/d3-brush": "1.1.5",
+        "@types/d3-collection": "1.0.10",
+        "@types/d3-color": "1.4.2",
+        "@types/d3-dispatch": "1.0.9",
+        "@types/d3-drag": "1.2.5",
+        "@types/d3-dsv": "1.2.1",
+        "@types/d3-ease": "1.0.11",
+        "@types/d3-format": "1.4.2",
+        "@types/d3-interpolate": "1.4.2",
+        "@types/d3-scale": "1.0.17",
+        "@types/d3-selection": "1.4.3",
+        "@types/d3-time-format": "2.3.1",
         "@types/d3-transition": "1.3.2",
-        "@types/d3-zoom": "1.7.4"
+        "@types/d3-zoom": "1.8.3"
     },
     "devDependencies": {
-        "@hpcc-js/bundle": "^2.10.23",
-        "@rollup/plugin-alias": "3.1.0",
-        "@rollup/plugin-commonjs": "12.0.0",
-        "@rollup/plugin-node-resolve": "8.0.0",
-        "@typescript-eslint/eslint-plugin": "4.31.0",
-        "@typescript-eslint/parser": "4.31.0",
-        "colorbrewer": "1.5.1",
-        "cpx": "1.5.0",
+        "@hpcc-js/bundle": "^2.11.1",
+        "colorbrewer": "1.5.2",
         "d3-array": "^1",
         "d3-brush": "^1",
         "d3-collection": "^1",
@@ -82,19 +76,8 @@
         "d3-time-format": "^2",
         "d3-transition": "^1",
         "d3-zoom": "^1",
-        "downlevel-dts": "0.6.0",
-        "eslint": "7.32.0",
-        "eslint-plugin-react-hooks": "^4.3.0",
         "font-awesome": "4.7.0",
-        "npm-run-all": "4.1.5",
-        "rimraf": "2.6.3",
-        "rollup": "2.10.7",
-        "rollup-plugin-postcss": "3.1.1",
-        "rollup-plugin-sourcemaps": "0.6.2",
-        "terser": "4.0.0",
-        "tslib": "2.3.0",
-        "typedoc": "0.14.2",
-        "typescript": "4.3.4"
+        "tslib": "2.3.1"
     },
     "repository": {
         "type": "git",
@@ -107,5 +90,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "e89ca1a0aecd1422fde175a1916720134e18014e"
+    "gitHead": "33aa52bc641400d8fb3bfa51dcd4c94a9599fc90"
 }

package/src/CanvasWidget.ts

@@ -25,7 +25,7 @@ export class CanvasWidget extends HTMLWidget {
     }
 
     click(d, c) {
-        console.log(d);
+        // console.log(d);
     }
 }
 CanvasWidget.prototype._class += " common_CanvasWidget";

package/src/Database.ts

@@ -83,7 +83,7 @@ export class Field extends PropertyExt {
         try {
             return this.typeTransformer(_);
         } catch (e) {
-            console.log("Unable to parse:  " + _);
+            console.warn("Unable to parse:  " + _);
             return null;
         }
     }
@@ -95,7 +95,7 @@ export class Field extends PropertyExt {
         try {
             return this.formatTransformer(this.typeTransformer(_));
         } catch (e) {
-            console.log("Unable to transform:  " + _);
+            console.warn("Unable to transform:  " + _);
             return null;
         }
     }
@@ -442,7 +442,7 @@ export class Grid extends PropertyExt {
                         case "MAX":
                             return d3Max(leaves, function (d) { return d[param1]; });
                         case "SCALE":
-                            console.log("Unexpected function:  " + mappedColumn.func);
+                            console.warn("Unexpected function:  " + mappedColumn.func);
                             //  All leaves should have the same values, use mean just in case they don't?
                             return d3Mean(leaves, function (d) { return d[param1] / +param2; });
                     }
@@ -465,7 +465,7 @@ export class Grid extends PropertyExt {
                         case "AVE":
                         case "MIN":
                         case "MAX":
-                            console.log("Unexpected function:  " + mappedColumn.func);
+                            console.warn("Unexpected function:  " + mappedColumn.func);
                     }
                     return row[param1];
                 });

package/src/EntityRect.ts

@@ -223,11 +223,11 @@ export class EntityRectList extends HTMLWidget {
 
     //  Events ---
     click(row, column, selected) {
-        console.log("Click:  " + JSON.stringify(row) + ", " + column + "," + selected);
+        // console.log("Click:  " + JSON.stringify(row) + ", " + column + "," + selected);
     }
 
     dblclick(row, column, selected) {
-        console.log("Double click:  " + JSON.stringify(row) + ", " + column + "," + selected);
+        // console.log("Double click:  " + JSON.stringify(row) + ", " + column + "," + selected);
     }
 
     //  SimpleSelectionMixin

package/src/FAChar.ts

@@ -54,11 +54,11 @@ export class FAChar extends SVGWidget {
     }
 
     click() {
-        console.log("Click:", this);
+        // console.log("Click:", this);
     }
 
     dblclick() {
-        console.log("Double click:", this);
+        // console.log("Double click:", this);
     }
 
     char: { (): string; (_: string): FAChar; };

package/src/HTMLWidget.ts

@@ -45,12 +45,12 @@ export class HTMLWidget extends Widget {
         return parseFloat(element.style("height")) + this.calcFrameHeight(element);
     }
 
-    hasHScroll(element) {
+    hasHScroll(element?) {
         element = element || this._element;
         return element.property("scrollWidth") > element.property("clientWidth");
     }
 
-    hasVScroll(element) {
+    hasVScroll(element?) {
         element = element || this._element;
         return element.property("scrollHeight") > element.property("clientHeight");
     }

package/src/Icon.ts

@@ -72,11 +72,11 @@ export class Icon extends SVGWidget {
     }
 
     click(_domNode) {
-        console.log("Clicked the icon");
+        // console.log("Clicked the icon");
     }
 
     dblclick(_domNode) {
-        console.log("Double clicked the icon");
+        // console.log("Double clicked the icon");
     }
 
     _prevHash;

package/src/List.ts

@@ -85,11 +85,11 @@ export class List extends SVGWidget implements IList {
 
     //  Events  ---
     click(d) {
-        console.log("Click:  " + d);
+        // console.log("Click:  " + d);
     }
 
     dblclick(d) {
-        console.log("Double click:  " + d);
+        // console.log("Double click:  " + d);
     }
 
     anchor: { (): string; (_: string): List; };

package/src/Menu.ts

@@ -51,7 +51,6 @@ export class Menu extends SVGWidget implements IMenu {
         const context = this;
         d3Select("body")
             .on("click." + this._id, function () {
-                console.log("click:  body - " + context._id);
                 if (context._open) {
                     context.hideMenu();
                 }
@@ -120,13 +119,10 @@ export class Menu extends SVGWidget implements IMenu {
 
     //  Events  ---
     click(d) {
-        console.log("Click:  " + d);
     }
     preShowMenu() {
-        console.log("preShowMenu");
     }
     postHideMenu() {
-        console.log("postHideMenu");
     }
 
     faChar: { (): string; (_: string): Menu; };

package/src/Palette.ts

@@ -277,7 +277,7 @@ export function test(ordinalDivID, brewerDivID, customDivID, customArr, steps) {
         .attr("class", "palette")
         .attr("title", function (d: any) { return d; })
         .on("click", function (d: any) {
-            console.log(d3Values(d.value).map(JSON.stringify as any).join("\n"));
+            console.info(d3Values(d.value).map(JSON.stringify as any).join("\n"));
         })
         .selectAll(".swatch").data(function (d) { return palette_ordinal(d).colors(); })
         .enter().append("span")
@@ -291,7 +291,7 @@ export function test(ordinalDivID, brewerDivID, customDivID, customArr, steps) {
         .attr("class", "palette")
         .attr("title", function (d: any) { return d; })
         .on("click", function (d: any) {
-            console.log(d3Values(d.value).map(JSON.stringify as any).join("\n"));
+            console.info(d3Values(d.value).map(JSON.stringify as any).join("\n"));
         })
         .selectAll(".swatch2").data(function (d) { return palette_rainbow(d).colors(); })
         .enter().append("span")
@@ -307,7 +307,7 @@ export function test(ordinalDivID, brewerDivID, customDivID, customArr, steps) {
         .attr("class", "palette")
         .attr("title", function () { return "aaa"; /*d.from + "->" + d.to;*/ })
         .on("click", function (d) {
-            console.log(d3Values(d.id).map(JSON.stringify as any).join("\n"));
+            console.info(d3Values(d.id).map(JSON.stringify as any).join("\n"));
         })
         .selectAll(".swatch2").data(function () {
             const retVal = [];

package/src/PropertyExt.ts

@@ -195,7 +195,7 @@ export class Meta {
             case "propertyArray":
                 this.checkedAssign = function (_) {
                     if (_.some(function (row) { return !row.publishedProperties; })) {
-                        console.log("Invalid value for '" + this.classID() + "." + id + "':  " + _ + " expected " + type);
+                        console.error("Invalid value for '" + this.classID() + "." + id + "':  " + _ + " expected " + type);
                     }
                     return _;
                 };
@@ -400,7 +400,7 @@ export class PropertyExt extends Class {
                         if (currVal.classID() === val.__class) {
                             currVal.deserialize(val);
                         } else {
-                            console.log("Dynamic class initialization not supported.");
+                            console.warn("Dynamic class initialization not supported.");
                         }
                         break;
                     default:
@@ -439,7 +439,7 @@ export class PropertyExt extends Class {
         if (GEN_PUB_STUBS) {
             if (PropertyExt.prevClassID !== (this as any).constructor.name) {
                 PropertyExt.prevClassID = (this as any).constructor.name;
-                console.log(`//  ${PropertyExt.prevClassID}  ---`);
+                console.info(`//  ${PropertyExt.prevClassID}  ---`);
             }
             let jsType: string = type;
             switch (type) {
@@ -453,7 +453,7 @@ export class PropertyExt extends Class {
                     jsType = "any[]";
                     break;
             }
-            console.log(`    ${id}(): ${jsType};
+            console.info(`    ${id}(): ${jsType};
     ${id}(_: ${jsType}): this;
     ${id}_exists(): boolean;`);
         }

package/src/Surface.ts

@@ -294,7 +294,6 @@ export class Surface extends SVGWidget {
     }
 
     click(d) {
-        console.log("Clicked: " + d.id);
     }
 
     showTitle: { (): boolean; (_: boolean): Surface; };

package/src/Utility.ts

@@ -164,12 +164,12 @@ export class SimpleSelection extends SelectionBase {
         return this;
     }
 
-    _initialSelection;
+    _initialSelection: (d) => boolean;
     enter(elements) {
         const context = this;
         elements
             .each(function (d) {
-                const selected = context._initialSelection ? context._initialSelection.indexOf(JSON.stringify(d)) >= 0 : false;
+                const selected: boolean = context._initialSelection ? context._initialSelection(d.data) : false;
                 d3Select(this)
                     .classed("selected", selected)
                     .classed("deselected", !selected)
@@ -222,10 +222,19 @@ export class SimpleSelection extends SelectionBase {
     }
     selection(_) {
         if (!arguments.length) {
-            const retVal = [];
+            return this.selection2().map(row => JSON.stringify(row));
+        }
+        this.selection2(d => _.indexOf(JSON.stringify(d)) >= 0);
+        return this;
+    }
+    selection2(): any[];
+    selection2(isSelected: (d) => boolean): this;
+    selection2(isSelected?: (d) => boolean): any[] | this {
+        if (!arguments.length) {
+            const retVal: any[] = [];
             if (this._widgetElement) {
                 this._widgetElement.selectAll(".selected")
-                    .each(function (d) { retVal.push(JSON.stringify(d)); })
+                    .each(d => retVal.push(d))
                     ;
             }
             return retVal;
@@ -234,16 +243,19 @@ export class SimpleSelection extends SelectionBase {
             const context = this;
             this._widgetElement.selectAll(".selected,.deselected")
                 .each(function (d) {
-                    const selected = _.indexOf(JSON.stringify(d)) >= 0;
+                    const selected = isSelected(d);
                     d3Select(this)
                         .classed("selected", selected)
                         .classed("deselected", !selected)
-                        .attr("filter", context.svgGlowID() ? `url(#${context.svgGlowID()})` : null)
+                        .attr("filter", (selected && context.svgGlowID()) ? `url(#${context.svgGlowID()})` : null)
                         ;
+                    if (selected && !context._skipBringToTop) {
+                        safeRaise(this);
+                    }
                 })
                 ;
         } else {
-            this._initialSelection = _;
+            this._initialSelection = isSelected;
         }
         return this;
     }
@@ -273,7 +285,7 @@ SimpleSelectionMixin.prototype.deserializeState = function (state) {
 const perf: any = window.performance;
 const now = perf && (perf.now || perf.mozNow || perf.msNow || perf.oNow || perf.webkitNow);
 
-const faCharMap = {"fa-500px": "", "fa-address-book": "", "fa-address-book-o": "", "fa-address-card": "", "fa-address-card-o": "", "fa-adjust": "", "fa-adn": "", "fa-align-center": "", "fa-align-justify": "", "fa-align-left": "", "fa-align-right": "", "fa-amazon": "", "fa-ambulance": "", "fa-american-sign-language-interpreting": "", "fa-anchor": "", "fa-android": "", "fa-angellist": "", "fa-angle-double-down": "", "fa-angle-double-left": "", "fa-angle-double-right": "", "fa-angle-double-up": "", "fa-angle-down": "", "fa-angle-left": "", "fa-angle-right": "", "fa-angle-up": "", "fa-apple": "", "fa-archive": "", "fa-area-chart": "", "fa-arrow-circle-down": "", "fa-arrow-circle-left": "", "fa-arrow-circle-o-down": "", "fa-arrow-circle-o-left": "", "fa-arrow-circle-o-right": "", "fa-arrow-circle-o-up": "", "fa-arrow-circle-right": "", "fa-arrow-circle-up": "", "fa-arrow-down": "", "fa-arrow-left": "", "fa-arrow-right": "", "fa-arrow-up": "", "fa-arrows": "", "fa-arrows-alt": "", "fa-arrows-h": "", "fa-arrows-v": "", "fa-asl-interpreting": "", "fa-assistive-listening-systems": "", "fa-asterisk": "", "fa-at": "", "fa-audio-description": "", "fa-automobile": "", "fa-backward": "", "fa-balance-scale": "", "fa-ban": "", "fa-bandcamp": "", "fa-bank": "", "fa-bar-chart": "", "fa-bar-chart-o": "", "fa-barcode": "", "fa-bars": "", "fa-bath": "", "fa-bathtub": "", "fa-battery": "", "fa-battery-0": "", "fa-battery-1": "", "fa-battery-2": "", "fa-battery-3": "", "fa-battery-4": "", "fa-battery-empty": "", "fa-battery-full": "", "fa-battery-half": "", "fa-battery-quarter": "", "fa-battery-three-quarters": "", "fa-bed": "", "fa-beer": "", "fa-behance": "", "fa-behance-square": "", "fa-bell": "", "fa-bell-o": "", "fa-bell-slash": "", "fa-bell-slash-o": "", "fa-bicycle": "", "fa-binoculars": "", "fa-birthday-cake": "", "fa-bitbucket": "", "fa-bitbucket-square": "", "fa-bitcoin": "", "fa-black-tie": "", "fa-blind": "", "fa-bluetooth": "", "fa-bluetooth-b": "", "fa-bold": "", "fa-bolt": "", "fa-bomb": "", "fa-book": "", "fa-bookmark": "", "fa-bookmark-o": "", "fa-braille": "", "fa-briefcase": "", "fa-btc": "", "fa-bug": "", "fa-building": "", "fa-building-o": "", "fa-bullhorn": "", "fa-bullseye": "", "fa-bus": "", "fa-buysellads": "", "fa-cab": "", "fa-calculator": "", "fa-calendar": "", "fa-calendar-check-o": "", "fa-calendar-minus-o": "", "fa-calendar-o": "", "fa-calendar-plus-o": "", "fa-calendar-times-o": "", "fa-camera": "", "fa-camera-retro": "", "fa-car": "", "fa-caret-down": "", "fa-caret-left": "", "fa-caret-right": "", "fa-caret-square-o-down": "", "fa-caret-square-o-left": "", "fa-caret-square-o-right": "", "fa-caret-square-o-up": "", "fa-caret-up": "", "fa-cart-arrow-down": "", "fa-cart-plus": "", "fa-cc": "", "fa-cc-amex": "", "fa-cc-diners-club": "", "fa-cc-discover": "", "fa-cc-jcb": "", "fa-cc-mastercard": "", "fa-cc-paypal": "", "fa-cc-stripe": "", "fa-cc-visa": "", "fa-certificate": "", "fa-chain": "", "fa-chain-broken": "", "fa-check": "", "fa-check-circle": "", "fa-check-circle-o": "", "fa-check-square": "", "fa-check-square-o": "", "fa-chevron-circle-down": "", "fa-chevron-circle-left": "", "fa-chevron-circle-right": "", "fa-chevron-circle-up": "", "fa-chevron-down": "", "fa-chevron-left": "", "fa-chevron-right": "", "fa-chevron-up": "", "fa-child": "", "fa-chrome": "", "fa-circle": "", "fa-circle-o": "", "fa-circle-o-notch": "", "fa-circle-thin": "", "fa-clipboard": "", "fa-clock-o": "", "fa-clone": "", "fa-close": "", "fa-cloud": "", "fa-cloud-download": "", "fa-cloud-upload": "", "fa-cny": "", "fa-code": "", "fa-code-fork": "", "fa-codepen": "", "fa-codiepie": "", "fa-coffee": "", "fa-cog": "", "fa-cogs": "", "fa-columns": "", "fa-comment": "", "fa-comment-o": "", "fa-commenting": "", "fa-commenting-o": "", "fa-comments": "", "fa-comments-o": "", "fa-compass": "", "fa-compress": "", "fa-connectdevelop": "", "fa-contao": "", "fa-copy": "", "fa-copyright": "", "fa-creative-commons": "", "fa-credit-card": "", "fa-credit-card-alt": "", "fa-crop": "", "fa-crosshairs": "", "fa-css3": "", "fa-cube": "", "fa-cubes": "", "fa-cut": "", "fa-cutlery": "", "fa-dashboard": "", "fa-dashcube": "", "fa-database": "", "fa-deaf": "", "fa-deafness": "", "fa-dedent": "", "fa-delicious": "", "fa-desktop": "", "fa-deviantart": "", "fa-diamond": "", "fa-digg": "", "fa-dollar": "", "fa-dot-circle-o": "", "fa-download": "", "fa-dribbble": "", "fa-drivers-license": "", "fa-drivers-license-o": "", "fa-dropbox": "", "fa-drupal": "", "fa-edge": "", "fa-edit": "", "fa-eercast": "", "fa-eject": "", "fa-ellipsis-h": "", "fa-ellipsis-v": "", "fa-empire": "", "fa-envelope": "", "fa-envelope-o": "", "fa-envelope-open": "", "fa-envelope-open-o": "", "fa-envelope-square": "", "fa-envira": "", "fa-eraser": "", "fa-etsy": "", "fa-eur": "", "fa-euro": "", "fa-exchange": "", "fa-exclamation": "", "fa-exclamation-circle": "", "fa-exclamation-triangle": "", "fa-expand": "", "fa-expeditedssl": "", "fa-external-link": "", "fa-external-link-square": "", "fa-eye": "", "fa-eye-slash": "", "fa-eyedropper": "", "fa-fa": "", "fa-facebook": "", "fa-facebook-f": "", "fa-facebook-official": "", "fa-facebook-square": "", "fa-fast-backward": "", "fa-fast-forward": "", "fa-fax": "", "fa-feed": "", "fa-female": "", "fa-fighter-jet": "", "fa-file": "", "fa-file-archive-o": "", "fa-file-audio-o": "", "fa-file-code-o": "", "fa-file-excel-o": "", "fa-file-image-o": "", "fa-file-movie-o": "", "fa-file-o": "", "fa-file-pdf-o": "", "fa-file-photo-o": "", "fa-file-picture-o": "", "fa-file-powerpoint-o": "", "fa-file-sound-o": "", "fa-file-text": "", "fa-file-text-o": "", "fa-file-video-o": "", "fa-file-word-o": "", "fa-file-zip-o": "", "fa-files-o": "", "fa-film": "", "fa-filter": "", "fa-fire": "", "fa-fire-extinguisher": "", "fa-firefox": "", "fa-first-order": "", "fa-flag": "", "fa-flag-checkered": "", "fa-flag-o": "", "fa-flash": "", "fa-flask": "", "fa-flickr": "", "fa-floppy-o": "", "fa-folder": "", "fa-folder-o": "", "fa-folder-open": "", "fa-folder-open-o": "", "fa-font": "", "fa-font-awesome": "", "fa-fonticons": "", "fa-fort-awesome": "", "fa-forumbee": "", "fa-forward": "", "fa-foursquare": "", "fa-free-code-camp": "", "fa-frown-o": "", "fa-futbol-o": "", "fa-gamepad": "", "fa-gavel": "", "fa-gbp": "", "fa-ge": "", "fa-gear": "", "fa-gears": "", "fa-genderless": "", "fa-get-pocket": "", "fa-gg": "", "fa-gg-circle": "", "fa-gift": "", "fa-git": "", "fa-git-square": "", "fa-github": "", "fa-github-alt": "", "fa-github-square": "", "fa-gitlab": "", "fa-gittip": "", "fa-glass": "", "fa-glide": "", "fa-glide-g": "", "fa-globe": "", "fa-google": "", "fa-google-plus": "", "fa-google-plus-circle": "", "fa-google-plus-official": "", "fa-google-plus-square": "", "fa-google-wallet": "", "fa-graduation-cap": "", "fa-gratipay": "", "fa-grav": "", "fa-group": "", "fa-h-square": "", "fa-hacker-news": "", "fa-hand-grab-o": "", "fa-hand-lizard-o": "", "fa-hand-o-down": "", "fa-hand-o-left": "", "fa-hand-o-right": "", "fa-hand-o-up": "", "fa-hand-paper-o": "", "fa-hand-peace-o": "", "fa-hand-pointer-o": "", "fa-hand-rock-o": "", "fa-hand-scissors-o": "", "fa-hand-spock-o": "", "fa-hand-stop-o": "", "fa-handshake-o": "", "fa-hard-of-hearing": "", "fa-hashtag": "", "fa-hdd-o": "", "fa-header": "", "fa-headphones": "", "fa-heart": "", "fa-heart-o": "", "fa-heartbeat": "", "fa-history": "", "fa-home": "", "fa-hospital-o": "", "fa-hotel": "", "fa-hourglass": "", "fa-hourglass-1": "", "fa-hourglass-2": "", "fa-hourglass-3": "", "fa-hourglass-end": "", "fa-hourglass-half": "", "fa-hourglass-o": "", "fa-hourglass-start": "", "fa-houzz": "", "fa-html5": "", "fa-i-cursor": "", "fa-id-badge": "", "fa-id-card": "", "fa-id-card-o": "", "fa-ils": "", "fa-image": "", "fa-imdb": "", "fa-inbox": "", "fa-indent": "", "fa-industry": "", "fa-info": "", "fa-info-circle": "", "fa-inr": "", "fa-instagram": "", "fa-institution": "", "fa-internet-explorer": "", "fa-intersex": "", "fa-ioxhost": "", "fa-italic": "", "fa-joomla": "", "fa-jpy": "", "fa-jsfiddle": "", "fa-key": "", "fa-keyboard-o": "", "fa-krw": "", "fa-language": "", "fa-laptop": "", "fa-lastfm": "", "fa-lastfm-square": "", "fa-leaf": "", "fa-leanpub": "", "fa-legal": "", "fa-lemon-o": "", "fa-level-down": "", "fa-level-up": "", "fa-life-bouy": "", "fa-life-buoy": "", "fa-life-ring": "", "fa-life-saver": "", "fa-lightbulb-o": "", "fa-line-chart": "", "fa-link": "", "fa-linkedin": "", "fa-linkedin-square": "", "fa-linode": "", "fa-linux": "", "fa-list": "", "fa-list-alt": "", "fa-list-ol": "", "fa-list-ul": "", "fa-location-arrow": "", "fa-lock": "", "fa-long-arrow-down": "", "fa-long-arrow-left": "", "fa-long-arrow-right": "", "fa-long-arrow-up": "", "fa-low-vision": "", "fa-magic": "", "fa-magnet": "", "fa-mail-forward": "", "fa-mail-reply": "", "fa-mail-reply-all": "", "fa-male": "", "fa-map": "", "fa-map-marker": "", "fa-map-o": "", "fa-map-pin": "", "fa-map-signs": "", "fa-mars": "", "fa-mars-double": "", "fa-mars-stroke": "", "fa-mars-stroke-h": "", "fa-mars-stroke-v": "", "fa-maxcdn": "", "fa-meanpath": "", "fa-medium": "", "fa-medkit": "", "fa-meetup": "", "fa-meh-o": "", "fa-mercury": "", "fa-microchip": "", "fa-microphone": "", "fa-microphone-slash": "", "fa-minus": "", "fa-minus-circle": "", "fa-minus-square": "", "fa-minus-square-o": "", "fa-mixcloud": "", "fa-mobile": "", "fa-mobile-phone": "", "fa-modx": "", "fa-money": "", "fa-moon-o": "", "fa-mortar-board": "", "fa-motorcycle": "", "fa-mouse-pointer": "", "fa-music": "", "fa-navicon": "", "fa-neuter": "", "fa-newspaper-o": "", "fa-object-group": "", "fa-object-ungroup": "", "fa-odnoklassniki": "", "fa-odnoklassniki-square": "", "fa-opencart": "", "fa-openid": "", "fa-opera": "", "fa-optin-monster": "", "fa-outdent": "", "fa-pagelines": "", "fa-paint-brush": "", "fa-paper-plane": "", "fa-paper-plane-o": "", "fa-paperclip": "", "fa-paragraph": "", "fa-paste": "", "fa-pause": "", "fa-pause-circle": "", "fa-pause-circle-o": "", "fa-paw": "", "fa-paypal": "", "fa-pencil": "", "fa-pencil-square": "", "fa-pencil-square-o": "", "fa-percent": "", "fa-phone": "", "fa-phone-square": "", "fa-photo": "", "fa-picture-o": "", "fa-pie-chart": "", "fa-pied-piper": "", "fa-pied-piper-alt": "", "fa-pied-piper-pp": "", "fa-pinterest": "", "fa-pinterest-p": "", "fa-pinterest-square": "", "fa-plane": "", "fa-play": "", "fa-play-circle": "", "fa-play-circle-o": "", "fa-plug": "", "fa-plus": "", "fa-plus-circle": "", "fa-plus-square": "", "fa-plus-square-o": "", "fa-podcast": "", "fa-power-off": "", "fa-print": "", "fa-product-hunt": "", "fa-puzzle-piece": "", "fa-qq": "", "fa-qrcode": "", "fa-question": "", "fa-question-circle": "", "fa-question-circle-o": "", "fa-quora": "", "fa-quote-left": "", "fa-quote-right": "", "fa-ra": "", "fa-random": "", "fa-ravelry": "", "fa-rebel": "", "fa-recycle": "", "fa-reddit": "", "fa-reddit-alien": "", "fa-reddit-square": "", "fa-refresh": "", "fa-registered": "", "fa-remove": "", "fa-renren": "", "fa-reorder": "", "fa-repeat": "", "fa-reply": "", "fa-reply-all": "", "fa-resistance": "", "fa-retweet": "", "fa-rmb": "", "fa-road": "", "fa-rocket": "", "fa-rotate-left": "", "fa-rotate-right": "", "fa-rouble": "", "fa-rss": "", "fa-rss-square": "", "fa-rub": "", "fa-ruble": "", "fa-rupee": "", "fa-s15": "", "fa-safari": "", "fa-save": "", "fa-scissors": "", "fa-scribd": "", "fa-search": "", "fa-search-minus": "", "fa-search-plus": "", "fa-sellsy": "", "fa-send": "", "fa-send-o": "", "fa-server": "", "fa-share": "", "fa-share-alt": "", "fa-share-alt-square": "", "fa-share-square": "", "fa-share-square-o": "", "fa-shekel": "", "fa-sheqel": "", "fa-shield": "", "fa-ship": "", "fa-shirtsinbulk": "", "fa-shopping-bag": "", "fa-shopping-basket": "", "fa-shopping-cart": "", "fa-shower": "", "fa-sign-in": "", "fa-sign-language": "", "fa-sign-out": "", "fa-signal": "", "fa-signing": "", "fa-simplybuilt": "", "fa-sitemap": "", "fa-skyatlas": "", "fa-skype": "", "fa-slack": "", "fa-sliders": "", "fa-slideshare": "", "fa-smile-o": "", "fa-snapchat": "", "fa-snapchat-ghost": "", "fa-snapchat-square": "", "fa-snowflake-o": "", "fa-soccer-ball-o": "", "fa-sort": "", "fa-sort-alpha-asc": "", "fa-sort-alpha-desc": "", "fa-sort-amount-asc": "", "fa-sort-amount-desc": "", "fa-sort-asc": "", "fa-sort-desc": "", "fa-sort-down": "", "fa-sort-numeric-asc": "", "fa-sort-numeric-desc": "", "fa-sort-up": "", "fa-soundcloud": "", "fa-space-shuttle": "", "fa-spinner": "", "fa-spoon": "", "fa-spotify": "", "fa-square": "", "fa-square-o": "", "fa-stack-exchange": "", "fa-stack-overflow": "", "fa-star": "", "fa-star-half": "", "fa-star-half-empty": "", "fa-star-half-full": "", "fa-star-half-o": "", "fa-star-o": "", "fa-steam": "", "fa-steam-square": "", "fa-step-backward": "", "fa-step-forward": "", "fa-stethoscope": "", "fa-sticky-note": "", "fa-sticky-note-o": "", "fa-stop": "", "fa-stop-circle": "", "fa-stop-circle-o": "", "fa-street-view": "", "fa-strikethrough": "", "fa-stumbleupon": "", "fa-stumbleupon-circle": "", "fa-subscript": "", "fa-subway": "", "fa-suitcase": "", "fa-sun-o": "", "fa-superpowers": "", "fa-superscript": "", "fa-support": "", "fa-table": "", "fa-tablet": "", "fa-tachometer": "", "fa-tag": "", "fa-tags": "", "fa-tasks": "", "fa-taxi": "", "fa-telegram": "", "fa-television": "", "fa-tencent-weibo": "", "fa-terminal": "", "fa-text-height": "", "fa-text-width": "", "fa-th": "", "fa-th-large": "", "fa-th-list": "", "fa-themeisle": "", "fa-thermometer": "", "fa-thermometer-0": "", "fa-thermometer-1": "", "fa-thermometer-2": "", "fa-thermometer-3": "", "fa-thermometer-4": "", "fa-thermometer-empty": "", "fa-thermometer-full": "", "fa-thermometer-half": "", "fa-thermometer-quarter": "", "fa-thermometer-three-quarters": "", "fa-thumb-tack": "", "fa-thumbs-down": "", "fa-thumbs-o-down": "", "fa-thumbs-o-up": "", "fa-thumbs-up": "", "fa-ticket": "", "fa-times": "", "fa-times-circle": "", "fa-times-circle-o": "", "fa-times-rectangle": "", "fa-times-rectangle-o": "", "fa-tint": "", "fa-toggle-down": "", "fa-toggle-left": "", "fa-toggle-off": "", "fa-toggle-on": "", "fa-toggle-right": "", "fa-toggle-up": "", "fa-trademark": "", "fa-train": "", "fa-transgender": "", "fa-transgender-alt": "", "fa-trash": "", "fa-trash-o": "", "fa-tree": "", "fa-trello": "", "fa-tripadvisor": "", "fa-trophy": "", "fa-truck": "", "fa-try": "", "fa-tty": "", "fa-tumblr": "", "fa-tumblr-square": "", "fa-turkish-lira": "", "fa-tv": "", "fa-twitch": "", "fa-twitter": "", "fa-twitter-square": "", "fa-umbrella": "", "fa-underline": "", "fa-undo": "", "fa-universal-access": "", "fa-university": "", "fa-unlink": "", "fa-unlock": "", "fa-unlock-alt": "", "fa-unsorted": "", "fa-upload": "", "fa-usb": "", "fa-usd": "", "fa-user": "", "fa-user-circle": "", "fa-user-circle-o": "", "fa-user-md": "", "fa-user-o": "", "fa-user-plus": "", "fa-user-secret": "", "fa-user-times": "", "fa-users": "", "fa-vcard": "", "fa-vcard-o": "", "fa-venus": "", "fa-venus-double": "", "fa-venus-mars": "", "fa-viacoin": "", "fa-viadeo": "", "fa-viadeo-square": "", "fa-video-camera": "", "fa-vimeo": "", "fa-vimeo-square": "", "fa-vine": "", "fa-vk": "", "fa-volume-control-phone": "", "fa-volume-down": "", "fa-volume-off": "", "fa-volume-up": "", "fa-warning": "", "fa-wechat": "", "fa-weibo": "", "fa-weixin": "", "fa-whatsapp": "", "fa-wheelchair": "", "fa-wheelchair-alt": "", "fa-wifi": "", "fa-wikipedia-w": "", "fa-window-close": "", "fa-window-close-o": "", "fa-window-maximize": "", "fa-window-minimize": "", "fa-window-restore": "", "fa-windows": "", "fa-won": "", "fa-wordpress": "", "fa-wpbeginner": "", "fa-wpexplorer": "", "fa-wpforms": "", "fa-wrench": "", "fa-xing": "", "fa-xing-square": "", "fa-y-combinator": "", "fa-y-combinator-square": "", "fa-yahoo": "", "fa-yc": "", "fa-yc-square": "", "fa-yelp": "", "fa-yen": "", "fa-yoast": "", "fa-youtube": "", "fa-youtube-play": "", "fa-youtube-square": ""};
+const faCharMap = { "fa-500px": "", "fa-address-book": "", "fa-address-book-o": "", "fa-address-card": "", "fa-address-card-o": "", "fa-adjust": "", "fa-adn": "", "fa-align-center": "", "fa-align-justify": "", "fa-align-left": "", "fa-align-right": "", "fa-amazon": "", "fa-ambulance": "", "fa-american-sign-language-interpreting": "", "fa-anchor": "", "fa-android": "", "fa-angellist": "", "fa-angle-double-down": "", "fa-angle-double-left": "", "fa-angle-double-right": "", "fa-angle-double-up": "", "fa-angle-down": "", "fa-angle-left": "", "fa-angle-right": "", "fa-angle-up": "", "fa-apple": "", "fa-archive": "", "fa-area-chart": "", "fa-arrow-circle-down": "", "fa-arrow-circle-left": "", "fa-arrow-circle-o-down": "", "fa-arrow-circle-o-left": "", "fa-arrow-circle-o-right": "", "fa-arrow-circle-o-up": "", "fa-arrow-circle-right": "", "fa-arrow-circle-up": "", "fa-arrow-down": "", "fa-arrow-left": "", "fa-arrow-right": "", "fa-arrow-up": "", "fa-arrows": "", "fa-arrows-alt": "", "fa-arrows-h": "", "fa-arrows-v": "", "fa-asl-interpreting": "", "fa-assistive-listening-systems": "", "fa-asterisk": "", "fa-at": "", "fa-audio-description": "", "fa-automobile": "", "fa-backward": "", "fa-balance-scale": "", "fa-ban": "", "fa-bandcamp": "", "fa-bank": "", "fa-bar-chart": "", "fa-bar-chart-o": "", "fa-barcode": "", "fa-bars": "", "fa-bath": "", "fa-bathtub": "", "fa-battery": "", "fa-battery-0": "", "fa-battery-1": "", "fa-battery-2": "", "fa-battery-3": "", "fa-battery-4": "", "fa-battery-empty": "", "fa-battery-full": "", "fa-battery-half": "", "fa-battery-quarter": "", "fa-battery-three-quarters": "", "fa-bed": "", "fa-beer": "", "fa-behance": "", "fa-behance-square": "", "fa-bell": "", "fa-bell-o": "", "fa-bell-slash": "", "fa-bell-slash-o": "", "fa-bicycle": "", "fa-binoculars": "", "fa-birthday-cake": "", "fa-bitbucket": "", "fa-bitbucket-square": "", "fa-bitcoin": "", "fa-black-tie": "", "fa-blind": "", "fa-bluetooth": "", "fa-bluetooth-b": "", "fa-bold": "", "fa-bolt": "", "fa-bomb": "", "fa-book": "", "fa-bookmark": "", "fa-bookmark-o": "", "fa-braille": "", "fa-briefcase": "", "fa-btc": "", "fa-bug": "", "fa-building": "", "fa-building-o": "", "fa-bullhorn": "", "fa-bullseye": "", "fa-bus": "", "fa-buysellads": "", "fa-cab": "", "fa-calculator": "", "fa-calendar": "", "fa-calendar-check-o": "", "fa-calendar-minus-o": "", "fa-calendar-o": "", "fa-calendar-plus-o": "", "fa-calendar-times-o": "", "fa-camera": "", "fa-camera-retro": "", "fa-car": "", "fa-caret-down": "", "fa-caret-left": "", "fa-caret-right": "", "fa-caret-square-o-down": "", "fa-caret-square-o-left": "", "fa-caret-square-o-right": "", "fa-caret-square-o-up": "", "fa-caret-up": "", "fa-cart-arrow-down": "", "fa-cart-plus": "", "fa-cc": "", "fa-cc-amex": "", "fa-cc-diners-club": "", "fa-cc-discover": "", "fa-cc-jcb": "", "fa-cc-mastercard": "", "fa-cc-paypal": "", "fa-cc-stripe": "", "fa-cc-visa": "", "fa-certificate": "", "fa-chain": "", "fa-chain-broken": "", "fa-check": "", "fa-check-circle": "", "fa-check-circle-o": "", "fa-check-square": "", "fa-check-square-o": "", "fa-chevron-circle-down": "", "fa-chevron-circle-left": "", "fa-chevron-circle-right": "", "fa-chevron-circle-up": "", "fa-chevron-down": "", "fa-chevron-left": "", "fa-chevron-right": "", "fa-chevron-up": "", "fa-child": "", "fa-chrome": "", "fa-circle": "", "fa-circle-o": "", "fa-circle-o-notch": "", "fa-circle-thin": "", "fa-clipboard": "", "fa-clock-o": "", "fa-clone": "", "fa-close": "", "fa-cloud": "", "fa-cloud-download": "", "fa-cloud-upload": "", "fa-cny": "", "fa-code": "", "fa-code-fork": "", "fa-codepen": "", "fa-codiepie": "", "fa-coffee": "", "fa-cog": "", "fa-cogs": "", "fa-columns": "", "fa-comment": "", "fa-comment-o": "", "fa-commenting": "", "fa-commenting-o": "", "fa-comments": "", "fa-comments-o": "", "fa-compass": "", "fa-compress": "", "fa-connectdevelop": "", "fa-contao": "", "fa-copy": "", "fa-copyright": "", "fa-creative-commons": "", "fa-credit-card": "", "fa-credit-card-alt": "", "fa-crop": "", "fa-crosshairs": "", "fa-css3": "", "fa-cube": "", "fa-cubes": "", "fa-cut": "", "fa-cutlery": "", "fa-dashboard": "", "fa-dashcube": "", "fa-database": "", "fa-deaf": "", "fa-deafness": "", "fa-dedent": "", "fa-delicious": "", "fa-desktop": "", "fa-deviantart": "", "fa-diamond": "", "fa-digg": "", "fa-dollar": "", "fa-dot-circle-o": "", "fa-download": "", "fa-dribbble": "", "fa-drivers-license": "", "fa-drivers-license-o": "", "fa-dropbox": "", "fa-drupal": "", "fa-edge": "", "fa-edit": "", "fa-eercast": "", "fa-eject": "", "fa-ellipsis-h": "", "fa-ellipsis-v": "", "fa-empire": "", "fa-envelope": "", "fa-envelope-o": "", "fa-envelope-open": "", "fa-envelope-open-o": "", "fa-envelope-square": "", "fa-envira": "", "fa-eraser": "", "fa-etsy": "", "fa-eur": "", "fa-euro": "", "fa-exchange": "", "fa-exclamation": "", "fa-exclamation-circle": "", "fa-exclamation-triangle": "", "fa-expand": "", "fa-expeditedssl": "", "fa-external-link": "", "fa-external-link-square": "", "fa-eye": "", "fa-eye-slash": "", "fa-eyedropper": "", "fa-fa": "", "fa-facebook": "", "fa-facebook-f": "", "fa-facebook-official": "", "fa-facebook-square": "", "fa-fast-backward": "", "fa-fast-forward": "", "fa-fax": "", "fa-feed": "", "fa-female": "", "fa-fighter-jet": "", "fa-file": "", "fa-file-archive-o": "", "fa-file-audio-o": "", "fa-file-code-o": "", "fa-file-excel-o": "", "fa-file-image-o": "", "fa-file-movie-o": "", "fa-file-o": "", "fa-file-pdf-o": "", "fa-file-photo-o": "", "fa-file-picture-o": "", "fa-file-powerpoint-o": "", "fa-file-sound-o": "", "fa-file-text": "", "fa-file-text-o": "", "fa-file-video-o": "", "fa-file-word-o": "", "fa-file-zip-o": "", "fa-files-o": "", "fa-film": "", "fa-filter": "", "fa-fire": "", "fa-fire-extinguisher": "", "fa-firefox": "", "fa-first-order": "", "fa-flag": "", "fa-flag-checkered": "", "fa-flag-o": "", "fa-flash": "", "fa-flask": "", "fa-flickr": "", "fa-floppy-o": "", "fa-folder": "", "fa-folder-o": "", "fa-folder-open": "", "fa-folder-open-o": "", "fa-font": "", "fa-font-awesome": "", "fa-fonticons": "", "fa-fort-awesome": "", "fa-forumbee": "", "fa-forward": "", "fa-foursquare": "", "fa-free-code-camp": "", "fa-frown-o": "", "fa-futbol-o": "", "fa-gamepad": "", "fa-gavel": "", "fa-gbp": "", "fa-ge": "", "fa-gear": "", "fa-gears": "", "fa-genderless": "", "fa-get-pocket": "", "fa-gg": "", "fa-gg-circle": "", "fa-gift": "", "fa-git": "", "fa-git-square": "", "fa-github": "", "fa-github-alt": "", "fa-github-square": "", "fa-gitlab": "", "fa-gittip": "", "fa-glass": "", "fa-glide": "", "fa-glide-g": "", "fa-globe": "", "fa-google": "", "fa-google-plus": "", "fa-google-plus-circle": "", "fa-google-plus-official": "", "fa-google-plus-square": "", "fa-google-wallet": "", "fa-graduation-cap": "", "fa-gratipay": "", "fa-grav": "", "fa-group": "", "fa-h-square": "", "fa-hacker-news": "", "fa-hand-grab-o": "", "fa-hand-lizard-o": "", "fa-hand-o-down": "", "fa-hand-o-left": "", "fa-hand-o-right": "", "fa-hand-o-up": "", "fa-hand-paper-o": "", "fa-hand-peace-o": "", "fa-hand-pointer-o": "", "fa-hand-rock-o": "", "fa-hand-scissors-o": "", "fa-hand-spock-o": "", "fa-hand-stop-o": "", "fa-handshake-o": "", "fa-hard-of-hearing": "", "fa-hashtag": "", "fa-hdd-o": "", "fa-header": "", "fa-headphones": "", "fa-heart": "", "fa-heart-o": "", "fa-heartbeat": "", "fa-history": "", "fa-home": "", "fa-hospital-o": "", "fa-hotel": "", "fa-hourglass": "", "fa-hourglass-1": "", "fa-hourglass-2": "", "fa-hourglass-3": "", "fa-hourglass-end": "", "fa-hourglass-half": "", "fa-hourglass-o": "", "fa-hourglass-start": "", "fa-houzz": "", "fa-html5": "", "fa-i-cursor": "", "fa-id-badge": "", "fa-id-card": "", "fa-id-card-o": "", "fa-ils": "", "fa-image": "", "fa-imdb": "", "fa-inbox": "", "fa-indent": "", "fa-industry": "", "fa-info": "", "fa-info-circle": "", "fa-inr": "", "fa-instagram": "", "fa-institution": "", "fa-internet-explorer": "", "fa-intersex": "", "fa-ioxhost": "", "fa-italic": "", "fa-joomla": "", "fa-jpy": "", "fa-jsfiddle": "", "fa-key": "", "fa-keyboard-o": "", "fa-krw": "", "fa-language": "", "fa-laptop": "", "fa-lastfm": "", "fa-lastfm-square": "", "fa-leaf": "", "fa-leanpub": "", "fa-legal": "", "fa-lemon-o": "", "fa-level-down": "", "fa-level-up": "", "fa-life-bouy": "", "fa-life-buoy": "", "fa-life-ring": "", "fa-life-saver": "", "fa-lightbulb-o": "", "fa-line-chart": "", "fa-link": "", "fa-linkedin": "", "fa-linkedin-square": "", "fa-linode": "", "fa-linux": "", "fa-list": "", "fa-list-alt": "", "fa-list-ol": "", "fa-list-ul": "", "fa-location-arrow": "", "fa-lock": "", "fa-long-arrow-down": "", "fa-long-arrow-left": "", "fa-long-arrow-right": "", "fa-long-arrow-up": "", "fa-low-vision": "", "fa-magic": "", "fa-magnet": "", "fa-mail-forward": "", "fa-mail-reply": "", "fa-mail-reply-all": "", "fa-male": "", "fa-map": "", "fa-map-marker": "", "fa-map-o": "", "fa-map-pin": "", "fa-map-signs": "", "fa-mars": "", "fa-mars-double": "", "fa-mars-stroke": "", "fa-mars-stroke-h": "", "fa-mars-stroke-v": "", "fa-maxcdn": "", "fa-meanpath": "", "fa-medium": "", "fa-medkit": "", "fa-meetup": "", "fa-meh-o": "", "fa-mercury": "", "fa-microchip": "", "fa-microphone": "", "fa-microphone-slash": "", "fa-minus": "", "fa-minus-circle": "", "fa-minus-square": "", "fa-minus-square-o": "", "fa-mixcloud": "", "fa-mobile": "", "fa-mobile-phone": "", "fa-modx": "", "fa-money": "", "fa-moon-o": "", "fa-mortar-board": "", "fa-motorcycle": "", "fa-mouse-pointer": "", "fa-music": "", "fa-navicon": "", "fa-neuter": "", "fa-newspaper-o": "", "fa-object-group": "", "fa-object-ungroup": "", "fa-odnoklassniki": "", "fa-odnoklassniki-square": "", "fa-opencart": "", "fa-openid": "", "fa-opera": "", "fa-optin-monster": "", "fa-outdent": "", "fa-pagelines": "", "fa-paint-brush": "", "fa-paper-plane": "", "fa-paper-plane-o": "", "fa-paperclip": "", "fa-paragraph": "", "fa-paste": "", "fa-pause": "", "fa-pause-circle": "", "fa-pause-circle-o": "", "fa-paw": "", "fa-paypal": "", "fa-pencil": "", "fa-pencil-square": "", "fa-pencil-square-o": "", "fa-percent": "", "fa-phone": "", "fa-phone-square": "", "fa-photo": "", "fa-picture-o": "", "fa-pie-chart": "", "fa-pied-piper": "", "fa-pied-piper-alt": "", "fa-pied-piper-pp": "", "fa-pinterest": "", "fa-pinterest-p": "", "fa-pinterest-square": "", "fa-plane": "", "fa-play": "", "fa-play-circle": "", "fa-play-circle-o": "", "fa-plug": "", "fa-plus": "", "fa-plus-circle": "", "fa-plus-square": "", "fa-plus-square-o": "", "fa-podcast": "", "fa-power-off": "", "fa-print": "", "fa-product-hunt": "", "fa-puzzle-piece": "", "fa-qq": "", "fa-qrcode": "", "fa-question": "", "fa-question-circle": "", "fa-question-circle-o": "", "fa-quora": "", "fa-quote-left": "", "fa-quote-right": "", "fa-ra": "", "fa-random": "", "fa-ravelry": "", "fa-rebel": "", "fa-recycle": "", "fa-reddit": "", "fa-reddit-alien": "", "fa-reddit-square": "", "fa-refresh": "", "fa-registered": "", "fa-remove": "", "fa-renren": "", "fa-reorder": "", "fa-repeat": "", "fa-reply": "", "fa-reply-all": "", "fa-resistance": "", "fa-retweet": "", "fa-rmb": "", "fa-road": "", "fa-rocket": "", "fa-rotate-left": "", "fa-rotate-right": "", "fa-rouble": "", "fa-rss": "", "fa-rss-square": "", "fa-rub": "", "fa-ruble": "", "fa-rupee": "", "fa-s15": "", "fa-safari": "", "fa-save": "", "fa-scissors": "", "fa-scribd": "", "fa-search": "", "fa-search-minus": "", "fa-search-plus": "", "fa-sellsy": "", "fa-send": "", "fa-send-o": "", "fa-server": "", "fa-share": "", "fa-share-alt": "", "fa-share-alt-square": "", "fa-share-square": "", "fa-share-square-o": "", "fa-shekel": "", "fa-sheqel": "", "fa-shield": "", "fa-ship": "", "fa-shirtsinbulk": "", "fa-shopping-bag": "", "fa-shopping-basket": "", "fa-shopping-cart": "", "fa-shower": "", "fa-sign-in": "", "fa-sign-language": "", "fa-sign-out": "", "fa-signal": "", "fa-signing": "", "fa-simplybuilt": "", "fa-sitemap": "", "fa-skyatlas": "", "fa-skype": "", "fa-slack": "", "fa-sliders": "", "fa-slideshare": "", "fa-smile-o": "", "fa-snapchat": "", "fa-snapchat-ghost": "", "fa-snapchat-square": "", "fa-snowflake-o": "", "fa-soccer-ball-o": "", "fa-sort": "", "fa-sort-alpha-asc": "", "fa-sort-alpha-desc": "", "fa-sort-amount-asc": "", "fa-sort-amount-desc": "", "fa-sort-asc": "", "fa-sort-desc": "", "fa-sort-down": "", "fa-sort-numeric-asc": "", "fa-sort-numeric-desc": "", "fa-sort-up": "", "fa-soundcloud": "", "fa-space-shuttle": "", "fa-spinner": "", "fa-spoon": "", "fa-spotify": "", "fa-square": "", "fa-square-o": "", "fa-stack-exchange": "", "fa-stack-overflow": "", "fa-star": "", "fa-star-half": "", "fa-star-half-empty": "", "fa-star-half-full": "", "fa-star-half-o": "", "fa-star-o": "", "fa-steam": "", "fa-steam-square": "", "fa-step-backward": "", "fa-step-forward": "", "fa-stethoscope": "", "fa-sticky-note": "", "fa-sticky-note-o": "", "fa-stop": "", "fa-stop-circle": "", "fa-stop-circle-o": "", "fa-street-view": "", "fa-strikethrough": "", "fa-stumbleupon": "", "fa-stumbleupon-circle": "", "fa-subscript": "", "fa-subway": "", "fa-suitcase": "", "fa-sun-o": "", "fa-superpowers": "", "fa-superscript": "", "fa-support": "", "fa-table": "", "fa-tablet": "", "fa-tachometer": "", "fa-tag": "", "fa-tags": "", "fa-tasks": "", "fa-taxi": "", "fa-telegram": "", "fa-television": "", "fa-tencent-weibo": "", "fa-terminal": "", "fa-text-height": "", "fa-text-width": "", "fa-th": "", "fa-th-large": "", "fa-th-list": "", "fa-themeisle": "", "fa-thermometer": "", "fa-thermometer-0": "", "fa-thermometer-1": "", "fa-thermometer-2": "", "fa-thermometer-3": "", "fa-thermometer-4": "", "fa-thermometer-empty": "", "fa-thermometer-full": "", "fa-thermometer-half": "", "fa-thermometer-quarter": "", "fa-thermometer-three-quarters": "", "fa-thumb-tack": "", "fa-thumbs-down": "", "fa-thumbs-o-down": "", "fa-thumbs-o-up": "", "fa-thumbs-up": "", "fa-ticket": "", "fa-times": "", "fa-times-circle": "", "fa-times-circle-o": "", "fa-times-rectangle": "", "fa-times-rectangle-o": "", "fa-tint": "", "fa-toggle-down": "", "fa-toggle-left": "", "fa-toggle-off": "", "fa-toggle-on": "", "fa-toggle-right": "", "fa-toggle-up": "", "fa-trademark": "", "fa-train": "", "fa-transgender": "", "fa-transgender-alt": "", "fa-trash": "", "fa-trash-o": "", "fa-tree": "", "fa-trello": "", "fa-tripadvisor": "", "fa-trophy": "", "fa-truck": "", "fa-try": "", "fa-tty": "", "fa-tumblr": "", "fa-tumblr-square": "", "fa-turkish-lira": "", "fa-tv": "", "fa-twitch": "", "fa-twitter": "", "fa-twitter-square": "", "fa-umbrella": "", "fa-underline": "", "fa-undo": "", "fa-universal-access": "", "fa-university": "", "fa-unlink": "", "fa-unlock": "", "fa-unlock-alt": "", "fa-unsorted": "", "fa-upload": "", "fa-usb": "", "fa-usd": "", "fa-user": "", "fa-user-circle": "", "fa-user-circle-o": "", "fa-user-md": "", "fa-user-o": "", "fa-user-plus": "", "fa-user-secret": "", "fa-user-times": "", "fa-users": "", "fa-vcard": "", "fa-vcard-o": "", "fa-venus": "", "fa-venus-double": "", "fa-venus-mars": "", "fa-viacoin": "", "fa-viadeo": "", "fa-viadeo-square": "", "fa-video-camera": "", "fa-vimeo": "", "fa-vimeo-square": "", "fa-vine": "", "fa-vk": "", "fa-volume-control-phone": "", "fa-volume-down": "", "fa-volume-off": "", "fa-volume-up": "", "fa-warning": "", "fa-wechat": "", "fa-weibo": "", "fa-weixin": "", "fa-whatsapp": "", "fa-wheelchair": "", "fa-wheelchair-alt": "", "fa-wifi": "", "fa-wikipedia-w": "", "fa-window-close": "", "fa-window-close-o": "", "fa-window-maximize": "", "fa-window-minimize": "", "fa-window-restore": "", "fa-windows": "", "fa-won": "", "fa-wordpress": "", "fa-wpbeginner": "", "fa-wpexplorer": "", "fa-wpforms": "", "fa-wrench": "", "fa-xing": "", "fa-xing-square": "", "fa-y-combinator": "", "fa-y-combinator-square": "", "fa-yahoo": "", "fa-yc": "", "fa-yc-square": "", "fa-yelp": "", "fa-yen": "", "fa-yoast": "", "fa-youtube": "", "fa-youtube-play": "", "fa-youtube-square": "" };
 const faClassMap = {
     "fa-arrows": "fas fa-arrows-alt",
     "fa-address-book-o": "fa fa-address-book",
@@ -560,9 +572,9 @@ export function d3ArrayAdapter(array) {
 
 export function downloadBlob(blob: Blob, filename: string) {
     let a = document.createElement("a");
-    if (navigator.msSaveBlob) { // IE10+
+    if (navigator["msSaveBlob"]) { // IE10+
         a = null;
-        return navigator.msSaveBlob(blob, filename);
+        return navigator["msSaveBlob"](blob, filename);
     } else if ("download" in a) { // html 5
         a.href = URL.createObjectURL(blob);
         a.setAttribute("download", filename);
@@ -757,19 +769,19 @@ export function textRect(text: string, fontName: string = "Verdana", fontSize: n
         g_fontSizeContext.fillText(text, 0, 0);
 
         let top, right, bottom, left = 0;
-        if(w > 0) {
+        if (w > 0) {
             const data = g_fontSizeContext.getImageData(0, 0, w, h).data;
             for (let y = 0; y < h; y++) {
                 for (let x = 0; x < w; x++) {
                     const i = (x + y * w) * 4;
-                    if(data[i+3] !== 0) {
-                        if(top === undefined) {
+                    if (data[i + 3] !== 0) {
+                        if (top === undefined) {
                             top = y;
                         }
-                        if(left === undefined || left > x) {
+                        if (left === undefined || left > x) {
                             left = x;
                         }
-                        if(right === undefined || right < x) {
+                        if (right === undefined || right < x) {
                             right = x;
                         }
                         bottom = y;
@@ -793,7 +805,7 @@ export function textRect(text: string, fontName: string = "Verdana", fontSize: n
 function globalCanvasElement() {
     if (!g_fontCanvas) {
         g_fontCanvas = document.getElementById("hpcc_js_font_size");
-        if(!g_fontCanvas){
+        if (!g_fontCanvas) {
             g_fontCanvas = document.createElement("canvas");
             g_fontCanvas.id = "hpcc_js_font_size";
             document.body.appendChild(g_fontCanvas);

package/src/Widget.ts

@@ -130,7 +130,7 @@ export abstract class Widget extends PropertyExt {
                 }
             });
             if (leaks) {
-                console.log("leak:  " + context.id() + " - " + context.classID() + "\t\twidget.target(null); was not called for this widget before it was removed from the page.");
+                console.error("leak:  " + context.id() + " - " + context.classID() + "\t\twidget.target(null); was not called for this widget before it was removed from the page.");
             }
         });
         let pNode = newNode.parentNode;
@@ -571,7 +571,7 @@ export abstract class Widget extends PropertyExt {
         if ((window as any).__hpcc_debug) {
             const now = Date.now();
             if (now - this._prevNow < 500) {
-                console.log("Double Render:  " + (now - this._prevNow) + " - " + this.id() + " - " + this.classID());
+                console.error("Double Render:  " + (now - this._prevNow) + " - " + this.id() + " - " + this.classID());
             }
             this._prevNow = now;
         }

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/common";
-export const PKG_VERSION = "2.65.0";
-export const BUILD_VERSION = "2.101.0";
+export const PKG_VERSION = "2.68.0";
+export const BUILD_VERSION = "2.103.0";

package/types/HTMLWidget.d.ts

@@ -8,8 +8,8 @@ export declare class HTMLWidget extends Widget {
     calcWidth(element: any): number;
     calcFrameHeight(element: any): number;
     calcHeight(element: any): number;
-    hasHScroll(element: any): boolean;
-    hasVScroll(element: any): boolean;
+    hasHScroll(element?: any): boolean;
+    hasVScroll(element?: any): boolean;
     clientWidth(): number;
     clientHeight(): number;
     getBBox(refresh?: boolean, round?: boolean): {

package/types/HTMLWidget.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"HTMLWidget.d.ts","sourceRoot":"","sources":["../src/HTMLWidget.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,qBAAa,UAAW,SAAQ,MAAM;IAElC,OAAO,CAAC,QAAQ,CAAC;IACjB,SAAS,CAAC,aAAa,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC7C,SAAS,CAAC,YAAY,MAAC;;IAUvB,cAAc,CAAC,OAAO,KAAA;IAWtB,SAAS,CAAC,OAAO,KAAA;IAIjB,eAAe,CAAC,OAAO,KAAA;IAWvB,UAAU,CAAC,OAAO,KAAA;IAIlB,UAAU,CAAC,OAAO,KAAA;IAKlB,UAAU,CAAC,OAAO,KAAA;IAKlB,WAAW;IAIX,YAAY;IAIZ,OAAO,CAAC,OAAO,UAAQ,EAAE,KAAK,UAAQ;;;;;;IA6BtC,UAAU,CAAC,GAAG,CAAC,KAAA;IAWf,MAAM,CAAC,IAAI,CAAC,KAAA;IAYZ,MAAM,IAAI,IAAI,GAAG,WAAW,GAAG,UAAU;IACzC,MAAM,CAAC,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,WAAW,GAAG,UAAU,GAAG,IAAI;IA0CzD,UAAU,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IAmB3B,IAAI,CAAC,OAAO,CAAC,KAAA,EAAE,OAAO,CAAC,KAAA;CAU1B"}
+{"version":3,"file":"HTMLWidget.d.ts","sourceRoot":"","sources":["../src/HTMLWidget.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,qBAAa,UAAW,SAAQ,MAAM;IAElC,OAAO,CAAC,QAAQ,CAAC;IACjB,SAAS,CAAC,aAAa,EAAE,QAAQ,GAAG,QAAQ,CAAC;IAC7C,SAAS,CAAC,YAAY,MAAC;;IAUvB,cAAc,CAAC,OAAO,KAAA;IAWtB,SAAS,CAAC,OAAO,KAAA;IAIjB,eAAe,CAAC,OAAO,KAAA;IAWvB,UAAU,CAAC,OAAO,KAAA;IAIlB,UAAU,CAAC,OAAO,CAAC,KAAA;IAKnB,UAAU,CAAC,OAAO,CAAC,KAAA;IAKnB,WAAW;IAIX,YAAY;IAIZ,OAAO,CAAC,OAAO,UAAQ,EAAE,KAAK,UAAQ;;;;;;IA6BtC,UAAU,CAAC,GAAG,CAAC,KAAA;IAWf,MAAM,CAAC,IAAI,CAAC,KAAA;IAYZ,MAAM,IAAI,IAAI,GAAG,WAAW,GAAG,UAAU;IACzC,MAAM,CAAC,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,WAAW,GAAG,UAAU,GAAG,IAAI;IA0CzD,UAAU,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IAmB3B,IAAI,CAAC,OAAO,CAAC,KAAA,EAAE,OAAO,CAAC,KAAA;CAU1B"}

package/types/Menu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Menu.d.ts","sourceRoot":"","sources":["../src/Menu.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,iBAAiB,CAAC;AAEzB,qBAAa,IAAK,SAAQ,SAAU,YAAW,KAAK;IAChD,SAAS,CAAC,KAAK,OAA6D;IAC5E,SAAS,CAAC,KAAK,OAAc;IAC7B,SAAS,CAAC,KAAK,MAAC;;IAchB,UAAU;IAQV,QAAQ;IA4BR,QAAQ;IAYR,KAAK,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IAsBtB,MAAM,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IAavB,IAAI,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IAarB,KAAK,CAAC,CAAC,KAAA;IAGP,WAAW;IAGX,YAAY;IAIZ,MAAM,EAAE;QAAE,IAAI,MAAM,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KAAE,CAAC;IAC3C,cAAc,EAAE;QAAE,IAAI,MAAM,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KAAE,CAAC;CACtD"}
+{"version":3,"file":"Menu.d.ts","sourceRoot":"","sources":["../src/Menu.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAExC,OAAO,iBAAiB,CAAC;AAEzB,qBAAa,IAAK,SAAQ,SAAU,YAAW,KAAK;IAChD,SAAS,CAAC,KAAK,OAA6D;IAC5E,SAAS,CAAC,KAAK,OAAc;IAC7B,SAAS,CAAC,KAAK,MAAC;;IAchB,UAAU;IAQV,QAAQ;IA2BR,QAAQ;IAYR,KAAK,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IAsBtB,MAAM,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IAavB,IAAI,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IAarB,KAAK,CAAC,CAAC,KAAA;IAEP,WAAW;IAEX,YAAY;IAGZ,MAAM,EAAE;QAAE,IAAI,MAAM,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KAAE,CAAC;IAC3C,cAAc,EAAE;QAAE,IAAI,MAAM,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;KAAE,CAAC;CACtD"}