fix: Templater Commands not running on automatic Daily Note Creation on Obsidian 1.11.0+

refs: #1689

Author: Zachatoo

src/handlers/EventHandler.ts

@@ -5,36 +5,51 @@ import {
     EventRef,
     Menu,
     MenuItem,
+    moment,
+    normalizePath,
     TAbstractFile,
     TFile,
     TFolder,
 } from "obsidian";
+import { get_active_file } from "utils/Utils";
 
 export default class EventHandler {
     private trigger_on_file_creation_event: EventRef | undefined;
 
     constructor(
         private plugin: TemplaterPlugin,
         private templater: Templater,
-        private settings: Settings
+        private settings: Settings,
     ) {}
 
     setup(): void {
-        if (Array.isArray(this.plugin.app.workspace.onLayoutReadyCallbacks)) {
-            // Use onLayoutReadyCallbacks instead of onLayoutReady
-            // to ensure that the event is registered before core plugin events (e.g. daily notes autorun)
-            this.plugin.app.workspace.onLayoutReadyCallbacks.unshift({
-                pluginId: this.plugin.manifest.id,
-                callback: () => {
-                    this.update_trigger_file_on_creation();
-                },
-            });
-        } else {
-            // Fallback to onLayoutReady if onLayoutReadyCallbacks is not available
-            this.plugin.app.workspace.onLayoutReady(() => {
-                this.update_trigger_file_on_creation();
-            });
-        }
+        this.plugin.app.workspace.onLayoutReady(() => {
+            if (this.settings.trigger_on_file_creation) {
+                const open_behavior =
+                    this.plugin.app.vault.getConfig("openBehavior");
+                if (open_behavior === "daily") {
+                    const daily_notes_plugin =
+                        this.plugin.app.internalPlugins.getEnabledPluginById(
+                            "daily-notes",
+                        );
+                    if (daily_notes_plugin) {
+                        const { folder, format } = daily_notes_plugin.options;
+                        const daily_note_path = normalizePath(
+                            `${folder}/${moment().format(format)}.md`,
+                        );
+                        const active_file = get_active_file(this.plugin.app);
+                        if (active_file?.path === daily_note_path) {
+                            Templater.on_file_creation(
+                                this.templater,
+                                this.plugin.app,
+                                active_file,
+                            );
+                        }
+                    }
+                }
+            }
+            this.update_trigger_file_on_creation();
+        });
         this.update_syntax_highlighting();
         this.update_file_menu();
     }
@@ -60,14 +75,14 @@ export default class EventHandler {
                     Templater.on_file_creation(
                         this.templater,
                         this.plugin.app,
-                        file
-                    )
+                        file,
+                    ),
             );
             this.plugin.registerEvent(this.trigger_on_file_creation_event);
         } else {
             if (this.trigger_on_file_creation_event) {
                 this.plugin.app.vault.offref(
-                    this.trigger_on_file_creation_event
+                    this.trigger_on_file_creation_event,
                 );
                 this.trigger_on_file_creation_event = undefined;
             }
@@ -85,13 +100,13 @@ export default class EventHandler {
                                 .setIcon("templater-icon")
                                 .onClick(() => {
                                     this.plugin.fuzzy_suggester.create_new_note_from_template(
-                                        file
+                                        file,
                                     );
                                 });
                         });
                     }
-                }
-            )
+                },
+            ),
         );
     }
 }