From fc42120549f55fd4604581e90af040c4bc426c7e Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Mon, 16 Jan 2023 09:37:10 -0500
Subject: [PATCH] Cleanup formatting and change model to presenter

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .../terminal-font-family.tsx                  | 13 ++++++------
 .../terminal-font-options.injectable.tsx      | 21 ++++++++++++-------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-family.tsx b/src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-family.tsx
index 9b5d8b1046..cdd7a96633 100644
--- a/src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-family.tsx
+++ b/src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-family.tsx
@@ -7,11 +7,11 @@ import { SubTitle } from "../../../../../../renderer/components/layout/sub-title
 import { withInjectables } from "@ogre-tools/injectable-react";
 import { observer } from "mobx-react";
 import { Select } from "../../../../../../renderer/components/select";
-import type { TerminalFontPreferenceModel } from "./terminal-font-options.injectable";
-import terminalFontPreferenceModelInjectable from "./terminal-font-options.injectable";
+import type { TerminalFontPreferencePresenter } from "./terminal-font-options.injectable";
+import terminalFontPreferencePresenterInjectable from "./terminal-font-options.injectable";
 
 interface Dependencies {
-  model: TerminalFontPreferenceModel;
+  model: TerminalFontPreferencePresenter;
 }
 
 const NonInjectedTerminalFontFamily = observer(({ model }: Dependencies) => (
@@ -22,14 +22,13 @@ const NonInjectedTerminalFontFamily = observer(({ model }: Dependencies) => (
       controlShouldRenderValue
       value={model.current.get()}
       options={model.options.get()}
-      onChange={model.set}
+      onChange={model.onSelection}
     />
   </section>
-),
-);
+));
 
 export const TerminalFontFamily = withInjectables<Dependencies>(NonInjectedTerminalFontFamily, {
   getProps: (di) => ({
-    model: di.inject(terminalFontPreferenceModelInjectable),
+    model: di.inject(terminalFontPreferencePresenterInjectable),
   }),
 });
diff --git a/src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-options.injectable.tsx b/src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-options.injectable.tsx
index b80902f21b..3d6a0d2ae0 100644
--- a/src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-options.injectable.tsx
+++ b/src/features/preferences/renderer/preference-items/terminal/terminal-font-family/terminal-font-options.injectable.tsx
@@ -12,22 +12,27 @@ import { defaultTerminalFontFamily } from "../../../../../../common/vars";
 import type { SelectOption } from "../../../../../../renderer/components/select";
 import { terminalFontInjectionToken } from "../../../../../terminal/renderer/fonts/token";
 
-export interface TerminalFontPreferenceModel {
+export interface TerminalFontPreferencePresenter {
   readonly options: IComputedValue<SelectOption<string>[]>;
   readonly current: IComputedValue<string>;
-  set: (selection: SingleValue<SelectOption<string>>) => void;
+  onSelection: (selection: SingleValue<SelectOption<string>>) => void;
 }
 
-const terminalFontPreferenceModelInjectable = getInjectable({
-  id: "terminal-font-preference-model",
-  instantiate: (di): TerminalFontPreferenceModel => {
+const terminalFontPreferencePresenterInjectable = getInjectable({
+  id: "terminal-font-preference-presenter",
+  instantiate: (di): TerminalFontPreferencePresenter => {
     const userStore = di.inject(userStoreInjectable);
     const terminalFonts = di.injectMany(terminalFontInjectionToken);
 
     return {
       options: computed(() => terminalFonts.map(font => ({
         label: (
-          <span style={{ fontFamily: `${font.name}, var(--font-terminal)`, fontSize: userStore.terminalConfig.fontSize }}>
+          <span
+            style={{
+              fontFamily: `${font.name}, var(--font-terminal)`,
+              fontSize: userStore.terminalConfig.fontSize,
+            }}
+          >
             {font.name}
           </span>
         ),
@@ -35,11 +40,11 @@ const terminalFontPreferenceModelInjectable = getInjectable({
         isSelected: userStore.terminalConfig.fontFamily === font.name,
       }))),
       current: computed(() => userStore.terminalConfig.fontFamily),
-      set: action(selection => {
+      onSelection: action(selection => {
         userStore.terminalConfig.fontFamily = selection?.value ?? defaultTerminalFontFamily;
       }),
     };
   },
 });
 
-export default terminalFontPreferenceModelInjectable;
+export default terminalFontPreferencePresenterInjectable;