Fix dumb clipboard bug

ZEBAS204 · Jan 12, 2023 · 0a874f0 · 0a874f0
1 parent d3bfab8
commit 0a874f0
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 22 deletions.
diff --git a/src/contents-sidebar-2.tsx b/src/contents-sidebar-2.tsx
@@ -232,10 +232,10 @@ function SectionClipboard() {
 					}
 					<TextareaButton
 						icon={DocumentDuplicateIcon}
-						onClick={e => {
-							if (clipboard === "") { return }
-							navigator.clipboard.writeText(clipboard)
-						}}
+						//// onClick={e => {
+						//// 	if (clipboard === "") { return }
+						//// 	navigator.clipboard.writeText(clipboard)
+						//// }}
 					>
 						COPY
 					</TextareaButton>

diff --git a/src/state.tsx b/src/state.tsx
@@ -238,7 +238,8 @@ export function StateProvider({ children }: PropsWithChildren) {
 						setSearch,
 						resetAll: resetAllSearch,
 					}), [resetAllSearch])}>
-						<RestoreSelectedSvgElementEffect />
+						<ClipboardEffect />
+						{/* <RestoreSelectedSvgElementEffect /> */}
 						<VisibilityChangeEffect />
 						<CastSizeAndStrokeWidthAsCSSVariablesEffect />
 						<URLSearchParamsEffect />
@@ -250,31 +251,46 @@ export function StateProvider({ children }: PropsWithChildren) {
 	</>
 }
 
-function RestoreSelectedSvgElementEffect() {
+function ClipboardEffect() {
 	const searchConfig = useContext(SearchConfigContext)!
-	const setSearchConfig = useContext(SetSearchConfigContext)!
-	const search = useContext(SearchContext)!
 
-	const prevIconset = useRef(search.iconset)
+	const onceRef = useRef(false)
 	useEffect(() => {
-		queueMicrotask(() => prevIconset.current = search.iconset)
-
-		if (searchConfig.selectedName === "") { return }
-		if (prevIconset.current.slice(0, 2) === search.iconset.slice(0, 2)) {
-			const svgElement = document
-				?.getElementById(searchConfig.selectedName)
-				?.querySelector("svg")
-			if (svgElement === undefined || svgElement === null) { return }
-			setSearchConfig.setSelectedSvgElement(svgElement)
-		} else {
-			setSearchConfig.setSelectedName("")
-			setSearchConfig.setSelectedSvgElement(null)
+		if (!onceRef.current) {
+			onceRef.current = true
+			return
 		}
-	}, [search.iconset, searchConfig.selectedName, setSearchConfig])
+		navigator.clipboard.writeText(searchConfig.clipboard)
+	}, [searchConfig.clipboard])
 
 	return <></>
 }
 
+//// function RestoreSelectedSvgElementEffect() {
+//// 	const searchConfig = useContext(SearchConfigContext)!
+//// 	const setSearchConfig = useContext(SetSearchConfigContext)!
+//// 	const search = useContext(SearchContext)!
+////
+//// 	const prevIconset = useRef(search.iconset)
+//// 	useEffect(() => {
+//// 		queueMicrotask(() => prevIconset.current = search.iconset)
+////
+//// 		if (searchConfig.selectedName === "") { return }
+//// 		if (prevIconset.current.slice(0, 2) === search.iconset.slice(0, 2)) {
+//// 			const svgElement = document
+//// 				?.getElementById(searchConfig.selectedName)
+//// 				?.querySelector("svg")
+//// 			if (svgElement === undefined || svgElement === null) { return }
+//// 			setSearchConfig.setSelectedSvgElement(svgElement)
+//// 		} else {
+//// 			setSearchConfig.setSelectedName("")
+//// 			setSearchConfig.setSelectedSvgElement(null)
+//// 		}
+//// 	}, [search.iconset, searchConfig.selectedName, setSearchConfig])
+////
+//// 	return <></>
+//// }
+
 function VisibilityChangeEffect() {
 	const search = useContext(SearchContext)!