From ded2d1866a43d3a2ffbacbb725a11e1f70c64067 Mon Sep 17 00:00:00 2001 From: Mo Date: Mon, 27 Jun 2022 17:43:17 -0500 Subject: [PATCH] fix: don't show deprecated editors; add missing solarized dark theme --- packages/components/src/Components.ts | 5 +++++ .../org.standardnotes.theme-solarized-dark/package.json | 1 + .../Components/ChangeEditor/createEditorMenuGroups.ts | 4 +++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/components/src/Components.ts b/packages/components/src/Components.ts index bd3c5e2e8..c5efbe9a6 100644 --- a/packages/components/src/Components.ts +++ b/packages/components/src/Components.ts @@ -105,6 +105,11 @@ const Themes = [ path: 'Themes/org.standardnotes.theme-titanium', static_files: BaseThemeStaticFiles, }, + { + identifier: 'org.standardnotes.solarized-dark', + path: 'Themes/org.standardnotes.solarized-dark', + static_files: BaseThemeStaticFiles, + }, ] const Components = [...Editors, ...DeprecatedEditors, ...Themes] diff --git a/packages/components/src/Packages/Themes/org.standardnotes.theme-solarized-dark/package.json b/packages/components/src/Packages/Themes/org.standardnotes.theme-solarized-dark/package.json index be96d59fb..e8377eca4 100644 --- a/packages/components/src/Packages/Themes/org.standardnotes.theme-solarized-dark/package.json +++ b/packages/components/src/Packages/Themes/org.standardnotes.theme-solarized-dark/package.json @@ -2,6 +2,7 @@ "name": "@standardnotes/solarized-dark-theme", "version": "1.2.11", "main": "dist/dist.css", + "author": "Standard Notes", "private": true, "sn": { "main": "dist/dist.css" diff --git a/packages/web/src/javascripts/Components/ChangeEditor/createEditorMenuGroups.ts b/packages/web/src/javascripts/Components/ChangeEditor/createEditorMenuGroups.ts index 369b3c1f7..6d94cd67d 100644 --- a/packages/web/src/javascripts/Components/ChangeEditor/createEditorMenuGroups.ts +++ b/packages/web/src/javascripts/Components/ChangeEditor/createEditorMenuGroups.ts @@ -54,7 +54,9 @@ export const createEditorMenuGroups = (application: WebApplication, editors: SNC .forEach((editorFeature) => { const notInstalled = !editors.find((editor) => editor.identifier === editorFeature.identifier) const isExperimental = application.features.isExperimentalFeature(editorFeature.identifier) - if (notInstalled && !isExperimental) { + const isDeprecated = editorFeature.deprecated + const isShowable = notInstalled && !isExperimental && !isDeprecated + if (isShowable) { editorItems[getEditorGroup(editorFeature)].push({ name: editorFeature.name as string, isEntitled: false,