From 7b960716439cba093202f9ba37dd6b258be39017 Mon Sep 17 00:00:00 2001
From: Syncx <47534062+Syncxv@users.noreply.github.com>
Date: Fri, 16 Feb 2024 17:52:09 +1100
Subject: [PATCH] fix ImageZoom patch (#2181)

---
 src/plugins/imageZoom/components/Magnifier.tsx | 11 ++++++-----
 src/plugins/imageZoom/index.tsx                |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/plugins/imageZoom/components/Magnifier.tsx b/src/plugins/imageZoom/components/Magnifier.tsx
index 6a3fc05a0..816717350 100644
--- a/src/plugins/imageZoom/components/Magnifier.tsx
+++ b/src/plugins/imageZoom/components/Magnifier.tsx
@@ -123,14 +123,13 @@ export const Magnifier: React.FC<MagnifierProps> = ({ instance, size: initialSiz
         waitFor(() => instance.state.readyState === "READY", () => {
             const elem = document.getElementById(ELEMENT_ID) as HTMLDivElement;
             element.current = elem;
-            elem.firstElementChild!.setAttribute("draggable", "false");
+            elem.querySelector("img,video")?.setAttribute("draggable", "false");
             if (instance.props.animated) {
                 originalVideoElementRef.current = elem!.querySelector("video")!;
                 originalVideoElementRef.current.addEventListener("timeupdate", syncVideos);
-                setReady(true);
-            } else {
-                setReady(true);
             }
+
+            setReady(true);
         });
         document.addEventListener("keydown", onKeyDown);
         document.addEventListener("keyup", onKeyUp);
@@ -155,7 +154,9 @@ export const Magnifier: React.FC<MagnifierProps> = ({ instance, size: initialSiz
 
     if (!ready) return null;
 
-    const box = element.current!.getBoundingClientRect();
+    const box = element.current?.getBoundingClientRect();
+
+    if (!box) return null;
 
     return (
         <div
diff --git a/src/plugins/imageZoom/index.tsx b/src/plugins/imageZoom/index.tsx
index c14754c87..8d8b6726d 100644
--- a/src/plugins/imageZoom/index.tsx
+++ b/src/plugins/imageZoom/index.tsx
@@ -171,7 +171,7 @@ export default definePlugin({
             find: "handleImageLoad=",
             replacement: [
                 {
-                    match: /showThumbhashPlaceholder:\i,/,
+                    match: /placeholderVersion:\i,/,
                     replace: "...$self.makeProps(this),$&"
                 },