create createAppOptions function and separate the code to utils.ts file

nainghtetlinn · Nov 25, 2023 · c70f6eb · c70f6eb
1 parent 7bcd3ca
commit c70f6eb
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 29 deletions.
diff --git a/src/library.ts b/src/library.ts
@@ -1,14 +1,5 @@
-import Color from "color"
 import { OtherPropsType, OptionsType, AppOptionsType } from "./types"
-
-const defaultOptions = {
-  fontSize: 30,
-  color: "rgba(255, 255, 255, 1)",
-  bgColor: "rgba(0, 0, 0, 1)",
-  wordCounts: { min: 5, max: 20 },
-  rainSpeed: { min: 1, max: 3 },
-  switchInterval: { min: 500, max: 1500 },
-}
+import { createAppOptions } from "./utils"
 
 export function animateMatrixEffect(id: string, ...rest: OtherPropsType) {
   const parentElement = document.getElementById(id)
@@ -32,25 +23,7 @@ export function animateMatrixEffect(id: string, ...rest: OtherPropsType) {
     rest[1] && typeof rest[1] === "function" && rest[1]()
   }
 
-  const appOptions: AppOptionsType = {
-    fontSize: options.fontSize || defaultOptions.fontSize,
-    color: new Color(options.color || defaultOptions.color).rgb().string(),
-    bgColor: new Color(options.bgColor || defaultOptions.bgColor)
-      .rgb()
-      .string(),
-    bgFade: new Color(options.bgColor || defaultOptions.bgColor)
-      .alpha(0.2)
-      .rgb()
-      .string(),
-    firstWordColor: new Color(
-      options.firstWordColor || options.color || defaultOptions.color
-    )
-      .rgb()
-      .string(),
-    wordCounts: options.wordCounts || defaultOptions.wordCounts,
-    rainSpeed: options.rainSpeed || defaultOptions.rainSpeed,
-    switchInterval: options.switchInterval || defaultOptions.switchInterval,
-  }
+  const appOptions: AppOptionsType = createAppOptions(options)
 
   let effect = new MatrixEffect(canvas.width, canvas.height, appOptions)
 

diff --git a/src/utils.ts b/src/utils.ts
@@ -0,0 +1,33 @@
+import Color from "color"
+import { OptionsType, AppOptionsType } from "./types"
+
+const defaultOptions = {
+  fontSize: 30,
+  color: "rgba(255, 255, 255, 1)",
+  bgColor: "rgba(0, 0, 0, 1)",
+  wordCounts: { min: 5, max: 20 },
+  rainSpeed: { min: 1, max: 3 },
+  switchInterval: { min: 500, max: 1500 },
+}
+
+export function createAppOptions(options: OptionsType): AppOptionsType {
+  return {
+    fontSize: options.fontSize || defaultOptions.fontSize,
+    color: new Color(options.color || defaultOptions.color).rgb().string(),
+    bgColor: new Color(options.bgColor || defaultOptions.bgColor)
+      .rgb()
+      .string(),
+    bgFade: new Color(options.bgColor || defaultOptions.bgColor)
+      .alpha(0.2)
+      .rgb()
+      .string(),
+    firstWordColor: new Color(
+      options.firstWordColor || options.color || defaultOptions.color
+    )
+      .rgb()
+      .string(),
+    wordCounts: options.wordCounts || defaultOptions.wordCounts,
+    rainSpeed: options.rainSpeed || defaultOptions.rainSpeed,
+    switchInterval: options.switchInterval || defaultOptions.switchInterval,
+  }
+}