Skip to content

Commit 593c7e8

Browse files
joshsmithbegedin
authored andcommitted
Fix hover state on task assignment (no tests) (#1488)
Fixe hover state on task assignment - deferred rendering of card, assignment, tooltips - correct hover behavior
1 parent e656510 commit 593c7e8

File tree

14 files changed

+19303
-9
lines changed

14 files changed

+19303
-9
lines changed
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import Component from '@ember/component';
2+
import TooltipForDropdownMixin from 'code-corps-ember/mixins/tooltip-for-dropdown';
23

3-
export default Component.extend({
4-
classNames: ['select-inline', 'select-inline__selected-item']
4+
export default Component.extend(TooltipForDropdownMixin, {
5+
classNames: ['select-inline', 'select-inline__selected-item'],
6+
7+
dropdownOpen: false,
8+
tooltipShown: false
59
});
Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
import Component from '@ember/component';
2+
import TooltipForDropdownMixin from 'code-corps-ember/mixins/tooltip-for-dropdown';
23

3-
export default Component.extend({
4-
classNames: ['select-inline', 'select-inline__unselected-item']
4+
export default Component.extend(TooltipForDropdownMixin, {
5+
classNames: ['select-inline', 'select-inline__unselected-item'],
6+
7+
dropdownOpen: false,
8+
tooltipShown: false
59
});

app/mixins/tooltip-for-dropdown.js

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import Mixin from '@ember/object/mixin';
2+
import { get, observer, set } from '@ember/object';
3+
4+
export default Mixin.create({
5+
dropdownOpen: false,
6+
tooltipShown: false,
7+
8+
mouseEnter() {
9+
let dropdownOpen = get(this, 'dropdownOpen');
10+
if (dropdownOpen) {
11+
return;
12+
} else {
13+
set(this, 'tooltipShown', true);
14+
}
15+
},
16+
17+
mouseLeave() {
18+
set(this, 'tooltipShown', false);
19+
},
20+
21+
dropdownOpened: observer('dropdownOpen', function() {
22+
let tooltipShown = get(this, 'dropdownOpen') ? false : null;
23+
set(this, 'tooltipShown', tooltipShown);
24+
})
25+
});

app/templates/components/task-card/user/selected-item.hbs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{{#if select.selected}}
2-
<img class="select-inline__selected-item__icon" src={{select.selected.photoThumbUrl}} />
2+
<img data-test-selected-icon class="select-inline__selected-item__icon" src={{select.selected.photoThumbUrl}} />
33
{{#tooltip-on-component
44
class='tooltip'
55
effect='none'
66
enableLazyRendering=true
7+
isShown=tooltipShown
78
keepInWindow=true
89
side='bottom'
910
}}

app/templates/components/task-card/user/unselected-item.hbs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{#if task.userTask.isLoading}}
2-
<span class="select-inline__loading-item__icon"></span>
2+
<span data-test-loading-icon class="select-inline__loading-item__icon"></span>
33
<span class="select-inline__loading-item__text"></span>
44
{{else}}
55
<span data-test-unselected-icon class="select-inline__unselected-item__icon">
@@ -9,6 +9,8 @@
99
class='tooltip'
1010
effect='none'
1111
enableLazyRendering=true
12+
event='none'
13+
isShown=tooltipShown
1214
keepInWindow=true
1315
side='bottom'
1416
}}

0 commit comments

Comments
 (0)