Add missing useCallbacks

Author: jonpyt

src/extensions/folding/index.ts

@@ -174,6 +174,7 @@ const useReadOnlyCodeFolding = (editor: PrismEditor, ...providers: FoldingRangeP
 		foldPositions = []
 		foldedRanges.clear()
 		foldedLines.clear()
+		lines = editor.lines!
 		value = code = editor.value
 		lineNumberWidth = Math.ceil(Math.log10(numLines(code))) + ".001ch"
 		const folds: [number, number][] = []
@@ -212,36 +213,38 @@ const useReadOnlyCodeFolding = (editor: PrismEditor, ...providers: FoldingRangeP
 
 	providerRef.current = providers
 
-	useLayoutEffect(() => {
-		editor.extensions.folding = {
-			get fullCode() {
-				return code
-			},
-			toggleFold: (lineNumber, force) =>
-				!!foldPositions[lineNumber] &&
-				foldedLines.has(lineNumber) != force &&
-				!toggleFold(lineNumber)!,
-			updateFolds: () => update(),
-		}
+	useLayoutEffect(
+		useCallback(() => {
+			editor.extensions.folding = {
+				get fullCode() {
+					return code
+				},
+				toggleFold: (lineNumber, force) =>
+					!!foldPositions[lineNumber] &&
+					foldedLines.has(lineNumber) != force &&
+					!toggleFold(lineNumber)!,
+				updateFolds: () => update(),
+			}
 
-		lines = editor.lines!
-		if (editor.value) createFolds()
+			if (editor.value) createFolds()
 
-		return () => {
-			delete editor.extensions.folding
-			if (foldToggles) {
-				foldToggles.forEach((el, i) => {
-					el.remove()
-					foldPlaceholders[i]?.remove()
-				})
-			}
-			if (foldedRanges.size) {
-				foldedRanges.clear()
-				foldPositions = []
-				update()
+			return () => {
+				delete editor.extensions.folding
+				if (foldToggles) {
+					foldToggles.forEach((el, i) => {
+						el.remove()
+						foldPlaceholders[i]?.remove()
+					})
+				}
+				if (foldedRanges.size) {
+					foldedRanges.clear()
+					foldPositions = []
+					update()
+				}
 			}
-		}
-	}, [])
+		}, []),
+		[],
+	)
 
 	useLayoutEffect(
 		useCallback(() => {

src/extensions/search/replace.ts

@@ -1,4 +1,4 @@
-import { useLayoutEffect, useMemo } from "react"
+import { useCallback, useLayoutEffect, useMemo } from "react"
 import { addTextareaListener } from "../../core"
 import { PrismEditor } from "../../types"
 import { SearchAPI, useEditorSearch } from "./search"
@@ -61,25 +61,23 @@ export const useEditorReplace = (
 		currentMatch?.classList.toggle("match")
 	}
 
-	const removeSelection = () => {
+	const removeSelection = useCallback(() => {
 		if (hasSelected) {
 			toggleClasses()
 			hasSelected = false
 		}
-	}
+	}, [])
 
 	let currentLine: HTMLDivElement
 	let currentMatch: HTMLSpanElement
 	let hasSelected = false
 
 	useLayoutEffect(() => {
-		let removeListener = addTextareaListener(editor, "focus", removeSelection)
-		return () => {
-			removeListener()
-			removeSelection()
-		}
+		return addTextareaListener(editor, "focus", removeSelection)
 	}, [])
 
+	useLayoutEffect(() => removeSelection, [])
+
 	return useMemo<ReplaceAPI>(
 		() =>
 			Object.assign(search, {