From 57f6e9e243b11016a6c9c15ef873a691c483411f Mon Sep 17 00:00:00 2001 From: undefined Date: Sat, 31 Aug 2024 21:13:07 +0800 Subject: [PATCH] ui: drop monacoTheme setting --- packages/ui-default/components/editor/index.tsx | 6 +++--- packages/ui-default/setting.yaml | 7 ------- packages/ui-default/utils/base.ts | 4 ++++ 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/packages/ui-default/components/editor/index.tsx b/packages/ui-default/components/editor/index.tsx index ab9c43191..c1d6e0158 100644 --- a/packages/ui-default/components/editor/index.tsx +++ b/packages/ui-default/components/editor/index.tsx @@ -3,7 +3,7 @@ import { nanoid } from 'nanoid'; import React from 'react'; import ReactDOM from 'react-dom/client'; import DOMAttachedObject from 'vj/components/DOMAttachedObject'; -import { i18n } from 'vj/utils'; +import { getTheme, i18n } from 'vj/utils'; import uploadFiles from '../upload'; interface MonacoOptions { @@ -40,7 +40,7 @@ export default class Editor extends DOMAttachedObject { const { load } = await import('vj/components/monaco/loader'); const { onChange, language = 'markdown', - theme = UserContext.monacoTheme || 'vs-light', + theme = `vs-${getTheme()}`, model = `file://model-${Math.random().toString(16)}`, autoResize = true, autoLayout = true, hide = [], lineNumbers = 'on', @@ -170,7 +170,7 @@ export default class Editor extends DOMAttachedObject { codeStyleReverse={false} ref={renderCallback} modelValue={val} - theme={['light', 'dark'].includes(UserContext.theme) ? UserContext.theme : 'light'} + theme={getTheme()} noMermaid noPrettier autoDetectCode diff --git a/packages/ui-default/setting.yaml b/packages/ui-default/setting.yaml index 58fb242a7..a8f58966a 100644 --- a/packages/ui-default/setting.yaml +++ b/packages/ui-default/setting.yaml @@ -48,13 +48,6 @@ preferredEditorType: family: markdown category: preference value: sv -monacoTheme: - type: - vs-dark: VS Dark - vs-light: VS Light - category: preference - value: vs-light - family: markdown theme: type: light: Light diff --git a/packages/ui-default/utils/base.ts b/packages/ui-default/utils/base.ts index 90ad558db..fbd01de2e 100644 --- a/packages/ui-default/utils/base.ts +++ b/packages/ui-default/utils/base.ts @@ -200,6 +200,10 @@ export async function setTemporaryViewTransitionNames(entries, vtPromise: Promis } } +export function getTheme(): 'dark' | 'light' { + return ['light', 'dark'].includes(UserContext.theme) ? UserContext.theme : 'light'; +} + Object.assign(window.Hydro.utils, { i18n, rawHtml,