fix(Todos): Fix Todos layout issues when Todos should be hidden

meetfranz · Apr 5, 2022 · fb3988a · fb3988a
1 parent 41957e1
commit fb3988a
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 20 deletions.
diff --git a/src/features/todos/components/TodosWebview.js b/src/features/todos/components/TodosWebview.js
@@ -103,17 +103,12 @@ class TodosWebview extends Component {
     intl: intlShape,
   };
 
-  resizeObserver = new window.ResizeObserver(([element]) => {
-    const bounds = element.target.getBoundingClientRect();
-
-    ipcRenderer.send(RESIZE_TODO_VIEW, {
-      width: bounds.width,
-      height: bounds.height,
-      x: bounds.x,
-      y: element.target.offsetTop,
-    });
+  resizeObserver = new window.ResizeObserver(() => {
+    this.resizeBrowserView();
   });
 
+  todosContainerRef = React.createRef()
+
   componentWillMount() {
     const { width } = this.props;
 
@@ -123,19 +118,21 @@ class TodosWebview extends Component {
   }
 
   componentDidMount() {
-    this.node.addEventListener('mousemove', this.resizePanel.bind(this));
-    this.node.addEventListener('mouseup', this.stopResize.bind(this));
-    this.node.addEventListener('mouseleave', this.stopResize.bind(this));
+    this.todosContainerRef.current.addEventListener('mousemove', this.resizePanel.bind(this));
+    this.todosContainerRef.current.addEventListener('mouseup', this.stopResize.bind(this));
+    this.todosContainerRef.current.addEventListener('mouseleave', this.stopResize.bind(this));
 
-    this.resizeObserver.observe(this.node);
+    this.resizeObserver.observe(this.todosContainerRef.current);
 
-    const bounds = this.node.getBoundingClientRect();
+    this.resizeBrowserView();
+  }
 
+  componentWillUnmount() {
     ipcRenderer.send(RESIZE_TODO_VIEW, {
-      width: bounds.width,
-      height: bounds.height,
-      x: bounds.x,
-      y: bounds.y,
+      width: 0,
+      height: 0,
+      x: 0,
+      y: 0,
     });
   }
 
@@ -193,6 +190,20 @@ class TodosWebview extends Component {
     }
   }
 
+  resizeBrowserView() {
+    if (this.todosContainerRef.current) {
+      const bounds = this.todosContainerRef.current.getBoundingClientRect();
+
+      ipcRenderer.send(RESIZE_TODO_VIEW, {
+        width: bounds.width,
+        height: bounds.height,
+        x: bounds.x,
+        y: this.todosContainerRef.current.offsetTop,
+      });
+    }
+  }
+
+
   render() {
     const {
       classes,
@@ -224,7 +235,7 @@ class TodosWebview extends Component {
         })}
         style={{ width: displayedWidth }}
         onMouseUp={() => this.stopResize()}
-        ref={(node) => { this.node = node; }}
+        ref={this.todosContainerRef}
         id="todos-panel"
       >
         <div

diff --git a/src/features/todos/store.js b/src/features/todos/store.js
@@ -18,7 +18,9 @@ import {
 } from '.';
 import { IPC } from './constants';
 import { state as delayAppState } from '../delayApp';
-import { TODOS_FETCH_WEB_CONTENTS_ID, TODOS_TOGGLE_DRAWER, TODOS_TOGGLE_ENABLE_TODOS } from '../../ipcChannels';
+import {
+  RESIZE_TODO_VIEW, TODOS_FETCH_WEB_CONTENTS_ID, TODOS_TOGGLE_DRAWER, TODOS_TOGGLE_ENABLE_TODOS,
+} from '../../ipcChannels';
 import { sleep } from '../../helpers/async-helpers';
 
 const debug = require('debug')('Franz:feature:todos:store');
@@ -101,6 +103,7 @@ export default class TodoStore extends FeatureStore {
       this._updateTodosConfig,
       this._firstLaunchReaction,
       this._routeCheckReaction,
+      this._hideTodosBrowserView,
     ]);
 
     this._registerReactions(this._allReactions);
@@ -284,4 +287,15 @@ export default class TodoStore extends FeatureStore {
       }
     }
   }
+
+  _hideTodosBrowserView = () => {
+    if (this.isTodosPanelForceHidden) {
+      ipcRenderer.send(RESIZE_TODO_VIEW, {
+        width: 0,
+        height: 0,
+        x: 0,
+        y: 0,
+      });
+    }
+  }
 }