Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/components/Typewriter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export const Typewriter = ({
typeSpeed = 80,
deleteSpeed = 50,
delaySpeed = 1500,
delayStart = 100,
cursor = false,
cursorStyle = '|',
cursorColor = 'inherit',
Expand All @@ -30,6 +31,7 @@ export const Typewriter = ({
loop,
typeSpeed,
deleteSpeed,
delayStart,
delaySpeed,
onLoopDone,
onType,
Expand Down
64 changes: 40 additions & 24 deletions src/hooks/useTypewriter.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ export type TypewriterProps = {
deleteSpeed?: number
/** Delay time between the words in Milliseconds */
delaySpeed?: number
/** Delay time before start in Milliseconds */
delayStart?: number
}

export type TypewriterHelper = {
Expand All @@ -39,6 +41,7 @@ export const useTypewriter = ({
typeSpeed = 80,
deleteSpeed = 50,
delaySpeed = 1500,
delayStart = 0,
onLoopDone,
onType,
onDelete,
Expand All @@ -56,38 +59,51 @@ export const useTypewriter = ({
const isDelete = useRef(false)
const isType = useRef(false)
const isDelay = useRef(false)
const isFirst = useRef(true)
const isFirstDone = useRef(false)

const handleTyping = useCallback(() => {
const index = count % words.length
const fullWord = words[index]

if (!isDelete.current) {
dispatch({ type: 'TYPE', payload: fullWord, speed: typeSpeed })
isType.current = true

if (text === fullWord) {
dispatch({ type: 'DELAY', payload: delaySpeed })
isType.current = false
isDelay.current = true

setTimeout(() => {
isDelay.current = false
isDelete.current = true
}, delaySpeed)

if (loop > 0) {
loops.current += 1
if (loops.current / words.length === loop) {
if (!isFirst.current) {
if (!isDelete.current) {
dispatch({ type: 'TYPE', payload: fullWord, speed: typeSpeed })
isType.current = true

if (text === fullWord) {
dispatch({ type: 'DELAY', payload: delaySpeed })
isType.current = false
isDelay.current = true

setTimeout(() => {
isDelay.current = false
isDone.current = true
isDelete.current = true
}, delaySpeed)

if (loop > 0) {
loops.current += 1
if (loops.current / words.length === loop) {
isDelay.current = false
isDone.current = true
}
}
}
} else {
dispatch({ type: 'DELETE', payload: fullWord, speed: deleteSpeed })
if (text === '') {
isDelete.current = false
dispatch({ type: 'COUNT' })
}
}
} else {
dispatch({ type: 'DELETE', payload: fullWord, speed: deleteSpeed })
if (text === '') {
isDelete.current = false
dispatch({ type: 'COUNT' })
if (!isFirstDone.current) {
dispatch({ type: 'DELAY', payload: delayStart })
isDelay.current = true
setTimeout(() => {
isDelay.current = false
isFirst.current = false
}, delayStart)
isFirstDone.current = true
}
}

Expand All @@ -108,6 +124,7 @@ export const useTypewriter = ({
deleteSpeed,
loop,
typeSpeed,
delayStart,
words,
text,
onType,
Expand All @@ -119,7 +136,6 @@ export const useTypewriter = ({
const typing = setTimeout(handleTyping, speed)

if (isDone.current) clearTimeout(typing)

return () => clearTimeout(typing)
}, [handleTyping, speed])

Expand Down