Merge branch 'beta'

Author: Developer-Mike

README.md

@@ -193,6 +193,10 @@ Quickly locate text within your canvas using a familiar search experience. Advan
     *   Swap two selected nodes with each other (x, y and width, height will be swapped)
 *   `Advanced Canvas: Copy wikilink to node`
     *   Copy the wikilink to the selected node to the clipboard
+*   `Advanced Canvas: Pull outgoing links to canvas`
+    *   Create file nodes for all outgoing links of the selected nodes / the whole canvas if no node is selected
+*   `Advanced Canvas: Pull backlinks to canvas`
+    *   Create file nodes for all backlinks of the selected nodes / the whole canvas if no node is selected
 </details>
 
 ## Node Styles

src/@types/Obsidian.d.ts

@@ -103,6 +103,7 @@ declare module "obsidian" {
     saveFileCache: (filepath: string, cache: FileCacheEntry) => void
     linkResolver: () => void
     resolveLinks: (filepath: string, /* custom */ cachedContent: any) => void
+    getBacklinksForFile: (file: TFile) => { data: Map<string, LinkCache[]> }
 
     // Custom
     registerInternalLinkAC: (canvasName: string, from: string, to: string) => void

src/canvas-extensions/better-default-settings-canvas-extension.ts

@@ -2,7 +2,7 @@ import { Canvas, CanvasEdge, CanvasNode } from "src/@types/Canvas"
 import CanvasHelper from "src/utils/canvas-helper"
 import { FileSelectModal } from "src/utils/modal-helper"
 import CanvasExtension from "./canvas-extension"
-import { CanvasFileNodeData } from "src/@types/AdvancedJsonCanvas"
+import { CanvasColor, CanvasFileNodeData } from "src/@types/AdvancedJsonCanvas"
 
 export default class BetterDefaultSettingsCanvasExtension  extends CanvasExtension {
   isEnabled() { return true }
@@ -103,8 +103,12 @@ export default class BetterDefaultSettingsCanvasExtension  extends CanvasExtensi
     const nodeData = node.getData()
     if (nodeData.type !== 'text') return
 
+    let color: CanvasColor | undefined = this.plugin.settings.getSetting('defaultTextNodeColor').toString() as CanvasColor
+    if (color === "0") color = undefined
+
     node.setData({
       ...nodeData,
+      color: color,
       styleAttributes: {
         ...nodeData.styleAttributes,
         ...this.plugin.settings.getSetting('defaultTextNodeStyleAttributes')
@@ -115,8 +119,12 @@ export default class BetterDefaultSettingsCanvasExtension  extends CanvasExtensi
   private async applyDefaultEdgeStyles(canvas: Canvas, edge: CanvasEdge) {
     const edgeData = edge.getData()
 
+    let color: CanvasColor | undefined = this.plugin.settings.getSetting('defaultEdgeColor').toString() as CanvasColor
+    if (color === "0") color = undefined
+
     edge.setData({
       ...edgeData,
+      color: color,
       styleAttributes: {
         ...edgeData.styleAttributes,
         ...this.plugin.settings.getSetting('defaultEdgeStyleAttributes')

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

@@ -3,8 +3,10 @@ import BBoxHelper from "src/utils/bbox-helper"
 import CanvasHelper from "src/utils/canvas-helper"
 import { FileSelectModal } from "src/utils/modal-helper"
 import CanvasExtension from "./canvas-extension"
-import { Notice } from "obsidian"
+import { Notice, TFile } from "obsidian"
 import TextHelper from "src/utils/text-helper"
+import { CanvasFileNodeData } from "src/@types/AdvancedJsonCanvas"
+import { ExtendedCachedMetadata } from "src/@types/Obsidian"
 
 type Direction = 'up' | 'down' | 'left' | 'right'
 const DIRECTIONS = ['up', 'down', 'left', 'right'] as Direction[]
@@ -171,6 +173,120 @@ export default class CommandsCanvasExtension extends CanvasExtension {
         }
       )
     })
+
+    this.plugin.addCommand({
+      id: 'pull-outgoing-links-to-canvas',
+      name: 'Pull outgoing links to canvas',
+      checkCallback: CanvasHelper.canvasCommand(
+        this.plugin,
+        (canvas: Canvas) => !canvas.readonly,
+        (canvas: Canvas) => {
+          const canvasFile = canvas.view.file
+          if (!canvasFile) return
+
+          let selectedNodeIds = canvas.getSelectionData().nodes.map(node => node.id)
+          if (selectedNodeIds.length === 0) selectedNodeIds = [...canvas.nodes.keys()]
+
+          const metadata = this.plugin.app.metadataCache.getFileCache(canvasFile) as ExtendedCachedMetadata
+          if (!metadata) return
+
+          // Get outgoing links for all selected nodes
+          const outgoingLinks: Set<TFile> = new Set()
+          for (const nodeId of selectedNodeIds) {
+            let relativeFile = canvasFile
+
+            let nodeOutgoingLinks = metadata.nodes?.[nodeId]?.links
+            if (!nodeOutgoingLinks) {
+              const file = canvas.nodes.get(nodeId)?.file
+              if (!file) continue
+
+              const fileMetadata = this.plugin.app.metadataCache.getFileCache(file)
+              nodeOutgoingLinks = fileMetadata?.links
+              relativeFile = file
+            }
+            if (!nodeOutgoingLinks) continue
+
+            for (const nodeOutgoingLink of nodeOutgoingLinks) {
+              const resolvedLink = this.plugin.app.metadataCache.getFirstLinkpathDest(nodeOutgoingLink.link, relativeFile.path)
+              if (!(resolvedLink instanceof TFile)) continue
+
+              outgoingLinks.add(resolvedLink)
+            }
+          }
+
+          // Create outgoing links filter for those that are already on the canvas
+          const existingFileNodes: Set<TFile> = new Set([canvas.view.file])
+          for (const node of canvas.nodes.values()) {
+            if (node.getData().type !== 'file' || !node.file) continue
+            existingFileNodes.add(node.file)
+          }
+
+          for (const outgoingLink of outgoingLinks) {
+            if (existingFileNodes.has(outgoingLink)) continue
+            this.createFileNode(canvas, outgoingLink)
+          }
+        }
+      )
+    })
+
+    this.plugin.addCommand({
+      id: 'pull-backlinks-to-canvas',
+      name: 'Pull backlinks to canvas',
+      checkCallback: CanvasHelper.canvasCommand(
+        this.plugin,
+        (canvas: Canvas) => !canvas.readonly,
+        (canvas: Canvas) => {
+          const canvasFile = canvas.view.file
+          if (!canvasFile) return
+
+          let selectedNodesData = canvas.getSelectionData().nodes.map(node => node)
+          const backlinks: Set<TFile> = new Set()
+          
+          if (selectedNodesData.length > 0) {
+            // Get backlinks for all selected nodes
+            for (const nodeData of selectedNodesData) {
+              if (nodeData.type !== 'file' || !(nodeData as CanvasFileNodeData).file) continue
+
+              const file = this.plugin.app.vault.getFileByPath((nodeData as CanvasFileNodeData).file)
+              if (!file) continue
+
+              const nodeBacklinks = this.plugin.app.metadataCache.getBacklinksForFile(file)
+              if (!nodeBacklinks) continue
+
+              for (const nodeBacklink of nodeBacklinks.data.keys()) {
+                const resolvedLink = this.plugin.app.metadataCache.getFirstLinkpathDest(nodeBacklink, file.path)
+                if (!(resolvedLink instanceof TFile)) continue
+
+                backlinks.add(resolvedLink)
+              }
+            }
+          } else {
+            // Get all backlinks for the canvas file
+            const canvasBacklinks = this.plugin.app.metadataCache.getBacklinksForFile(canvasFile)
+            if (!canvasBacklinks) return
+
+            for (const canvasBacklink of canvasBacklinks.data.keys()) {
+              const resolvedLink = this.plugin.app.metadataCache.getFirstLinkpathDest(canvasBacklink, canvasFile.path)
+              if (!(resolvedLink instanceof TFile)) continue
+
+              backlinks.add(resolvedLink)
+            }
+          }
+
+          // Create backlinks filter for those that are already on the canvas
+          const existingFileNodes: Set<TFile> = new Set([canvas.view.file])
+          for (const node of canvas.nodes.values()) {
+            if (node.getData().type !== 'file' || !node.file) continue
+            existingFileNodes.add(node.file)
+          }
+
+          for (const backlink of backlinks) {
+            if (existingFileNodes.has(backlink)) continue
+            this.createFileNode(canvas, backlink)
+          }
+        }
+      )
+    })
   }
 
   private createTextNode(canvas: Canvas) {
@@ -180,12 +296,12 @@ export default class CommandsCanvasExtension extends CanvasExtension {
     canvas.createTextNode({ pos: pos, size: size })
   }
 
-  private async createFileNode(canvas: Canvas) {
+  private async createFileNode(canvas: Canvas, file?: TFile) {
     const size = canvas.config.defaultFileNodeDimensions
     const pos = CanvasHelper.getCenterCoordinates(canvas, size)
-    const file = await new FileSelectModal(this.plugin.app, undefined, true).awaitInput()
+    file ??= await new FileSelectModal(this.plugin.app, undefined, true).awaitInput()
 
-    canvas.createFileNode({ pos: pos, size: size, file: file })
+    canvas.createFileNode({ pos: pos, size: size, file })
   }
 
   private cloneNode(canvas: Canvas, cloneDirection: Direction) {

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

@@ -100,6 +100,19 @@ export default class ExportCanvasExtension extends CanvasExtension {
         .onChange(value => noFontExport = value)
       )
 
+    let theme: 'light' | 'dark' = document.body.classList.contains('theme-dark') ? 'dark' : 'light'
+    new Setting(modal.contentEl)
+      .setName('Theme')
+      .setDesc('The theme used for the export.')
+      .addDropdown(dropdown => dropdown
+        .addOptions({
+          light: 'Light',
+          dark: 'Dark'
+        } as Record<'light' | 'dark', string>)
+        .setValue(theme)
+        .onChange(value => theme = value as 'light' | 'dark')
+      )
+
     let watermark = false
     new Setting(modal.contentEl)
       .setName('Show logo')
@@ -140,6 +153,7 @@ export default class ExportCanvasExtension extends CanvasExtension {
             svg, 
             svg ? 1 : pixelRatioFactor, 
             svg ? noFontExport : false,
+            theme,
             watermark,
             garbledText,
             svg ? true : transparentBackground
@@ -151,7 +165,14 @@ export default class ExportCanvasExtension extends CanvasExtension {
     modal.open()
   }
 
-  private async exportImage(canvas: Canvas, nodesToExport: CanvasNode[] | null, svg: boolean, pixelRatioFactor: number, noFontExport: boolean, watermark: boolean, garbledText: boolean, transparentBackground: boolean) {
+  private async exportImage(canvas: Canvas, nodesToExport: CanvasNode[] | null, svg: boolean, pixelRatioFactor: number, noFontExport: boolean, theme: 'light' | 'dark', watermark: boolean, garbledText: boolean, transparentBackground: boolean) {
+    // Set theme
+    const cachedTheme = document.body.classList.contains('theme-dark') ? 'dark' : 'light'
+    if (theme !== cachedTheme) {
+      document.body.classList.toggle('theme-dark', theme === 'dark')
+      document.body.classList.toggle('theme-light', theme === 'light')
+    }
+
     const isWholeCanvas = nodesToExport === null
     if (!nodesToExport) nodesToExport = [...canvas.nodes.values()]
 
@@ -325,6 +346,12 @@ export default class ExportCanvasExtension extends CanvasExtension {
 
       // Remove the loading overlay
       interactionBlocker.remove()
+
+      // Restore theme
+      if (theme !== cachedTheme) {
+        document.body.classList.toggle('theme-dark', cachedTheme === 'dark')
+        document.body.classList.toggle('theme-light', cachedTheme === 'light')
+      }
     }
   }
 

src/settings.ts

@@ -29,10 +29,12 @@ export interface AdvancedCanvasPluginSettingsValues {
 
   nodeStylingFeatureEnabled: boolean
   customNodeStyleAttributes: StyleAttribute[]
+  defaultTextNodeColor: number
   defaultTextNodeStyleAttributes: { [key: string]: string }
 
   edgesStylingFeatureEnabled: boolean
   customEdgeStyleAttributes: StyleAttribute[]
+  defaultEdgeColor: number
   defaultEdgeLineDirection: keyof typeof SETTINGS.edgesStylingFeatureEnabled.children.defaultEdgeLineDirection.options
   defaultEdgeStyleAttributes: { [key: string]: string }
   edgeStyleUpdateWhileDragging: boolean
@@ -119,10 +121,12 @@ export const DEFAULT_SETTINGS_VALUES: AdvancedCanvasPluginSettingsValues = {
 
   nodeStylingFeatureEnabled: true,
   customNodeStyleAttributes: [],
+  defaultTextNodeColor: 0,
   defaultTextNodeStyleAttributes: {},
 
   edgesStylingFeatureEnabled: true,
   customEdgeStyleAttributes: [],
+  defaultEdgeColor: 0,
   defaultEdgeLineDirection: 'unidirectional',
   defaultEdgeStyleAttributes: {},
   edgeStyleUpdateWhileDragging: false,
@@ -352,6 +356,12 @@ export const SETTINGS = {
         type: 'button',
         onClick: () => window.open("https://github.com/Developer-Mike/obsidian-advanced-canvas/blob/main/README.md#custom-styles")
       } as ButtonSetting,
+      defaultTextNodeColor: {
+        label: 'Default text node color',
+        description: 'The default color of a text node. The default range is from 0 to 6, where 0 is no color. The range can be extended by using the Custom Colors feature of Advanced Canvas.',
+        type: 'number',
+        parse: (value: string) => Math.max(0, parseInt(value) || 0)
+      },
       defaultTextNodeStyleAttributes: {
         label: 'Default text node style attributes',
         type: 'styles',
@@ -373,6 +383,12 @@ export const SETTINGS = {
         type: 'button',
         onClick: () => window.open("https://github.com/Developer-Mike/obsidian-advanced-canvas/blob/main/README.md#custom-styles")
       } as ButtonSetting,
+      defaultEdgeColor: {
+        label: 'Default edge color',
+        description: 'The default color of an edge. The default range is from 0 to 6, where 0 is no color. The range can be extended by using the Custom Colors feature of Advanced Canvas.',
+        type: 'number',
+        parse: (value: string) => Math.max(0, parseInt(value) || 0)
+      },
       defaultEdgeLineDirection: {
         label: 'Default edge line direction',
         description: 'The default line direction of an edge.',