diff --git a/api/js/egw_action/EgwDragDropShoelaceTree.ts b/api/js/egw_action/EgwDragDropShoelaceTree.ts index cb94c11c46..358b997da4 100644 --- a/api/js/egw_action/EgwDragDropShoelaceTree.ts +++ b/api/js/egw_action/EgwDragDropShoelaceTree.ts @@ -23,7 +23,7 @@ function dhtmlxTree_getNode(_tree: Et2Tree, _itemId: string) } } -export const EXPAND_FOLDER_ON_DRAG_DROP_TIMEOUT = 2000 +export const EXPAND_FOLDER_ON_DRAG_DROP_TIMEOUT = 1000 export class EgwDragDropShoelaceTree { constructor(_tree:Et2Tree, _itemId) { diff --git a/api/js/egw_action/EgwDropActionImplementation.ts b/api/js/egw_action/EgwDropActionImplementation.ts index 9cb18aa74f..b40f8a3b82 100644 --- a/api/js/egw_action/EgwDropActionImplementation.ts +++ b/api/js/egw_action/EgwDropActionImplementation.ts @@ -175,7 +175,7 @@ export class EgwDropActionImplementation implements EgwActionImplementation { // don't trigger dragleave if we are leaving the drag element // don't go further if the dragged element is no there (happens when a none et2 dragged element is being dragged) - if (!self.getTheDraggedDOM() || self.isTheDraggedDOM(this) || this == self.currentDropEl) return; + if (!self.getTheDraggedDOM() || self.isTheDraggedDOM(this)) return; const data = { event: event, diff --git a/api/js/etemplate/Et2Tree/Et2Tree.ts b/api/js/etemplate/Et2Tree/Et2Tree.ts index 3c63443a0f..9f3cf3f297 100644 --- a/api/js/etemplate/Et2Tree/Et2Tree.ts +++ b/api/js/etemplate/Et2Tree/Et2Tree.ts @@ -161,7 +161,19 @@ export class Et2Tree extends Et2WidgetWithSelectMixin(LitElement) white-space: nowrap; text-overflow: ellipsis; } + sl-tree-item{ + background-color: white; + } + sl-tree-item.drop-hover{ + background-color: #0a5ca5; + } + sl-tree-item.drop-hover sl-tree-item{ + background-color: white ; + } + ` + //todo bg color on drop-hover should take precedence over selected color change + ] }