Skip to content

Commit

Permalink
Fix hover state on task assignment (no tests) (#1488)
Browse files Browse the repository at this point in the history
Fixe hover state on task assignment

- deferred rendering of card, assignment, tooltips
- correct hover behavior
  • Loading branch information
joshsmith authored and begedin committed Dec 8, 2017
1 parent e656510 commit 593c7e8
Show file tree
Hide file tree
Showing 14 changed files with 19,303 additions and 9 deletions.
8 changes: 6 additions & 2 deletions app/components/task-card/user/selected-item.js
@@ -1,5 +1,9 @@
import Component from '@ember/component';
import TooltipForDropdownMixin from 'code-corps-ember/mixins/tooltip-for-dropdown';

export default Component.extend({
classNames: ['select-inline', 'select-inline__selected-item']
export default Component.extend(TooltipForDropdownMixin, {
classNames: ['select-inline', 'select-inline__selected-item'],

dropdownOpen: false,
tooltipShown: false
});
8 changes: 6 additions & 2 deletions app/components/task-card/user/unselected-item.js
@@ -1,5 +1,9 @@
import Component from '@ember/component';
import TooltipForDropdownMixin from 'code-corps-ember/mixins/tooltip-for-dropdown';

export default Component.extend({
classNames: ['select-inline', 'select-inline__unselected-item']
export default Component.extend(TooltipForDropdownMixin, {
classNames: ['select-inline', 'select-inline__unselected-item'],

dropdownOpen: false,
tooltipShown: false
});
25 changes: 25 additions & 0 deletions app/mixins/tooltip-for-dropdown.js
@@ -0,0 +1,25 @@
import Mixin from '@ember/object/mixin';
import { get, observer, set } from '@ember/object';

export default Mixin.create({
dropdownOpen: false,
tooltipShown: false,

mouseEnter() {
let dropdownOpen = get(this, 'dropdownOpen');
if (dropdownOpen) {
return;
} else {
set(this, 'tooltipShown', true);
}
},

mouseLeave() {
set(this, 'tooltipShown', false);
},

dropdownOpened: observer('dropdownOpen', function() {
let tooltipShown = get(this, 'dropdownOpen') ? false : null;
set(this, 'tooltipShown', tooltipShown);
})
});
3 changes: 2 additions & 1 deletion app/templates/components/task-card/user/selected-item.hbs
@@ -1,9 +1,10 @@
{{#if select.selected}}
<img class="select-inline__selected-item__icon" src={{select.selected.photoThumbUrl}} />
<img data-test-selected-icon class="select-inline__selected-item__icon" src={{select.selected.photoThumbUrl}} />
{{#tooltip-on-component
class='tooltip'
effect='none'
enableLazyRendering=true
isShown=tooltipShown
keepInWindow=true
side='bottom'
}}
Expand Down
4 changes: 3 additions & 1 deletion app/templates/components/task-card/user/unselected-item.hbs
@@ -1,5 +1,5 @@
{{#if task.userTask.isLoading}}
<span class="select-inline__loading-item__icon"></span>
<span data-test-loading-icon class="select-inline__loading-item__icon"></span>
<span class="select-inline__loading-item__text"></span>
{{else}}
<span data-test-unselected-icon class="select-inline__unselected-item__icon">
Expand All @@ -9,6 +9,8 @@
class='tooltip'
effect='none'
enableLazyRendering=true
event='none'
isShown=tooltipShown
keepInWindow=true
side='bottom'
}}
Expand Down

0 comments on commit 593c7e8

Please sign in to comment.