Kaynağa Gözat

set default in options selector

reiji-h 2 yıl önce
ebeveyn
işleme
2914116b38

+ 4 - 4
apps/app/src/components/PageEditor/OptionsSelector.tsx

@@ -2,8 +2,8 @@ import React, {
   memo, useCallback, useMemo, useState,
 } from 'react';
 
-import type {
-  EditorTheme, KeyMapMode,
+import {
+  type EditorTheme, type KeyMapMode, DEFAULT_KEYMAP, DEFAULT_THEME,
 } from '@growi/editor';
 import { useTranslation } from 'next-i18next';
 import Image from 'next/image';
@@ -88,7 +88,7 @@ const ThemeSelector = memo(({ onClickBefore }: {onClickBefore: () => void}): JSX
 
   const { t } = useTranslation();
   const { data: editorSettings, update } = useEditorSettings();
-  const selectedTheme = editorSettings?.theme;
+  const selectedTheme = editorSettings?.theme ?? DEFAULT_THEME;
 
   const listItems = useMemo(() => (
     <>
@@ -123,7 +123,7 @@ const KeymapSelector = memo(({ onClickBefore }: {onClickBefore: () => void}): JS
 
   const { t } = useTranslation();
   const { data: editorSettings, update } = useEditorSettings();
-  const selectedKeymapMode = editorSettings?.keymapMode;
+  const selectedKeymapMode = editorSettings?.keymapMode ?? DEFAULT_KEYMAP;
 
   const listItems = useMemo(() => (
     <>

+ 1 - 0
packages/editor/src/services/editor-theme/index.ts

@@ -37,5 +37,6 @@ const EditorTheme = {
   kimbie: 'kimbie',
 } as const;
 
+export const DEFAULT_THEME = 'defaultlight';
 export const AllEditorTheme = Object.values(EditorTheme);
 export type EditorTheme = typeof EditorTheme[keyof typeof EditorTheme]

+ 1 - 0
packages/editor/src/services/keymaps/index.ts

@@ -21,5 +21,6 @@ const KeyMapMode = {
   vscode: 'vscode',
 } as const;
 
+export const DEFAULT_KEYMAP = 'default';
 export const AllKeyMap = Object.values(KeyMapMode);
 export type KeyMapMode = typeof KeyMapMode[keyof typeof KeyMapMode];