extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-21 23:43:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix drag & drop onto tree items loaded via ajax did not hightlight on drag enter

Browse Source
This commit is contained in:
nathan 2024-09-30 13:58:31 -06:00
parent 792e289234
commit 2c196d3419
3 changed files with 60 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
api/js/egw_action/EgwDragDropShoelaceTree.ts
View File

@ -24,50 +24,63 @@ export class EgwDragDropShoelaceTree extends egwActionObjectInterface{
// Reference to the widget that's handling actions for us
public findActionTargetHandler : EgwActionObject;
constructor(_tree:Et2Tree, _itemId: string) {
private timeout : ReturnType<typeof setTimeout>;
constructor(_tree : Et2Tree)
{
super();
this.node = _tree.getDomNode(_itemId);
this.id = _itemId
this.tree = _tree
this.findActionTargetHandler = _tree.widget_object;
this.doGetDOMNode = function () {
return this.node;
}
let timeout: NodeJS.Timeout;
this.doTriggerEvent = function (_event) {
if (_event == EGW_AI_DRAG_ENTER)
public doTriggerEvent(egw_event : number, dom_event : Event)
{
this.node.classList.add("draggedOver", "drop-hover");
timeout = setTimeout(() => {
if (this.node.classList.contains("draggedOver"))
const target = this.tree.findActionTarget(dom_event);
if(egw_event == EGW_AI_DRAG_ENTER)
{
this.node.expanded = true
target.target.classList.add("draggedOver", "drop-hover");
this.timeout = setTimeout(() =>
{
if(target.target.classList.contains("draggedOver"))
{
(<SlTreeItem>target.target).expanded = true
}
}, EXPAND_FOLDER_ON_DRAG_DROP_TIMEOUT)
}
if (_event == EGW_AI_DRAG_OUT)
else if(egw_event == EGW_AI_DRAG_OUT)
{
(this.node).classList.remove("draggedOver", "drop-hover");
clearTimeout(timeout)
target.target.classList.remove("draggedOver", "drop-hover");
clearTimeout(this.timeout)
}
else
{
debugger;
}
return true
}
this.doSetState = function (_state) {
if (!_tree || !_tree.focusItem) return;
public doSetState(_state)
{
if(!this.tree || !this.tree.focusItem)
{
return;
}
// Update the "focused" flag
if (egwBitIsSet(_state, EGW_AO_STATE_FOCUSED))
if(egwBitIsSet(_state, EGW_AO_STATE_FOCUSED))
{
_tree.focusItem(this.id);
this.tree.focusItem(this.id);
}
if (egwBitIsSet(_state, EGW_AO_STATE_SELECTED))
if(egwBitIsSet(_state, EGW_AO_STATE_SELECTED))
{
// _tree.selectItem(this.id, false); // false = do not trigger onSelect
}
}
doGetDOMNode()
{
return this.tree;
}
}

6
api/js/etemplate/Et2Tree/Et2Tree.ts
View File

@ -1291,6 +1291,12 @@ export class Et2Tree extends Et2WidgetWithSelectMixin(LitElement) implements Fin
return element.tagName == "SL-TREE-ITEM"
});
let action : EgwActionObject = this.widget_object.getObjectById(target.id);
// Create on the fly if not there?
if(!action)
{
debugger;
}
return {target: target, action: action};
}
}

2
mail/js/app.js
View File

@ -3693,7 +3693,7 @@ app.classes.mail = AppJS.extend(
* @param _allMessagesChecked
*/
mail_callMove: function(_action,_senders,_target,_allMessagesChecked) {
var target = _action.id == 'drop_move_mail' ? _target.iface.id : _action.id.substr(5);
var target = _action.id == 'drop_move_mail' ? _target.id : _action.id.substr(5);
var messages = this.mail_getFormData(_senders);
if (typeof _allMessagesChecked=='undefined') _allMessagesChecked=false;