From 8765b8f4947f064350d046151dcda4434b55567a Mon Sep 17 00:00:00 2001
From: haraldox <haraldox@outlook.com>
Date: Tue, 16 Jan 2018 14:24:40 +0100
Subject: Fix #32 service tooltips not initialized properly

tooltips have to be rebuilt when services are added (ReactTooltip seems to cache them at first render)
---
 src/components/layout/Sidebar.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'src/components/layout/Sidebar.js')

diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 915ebeace..6fec80090 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -50,6 +50,10 @@ export default class Sidebar extends Component {
     this.setState({ tooltipEnabled: false });
   }
 
+  componentDidUpdate() {
+    ReactTooltip.rebuild();
+  }
+
   render() {
     const { openSettings, toggleMuteApp, isAppMuted } = this.props;
     const { intl } = this.context;
-- 
cgit v1.2.3-70-g09d2


From c1e9104970619e191122eb6924003b35091ffb19 Mon Sep 17 00:00:00 2001
From: haraldox <hnaumann+github@gmail.com>
Date: Wed, 17 Jan 2018 12:09:34 +0100
Subject: fix linting issue

react component lifecycle method order
---
 src/components/layout/Sidebar.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/components/layout/Sidebar.js')

diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index 6fec80090..fa269f216 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -42,6 +42,10 @@ export default class Sidebar extends Component {
     tooltipEnabled: true,
   };
 
+  componentDidUpdate() {
+    ReactTooltip.rebuild();
+  }
+
   enableToolTip() {
     this.setState({ tooltipEnabled: true });
   }
@@ -50,10 +54,6 @@ export default class Sidebar extends Component {
     this.setState({ tooltipEnabled: false });
   }
 
-  componentDidUpdate() {
-    ReactTooltip.rebuild();
-  }
-
   render() {
     const { openSettings, toggleMuteApp, isAppMuted } = this.props;
     const { intl } = this.context;
-- 
cgit v1.2.3-70-g09d2