Skip to content

Drag-drop to reorder media #871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
graue wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Drag-drop to reorder media #871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/components/compose.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,9 @@
background-size: 10px 10px;
background-position: 0 0, 0 5px, 5px -5px, -5px 0px;
}
#compose-container .media-preview.dragging-over {
opacity: 0.5;
}
#compose-container .media-preview > * {
width: 80px;
height: 80px;
Expand Down
51 changes: 50 additions & 1 deletion src/components/compose.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,8 @@ function Compose({
);
const prevLanguage = useRef(language);
const [mediaAttachments, setMediaAttachments] = useState([]);
const [draggingAttachment, setDraggingAttachment] = useState(null);
const [draggingOver, setDraggingOver] = useState(null);
const [poll, setPoll] = useState(null);

const prefs = store.account.get('preferences') || {};
Expand Down Expand Up @@ -1252,6 +1254,40 @@ function Compose({
return newAttachments;
});
}}
draggingOver={draggingOver === i}
onDragStart={(e) => {
setDraggingAttachment(i);
e.dataTransfer.dropEffect = 'move';
}}
onDragEnter={() => setDraggingOver(i)}
onDragLeave={() => setDraggingOver(null)}
onDragEnd={() => {
setDraggingAttachment(null);
setDraggingOver(null);
}}
onDrop={(e) => {
const from = draggingAttachment;
const to = i;
if (from == null || from === to) return;
setMediaAttachments((attachments) => {
if (to < from) {
return [
...attachments.slice(0, to),
attachments[from],
...attachments.slice(to, from),
...attachments.slice(from + 1),
];
} else {
return [
...attachments.slice(0, from),
...attachments.slice(from + 1, to + 1),
attachments[from],
...attachments.slice(to + 1),
];
}
});
e.stopPropagation();
}}
onRemove={() => {
setMediaAttachments((attachments) => {
return attachments.filter((_, j) => j !== i);
Expand Down Expand Up @@ -2114,6 +2150,12 @@ function MediaAttachment({
disabled,
lang,
onDescriptionChange = () => {},
draggingOver,
onDragStart,
onDragEnd,
onDragEnter,
onDragLeave,
onDrop,
onRemove = () => {},
}) {
const { i18n } = useLingui();
Expand Down Expand Up @@ -2329,8 +2371,15 @@ function MediaAttachment({
<>
<div class="media-attachment">
<div
class="media-preview"
class={`media-preview ${draggingOver ? 'dragging-over' : ''}`}
tabIndex="0"
draggable
onDragStart={onDragStart}
onDragEnd={onDragEnd}
onDragEnter={onDragEnter}
onDragLeave={onDragLeave}
onDragOver={(e) => e.preventDefault()}
onDrop={onDrop}
onClick={() => {
setShowModal(true);
}}
Expand Down
Loading