phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Close downloads menu when clicking "show in folder" (#2507)

Browse Source
This commit is contained in:
Tasos Boulis
2023-01-19 16:34:24 +02:00
committed by GitHub
parent 5bafaff297
commit 4131f8fb66
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/common/communication.ts
View File

@@ -168,3 +168,4 @@ export const REQUEST_DOWNLOADS_DROPDOWN_MENU_INFO = 'request-downloads-dropdown-
export const DOWNLOADS_DROPDOWN_MENU_CANCEL_DOWNLOAD = 'downloads-dropdown-menu-cancel-download';
export const DOWNLOADS_DROPDOWN_MENU_CLEAR_FILE = 'downloads-dropdown-menu-clear-file';
export const DOWNLOADS_DROPDOWN_MENU_OPEN_FILE = 'downloads-dropdown-menu-open-file';
export const DOWNLOADS_DROPDOWN_MENU_SHOW_FILE_IN_FOLDER = 'downloads-dropdown-menu-show-file-in-folder';

6
src/main/preload/downloadsDropdownMenu.js
View File

@@ -9,7 +9,7 @@ import {
GET_LANGUAGE_INFORMATION,
DOWNLOADS_DROPDOWN_MENU_CLEAR_FILE,
RETRIEVED_LANGUAGE_INFORMATION,
DOWNLOADS_DROPDOWN_SHOW_FILE_IN_FOLDER,
DOWNLOADS_DROPDOWN_MENU_SHOW_FILE_IN_FOLDER,
DOWNLOADS_DROPDOWN_MENU_CANCEL_DOWNLOAD,
DOWNLOADS_DROPDOWN_MENU_OPEN_FILE,
UPDATE_DOWNLOADS_DROPDOWN_MENU,
@@ -30,8 +30,8 @@ window.addEventListener('message', async (event) => {
case REQUEST_DOWNLOADS_DROPDOWN_MENU_INFO:
ipcRenderer.send(REQUEST_DOWNLOADS_DROPDOWN_MENU_INFO);
break;
case DOWNLOADS_DROPDOWN_SHOW_FILE_IN_FOLDER:
ipcRenderer.send(DOWNLOADS_DROPDOWN_SHOW_FILE_IN_FOLDER, event.data.payload.item);
case DOWNLOADS_DROPDOWN_MENU_SHOW_FILE_IN_FOLDER:
ipcRenderer.send(DOWNLOADS_DROPDOWN_MENU_SHOW_FILE_IN_FOLDER, event.data.payload.item);
break;
case DOWNLOADS_DROPDOWN_MENU_CANCEL_DOWNLOAD:
ipcRenderer.send(DOWNLOADS_DROPDOWN_MENU_CANCEL_DOWNLOAD, event.data.payload.item);

7
src/main/views/downloadsDropdownMenuView.ts
View File

@@ -12,6 +12,7 @@ import {
DOWNLOADS_DROPDOWN_MENU_CANCEL_DOWNLOAD,
DOWNLOADS_DROPDOWN_MENU_CLEAR_FILE,
DOWNLOADS_DROPDOWN_MENU_OPEN_FILE,
DOWNLOADS_DROPDOWN_MENU_SHOW_FILE_IN_FOLDER,
EMIT_CONFIGURATION,
OPEN_DOWNLOADS_DROPDOWN_MENU,
REQUEST_DOWNLOADS_DROPDOWN_MENU_INFO,
@@ -69,6 +70,7 @@ export default class DownloadsDropdownMenuView {
ipcMain.on(EMIT_CONFIGURATION, this.updateConfig);
ipcMain.on(REQUEST_DOWNLOADS_DROPDOWN_MENU_INFO, this.updateDownloadsDropdownMenu);
ipcMain.on(DOWNLOADS_DROPDOWN_MENU_OPEN_FILE, this.openFile);
ipcMain.on(DOWNLOADS_DROPDOWN_MENU_SHOW_FILE_IN_FOLDER, this.showFileInFolder);
ipcMain.on(DOWNLOADS_DROPDOWN_MENU_CANCEL_DOWNLOAD, this.cancelDownload);
ipcMain.on(DOWNLOADS_DROPDOWN_MENU_CLEAR_FILE, this.clearFile);
ipcMain.on(UPDATE_DOWNLOADS_DROPDOWN_MENU, this.updateItem);
@@ -164,6 +166,11 @@ export default class DownloadsDropdownMenuView {
this.handleClose();
}
showFileInFolder = (e: IpcMainEvent, item: DownloadedItem) => {
downloadsManager.showFileInFolder(item);
this.handleClose();
}
clearFile = () => {
downloadsManager.clearFile(this.item);
this.handleClose();

4
src/renderer/downloadsDropdownMenu.tsx
View File

@@ -12,7 +12,7 @@ import {
DOWNLOADS_DROPDOWN_MENU_CANCEL_DOWNLOAD,
DOWNLOADS_DROPDOWN_MENU_CLEAR_FILE,
DOWNLOADS_DROPDOWN_MENU_OPEN_FILE,
DOWNLOADS_DROPDOWN_SHOW_FILE_IN_FOLDER,
DOWNLOADS_DROPDOWN_MENU_SHOW_FILE_IN_FOLDER,
REQUEST_DOWNLOADS_DROPDOWN_MENU_INFO,
UPDATE_DOWNLOADS_DROPDOWN_MENU,
} from 'common/communication';
@@ -86,7 +86,7 @@ const DownloadsDropdownMenu = () => {
if (item?.type === 'update') {
return;
}
window.postMessage({type: DOWNLOADS_DROPDOWN_SHOW_FILE_IN_FOLDER, payload: {item}}, window.location.href);
window.postMessage({type: DOWNLOADS_DROPDOWN_MENU_SHOW_FILE_IN_FOLDER, payload: {item}}, window.location.href);
}, [item]);
const clearFile = useCallback(() => {