From 96db927c71e71f3f798aa9815b7dd5bec0bae006 Mon Sep 17 00:00:00 2001
From: Ivan <8611739+IRBorisov@users.noreply.github.com>
Date: Wed, 21 Aug 2024 20:32:04 +0300
Subject: [PATCH] R: Remove redundant font option

---
 .../frontend/src/components/RSInput/RSInput.tsx   |  5 ++---
 .../components/select/PickMultiConstituenta.tsx   |  2 +-
 .../src/context/ConceptOptionsContext.tsx         |  7 -------
 rsconcept/frontend/src/models/miscellaneous.ts    |  5 -----
 rsconcept/frontend/src/models/miscellaneousAPI.ts |  9 +--------
 .../pages/ManualsPage/items/ui/HelpRSEditor.tsx   |  4 ----
 .../EditorRSExpression/ToolbarRSExpression.tsx    | 15 +--------------
 .../EditorTermGraph/EditorTermGraph.tsx           |  2 +-
 rsconcept/frontend/src/styling/constants.css      |  1 -
 rsconcept/frontend/src/styling/styles.css         |  3 ---
 rsconcept/frontend/src/utils/constants.ts         |  1 -
 11 files changed, 6 insertions(+), 48 deletions(-)

diff --git a/rsconcept/frontend/src/components/RSInput/RSInput.tsx b/rsconcept/frontend/src/components/RSInput/RSInput.tsx
index ebc673f0..f5f1763b 100644
--- a/rsconcept/frontend/src/components/RSInput/RSInput.tsx
+++ b/rsconcept/frontend/src/components/RSInput/RSInput.tsx
@@ -10,7 +10,6 @@ import { forwardRef, useCallback, useMemo, useRef } from 'react';
 
 import Label from '@/components/ui/Label';
 import { useConceptOptions } from '@/context/ConceptOptionsContext';
-import { getFontClassName } from '@/models/miscellaneousAPI';
 import { ConstituentaID, IRSForm } from '@/models/rsform';
 import { generateAlias, getCstTypePrefix, guessCstType } from '@/models/rsformAPI';
 import { extractGlobals } from '@/models/rslangAPI';
@@ -64,7 +63,7 @@ const RSInput = forwardRef<ReactCodeMirrorRef, RSInputProps>(
     },
     ref
   ) => {
-    const { darkMode, colors, mathFont } = useConceptOptions();
+    const { darkMode, colors } = useConceptOptions();
 
     const internalRef = useRef<ReactCodeMirrorRef>(null);
     const thisRef = useMemo(() => (!ref || typeof ref === 'function' ? internalRef : ref), [internalRef, ref]);
@@ -152,7 +151,7 @@ const RSInput = forwardRef<ReactCodeMirrorRef, RSInputProps>(
       <div className={clsx('flex flex-col gap-2', className, cursor)} style={style}>
         <Label text={label} />
         <CodeMirror
-          className={getFontClassName(mathFont)}
+          className={'font-math'}
           id={id}
           ref={thisRef}
           basicSetup={editorSetup}
diff --git a/rsconcept/frontend/src/components/select/PickMultiConstituenta.tsx b/rsconcept/frontend/src/components/select/PickMultiConstituenta.tsx
index 1e3cbf81..f0a4da4d 100644
--- a/rsconcept/frontend/src/components/select/PickMultiConstituenta.tsx
+++ b/rsconcept/frontend/src/components/select/PickMultiConstituenta.tsx
@@ -83,7 +83,7 @@ function PickMultiConstituenta({ id, schema, prefixID, rows, selected, setSelect
           <ToolbarGraphSelection
             graph={schema.graph}
             isCore={cstID => isBasicConcept(schema.cstByID.get(cstID)?.cst_type)}
-            isOwned={cstID => !schema.cstByID.get(cstID)?.is_inherited ?? false}
+            isOwned={cstID => !schema.cstByID.get(cstID)?.is_inherited}
             setSelected={setSelected}
             emptySelection={selected.length === 0}
             className='w-full ml-8'
diff --git a/rsconcept/frontend/src/context/ConceptOptionsContext.tsx b/rsconcept/frontend/src/context/ConceptOptionsContext.tsx
index 94c3b4d6..1e050444 100644
--- a/rsconcept/frontend/src/context/ConceptOptionsContext.tsx
+++ b/rsconcept/frontend/src/context/ConceptOptionsContext.tsx
@@ -5,7 +5,6 @@ import { createContext, useCallback, useContext, useLayoutEffect, useMemo, useSt
 
 import Tooltip from '@/components/ui/Tooltip';
 import useLocalStorage from '@/hooks/useLocalStorage';
-import { FontStyle } from '@/models/miscellaneous';
 import { animationDuration } from '@/styling/animations';
 import { darkT, IColorTheme, lightT } from '@/styling/color';
 import { globals, storage } from '@/utils/constants';
@@ -23,9 +22,6 @@ interface IOptionsContext {
   adminMode: boolean;
   toggleAdminMode: () => void;
 
-  mathFont: FontStyle;
-  setMathFont: (value: FontStyle) => void;
-
   noNavigationAnimation: boolean;
   noNavigation: boolean;
   toggleNoNavigation: () => void;
@@ -58,7 +54,6 @@ interface OptionsStateProps {
 export const OptionsState = ({ children }: OptionsStateProps) => {
   const [darkMode, setDarkMode] = useLocalStorage(storage.themeDark, false);
   const [adminMode, setAdminMode] = useLocalStorage(storage.optionsAdmin, false);
-  const [mathFont, setMathFont] = useLocalStorage<FontStyle>(storage.rseditFont, 'math');
   const [showHelp, setShowHelp] = useLocalStorage(storage.optionsHelp, true);
   const [noNavigation, setNoNavigation] = useState(false);
 
@@ -128,8 +123,6 @@ export const OptionsState = ({ children }: OptionsStateProps) => {
         darkMode,
         adminMode,
         colors,
-        mathFont,
-        setMathFont,
         noNavigationAnimation,
         noNavigation,
         noFooter,
diff --git a/rsconcept/frontend/src/models/miscellaneous.ts b/rsconcept/frontend/src/models/miscellaneous.ts
index 46ab14c1..3962dabd 100644
--- a/rsconcept/frontend/src/models/miscellaneous.ts
+++ b/rsconcept/frontend/src/models/miscellaneous.ts
@@ -55,11 +55,6 @@ export type GraphColoring = 'none' | 'status' | 'type';
  */
 export type GraphSizing = 'none' | 'complex' | 'derived';
 
-/**
- * Represents font styles.
- */
-export type FontStyle = 'controls' | 'main' | 'math' | 'math2';
-
 /**
  * Represents manuals topic.
  */
diff --git a/rsconcept/frontend/src/models/miscellaneousAPI.ts b/rsconcept/frontend/src/models/miscellaneousAPI.ts
index b15feb4f..27995dbd 100644
--- a/rsconcept/frontend/src/models/miscellaneousAPI.ts
+++ b/rsconcept/frontend/src/models/miscellaneousAPI.ts
@@ -1,16 +1,9 @@
 /**
  * Module: API for miscellaneous frontend model types. Future targets for refactoring aimed at extracting modules.
  */
-import { DependencyMode, FontStyle, GraphSizing } from './miscellaneous';
+import { DependencyMode, GraphSizing } from './miscellaneous';
 import { IConstituenta, IRSForm } from './rsform';
 
-/**
- * Create style name from  {@link FontStyle}.
- */
-export function getFontClassName(style: FontStyle): string {
-  return `font-${style}`;
-}
-
 /**
  * Filter list of  {@link ILibraryItem} to a given graph query.
  */
diff --git a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpRSEditor.tsx b/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpRSEditor.tsx
index 9a744028..8f459513 100644
--- a/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpRSEditor.tsx
+++ b/rsconcept/frontend/src/pages/ManualsPage/items/ui/HelpRSEditor.tsx
@@ -15,7 +15,6 @@ import {
   IconSave,
   IconSettings,
   IconStatusOK,
-  IconText,
   IconTree
 } from '@/components/Icons';
 import LinkTopic from '@/components/ui/LinkTopic';
@@ -88,9 +87,6 @@ function HelpRSEditor() {
       <li>
         <IconStatusOK className='inline-icon' /> индикатор статуса определения сверху
       </li>
-      <li>
-        <IconText className='inline-icon' /> переключение шрифта
-      </li>
       <li>
         <IconControls className='inline-icon' /> специальная клавиатура и горячие клавиши
       </li>
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ToolbarRSExpression.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ToolbarRSExpression.tsx
index 8861989b..4e3c5f49 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ToolbarRSExpression.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorRSExpression/ToolbarRSExpression.tsx
@@ -1,7 +1,6 @@
-import { IconControls, IconText, IconTextOff, IconTree } from '@/components/Icons';
+import { IconControls, IconTree } from '@/components/Icons';
 import MiniButton from '@/components/ui/MiniButton';
 import Overlay from '@/components/ui/Overlay';
-import { useConceptOptions } from '@/context/ConceptOptionsContext';
 import { useRSForm } from '@/context/RSFormContext';
 
 interface ToolbarRSExpressionProps {
@@ -14,21 +13,9 @@ interface ToolbarRSExpressionProps {
 
 function ToolbarRSExpression({ disabled, showControls, toggleControls, showAST }: ToolbarRSExpressionProps) {
   const model = useRSForm();
-  const { mathFont, setMathFont } = useConceptOptions();
-
-  function toggleFont() {
-    setMathFont(mathFont === 'math' ? 'math2' : 'math');
-  }
 
   return (
     <Overlay position='top-[-0.5rem] right-0' className='cc-icons'>
-      <MiniButton
-        title='Изменить шрифт'
-        onClick={toggleFont}
-        icon={
-          mathFont === 'math' ? <IconText size='1.25rem' className='icon-primary' /> : <IconTextOff size='1.25rem' />
-        }
-      />
       {!disabled || model.processing ? (
         <MiniButton
           title='Отображение специальной клавиатуры'
diff --git a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx
index c1e0be7c..6a4419fa 100644
--- a/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx
+++ b/rsconcept/frontend/src/pages/RSFormPage/EditorTermGraph/EditorTermGraph.tsx
@@ -325,7 +325,7 @@ function EditorTermGraph({ onOpenEdit }: EditorTermGraphProps) {
           <ToolbarGraphSelection
             graph={controller.schema!.graph}
             isCore={cstID => isBasicConcept(controller.schema?.cstByID.get(cstID)?.cst_type)}
-            isOwned={cstID => !controller.schema?.cstByID.get(cstID)?.is_inherited ?? false}
+            isOwned={cstID => !controller.schema?.cstByID.get(cstID)?.is_inherited}
             setSelected={controller.setSelected}
             emptySelection={controller.selected.length === 0}
           />
diff --git a/rsconcept/frontend/src/styling/constants.css b/rsconcept/frontend/src/styling/constants.css
index eca4d0b3..59807a6d 100644
--- a/rsconcept/frontend/src/styling/constants.css
+++ b/rsconcept/frontend/src/styling/constants.css
@@ -7,7 +7,6 @@
   --font-ui:  'Alegreya Sans SC', 'Rubik', 'Segoe UI Symbol', sans-serif;
   --font-main: 'Rubik', 'Fira Code', 'Noto Sans Math', 'Noto Sans Symbols 2', 'Segoe UI Symbol', sans-serif;
   --font-math: 'Fira Code', 'Noto Sans Math', 'Noto Sans Symbols 2', 'Rubik', 'Segoe UI Symbol', sans-serif;
-  --font-math2: 'Noto Sans Math', 'Noto Sans Symbols 2', 'Rubik', 'Segoe UI Symbol', sans-serif;
 
   /* Light Theme */
   --cl-bg-120:      hsl(000, 000%, 100%);
diff --git a/rsconcept/frontend/src/styling/styles.css b/rsconcept/frontend/src/styling/styles.css
index e6527d1e..198b365a 100644
--- a/rsconcept/frontend/src/styling/styles.css
+++ b/rsconcept/frontend/src/styling/styles.css
@@ -18,9 +18,6 @@
   .font-math {
     font-family: var(--font-math);
   }
-  .font-math2 {
-    font-family: var(--font-math2);
-  }
 }
 
 @layer components {
diff --git a/rsconcept/frontend/src/utils/constants.ts b/rsconcept/frontend/src/utils/constants.ts
index ecae1d79..5895aef4 100644
--- a/rsconcept/frontend/src/utils/constants.ts
+++ b/rsconcept/frontend/src/utils/constants.ts
@@ -102,7 +102,6 @@ export const storage = {
   optionsAdmin: 'options.admin',
   optionsHelp: 'options.help',
 
-  rseditFont: 'rsedit.font',
   rseditShowList: 'rsedit.show_list',
   rseditShowControls: 'rsedit.show_controls',