From 7c15d03b5094bbcf4ca5dc872b390b88f6e944e1 Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Thu, 3 Aug 2023 19:32:09 -0400
Subject: [PATCH] fix: Crash with some find characters fix: Warning on close of
 find dialog

---
 app/editor/components/FindAndReplace.tsx   | 2 ++
 shared/editor/extensions/FindAndReplace.ts | 9 ++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/app/editor/components/FindAndReplace.tsx b/app/editor/components/FindAndReplace.tsx
index a5232271b..f2b8032f9 100644
--- a/app/editor/components/FindAndReplace.tsx
+++ b/app/editor/components/FindAndReplace.tsx
@@ -29,6 +29,7 @@ type Props = {
 
 export default function FindAndReplace({ readOnly }: Props) {
   const editor = useEditor();
+  const finalFocusRef = React.useRef<HTMLElement>(editor.view.dom);
   const selectionRef = React.useRef<string | undefined>();
   const inputRef = React.useRef<HTMLInputElement>(null);
   const { t } = useTranslation();
@@ -224,6 +225,7 @@ export default function FindAndReplace({ readOnly }: Props) {
     <Portal>
       <Popover
         {...popover}
+        unstable_finalFocusRef={finalFocusRef}
         style={style}
         aria-label={t("Find and replace")}
         width={420}
diff --git a/shared/editor/extensions/FindAndReplace.ts b/shared/editor/extensions/FindAndReplace.ts
index 60c97d86e..df0e7cedc 100644
--- a/shared/editor/extensions/FindAndReplace.ts
+++ b/shared/editor/extensions/FindAndReplace.ts
@@ -141,7 +141,14 @@ export default class FindAndReplace extends Extension {
   }
 
   private get findRegExp() {
-    return RegExp(this.searchTerm, !this.options.caseSensitive ? "gui" : "gu");
+    try {
+      return RegExp(
+        this.searchTerm.replace(/\\+$/, ""),
+        !this.options.caseSensitive ? "gui" : "gu"
+      );
+    } catch (err) {
+      return RegExp("");
+    }
   }
 
   private goToMatch(direction: number): Command {