Refactoring#4

hacagahasanli · Apr 6, 2023 · ab9e45b · ab9e45b
1 parent b65cd62
commit ab9e45b
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 14 deletions.
diff --git a/index.html b/index.html
@@ -7,7 +7,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Vite + React + TS</title>
   </head>
-  <body style="cursor: default ;">
+  <body style="cursor: default;background: rgb(247, 247, 247);">
     <div id="root"></div>
     <script type="module" src="/src/main.tsx"></script>
   </body>

diff --git a/src/components/KeyItem/index.tsx b/src/components/KeyItem/index.tsx
@@ -17,7 +17,7 @@ export const KeyItem = ({ id, size, name, subName, c, img, hasImage }: IKeyItemT
 
     const isUpperCasedValue = capsClicked && validValues.includes(name)
 
-    const isActive = !(!subName) && shiftClicked
+    const isActive = !!subName && shiftClicked
 
     const currentScript = hasImage && img
         ? <Icon name={img} />

diff --git a/src/components/TextArea/ITextArea.ts b/src/components/TextArea/ITextArea.ts
@@ -0,0 +1,12 @@
+interface IKeyClickedSelector {
+    keyClicked: {
+        capsClicked: boolean;
+    }
+}
+interface IKeyBoardSelector {
+    keyboard: {
+        typedValue: string[];
+    }
+}
+
+export type { IKeyClickedSelector, IKeyBoardSelector }
diff --git a/src/components/TextArea/index.tsx b/src/components/TextArea/index.tsx
@@ -1,17 +1,7 @@
 import styled from "styled-components"
 import { useSelector } from "react-redux"
 import { ITextareaProps } from '../../types/keyClickedTypes/index';
-
-interface IKeyClickedSelector {
-    keyClicked: {
-        capsClicked: boolean;
-    }
-}
-interface IKeyBoardSelector {
-    keyboard: {
-        typedValue: string[];
-    }
-}
+import { IKeyBoardSelector } from "./ITextArea";
 
 export const TextArea = () => {
     const { typedValue } = useSelector((state: IKeyBoardSelector) => state.keyboard)

diff --git a/src/store/reducers/keyboard/index.ts b/src/store/reducers/keyboard/index.ts
@@ -16,7 +16,7 @@ const KeyboardSlice = createSlice({
         },
         addClickedKeyValue: (state: any, action: AddClickedKeyValueAction) => {
             const { subName, name, capsClicked, shiftClicked, texts } = action.payload;
-            const hasSubName = !(!subName);
+            const hasSubName = !!subName;
             const key = state.keyCombination.join("")
 
             key === "ctrlv" && (texts?.split('')