@peers-app/peers-ui 0.25.2 → 0.25.4

package/dist/tabs-layout/tabs-state.js

@@ -1,12 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.switchToPreviousTab = exports.switchToNextTab = exports.closeCurrentTab = exports.openNewTab = exports.setSingleTabMode = exports.updateActiveTabTitle = exports.handleMainPathChanged = exports.initializedTabs = exports.recentlyUsedApps = exports.activeTabId = exports.activeTabs = exports.launcherApp = void 0;
+exports.navigateTo = navigateTo;
 exports.goToTabPath = goToTabPath;
+exports.restoreNavigationState = restoreNavigationState;
+exports.migrateRecentPath = migrateRecentPath;
 exports.determineAppFromPath = determineAppFromPath;
 const peers_sdk_1 = require("@peers-app/peers-sdk");
 const globals_1 = require("../globals");
+const identity_routes_1 = require("../screens/identity/identity-routes");
 const system_apps_1 = require("../system-apps");
 const routes_loader_1 = require("../ui-router/routes-loader");
+/** The app launcher tab. It is always present and cannot be closed. */
 exports.launcherApp = {
     tabId: "launcher",
     packageId: "launcher",
@@ -24,109 +29,163 @@ const _persistentActiveTabId = (0, peers_sdk_1.groupDeviceVar)("activeTabId", {
 const _persistentRecentlyUsedApps = (0, peers_sdk_1.groupUserVar)("recentlyUsedApps", {
     defaultValue: [],
 });
+let finishNavigationRestore = () => { };
+const navigationReady = new Promise((resolve) => {
+    finishNavigationRestore = resolve;
+});
 // In-memory observables for UI state (loaded once, then write-through to persistent vars)
+/** Open tabs. Writes through to device storage after the initial restore. */
 exports.activeTabs = (() => {
     const obs = (0, peers_sdk_1.observable)([exports.launcherApp]);
     // Write-through to persistent var on change
     obs.subscribe((value) => {
         _persistentActiveTabs(value);
     });
-    // Load initial value once
-    const loadingPromise = _persistentActiveTabs.loadingPromise.then(() => {
-        obs(_persistentActiveTabs());
-    });
-    return Object.assign(obs, { loadingPromise });
+    return Object.assign(obs, { loadingPromise: navigationReady });
 })();
+/** Id of the tab whose path is showing. */
 exports.activeTabId = (() => {
     const obs = (0, peers_sdk_1.observable)("launcher");
     // Write-through to persistent var on change
     obs.subscribe((value) => {
         _persistentActiveTabId(value);
     });
-    // Load initial value once
-    const loadingPromise = _persistentActiveTabId.loadingPromise.then(() => {
-        obs(_persistentActiveTabId());
-    });
-    return Object.assign(obs, { loadingPromise });
+    return Object.assign(obs, { loadingPromise: navigationReady });
 })();
+/** App roots recently opened from the launcher, newest first. */
 exports.recentlyUsedApps = (() => {
     const obs = (0, peers_sdk_1.observable)([]);
     // Write-through to persistent var on change
     obs.subscribe((value) => {
         _persistentRecentlyUsedApps(value);
     });
-    // Load initial value once
-    const loadingPromise = _persistentRecentlyUsedApps.loadingPromise.then(() => {
-        obs(_persistentRecentlyUsedApps());
-    });
-    return Object.assign(obs, { loadingPromise });
+    return Object.assign(obs, { loadingPromise: navigationReady });
 })();
-exports.initializedTabs = new Set();
-function goToTabPath(path) {
-    const tab = (0, exports.activeTabs)().find((t) => t.path === path);
-    if (tab) {
-        (0, exports.activeTabId)(tab.tabId);
+void Promise.all([
+    _persistentActiveTabs.loadingPromise,
+    _persistentActiveTabId.loadingPromise,
+    _persistentRecentlyUsedApps.loadingPromise,
+]).then(() => {
+    const restored = restoreNavigationState(_persistentActiveTabs(), _persistentActiveTabId());
+    (0, exports.activeTabs)(restored.tabs);
+    if ((0, exports.activeTabId)() !== restored.activeId) {
+        (0, exports.activeTabId)(restored.activeId);
     }
-    else {
-        const appInfo = determineAppFromPath(path);
-        if (appInfo) {
-            (0, exports.openNewTab)({
-                path: path,
-                title: appInfo.navItem.displayName || appInfo.navItem.name,
-                packageId: appInfo.package.packageId,
-                iconClassName: appInfo.navItem.iconClassName,
-            });
+    (0, exports.recentlyUsedApps)(migrateRecentPaths(_persistentRecentlyUsedApps()));
+    finishNavigationRestore();
+});
+/** Tab ids whose bodies have been mounted at least once. */
+exports.initializedTabs = new Set();
+/**
+ * Open a path in the tab that owns its app.
+ *
+ * Legacy identity aliases are rewritten first. A route owned by the current
+ * app replaces that tab's path. A route owned by another open app activates
+ * that app's tab. Otherwise a new tab is opened.
+ *
+ * @param rawPath - Requested route, with or without a query string.
+ * @param options - App-root behavior. Launcher opens preserve the current section.
+ */
+function navigateTo(rawPath, options) {
+    const requestedPathname = (0, identity_routes_1.parseRoute)(rawPath).pathname;
+    if (!requestedPathname) {
+        const launcher = (0, exports.activeTabs)().find((tab) => tab.tabId === "launcher") ?? (0, exports.activeTabs)()[0];
+        if (launcher && (0, exports.activeTabId)() !== launcher.tabId) {
+            (0, exports.activeTabId)(launcher.tabId);
         }
-        else {
-            // No app matched — navigate by updating the active tab's path (e.g. deep link).
-            // Must replace the tab object (immutable): TabContentRenderer is memoized on tab.path,
-            // and mutating in place makes prev/next props compare equal so Router never re-renders.
-            const currentTabId = (0, exports.activeTabId)();
-            const currentTabs = (0, exports.activeTabs)();
-            const idx = currentTabs.findIndex((t) => t.tabId === currentTabId);
-            if (idx >= 0 && currentTabs[idx].path !== "") {
-                const prev = currentTabs[idx];
-                const newTabs = [...currentTabs];
-                newTabs[idx] = { ...prev, path };
-                (0, exports.activeTabs)(newTabs);
-                if (prev.packageId !== "launcher") {
-                    (0, globals_1._mainContentPath)(path);
-                }
-            }
-            else {
-                (0, exports.openNewTab)({
-                    path: path,
-                    title: "New Tab",
-                    packageId: "system-apps",
-                    iconClassName: "bi-question-circle",
-                });
+        return;
+    }
+    const next = (0, identity_routes_1.canonicalizeRoute)(rawPath);
+    const app = determineAppFromPath(next);
+    if (options?.preserveSectionOnAppRoot && app && isAppRootRequest(requestedPathname, app)) {
+        const existing = findTabForApp(app);
+        if (existing) {
+            if ((0, exports.activeTabId)() !== existing.tabId) {
+                (0, exports.activeTabId)(existing.tabId);
             }
+            rememberRecentApp(existing.path);
+            return;
         }
     }
-}
-const handleMainPathChanged = (oldPath, newPath, setNewMainPath) => {
-    const oldPathPart = oldPath.toLowerCase().trim().split("?")[0];
-    const newPathPart = newPath.toLowerCase().trim().split("?")[0];
-    const currentTab = (0, exports.activeTabs)().find((t) => t.tabId === (0, exports.activeTabId)());
-    if (oldPathPart === newPathPart || (currentTab && currentTab.path === newPath)) {
-        // nothing to do
-        setNewMainPath(newPath);
+    if (!app || app.package.packageId === "launcher") {
+        openUnresolved(next);
         return;
     }
-    const appInfo = determineAppFromPath(newPath);
-    if (appInfo && oldPath !== "") {
-        (0, exports.openNewTab)({
-            path: newPath,
-            title: appInfo.navItem.displayName || appInfo.navItem.name,
-            packageId: appInfo.package.packageId,
-            iconClassName: appInfo.navItem.iconClassName,
-        });
+    const current = (0, exports.activeTabs)().find((tab) => tab.tabId === (0, exports.activeTabId)());
+    const currentApp = current ? determineAppFromPath(current.path) : undefined;
+    if (current && current.packageId !== "launcher" && currentApp && sameApp(currentApp, app)) {
+        showTab(current.tabId, next);
+        return;
     }
-    else {
-        setNewMainPath(newPath);
+    const existing = findTabForApp(app);
+    if (existing) {
+        showTab(existing.tabId, next);
+        return;
     }
+    (0, exports.openNewTab)({
+        path: next,
+        title: app.navItem.displayName || app.navItem.name,
+        packageId: app.package.packageId,
+        iconClassName: app.navItem.iconClassName,
+    });
+}
+/**
+ * Open an app or path from the launcher.
+ *
+ * Choosing an app that is already open keeps the section the user was on.
+ *
+ * @param path - App root or deep link.
+ */
+function goToTabPath(path) {
+    navigateTo(path, { preserveSectionOnAppRoot: true });
+}
+/**
+ * Apply a {@link mainContentPath} write to the open tabs.
+ *
+ * @param _oldPath - Previous route. Retained for existing call sites.
+ * @param newPath - Requested route.
+ * @param _setNewMainPath - Direct path setter. Navigation updates the path itself.
+ */
+const handleMainPathChanged = (_oldPath, newPath, _setNewMainPath) => {
+    navigateTo(newPath);
 };
 exports.handleMainPathChanged = handleMainPathChanged;
+/**
+ * Rewrite stored tabs onto canonical routes.
+ *
+ * Contacts, Groups, and Devices tabs from before the Identity app become one
+ * Identity tab. The active tab is kept when it is one of those duplicates.
+ *
+ * @param tabs - Persisted tabs.
+ * @param activeId - Persisted active tab id.
+ */
+function restoreNavigationState(tabs, activeId) {
+    const migrated = (tabs.length > 0 ? tabs : [exports.launcherApp]).map(migrateStoredTab);
+    const merged = mergeIdentityTabs(migrated, activeId);
+    const activeExists = merged.tabs.some((tab) => tab.tabId === merged.activeId);
+    return {
+        tabs: merged.tabs,
+        activeId: activeExists ? merged.activeId : merged.tabs[0].tabId,
+    };
+}
+/**
+ * Map a stored recent-app path onto the current app root.
+ *
+ * @param path - Persisted recent path, possibly a legacy alias.
+ */
+function migrateRecentPath(path) {
+    const canonical = (0, identity_routes_1.canonicalizeRoute)(path);
+    if ((0, identity_routes_1.isIdentityPath)(canonical)) {
+        return identity_routes_1.IDENTITY_APP_PATH;
+    }
+    return canonical;
+}
+/**
+ * Resolve the app that owns a route.
+ *
+ * @param path - Route, with or without a query string.
+ * @returns The matching app, the launcher for an empty path, or `undefined`.
+ */
 function determineAppFromPath(path) {
     const launcherInfo = {
         navItem: {
@@ -192,7 +251,123 @@ function determineAppFromPath(path) {
     console.warn(`No app found for path: ${path}`);
     return undefined;
 }
-// Utility function for detail screens to update the active tab's title
+function appKey(app) {
+    const nav = app.navItem.navigationPath || app.navItem.name.toLowerCase();
+    return `${app.package.packageId}:${nav}`;
+}
+function sameApp(left, right) {
+    return appKey(left) === appKey(right);
+}
+function isAppRootRequest(pathname, app) {
+    const nav = (app.navItem.navigationPath || app.navItem.name).toLowerCase();
+    return pathname.toLowerCase() === nav;
+}
+function findTabForApp(app) {
+    const key = appKey(app);
+    return (0, exports.activeTabs)().find((tab) => {
+        const info = determineAppFromPath(tab.path);
+        return info ? appKey(info) === key : false;
+    });
+}
+/**
+ * Replace a tab's path immutably so the memoized tab body re-renders.
+ * Activating a different tab lets the tab subscription publish the path.
+ */
+function showTab(tabId, path) {
+    const tabs = (0, exports.activeTabs)();
+    const index = tabs.findIndex((tab) => tab.tabId === tabId);
+    if (index < 0) {
+        return;
+    }
+    const current = tabs[index];
+    if (current.path !== path) {
+        const nextTabs = [...tabs];
+        nextTabs[index] = { ...current, path };
+        (0, exports.activeTabs)(nextTabs);
+    }
+    if ((0, exports.activeTabId)() !== tabId) {
+        (0, exports.activeTabId)(tabId);
+    }
+    else if ((0, globals_1._mainContentPath)() !== path) {
+        (0, globals_1._mainContentPath)(path);
+    }
+    rememberRecentApp(path);
+}
+function openUnresolved(path) {
+    const current = (0, exports.activeTabs)().find((tab) => tab.tabId === (0, exports.activeTabId)());
+    if (current && current.packageId === "system-apps") {
+        showTab(current.tabId, path);
+        return;
+    }
+    (0, exports.openNewTab)({
+        path,
+        title: "New Tab",
+        packageId: "system-apps",
+        iconClassName: "bi-question-circle",
+    });
+}
+function rememberRecentApp(path) {
+    const app = determineAppFromPath((0, identity_routes_1.canonicalizeRoute)(path));
+    if (!app || app.package.packageId === "launcher") {
+        return;
+    }
+    const recentPath = app.package.packageId === system_apps_1.systemPackage.packageId ? app.navItem.navigationPath || path : path;
+    if (!recentPath) {
+        return;
+    }
+    const recent = (0, exports.recentlyUsedApps)();
+    const filtered = recent.filter((entry) => entry !== recentPath);
+    const next = [recentPath, ...filtered].slice(0, 8);
+    if (next.length === recent.length && next.every((entry, index) => entry === recent[index])) {
+        return;
+    }
+    (0, exports.recentlyUsedApps)(next);
+}
+function migrateStoredTab(tab) {
+    const path = (0, identity_routes_1.canonicalizeRoute)(tab.path);
+    if (path === tab.path) {
+        return tab;
+    }
+    const app = determineAppFromPath(path);
+    const identity = app?.navItem.navigationPath === identity_routes_1.IDENTITY_APP_PATH;
+    return {
+        ...tab,
+        path,
+        packageId: app?.package.packageId ?? tab.packageId,
+        title: identity ? app?.navItem.displayName || app?.navItem.name || tab.title : tab.title,
+        iconClassName: identity ? app?.navItem.iconClassName || tab.iconClassName : tab.iconClassName,
+    };
+}
+function mergeIdentityTabs(tabs, activeId) {
+    const identityTabs = tabs.filter((tab) => (0, identity_routes_1.isIdentityPath)(tab.path));
+    if (identityTabs.length <= 1) {
+        return { tabs, activeId };
+    }
+    const keeper = identityTabs.find((tab) => tab.tabId === activeId) ?? identityTabs[0];
+    const remove = new Set(identityTabs.filter((tab) => tab.tabId !== keeper.tabId).map((tab) => tab.tabId));
+    return {
+        tabs: tabs.filter((tab) => !remove.has(tab.tabId)),
+        activeId: remove.has(activeId) ? keeper.tabId : activeId,
+    };
+}
+function migrateRecentPaths(paths) {
+    const seen = new Set();
+    const next = [];
+    for (const path of paths) {
+        const migrated = migrateRecentPath(path);
+        if (!migrated || seen.has(migrated)) {
+            continue;
+        }
+        seen.add(migrated);
+        next.push(migrated);
+    }
+    return next.slice(0, 8);
+}
+/**
+ * Set the active tab's title.
+ *
+ * @param newTitle - Title shown on the tab strip.
+ */
 const updateActiveTabTitle = (newTitle) => {
     // TODO Fix this to use a more reliable update mechanism
     //      using setTimeout to get around a race condition for setting title on new tabs
@@ -222,7 +397,12 @@ const setSingleTabMode = (enabled) => {
     singleTabModeEnabled = enabled;
 };
 exports.setSingleTabMode = setSingleTabMode;
-// Global function to open content in new tab
+/**
+ * Open a tab, or activate an existing tab with the same package and path.
+ *
+ * @param tab - Tab contents. `tabId` is assigned here.
+ * @param forceNew - When true, always append a tab instead of reusing one.
+ */
 const openNewTab = (tab, forceNew = false) => {
     const newTab = {
         ...tab,
@@ -255,15 +435,12 @@ const openNewTab = (tab, forceNew = false) => {
         (0, exports.activeTabs)([...currentTabs, newTab]);
         (0, exports.activeTabId)(newTab.tabId);
     }
-    // Update recently used (track by path instead of packageId)
     if (tab.path && tab.packageId !== "launcher") {
-        const recent = (0, exports.recentlyUsedApps)();
-        const filtered = recent.filter((path) => path !== tab.path);
-        (0, exports.recentlyUsedApps)([tab.path, ...filtered].slice(0, 8));
+        rememberRecentApp(tab.path);
     }
 };
 exports.openNewTab = openNewTab;
-// Close the current active tab (but not launcher)
+/** Close the active tab. The launcher tab stays open. */
 const closeCurrentTab = () => {
     const currentTabs = (0, exports.activeTabs)();
     const _activeTabId = (0, exports.activeTabId)();
@@ -285,7 +462,7 @@ const closeCurrentTab = () => {
     }
 };
 exports.closeCurrentTab = closeCurrentTab;
-// Navigate to next tab
+/** Activate the next open tab, wrapping around. */
 const switchToNextTab = () => {
     const currentTabs = (0, exports.activeTabs)();
     const activeTab = (0, exports.activeTabId)();
@@ -296,7 +473,7 @@ const switchToNextTab = () => {
     (0, exports.activeTabId)(currentTabs[nextIndex].tabId);
 };
 exports.switchToNextTab = switchToNextTab;
-// Navigate to previous tab
+/** Activate the previous open tab, wrapping around. */
 const switchToPreviousTab = () => {
     const currentTabs = (0, exports.activeTabs)();
     const activeTab = (0, exports.activeTabId)();

package/dist/tabs-layout/tabs-state.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/tabs-layout/tabs-state.test.js

@@ -0,0 +1,110 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+jest.mock("../globals", () => {
+    const { observable } = jest.requireActual("@peers-app/peers-sdk");
+    return { _mainContentPath: observable("") };
+});
+jest.mock("../ui-router/routes-loader", () => {
+    const { observable } = jest.requireActual("@peers-app/peers-sdk");
+    return { allPackages: observable([]) };
+});
+jest.mock("@peers-app/peers-sdk", () => {
+    const actual = jest.requireActual("@peers-app/peers-sdk");
+    let nextId = 0;
+    const deviceVars = new Map();
+    const userVars = new Map();
+    function stored(map, id, initial) {
+        const existing = map.get(id);
+        if (existing) {
+            return existing;
+        }
+        const value = actual.observable(initial);
+        Object.assign(value, { loadingPromise: Promise.resolve() });
+        map.set(id, value);
+        return value;
+    }
+    return {
+        ...actual,
+        newid: () => `tab${++nextId}`,
+        groupDeviceVar: (id, options) => stored(deviceVars, id, options?.defaultValue),
+        groupUserVar: (id, options) => stored(userVars, id, options?.defaultValue),
+    };
+});
+const globals_1 = require("../globals");
+const tabs_state_1 = require("./tabs-state");
+const PERSON_ID = "abcdefghijklmnopqrstuvwxy";
+function tab(partial) {
+    return {
+        packageId: "system-apps",
+        title: partial.path,
+        iconClassName: "bi-circle",
+        ...partial,
+    };
+}
+describe("restoreNavigationState", () => {
+    it("merges legacy identity tabs into the active Identity tab", () => {
+        const restored = (0, tabs_state_1.restoreNavigationState)([
+            tabs_state_1.launcherApp,
+            tab({ tabId: "people", path: "contacts", title: "Contacts" }),
+            tab({ tabId: "groups", path: `groups/${PERSON_ID}`, title: "Groups" }),
+            tab({ tabId: "devices", path: "devices?action=pair", title: "Devices" }),
+            tab({ tabId: "account", path: "account", title: "Account" }),
+        ], "groups");
+        expect(restored.tabs.map((entry) => entry.path)).toEqual(["", `identity/groups/${PERSON_ID}`]);
+        expect(restored.activeId).toBe("groups");
+        expect(restored.tabs[1]?.title).toBe("Identity");
+        expect((0, tabs_state_1.migrateRecentPath)("contacts")).toBe("identity");
+        expect((0, tabs_state_1.migrateRecentPath)("invites/accept")).toBe("identity");
+        expect((0, tabs_state_1.migrateRecentPath)("account")).toBe("identity");
+    });
+});
+describe("navigateTo", () => {
+    beforeEach(async () => {
+        await tabs_state_1.activeTabs.loadingPromise;
+        (0, tabs_state_1.activeTabs)([tabs_state_1.launcherApp, tab({ tabId: "threads", path: "threads", title: "Threads" })]);
+        (0, tabs_state_1.activeTabId)("threads");
+        (0, tabs_state_1.recentlyUsedApps)([]);
+        (0, globals_1._mainContentPath)("threads");
+    });
+    it("updates the same app in place and preserves the query", () => {
+        (0, tabs_state_1.navigateTo)("threads/thread-1?draft=1");
+        expect((0, tabs_state_1.activeTabs)()).toHaveLength(2);
+        expect((0, tabs_state_1.activeTabs)().find((entry) => entry.tabId === "threads")?.path).toBe("threads/thread-1?draft=1");
+        expect((0, tabs_state_1.activeTabId)()).toBe("threads");
+        expect((0, globals_1._mainContentPath)()).toBe("threads/thread-1?draft=1");
+    });
+    it("opens another app without duplicating an existing tab", () => {
+        (0, tabs_state_1.navigateTo)(`contacts/${PERSON_ID}`);
+        const identityId = (0, tabs_state_1.activeTabId)();
+        (0, tabs_state_1.activeTabId)("threads");
+        (0, tabs_state_1.navigateTo)("identity/devices?foo=bar");
+        const identityTabs = (0, tabs_state_1.activeTabs)().filter((entry) => entry.path.startsWith("identity"));
+        expect(identityTabs).toHaveLength(1);
+        expect(identityTabs[0]?.path).toBe("identity/devices?foo=bar");
+        expect((0, tabs_state_1.activeTabId)()).toBe(identityId);
+        expect((0, tabs_state_1.activeTabs)().some((entry) => entry.tabId === "threads")).toBe(true);
+    });
+    it("opens the account alias inside the Identity tab", () => {
+        (0, tabs_state_1.navigateTo)("account");
+        const identityId = (0, tabs_state_1.activeTabId)();
+        expect((0, globals_1._mainContentPath)()).toBe("identity/account");
+        (0, tabs_state_1.navigateTo)("identity/people");
+        expect((0, tabs_state_1.activeTabId)()).toBe(identityId);
+        expect((0, tabs_state_1.activeTabs)().filter((entry) => entry.path.startsWith("identity"))).toHaveLength(1);
+        expect((0, globals_1._mainContentPath)()).toBe("identity/people");
+    });
+    it("rewrites invite acceptance onto the open Identity tab", () => {
+        (0, tabs_state_1.navigateTo)("identity/people");
+        const identityId = (0, tabs_state_1.activeTabId)();
+        (0, tabs_state_1.navigateTo)("invites/accept");
+        expect((0, tabs_state_1.activeTabId)()).toBe(identityId);
+        expect((0, tabs_state_1.activeTabs)().filter((entry) => entry.path.startsWith("identity"))).toHaveLength(1);
+        expect((0, globals_1._mainContentPath)()).toBe("identity/activity/accept");
+    });
+    it("keeps the current section when the app root is opened again", () => {
+        (0, tabs_state_1.navigateTo)("identity/devices/pair");
+        (0, tabs_state_1.goToTabPath)("identity");
+        expect((0, globals_1._mainContentPath)()).toBe("identity/devices/pair");
+        expect((0, tabs_state_1.recentlyUsedApps)()).toEqual(["identity"]);
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@peers-app/peers-ui",
-  "version": "0.25.2",
+  "version": "0.25.4",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/peers-app/peers-ui.git"
@@ -28,7 +28,7 @@
     "lint:fix": "biome check --write ."
   },
   "peerDependencies": {
-    "@peers-app/peers-sdk": "^0.25.2",
+    "@peers-app/peers-sdk": "^0.25.4",
     "bootstrap": "^5.3.3",
     "react": "^18.0.0",
     "react-dom": "^18.0.0"
@@ -39,7 +39,7 @@
     "@babel/preset-react": "^7.24.1",
     "@babel/preset-typescript": "^7.27.1",
     "@biomejs/biome": "2.3.11",
-    "@peers-app/peers-sdk": "0.25.2",
+    "@peers-app/peers-sdk": "0.25.4",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/jest-dom": "^6.6.3",
     "@testing-library/react": "^16.3.0",

package/src/components/markdown-editor/mention-node.ts

@@ -14,6 +14,7 @@ import {
 import { mainContentPath } from "../../globals";
 import { mentionConfigs } from "../../mention-configs";
 
+/** Serialized Lexical payload for a Peers mention node. */
 export type SerializedMentionNode = Spread<
   {
     data: IMentionData;
@@ -43,6 +44,7 @@ function $convertMentionElement(domNode: HTMLElement): DOMConversionOutput | nul
   return null;
 }
 
+/** Lexical text entity that renders and navigates a typed Peers mention. */
 export class MentionNode extends TextNode {
   static getType(): string {
     return "mention";
@@ -109,7 +111,7 @@ export class MentionNode extends TextNode {
         onClick(this.data);
       } else {
         const id = this.data.id;
-        const href = `#${kind}s/${id}`;
+        const href = kind === "user" ? `identity/people/${id}` : `${kind}s/${id}`;
         mainContentPath(href);
       }
     });
@@ -189,12 +191,14 @@ export class MentionNode extends TextNode {
   }
 }
 
+/** Create a segmented Lexical mention node from mention data. */
 export function $createMentionNode(data: IMentionData): MentionNode {
   const mentionNode = new MentionNode(data);
   mentionNode.setMode("segmented").toggleDirectionless();
   return $applyNodeReplacement(mentionNode);
 }
 
+/** Return whether a Lexical node is a {@link MentionNode}. */
 export function $isMentionNode(node: LexicalNode | null | undefined): node is MentionNode {
   return node instanceof MentionNode;
 }