Skip to content
Merged
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
4 changes: 3 additions & 1 deletion src/contentScript/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { doesUrlMatchPatterns } from '../shared/url'
const BLOCK_DATA_STATUS = 'coderchartStatus'
const BLOCK_DATA_SOURCE = 'coderchartSource'
const PNG_PREPARING_LABEL = 'Preparing PNG…'
const PROMPT_RESET_DELAY_MS = 2000
let diagramCounter = 0
let blockIdentifierCounter = 0
let observer: MutationObserver | null = null
Expand Down Expand Up @@ -737,9 +738,10 @@ function createErrorNotice(doc: Document, err: unknown, source: string): HTMLEle
}

setTimeout(() => {
if (!promptButton.isConnected) return
promptButton.disabled = false
promptButton.textContent = defaultLabel
}, 2000)
}, PROMPT_RESET_DELAY_MS)
})

promptSection.append(promptButton, promptStatus, promptPreview)
Expand Down
21 changes: 18 additions & 3 deletions src/options/Options.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
import { FormEvent, useEffect, useMemo, useState } from 'react'
import { FormEvent, useEffect, useMemo, useRef, useState } from 'react'
import { DEFAULT_SETTINGS, ExtensionSettings, getSettings, saveSettings, normalizeSettings } from '../shared/settings'

import './Options.css'

type SaveStatus = 'idle' | 'saving' | 'saved' | 'error'

const defaultState = cloneSettings(DEFAULT_SETTINGS)
const SAVE_STATUS_RESET_DELAY_MS = 2400

export const Options = () => {
const [settings, setSettings] = useState<ExtensionSettings>(defaultState)
const [newPattern, setNewPattern] = useState('')
const [status, setStatus] = useState<SaveStatus>('idle')
const [errorMessage, setErrorMessage] = useState<string | null>(null)
const resetStatusTimeout = useRef<number | null>(null)

useEffect(() => {
let mounted = true
Expand All @@ -31,6 +33,14 @@ export const Options = () => {
}
}, [])

useEffect(() => {
return () => {
if (resetStatusTimeout.current !== null) {
window.clearTimeout(resetStatusTimeout.current)
}
}
}, [])

const normalizedPatterns = useMemo(() => settings.hostPatterns.map((pattern) => pattern.trim()), [settings.hostPatterns])

const canAddPattern = useMemo(() => {
Expand Down Expand Up @@ -74,16 +84,21 @@ export const Options = () => {

const handleSubmit = async (event: FormEvent) => {
event.preventDefault()
if (resetStatusTimeout.current !== null) {
window.clearTimeout(resetStatusTimeout.current)
resetStatusTimeout.current = null
}
setStatus('saving')
setErrorMessage(null)
try {
const normalized = normalizeSettings(settings)
await saveSettings(normalized)
setSettings(cloneSettings(normalized))
setStatus('saved')
setTimeout(() => {
resetStatusTimeout.current = window.setTimeout(() => {
setStatus('idle')
}, 2400)
resetStatusTimeout.current = null
}, SAVE_STATUS_RESET_DELAY_MS)
} catch (error) {
console.error('Failed to save settings', error)
setStatus('error')
Expand Down