From 3dc625a8bdafd34f924a08938fedf13b271af24e Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Tue, 6 Jun 2017 10:35:37 -0400 Subject: PLT-6705 Show partially hidden channels as 'Unread above/below' (#6580) --- webapp/components/sidebar.jsx | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'webapp/components/sidebar.jsx') diff --git a/webapp/components/sidebar.jsx b/webapp/components/sidebar.jsx index 6fd82f3a7..b998700d8 100644 --- a/webapp/components/sidebar.jsx +++ b/webapp/components/sidebar.jsx @@ -249,10 +249,13 @@ export default class Sidebar extends React.Component { var showTopUnread = false; var showBottomUnread = false; + // Consider partially obscured channels as above/below + const unreadMargin = 15; + if (this.firstUnreadChannel) { var firstUnreadElement = $(ReactDOM.findDOMNode(this.refs[this.firstUnreadChannel])); - if (firstUnreadElement.position().top + firstUnreadElement.height() < 0) { + if (firstUnreadElement.position().top + firstUnreadElement.height() < unreadMargin) { showTopUnread = true; } } @@ -260,7 +263,7 @@ export default class Sidebar extends React.Component { if (this.lastUnreadChannel) { var lastUnreadElement = $(ReactDOM.findDOMNode(this.refs[this.lastUnreadChannel])); - if (lastUnreadElement.position().top > container.height()) { + if (lastUnreadElement.position().top > container.height() - unreadMargin) { showBottomUnread = true; } } -- cgit v1.2.3-1-g7c22