Fixed presentation mode gets lost when pressing back on the first node. Added unclamped zooming option for presentation mode. Fixed no animation if zoom gets clamped.

Author: Developer-Mike

src/@types/Canvas.d.ts

@@ -110,6 +110,8 @@ export interface Canvas {
   handlePaste(): void
   requestSave(): void
 
+  onResize(): void
+
   // Custom
   isClearing?: boolean
   isCopying?: boolean

src/canvas-extensions/presentation-canvas-extension.ts

@@ -252,29 +252,32 @@ export default class PresentationCanvasExtension extends CanvasExtension {
   private async animateNodeTransition(canvas: Canvas, fromNode: CanvasNode|undefined, toNode: CanvasNode) {
     const useCustomZoomFunction = this.plugin.settings.getSetting('zoomToSlideWithoutPadding')
     const animationDurationMs = this.plugin.settings.getSetting('slideTransitionAnimationDuration') * 1000
+
+    const toNodeBBox = CanvasHelper.getSmallestAllowedZoomBBox(canvas, toNode.getBBox())
 
     if (animationDurationMs > 0 && fromNode) {
       const animationIntensity = this.plugin.settings.getSetting('slideTransitionAnimationIntensity')
 
-      const currentNodeBBoxEnlarged = BBoxHelper.scaleBBox(fromNode.getBBox(), animationIntensity)
+      const fromNodeBBox = CanvasHelper.getSmallestAllowedZoomBBox(canvas, fromNode.getBBox())
+
+      const currentNodeBBoxEnlarged = BBoxHelper.scaleBBox(fromNodeBBox, animationIntensity)
       if (useCustomZoomFunction) CanvasHelper.zoomToRealBBox(canvas, currentNodeBBoxEnlarged)
       else canvas.zoomToBbox(currentNodeBBoxEnlarged)
 
       await sleep(animationDurationMs / 2)
 
       if (fromNode.getData().id !== toNode.getData().id) {
         // Add 0.1 to fix obsidian bug that causes the animation to skip if the bbox is the same
-        const nextNodeBBoxEnlarged = BBoxHelper.scaleBBox(toNode.getBBox(), animationIntensity + 0.1)
+        const nextNodeBBoxEnlarged = BBoxHelper.scaleBBox(toNodeBBox, animationIntensity + 0.1)
         if (useCustomZoomFunction) CanvasHelper.zoomToRealBBox(canvas, nextNodeBBoxEnlarged)
         else canvas.zoomToBbox(nextNodeBBoxEnlarged)
 
         await sleep(animationDurationMs / 2)
       }
     }
 
-    let nodeBBox = toNode.getBBox()
-    if (useCustomZoomFunction) CanvasHelper.zoomToRealBBox(canvas, nodeBBox)
-    else canvas.zoomToBbox(nodeBBox)
+    if (useCustomZoomFunction) CanvasHelper.zoomToRealBBox(canvas, toNodeBBox)
+    else canvas.zoomToBbox(toNodeBBox)
   }
 
   private async startPresentation(canvas: Canvas, tryContinue: boolean = false) {
@@ -304,6 +307,10 @@ export default class PresentationCanvasExtension extends CanvasExtension {
     // Lock canvas
     canvas.setReadonly(true)
 
+    // Disable zoom clamping
+    if (this.plugin.settings.getSetting('useUnclampedZoomWhilePresenting'))
+      canvas.screenshotting = true
+
     // Register event handler for keyboard navigation
     canvas.wrapperEl.onkeydown = (e: any) => {
       if (this.plugin.settings.getSetting('useArrowKeysToChangeSlides')) {
@@ -361,6 +368,10 @@ export default class PresentationCanvasExtension extends CanvasExtension {
 
     // Unlock canvas
     canvas.setReadonly(false)
+    
+    // Re-enable zoom clamping
+    if (this.plugin.settings.getSetting('useUnclampedZoomWhilePresenting'))
+      canvas.screenshotting = false
 
     // Exit fullscreen mode
     canvas.wrapperEl.classList.remove('presentation-mode')
@@ -420,10 +431,7 @@ export default class PresentationCanvasExtension extends CanvasExtension {
     if (!fromNode) return
 
     const toNodeId = this.visitedNodeIds.last()
-    if (!toNodeId) return
-
-    let toNode = canvas.nodes.get(toNodeId)
-    if (!toNode) return
+    let toNode = toNodeId ? canvas.nodes.get(toNodeId) : null
 
     // Fall back to same node if there are no more nodes before
     if (!toNode) {

src/settings.ts

@@ -81,6 +81,7 @@ export interface AdvancedCanvasPluginSettingsValues {
   useArrowKeysToChangeSlides: boolean
   usePgUpPgDownKeysToChangeSlides: boolean
   zoomToSlideWithoutPadding: boolean
+  useUnclampedZoomWhilePresenting: boolean
   slideTransitionAnimationDuration: number
   slideTransitionAnimationIntensity: number
 
@@ -159,6 +160,7 @@ export const DEFAULT_SETTINGS_VALUES: AdvancedCanvasPluginSettingsValues = {
   useArrowKeysToChangeSlides: true,
   usePgUpPgDownKeysToChangeSlides: true,
   zoomToSlideWithoutPadding: true,
+  useUnclampedZoomWhilePresenting: false,
   slideTransitionAnimationDuration: 0.5,
   slideTransitionAnimationIntensity: 1.25,
 
@@ -470,6 +472,11 @@ export const SETTINGS = {
         description: 'When enabled, the canvas will zoom to the slide without padding.',
         type: 'boolean'
       },
+      useUnclampedZoomWhilePresenting: {
+        label: 'Use unclamped zoom while presenting',
+        description: 'When enabled, the zoom will not be clamped while presenting.',
+        type: 'boolean'
+      },
       slideTransitionAnimationDuration: {
         label: 'Slide transition animation duration',
         description: 'The duration of the slide transition animation in seconds. Set to 0 to disable the animation.',

src/utils/canvas-helper.ts

@@ -165,6 +165,8 @@ export default class CanvasHelper {
 
   static readonly MAX_ALLOWED_ZOOM = 1
   static getSmallestAllowedZoomBBox(canvas: Canvas, bbox: BBox): BBox {
+    if (canvas.screenshotting) return bbox // Zoom is not limited when taking screenshots
+
     if (canvas.canvasRect.width === 0 || canvas.canvasRect.height === 0) return bbox
 
     const widthZoom = canvas.canvasRect.width / (bbox.maxX - bbox.minX)