Merge pull request #546 from jpmorganchase/hypergrid-hover-theme-fix

Hypergrid hover theme fix
finos · Apr 19, 2019 · 529e9b5 · 529e9b5
2 parents e26c7e6 + 64fe927
commit 529e9b5
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/packages/perspective-viewer-hypergrid/src/js/hypergrid.js b/packages/perspective-viewer-hypergrid/src/js/hypergrid.js
@@ -15,6 +15,7 @@ const perspectivePlugin = require("./perspective-plugin");
 const PerspectiveDataModel = require("./PerspectiveDataModel");
 const treeLineRendererPaint = require("./hypergrid-tree-cell-renderer").treeLineRendererPaint;
 const {psp2hypergrid, page2hypergrid} = require("./psp-to-hypergrid");
+const {cloneDeep} = require("lodash");
 
 import {bindTemplate} from "@jpmorganchase/perspective-viewer/cjs/js/utils.js";
 
@@ -117,7 +118,7 @@ const light_theme_overrides = {
 };
 
 function generateGridProperties(overrides) {
-    return Object.assign({}, base_grid_properties, overrides);
+    return Object.assign({}, cloneDeep(base_grid_properties), cloneDeep(overrides));
 }
 
 function null_formatter(formatter, null_value = "") {
@@ -193,7 +194,7 @@ bindTemplate(TEMPLATE, style)(
                     return _old_paint.call(this, gc, config);
                 };
 
-                const grid_properties = generateGridProperties(Hypergrid._default_properties || light_theme_overrides);
+                const grid_properties = generateGridProperties(light_theme_overrides);
 
                 grid_properties["showRowNumbers"] = grid_properties["showCheckboxes"] || grid_properties["showRowNumbers"];
                 grid_properties["treeHeaderBackgroundColor"] = grid_properties["backgroundColor"] = this.get_style("--hypergrid-tree-header--background");