Allow Unit rebase to top-level

Outline base Unit row during drag
Closes #25
This commit is contained in:
cryptogopher 2024-04-05 02:18:05 +02:00
parent 8d7f53be10
commit 175ccf6eae
4 changed files with 64 additions and 6 deletions

View File

@ -376,6 +376,17 @@ table.items td.actions {
gap: 0.4em; gap: 0.4em;
justify-content: end; justify-content: end;
} }
table.items tr.dropzone {
position: relative;
}
table.items tr.dropzone::after {
content: '';
inset: 1px 0 0 0;
position: absolute;
outline: dashed 2px #009ade;
outline-offset: -1px;
z-index: var(--z-index-table-row-outline);
}
table.items td.handle { table.items td.handle {
cursor: move; cursor: move;
} }

View File

@ -1,5 +1,8 @@
<%= tag.tr id: dom_id(unit), ondragover: "dragOver(event)", ondrop: "drop(event)", <%= tag.tr id: dom_id(unit),
data: {drag_path: unit_path(unit), drop_id: unit.base_id || unit.id} do %> ondragstart: 'dragStart(event)', ondragend: 'dragEnd(event)',
ondragover: 'dragOver(event)', ondrop: 'drop(event)',
ondragenter: 'dragEnter(event)', ondragleave: 'dragLeave(event)',
data: {drag_path: rebase_unit_path(unit), drop_id: dom_id(unit.base || unit)} do %>
<td class="<%= class_names('link', {subunit: unit.base}) %>"> <td class="<%= class_names('link', {subunit: unit.base}) %>">
<%= link_to unit.symbol, edit_unit_path(unit), id: dom_id(unit, :edit), <%= link_to unit.symbol, edit_unit_path(unit), id: dom_id(unit, :edit),
@ -20,7 +23,7 @@
method: :delete %> method: :delete %>
</td> </td>
<% if unit.movable? %> <% if unit.movable? %>
<td class="handle" draggable="true" ondragstart="dragStart(event)">&#x283F</td> <td class="handle" draggable="true">&#x283F</td>
<% else %> <% else %>
<td></td> <td></td>
<% end %> <% end %>

View File

@ -18,6 +18,12 @@
<th></th> <th></th>
<% end %> <% end %>
</tr> </tr>
<%= tag.tr id: 'unit_', hidden: true,
ondragover: 'dragOver(event)', ondrop: 'drop(event)',
ondragenter: 'dragEnter(event)', ondragleave: 'dragLeave(event)',
data: {drop_id: 'unit_'} do %>
<th colspan="5"><%= t '.top_level_drop' %></th>
<% end %>
</thead> </thead>
<tbody id="units"> <tbody id="units">
<%= render(@units) || render_no_items %> <%= render(@units) || render_no_items %>
@ -31,17 +37,54 @@
} }
} }
var lastEnterTime;
function dragStart(event) { function dragStart(event) {
var row = event.target.closest("tr"); lastEnterTime = event.timeStamp;
var row = event.currentTarget;
row.closest("table").querySelectorAll("thead tr").forEach((tr) => {
tr.toggleAttribute("hidden");
});
event.dataTransfer.setData("text/plain", row.getAttribute("data-drag-path")); event.dataTransfer.setData("text/plain", row.getAttribute("data-drag-path"));
var rowRectangle = row.getBoundingClientRect(); var rowRectangle = row.getBoundingClientRect();
event.dataTransfer.setDragImage(row, event.x - rowRectangle.left, event.y - rowRectangle.top); event.dataTransfer.setDragImage(row, event.x - rowRectangle.left, event.y - rowRectangle.top);
event.dataTransfer.dropEffect = "none"; event.dataTransfer.dropEffect = "move";
}
/*
* Drag tracking assumptions (based on FF 122.0 experience):
* * Enter/Leave events at the same timeStamp may not be logically ordered
* (e.g. E -> E -> L, not E -> L -> E),
* * not every Enter event has corresponding Leave event, especially during
* rapid pointer moves
* NOTE: sometimes Leave is not emitted when pointer goes fast over table
* and outside. This should probably be fixed in browser, than patched here.
*/
function dragEnter(event) {
//console.log(event.timeStamp + " " + event.type + ": " + event.currentTarget.id);
dragLeave(event);
lastEnterTime = event.timeStamp;
const id = event.currentTarget.getAttribute("data-drop-id");
document.getElementById(id).classList.add("dropzone");
} }
function dragOver(event) { function dragOver(event) {
event.preventDefault(); event.preventDefault();
event.dataTransfer.dropEffect = "move"; }
function dragLeave(event) {
//console.log(event.timeStamp + " " + event.type + ": " + event.currentTarget.id);
// Leave has been accounted for by Enter at the same timestamp, processed earlier
if (event.timeStamp <= lastEnterTime) return;
event.currentTarget.closest("table").querySelectorAll(".dropzone").forEach((tr) => {
tr.classList.remove("dropzone");
})
}
function dragEnd(event) {
dragLeave(event);
event.currentTarget.closest("table").querySelectorAll("thead tr").forEach((tr) => {
tr.toggleAttribute("hidden");
});
} }
function drop(event) { function drop(event) {

View File

@ -53,6 +53,7 @@ en:
index: index:
add_unit: Add unit add_unit: Add unit
no_items: There are no configured units. You can try to import some defaults. no_items: There are no configured units. You can try to import some defaults.
top_level_drop: Drop here to reposition into top-level unit
new: new:
none: none none: none
create: create: