Merge pull request #1439 from plone/contentbrowser-initialpath-fix

Fix selecting current path when opening `pat-contentbrowser` initially
plone · Feb 21, 2025 · 824fa38 · 824fa38
2 parents 81ae4f4 + 5e45332
commit 824fa38
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/src/pat/contentbrowser/src/App.svelte b/src/pat/contentbrowser/src/App.svelte
@@ -52,13 +52,24 @@
     const currentPath = getContext("currentPath");
 
     if (!$currentPath) {
-        if(basePath || rootPath) {
+        if (basePath || rootPath) {
             // if root path is not above base path we start at rootPath
             $currentPath = basePath.indexOf(rootPath) != 0 ? rootPath : basePath;
+            if (
+                rootPath &&
+                $currentPath != rootPath &&
+                $currentPath.indexOf(rootPath) == 0
+            ) {
+                // remove rootPath from $currentPath
+                $currentPath = $currentPath.replace(rootPath, "");
+            }
         } else {
             // no path available. try to determine path from vocabularyUrl
             const vocabPath = new URL(vocabularyUrl).pathname.split("/");
-            rootPath = contextPath = $currentPath = vocabPath.slice(0, vocabPath.length - 1).join("/") || "/";
+            rootPath =
+                contextPath =
+                $currentPath =
+                    vocabPath.slice(0, vocabPath.length - 1).join("/") || "/";
         }
     }
 

diff --git a/src/pat/contentbrowser/src/ContentBrowser.svelte b/src/pat/contentbrowser/src/ContentBrowser.svelte
@@ -598,7 +598,7 @@
                                                 class={gridView
                                                     ? "grid-preview"
                                                     : "item-title"}
-                                                title="{item.portal_type}: {item.Title}"
+                                                title="{item.path}: {item.Title}"
                                             >
                                                 {#if gridView && item.getIcon}
                                                     <img
@@ -834,7 +834,7 @@
     }
     .levelToolbar {
         width: 100%;
-        height: 2.5rem;
+        min-height: 2.5rem;
         display: flex;
         justify-content: space-between;
         white-space: nowrap;