Update API version and deps

Author: pjeby

package.json

@@ -9,6 +9,6 @@
     "@ophidian/build": "^1.0.1",
     "@ophidian/core": "git://github.com/ophidian-lib/core.git",
     "monkey-around": "^2.3.0",
-    "obsidian": "0.15.4"
+    "obsidian": "1.2.8"
   }
 }

pnpm-lock.yaml

@@ -275,7 +275,7 @@ export class HistoryManager extends Service {
         }));
 
         this.registerEvent(store.onLoadItem((item, state) => {
-            if (item instanceof WorkspaceLeaf && state[SERIAL_PROP]) {
+            if (item instanceof WorkspaceLeaf && state && state[SERIAL_PROP]) {
                 new History(item, state[SERIAL_PROP]).saveToNative();
             }
         }));
@@ -312,7 +312,7 @@ export class HistoryManager extends Service {
 
         this.register(around(app.workspace, {
         // Monkeypatch: keep Obsidian from pushing history in setActiveLeaf
-            setActiveLeaf(old) { return function setActiveLeaf(leaf, ...etc) {
+            setActiveLeaf(old) { return function setActiveLeaf(leaf, ...etc: any[]) {
                 const unsub = around(this, {
                     recordHistory(old) { return function (leaf: WorkspaceLeaf, _push: boolean, ...args: any[]) {
                         // Always update state in place

src/History.ts

@@ -12,7 +12,6 @@ declare global {
 declare module "obsidian" {
     interface Menu {
         dom: HTMLElement
-        setUseNativeMenu?(flag: boolean): void;  // 0.16 to force HTML menu
     }
     interface MenuItem {
         dom: HTMLElement
@@ -313,9 +312,9 @@ export class Navigator extends Component {
         menu.showAtPosition({x: evt.clientX, y: evt.clientY + 20});
         menu.register(around(app.workspace, {setActiveLeaf(old) {
             // Don't allow a hover editor to auto-focus, so you can mod-click without targeting it
-            return function(leaf, pushHistory, focus) {
+            return function(leaf, ...args: any[]) {
                 if (leaf.containerEl.matchParent(".hover-editor")) return;
-                return old.call(this, leaf, pushHistory, focus);
+                return old.call(this, leaf, ...args);
             }
         }}));
         this.owner.historyIsOpen = true;
@@ -378,9 +377,9 @@ export class Navigator extends Component {
 }
 
 export function formatState(entry: HistoryEntry): FileInfo {
-    const {viewState: {type, state}, eState, path} = entry;
+    const {viewState: {type, state}, eState, path, raw} = entry;
     const file = path && app.vault.getAbstractFileByPath(path) as TFile;
-    const info = {icon: "", title: "", file, type, state, eState};
+    const info = {icon: raw?.icon ?? "", title: raw?.title ?? "" , file, type, state, eState};
 
     if (nonFileViews[type]) {
         [info.icon, info.title] = nonFileViews[type];

src/Navigator.ts

@@ -1,12 +1,12 @@
 import { around } from "monkey-around";
 import { Notice, Plugin, setIcon, Workspace, WorkspaceLeaf } from "obsidian";
-import { defer, isLeafAttached, LayoutSetting, Service } from "@ophidian/core";
+import { defer, isLeafAttached, LayoutSetting, Service, o } from "@ophidian/core";
 import { addCommands, command } from "./commands";
 import { setTooltip } from "./Navigator";
 
 export class FocusLock extends Service {
 
-    setting = new LayoutSetting<boolean, Workspace>(this, "pane-relief:focus-lock").of(app.workspace);
+    setting = new LayoutSetting<boolean, o.Workspace>(this, "pane-relief:focus-lock").of(app.workspace);
 
     plugin = this.use(Plugin);
     statusEl = this.plugin.addStatusBarItem();
@@ -31,11 +31,11 @@ export class FocusLock extends Service {
         const self = this;
         // wrap setActiveLeaf and canNavigate to prevent select/activate
         this.register(around(app.workspace, {
-            setActiveLeaf(old) { return function(this: Workspace, leaf, pushHistory, focus) {
-                if (!self.isLocked || isMain(leaf)) return old.call(this, leaf, pushHistory, focus);
+            setActiveLeaf(old) { return function(this: Workspace, leaf, ...etc: any[]) {
+                if (!self.isLocked || isMain(leaf)) return old.call(this, leaf, ...etc);
                 // Handle the case where there was no prior active leaf
                 if (!this.activeLeaf || !isLeafAttached(this.activeLeaf))
-                    return old.call(this, this.getLeaf(), pushHistory, focus);
+                    return old.call(this, this.getLeaf(), ...etc);
             }},
             revealLeaf(old) {
                 return function(leaf: WorkspaceLeaf) {
@@ -98,7 +98,7 @@ export class FocusLock extends Service {
         }
         this.isLocked = shouldLock;
 
-        setIcon(this.iconEl, shouldLock ? "lucide-lock" : "lucide-unlock", 13);
+        setIcon(this.iconEl, shouldLock ? "lucide-lock" : "lucide-unlock");
         setTooltip(this.iconEl, shouldLock ?
             "Sidebar focus disabled: click to enable" :
             "Sidebar focus enabled: click to disable"
@@ -120,7 +120,4 @@ declare module "obsidian" {
     interface WorkspaceLeaf {
         canNavigate(): boolean
     }
-    interface Notice {
-        noticeEl: HTMLDivElement
-    }
-}
+}