From 87abb2a22212007440bfe2ebc6f5af4f7e6fd8e3 Mon Sep 17 00:00:00 2001 From: Gene Mecija Date: Sun, 2 Feb 2020 02:55:53 -0800 Subject: [PATCH] setInterval cleanup, button bug fixes, history size reduction --- src/App.js | 22 +++++++++++----------- src/components/Info.js | 4 ++-- src/components/MorseHistory_textbox.js | 8 ++++---- src/config.json | 2 +- src/css/App.css | 19 ++++++++++--------- src/css/App.css.map | 2 +- src/hooks/useElectronicKey.js | 13 ++++++++----- src/hooks/useStraightKey.js | 5 ++++- src/scss/App.scss | 17 +++++++++-------- 9 files changed, 50 insertions(+), 42 deletions(-) diff --git a/src/App.js b/src/App.js index 8271e20..430dab5 100644 --- a/src/App.js +++ b/src/App.js @@ -40,16 +40,7 @@ export default React.memo(function App() {
- -
-

Options

- - - - {gameMode === 'challenge' && - - } -
+
{keyType === "straight" ? @@ -77,7 +68,16 @@ export default React.memo(function App() {
diff --git a/src/components/Info.js b/src/components/Info.js index e1bf2b6..9d1d924 100644 --- a/src/components/Info.js +++ b/src/components/Info.js @@ -5,7 +5,7 @@ export default React.memo(function Info() { return (

Info

- Morse code is communication through various lengths of tones and silences. +

Morse code is a method of communication via tones and silences of various lengths.

Telegraph Key Types

-

The instrument used to send morse code is called the key. Straight Keys use a single button and generates tones whe pressed down. Straight keys require greater accuracy as you control the dits, dahs, and spacing. Electronic Keys can have two paddles that automatically generate either dits or dahs of appropriate length when pressed.

+

The instrument used to send morse code is called the key. Straight Keys use a single button and generates tones when pressed down. Straight keys require greater accuracy as you control the dits, dahs, and spacing manually. Electronic Keys automatically generate dits or dahs of appropriate length. The Electronic Keyer used here is an Iambic keyer. It uses two paddles, one for dits, one for dahs. Switch between the two at the appropriate times to build letters.

) }) \ No newline at end of file diff --git a/src/components/MorseHistory_textbox.js b/src/components/MorseHistory_textbox.js index c63725c..9bd89ae 100644 --- a/src/components/MorseHistory_textbox.js +++ b/src/components/MorseHistory_textbox.js @@ -12,7 +12,7 @@ export default (function MorseHistoryTextBox() { console.log('morseWords', morseWords); - morseWords.forEach((word) => { + morseWords.forEach((word, index) => { if (word.includes(' ')) { let newWord = '' word.split(' ').forEach(letter => { @@ -25,14 +25,14 @@ export default (function MorseHistoryTextBox() { } }) // text = newWord + ' ' + text - span.splice(0, 0, {newWord}) + span.splice(0, 0, {newWord}) } else if (morseCode[word] === undefined) { // text = '[?] ' + text - span.splice(0, 0, [?]) + span.splice(0, 0, [?]) } else { // text = morseCode[word].toUpperCase() + ' ' + text - span.splice(0, 0, {morseCode[word].toUpperCase()}) + span.splice(0, 0, {morseCode[word].toUpperCase()}) } }) diff --git a/src/config.json b/src/config.json index 10f6f10..9fdd0f1 100644 --- a/src/config.json +++ b/src/config.json @@ -8,5 +8,5 @@ "normal": 24, "fast": 17 }, - "historySize": 40 + "historySize": 10 } \ No newline at end of file diff --git a/src/css/App.css b/src/css/App.css index a66818a..f49b4e6 100644 --- a/src/css/App.css +++ b/src/css/App.css @@ -54,6 +54,7 @@ header { } #main-content .sidebar#left { + border: 1px solid yellowgreen; display: -webkit-box; display: -ms-flexbox; display: flex; @@ -79,12 +80,12 @@ header { -webkit-box-direction: normal; -ms-flex-direction: column; flex-direction: column; - -webkit-box-pack: start; - -ms-flex-pack: start; - justify-content: flex-start; + -webkit-box-pack: justify; + -ms-flex-pack: justify; + justify-content: space-between; height: 100%; min-width: 500px; - width: 600px; + width: 400px; padding: 1.5em; right: 0px; } @@ -307,7 +308,7 @@ i[class*="ri-"] { #morseButton { width: 400px; - height: 55px; + height: 60px; margin-top: 30px; margin-bottom: 10px; border-radius: 5px; @@ -341,7 +342,7 @@ i[class*="ri-"] { font-size: 1rem; color: transparent; width: 200px; - height: 55px; + height: 60px; background: #f4f4f4; margin: 0px; border: 0px; @@ -355,8 +356,8 @@ i[class*="ri-"] { color: #888; font-size: 1rem; font-weight: bold; - width: 60px; - height: 55px; + width: calc($button-height+5px); + height: 60px; -webkit-box-shadow: 0px 3px 3px rgba(0, 0, 0, 0.3), 0px -1px 1px white; box-shadow: 0px 3px 3px rgba(0, 0, 0, 0.3), 0px -1px 1px white; } @@ -395,7 +396,7 @@ i[class*="ri-"] { #morseButtonText { font-weight: bold; - color: #bbb; + color: #aaa; font-size: 0.7rem; margin-bottom: 40px; } diff --git a/src/css/App.css.map b/src/css/App.css.map index 4555394..e8fec8f 100644 --- a/src/css/App.css.map +++ b/src/css/App.css.map @@ -1,6 +1,6 @@ { "version": 3, - "mappings": "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", + "mappings": "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", "sources": [ "../scss/App.scss" ], diff --git a/src/hooks/useElectronicKey.js b/src/hooks/useElectronicKey.js index 659ffc5..a8f5a33 100644 --- a/src/hooks/useElectronicKey.js +++ b/src/hooks/useElectronicKey.js @@ -7,7 +7,7 @@ import { GameModeContext } from '../contexts/gameModeContext' // ELECTRONIC KEY TELEGRAPH - Iambic A function useElectronicKey() { - + console.log('useElectronicKey'); const {morseCharBuffer, setMorseCharBuffer, morseWords, setMorseWords} = useContext(MorseBufferContext) const {wpm} = useContext(WPMContext) const {gameMode} = useContext(GameModeContext) @@ -242,7 +242,7 @@ function useElectronicKey() { if (event.repeat) { return } if (event.keyCode === 188 || event.target.id === "left") { - document.getElementById('left').classList.add('active') + document.querySelector('.paddle#left').classList.add('active') leftIsPressed = true if (!rightIsPressed) { pressedFirst = 'left'} @@ -253,7 +253,7 @@ function useElectronicKey() { } } else if (event.keyCode === 190 || event.target.id === "right") { - document.getElementById('right').classList.add('active') + document.querySelector('.paddle#right').classList.add('active') rightIsPressed = true if (!leftIsPressed) { pressedFirst = 'right'} @@ -271,7 +271,7 @@ function useElectronicKey() { // if (!insideBufferDisplay) {return} if (event.keyCode === 188 || event.target.id === "left") { - document.getElementById('left').classList.remove('active') + document.querySelector('.paddle#left').classList.remove('active') leftIsPressed = false @@ -281,7 +281,7 @@ function useElectronicKey() { else { stopDepressSyncTimer() } } if (event.keyCode === 190 || event.target.id === "right") { - document.getElementById('right').classList.remove('active') + document.querySelector('.paddle#right').classList.remove('active') rightIsPressed = false if (pressedFirst === 'right') { pressedFirst = null } @@ -355,6 +355,9 @@ function useElectronicKey() { paddle.removeEventListener('mouseup', handleInputEnd) paddle.removeEventListener('touchend', handleInputEnd) }) + + clearInterval(depressSyncTimer) + clearInterval(gapTimer) // clearHistory() } // eslint-disable-next-line diff --git a/src/hooks/useStraightKey.js b/src/hooks/useStraightKey.js index 26a6387..7294845 100644 --- a/src/hooks/useStraightKey.js +++ b/src/hooks/useStraightKey.js @@ -6,7 +6,7 @@ import { GameModeContext } from '../contexts/gameModeContext' // STRAIGHT KEY TELEGRAPH function useStraightKey() { - + console.log('useStraightKey'); const {morseCharBuffer, setMorseCharBuffer, morseWords, setMorseWords} = useContext(MorseBufferContext) const {wpm} = useContext(WPMContext) const {gameMode} = useContext(GameModeContext) @@ -206,6 +206,9 @@ function useStraightKey() { paddle.removeEventListener('mouseup', handleInputEnd) paddle.removeEventListener('touchend', handleInputEnd) }) + + clearInterval(charTimer) + clearInterval(gapTimer) // clearHistory() } // eslint-disable-next-line diff --git a/src/scss/App.scss b/src/scss/App.scss index 46f8a00..99a339e 100644 --- a/src/scss/App.scss +++ b/src/scss/App.scss @@ -57,7 +57,7 @@ header { align-items: center; .sidebar#left { - // border: 1px solid green; + border: 1px solid yellowgreen; display: flex; flex-direction: column; justify-content: flex-start; @@ -70,10 +70,10 @@ header { border: 1px solid green; display: flex; flex-direction: column; - justify-content: flex-start; + justify-content: space-between; height: 100%; min-width: 500px; - width: 600px; + width: 400px; padding: 1.5em; right: 0px; } @@ -232,9 +232,10 @@ i[class*="ri-"] { } } +$button-height: 60px; #morseButton { width: 400px; - height: 55px; + height: $button-height; margin-top: 30px; margin-bottom: 10px; border-radius: 5px; @@ -258,7 +259,7 @@ i[class*="ri-"] { font-size: 1rem; color: transparent; width: 200px; - height: 55px; + height: $button-height; // background: yellow; background: #f4f4f4; margin: 0px; @@ -270,8 +271,8 @@ i[class*="ri-"] { color: #888; font-size: 1rem; font-weight: bold; - width: 60px; - height: 55px; + width: calc($button-height+5px); + height: $button-height; box-shadow: $main-box-shadow-light; } &#left { @@ -302,7 +303,7 @@ i[class*="ri-"] { } #morseButtonText { font-weight: bold; - color: #bbb; + color: #aaa; font-size: 0.7rem; margin-bottom: 40px; }