cjw/Oxicloud
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor(files): merge grid and list builder, use CSS only to switch between views

Browse Source
This commit is contained in:
Edouard Vanbelle
2026-04-03 17:58:14 +02:00
parent 3157d6ef64
commit a466a6473d
19 changed files with 640 additions and 743 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/js/app/filesView.js
+10 -18
View File
@@ -128,12 +128,12 @@ async function loadFiles(options = { insertHistory: true}) {
// This to avoid blinking page, a better solution would be to put loading on an overlay and remove timeout
let loadingFiles = setTimeout( () => {
// display loader after few delay (will be canceled if result take less time)
elements.filesGrid.innerHTML = `
window.ui.showError(`
<div class="files-loading-spinner">
<div class="spinner"></div>
<span>${window.i18n ? window.i18n.t('files.loading') : 'Loading files…'}</span>
</div>
`;
`)
}, 100);
if (!app.userHomeFolderId) {
@@ -195,16 +195,8 @@ async function loadFiles(options = { insertHistory: true}) {
if (response.status === 401 || response.status === 403) {
console.warn("Auth error when loading files, showing empty list");
elements.filesGrid.innerHTML = '<div class="empty-state"><p>Could not load files</p></div>';
elements.filesListView.innerHTML = `
<div class="list-header">
<div class="list-header-checkbox"><input type="checkbox" id="select-all-checkbox" title="Select all"></div>
<div>Name</div>
<div>Type</div>
<div>Size</div>
<div>Modified</div>
</div>
`;
// FIXME: i18n
window.ui.showError(`<p>Could not load files</p>`);
return;
}
@@ -216,17 +208,17 @@ async function loadFiles(options = { insertHistory: true}) {
if (window.multiSelect) window.multiSelect.clear();
window.ui._items.clear();
elements.filesGrid.innerHTML = '';
const _t = (window.i18n && window.i18n.t) ? window.i18n.t : k => k.split('.').pop();
elements.filesListView.innerHTML = `
window.ui.showError(`
<div class="list-header">
<div class="list-header-checkbox"><input type="checkbox" id="select-all-checkbox" title="Select all"></div>
<div data-i18n="files.name">${_t('files.name')}</div>
<div data-i18n="files.type">${_t('files.type')}</div>
<div data-i18n="files.size">${_t('files.size')}</div>
<div data-i18n="files.modified">${_t('files.modified')}</div>
</div>
`;
</div>`
);
const selectAllCb = document.getElementById('select-all-checkbox');
if (selectAllCb && window.multiSelect) {
@@ -237,9 +229,9 @@ async function loadFiles(options = { insertHistory: true}) {
const fileList = Array.isArray(listing.files) ? listing.files : [];
if (folderList.length === 0 && fileList.length === 0) {
window.showEmptyList(true);
window.ui.showEmptyList();
} else {
window.showEmptyList(false);
window.ui.resetFilesList();
window.ui.renderFolders(folderList);
window.ui.renderFiles(fileList);
}
static/js/app/main.js
+1 -2
View File
@@ -408,8 +408,7 @@ function cacheElements() {
elements.uploadBtn = document.getElementById('upload-btn');
elements.dropzone = document.getElementById('dropzone');
elements.fileInput = document.getElementById('file-input');
elements.filesGrid = document.getElementById('files-grid');
elements.filesListView = document.getElementById('files-list-view');
elements.filesList = document.getElementById('files-list');
elements.newFolderBtn = document.getElementById('new-folder-btn');
elements.gridViewBtn = document.getElementById('grid-view-btn');
elements.listViewBtn = document.getElementById('list-view-btn');
static/js/app/navigation.js
+74 -84
View File
@@ -8,27 +8,34 @@
* based on the current view preference.
*/
function syncViewContainers() {
const filesGrid = document.getElementById('files-grid');
const filesListView = document.getElementById('files-list-view');
const filesList = document.getElementById('files-list');
const gridViewBtn = document.getElementById('grid-view-btn');
const listViewBtn = document.getElementById('list-view-btn');
const isGrid = window.app.currentView === 'grid';
if (filesGrid) {
filesGrid.style.display = isGrid ? 'grid' : 'none';
filesGrid.classList.toggle('hidden', !isGrid);
if (isGrid) {
filesList.classList.remove("files-list-view");
filesList.classList.add("files-grid-view");
gridViewBtn?.classList.add('active');
listViewBtn?.classList.remove('active');
}
if (filesListView) {
filesListView.style.display = isGrid ? 'none' : 'flex';
filesListView.classList.toggle('hidden', isGrid);
else {
filesList.classList.add("files-list-view");
filesList.classList.remove("files-grid-view");
gridViewBtn?.classList.remove('active');
listViewBtn?.classList.add('active');
}
}
/**
* Hide both grid and list containers (used when switching to non-file views).
* Hide file containers (used when switching to non-file views).
* @param {boolean} show false to hide, true to show
*/
function hideFileContainers() {
const filesGrid = document.getElementById('files-grid');
const filesListView = document.getElementById('files-list-view');
if (filesGrid) { filesGrid.style.display = 'none'; filesGrid.classList.add('hidden'); }
if (filesListView) { filesListView.style.display = 'none'; filesListView.classList.add('hidden'); }
function toggleFileContainer(show) {
const filesList = document.getElementById('files-list');
filesList.classList.toggle('hidden', !show);
}
/**
@@ -162,20 +169,15 @@ function switchToSharedSection() {
// Hide breadcrumb (only shown in Files view)
const breadcrumb = document.querySelector('.breadcrumb');
if (breadcrumb) breadcrumb.style.display = 'none';
breadcrumb?.classList.add("hidden");
// Hide actions-bar for shared view
window.setActionsBarMode('hidden');
const filesGrid = document.getElementById('files-grid');
const filesListView = document.getElementById('files-list-view');
if (filesGrid) filesGrid.style.display = 'none';
if (filesListView) filesListView.style.display = 'none';
if (filesGrid) filesGrid.classList.add('hidden');
if (filesListView) filesListView.classList.add('hidden');
toggleFileContainer(false);
//hide by default empty list
window.showEmptyList(false);
//reset files view + remove any error
window.ui.resetFilesList();
// Show shared view
if (window.sharedView) {
@@ -194,17 +196,16 @@ function switchToFilesSection() {
// Show breadcrumb (only in Files view)
const breadcrumb = document.querySelector('.breadcrumb');
if (breadcrumb) breadcrumb.style.display = '';
breadcrumb?.classList.remove("hidden");
const filesGrid = document.getElementById('files-grid');
const filesListView = document.getElementById('files-list-view');
if (filesGrid) filesGrid.style.display = window.app.currentView === 'grid' ? 'grid' : 'none';
if (filesGrid) filesGrid.classList.toggle('hidden', window.app.currentView !== 'grid');
if (filesListView) filesListView.style.display = window.app.currentView === 'list' ? 'flex' : 'none';
if (filesListView) filesListView.classList.toggle('hidden', window.app.currentView !== 'list');
// show files container
toggleFileContainer(true);
//hide by default empty list
window.showEmptyList(false);
// ensure correct view
syncViewContainers();
//reset files view + remove any error
window.ui.resetFilesList();
// Reset to home folder and update breadcrumb
window.app.currentPath = window.app.userHomeFolderId || '';
@@ -223,31 +224,26 @@ function switchToFavoritesSection() {
// Hide breadcrumb (only shown in Files view)
const breadcrumb = document.querySelector('.breadcrumb');
if (breadcrumb) breadcrumb.style.display = 'none';
breadcrumb?.classList.add("hidden");
const filesGrid = document.getElementById('files-grid');
const filesListView = document.getElementById('files-list-view');
if (filesGrid) filesGrid.style.display = window.app.currentView === 'grid' ? 'grid' : 'none';
if (filesGrid) filesGrid.classList.toggle('hidden', window.app.currentView !== 'grid');
if (filesListView) filesListView.style.display = window.app.currentView === 'list' ? 'flex' : 'none';
if (filesListView) filesListView.classList.toggle('hidden', window.app.currentView !== 'list');
// show files container
toggleFileContainer(true);
// ensure correct view
syncViewContainers();
//hide by default empty list
window.showEmptyList(false);
//reset files view + remove any error
window.ui.resetFilesList();
if (window.favorites) {
window.favorites.displayFavorites();
} else {
console.error('Favorites module not loaded or initialized');
const filesGridError = document.getElementById('files-grid');
if (filesGridError) {
filesGridError.innerHTML = `
<div class="empty-state">
<i class="fas fa-exclamation-circle empty-state-icon error"></i>
<p>Error loading the favorites module</p>
</div>
`;
}
window.ui.showError(`
<i class="fas fa-exclamation-circle empty-state-icon error"></i>
<p>Error loading the favorites module</p>
`
);
}
if (window.multiSelect) window.multiSelect.clear();
@@ -262,31 +258,26 @@ function switchToRecentFilesSection() {
// Hide breadcrumb (only shown in Files view)
const breadcrumb = document.querySelector('.breadcrumb');
if (breadcrumb) breadcrumb.style.display = 'none';
breadcrumb?.classList.add("hidden");
const filesGrid = document.getElementById('files-grid');
const filesListView = document.getElementById('files-list-view');
if (filesGrid) filesGrid.style.display = window.app.currentView === 'grid' ? 'grid' : 'none';
if (filesGrid) filesGrid.classList.toggle('hidden', window.app.currentView !== 'grid');
if (filesListView) filesListView.style.display = window.app.currentView === 'list' ? 'flex' : 'none';
if (filesListView) filesListView.classList.toggle('hidden', window.app.currentView !== 'list');
// show files container
toggleFileContainer(true);
//hide by default empty list
window.showEmptyList(false);
// ensure correct view
syncViewContainers();
//reset files view + remove any error
window.ui.resetFilesList();
if (window.recent) {
window.recent.displayRecentFiles();
} else {
console.error('Recent files module not loaded or initialized');
const filesGridError = document.getElementById('files-grid');
if (filesGridError) {
filesGridError.innerHTML = `
<div class="empty-state">
<i class="fas fa-exclamation-circle empty-state-icon error"></i>
<p>Error loading the recent files module</p>
</div>
`;
}
window.ui.showError(`
<i class="fas fa-exclamation-circle empty-state-icon error"></i>
<p>Error loading the recent module</p>
`
);
}
if (window.multiSelect) window.multiSelect.clear();
}
@@ -296,19 +287,16 @@ function switchToPhotosSection() {
// Hide breadcrumb
const breadcrumb = document.querySelector('.breadcrumb');
if (breadcrumb) breadcrumb.style.display = 'none';
breadcrumb?.classList.add("hidden");
// Hide file containers
toggleFileContainer(false);
// Hide actions-bar (photos has its own upload via selection bar)
window.setActionsBarMode('hidden');
// Hide file containers
const filesGrid = document.getElementById('files-grid');
const filesListView = document.getElementById('files-list-view');
if (filesGrid) { filesGrid.style.display = 'none'; filesGrid.classList.add('hidden'); }
if (filesListView) { filesListView.style.display = 'none'; filesListView.classList.add('hidden'); }
//hide by default empty list
window.showEmptyList(false);
//reset files view + remove any error
window.ui.resetFilesList();
// Show photos view
if (window.photosView) {
@@ -323,18 +311,19 @@ function switchToTrashSection() {
// Hide breadcrumb (only shown in Files view)
const breadcrumb = document.querySelector('.breadcrumb');
if (breadcrumb) breadcrumb.style.display = 'none';
breadcrumb?.classList.add("hidden");
// Show files containers (to be filled with trash)
const filesGrid = document.getElementById('files-grid');
const filesListView = document.getElementById('files-list-view');
if (filesGrid) { filesGrid.style.display = app.currentView === 'grid' ? 'grid' : 'none'; filesGrid.classList.toggle('hidden', app.currentView !== 'grid'); }
if (filesListView) { filesListView.style.display = app.currentView === 'list' ? 'flex' : 'none'; filesListView.classList.toggle('hidden', app.currentView !== 'list'); }
const filesList = document.getElementById('files-list');
filesList.classList.remove('hidden');
setActionsBarMode('trash');
//hide by default empty list
window.showEmptyList(false);
//reset files view + remove any error
window.ui.resetFilesList();
//ensure buttons match the current view
syncViewContainers();
// Load trash items
window.loadTrashItems();
@@ -348,3 +337,4 @@ window.switchToFavoritesSection = switchToFavoritesSection;
window.switchToRecentFilesSection = switchToRecentFilesSection;
window.switchToPhotosSection = switchToPhotosSection;
window.switchToTrashSection = switchToTrashSection;
window.syncViewContainers = syncViewContainers;
static/js/app/searchView.js
+4 -8
View File
@@ -11,14 +11,10 @@ async function performSearch(query, sortBy) {
app.isSearchMode = true;
window.ui.updateBreadcrumb(`Search: "${query}"`);
const filesGrid = document.getElementById('files-grid');
if (filesGrid) {
filesGrid.innerHTML = `
<div class="search-results-header">
<h3><i class="fas fa-spinner fa-spin search-spinner"></i> Searching for "${query}"...</h3>
</div>
`;
}
window.ui.showError(
`<h3><i class="fas fa-spinner fa-spin search-spinner"></i> Searching for "${query}"...</h3>`
);
const options = {
recursive: true,
static/js/app/trashView.js
+5 -45
View File
@@ -7,9 +7,9 @@ async function loadTrashItems() {
try {
if (window.multiSelect) window.multiSelect.clear();
elements.filesGrid.innerHTML = '';
window.ui.resetFilesList(); // ensure also list visible & error hidden
const _tt = (window.i18n && window.i18n.t) ? window.i18n.t : k => k.split('.').pop();
elements.filesListView.innerHTML = `
elements.filesList.innerHTML = `
<div class="list-header trash-header">
<div data-i18n="files.name">${_tt('files.name')}</div>
<div data-i18n="files.type">${_tt('files.type')}</div>
@@ -24,13 +24,10 @@ async function loadTrashItems() {
const trashItems = await window.fileOps.getTrashItems();
if (trashItems.length === 0) {
const emptyState = document.createElement('div');
emptyState.className = 'empty-state';
emptyState.innerHTML = `
window.ui.showError(`
<i class="fas fa-trash empty-state-icon"></i>
<p>${window.i18n ? window.i18n.t('trash.empty_state') : 'The trash is empty'}</p>
`;
elements.filesGrid.appendChild(emptyState);
`);
return;
}
@@ -74,43 +71,6 @@ function addTrashItemToView(item) {
? 'file-icon folder-icon'
: `file-icon ${iconSpecialClass}`.trim();
const gridElement = document.createElement('div');
gridElement.className = 'file-card trash-item';
gridElement.dataset.trashId = item.id;
gridElement.dataset.originalId = item.original_id;
gridElement.dataset.itemType = item.item_type;
gridElement.innerHTML = `
<div class="${iconWrapClass}">
<i class="${iconClass}"></i>
</div>
<div class="file-name">${escapeHtml(item.name)}</div>
<div class="file-info">${escapeHtml(typeLabel)} - ${escapeHtml(formattedDate)}</div>
<div class="trash-actions">
<button class="btn-restore" title="${window.i18n ? window.i18n.t('trash.restore') : 'Restore'}">
<i class="fas fa-undo"></i>
</button>
<button class="btn-delete" title="${window.i18n ? window.i18n.t('trash.delete_permanently') : 'Delete permanently'}">
<i class="fas fa-trash"></i>
</button>
</div>
`;
gridElement.querySelector('.btn-restore').addEventListener('click', async (e) => {
e.stopPropagation();
if (await window.fileOps.restoreFromTrash(item.id)) {
window.loadTrashItems();
}
});
gridElement.querySelector('.btn-delete').addEventListener('click', async (e) => {
e.stopPropagation();
if (await window.fileOps.deletePermanently(item.id)) {
window.loadTrashItems();
}
});
elements.filesGrid.appendChild(gridElement);
const listElement = document.createElement('div');
listElement.className = 'file-item trash-item';
listElement.dataset.trashId = item.id;
@@ -151,7 +111,7 @@ function addTrashItemToView(item) {
}
});
elements.filesListView.appendChild(listElement);
elements.filesList.appendChild(listElement);
}
window.loadTrashItems = loadTrashItems;
static/js/app/ui.js
+258 -358
View File
@@ -7,6 +7,10 @@
// UI Module
const ui = {
/** @type {HTMLDListElement | null} */
//dragPreview,
/**
* Initialize context menus and dialogs
*/
@@ -450,42 +454,24 @@ const ui = {
* Switch to grid view
*/
switchToGridView() {
const filesGrid = document.getElementById('files-grid');
const filesListView = document.getElementById('files-list-view');
const gridViewBtn = document.getElementById('grid-view-btn');
const listViewBtn = document.getElementById('list-view-btn');
this._hydrateViewIfNeeded();
this._hydrateViewIfNeeded('grid');
filesGrid.style.display = 'grid';
filesGrid.classList.remove('hidden');
filesListView.style.display = 'none';
filesListView.classList.add('hidden');
gridViewBtn.classList.add('active');
listViewBtn.classList.remove('active');
window.app.currentView = 'grid';
localStorage.setItem('oxicloud-view', 'grid');
window.syncViewContainers();
},
/**
* Switch to list view
*/
switchToListView() {
const filesGrid = document.getElementById('files-grid');
const filesListView = document.getElementById('files-list-view');
const gridViewBtn = document.getElementById('grid-view-btn');
const listViewBtn = document.getElementById('list-view-btn');
this._hydrateViewIfNeeded();
this._hydrateViewIfNeeded('list');
filesGrid.style.display = 'none';
filesGrid.classList.add('hidden');
filesListView.style.display = 'flex';
filesListView.classList.remove('hidden');
gridViewBtn.classList.remove('active');
listViewBtn.classList.add('active');
window.app.currentView = 'list';
localStorage.setItem('oxicloud-view', 'list');
window.syncViewContainers();
},
/**
@@ -679,34 +665,36 @@ const ui = {
return stored === 'list' ? 'list' : 'grid';
},
_renderFoldersToView(folders, view) {
/**
*
* @param {Object[]} folders
* @returns
*/
_renderFoldersToView(folders) {
if (!Array.isArray(folders) || folders.length === 0) return;
const target = view === 'list'
? document.getElementById('files-list-view')
: document.getElementById('files-grid');
const target = document.getElementById('files-list')
if (!target) return;
const frag = document.createDocumentFragment();
for (const folder of folders) {
frag.appendChild(view === 'list'
? this._createFolderItem(folder)
: this._createFolderCard(folder));
frag.appendChild( this._createFolderItem(folder));
}
target.appendChild(frag);
},
_renderFilesToView(files, view) {
/**
*
* @param {Object[]} files
* @returns
*/
_renderFilesToView(files) {
if (!Array.isArray(files) || files.length === 0) return;
const target = view === 'list'
? document.getElementById('files-list-view')
: document.getElementById('files-grid');
const target = document.getElementById('files-list')
if (!target) return;
const frag = document.createDocumentFragment();
for (const file of files) {
frag.appendChild(view === 'list'
? this._createFileItem(file)
: this._createFileCard(file));
frag.appendChild( this._createFileItem(file))
}
target.appendChild(frag);
},
@@ -729,7 +717,7 @@ const ui = {
*/
async _dropToFolder(action, targetFolderId, dataTransfer) {
let selection = window.multiSelect.getSelection(targetFolderId);
window.multiSelect.clear();
if (selection.fileIds.length == 0 && selection.folderIds.length == 0) {
@@ -766,57 +754,45 @@ const ui = {
result = await window.fileOps.batchCopy(selection.fileIds, selection.folderIds, targetFolderId);
break;
case "move":
case "move":
result = await window.fileOps.batchMove(selection.fileIds, selection.folderIds, targetFolderId);
// redraw directory
// redraw directory
if (result.success > 0)
window.loadFiles();
break;
default:
console.error(`drag and drop: action ${action} unknown`);
return;
console.error(`drag and drop: action ${action} unknown`);
return;
}
window.multiSelect.showBatchResult(action, result);
console.log( result);
},
_hydrateViewIfNeeded(view) {
_hydrateViewIfNeeded() {
// Only hydrate if there is at least one rendered item in the opposite/current DOM.
// This prevents stale cache hydration in empty-state screens.
const hasAnyRenderedItem = !!document.querySelector('#files-grid .file-card, #files-list-view .file-item');
const hasAnyRenderedItem = !!document.querySelector('#files-list .file-item');
if (!hasAnyRenderedItem) return;
if (view === 'grid') {
const grid = document.getElementById('files-grid');
if (!grid) return;
if (grid.children.length > 0) return;
// FIXME: thre is the header...
const listView = document.getElementById('files-list');
if (!listView) return;
if (listView.children.length > 1) return;
this._renderFoldersToView(this._lastFolders, 'grid');
this._renderFilesToView(this._lastFiles, 'grid');
}
if (view === 'list') {
const list = document.getElementById('files-list-view');
if (!list) return;
// list view keeps a static header row as first child
if (list.querySelector('.file-item')) return;
this._renderFoldersToView(this._lastFolders, 'list');
this._renderFilesToView(this._lastFiles, 'list');
}
this._renderFoldersToView(this._lastFolders);
this._renderFilesToView(this._lastFiles);
},
/**
* Attach a fixed set of delegated event listeners to the two
* container elements (files-grid, files-list-view).
* container elements (files-list).
* Called once – idempotent.
*/
initDelegation() {
if (this._delegationReady) return;
const grid = document.getElementById('files-grid');
const list = document.getElementById('files-list-view');
if (!grid || !list) return;
const filesList = document.getElementById('files-list');
if (!filesList) return;
this._delegationReady = true;
const self = this;
@@ -878,12 +854,12 @@ const ui = {
}
};
// ── GRID: click (open / navigate; select only via checkbox) ──
grid.addEventListener('click', (e) => {
const card = e.target.closest('.file-card');
// ── click (open / navigate; select only via checkbox) ──
filesList.addEventListener('click', (e) => {
const card = e.target.closest('.file-item');
if (!card) return;
if (e.target.closest('.file-card-more')) {
if (e.target.closest('.file-actions')) {
e.stopPropagation();
e.preventDefault();
const info = itemInfo(card);
@@ -892,11 +868,11 @@ const ui = {
const menuId = info.type === 'folder'
? 'folder-context-menu' : 'file-context-menu';
showContextMenuAtElement(
e.target.closest('.file-card-more'), menuId);
e.target.closest('.file-actions'), menuId);
return;
}
if (e.target.closest('.file-card-checkbox')) {
if (e.target.closest('.checkbox-cell')) {
toggleCardSelection(card, e);
return;
}
@@ -916,178 +892,144 @@ const ui = {
});
// ── GRID: dblclick (navigate / open) ──────────────────────
grid.addEventListener('dblclick', (e) => {
filesList.addEventListener('dblclick', (e) => {
// Single-click already handles open/navigate.
// Prevent duplicate actions on double-click.
e.preventDefault();
});
// ── LIST: click (navigate / open) ─────────────────────────
list.addEventListener('click', (e) => {
if (e.target.closest('.list-header')) return;
// ── shared events ──────────────────────
filesList.addEventListener('contextmenu', (e) => {
const card = e.target.closest('.file-item');
if (!card) return;
if (e.target.closest('.file-more')) {
e.stopPropagation();
e.preventDefault();
const info = itemInfo(card);
if (!info) return;
setContextTarget(card, info);
const menuId = info.type === 'folder'
? 'folder-context-menu' : 'file-context-menu';
showContextMenuAtElement(
e.target.closest('.file-more'), menuId);
return;
}
if (e.target.closest('.list-item-checkbox') ||
e.target.closest('.item-checkbox')) {
toggleCardSelection(card, e);
return;
}
e.preventDefault();
const info = itemInfo(card);
if (!info) return;
if (info.type === 'folder') {
navigateFolder(card);
} else {
openFile(info.data);
setContextTarget(card, info);
const menuId = info.type === 'folder'
? 'folder-context-menu' : 'file-context-menu';
const menu = document.getElementById(menuId);
if (window.contextMenus && typeof window.contextMenus.syncFavoriteOptionLabels === 'function') {
window.contextMenus.syncFavoriteOptionLabels();
}
if (window.contextMenus && typeof window.contextMenus.syncWopiOptionVisibility === 'function') {
window.contextMenus.syncWopiOptionVisibility().catch(function(){});
}
menu.style.left = `${e.pageX}px`;
menu.style.top = `${e.pageY}px`;
menu.style.display = 'block';
});
// ── shared events on both containers ──────────────────────
for (const container of [grid, list]) {
const sel = container === grid ? '.file-card' : '.file-item';
// contextmenu
container.addEventListener('contextmenu', (e) => {
const card = e.target.closest(sel);
if (!card) return;
e.preventDefault();
const info = itemInfo(card);
if (!info) return;
setContextTarget(card, info);
const menuId = info.type === 'folder'
? 'folder-context-menu' : 'file-context-menu';
const menu = document.getElementById(menuId);
if (window.contextMenus && typeof window.contextMenus.syncFavoriteOptionLabels === 'function') {
window.contextMenus.syncFavoriteOptionLabels();
}
if (window.contextMenus && typeof window.contextMenus.syncWopiOptionVisibility === 'function') {
window.contextMenus.syncWopiOptionVisibility().catch(function(){});
}
menu.style.left = `${e.pageX}px`;
menu.style.top = `${e.pageY}px`;
menu.style.display = 'block';
});
// dragstart
container.addEventListener('dragstart', (e) => {
let card = e.target.closest(sel);
if (!card) { e.preventDefault(); return; }
const info = itemInfo(card);
if (!info) { e.preventDefault(); return; }
if (container === grid) {
// pickup the equivalent item in list
const selector = (info.type === 'folder') ? "data-folder-id" : "data-file-id";
card = list.querySelector(`div.file-item[${selector}="${info.id}"]`);
}
e.dataTransfer.setData('text/plain', info.id);
if (info.type === 'folder') {
e.dataTransfer.setData(
'application/oxicloud-folder', 'true');
}
// allow copy or move (handled by the browser)
e.dataTransfer.effectAllowed = "copyMove";
self.draggedItems = document.createElement("div");
self.draggedItems.className = "dragged-items";
// Fplease note that dragged elements are taken from list view (uniformisation)
let selectedCardFromList = list.querySelectorAll(`div.selected > div.name-cell`);
if (selectedCardFromList.length == 0) {
// fallback to current element
selectedCardFromList = card.querySelectorAll('div.name-cell');
}
let index = 0;
const maxElements = 4;
let lastItemDiv = null;
while (index < selectedCardFromList.length && index < maxElements) {
let div = document.createElement("div");
div.className="file-item";
let clone = selectedCardFromList[index].cloneNode(true);
let star = clone.querySelector('.favorite-star-inline');
clone.querySelectorAll('img').forEach((img) => { img.loading="eager"; } );
if (star) clone.removeChild(star);
div.appendChild(clone);
self.draggedItems.appendChild( div);
index += 1;
lastItemDiv = div;
}
// if more than 1 item, display the badge
if (selectedCardFromList.length > 1) {
let badge = document.createElement("span");
badge.className="dragged-items-badge";
badge.innerText=selectedCardFromList.length;
self.draggedItems.appendChild( badge);
}
// if more than maxElements display the fading
if (selectedCardFromList.length > maxElements) {
lastItemDiv.classList.add("fading");
}
self.dragPreview.appendChild( self.draggedItems);
e.dataTransfer.setDragImage(self.draggedItems, -20, -20);
// dragstart
filesList.addEventListener('dragstart', (e) => {
let card = e.target.closest('.file-item');
if (!card) { e.preventDefault(); return; }
});
const info = itemInfo(card);
if (!info) { e.preventDefault(); return; }
// dragend
container.addEventListener('dragend', (e) => {
self.dragPreview.removeChild( self.draggedItems);
document.querySelectorAll('.drop-target')
.forEach(el => el.classList.remove('drop-target'));
});
e.dataTransfer.setData('text/plain', info.id);
if (info.type === 'folder') {
e.dataTransfer.setData(
'application/oxicloud-folder', 'true');
}
// allow copy or move (handled by the browser)
e.dataTransfer.effectAllowed = "copyMove";
self.draggedItems = document.createElement("div");
self.draggedItems.className = "dragged-items";
let selectedCardFromList = filesList.querySelectorAll(`div.selected > div.name-cell`);
if (selectedCardFromList.length == 0) {
// fallback to current element
selectedCardFromList = card.querySelectorAll('div.name-cell');
}
let index = 0;
const maxElements = 4;
let lastItemDiv = null;
// dragover – only folders are valid drop targets
container.addEventListener('dragover', (e) => {
const card = e.target.closest(sel);
if (!card || card.dataset.fileId) return;
if (!card.dataset.folderId) return;
e.preventDefault();
card.classList.add('drop-target');
});
while (index < selectedCardFromList.length && index < maxElements) {
let iconCell = document.createElement("div");
let icon = selectedCardFromList[index].getElementsByClassName("file-icon").item(0)?.cloneNode(true);
if (icon) {
iconCell.appendChild( icon);
iconCell.querySelectorAll('img')?.forEach((img) => { img.loading="eager"; } );
}
// dragleave
container.addEventListener('dragleave', (e) => {
const card = e.target.closest(sel);
if (!card || card.dataset.fileId) return;
card.classList.remove('drop-target');
});
let nameCell = document.createElement("div");
let name = selectedCardFromList[index].getElementsByTagName("span").item(0)?.cloneNode(true);
if (name) {
nameCell.appendChild(name);
}
// drop – only folders accept drops
container.addEventListener('drop', async (e) => {
const card = e.target.closest(sel);
if (!card || card.dataset.fileId) return;
const targetFolderId = card.dataset.folderId;
if (!targetFolderId) return;
let div = document.createElement("div");
div.className="file-item";
div.appendChild(iconCell);
div.appendChild(nameCell);
e.preventDefault();
card.classList.remove('drop-target');
self.draggedItems.appendChild( div);
index += 1;
lastItemDiv = div;
}
const action = e.dataTransfer.dropEffect;
await self._dropToFolder( action, targetFolderId, e.dataTransfer);
});
}
// if more than 1 item, display the badge
if (selectedCardFromList.length > 1) {
let badge = document.createElement("span");
badge.className="dragged-items-badge";
badge.innerText=`${selectedCardFromList.length}`;
self.draggedItems.appendChild( badge);
}
// if more than maxElements display the fading
if (selectedCardFromList.length > maxElements) {
lastItemDiv.classList.add("fading");
}
self.dragPreview.appendChild( self.draggedItems);
e.dataTransfer.setDragImage(self.draggedItems, 0, 0);
});
// dragend
filesList.addEventListener('dragend', (e) => {
self.dragPreview.removeChild( self.draggedItems);
document.querySelectorAll('.drop-target')
.forEach(el => el.classList.remove('drop-target'));
});
// dragover – only folders are valid drop targets
filesList.addEventListener('dragover', (e) => {
const card = e.target.closest('.file-item');
if (!card || card.dataset.fileId) return;
if (!card.dataset.folderId) return;
e.preventDefault();
card.classList.add('drop-target');
});
// dragleave
filesList.addEventListener('dragleave', (e) => {
const card = e.target.closest('.file-item');
if (!card || card.dataset.fileId) return;
card.classList.remove('drop-target');
});
// drop – only folders accept drops
filesList.addEventListener('drop', async (e) => {
const card = e.target.closest('.file-item');
if (!card || card.dataset.fileId) return;
const targetFolderId = card.dataset.folderId;
if (!targetFolderId) return;
e.preventDefault();
card.classList.remove('drop-target');
const action = e.dataTransfer.dropEffect;
await self._dropToFolder( action, targetFolderId, e.dataTransfer);
});
},
/* ================================================================
@@ -1130,15 +1072,11 @@ const ui = {
* Sync favorite visuals for a file/folder across grid and list views.
*/
setFavoriteVisualState(itemId, itemType, isFavorite) {
const cardSelector = itemType === 'folder'
? `.file-card[data-folder-id="${itemId}"]`
: `.file-card[data-file-id="${itemId}"]`;
const selector = itemType === 'folder'
? `#files-list .file-item[data-folder-id="${itemId}"]`
: `#files-list .file-item[data-file-id="${itemId}"]`;
const listSelector = itemType === 'folder'
? `.file-item[data-folder-id="${itemId}"]`
: `.file-item[data-file-id="${itemId}"]`;
const card = document.querySelector(cardSelector);
const card = document.querySelector(selector);
const starBtn = card ? card.querySelector('.favorite-star') : null;
if (starBtn) {
@@ -1162,8 +1100,8 @@ const ui = {
i.classList.add(isFavorite ? 'fas' : 'far');
}
}
const listItem = document.querySelector(listSelector);
const listItem = document.querySelector(selector);
if (listItem) {
const nameCell = listItem.querySelector('.name-cell');
if (nameCell) {
@@ -1186,37 +1124,6 @@ const ui = {
* Element-creation helpers
* ================================================================ */
/** Create a grid card for a folder */
_createFolderCard(folder) {
const el = document.createElement('div');
el.className = 'file-card';
el.dataset.folderId = folder.id;
el.dataset.folderName = folder.name;
el.dataset.parentId = folder.parent_id || "";
const isFav = window.favorites &&
window.favorites.isFavorite(folder.id, 'folder');
el.innerHTML = `
<div class="file-card-checkbox"><i class="fas fa-check"></i></div>
<button class="file-card-more"><i class="fas fa-ellipsis-v"></i></button>
<button class="favorite-star${isFav ? ' active' : ''}" data-item-id="${folder.id}" data-item-type="folder" data-item-name="${escapeHtml(folder.name)}">
<i class="${isFav ? 'fas' : 'far'} fa-star"></i>
</button>
<div class="file-icon folder-icon">
<i class="fas fa-folder"></i>
</div>
<div class="file-name">${escapeHtml(folder.name)}</div>
<div class="file-info">${window.i18n ? window.i18n.t('files.file_types.folder') : 'Folder'}</div>
`;
if (window.app.currentPath !== "") {
el.setAttribute('draggable', 'true');
}
this._bindStarClick(el);
return el;
},
/** Create a list row for a folder */
_createFolderItem(folder) {
const el = document.createElement('div');
@@ -1225,16 +1132,11 @@ const ui = {
el.dataset.folderName = folder.name;
el.dataset.parentId = folder.parent_id || "";
const isFav = window.favorites &&
window.favorites.isFavorite(folder.id, 'folder');
const isFav = window.favorites && window.favorites.isFavorite(folder.id, 'folder');
const formattedDate = window.formatDateTime(folder.modified_at);
if (window.app.currentPath !== "") {
el.setAttribute('draggable', 'true');
}
el.innerHTML = `
<div class="list-item-checkbox"><input type="checkbox" class="item-checkbox"></div>
<div class="checkbox-cell"><input type="checkbox" class="item-checkbox"></div>
<div class="name-cell">
<div class="file-icon folder-icon">
<i class="fas fa-folder"></i>
@@ -1245,61 +1147,32 @@ const ui = {
<div class="type-cell">${window.i18n ? window.i18n.t('files.file_types.folder') : 'Folder'}</div>
<div class="size-cell">--</div>
<div class="date-cell">${formattedDate}</div>
<div class="action-cell"><button class="file-more"><i class="fas fa-ellipsis-v"></i></button></div>
`;
return el;
},
/** Create a grid card for a file */
_createFileCard(file) {
const iconClass = file.icon_class || this.getIconClass(file.name);
const iconSpecialClass = file.icon_special_class || this.getIconSpecialClass(file.name);
const isFileFav = window.favorites &&
window.favorites.isFavorite(file.id, 'file');
const formattedDate = window.formatDateTime(file.modified_at);
const el = document.createElement('div');
el.className = 'file-card';
el.dataset.fileId = file.id;
el.dataset.fileName = file.name;
el.dataset.folderId = file.folder_id || "";
el.setAttribute('draggable', 'true');
el.innerHTML = `
<div class="file-card-checkbox"><i class="fas fa-check"></i></div>
<button class="file-card-more"><i class="fas fa-ellipsis-v"></i></button>
<button class="favorite-star${isFileFav ? ' active' : ''}" data-item-id="${file.id}" data-item-type="file" data-item-name="${escapeHtml(file.name)}">
<i class="${isFileFav ? 'fas' : 'far'} fa-star"></i>
</button>
<div class="file-icon ${iconSpecialClass}">
${iconSpecialClass === 'image-icon' ? `<img class="file-thumb" src="/api/files/${file.id}/thumbnail/icon" loading="lazy" alt="">` : ''}
<i class="${iconClass}"></i>
<div class="action-cell">
<button class="favorite-star${isFav ? ' active' : ''}" data-item-id="${folder.id}" data-item-type="folder" data-item-name="${escapeHtml(folder.name)}">
<i class="${isFav ? 'fas' : 'far'} fa-star"></i>
</button>
<button class="file-actions"><i class="fas fa-ellipsis-v"></i></button>
</div>
<div class="file-name">${escapeHtml(file.name)}</div>
<div class="file-info">Modified ${formattedDate.split(' ')[0]}</div>
`;
var thumb = el.querySelector('.file-thumb');
if (thumb) thumb.addEventListener('error', function() { this.style.display = 'none'; });
if (window.app.currentPath !== "") {
el.setAttribute('draggable', 'true');
}
this._bindStarClick(el);
return el;
},
/** Create a list row for a file */
/** Create a grid card for a file */
_createFileItem(file) {
const iconClass = file.icon_class || this.getIconClass(file.name);
const iconSpecialClass = file.icon_special_class || this.getIconSpecialClass(file.name);
const cat = file.category || '';
const typeLabel = cat
? (window.i18n
? window.i18n.t(`files.file_types.${cat.toLowerCase()}`) || cat
: cat)
: (window.i18n
? window.i18n.t('files.file_types.document')
: 'Document');
? (window.i18n ? window.i18n.t(`files.file_types.${cat.toLowerCase()}`) || cat : cat)
: (window.i18n ? window.i18n.t('files.file_types.document') : 'Document');
const fileSize = file.size_formatted || window.formatFileSize(file.size);
const formattedDate = window.formatDateTime(file.modified_at);
const isFileFav = window.favorites &&
window.favorites.isFavorite(file.id, 'file');
const isFav = window.favorites && window.favorites.isFavorite(file.id, 'file');
const el = document.createElement('div');
el.className = 'file-item';
@@ -1309,22 +1182,29 @@ const ui = {
el.setAttribute('draggable', 'true');
el.innerHTML = `
<div class="list-item-checkbox"><input type="checkbox" class="item-checkbox"></div>
<div class="checkbox-cell"><input type="checkbox" class="item-checkbox"></div>
<div class="name-cell">
<div class="file-icon ${iconSpecialClass}">
${iconSpecialClass === 'image-icon' ? `<img class="file-thumb" src="/api/files/${file.id}/thumbnail/icon" loading="lazy" alt="">` : ''}
<i class="${iconClass}"></i>
</div>
<span>${escapeHtml(file.name)}</span>
${isFileFav ? '<i class="fas fa-star favorite-star-inline"></i>' : ''}
${isFav ? '<i class="fas fa-star favorite-star-inline"></i>' : ''}
</div>
<div class="type-cell">${typeLabel}</div>
<div class="size-cell">${fileSize}</div>
<div class="date-cell">${formattedDate}</div>
<div class="action-cell"><button class="file-more"><i class="fas fa-ellipsis-v"></i></button></div>
<div class="action-cell">
<button class="favorite-star${isFav ? ' active' : ''}" data-item-id="${file.id}" data-item-type="file" data-item-name="${escapeHtml(file.name)}">
<i class="${isFav ? 'fas' : 'far'} fa-star"></i>
</button>
<button class="file-actions"><i class="fas fa-ellipsis-v"></i></button>
</div>
`;
var thumb = el.querySelector('.file-thumb');
if (thumb) thumb.addEventListener('error', function() { this.style.display = 'none'; });
this._bindStarClick(el);
return el;
},
@@ -1332,6 +1212,55 @@ const ui = {
* Batch rendering with DocumentFragment
* ================================================================ */
resetFilesList() {
const filesList = document.getElementById('files-list');
const filesContainerError=document.getElementById("files-container-error");
if (!filesList) return;
filesList.innerHTML=`
<div class="list-header">
<div class="list-header-checkbox"><input type="checkbox" id="select-all-checkbox" title="Select all"></div>
<div data-i18n="files.name">Name</div>
<div data-i18n="files.type">Type</div>
<div data-i18n="files.size">Size</div>
<div data-i18n="files.modified">Modified</div>
<div></div><!-- actions -->
</div>`;
if (window.i18n && window.i18n.translateElement)
window.i18n.translateElement( filesList);
filesList.classList.remove("hidden");
filesContainerError?.classList.add("hidden");
},
showEmptyList() {
this.showError(`
<i class="fas fa-folder-open empty-state-icon"></i>
<p data-i18n="files.no_files"></p>
<p data-i18n="files.empty_hint"></p>
`
);
},
/**
*
* @param {string} content
*
*/
showError(content) {
const filesContainerError=document.getElementById("files-container-error");
const filesList=document.getElementById("files-list");
if (filesContainerError)
filesContainerError.innerHTML=content;
if (window.i18n && window.i18n.translateElement)
window.i18n.translateElement( filesContainerError);
filesContainerError?.classList.remove("hidden");
filesList?.classList.add("hidden");
},
/**
* Render an array of folders into both grid and list views
* using DocumentFragment for minimal reflows.
@@ -1345,8 +1274,7 @@ const ui = {
this._items.set(folder.id, folder);
}
this._renderFoldersToView(safeFolders, 'grid');
this._renderFoldersToView(safeFolders, 'list');
this._renderFoldersToView(safeFolders);
},
/**
@@ -1362,8 +1290,7 @@ const ui = {
this._items.set(file.id, file);
}
this._renderFilesToView(safeFiles, 'grid');
this._renderFilesToView(safeFiles, 'list');
this._renderFilesToView(safeFiles);
},
/* ================================================================
@@ -1378,16 +1305,14 @@ const ui = {
if (!this._delegationReady) this.initDelegation();
// Duplicate guard
if (document.querySelector(`.file-card[data-folder-id="${folder.id}"]`) ||
document.querySelector(`.file-item[data-folder-id="${folder.id}"]`)) {
if (document.querySelector(`.file-item[data-folder-id="${folder.id}"]`)) {
console.log(`Folder ${folder.name} (${folder.id}) already exists in the view, not duplicating`);
return;
}
this._items.set(folder.id, folder);
this._upsertById(this._lastFolders, folder);
this._renderFoldersToView([folder], 'grid');
this._renderFoldersToView([folder], 'list');
this._renderFoldersToView([folder]);
},
/**
@@ -1398,16 +1323,14 @@ const ui = {
if (!this._delegationReady) this.initDelegation();
// Duplicate guard
if (document.querySelector(`.file-card[data-file-id="${file.id}"]`) ||
document.querySelector(`.file-item[data-file-id="${file.id}"]`)) {
if (document.querySelector(`.file-item[data-file-id="${file.id}"]`)) {
console.log(`File ${file.name} (${file.id}) already exists in the view, not duplicating`);
return;
}
this._items.set(file.id, file);
this._upsertById(this._lastFiles, file);
this._renderFilesToView([file], 'grid');
this._renderFilesToView([file], 'list');
this._renderFilesToView([file]);
}
};
@@ -1476,16 +1399,15 @@ function initRubberBandSelection() {
let active = false;
let startX = 0, startY = 0;
const list = document.getElementById('files-list-view');
// We listen on the whole files-container (covers grid + empty space)
const container = document.querySelector('.files-container') || document.getElementById('files-grid');
const container = document.querySelector('.files-container') || document.getElementById('files-list');
if (!container) return;
container.addEventListener('mousedown', (e) => {
// Only start if clicking empty area (not on a card, button, menu, input…)
if (e.button !== 0) return; // left click only
if (e.target.closest('.file-card') || e.target.closest('.file-item') ||
if (e.target.closest('.file-item') ||
e.target.closest('.context-menu') ||
e.target.closest('.upload-dropdown') || e.target.closest('button') ||
e.target.closest('input') || e.target.closest('.breadcrumb') ||
@@ -1528,7 +1450,7 @@ function initRubberBandSelection() {
// Highlight cards that intersect with the rectangle
const rectBounds = { left, top, right: left + width, bottom: top + height };
document.querySelectorAll('#files-grid .file-card').forEach(card => {
document.querySelectorAll('#files-list .file-item').forEach(card => {
const cardRect = card.getBoundingClientRect();
const intersects =
cardRect.left < rectBounds.right &&
@@ -1542,25 +1464,13 @@ function initRubberBandSelection() {
// Sync with multiSelect module
if (window.multiSelect) {
const info = window.multiSelect._extractInfo(card);
// select the equivalent list-item to activate it too
let selector = (info.type === 'folder') ? "data-folder-id" : "data-file-id";
const fileItem = list?.querySelector(`div.file-item[${selector}="${info.id}"]`);
fileItem?.classList.add('selected');
if (info) window.multiSelect.select(info.id, info.name, info.type, info.parentId);
}
} else {
card.classList.remove('selected');
// Deselect from multiSelect module
if (window.multiSelect) {
const info = window.multiSelect._extractInfo(card);
// select the equivalent list-item to activate it too
let selector = (info.type === 'folder') ? "data-folder-id" : "data-file-id";
const fileItem = list?.querySelector(`div.file-item[${selector}="${info.id}"]`);
fileItem?.classList.remove('selected');
const info = window.multiSelect._extractInfo(card)
if (info) window.multiSelect.deselect(info.id);
}
}
@@ -1590,20 +1500,10 @@ if (document.readyState === 'loading') {
initRubberBandSelection();
}
/**
*
* @param {boolean} show
*/
function showEmptyList(show) {
const emptyArea=document.getElementById("empty-files-state");
emptyArea.classList.toggle("hidden", !show);
}
// Expose helpers globally
window.toggleCardSelection = toggleCardSelection;
window.showContextMenuAtElement = showContextMenuAtElement;
window.initRubberBandSelection = initRubberBandSelection;
window.showEmptyList = showEmptyList;
/**