bruce-cesium 7.0.9 → 7.1.1

package/dist/lib/widgets/tabs-left-panel/widget-left-panel-tab-bookmarks.js

@@ -3,15 +3,31 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.WidgetLeftPanelTabBookmarks = void 0;
 const bruce_models_1 = require("bruce-models");
 const widget_left_panel_tab_1 = require("./widget-left-panel-tab");
+// Icons are inline so the library stays dependency free.
+const ICON_FOLDER = `<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M3 6C3 5.44772 3.44772 5 4 5H9L11 7.5H20C20.5523 7.5 21 7.94772 21 8.5V18C21 18.5523 20.5523 19 20 19H4C3.44772 19 3 18.5523 3 18V6Z" stroke="currentColor" stroke-width="1.5" stroke-linejoin="round"/></svg>`;
+const ICON_FOLDER_OPEN = `<svg viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M3 6C3 5.44772 3.44772 5 4 5H9L11 7.5H20C20.5523 7.5 21 7.94772 21 8.5V10H3V6Z" stroke="currentColor" stroke-width="1.5" stroke-linejoin="round"/><path d="M3 10H21.5L19.5 18.5C19.4 18.8 19.1 19 18.8 19H4C3.44772 19 3 18.5523 3 18V10Z" stroke="currentColor" stroke-width="1.5" stroke-linejoin="round"/></svg>`;
+const OPEN_STATE_STORAGE_PREFIX = "NextspaceBookmarkGroupOpen_";
+const COMPACT_MODE_STORAGE_KEY = "NextspaceBookmarksCompactMode";
+// Group id used for the synthetic list of bookmarks that belong to no group.
+const UNGROUPED_ID = null;
 class WidgetLeftPanelTabBookmarks extends widget_left_panel_tab_1.WidgetLeftPanelTab.ATab {
     constructor(params) {
+        var _a, _b;
         super(params);
         this.STYLESHEET_ID = "nextspace-left-panel-tab-bookmarks-stylesheet";
+        this._compact = false;
+        this._compact = this._getStoredCompact();
         this._generateStyles();
         this._generateElement();
         this._widget.Loading.then(() => {
             this._updateBookmarks();
         });
+        // The panel can be opened before a view has rendered, so the list has to rebuild when one arrives.
+        this._viewIdChangeRemoval = (_b = (_a = this._widget) === null || _a === void 0 ? void 0 : _a.OnViewIdChange) === null || _b === void 0 ? void 0 : _b.Subscribe(() => {
+            this._widget.Loading.then(() => {
+                this._updateBookmarks();
+            });
+        });
         // In case another widget messed with the panel width.
         // Probably should just add a SetWidth method to avoid having plugins mess with the container CSS.
         if (this.Container) {
@@ -19,6 +35,8 @@ class WidgetLeftPanelTabBookmarks extends widget_left_panel_tab_1.WidgetLeftPane
         }
     }
     Dispose() {
+        var _a;
+        (_a = this._viewIdChangeRemoval) === null || _a === void 0 ? void 0 : _a.call(this);
         super.Dispose();
     }
     _generateStyles() {
@@ -28,11 +46,16 @@ class WidgetLeftPanelTabBookmarks extends widget_left_panel_tab_1.WidgetLeftPane
         const style = document.createElement("style");
         style.id = this.STYLESHEET_ID;
         style.innerHTML = `
+            .NextspaceLeftPanelTabBookmarks * {
+                box-sizing: border-box;
+            }
+
             .NextspaceLeftPanelTabBookmarks {
                 display: flex;
                 flex-direction: column;
                 flex-grow: 1;
                 flex-shrink: 1;
+                font-family: Arial, sans-serif;
                 overflow: hidden;
                 width: 100%;
             }
@@ -58,6 +81,59 @@ class WidgetLeftPanelTabBookmarks extends widget_left_panel_tab_1.WidgetLeftPane
                 margin-bottom: 15px;
             }
 
+            .NextspaceLeftPanelTabBookmarksCompactBar {
+                align-items: center;
+                color: #fff;
+                display: flex;
+                flex-shrink: 0;
+                font-size: 12px;
+                justify-content: flex-end;
+                margin-bottom: 10px;
+                user-select: none;
+            }
+
+            .NextspaceLeftPanelTabBookmarksCompactToggle {
+                align-items: center;
+                cursor: pointer;
+                display: flex;
+                opacity: .7;
+                transition: opacity .3s ease;
+            }
+
+            .NextspaceLeftPanelTabBookmarksCompactToggle:hover {
+                opacity: 1;
+            }
+
+            .NextspaceLeftPanelTabBookmarksCompactToggle >.NextspaceLeftPanelTabBookmarksCompactToggleTrack {
+                background: rgba(255, 255, 255, .2);
+                border-radius: 8px;
+                height: 16px;
+                margin-right: 8px;
+                position: relative;
+                transition: background .3s ease;
+                width: 30px;
+            }
+
+            .NextspaceLeftPanelTabBookmarksCompactToggle >.NextspaceLeftPanelTabBookmarksCompactToggleTrack:after {
+                background: #fff;
+                border-radius: 50%;
+                content: "";
+                height: 12px;
+                left: 2px;
+                position: absolute;
+                top: 2px;
+                transition: left .3s ease;
+                width: 12px;
+            }
+
+            .NextspaceLeftPanelTabBookmarksCompactToggle[is-on="true"] >.NextspaceLeftPanelTabBookmarksCompactToggleTrack {
+                background: #33b1ff;
+            }
+
+            .NextspaceLeftPanelTabBookmarksCompactToggle[is-on="true"] >.NextspaceLeftPanelTabBookmarksCompactToggleTrack:after {
+                left: 16px;
+            }
+
             .NextspaceLeftPanelTabBookmarksList {
                 display: flex;
                 flex-direction: column;
@@ -66,30 +142,110 @@ class WidgetLeftPanelTabBookmarks extends widget_left_panel_tab_1.WidgetLeftPane
                 overflow: auto;
             }
 
-            .NextspaceLeftPanelTabBookmarksListItem {
-                margin-bottom: 15px;
+            .NextspaceLeftPanelTabBookmarksGroupHeader {
+                align-items: flex-end;
+                border-left: 2px solid rgba(255, 255, 255, .2);
+                color: #fff;
+                cursor: pointer;
+                display: flex;
+                font-size: 12px;
+                font-weight: 300;
+                letter-spacing: .01em;
+                padding-left: 8px;
+                transition: border-left-color .3s ease;
+                user-select: none;
+            }
+
+            .NextspaceLeftPanelTabBookmarksGroupHeader:hover {
+                border-left-color: rgba(255, 255, 255, .5);
+            }
+
+            .NextspaceLeftPanelTabBookmarksGroupHeader[is-opened="false"] {
+                margin-bottom: 10px;
+            }
+
+            .NextspaceLeftPanelTabBookmarksGroupHeader[is-opened="true"] {
+                padding-bottom: 5px;
+            }
+
+            .NextspaceLeftPanelTabBookmarksGroupHeader >.NextspaceLeftPanelTabBookmarksGroupHeaderIcon {
                 align-items: center;
                 display: flex;
+                flex-shrink: 0;
+                height: 20px;
+                justify-content: center;
+                margin-right: 8px;
+                width: 20px;
+            }
+
+            .NextspaceLeftPanelTabBookmarksGroupHeader >.NextspaceLeftPanelTabBookmarksGroupHeaderIcon >svg {
+                height: 20px;
+                width: 20px;
+            }
+
+            .NextspaceLeftPanelTabBookmarksGroupHeader >.NextspaceLeftPanelTabBookmarksGroupHeaderName {
+                margin-right: 8px;
+                opacity: .7;
+                overflow: hidden;
+                padding-bottom: 8px;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+            }
+
+            .NextspaceLeftPanelTabBookmarksGroupHeader >.NextspaceLeftPanelTabBookmarksGroupHeaderCount {
+                margin-right: 3px;
+                opacity: .7;
+                padding-bottom: 8px;
+            }
+
+            .NextspaceLeftPanelTabBookmarksGroupBody {
+                display: flex;
+                flex-direction: column;
+            }
+
+            .NextspaceLeftPanelTabBookmarksGroupBody[is-grouped="true"] {
+                border-left: 2px solid rgba(255, 255, 255, .2);
+                margin-bottom: 12px;
+                padding-left: 8px;
+            }
+
+            .NextspaceLeftPanelTabBookmarksListItem {
+                background: rgba(255, 255, 255, .05);
+                border: 1px solid rgba(255, 255, 255, .1);
+                border-radius: 8px;
+                cursor: pointer;
+                display: flex;
                 flex-direction: column;
+                margin-bottom: 6px;
+                overflow: hidden;
+                padding: 12px;
+                transition: background .3s ease, border-color .3s ease, transform .3s ease;
                 width: 100%;
             }
 
-            .NextspaceLeftPanelTabBookmarksListItem[is-selected="true"] >.NextspaceLeftPanelTabBookmarksListItemImageBox {
-                border: 3px solid #0072c3;
+            .NextspaceLeftPanelTabBookmarksListItem:hover {
+                background: rgba(255, 255, 255, .08);
+                border-color: rgba(255, 255, 255, .2);
+                transform: translateY(-2px);
+            }
+
+            .NextspaceLeftPanelTabBookmarksListItem[is-selected="true"] {
+                background: rgba(51, 177, 255, .1);
+                border-color: #33b1ff;
             }
 
             .NextspaceLeftPanelTabBookmarksListItemImageBox {
-                border: 3px solid #0000;
-                border-radius: 5px;
+                background-color: rgba(255, 255, 255, .05);
+                border-radius: 6px;
                 display: flex;
-                height: 132px;
+                flex-shrink: 0;
+                height: 120px;
                 margin-bottom: 8px;
                 overflow: hidden;
                 width: 100%;
             }
 
             .NextspaceLeftPanelTabBookmarksListItemImageBoxImage {
-                cursor: pointer;
                 display: flex;
                 flex-direction: column;
                 flex-grow: 1;
@@ -105,25 +261,59 @@ class WidgetLeftPanelTabBookmarks extends widget_left_panel_tab_1.WidgetLeftPane
                 width: 100%;
             }
 
-            .NextspaceLeftPanelTabBookmarksListItemTitle {
-                color: #fff;
-                display: flex;
-                padding-right: 15px;
-                text-align: center;
-                width: 100%;
-            }
-
             .NextspaceLeftPanelTabBookmarksListItemTitleText {
+                color: #f2f4f8;
                 display: block;
-                margin-left: 35px;
-                margin-right: 20px;
+                font-family: Arial;
+                font-size: 13px;
+                font-weight: 600;
                 overflow: hidden;
-                text-align: center;
                 text-overflow: ellipsis;
                 white-space: nowrap;
                 width: 100%;
-                font-family: Arial;
+            }
+
+            .NextspaceLeftPanelTabBookmarksListItemDescription {
+                color: rgba(255, 255, 255, .7);
+                font-size: 12px;
+                margin-top: 4px;
+                overflow: hidden;
+                width: 100%;
+            }
+
+            .NextspaceLeftPanelTabBookmarks[is-compact="true"] .NextspaceLeftPanelTabBookmarksListItem {
+                align-items: center;
+                flex-direction: row;
+                margin-bottom: 4px;
+                min-height: 54px;
+                padding: 0;
+                transform: none;
+            }
+
+            .NextspaceLeftPanelTabBookmarks[is-compact="true"] .NextspaceLeftPanelTabBookmarksListItemImageBox {
+                border-radius: 8px 0 0 8px;
+                border-right: 1px solid #6a6a6a;
+                height: 60px;
+                margin-bottom: 0;
+                margin-right: 10px;
+                width: 70px;
+            }
+
+            .NextspaceLeftPanelTabBookmarks[is-compact="true"] .NextspaceLeftPanelTabBookmarksListItemTitleText {
+                font-size: 12px;
+                font-weight: 400;
+                padding-right: 10px;
+                text-align: right;
+            }
+
+            .NextspaceLeftPanelTabBookmarks[is-compact="true"] .NextspaceLeftPanelTabBookmarksListItemDescription {
+                display: none;
+            }
+
+            .NextspaceLeftPanelTabBookmarksEmpty {
+                color: #fff;
                 font-size: 13px;
+                opacity: .7;
             }
         `;
         document.head.appendChild(style);
@@ -131,6 +321,7 @@ class WidgetLeftPanelTabBookmarks extends widget_left_panel_tab_1.WidgetLeftPane
     _generateElement() {
         const element = document.createElement("div");
         element.className = "NextspaceLeftPanelTabBookmarks";
+        element.setAttribute("is-compact", String(this._compact));
         const title = document.createElement("div");
         title.className = "NextspaceLeftPanelTabBookmarksTitleBar";
         title.textContent = "Bookmarks";
@@ -138,52 +329,224 @@ class WidgetLeftPanelTabBookmarks extends widget_left_panel_tab_1.WidgetLeftPane
         const breaker = document.createElement("div");
         breaker.className = "NextspaceLeftPanelTabBookmarksTitleBreaker";
         element.appendChild(breaker);
+        const compactBar = document.createElement("div");
+        compactBar.className = "NextspaceLeftPanelTabBookmarksCompactBar";
+        const compactToggle = document.createElement("div");
+        compactToggle.className = "NextspaceLeftPanelTabBookmarksCompactToggle";
+        compactToggle.title = "Compact";
+        compactToggle.setAttribute("is-on", String(this._compact));
+        const compactTrack = document.createElement("div");
+        compactTrack.className = "NextspaceLeftPanelTabBookmarksCompactToggleTrack";
+        compactToggle.appendChild(compactTrack);
+        const compactLabel = document.createElement("div");
+        compactLabel.textContent = "Compact";
+        compactToggle.appendChild(compactLabel);
+        compactToggle.onclick = () => {
+            this._setCompact(!this._compact);
+        };
+        compactBar.appendChild(compactToggle);
+        element.appendChild(compactBar);
+        const empty = document.createElement("div");
+        empty.className = "NextspaceLeftPanelTabBookmarksEmpty";
+        empty.textContent = "No bookmarks in this project view.";
+        empty.style.display = "none";
+        element.appendChild(empty);
         const list = document.createElement("div");
         list.className = "NextspaceLeftPanelTabBookmarksList";
         element.appendChild(list);
         this.Container.appendChild(element);
         this._element = element;
     }
+    _getStoredCompact() {
+        try {
+            return window.localStorage.getItem(COMPACT_MODE_STORAGE_KEY) === "true";
+        }
+        catch (e) {
+            // Storage can be unavailable (private mode, blocked cookies). The default layout still works.
+            return false;
+        }
+    }
+    _setCompact(compact) {
+        this._compact = compact;
+        this._element.setAttribute("is-compact", String(compact));
+        const toggle = this._element.querySelector(".NextspaceLeftPanelTabBookmarksCompactToggle");
+        if (toggle) {
+            toggle.setAttribute("is-on", String(compact));
+        }
+        try {
+            window.localStorage.setItem(COMPACT_MODE_STORAGE_KEY, String(compact));
+        }
+        catch (e) {
+            console.warn(e);
+        }
+    }
+    _getGroupOpen(groupId) {
+        try {
+            return window.localStorage.getItem(OPEN_STATE_STORAGE_PREFIX + groupId) === "true";
+        }
+        catch (e) {
+            return false;
+        }
+    }
+    _setGroupOpen(groupId, open) {
+        try {
+            window.localStorage.setItem(OPEN_STATE_STORAGE_PREFIX + groupId, String(open));
+        }
+        catch (e) {
+            console.warn(e);
+        }
+    }
+    /**
+     * Sorts the bookmarks into their groups, ordering both by display order then name.
+     * Bookmarks with no group, or one that no longer exists, land in a trailing ungrouped list.
+     */
+    _buildGroupLists() {
+        var _a, _b;
+        const bookmarks = (_a = this._widget.Bookmarks) !== null && _a !== void 0 ? _a : [];
+        const groups = ((_b = this._widget.BookmarkGroups) !== null && _b !== void 0 ? _b : []).slice().sort((a, b) => {
+            var _a, _b, _c, _d;
+            const orderDiff = ((_a = a.DisplayOrder) !== null && _a !== void 0 ? _a : 0) - ((_b = b.DisplayOrder) !== null && _b !== void 0 ? _b : 0);
+            if (orderDiff !== 0) {
+                return orderDiff;
+            }
+            return ((_c = a.Name) !== null && _c !== void 0 ? _c : "").toLowerCase().localeCompare(((_d = b.Name) !== null && _d !== void 0 ? _d : "").toLowerCase());
+        });
+        const lists = groups.map(group => ({
+            groupId: group.ID,
+            group,
+            bookmarks: []
+        }));
+        const listsById = new Map(lists.map(list => [list.groupId, list]));
+        const ungrouped = {
+            groupId: UNGROUPED_ID,
+            group: null,
+            bookmarks: []
+        };
+        for (const bookmark of bookmarks) {
+            const groupId = bookmark["UI.SlideGroup.ID"];
+            const list = groupId ? listsById.get(groupId) : null;
+            (list !== null && list !== void 0 ? list : ungrouped).bookmarks.push(bookmark);
+        }
+        for (const list of lists) {
+            list.bookmarks.sort(this._compareBookmarks);
+        }
+        ungrouped.bookmarks.sort(this._compareBookmarks);
+        // Ungrouped always trails the named groups.
+        lists.push(ungrouped);
+        return lists;
+    }
+    _compareBookmarks(a, b) {
+        var _a, _b, _c, _d;
+        const orderDiff = ((_a = a.DisplayOrder) !== null && _a !== void 0 ? _a : 0) - ((_b = b.DisplayOrder) !== null && _b !== void 0 ? _b : 0);
+        if (orderDiff !== 0) {
+            return orderDiff;
+        }
+        return ((_c = a.Title) !== null && _c !== void 0 ? _c : "").localeCompare((_d = b.Title) !== null && _d !== void 0 ? _d : "");
+    }
     _updateBookmarks() {
-        var _a;
-        const bookmarks = this._widget.Bookmarks;
-        this._element.style.display = bookmarks.length ? "flex" : "none";
-        const api = this._widget._getApiGetters().GetBruceApi();
+        var _a, _b;
+        const bookmarks = (_a = this._widget.Bookmarks) !== null && _a !== void 0 ? _a : [];
         const list = this._element.querySelector(".NextspaceLeftPanelTabBookmarksList");
+        const empty = this._element.querySelector(".NextspaceLeftPanelTabBookmarksEmpty");
+        const compactBar = this._element.querySelector(".NextspaceLeftPanelTabBookmarksCompactBar");
         list.innerHTML = "";
-        for (const bookmark of bookmarks) {
-            const item = document.createElement("div");
-            item.className = "NextspaceLeftPanelTabBookmarksListItem";
-            const imageBox = document.createElement("div");
-            imageBox.className = "NextspaceLeftPanelTabBookmarksListItemImageBox";
-            item.appendChild(imageBox);
-            const image = document.createElement("div");
-            image.className = "NextspaceLeftPanelTabBookmarksListItemImageBoxImage";
-            imageBox.appendChild(image);
-            const previewUrl = bookmark["Screenshot.ClientFile.ID"] ? ((_a = bookmark["Screenshot.URL"]) !== null && _a !== void 0 ? _a : bruce_models_1.ClientFile.GetUrl({
-                fileId: bookmark["Screenshot.ClientFile.ID"],
-                api,
-                viaCdn: true
-            })) : "";
-            // TODO: Some nice empty image.
+        const hasBookmarks = bookmarks.length > 0;
+        empty.style.display = hasBookmarks ? "none" : "block";
+        compactBar.style.display = hasBookmarks ? "flex" : "none";
+        if (!hasBookmarks) {
+            return;
+        }
+        const api = (_b = this._widget._getApiGetters()) === null || _b === void 0 ? void 0 : _b.GetBruceApi();
+        for (const groupList of this._buildGroupLists()) {
+            if (!groupList.bookmarks.length) {
+                continue;
+            }
+            this._renderGroup(groupList, list, api);
+        }
+        this._updateBookmark();
+    }
+    _renderGroup(groupList, parent, api) {
+        var _a;
+        const isGrouped = groupList.groupId != null;
+        // Ungrouped bookmarks have no header, so they're always visible.
+        const opened = isGrouped ? this._getGroupOpen(groupList.groupId) : true;
+        const body = document.createElement("div");
+        body.className = "NextspaceLeftPanelTabBookmarksGroupBody";
+        body.setAttribute("is-grouped", String(isGrouped));
+        if (isGrouped) {
+            const header = document.createElement("div");
+            header.className = "NextspaceLeftPanelTabBookmarksGroupHeader";
+            header.setAttribute("group-id", String(groupList.groupId));
+            header.setAttribute("is-opened", String(opened));
+            const icon = document.createElement("div");
+            icon.className = "NextspaceLeftPanelTabBookmarksGroupHeaderIcon";
+            icon.innerHTML = opened ? ICON_FOLDER_OPEN : ICON_FOLDER;
+            header.appendChild(icon);
+            const name = document.createElement("div");
+            name.className = "NextspaceLeftPanelTabBookmarksGroupHeaderName";
+            name.textContent = ((_a = groupList.group) === null || _a === void 0 ? void 0 : _a.Name) || "Unnamed Group";
+            header.appendChild(name);
+            const count = document.createElement("div");
+            count.className = "NextspaceLeftPanelTabBookmarksGroupHeaderCount";
+            count.textContent = "(" + groupList.bookmarks.length + ")";
+            header.appendChild(count);
+            header.onclick = () => {
+                this._setGroupOpen(groupList.groupId, !this._getGroupOpen(groupList.groupId));
+                this._updateBookmarks();
+            };
+            parent.appendChild(header);
+            body.style.display = opened ? "flex" : "none";
+        }
+        parent.appendChild(body);
+        if (!opened) {
+            return;
+        }
+        for (const bookmark of groupList.bookmarks) {
+            this._renderBookmark(bookmark, body, api);
+        }
+    }
+    _renderBookmark(bookmark, parent, api) {
+        var _a;
+        const item = document.createElement("div");
+        item.className = "NextspaceLeftPanelTabBookmarksListItem";
+        const imageBox = document.createElement("div");
+        imageBox.className = "NextspaceLeftPanelTabBookmarksListItemImageBox";
+        item.appendChild(imageBox);
+        const image = document.createElement("div");
+        image.className = "NextspaceLeftPanelTabBookmarksListItemImageBoxImage";
+        imageBox.appendChild(image);
+        const previewUrl = bookmark["Screenshot.ClientFile.ID"] ? ((_a = bookmark["Screenshot.URL"]) !== null && _a !== void 0 ? _a : bruce_models_1.ClientFile.GetUrl({
+            fileId: bookmark["Screenshot.ClientFile.ID"],
+            api,
+            viaCdn: true
+        })) : "";
+        // A bookmark without a screenshot keeps the empty tinted box rather than a broken image.
+        if (previewUrl) {
             const img = document.createElement("img");
             img.src = previewUrl;
+            img.loading = "lazy";
             image.appendChild(img);
-            const title = document.createElement("div");
-            title.className = "NextspaceLeftPanelTabBookmarksListItemTitle";
-            item.appendChild(title);
-            const titleText = document.createElement("div");
-            titleText.className = "NextspaceLeftPanelTabBookmarksListItemTitleText";
-            titleText.textContent = bookmark.Title ? bookmark.Title : "Untitled Bookmark";
-            title.appendChild(titleText);
-            item.setAttribute("bookmark-id", bookmark.ID);
-            item.setAttribute("is-selected", String(bookmark.ID === this._widget.LastEnabledBookmarkId));
-            item.onclick = () => {
-                this._selectBookmark(bookmark);
-            };
-            list.appendChild(item);
         }
-        this._updateBookmark();
+        const content = document.createElement("div");
+        content.className = "NextspaceLeftPanelTabBookmarksListItemContent";
+        item.appendChild(content);
+        const titleText = document.createElement("div");
+        titleText.className = "NextspaceLeftPanelTabBookmarksListItemTitleText";
+        titleText.textContent = bookmark.Title ? bookmark.Title : "Untitled Bookmark";
+        titleText.title = titleText.textContent;
+        content.appendChild(titleText);
+        if (bookmark.Note) {
+            const description = document.createElement("div");
+            description.className = "NextspaceLeftPanelTabBookmarksListItemDescription";
+            description.textContent = bookmark.Note;
+            content.appendChild(description);
+        }
+        item.setAttribute("bookmark-id", bookmark.ID);
+        item.setAttribute("is-selected", String(bookmark.ID === this._widget.LastEnabledBookmarkId));
+        item.onclick = () => {
+            this._selectBookmark(bookmark);
+        };
+        parent.appendChild(item);
     }
     _selectBookmark(bookmark) {
         this._widget.SelectBookmark(bookmark);
@@ -199,19 +562,20 @@ class WidgetLeftPanelTabBookmarks extends widget_left_panel_tab_1.WidgetLeftPane
                 item.setAttribute("is-selected", "false");
             }
         }
-        // Scroll the selected bookmark into view.
+        // Scroll the selected bookmark into view. This list is vertical, unlike the bookmark strip widget's.
         const selected = this._element.querySelector(".NextspaceLeftPanelTabBookmarksListItem[is-selected='true']");
         if (selected) {
             const list = this._element.querySelector(".NextspaceLeftPanelTabBookmarksList");
-            const scrollLeft = list.scrollLeft;
-            const scrollRight = scrollLeft + list.clientWidth;
-            const left = selected.offsetLeft;
-            const right = left + selected.clientWidth;
-            if (left < scrollLeft) {
-                list.scrollLeft = left;
-            }
-            else if (right > scrollRight) {
-                list.scrollLeft = right - list.clientWidth;
+            const scrollTop = list.scrollTop;
+            const scrollBottom = scrollTop + list.clientHeight;
+            // Both share the panel container as their offset parent, so this is the item's offset within the list.
+            const top = selected.offsetTop - list.offsetTop;
+            const bottom = top + selected.clientHeight;
+            if (top < scrollTop) {
+                list.scrollTop = top;
+            }
+            else if (bottom > scrollBottom) {
+                list.scrollTop = bottom - list.clientHeight;
             }
         }
     }

package/dist/lib/widgets/tabs-left-panel/widget-left-panel-tab-bookmarks.js.map

@@ -1 +1 @@
-{"version":3,"file":"widget-left-panel-tab-bookmarks.js","sourceRoot":"","sources":["../../../../src/widgets/tabs-left-panel/widget-left-panel-tab-bookmarks.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"widget-left-panel-tab-bookmarks.js","sourceRoot":"","sources":["../../../../src/widgets/tabs-left-panel/widget-left-panel-tab-bookmarks.ts"],"names":[],"mappings":"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"}