From 3b501137a58f5f08a5c3e08c0249a114d7a87026 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Thu, 14 Jun 2018 11:42:21 +0100 Subject: [PATCH] change cursor:pointer iff clicking TagPanel background does something Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- res/css/structures/_TagPanel.scss | 5 ++++- src/components/structures/TagPanel.js | 13 ++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/res/css/structures/_TagPanel.scss b/res/css/structures/_TagPanel.scss index a76c04805d..415aafd924 100644 --- a/res/css/structures/_TagPanel.scss +++ b/res/css/structures/_TagPanel.scss @@ -17,7 +17,6 @@ limitations under the License. .mx_TagPanel { flex: 0 0 60px; background-color: $tertiary-accent-color; - cursor: pointer; display: flex; flex-direction: column; @@ -25,6 +24,10 @@ limitations under the License. justify-content: space-between; } +.mx_TagPanel_items_selected { + cursor: pointer; +} + .mx_TagPanel .mx_TagPanel_clearButton_container { /* Constant height within flex mx_TagPanel */ height: 70px; diff --git a/src/components/structures/TagPanel.js b/src/components/structures/TagPanel.js index 6b6b09c5dc..652211595b 100644 --- a/src/components/structures/TagPanel.js +++ b/src/components/structures/TagPanel.js @@ -1,5 +1,5 @@ /* -Copyright 2017 New Vector Ltd. +Copyright 2017, 2018 New Vector Ltd. Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -26,6 +26,7 @@ import dis from '../../dispatcher'; import { _t } from '../../languageHandler'; import { Droppable } from 'react-beautiful-dnd'; +import classNames from 'classnames'; const TagPanel = React.createClass({ displayName: 'TagPanel', @@ -116,8 +117,10 @@ const TagPanel = React.createClass({ />; }); + const itemsSelected = this.state.selectedTags.length > 0; + let clearButton; - if (this.state.selectedTags.length > 0) { + if (itemsSelected) { clearButton = ; } - return
+ const classes = classNames('mx_TagPanel', { + mx_TagPanel_items_selected: itemsSelected, + }); + + return
{ clearButton }