Compare commits

...

4 Commits

Author SHA1 Message Date
e0f176b221 v3.6.1
Some checks failed
Default (tags) / security (push) Failing after 14s
Default (tags) / test (push) Failing after 14s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2026-01-04 16:51:52 +00:00
e625fe9ba6 fix(wcc-sidebar): sort sidebar items alphabetically and unify grouped and ungrouped items for consistent ordering 2026-01-04 16:51:52 +00:00
fe62278d74 v3.6.0
Some checks failed
Default (tags) / security (push) Failing after 14s
Default (tags) / test (push) Failing after 15s
Default (tags) / release (push) Has been skipped
Default (tags) / metadata (push) Has been skipped
2026-01-04 16:41:24 +00:00
3ee8afcdae feat(sidebar): restructure sidebar layout, add search clear button, and improve scrolling behavior 2026-01-04 16:41:24 +00:00
4 changed files with 108 additions and 27 deletions

View File

@@ -1,5 +1,22 @@
# Changelog # Changelog
## 2026-01-04 - 3.6.1 - fix(wcc-sidebar)
sort sidebar items alphabetically and unify grouped and ungrouped items for consistent ordering
- Unifies ungrouped elements and groups into a single render list using a RenderItem type with a sortKey.
- Sorts all top-level items alphabetically by element name (case-insensitive via toLowerCase) so sidebar order is deterministic.
- Groups are ordered by the first element's name; individual items inside a group preserve their original order.
- Replaces previous separate rendering paths with a single sorted render pass that returns TemplateResult array.
## 2026-01-04 - 3.6.0 - feat(sidebar)
restructure sidebar layout, add search clear button, and improve scrolling behavior
- Change sidebar root to a flex column layout and add a .sidebar-header to separate header content from the scrollable menu
- Move pinned section into the header and make .menu flex: 1 with min-height: 0 so the menu becomes the scrollable area
- Replace overflow-y on the root with overflow:hidden to avoid double scrolling and constrain scrolling to .menu
- Add a clear button for the search input (.search-clear) with positioning, hover styles, and a clearSearch() method to reset the query and emit searchChanged
- Adjust search input padding and make .search-container position: relative to correctly position the clear button
## 2026-01-04 - 3.5.3 - fix(deps) ## 2026-01-04 - 3.5.3 - fix(deps)
bump dependency versions: @design.estate/dees-domtools to ^2.3.7, @design.estate/dees-element to ^2.1.5, lit to ^3.3.2; update devDependencies @api.global/typedserver to ^8.1.0 and @git.zone/tstest to ^3.1.4 bump dependency versions: @design.estate/dees-domtools to ^2.3.7, @design.estate/dees-element to ^2.1.5, lit to ^3.3.2; update devDependencies @api.global/typedserver to ^8.1.0 and @git.zone/tstest to ^3.1.4

View File

@@ -1,6 +1,6 @@
{ {
"name": "@design.estate/dees-wcctools", "name": "@design.estate/dees-wcctools",
"version": "3.5.3", "version": "3.6.1",
"private": false, "private": false,
"description": "A set of web component tools for creating element catalogues, enabling the structured development and documentation of custom elements and pages.", "description": "A set of web component tools for creating element catalogues, enabling the structured development and documentation of custom elements and pages.",
"exports": { "exports": {

View File

@@ -3,6 +3,6 @@
*/ */
export const commitinfo = { export const commitinfo = {
name: '@design.estate/dees-wcctools', name: '@design.estate/dees-wcctools',
version: '3.5.3', version: '3.6.1',
description: 'A set of web component tools for creating element catalogues, enabling the structured development and documentation of custom elements and pages.' description: 'A set of web component tools for creating element catalogues, enabling the structured development and documentation of custom elements and pages.'
} }

View File

@@ -71,7 +71,8 @@ export class WccSidebar extends DeesElement {
--ring: #3b82f6; --ring: #3b82f6;
--radius: 4px; --radius: 4px;
display: ${this.isHidden ? 'none' : 'block'}; display: ${this.isHidden ? 'none' : 'flex'};
flex-direction: column;
border-right: 1px solid rgba(255, 255, 255, 0.08); border-right: 1px solid rgba(255, 255, 255, 0.08);
font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', sans-serif; font-family: 'Inter', -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', sans-serif;
font-size: 14px; font-size: 14px;
@@ -81,13 +82,20 @@ export class WccSidebar extends DeesElement {
width: ${this.sidebarWidth}px; width: ${this.sidebarWidth}px;
top: 0px; top: 0px;
bottom: 0px; bottom: 0px;
overflow-y: auto; overflow: hidden;
overflow-x: hidden;
background: var(--background); background: var(--background);
color: var(--foreground); color: var(--foreground);
} }
.sidebar-header {
flex-shrink: 0;
}
.menu { .menu {
flex: 1;
min-height: 0;
overflow-y: auto;
overflow-x: hidden;
padding: 0.5rem 0; padding: 0.5rem 0;
} }
@@ -281,6 +289,7 @@ export class WccSidebar extends DeesElement {
.search-container { .search-container {
padding: 0.5rem; padding: 0.5rem;
border-bottom: 1px solid var(--border); border-bottom: 1px solid var(--border);
position: relative;
} }
.search-input { .search-input {
@@ -289,7 +298,7 @@ export class WccSidebar extends DeesElement {
background: var(--input); background: var(--input);
border: 1px solid var(--border); border: 1px solid var(--border);
border-radius: var(--radius); border-radius: var(--radius);
padding: 0.5rem 0.75rem; padding: 0.5rem 1.75rem 0.5rem 0.75rem;
color: var(--foreground); color: var(--foreground);
font-size: 0.75rem; font-size: 0.75rem;
font-family: inherit; font-family: inherit;
@@ -305,6 +314,33 @@ export class WccSidebar extends DeesElement {
color: var(--muted-foreground); color: var(--muted-foreground);
} }
.search-clear {
position: absolute;
right: 0.75rem;
top: 50%;
transform: translateY(-50%);
background: none;
border: none;
padding: 0.25rem;
cursor: pointer;
color: var(--muted-foreground);
display: flex;
align-items: center;
justify-content: center;
border-radius: 2px;
transition: color 0.15s ease, background 0.15s ease;
}
.search-clear:hover {
color: var(--foreground);
background: rgba(255, 255, 255, 0.1);
}
.search-clear .material-symbols-outlined {
font-size: 14px;
opacity: 1;
}
.highlight { .highlight {
background: rgba(59, 130, 246, 0.3); background: rgba(59, 130, 246, 0.3);
border-radius: 2px; border-radius: 2px;
@@ -394,6 +430,7 @@ export class WccSidebar extends DeesElement {
background: var(--primary); background: var(--primary);
} }
</style> </style>
<div class="sidebar-header">
<div class="search-container"> <div class="search-container">
<input <input
type="text" type="text"
@@ -402,9 +439,15 @@ export class WccSidebar extends DeesElement {
.value=${this.searchQuery} .value=${this.searchQuery}
@input=${this.handleSearchInput} @input=${this.handleSearchInput}
/> />
${this.searchQuery ? html`
<button class="search-clear" @click=${this.clearSearch}>
<i class="material-symbols-outlined">close</i>
</button>
` : null}
</div>
${this.renderPinnedSection()}
</div> </div>
<div class="menu"> <div class="menu">
${this.renderPinnedSection()}
${this.renderSections()} ${this.renderSections()}
</div> </div>
<div <div
@@ -604,27 +647,43 @@ export class WccSidebar extends DeesElement {
groupedItems.get(group)!.push(entry); groupedItems.get(group)!.push(entry);
} }
const result: TemplateResult[] = []; // Build a unified list of render items (ungrouped elements and groups)
// Each item has a sortKey (element name or first element name of group)
type RenderItem =
| { type: 'element'; entry: [string, any]; sortKey: string }
| { type: 'group'; groupName: string; items: Array<[string, any]>; sortKey: string };
// Render ungrouped items first const renderItems: RenderItem[] = [];
// Add ungrouped items
const ungrouped = groupedItems.get(null) || []; const ungrouped = groupedItems.get(null) || [];
for (const entry of ungrouped) { for (const entry of ungrouped) {
result.push(this.renderElementItem(entry, section)); renderItems.push({ type: 'element', entry, sortKey: entry[0].toLowerCase() });
} }
// Render grouped items // Add groups (sorted by their first element's name)
for (const [groupName, items] of groupedItems) { for (const [groupName, items] of groupedItems) {
if (groupName === null) continue; if (groupName === null) continue;
const firstElementName = items[0]?.[0] || '';
result.push(html` renderItems.push({ type: 'group', groupName, items, sortKey: firstElementName.toLowerCase() });
<div class="item-group">
<span class="item-group-legend">${groupName}</span>
${items.map((entry) => this.renderElementItem(entry, section))}
</div>
`);
} }
return result; // Sort all items alphabetically by sortKey
renderItems.sort((a, b) => a.sortKey.localeCompare(b.sortKey));
// Render in sorted order
return renderItems.map((item) => {
if (item.type === 'element') {
return this.renderElementItem(item.entry, section);
} else {
return html`
<div class="item-group">
<span class="item-group-legend">${item.groupName}</span>
${item.items.map((entry) => this.renderElementItem(entry, section))}
</div>
`;
}
});
} }
} }
@@ -716,6 +775,11 @@ export class WccSidebar extends DeesElement {
this.dispatchEvent(new CustomEvent('searchChanged', { detail: this.searchQuery })); this.dispatchEvent(new CustomEvent('searchChanged', { detail: this.searchQuery }));
} }
private clearSearch() {
this.searchQuery = '';
this.dispatchEvent(new CustomEvent('searchChanged', { detail: this.searchQuery }));
}
private matchesSearch(name: string): boolean { private matchesSearch(name: string): boolean {
if (!this.searchQuery) return true; if (!this.searchQuery) return true;
return name.toLowerCase().includes(this.searchQuery.toLowerCase()); return name.toLowerCase().includes(this.searchQuery.toLowerCase());