Makes Datatable SSR compatible #66

LiferayCloud · Feb 17, 2018 · 059dc5c · 059dc5c
1 parent 2a144c2
commit 059dc5c
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 10 deletions.
diff --git a/packages/marble-datatable/src/Datatable.js b/packages/marble-datatable/src/Datatable.js
@@ -1,4 +1,4 @@
-import core from 'metal';
+import {core, isServerSide} from 'metal';
 import dom from 'metal-dom';
 import templates from './Datatable.soy.js';
 import Component from 'metal-component';
@@ -7,6 +7,19 @@ import Soy from 'metal-soy';
 import UA from 'metal-useragent';
 
 class Datatable extends Component {
+  /**
+   * @inheritDoc
+   */
+  attached() {
+    if (isServerSide()) {
+      return;
+    }
+
+    this.keyboardFocusManager_ = new KeyboardFocusManager(this, 'td,th')
+      .setFocusHandler(this.handleNextFocus_.bind(this))
+      .start();
+  }
+
   /**
    * Visits array items and asserts that it only contains one literal type.
    * @param {array} value
@@ -38,15 +51,6 @@ class Datatable extends Component {
     }
   }
 
-  /**
-   * @inheritDoc
-   */
-  attached() {
-    this.keyboardFocusManager_ = new KeyboardFocusManager(this, 'td,th')
-      .setFocusHandler(this.handleNextFocus_.bind(this))
-      .start();
-  }
-
   /**
    * Builds a ref with for the given row and column positions.
    * @param {string} prefix

diff --git a/packages/marble-datatable/test/Datatable.node.js b/packages/marble-datatable/test/Datatable.node.js
@@ -0,0 +1,13 @@
+/**
+ * @jest-environment node
+ */
+
+import Component from 'metal-component';
+import Datatable from '../src/Datatable';
+
+describe('Datatable.node', () => {
+  it('should not fail on the server side', () => {
+    const datatable = Component.renderToString(Datatable);
+    expect(datatable).not.toBeNull();
+  });
+});