BlueGit

timfa filemanager

Add icon drag-into-folder feature (drag-move.js/css) and fix page.load test

timfa Tim Falken · pushed by timfa

Authored 2026-05-04 · 6 months ago

Hash
74ac34e237de6505968ec8c82cb5a0065c2ae2ff
Parent
e2f3ff5a
8 files changed +435 −20
.github/technical-reference.md +16 −0
@@ -48,6 +48,22 @@
48 48 - renderPreviewBody(item, blob, objectUrl) - Renders preview content (image/video/audio/pdf/text) or unsupported message.
49 49 - closePreview() - Closes preview overlay and revokes active preview object URL.
50 50 - isInlinePreviewableBlob(blob, name) - Determines if a blob can be previewed inline by MIME/extension.
51 - makeFileItem(item) - Builds a .file-item element; sets data-isdir attribute on folders and calls makeDraggable(el, item) from drag-move.js.
52
53 ## public/drag-move.js
54 - makeDraggable(el, item) - Attaches pointerdown to a .file-item; starts drag after threshold movement. Depends on: api(), canWrite(), navigateTo(), STATE, closeSidebar(), toast() from app.js.
55 - (internal) _beginDrag(e, el, item) - Creates ghost clone, dims source, records drag state.
56 - (internal) _moveDrag(e) - Moves ghost, hit-tests .file-item[data-isdir] targets, toggles drop-target class.
57 - (internal) _endDrag(e) - On valid target: runs drop animation then calls POST /api/files/move, refreshes dir. Otherwise snap-back.
58 - (internal) _cleanupDrag() - Removes ghost, clears classes, resets _drag state.
59
60 ## public/drag-move.css
61 - .file-item.drag-source - Dims source item during drag.
62 - .file-item.drop-target - Glows folder icon when drag hovers over it.
63 - .drag-ghost - Fixed-position cursor-following clone.
64 - @keyframes drag-rise-spin-fall - Ghost rises, spins, falls/scales into folder on drop.
65 - @keyframes folder-bounce - Target folder bounces down then back on accept.
66 - @keyframes drag-snap-back - Ghost snaps back to origin on abort.
51 67
52 68 ## tests/auth.routes.test.js
53 69 - session lifecycle / POST /api/auth/logout revokes active session - Verifies explicit logout invalidates token immediately.
@@ -48,6 +48,22 @@
48- renderPreviewBody(item, blob, objectUrl) - Renders preview content (image/video/audio/pdf/text) or unsupported message.
48- renderPreviewBody(item, blob, objectUrl) - Renders preview content (image/video/audio/pdf/text) or unsupported message.
49- closePreview() - Closes preview overlay and revokes active preview object URL.
49- closePreview() - Closes preview overlay and revokes active preview object URL.
50- isInlinePreviewableBlob(blob, name) - Determines if a blob can be previewed inline by MIME/extension.
50- isInlinePreviewableBlob(blob, name) - Determines if a blob can be previewed inline by MIME/extension.
51- makeFileItem(item) - Builds a .file-item element; sets data-isdir attribute on folders and calls makeDraggable(el, item) from drag-move.js.
52
53## public/drag-move.js
54- makeDraggable(el, item) - Attaches pointerdown to a .file-item; starts drag after threshold movement. Depends on: api(), canWrite(), navigateTo(), STATE, closeSidebar(), toast() from app.js.
55- (internal) _beginDrag(e, el, item) - Creates ghost clone, dims source, records drag state.
56- (internal) _moveDrag(e) - Moves ghost, hit-tests .file-item[data-isdir] targets, toggles drop-target class.
57- (internal) _endDrag(e) - On valid target: runs drop animation then calls POST /api/files/move, refreshes dir. Otherwise snap-back.
58- (internal) _cleanupDrag() - Removes ghost, clears classes, resets _drag state.
59
60## public/drag-move.css
61- .file-item.drag-source - Dims source item during drag.
62- .file-item.drop-target - Glows folder icon when drag hovers over it.
63- .drag-ghost - Fixed-position cursor-following clone.
64- @keyframes drag-rise-spin-fall - Ghost rises, spins, falls/scales into folder on drop.
65- @keyframes folder-bounce - Target folder bounces down then back on accept.
66- @keyframes drag-snap-back - Ghost snaps back to origin on abort.
51
67
52## tests/auth.routes.test.js
68## tests/auth.routes.test.js
53- session lifecycle / POST /api/auth/logout revokes active session - Verifies explicit logout invalidates token immediately.
69- session lifecycle / POST /api/auth/logout revokes active session - Verifies explicit logout invalidates token immediately.
.github/tests.md +4 −2
@@ -31,7 +31,9 @@
31 31
32 32 ---
33 33
34 ## `test/crypto.test.js`
35 - `hybrid encrypt / decrypt round-trip`
34 ## `tests/files.routes.test.js`
35 - `POST /api/files/move / moves a file into another folder and rewrites metadata`
36 - `POST /api/files/move / moves a folder into another folder and rewrites descendant metadata`
37 - `POST /api/files/move / rejects moving a folder into itself`
36 38
37 39 ---
@@ -31,7 +31,9 @@
31
31
32---
32---
33
33
34## `test/crypto.test.js`
34## `tests/files.routes.test.js`
35- `hybrid encrypt / decrypt round-trip`
35- `POST /api/files/move / moves a file into another folder and rewrites metadata`
36- `POST /api/files/move / moves a folder into another folder and rewrites descendant metadata`
37- `POST /api/files/move / rejects moving a folder into itself`
36
38
37---
39---
package.json +28 −18
@@ -1,20 +1,30 @@
1 1 {
2 "name": "filemanager",
3 "version": "1.0.0",
4 "description": "Self-hosted file manager for Raspberry Pi",
5 "main": "server/index.js",
6 "scripts": {
7 "start": "node server/index.js",
8 "test": "jest --runInBand"
9 },
10 "dependencies": {
11 "bcrypt": "^5.1.1",
12 "node-sqlite3-wasm": "^0.8.10",
13 "express": "^4.18.2",
14 "geoip-lite": "^1.4.10",
15 "jsonwebtoken": "^9.0.2",
16 "multer": "^1.4.5-lts.1",
17 "uuid": "^9.0.0",
18 "jest": "^29.7.0"
19 }
2 "name": "filemanager",
3 "version": "1.0.0",
4 "description": "Self-hosted file manager for Raspberry Pi",
5 "main": "server/index.js",
6 "scripts": {
7 "start": "node server/index.js",
8 "test": "jest --runInBand"
9 },
10 "dependencies": {
11 "bcrypt": "^5.1.1",
12 "express": "^4.18.2",
13 "geoip-lite": "^1.4.10",
14 "jest": "^29.7.0",
15 "jsonwebtoken": "^9.0.2",
16 "multer": "^1.4.5-lts.1",
17 "node-sqlite3-wasm": "^0.8.10",
18 "uuid": "^9.0.0"
19 },
20 "jest": {
21 "testEnvironment": "node",
22 "transformIgnorePatterns": [
23 "/node_modules/(?!(@exodus/bytes)/)"
24 ]
25 },
26 "devDependencies": {
27 "jest-environment-jsdom": "^30.3.0",
28 "jsdom": "^20.0.3"
29 }
20 30 }
@@ -1,20 +1,30 @@
1{
1{
2 "name": "filemanager",
2 "name": "filemanager",
3 "version": "1.0.0",
3 "version": "1.0.0",
4 "description": "Self-hosted file manager for Raspberry Pi",
4 "description": "Self-hosted file manager for Raspberry Pi",
5 "main": "server/index.js",
5 "main": "server/index.js",
6 "scripts": {
6 "scripts": {
7 "start": "node server/index.js",
7 "start": "node server/index.js",
8 "test": "jest --runInBand"
8 "test": "jest --runInBand"
9 },
9 },
10 "dependencies": {
10 "dependencies": {
11 "bcrypt": "^5.1.1",
11 "bcrypt": "^5.1.1",
12 "node-sqlite3-wasm": "^0.8.10",
12 "express": "^4.18.2",
13 "express": "^4.18.2",
13 "geoip-lite": "^1.4.10",
14 "geoip-lite": "^1.4.10",
14 "jest": "^29.7.0",
15 "jsonwebtoken": "^9.0.2",
15 "jsonwebtoken": "^9.0.2",
16 "multer": "^1.4.5-lts.1",
16 "multer": "^1.4.5-lts.1",
17 "uuid": "^9.0.0",
17 "node-sqlite3-wasm": "^0.8.10",
18 "jest": "^29.7.0"
18 "uuid": "^9.0.0"
19 }
19 },
20 "jest": {
21 "testEnvironment": "node",
22 "transformIgnorePatterns": [
23 "/node_modules/(?!(@exodus/bytes)/)"
24 ]
25 },
26 "devDependencies": {
27 "jest-environment-jsdom": "^30.3.0",
28 "jsdom": "^20.0.3"
29 }
20}
30}
public/app.js +3 −0
@@ -892,6 +892,7 @@ function makeFileItem (item)
892 892 const el = document.createElement('div');
893 893 el.className = 'file-item';
894 894 el.dataset.path = item.path;
895 if (item.isDir) el.dataset.isdir = '1';
895 896
896 897 const icon = document.createElement('div');
897 898 icon.className = 'icon';
@@ -907,6 +908,8 @@ function makeFileItem (item)
907 908 name.textContent = item.name;
908 909 el.appendChild(name);
909 910
911 makeDraggable(el, item);
912
910 913 // Single-click: open sidebar
911 914 el.addEventListener('click', (e) =>
912 915 {
@@ -892,6 +892,7 @@ function makeFileItem (item)
892 const el = document.createElement('div');
892 const el = document.createElement('div');
893 el.className = 'file-item';
893 el.className = 'file-item';
894 el.dataset.path = item.path;
894 el.dataset.path = item.path;
895 if (item.isDir) el.dataset.isdir = '1';
895
896
896 const icon = document.createElement('div');
897 const icon = document.createElement('div');
897 icon.className = 'icon';
898 icon.className = 'icon';
@@ -907,6 +908,8 @@ function makeFileItem (item)
907 name.textContent = item.name;
908 name.textContent = item.name;
908 el.appendChild(name);
909 el.appendChild(name);
909
910
911 makeDraggable(el, item);
912
910 // Single-click: open sidebar
913 // Single-click: open sidebar
911 el.addEventListener('click', (e) =>
914 el.addEventListener('click', (e) =>
912 {
915 {
public/drag-move.css added +61 −0
@@ -0,0 +1,61 @@
1 /* =========================================================
2 DRAG-MOVE — icon drag-into-folder styles
3 ========================================================= */
4
5 /* The item being dragged becomes translucent in place */
6 .file-item.drag-source {
7 opacity: 0.35;
8 pointer-events: none;
9 }
10
11 /* Folder highlighted while a dragged item hovers over it */
12 .file-item.drop-target .icon {
13 filter: drop-shadow(0 0 6px var(--accent, #4f8ef7)) brightness(1.25);
14 }
15
16 /* Ghost clone that follows the cursor */
17 .drag-ghost {
18 position: fixed;
19 top: 0;
20 left: 0;
21 pointer-events: none;
22 z-index: 9999;
23 opacity: 0.85;
24 transform-origin: center center;
25 will-change: transform;
26 }
27
28 /* ---- drop animation on the dragged item ---- */
29 @keyframes drag-rise-spin-fall {
30 0% { transform: translate(var(--dx), var(--dy)) scale(1) rotate(0deg); opacity: 1; }
31 20% { transform: translate(var(--dx), calc(var(--dy) - 40px)) scale(1.05) rotate(60deg); opacity: 1; }
32 60% { transform: translate(var(--dx), calc(var(--dy) - 20px)) scale(0.7) rotate(200deg); opacity: 0.9; }
33 100% { transform: translate(var(--dx), var(--fall-y)) scale(0.05) rotate(360deg); opacity: 0; }
34 }
35
36 .drag-ghost.dropping {
37 animation: drag-rise-spin-fall 0.45s cubic-bezier(0.4, 0, 0.8, 1) forwards;
38 }
39
40 /* ---- bounce animation on the target folder ---- */
41 @keyframes folder-bounce {
42 0% { transform: translateY(0); }
43 30% { transform: translateY(8px); }
44 65% { transform: translateY(-4px); }
45 85% { transform: translateY(2px); }
46 100% { transform: translateY(0); }
47 }
48
49 .file-item.folder-bounce {
50 animation: folder-bounce 0.4s ease-out forwards;
51 }
52
53 /* ---- snap-back animation for aborted drag ---- */
54 @keyframes drag-snap-back {
55 0% { transform: translate(var(--dx), var(--dy)) scale(1); opacity: 0.85; }
56 100% { transform: translate(0px, 0px) scale(1); opacity: 0; }
57 }
58
59 .drag-ghost.snapping {
60 animation: drag-snap-back 0.25s ease-out forwards;
61 }
@@ -0,0 +1,61 @@
1/* =========================================================
2 DRAG-MOVE — icon drag-into-folder styles
3 ========================================================= */
4
5/* The item being dragged becomes translucent in place */
6.file-item.drag-source {
7 opacity: 0.35;
8 pointer-events: none;
9}
10
11/* Folder highlighted while a dragged item hovers over it */
12.file-item.drop-target .icon {
13 filter: drop-shadow(0 0 6px var(--accent, #4f8ef7)) brightness(1.25);
14}
15
16/* Ghost clone that follows the cursor */
17.drag-ghost {
18 position: fixed;
19 top: 0;
20 left: 0;
21 pointer-events: none;
22 z-index: 9999;
23 opacity: 0.85;
24 transform-origin: center center;
25 will-change: transform;
26}
27
28/* ---- drop animation on the dragged item ---- */
29@keyframes drag-rise-spin-fall {
30 0% { transform: translate(var(--dx), var(--dy)) scale(1) rotate(0deg); opacity: 1; }
31 20% { transform: translate(var(--dx), calc(var(--dy) - 40px)) scale(1.05) rotate(60deg); opacity: 1; }
32 60% { transform: translate(var(--dx), calc(var(--dy) - 20px)) scale(0.7) rotate(200deg); opacity: 0.9; }
33 100% { transform: translate(var(--dx), var(--fall-y)) scale(0.05) rotate(360deg); opacity: 0; }
34}
35
36.drag-ghost.dropping {
37 animation: drag-rise-spin-fall 0.45s cubic-bezier(0.4, 0, 0.8, 1) forwards;
38}
39
40/* ---- bounce animation on the target folder ---- */
41@keyframes folder-bounce {
42 0% { transform: translateY(0); }
43 30% { transform: translateY(8px); }
44 65% { transform: translateY(-4px); }
45 85% { transform: translateY(2px); }
46 100% { transform: translateY(0); }
47}
48
49.file-item.folder-bounce {
50 animation: folder-bounce 0.4s ease-out forwards;
51}
52
53/* ---- snap-back animation for aborted drag ---- */
54@keyframes drag-snap-back {
55 0% { transform: translate(var(--dx), var(--dy)) scale(1); opacity: 0.85; }
56 100% { transform: translate(0px, 0px) scale(1); opacity: 0; }
57}
58
59.drag-ghost.snapping {
60 animation: drag-snap-back 0.25s ease-out forwards;
61}
public/drag-move.js added +231 −0
@@ -0,0 +1,231 @@
1 /* =========================================================
2 DRAG-MOVE — icon drag-into-folder behaviour
3 Depends on: api(), canWrite(), navigateTo(), STATE,
4 closeSidebar() — all defined in app.js
5 ========================================================= */
6 'use strict';
7
8 /**
9 * Call this once per .file-item element created by makeFileItem().
10 * @param {HTMLElement} el The .file-item element
11 * @param {object} item The file/folder metadata object
12 */
13 function makeDraggable (el, item)
14 {
15 el.addEventListener('pointerdown', (e) =>
16 {
17 // Only primary mouse button or first touch point
18 if (e.button !== undefined && e.button !== 0) return;
19 // Don't start a drag immediately — wait for a small movement threshold
20 _dragStart(e, el, item);
21 });
22 }
23
24 // ─── Internal drag state ───────────────────────────────────────────────────
25
26 const _drag = {
27 active: false,
28 sourceEl: null,
29 sourceItem: null,
30 ghost: null,
31 originRect: null,
32 offsetX: 0,
33 offsetY: 0,
34 currentTarget: null, // .file-item folder currently hovered
35 };
36
37 const DRAG_THRESHOLD = 6; // px movement before drag is considered started
38
39 function _dragStart (downEvent, el, item)
40 {
41 let started = false;
42 let startX = downEvent.clientX;
43 let startY = downEvent.clientY;
44
45 function onMove (e)
46 {
47 const dx = e.clientX - startX;
48 const dy = e.clientY - startY;
49 if (!started)
50 {
51 if (Math.hypot(dx, dy) < DRAG_THRESHOLD) return;
52 started = true;
53 _beginDrag(downEvent, el, item);
54 }
55 if (_drag.active) _moveDrag(e);
56 }
57
58 function onUp (e)
59 {
60 document.removeEventListener('pointermove', onMove);
61 document.removeEventListener('pointerup', onUp);
62 if (started && _drag.active) _endDrag(e);
63 }
64
65 document.addEventListener('pointermove', onMove);
66 document.addEventListener('pointerup', onUp);
67 }
68
69 function _beginDrag (e, el, item)
70 {
71 if (!canWrite()) return;
72
73 const rect = el.getBoundingClientRect();
74 _drag.active = true;
75 _drag.sourceEl = el;
76 _drag.sourceItem = item;
77 _drag.originRect = rect;
78 _drag.offsetX = e.clientX - rect.left;
79 _drag.offsetY = e.clientY - rect.top;
80 _drag.currentTarget = null;
81
82 // Create ghost
83 const ghost = el.cloneNode(true);
84 ghost.className = 'file-item drag-ghost';
85 ghost.style.width = rect.width + 'px';
86 ghost.style.height = rect.height + 'px';
87 ghost.style.left = '0px';
88 ghost.style.top = '0px';
89 _setGhostPos(ghost, e.clientX - _drag.offsetX, e.clientY - _drag.offsetY);
90 document.body.appendChild(ghost);
91 _drag.ghost = ghost;
92
93 // Dim the source
94 el.classList.add('drag-source');
95
96 // Prevent text selection during drag
97 document.body.style.userSelect = 'none';
98 }
99
100 function _setGhostPos (ghost, x, y)
101 {
102 ghost.style.transform = `translate(${x}px, ${y}px)`;
103 }
104
105 function _moveDrag (e)
106 {
107 const x = e.clientX - _drag.offsetX;
108 const y = e.clientY - _drag.offsetY;
109 _setGhostPos(_drag.ghost, x, y);
110
111 // Hit-test: find .file-item[data-isdir] under cursor (excluding source)
112 _drag.ghost.style.display = 'none';
113 const under = document.elementFromPoint(e.clientX, e.clientY);
114 _drag.ghost.style.display = '';
115
116 const targetEl = under && under.closest('.file-item[data-isdir]');
117 const isValidTarget = targetEl && targetEl !== _drag.sourceEl;
118
119 if (_drag.currentTarget && _drag.currentTarget !== targetEl)
120 {
121 _drag.currentTarget.classList.remove('drop-target');
122 }
123 if (isValidTarget)
124 {
125 targetEl.classList.add('drop-target');
126 _drag.currentTarget = targetEl;
127 } else
128 {
129 _drag.currentTarget = null;
130 }
131 }
132
133 function _endDrag (e)
134 {
135 const target = _drag.currentTarget;
136
137 // Clean up hover state
138 if (target) target.classList.remove('drop-target');
139 document.body.style.userSelect = '';
140
141 if (!target)
142 {
143 // Snap back to origin
144 _snapBack();
145 return;
146 }
147
148 // Compute animation variables: where ghost currently is vs folder top-centre
149 const ghostRect = _drag.ghost.getBoundingClientRect();
150 const folderRect = target.getBoundingClientRect();
151
152 // Fall destination: top-centre of folder icon, adjusted for ghost size
153 const fallX = folderRect.left + folderRect.width / 2 - ghostRect.width / 2;
154 const fallY = folderRect.top;
155
156 const curX = ghostRect.left;
157 const curY = ghostRect.top;
158
159 // Set CSS custom properties for the animation keyframes
160 const ghost = _drag.ghost;
161 ghost.style.setProperty('--dx', `${curX}px`);
162 ghost.style.setProperty('--dy', `${curY}px`);
163 ghost.style.setProperty('--fall-y', `${fallY}px`);
164 // Reset transform to (0,0) so the animation's translate values are absolute
165 ghost.style.transform = 'translate(0px, 0px)';
166
167 ghost.classList.add('dropping');
168 target.classList.add('folder-bounce');
169
170 const sourceEl = _drag.sourceEl;
171 const sourceItem = _drag.sourceItem;
172
173 ghost.addEventListener('animationend', async () =>
174 {
175 _cleanupDrag();
176 target.classList.remove('folder-bounce');
177
178 // Determine target folder path
179 const targetPath = target.dataset.path;
180 if (!targetPath) return;
181
182 try
183 {
184 await api('POST', '/files/move', { from: sourceItem.path, toDir: targetPath });
185 }
186 catch (err)
187 {
188 toast('Move failed: ' + err.message, 'err');
189 return;
190 }
191
192 // If the moved item was selected, close its sidebar
193 if (STATE.selectedItem && STATE.selectedItem.path === sourceItem.path)
194 {
195 closeSidebar();
196 }
197
198 navigateTo(STATE.currentDir, STATE.currentRoot);
199 }, { once: true });
200 }
201
202 function _snapBack ()
203 {
204 const ghost = _drag.ghost;
205 if (!ghost) { _cleanupDrag(); return; }
206
207 const ghostRect = ghost.getBoundingClientRect();
208 ghost.style.setProperty('--dx', `${ghostRect.left}px`);
209 ghost.style.setProperty('--dy', `${ghostRect.top}px`);
210 ghost.style.transform = 'translate(0px, 0px)';
211 ghost.classList.add('snapping');
212
213 ghost.addEventListener('animationend', () =>
214 {
215 _cleanupDrag();
216 }, { once: true });
217 }
218
219 function _cleanupDrag ()
220 {
221 if (_drag.sourceEl) _drag.sourceEl.classList.remove('drag-source');
222 if (_drag.ghost && _drag.ghost.parentNode) _drag.ghost.parentNode.removeChild(_drag.ghost);
223 if (_drag.currentTarget) _drag.currentTarget.classList.remove('drop-target');
224
225 _drag.active = false;
226 _drag.sourceEl = null;
227 _drag.sourceItem = null;
228 _drag.ghost = null;
229 _drag.originRect = null;
230 _drag.currentTarget = null;
231 }
@@ -0,0 +1,231 @@
1/* =========================================================
2 DRAG-MOVE — icon drag-into-folder behaviour
3 Depends on: api(), canWrite(), navigateTo(), STATE,
4 closeSidebar() — all defined in app.js
5 ========================================================= */
6'use strict';
7
8/**
9 * Call this once per .file-item element created by makeFileItem().
10 * @param {HTMLElement} el The .file-item element
11 * @param {object} item The file/folder metadata object
12 */
13function makeDraggable (el, item)
14{
15 el.addEventListener('pointerdown', (e) =>
16 {
17 // Only primary mouse button or first touch point
18 if (e.button !== undefined && e.button !== 0) return;
19 // Don't start a drag immediately — wait for a small movement threshold
20 _dragStart(e, el, item);
21 });
22}
23
24// ─── Internal drag state ───────────────────────────────────────────────────
25
26const _drag = {
27 active: false,
28 sourceEl: null,
29 sourceItem: null,
30 ghost: null,
31 originRect: null,
32 offsetX: 0,
33 offsetY: 0,
34 currentTarget: null, // .file-item folder currently hovered
35};
36
37const DRAG_THRESHOLD = 6; // px movement before drag is considered started
38
39function _dragStart (downEvent, el, item)
40{
41 let started = false;
42 let startX = downEvent.clientX;
43 let startY = downEvent.clientY;
44
45 function onMove (e)
46 {
47 const dx = e.clientX - startX;
48 const dy = e.clientY - startY;
49 if (!started)
50 {
51 if (Math.hypot(dx, dy) < DRAG_THRESHOLD) return;
52 started = true;
53 _beginDrag(downEvent, el, item);
54 }
55 if (_drag.active) _moveDrag(e);
56 }
57
58 function onUp (e)
59 {
60 document.removeEventListener('pointermove', onMove);
61 document.removeEventListener('pointerup', onUp);
62 if (started && _drag.active) _endDrag(e);
63 }
64
65 document.addEventListener('pointermove', onMove);
66 document.addEventListener('pointerup', onUp);
67}
68
69function _beginDrag (e, el, item)
70{
71 if (!canWrite()) return;
72
73 const rect = el.getBoundingClientRect();
74 _drag.active = true;
75 _drag.sourceEl = el;
76 _drag.sourceItem = item;
77 _drag.originRect = rect;
78 _drag.offsetX = e.clientX - rect.left;
79 _drag.offsetY = e.clientY - rect.top;
80 _drag.currentTarget = null;
81
82 // Create ghost
83 const ghost = el.cloneNode(true);
84 ghost.className = 'file-item drag-ghost';
85 ghost.style.width = rect.width + 'px';
86 ghost.style.height = rect.height + 'px';
87 ghost.style.left = '0px';
88 ghost.style.top = '0px';
89 _setGhostPos(ghost, e.clientX - _drag.offsetX, e.clientY - _drag.offsetY);
90 document.body.appendChild(ghost);
91 _drag.ghost = ghost;
92
93 // Dim the source
94 el.classList.add('drag-source');
95
96 // Prevent text selection during drag
97 document.body.style.userSelect = 'none';
98}
99
100function _setGhostPos (ghost, x, y)
101{
102 ghost.style.transform = `translate(${x}px, ${y}px)`;
103}
104
105function _moveDrag (e)
106{
107 const x = e.clientX - _drag.offsetX;
108 const y = e.clientY - _drag.offsetY;
109 _setGhostPos(_drag.ghost, x, y);
110
111 // Hit-test: find .file-item[data-isdir] under cursor (excluding source)
112 _drag.ghost.style.display = 'none';
113 const under = document.elementFromPoint(e.clientX, e.clientY);
114 _drag.ghost.style.display = '';
115
116 const targetEl = under && under.closest('.file-item[data-isdir]');
117 const isValidTarget = targetEl && targetEl !== _drag.sourceEl;
118
119 if (_drag.currentTarget && _drag.currentTarget !== targetEl)
120 {
121 _drag.currentTarget.classList.remove('drop-target');
122 }
123 if (isValidTarget)
124 {
125 targetEl.classList.add('drop-target');
126 _drag.currentTarget = targetEl;
127 } else
128 {
129 _drag.currentTarget = null;
130 }
131}
132
133function _endDrag (e)
134{
135 const target = _drag.currentTarget;
136
137 // Clean up hover state
138 if (target) target.classList.remove('drop-target');
139 document.body.style.userSelect = '';
140
141 if (!target)
142 {
143 // Snap back to origin
144 _snapBack();
145 return;
146 }
147
148 // Compute animation variables: where ghost currently is vs folder top-centre
149 const ghostRect = _drag.ghost.getBoundingClientRect();
150 const folderRect = target.getBoundingClientRect();
151
152 // Fall destination: top-centre of folder icon, adjusted for ghost size
153 const fallX = folderRect.left + folderRect.width / 2 - ghostRect.width / 2;
154 const fallY = folderRect.top;
155
156 const curX = ghostRect.left;
157 const curY = ghostRect.top;
158
159 // Set CSS custom properties for the animation keyframes
160 const ghost = _drag.ghost;
161 ghost.style.setProperty('--dx', `${curX}px`);
162 ghost.style.setProperty('--dy', `${curY}px`);
163 ghost.style.setProperty('--fall-y', `${fallY}px`);
164 // Reset transform to (0,0) so the animation's translate values are absolute
165 ghost.style.transform = 'translate(0px, 0px)';
166
167 ghost.classList.add('dropping');
168 target.classList.add('folder-bounce');
169
170 const sourceEl = _drag.sourceEl;
171 const sourceItem = _drag.sourceItem;
172
173 ghost.addEventListener('animationend', async () =>
174 {
175 _cleanupDrag();
176 target.classList.remove('folder-bounce');
177
178 // Determine target folder path
179 const targetPath = target.dataset.path;
180 if (!targetPath) return;
181
182 try
183 {
184 await api('POST', '/files/move', { from: sourceItem.path, toDir: targetPath });
185 }
186 catch (err)
187 {
188 toast('Move failed: ' + err.message, 'err');
189 return;
190 }
191
192 // If the moved item was selected, close its sidebar
193 if (STATE.selectedItem && STATE.selectedItem.path === sourceItem.path)
194 {
195 closeSidebar();
196 }
197
198 navigateTo(STATE.currentDir, STATE.currentRoot);
199 }, { once: true });
200}
201
202function _snapBack ()
203{
204 const ghost = _drag.ghost;
205 if (!ghost) { _cleanupDrag(); return; }
206
207 const ghostRect = ghost.getBoundingClientRect();
208 ghost.style.setProperty('--dx', `${ghostRect.left}px`);
209 ghost.style.setProperty('--dy', `${ghostRect.top}px`);
210 ghost.style.transform = 'translate(0px, 0px)';
211 ghost.classList.add('snapping');
212
213 ghost.addEventListener('animationend', () =>
214 {
215 _cleanupDrag();
216 }, { once: true });
217}
218
219function _cleanupDrag ()
220{
221 if (_drag.sourceEl) _drag.sourceEl.classList.remove('drag-source');
222 if (_drag.ghost && _drag.ghost.parentNode) _drag.ghost.parentNode.removeChild(_drag.ghost);
223 if (_drag.currentTarget) _drag.currentTarget.classList.remove('drop-target');
224
225 _drag.active = false;
226 _drag.sourceEl = null;
227 _drag.sourceItem = null;
228 _drag.ghost = null;
229 _drag.originRect = null;
230 _drag.currentTarget = null;
231}
public/index.html +2 −0
@@ -266,6 +266,8 @@
266 266 <!-- TOAST -->
267 267 <div id="toast" aria-live="assertive" aria-atomic="true"></div>
268 268
269 <link rel="stylesheet" href="drag-move.css" />
270 <script src="drag-move.js"></script>
269 271 <script src="app.js"></script>
270 272 </body>
271 273
@@ -266,6 +266,8 @@
266 <!-- TOAST -->
266 <!-- TOAST -->
267 <div id="toast" aria-live="assertive" aria-atomic="true"></div>
267 <div id="toast" aria-live="assertive" aria-atomic="true"></div>
268
268
269 <link rel="stylesheet" href="drag-move.css" />
270 <script src="drag-move.js"></script>
269 <script src="app.js"></script>
271 <script src="app.js"></script>
270</body>
272</body>
271
273
tests/page.load.test.js added +90 −0
@@ -0,0 +1,90 @@
1 'use strict';
2
3 const express = require('express');
4 const http = require('http');
5 const path = require('path');
6 const { once } = require('events');
7 const { webcrypto } = require('crypto');
8
9 describe('page load smoke test', () =>
10 {
11 let server;
12 let baseUrl;
13 let JSDOM;
14 let VirtualConsole;
15
16 beforeAll(async () =>
17 {
18 ({ JSDOM, VirtualConsole } = require('jsdom'));
19
20 const app = express();
21 const publicDir = path.join(__dirname, '../public');
22
23 app.use(express.json());
24 app.use(express.static(publicDir));
25
26 app.get('/api/auth/server-key', (req, res) => res.json({ publicKey: null }));
27 app.get('/api/auth/setup-needed', (req, res) => res.json({ needed: false }));
28 app.get('/api/auth/me', (req, res) => res.json({ username: 'tester', isAdmin: false, permissions: {} }));
29 app.get('/api/files/roots', (req, res) => res.json({ roots: [{ label: 'Root', path: '/data' }] }));
30 app.get('/api/files/list', (req, res) => res.json({ items: [] }));
31 app.get('/api/files/space', (req, res) => res.json({ usedBytes: 0, freeBytes: 1024 * 1024 }));
32 app.post('/api/auth/logout', (req, res) => res.json({ ok: true }));
33 app.get('*', (req, res) => res.sendFile(path.join(publicDir, 'index.html')));
34
35 server = http.createServer(app);
36 server.listen(0);
37 await once(server, 'listening');
38 baseUrl = `http://127.0.0.1:${server.address().port}`;
39 });
40
41 afterAll(() => server.close());
42
43 test('requests / and boots the client without runtime errors', async () =>
44 {
45 const virtualConsole = new VirtualConsole();
46 const runtimeErrors = [];
47
48 virtualConsole.on('jsdomError', (err) =>
49 {
50 runtimeErrors.push(err);
51 });
52
53 const dom = await JSDOM.fromURL(baseUrl + '/', {
54 resources: 'usable',
55 runScripts: 'dangerously',
56 pretendToBeVisual: true,
57 virtualConsole,
58 beforeParse (window)
59 {
60 window.crypto = webcrypto;
61 window.fetch = (input, init) =>
62 {
63 const url = typeof input === 'string' ? input : input.url;
64 return fetch(new URL(url, baseUrl).toString(), init);
65 };
66 window.HTMLElement.prototype.focus = function focus () { };
67 window.matchMedia = () => ({ matches: false, addListener () { }, removeListener () { }, addEventListener () { }, removeEventListener () { } });
68 window.scrollTo = () => { };
69
70 const saved = {
71 token: 'saved-token',
72 dir: '/data',
73 rootPath: '/data',
74 lastOperationAt: Date.now(),
75 };
76 window.localStorage.setItem('filemanager.session.v1', JSON.stringify(saved));
77 window.addEventListener('error', (event) => runtimeErrors.push(event.error || new Error(event.message)));
78 window.addEventListener('unhandledrejection', (event) => runtimeErrors.push(event.reason || new Error('Unhandled rejection')));
79 },
80 });
81
82 await new Promise((resolve) => dom.window.addEventListener('load', resolve, { once: true }));
83 await new Promise(resolve => dom.window.setTimeout(resolve, 100));
84
85 expect(runtimeErrors).toEqual([]);
86 expect(dom.window.document.getElementById('app').classList.contains('hidden')).toBe(false);
87
88 dom.window.close();
89 });
90 });
@@ -0,0 +1,90 @@
1'use strict';
2
3const express = require('express');
4const http = require('http');
5const path = require('path');
6const { once } = require('events');
7const { webcrypto } = require('crypto');
8
9describe('page load smoke test', () =>
10{
11 let server;
12 let baseUrl;
13 let JSDOM;
14 let VirtualConsole;
15
16 beforeAll(async () =>
17 {
18 ({ JSDOM, VirtualConsole } = require('jsdom'));
19
20 const app = express();
21 const publicDir = path.join(__dirname, '../public');
22
23 app.use(express.json());
24 app.use(express.static(publicDir));
25
26 app.get('/api/auth/server-key', (req, res) => res.json({ publicKey: null }));
27 app.get('/api/auth/setup-needed', (req, res) => res.json({ needed: false }));
28 app.get('/api/auth/me', (req, res) => res.json({ username: 'tester', isAdmin: false, permissions: {} }));
29 app.get('/api/files/roots', (req, res) => res.json({ roots: [{ label: 'Root', path: '/data' }] }));
30 app.get('/api/files/list', (req, res) => res.json({ items: [] }));
31 app.get('/api/files/space', (req, res) => res.json({ usedBytes: 0, freeBytes: 1024 * 1024 }));
32 app.post('/api/auth/logout', (req, res) => res.json({ ok: true }));
33 app.get('*', (req, res) => res.sendFile(path.join(publicDir, 'index.html')));
34
35 server = http.createServer(app);
36 server.listen(0);
37 await once(server, 'listening');
38 baseUrl = `http://127.0.0.1:${server.address().port}`;
39 });
40
41 afterAll(() => server.close());
42
43 test('requests / and boots the client without runtime errors', async () =>
44 {
45 const virtualConsole = new VirtualConsole();
46 const runtimeErrors = [];
47
48 virtualConsole.on('jsdomError', (err) =>
49 {
50 runtimeErrors.push(err);
51 });
52
53 const dom = await JSDOM.fromURL(baseUrl + '/', {
54 resources: 'usable',
55 runScripts: 'dangerously',
56 pretendToBeVisual: true,
57 virtualConsole,
58 beforeParse (window)
59 {
60 window.crypto = webcrypto;
61 window.fetch = (input, init) =>
62 {
63 const url = typeof input === 'string' ? input : input.url;
64 return fetch(new URL(url, baseUrl).toString(), init);
65 };
66 window.HTMLElement.prototype.focus = function focus () { };
67 window.matchMedia = () => ({ matches: false, addListener () { }, removeListener () { }, addEventListener () { }, removeEventListener () { } });
68 window.scrollTo = () => { };
69
70 const saved = {
71 token: 'saved-token',
72 dir: '/data',
73 rootPath: '/data',
74 lastOperationAt: Date.now(),
75 };
76 window.localStorage.setItem('filemanager.session.v1', JSON.stringify(saved));
77 window.addEventListener('error', (event) => runtimeErrors.push(event.error || new Error(event.message)));
78 window.addEventListener('unhandledrejection', (event) => runtimeErrors.push(event.reason || new Error('Unhandled rejection')));
79 },
80 });
81
82 await new Promise((resolve) => dom.window.addEventListener('load', resolve, { once: true }));
83 await new Promise(resolve => dom.window.setTimeout(resolve, 100));
84
85 expect(runtimeErrors).toEqual([]);
86 expect(dom.window.document.getElementById('app').classList.contains('hidden')).toBe(false);
87
88 dom.window.close();
89 });
90});