fixed issue #198

TonyGermaneri · Apr 4, 2019 · 5bf9258 · 5bf9258
1 parent a5069fc
commit 5bf9258
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 12 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "canvas-datagrid",
   "main": "lib/main.js",
-  "version": "0.22.10",
+  "version": "0.22.11",
   "ignore": [
     "**/.*",
     "node_modules",

diff --git a/build.txt b/build.txt
@@ -1 +1 @@
-2040
+2041
diff --git a/dist/canvas-datagrid.debug.js b/dist/canvas-datagrid.debug.js
diff --git a/dist/canvas-datagrid.debug.map b/dist/canvas-datagrid.debug.map
diff --git a/dist/canvas-datagrid.js b/dist/canvas-datagrid.js
diff --git a/dist/canvas-datagrid.map b/dist/canvas-datagrid.map
diff --git a/lib/component.js b/lib/component.js
@@ -105,6 +105,8 @@ define(['./defaults'], function (defaults) {
         };
         component.connectedCallback = function () {
             var intf = this;
+            intf.parentDOMNode.innerHTML = "";
+            intf.parentDOMNode.appendChild(intf.canvas);
             intf.connected = true;
             component.observe(intf);
             component.applyComponentStyle(true, intf);

diff --git a/lib/dom.js b/lib/dom.js
@@ -516,12 +516,13 @@ define([], function () {
                 self.parentIsCanvas = /^canvas$/i.test(self.parentDOMNode.tagName);
                 if (self.parentIsCanvas) {
                     self.canvas = self.parentDOMNode;
-                    document.body.appendChild(self.controlInput);
                 } else {
                     self.canvas = document.createElement('canvas');
-                    self.parentDOMNode.appendChild(self.canvas);
-                    document.body.appendChild(self.controlInput);
+                    if (self.intf.createShadowRoot) {
+                        self.parentDOMNode.appendChild(self.canvas);
+                    }
                 }
+                document.body.appendChild(self.controlInput);
                 self.createInlineStyle(self.canvas, 'canvas-datagrid');
                 self.ctx = self.canvas.getContext('2d');
                 self.ctx.textBaseline = 'alphabetic';

diff --git a/lib/intf.js b/lib/intf.js
@@ -784,6 +784,11 @@ define([], function () {
                 return self.sizes;
             }
         });
+        Object.defineProperty(self.intf, 'parentDOMNode', {
+            get: function () {
+                return self.parentDOMNode;
+            }
+        });
         Object.defineProperty(self.intf, 'input', {
             get: function () {
                 return self.input;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "canvas-datagrid",
-  "version": "0.22.10",
+  "version": "0.22.11",
   "description": "Canvas based data grid web component.  Capable of displaying millions of contiguous hierarchical rows and columns without paging or loading, on a single canvas element.",
   "main": "./dist/canvas-datagrid.js",
   "scripts": {