From 060e65760d476886823e90de891cb510b44cd634 Mon Sep 17 00:00:00 2001 From: Hubert Date: Tue, 29 Aug 2023 14:40:22 -0300 Subject: [PATCH] Fixes from review. --- packages/app-desktop/gui/MenuBar.tsx | 2 +- packages/lib/services/interop/InteropService.ts | 2 +- packages/lib/services/interop/Module.ts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/app-desktop/gui/MenuBar.tsx b/packages/app-desktop/gui/MenuBar.tsx index b202a3eff2..32f7d1e21b 100644 --- a/packages/app-desktop/gui/MenuBar.tsx +++ b/packages/app-desktop/gui/MenuBar.tsx @@ -403,7 +403,7 @@ function useMenu(props: Props) { label: module.fullLabel(moduleSource), click: () => onImportModuleClickRef.current(module, moduleSource), }); - if (module.separator) importItems.push({ type: 'separator' }); + if (module.separatorAfter) importItems.push({ type: 'separator' }); } } } diff --git a/packages/lib/services/interop/InteropService.ts b/packages/lib/services/interop/InteropService.ts index a24bb5a95e..bf73e71fc0 100644 --- a/packages/lib/services/interop/InteropService.ts +++ b/packages/lib/services/interop/InteropService.ts @@ -63,7 +63,7 @@ export default class InteropService { format: 'raw', sources: [FileSystemItem.Directory], description: _('Joplin Export Directory'), - separator: true, + separatorAfter: true, }, () => new InteropService_Importer_Raw()), makeImportModule({ diff --git a/packages/lib/services/interop/Module.ts b/packages/lib/services/interop/Module.ts index 8792751b0e..239cccd687 100644 --- a/packages/lib/services/interop/Module.ts +++ b/packages/lib/services/interop/Module.ts @@ -10,7 +10,7 @@ interface BaseMetadata { fileExtensions: string[]; description: string; isDefault: boolean; - separator: boolean; + separatorAfter: boolean; // this isn't a property of the importer, but of how it should be displayed in the GUI supportsMobile: boolean; @@ -52,7 +52,7 @@ const defaultBaseMetadata = { isNoteArchive: true, supportsMobile: true, isDefault: false, - separator: false, + separatorAfter: false, }; const moduleFullLabel = (metadata: ImportMetadata|ExportMetadata, moduleSource: FileSystemItem = null) => {