From 386e2740e6b9b403e4821aaee8f31279db030256 Mon Sep 17 00:00:00 2001
From: Henrik Giesel <hengiesel@gmail.com>
Date: Wed, 4 Aug 2021 19:13:37 +0200
Subject: [PATCH] Only allow ImageHandle on valid pictures (determined in
 SizeSelect)

---
 ts/editor/ImageHandle.svelte           | 14 ++++++++------
 ts/editor/ImageHandleSizeSelect.svelte |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ts/editor/ImageHandle.svelte b/ts/editor/ImageHandle.svelte
index d46c25486..e4b585790 100644
--- a/ts/editor/ImageHandle.svelte
+++ b/ts/editor/ImageHandle.svelte
@@ -42,18 +42,14 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     }
 
     function resetSizes() {
+        activeImage = null;
+
         top = 0;
         left = 0;
         width = 0;
         height = 0;
     }
 
-    $: if (activeImage) {
-        updateSizes();
-    } else {
-        resetSizes();
-    }
-
     let actualWidth = "";
     let actualHeight = "";
     let customDimensions = false;
@@ -178,6 +174,12 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
     let sizeSelect: any;
     let active = false;
 
+    $: if (activeImage && sizeSelect?.images.includes(activeImage)) {
+        updateSizes();
+    } else {
+        resetSizes();
+    }
+
     function onDblclick() {
         sizeSelect.toggleActualSize();
     }
diff --git a/ts/editor/ImageHandleSizeSelect.svelte b/ts/editor/ImageHandleSizeSelect.svelte
index 7cac923f7..d44e95f3e 100644
--- a/ts/editor/ImageHandleSizeSelect.svelte
+++ b/ts/editor/ImageHandleSizeSelect.svelte
@@ -62,7 +62,7 @@ License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
         return createPathRecursive([], element).join(" > ");
     }
 
-    let images: HTMLImageElement[] = [];
+    export const images: HTMLImageElement[] = [];
 
     $: for (const [index, image] of images.entries()) {
         const rule = sheet.cssRules[index] as CSSStyleRule;