change otherprops to rest

nainghtetlinn · Nov 25, 2023 · c262dc7 · c262dc7
1 parent f94b5c6
commit c262dc7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 20 deletions.
diff --git a/src/library.ts b/src/library.ts
@@ -1,13 +1,13 @@
 import Color from "color"
+import { OtherPropsType, OptionsType, AppOptionsType } from "./types"
 
-import {
-  OtherProps,
-  OptionsType,
-  AppOptionsType,
-  defaultOptions,
-} from "./types"
+const defaultOptions = {
+  fontSize: 30,
+  color: "rgba(255, 255, 255, 1)",
+  bgColor: "rgba(0, 0, 0, 1)",
+}
 
-export function animateMatrixEffect(id: string, ...otherProps: OtherProps) {
+export function animateMatrixEffect(id: string, ...rest: OtherPropsType) {
   const parentElement = document.getElementById(id)
   if (!parentElement) throw new Error(`Cannot find element with id: "${id}"`)
 
@@ -19,14 +19,14 @@ export function animateMatrixEffect(id: string, ...otherProps: OtherProps) {
 
   // getting options base on user parameter
   let options: OptionsType = {}
-  if (otherProps.length > 0) {
-    if (typeof otherProps[0] === "function") {
-      otherProps[0]()
+  if (rest.length > 0) {
+    if (typeof rest[0] === "function") {
+      rest[0]()
     } else {
-      options = { ...otherProps[0] }
+      options = { ...rest[0] }
     }
 
-    otherProps[1] && typeof otherProps[1] === "function" && otherProps[1]()
+    rest[1] && typeof rest[1] === "function" && rest[1]()
   }
 
   const appOptions: AppOptionsType = {

diff --git a/src/types.ts b/src/types.ts
@@ -1,4 +1,4 @@
-export type OtherProps =
+export type OtherPropsType =
   | [OptionsType]
   | [OptionsType, () => void]
   | [() => void]
@@ -14,13 +14,7 @@ export type OptionsType = {
 export type AppOptionsType = {
   fontSize: number
   color: string
+  firstWordColor: string
   bgColor: string
   bgFade: string
-  firstWordColor: string
-}
-
-export const defaultOptions = {
-  fontSize: 30,
-  color: "rgba(255, 255, 255, 1)",
-  bgColor: "rgba(0, 0, 0, 1)",
 }