Browse Source

Fix hover state in Layers. Closes #3065

pull/3147/head
Artur Arseniev 5 years ago
parent
commit
e08b795bc6
  1. 17
      src/commands/view/SelectComponent.js
  2. 7
      src/navigator/view/ItemView.js

17
src/commands/view/SelectComponent.js

@ -157,6 +157,15 @@ export default {
if (el.ownerDocument === this.currentDoc) this.elHovered = result;
});
} else {
this.currentDoc = null;
this.elHovered = 0;
this.updateToolsLocal();
this.canvas.getFrames().forEach(frame => {
const { view } = frame;
const el = view && view.getToolsEl();
el && this.toggleToolsEl(0, 0, { el });
});
}
},
@ -209,15 +218,7 @@ export default {
},
onOut() {
this.currentDoc = null;
this.em.setHovered(0);
this.elHovered = 0;
this.updateToolsLocal();
this.canvas.getFrames().forEach(frame => {
const { view } = frame;
const el = view && view.getToolsEl();
el && this.toggleToolsEl(0, 0, { el });
});
},
toggleToolsEl(on, view, opts = {}) {

7
src/navigator/view/ItemView.js

@ -15,6 +15,7 @@ export default Backbone.View.extend({
'click [data-toggle-visible]': 'toggleVisibility',
'click [data-toggle-select]': 'handleSelect',
'mouseover [data-toggle-select]': 'handleHover',
'mouseout [data-toggle-select]': 'handleHoverOut',
'click [data-toggle-open]': 'toggleOpening',
'dblclick [data-name]': 'handleEdit',
'focusout [data-name]': 'handleEditEnd'
@ -249,6 +250,12 @@ export default Backbone.View.extend({
em && config.showHover && em.setHovered(model, { fromLayers: 1 });
},
handleHoverOut(ev) {
ev.stopPropagation();
const { em, config } = this;
em && config.showHover && em.setHovered(0, { fromLayers: 1 });
},
/**
* Delegate to sorter
* @param Event

Loading…
Cancel
Save