Improve Adaptive Navigation of Header Menu
This commit is contained in:
1 parent
2f5e79e300
commit
7363684b2f
7 files changed
+147
-71
No files matched your search
+2
-1
@@ -57,6 +57,7 @@ export class App {
|
|||||||
this.contentElement()!.nativeElement.tabIndex = 0;
|
this.contentElement()!.nativeElement.tabIndex = 0;
|
||||||
this.contentElement()!.nativeElement.focus();
|
this.contentElement()!.nativeElement.focus();
|
||||||
|
|
||||||
this.contentElement()!.nativeElement.tabIndex = -1;
|
// @ts-ignore
|
||||||
|
this.contentElement()!.nativeElement.tabIndex = undefined;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,21 +1,29 @@
|
|||||||
<div class="menu-left">
|
<div #menuLeft class="menu-left">
|
||||||
<a class="brand" [routerLink]="['/']">
|
<a class="brand" [routerLink]="['/']">
|
||||||
<img [src]="settings.darkMode() ? '/logo.svg' : '/logo_inverted.svg'" alt="logo" height="20" width="59.52" />
|
<img [src]="settings.darkMode() ? '/logo.svg' : '/logo_inverted.svg'" alt="logo" height="20" width="59.52" />
|
||||||
<span #brandText [class.hidden]="!hasExtraSpace()">
|
<span #brandText [class.hidden]="expandStage() < 2">
|
||||||
<strong>ADOFAI Editor Forum</strong>
|
<strong>ADOFAI Editor Forum</strong>
|
||||||
</span>
|
</span>
|
||||||
</a>
|
</a>
|
||||||
|
|
||||||
|
<div #leftMenuItems [class.hidden]="expandStage() < 1" [attr.inert]="expandStage() < 1 ? '' : null" class="menu-items">
|
||||||
<a class="menu-item nav-link" [routerLink]="['/levels']">{{ translation.menu.levels }}</a>
|
<a class="menu-item nav-link" [routerLink]="['/levels']">{{ translation.menu.levels }}</a>
|
||||||
<span class="menu-item dummy-link">{{ translation.menu.community }}</span>
|
<span class="menu-item dummy-link">{{ translation.menu.community }}</span>
|
||||||
<span class="menu-item dummy-link">{{ translation.menu.leaderboard }}</span>
|
<span class="menu-item dummy-link">{{ translation.menu.leaderboard }}</span>
|
||||||
<span class="menu-item dummy-link">{{ translation.menu.about }}</span>
|
<span class="menu-item dummy-link">{{ translation.menu.about }}</span>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="menu-right" #menuRight>
|
<div #menuRight class="menu-right">
|
||||||
|
<div #rightMenuItems [class.hidden]="expandStage() < 1" [attr.inert]="expandStage() < 1 ? '' : null" class="menu-items">
|
||||||
<a class="menu-item nav-link" [routerLink]="['/known-issues']">{{ translation.menu.knownIssues }}</a>
|
<a class="menu-item nav-link" [routerLink]="['/known-issues']">{{ translation.menu.knownIssues }}</a>
|
||||||
<span class="menu-item dummy-link"><strong>{{ translation.menu.login }}</strong></span>
|
<span class="menu-item dummy-link"><strong>{{ translation.menu.login }}</strong></span>
|
||||||
<span class="menu-item dummy-link">{{ translation.menu.signup }}</span>
|
<span class="menu-item dummy-link">{{ translation.menu.signup }}</span>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<button type="button" [class.hidden]="expandStage() > 0" [attr.inert]="expandStage() > 0 ? '' : null" class="material-symbols-outlined icon-40 menu" (click)="onHamburgerClick()" [attr.aria-label]="translation.menu.menu">
|
||||||
|
menu
|
||||||
|
</button>
|
||||||
|
|
||||||
<button type="button" class="material-symbols-outlined icon-40 settings" (click)="onSettingsClick()" [attr.aria-label]="translation.settings.title">
|
<button type="button" class="material-symbols-outlined icon-40 settings" (click)="onSettingsClick()" [attr.aria-label]="translation.settings.title">
|
||||||
settings
|
settings
|
||||||
|
|||||||
@@ -4,11 +4,12 @@
|
|||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: row;
|
flex-direction: row;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: start;
|
justify-content: space-between;
|
||||||
gap: 0;
|
gap: 0;
|
||||||
|
|
||||||
width: fit-content;
|
width: fit-content;
|
||||||
min-width: 100%;
|
min-width: 100%;
|
||||||
|
height: 64px;
|
||||||
|
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
box-shadow: 0 2px 0 light-dark(oklch(0 0 0 / 20%), oklch(1 0 0 / 20%));
|
box-shadow: 0 2px 0 light-dark(oklch(0 0 0 / 20%), oklch(1 0 0 / 20%));
|
||||||
@@ -26,11 +27,24 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 48px;
|
gap: 48px;
|
||||||
|
|
||||||
|
.menu-items {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: row;
|
||||||
|
align-items: center;
|
||||||
|
gap: 48px;
|
||||||
|
|
||||||
|
&.hidden {
|
||||||
|
position: absolute;
|
||||||
|
top: -100000px;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
& > * {
|
& > * {
|
||||||
user-select: none;
|
user-select: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.menu-item, a:not(.settings) {
|
.menu-item, a {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
height: 40px;
|
height: 40px;
|
||||||
@@ -62,7 +76,7 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.settings {
|
.settings, .menu {
|
||||||
border: none;
|
border: none;
|
||||||
border-radius: 100%;
|
border-radius: 100%;
|
||||||
background-color: inherit;
|
background-color: inherit;
|
||||||
@@ -71,6 +85,9 @@
|
|||||||
position: relative;
|
position: relative;
|
||||||
z-index: 10;
|
z-index: 10;
|
||||||
cursor: pointer;
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.settings {
|
||||||
transition: transform 0.3s ease;
|
transition: transform 0.3s ease;
|
||||||
|
|
||||||
&:hover {
|
&:hover {
|
||||||
@@ -78,6 +95,14 @@
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.menu {
|
||||||
|
&.hidden {
|
||||||
|
position: absolute;
|
||||||
|
top: -100000px;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* 구체적인 아이콘 예외 처리 */
|
/* 구체적인 아이콘 예외 처리 */
|
||||||
.icon-40 {
|
.icon-40 {
|
||||||
height: auto;
|
height: auto;
|
||||||
@@ -85,6 +110,9 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.menu-left {
|
.menu-left {
|
||||||
|
position: absolute;
|
||||||
|
left: 0;
|
||||||
|
|
||||||
justify-content: start;
|
justify-content: start;
|
||||||
padding: 12px;
|
padding: 12px;
|
||||||
|
|
||||||
@@ -104,7 +132,7 @@
|
|||||||
img {
|
img {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
height: 20px;
|
height: 20px;
|
||||||
padding: 10px 10px 10px 0;
|
padding: 10px 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
strong {
|
strong {
|
||||||
@@ -113,9 +141,11 @@
|
|||||||
|
|
||||||
span {
|
span {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
padding-left: 10px;
|
||||||
|
|
||||||
&.hidden {
|
&.hidden {
|
||||||
display: none;
|
position: absolute;
|
||||||
|
top: -100000px;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -123,8 +153,10 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
.menu-right {
|
.menu-right {
|
||||||
flex-grow: 1;
|
position: absolute;
|
||||||
|
right: 0;
|
||||||
|
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
padding: 12px 20px;
|
padding: 12px 20px 12px 12px;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -6,6 +6,7 @@ import {
|
|||||||
inject,
|
inject,
|
||||||
NgZone,
|
NgZone,
|
||||||
OnDestroy,
|
OnDestroy,
|
||||||
|
OnInit,
|
||||||
signal,
|
signal,
|
||||||
viewChild,
|
viewChild,
|
||||||
} from '@angular/core';
|
} from '@angular/core';
|
||||||
@@ -21,101 +22,132 @@ import { SettingsService } from '../../services/settings.service';
|
|||||||
templateUrl: './header-menu.html',
|
templateUrl: './header-menu.html',
|
||||||
styleUrl: './header-menu.scss',
|
styleUrl: './header-menu.scss',
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
|
host: {
|
||||||
|
'[class.folded-menu]': 'expandStage() < 1',
|
||||||
|
},
|
||||||
})
|
})
|
||||||
export class HeaderMenu implements OnDestroy {
|
export class HeaderMenu implements OnDestroy {
|
||||||
private popupService = inject(PopupService);
|
private popupService = inject(PopupService);
|
||||||
protected translation = inject(TranslationService).translation;
|
protected translation = inject(TranslationService).translation;
|
||||||
protected settings = inject(SettingsService);
|
protected settings = inject(SettingsService);
|
||||||
|
|
||||||
menuRight = viewChild<ElementRef<HTMLElement>>('menuRight');
|
private static readonly LOGICAL_GAP = 24;
|
||||||
brandText = viewChild<ElementRef<HTMLElement>>('brandText');
|
|
||||||
|
|
||||||
hasExtraSpace = signal(true);
|
private resizeObserver?: ResizeObserver;
|
||||||
|
private brandTextObserver?: ResizeObserver;
|
||||||
|
private menuItemsObserver?: ResizeObserver;
|
||||||
|
private menuWidth: number = 99999;
|
||||||
|
|
||||||
private menuResizeObserver: ResizeObserver | null = null;
|
private menuLeft = viewChild<ElementRef<HTMLElement>>('menuLeft');
|
||||||
private textResizeObserver: ResizeObserver | null = null;
|
private leftMenuItems = viewChild<ElementRef<HTMLElement>>('leftMenuItems');
|
||||||
|
private menuLeftWidth: number = 0;
|
||||||
|
private leftMenuItemsWidth: number = 0;
|
||||||
|
|
||||||
private childWidths = new Map<Element, number>();
|
private menuRight = viewChild<ElementRef<HTMLElement>>('menuRight');
|
||||||
private cachedTextWidth = 0;
|
private rightMenuItems = viewChild<ElementRef<HTMLElement>>('rightMenuItems');
|
||||||
private cachedRightMenuContentWidth = 0;
|
private menuRightWidth: number = 0;
|
||||||
|
private rightMenuItemsWidth: number = 0;
|
||||||
|
|
||||||
constructor(private ngZone: NgZone) {
|
private brandText = viewChild<ElementRef<HTMLElement>>('brandText');
|
||||||
|
private brandTextWidth: number = 0;
|
||||||
|
|
||||||
|
expandStage = signal(2);
|
||||||
|
|
||||||
|
constructor(
|
||||||
|
private element: ElementRef,
|
||||||
|
private ngZone: NgZone,
|
||||||
|
) {
|
||||||
afterNextRender(() => {
|
afterNextRender(() => {
|
||||||
const rightElement = this.menuRight()?.nativeElement;
|
|
||||||
const textElement = this.brandText()?.nativeElement;
|
|
||||||
if (!rightElement || !textElement) return;
|
|
||||||
|
|
||||||
this.ngZone.runOutsideAngular(() => {
|
this.ngZone.runOutsideAngular(() => {
|
||||||
// 1. Right Menu & Children Observer
|
this.resizeObserver = new ResizeObserver((entries) => {
|
||||||
this.menuResizeObserver = new ResizeObserver((entries) => {
|
for (let entry of entries) {
|
||||||
let containerWidth = -1;
|
|
||||||
let contentChanged = false;
|
|
||||||
|
|
||||||
for (const entry of entries) {
|
|
||||||
if (entry.target === rightElement) {
|
|
||||||
containerWidth = entry.borderBoxSize[0].inlineSize;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
const width = entry.borderBoxSize[0].inlineSize;
|
const width = entry.borderBoxSize[0].inlineSize;
|
||||||
if (this.childWidths.get(entry.target) !== width) {
|
if (width > 0)
|
||||||
this.childWidths.set(entry.target, width);
|
switch (entry.target) {
|
||||||
contentChanged = true;
|
case element.nativeElement:
|
||||||
|
this.menuWidth = width;
|
||||||
|
break;
|
||||||
|
case this.menuLeft()!.nativeElement:
|
||||||
|
this.menuLeftWidth = width;
|
||||||
|
break;
|
||||||
|
case this.menuRight()!.nativeElement:
|
||||||
|
this.menuRightWidth = width;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (contentChanged) this.updateCachedRightMenuContentWidth();
|
this.updateExpandStatus();
|
||||||
if (containerWidth !== -1) this.resize(containerWidth);
|
|
||||||
});
|
});
|
||||||
|
|
||||||
this.menuResizeObserver.observe(rightElement);
|
this.menuItemsObserver = new ResizeObserver((entries) => {
|
||||||
Array.from(rightElement.children).forEach((child) => {
|
for (let entry of entries) {
|
||||||
this.childWidths.set(child, (child as HTMLElement).offsetWidth);
|
const width = entry.borderBoxSize[0].inlineSize;
|
||||||
this.menuResizeObserver?.observe(child);
|
if (width > 0)
|
||||||
|
switch (entry.target) {
|
||||||
|
case this.leftMenuItems()!.nativeElement:
|
||||||
|
this.leftMenuItemsWidth = width;
|
||||||
|
break;
|
||||||
|
case this.rightMenuItems()!.nativeElement:
|
||||||
|
this.rightMenuItemsWidth = width;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
this.updateExpandStatus();
|
||||||
});
|
});
|
||||||
|
|
||||||
// 2. Brand Text Observer
|
this.resizeObserver.observe(element.nativeElement);
|
||||||
this.textResizeObserver = new ResizeObserver((entries) => {
|
this.resizeObserver.observe(this.menuLeft()!.nativeElement);
|
||||||
|
this.resizeObserver.observe(this.menuRight()!.nativeElement);
|
||||||
|
|
||||||
|
this.menuItemsObserver.observe(this.leftMenuItems()!.nativeElement);
|
||||||
|
this.menuItemsObserver.observe(this.rightMenuItems()!.nativeElement);
|
||||||
|
|
||||||
|
this.brandTextObserver = new ResizeObserver((entries) => {
|
||||||
const width = entries[0].borderBoxSize[0].inlineSize;
|
const width = entries[0].borderBoxSize[0].inlineSize;
|
||||||
if (width > 0) this.cachedTextWidth = width;
|
if (width > 0) this.brandTextWidth = width;
|
||||||
|
|
||||||
|
this.updateExpandStatus();
|
||||||
});
|
});
|
||||||
|
|
||||||
this.textResizeObserver.observe(textElement);
|
this.brandTextObserver.observe(this.brandText()!.nativeElement);
|
||||||
|
|
||||||
// Initial calculation
|
|
||||||
this.cachedTextWidth = textElement.offsetWidth;
|
|
||||||
this.updateCachedRightMenuContentWidth();
|
|
||||||
this.resize(rightElement.offsetWidth);
|
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnDestroy() {
|
ngOnDestroy() {
|
||||||
this.menuResizeObserver?.disconnect();
|
this.resizeObserver?.disconnect();
|
||||||
this.textResizeObserver?.disconnect();
|
this.menuItemsObserver?.disconnect();
|
||||||
this.childWidths.clear();
|
this.brandTextObserver?.disconnect();
|
||||||
}
|
}
|
||||||
|
|
||||||
private updateCachedRightMenuContentWidth() {
|
private updateExpandStatus() {
|
||||||
const gap = 48;
|
let menuContentWidth = this.menuLeftWidth + this.menuRightWidth;
|
||||||
const widths = Array.from(this.childWidths.values());
|
let enoughSpace = this.menuWidth > menuContentWidth + HeaderMenu.LOGICAL_GAP;
|
||||||
if (widths.length === 0) {
|
let initialExpandStage = this.expandStage();
|
||||||
this.cachedRightMenuContentWidth = 0;
|
|
||||||
return;
|
if (enoughSpace) {
|
||||||
|
let extraSpaceToExpand = Number.MAX_VALUE;
|
||||||
|
switch (initialExpandStage) {
|
||||||
|
case 1:
|
||||||
|
extraSpaceToExpand = this.brandTextWidth;
|
||||||
|
break;
|
||||||
|
case 0:
|
||||||
|
extraSpaceToExpand = this.leftMenuItemsWidth + this.rightMenuItemsWidth + 48 - 40;
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
this.cachedRightMenuContentWidth =
|
if (
|
||||||
widths.reduce((acc, w) => acc + w, 0) + (widths.length - 1) * gap;
|
// Add a gap of 2px to prevent flickering
|
||||||
|
this.menuWidth >= menuContentWidth + HeaderMenu.LOGICAL_GAP + extraSpaceToExpand + 2
|
||||||
|
) {
|
||||||
|
this.expandStage.set(initialExpandStage + 1);
|
||||||
|
}
|
||||||
|
} else if (initialExpandStage > 0) this.expandStage.set(initialExpandStage - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
private resize(availableWidth: number) {
|
onHamburgerClick(): void {
|
||||||
const hadSpace = this.hasExtraSpace();
|
|
||||||
|
|
||||||
const buffer = 20 * 2 + 24; // Internal Padding + Logical Gap
|
|
||||||
const threshold = hadSpace ? 0 : this.cachedTextWidth;
|
|
||||||
const hasSpace = availableWidth > this.cachedRightMenuContentWidth + threshold + buffer;
|
|
||||||
|
|
||||||
if (hadSpace !== hasSpace) this.ngZone.run(() => this.hasExtraSpace.set(hasSpace));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onSettingsClick() {
|
onSettingsClick() {
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ export const EN = {
|
|||||||
knownIssues: 'Known Issues',
|
knownIssues: 'Known Issues',
|
||||||
login: 'Login',
|
login: 'Login',
|
||||||
signup: 'Signup',
|
signup: 'Signup',
|
||||||
|
menu: 'Menu',
|
||||||
},
|
},
|
||||||
common: {
|
common: {
|
||||||
selectOption: 'Select Option...',
|
selectOption: 'Select Option...',
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ export const JP: Translation = {
|
|||||||
knownIssues: '既知の問題',
|
knownIssues: '既知の問題',
|
||||||
login: 'ログイン',
|
login: 'ログイン',
|
||||||
signup: '新規登録',
|
signup: '新規登録',
|
||||||
|
menu: 'メニュー',
|
||||||
},
|
},
|
||||||
common: {
|
common: {
|
||||||
selectOption: 'オプションを選択...',
|
selectOption: 'オプションを選択...',
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ export const KR: Translation = {
|
|||||||
knownIssues: '알려진 문제',
|
knownIssues: '알려진 문제',
|
||||||
login: '로그인',
|
login: '로그인',
|
||||||
signup: '회원가입',
|
signup: '회원가입',
|
||||||
|
menu: '메뉴',
|
||||||
},
|
},
|
||||||
common: {
|
common: {
|
||||||
selectOption: '옵션 선택...',
|
selectOption: '옵션 선택...',
|
||||||
|
|||||||
Reference in new issue
Block a user