From 5321f15defcef641bf5b7ba39e5c9057d562c5f8 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Thu, 2 Jun 2016 23:41:32 -0700
Subject: web: fix eventlog height registration

---
 web/src/js/components/eventlog.js | 27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

(limited to 'web')

diff --git a/web/src/js/components/eventlog.js b/web/src/js/components/eventlog.js
index 0857056c..95889a66 100644
--- a/web/src/js/components/eventlog.js
+++ b/web/src/js/components/eventlog.js
@@ -7,15 +7,15 @@ import AutoScroll from "./helpers/AutoScroll";
 import {calcVScroll} from "./helpers/VirtualScroll"
 import {ToggleButton} from "./common";
 
-function LogIcon({entry}) {
-    let icon = {web: "html5", debug: "bug"}[entry.level] || "info";
+function LogIcon({event}) {
+    let icon = {web: "html5", debug: "bug"}[event.level] || "info";
     return <i className={`fa fa-fw fa-${icon}`}></i>
 }
 
-function LogEntry({entry}) {
-    return <div>
-        <LogIcon entry={entry}/>
-        {entry.message}
+function LogEntry({event, registerHeight}) {
+    return <div ref={registerHeight}>
+        <LogIcon event={event}/>
+        {event.message}
     </div>;
 }
 
@@ -63,9 +63,10 @@ class EventLogContents extends React.Component {
         }
     }
 
-    setHeight(id, ref) {
-        if (ref && !this.heights[id]) {
-            const height = ReactDOM.findDOMNode(ref).offsetHeight;
+    setHeight(id, node) {
+        console.log("setHeight", id, node);
+        if (node && !this.heights[id]) {
+            const height = node.offsetHeight;
             if (this.heights[id] !== height) {
                 this.heights[id] = height;
                 this.onViewportUpdate();
@@ -77,8 +78,12 @@ class EventLogContents extends React.Component {
         const vScroll = this.state.vScroll;
         const events = this.props.events
             .slice(vScroll.start, vScroll.end)
-            .map(entry =>
-                <LogEntry entry={entry} key={entry.id} ref={this.setHeight.bind(this, entry.id)}/>
+            .map(event =>
+                <LogEntry
+                    event={event}
+                    key={event.id}
+                    registerHeight={(node) => this.setHeight(event.id, node)}
+                />
             );
 
         return (
-- 
cgit v1.2.3