feat(dees-contextmenu,dees-appui-tabs,test): Prevent double-destruction of context menus, await window layer teardown, update destroyAll behavior, remove tabs content slot, and adjust tests

This commit is contained in:
2025-12-29 11:30:49 +00:00
parent 45a2743312
commit e45810dd06
6 changed files with 36 additions and 27 deletions

View File

@@ -67,9 +67,8 @@ export const demoFunc = () => {
<div class="demo-container">
<div class="section">
<div class="section-title">Horizontal Tabs with Animated Indicator</div>
<dees-appui-tabs .tabs=${horizontalTabs}>
${demoContent('Select a tab to see the smooth sliding animation of the indicator. The indicator automatically adjusts its width to match the tab content with minimal padding.')}
</dees-appui-tabs>
<dees-appui-tabs .tabs=${horizontalTabs}></dees-appui-tabs>
${demoContent('Select a tab to see the smooth sliding animation of the indicator. The indicator automatically adjusts its width to match the tab content with minimal padding.')}
</div>
<div class="section">
@@ -82,9 +81,8 @@ export const demoFunc = () => {
<div class="section">
<div class="section-title">Without Indicator</div>
<dees-appui-tabs .showTabIndicator=${false} .tabs=${noIndicatorTabs}>
${demoContent('Tabs can also be used without the animated indicator by setting showTabIndicator to false.')}
</dees-appui-tabs>
<dees-appui-tabs .showTabIndicator=${false} .tabs=${noIndicatorTabs}></dees-appui-tabs>
${demoContent('Tabs can also be used without the animated indicator by setting showTabIndicator to false.')}
</div>
</div>
`;

View File

@@ -198,19 +198,12 @@ export class DeesAppuiTabs extends DeesElement {
z-index: 1;
box-shadow: 0 1px 3px rgba(0, 0, 0, 0.08);
}
.content {
padding: 32px 24px;
}
`,
];
public render(): TemplateResult {
return html`
${this.renderTabsWrapper()}
<div class="content">
<slot></slot>
</div>
`;
}

View File

@@ -134,6 +134,7 @@ export class DeesContextmenu extends DeesElement {
private submenu: DeesContextmenu | null = null;
private submenuTimeout: any = null;
private parentMenu: DeesContextmenu | null = null;
private isDestroying: boolean = false;
constructor() {
super();
@@ -416,27 +417,33 @@ export class DeesContextmenu extends DeesElement {
}
public async destroy() {
// Guard against double-destruction
if (this.isDestroying) {
return;
}
this.isDestroying = true;
// Clear timeout
if (this.submenuTimeout) {
clearTimeout(this.submenuTimeout);
this.submenuTimeout = null;
}
// Destroy submenu first
if (this.submenu) {
await this.submenu.destroy();
this.submenu = null;
}
// Only destroy window layer if this is not a submenu
if (this.windowLayer && !this.parentMenu) {
this.windowLayer.destroy();
await this.windowLayer.destroy();
}
this.style.opacity = '0';
this.style.transform = 'scale(0.95) translateY(-10px)';
await domtools.plugins.smartdelay.delayFor(100);
if (this.parentElement) {
this.parentElement.removeChild(this);
}
@@ -446,13 +453,14 @@ export class DeesContextmenu extends DeesElement {
* Destroys this menu and all parent menus in the chain
*/
public async destroyAll() {
// First destroy parent menus if they exist
if (this.parentMenu) {
await this.parentMenu.destroyAll();
} else {
// If we're at the top level, just destroy this menu
await this.destroy();
// Find the root menu (top-level parent)
let rootMenu: DeesContextmenu = this;
while (rootMenu.parentMenu) {
rootMenu = rootMenu.parentMenu;
}
// Destroy from the root - this will cascade through all submenus
await rootMenu.destroy();
}
}