@brightspot/ui 6.1.1-rc.2 → 6.2.0

package/src/legacy/tool-ui/src/main/webapp/v4/CIGCluster.less

@@ -1,4 +1,13 @@
 btu-cig-cluster {
+  // Flex (not block) so narrow .CIG-row children pair up like they do in .CIG.
+  display: flex;
+  flex-wrap: wrap;
+
+  // Children run the full row; the narrow modifiers (.is-half etc.) override this to pair up.
+  > * {
+    width: 100%;
+  }
+
   .CIG-title {
     padding: 0;
   }

package/src/legacy/tool-ui/src/main/webapp/v4/TabBar.less

@@ -112,6 +112,10 @@
   &.state-selected {
     .TabBar-itemSelected();
   }
+
+  btu-cig-cluster .CIG .TabBar & {
+    width: auto;
+  }
 }
 
 .TabBar-menu:hover > .TabBar-menuToggle,

package/src/legacy/tool-ui/src/v5.ts

@@ -1,3 +1,5 @@
+import './logVersion' // must stay first
+
 import './main/webapp/v4/Entry.js'
 
 import './v5.css'
@@ -368,17 +370,26 @@ onFind('.TabBar.is-menuOnly', (container: HTMLElement) => {
     })
 })
 
-/** Adds a new data-label attribute to search result tab items
- * for icon styling the tab buttons based on their text content
+/** Adds a data-label attribute to search result tab items so CSS can pick each
+ * view's icon (see SearchResult.css `[data-label='list'|'grid'|'board'|...]`).
+ *
+ * The key MUST be derived from the stable view class name (data-view), not the
+ * visible text: the text is localized, so keying off it left the built-in views
+ * (List/Grid/Board/Hierarchy/Taxonomy/Mixed) with no icon in non-English locales.
+ * aria-label/title still use the human-readable (localized) text.
  */
 onFind('.SearchResult-views > ul', (tabs: HTMLElement) => {
   tabs
     .querySelectorAll<HTMLElement>(':scope > li > a')
     .forEach((tabItem: HTMLElement) => {
-      const label = tabItem.textContent?.toLowerCase() ?? ''
-      tabItem.dataset.label = label
-      tabItem.ariaLabel = label
-      tabItem.title = label
+      const text = tabItem.textContent?.trim() ?? ''
+      const viewClass = (tabItem.dataset.view ?? '').split('.').pop() ?? ''
+      const core = viewClass.match(
+        /^(List|Grid|Board|Hierarchy|Taxonomy|Mixed)SearchResultView$/,
+      )
+      tabItem.dataset.label = core ? core[1].toLowerCase() : text.toLowerCase()
+      tabItem.ariaLabel = text || tabItem.dataset.label
+      tabItem.title = text || tabItem.dataset.label
     })
 })
 
@@ -2052,12 +2063,32 @@ onFind('.ActionBar', (actionBar) => {
   const widgetTitle = widget.querySelector<HTMLElement>('.Widget-title')
 
   let lastPointerType = ''
+
+  // The browser refocuses whatever was focused before when the window regains focus. That
+  // arrives as a focusin with no preceding pointerdown, so the pointer guard below never
+  // catches it, and the scroll drags the editor away from wherever they had deliberately
+  // scrolled to — most visibly with a rich text field taller than the pane.
+  // Seeded from hasFocus() because binding can happen while the window is already blurred —
+  // a background tab, or form content that mounts lazily while the user is away — in which
+  // case the blur has already fired and there is nothing left to listen for.
+  let isRestoringFocus = !document.hasFocus()
+  const handleWindowBlur = () => {
+    isRestoringFocus = true
+  }
+
+  // Any deliberate input means we are no longer restoring, so the flag cannot go stale if
+  // focus happens to return to something outside this widget.
+  const clearRestoringFocus = () => {
+    isRestoringFocus = false
+  }
+
   const handlePointerdown = (event: Event) => {
     lastPointerType = (event as PointerEvent).pointerType
     // Reset after current task so only the immediately following focusin is affected.
     setTimeout(() => {
       lastPointerType = ''
     }, 0)
+    clearRestoringFocus()
   }
 
   const handleFocusin = (event: Event) => {
@@ -2065,6 +2096,13 @@ onFind('.ActionBar', (actionBar) => {
     // smooth scrolling mid-click disrupts dropdown positioning and button actions.
     if (lastPointerType) return
 
+    // Skip the single focusin the browser fires when restoring focus on window re-entry.
+    // Keyboard navigation afterwards still scrolls, which is what this handler is for.
+    if (isRestoringFocus) {
+      isRestoringFocus = false
+      return
+    }
+
     const target = event.target
     if (!(target instanceof HTMLElement)) return
 
@@ -2081,8 +2119,13 @@ onFind('.ActionBar', (actionBar) => {
 
   widget.addEventListener('pointerdown', handlePointerdown, { passive: true })
   widget.addEventListener('focusin', handleFocusin, { passive: true })
+  // Bound on window without capture — capture would also pick up element blur events.
+  window.addEventListener('blur', handleWindowBlur)
+  window.addEventListener('keydown', clearRestoringFocus, { passive: true })
   onRemove(widget, () => {
     widget.removeEventListener('pointerdown', handlePointerdown)
     widget.removeEventListener('focusin', handleFocusin)
+    window.removeEventListener('blur', handleWindowBlur)
+    window.removeEventListener('keydown', clearRestoringFocus)
   })
 })

package/dist/storybook/assets/if-defined-C-mi5lcR.js

@@ -1 +0,0 @@
-import{E as r}from"./iframe-CemlMLl9.js";const m=o=>o??r;export{m as o};