Merge with jenny

1 files changed, 12 insertions, 5 deletions

diff --git a/src/client/views/GlobalKeyHandler.ts b/src/client/views/GlobalKeyHandler.ts
index 4a327a842..6120c4c9e 100644
--- a/src/client/views/GlobalKeyHandler.ts
+++ b/src/client/views/GlobalKeyHandler.ts
@@ -142,11 +142,18 @@ export class KeyManager {
             case "delete":
             case "backspace":
                 if (document.activeElement?.tagName !== "INPUT" && document.activeElement?.tagName !== "TEXTAREA") {
-                    const selected = SelectionManager.Views().filter(dv => !dv.topMost);
                     UndoManager.RunInBatch(() => {
-                        SelectionManager.DeselectAll();
-                        selected.map(dv => !dv.props.Document._stayInCollection && dv.props.removeDocument?.(dv.props.Document));
-                    }, "delete");
+                        if (LightboxView.LightboxDoc) {
+                            LightboxView.SetLightboxDoc(undefined);
+                            SelectionManager.DeselectAll();
+                        }
+                        else DocumentDecorations.Instance.onCloseClick(true);
+                    }, "backspace");
+                    // const selected = SelectionManager.Views().filter(dv => !dv.topMost);
+                    // UndoManager.RunInBatch(() => {
+                    //     SelectionManager.DeselectAll();
+                    //     selected.map(dv => !dv.props.Document._stayInCollection && dv.props.removeDocument?.(dv.props.Document));
+                    // }, "delete");
                     return { stopPropagation: true, preventDefault: true };
                 }
                 break;
@@ -268,7 +275,7 @@ export class KeyManager {
                     const pt = SelectionManager.Views()[0].props.ScreenToLocalTransform().transformPoint(bds.x + (bds.r - bds.x) / 2, bds.y + (bds.b - bds.y) / 2);
                     const text = `__DashDocId(${pt?.[0] || 0},${pt?.[1] || 0}):` + SelectionManager.Views().map(dv => dv.Document[Id]).join(":");
                     SelectionManager.Views().length && navigator.clipboard.writeText(text);
-                    DocumentDecorations.Instance.onCloseClick();
+                    DocumentDecorations.Instance.onCloseClick(true);
                     stopPropagation = false;
                     preventDefault = false;
                 }