Compare commits
2
Commits
2f5e79e300
...
25a9bca291
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
25a9bca291 | ||
|
|
7363684b2f |
No files matched your search
+2
-1
@@ -57,6 +57,7 @@ export class App {
|
||||
this.contentElement()!.nativeElement.tabIndex = 0;
|
||||
this.contentElement()!.nativeElement.focus();
|
||||
|
||||
this.contentElement()!.nativeElement.tabIndex = -1;
|
||||
// @ts-ignore
|
||||
this.contentElement()!.nativeElement.tabIndex = undefined;
|
||||
}
|
||||
}
|
||||
@@ -37,7 +37,7 @@ $default_animation_duration: 0.2s;
|
||||
animation: popup-enter var(--animation-duration) $animation_timing;
|
||||
|
||||
outline: light-dark(oklch(0 0 0 / 20%), oklch(1 0 0 / 20%)) 2px solid;
|
||||
gap: 16px;
|
||||
gap: 12px;
|
||||
|
||||
&.variant-glass {
|
||||
background-color: light-dark(oklch(1 0 0 / 60%), oklch(0 0 0 / 60%));
|
||||
|
||||
@@ -1,21 +1,29 @@
|
||||
<div class="menu-left">
|
||||
<div #menuLeft class="menu-left">
|
||||
<a class="brand" [routerLink]="['/']">
|
||||
<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>
|
||||
</span>
|
||||
</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>
|
||||
<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.about }}</span>
|
||||
</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>
|
||||
<span class="menu-item dummy-link"><strong>{{ translation.menu.login }}</strong></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">
|
||||
settings
|
||||
|
||||
@@ -4,11 +4,12 @@
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
align-items: center;
|
||||
justify-content: start;
|
||||
justify-content: space-between;
|
||||
gap: 0;
|
||||
|
||||
width: fit-content;
|
||||
min-width: 100%;
|
||||
height: 64px;
|
||||
|
||||
box-sizing: border-box;
|
||||
box-shadow: 0 2px 0 light-dark(oklch(0 0 0 / 20%), oklch(1 0 0 / 20%));
|
||||
@@ -26,11 +27,24 @@
|
||||
align-items: center;
|
||||
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;
|
||||
}
|
||||
|
||||
.menu-item, a:not(.settings) {
|
||||
.menu-item, a {
|
||||
text-decoration: none;
|
||||
font-size: 18px;
|
||||
height: 40px;
|
||||
@@ -42,6 +56,7 @@
|
||||
cursor: pointer;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
border-radius: 4px;
|
||||
|
||||
&.nav-link {
|
||||
font-weight: 700;
|
||||
@@ -62,7 +77,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
.settings {
|
||||
.settings, .menu {
|
||||
border: none;
|
||||
border-radius: 100%;
|
||||
background-color: inherit;
|
||||
@@ -71,6 +86,9 @@
|
||||
position: relative;
|
||||
z-index: 10;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.settings {
|
||||
transition: transform 0.3s ease;
|
||||
|
||||
&:hover {
|
||||
@@ -78,6 +96,14 @@
|
||||
}
|
||||
}
|
||||
|
||||
.menu {
|
||||
&.hidden {
|
||||
position: absolute;
|
||||
top: -100000px;
|
||||
pointer-events: none;
|
||||
}
|
||||
}
|
||||
|
||||
/* 구체적인 아이콘 예외 처리 */
|
||||
.icon-40 {
|
||||
height: auto;
|
||||
@@ -85,6 +111,9 @@
|
||||
}
|
||||
|
||||
.menu-left {
|
||||
position: absolute;
|
||||
left: 0;
|
||||
|
||||
justify-content: start;
|
||||
padding: 12px;
|
||||
|
||||
@@ -104,7 +133,7 @@
|
||||
img {
|
||||
display: inline-block;
|
||||
height: 20px;
|
||||
padding: 10px 10px 10px 0;
|
||||
padding: 10px 0;
|
||||
}
|
||||
|
||||
strong {
|
||||
@@ -113,9 +142,11 @@
|
||||
|
||||
span {
|
||||
display: inline-block;
|
||||
padding-left: 10px;
|
||||
|
||||
&.hidden {
|
||||
display: none;
|
||||
position: absolute;
|
||||
top: -100000px;
|
||||
pointer-events: none;
|
||||
}
|
||||
}
|
||||
@@ -123,8 +154,10 @@
|
||||
}
|
||||
|
||||
.menu-right {
|
||||
flex-grow: 1;
|
||||
position: absolute;
|
||||
right: 0;
|
||||
|
||||
justify-content: flex-end;
|
||||
padding: 12px 20px;
|
||||
padding: 12px 20px 12px 12px;
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,7 @@ import {
|
||||
afterNextRender,
|
||||
ChangeDetectionStrategy,
|
||||
Component,
|
||||
effect,
|
||||
ElementRef,
|
||||
inject,
|
||||
NgZone,
|
||||
@@ -12,6 +13,7 @@ import {
|
||||
import { RouterLink } from '@angular/router';
|
||||
import { PopupService } from '../../services/popup.service';
|
||||
import { SettingsPopup } from '../settings/settings';
|
||||
import { NavigationMenu } from './navigation-menu';
|
||||
import { TranslationService } from '../../services/translation.service';
|
||||
import { SettingsService } from '../../services/settings.service';
|
||||
|
||||
@@ -21,101 +23,140 @@ import { SettingsService } from '../../services/settings.service';
|
||||
templateUrl: './header-menu.html',
|
||||
styleUrl: './header-menu.scss',
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
host: {
|
||||
'[class.folded-menu]': 'expandStage() < 1',
|
||||
},
|
||||
})
|
||||
export class HeaderMenu implements OnDestroy {
|
||||
private popupService = inject(PopupService);
|
||||
protected translation = inject(TranslationService).translation;
|
||||
protected settings = inject(SettingsService);
|
||||
|
||||
menuRight = viewChild<ElementRef<HTMLElement>>('menuRight');
|
||||
brandText = viewChild<ElementRef<HTMLElement>>('brandText');
|
||||
private static readonly LOGICAL_GAP = 24;
|
||||
|
||||
hasExtraSpace = signal(true);
|
||||
private resizeObserver?: ResizeObserver;
|
||||
private brandTextObserver?: ResizeObserver;
|
||||
private menuItemsObserver?: ResizeObserver;
|
||||
private menuWidth: number = 99999;
|
||||
|
||||
private menuResizeObserver: ResizeObserver | null = null;
|
||||
private textResizeObserver: ResizeObserver | null = null;
|
||||
private menuLeft = viewChild<ElementRef<HTMLElement>>('menuLeft');
|
||||
private leftMenuItems = viewChild<ElementRef<HTMLElement>>('leftMenuItems');
|
||||
private menuLeftWidth: number = 0;
|
||||
private leftMenuItemsWidth: number = 0;
|
||||
|
||||
private childWidths = new Map<Element, number>();
|
||||
private cachedTextWidth = 0;
|
||||
private cachedRightMenuContentWidth = 0;
|
||||
private menuRight = viewChild<ElementRef<HTMLElement>>('menuRight');
|
||||
private rightMenuItems = viewChild<ElementRef<HTMLElement>>('rightMenuItems');
|
||||
private menuRightWidth: number = 0;
|
||||
private rightMenuItemsWidth: number = 0;
|
||||
|
||||
private brandText = viewChild<ElementRef<HTMLElement>>('brandText');
|
||||
private brandTextWidth: number = 0;
|
||||
|
||||
expandStage = signal(2);
|
||||
|
||||
constructor(
|
||||
private element: ElementRef,
|
||||
private ngZone: NgZone,
|
||||
) {
|
||||
effect(() => {
|
||||
if (this.expandStage() > 0) {
|
||||
this.popupService.close(NavigationMenu);
|
||||
}
|
||||
});
|
||||
|
||||
constructor(private ngZone: NgZone) {
|
||||
afterNextRender(() => {
|
||||
const rightElement = this.menuRight()?.nativeElement;
|
||||
const textElement = this.brandText()?.nativeElement;
|
||||
if (!rightElement || !textElement) return;
|
||||
|
||||
this.ngZone.runOutsideAngular(() => {
|
||||
// 1. Right Menu & Children Observer
|
||||
this.menuResizeObserver = new ResizeObserver((entries) => {
|
||||
let containerWidth = -1;
|
||||
let contentChanged = false;
|
||||
|
||||
for (const entry of entries) {
|
||||
if (entry.target === rightElement) {
|
||||
containerWidth = entry.borderBoxSize[0].inlineSize;
|
||||
continue;
|
||||
}
|
||||
|
||||
this.resizeObserver = new ResizeObserver((entries) => {
|
||||
for (let entry of entries) {
|
||||
const width = entry.borderBoxSize[0].inlineSize;
|
||||
if (this.childWidths.get(entry.target) !== width) {
|
||||
this.childWidths.set(entry.target, width);
|
||||
contentChanged = true;
|
||||
if (width > 0)
|
||||
switch (entry.target) {
|
||||
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();
|
||||
if (containerWidth !== -1) this.resize(containerWidth);
|
||||
this.updateExpandStatus();
|
||||
});
|
||||
|
||||
this.menuResizeObserver.observe(rightElement);
|
||||
Array.from(rightElement.children).forEach((child) => {
|
||||
this.childWidths.set(child, (child as HTMLElement).offsetWidth);
|
||||
this.menuResizeObserver?.observe(child);
|
||||
this.menuItemsObserver = new ResizeObserver((entries) => {
|
||||
for (let entry of entries) {
|
||||
const width = entry.borderBoxSize[0].inlineSize;
|
||||
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.textResizeObserver = new ResizeObserver((entries) => {
|
||||
this.resizeObserver.observe(element.nativeElement);
|
||||
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;
|
||||
if (width > 0) this.cachedTextWidth = width;
|
||||
if (width > 0) this.brandTextWidth = width;
|
||||
|
||||
this.updateExpandStatus();
|
||||
});
|
||||
|
||||
this.textResizeObserver.observe(textElement);
|
||||
|
||||
// Initial calculation
|
||||
this.cachedTextWidth = textElement.offsetWidth;
|
||||
this.updateCachedRightMenuContentWidth();
|
||||
this.resize(rightElement.offsetWidth);
|
||||
this.brandTextObserver.observe(this.brandText()!.nativeElement);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
ngOnDestroy() {
|
||||
this.menuResizeObserver?.disconnect();
|
||||
this.textResizeObserver?.disconnect();
|
||||
this.childWidths.clear();
|
||||
this.resizeObserver?.disconnect();
|
||||
this.menuItemsObserver?.disconnect();
|
||||
this.brandTextObserver?.disconnect();
|
||||
}
|
||||
|
||||
private updateCachedRightMenuContentWidth() {
|
||||
const gap = 48;
|
||||
const widths = Array.from(this.childWidths.values());
|
||||
if (widths.length === 0) {
|
||||
this.cachedRightMenuContentWidth = 0;
|
||||
return;
|
||||
private updateExpandStatus() {
|
||||
let menuContentWidth = this.menuLeftWidth + this.menuRightWidth;
|
||||
let enoughSpace = this.menuWidth > menuContentWidth + HeaderMenu.LOGICAL_GAP;
|
||||
let initialExpandStage = this.expandStage();
|
||||
|
||||
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 =
|
||||
widths.reduce((acc, w) => acc + w, 0) + (widths.length - 1) * gap;
|
||||
if (
|
||||
// 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) {
|
||||
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));
|
||||
onHamburgerClick(): void {
|
||||
this.popupService.open(NavigationMenu, {
|
||||
position: { top: '84px', right: '20px' },
|
||||
});
|
||||
}
|
||||
|
||||
onSettingsClick() {
|
||||
|
||||
@@ -0,0 +1,23 @@
|
||||
<app-popup [position]="position()" (closeRequest)="close()">
|
||||
<div header-left class="menu-header-title">
|
||||
<span class="material-symbols-outlined">menu</span>
|
||||
<span>{{ translation.menu.menu }}</span>
|
||||
</div>
|
||||
|
||||
<div class="menu-content">
|
||||
<div class="menu-section">
|
||||
<a class="menu-item nav-link" [routerLink]="['/levels']" (click)="close()">{{ translation.menu.levels }}</a>
|
||||
<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.about }}</span>
|
||||
</div>
|
||||
|
||||
<hr class="menu-divider" />
|
||||
|
||||
<div class="menu-section">
|
||||
<a class="menu-item nav-link" [routerLink]="['/known-issues']" (click)="close()">{{ translation.menu.knownIssues }}</a>
|
||||
<span class="menu-item dummy-link"><strong>{{ translation.menu.login }}</strong></span>
|
||||
<span class="menu-item dummy-link">{{ translation.menu.signup }}</span>
|
||||
</div>
|
||||
</div>
|
||||
</app-popup>
|
||||
@@ -0,0 +1,73 @@
|
||||
:host {
|
||||
display: block;
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.menu-header-title {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
font-size: 18px;
|
||||
|
||||
.material-symbols-outlined {
|
||||
font-size: 24px;
|
||||
}
|
||||
}
|
||||
|
||||
.menu-content {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
min-width: 276px;
|
||||
padding-bottom: 12px;
|
||||
gap: 12px;
|
||||
}
|
||||
|
||||
.menu-section {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
}
|
||||
|
||||
.menu-divider {
|
||||
height: 1px;
|
||||
border: none;
|
||||
background-color: light-dark(oklch(0 0 0 / 20%), oklch(1 0 0 / 20%));
|
||||
margin: 0 6px;
|
||||
}
|
||||
|
||||
.menu-item {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
align-content: center;
|
||||
height: 40px;
|
||||
padding-left: 12px;
|
||||
text-decoration: none;
|
||||
color: inherit;
|
||||
font-size: 18px;
|
||||
cursor: pointer;
|
||||
vertical-align: middle;
|
||||
transition: background-color 0.2s;
|
||||
border-radius: 4px;
|
||||
|
||||
.material-symbols-outlined {
|
||||
font-size: 24px;
|
||||
color: light-dark(oklch(0.4 0 0), oklch(0.8 0 0));
|
||||
}
|
||||
|
||||
strong {
|
||||
font-weight: 700;
|
||||
}
|
||||
|
||||
&.nav-link {
|
||||
font-weight: 700;
|
||||
color: oklch(0.6 0.15 250);
|
||||
transition: opacity 0.3s;
|
||||
|
||||
&:hover {
|
||||
opacity: 0.7;
|
||||
}
|
||||
}
|
||||
|
||||
&.dummy-link {
|
||||
cursor: not-allowed;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
import { Component, inject, input } from '@angular/core';
|
||||
import { RouterLink } from '@angular/router';
|
||||
import { PopupComponent, PopupPosition } from '../../components/popup/popup';
|
||||
import { PopupService } from '../../services/popup.service';
|
||||
import { TranslationService } from '../../services/translation.service';
|
||||
|
||||
@Component({
|
||||
selector: 'navigation-menu',
|
||||
standalone: true,
|
||||
imports: [PopupComponent, RouterLink],
|
||||
templateUrl: './navigation-menu.html',
|
||||
styleUrl: './navigation-menu.scss',
|
||||
})
|
||||
export class NavigationMenu {
|
||||
private popupService = inject(PopupService);
|
||||
protected translation = inject(TranslationService).translation;
|
||||
|
||||
/**
|
||||
* 팝업의 위치
|
||||
*/
|
||||
position = input<PopupPosition | 'center'>('center');
|
||||
|
||||
close() {
|
||||
this.popupService.close(NavigationMenu);
|
||||
}
|
||||
}
|
||||
@@ -23,6 +23,7 @@
|
||||
flex-direction: column;
|
||||
gap: 16px;
|
||||
|
||||
padding-top: 4px;
|
||||
padding-bottom: 12px;
|
||||
}
|
||||
|
||||
@@ -16,6 +16,7 @@ export const EN = {
|
||||
knownIssues: 'Known Issues',
|
||||
login: 'Login',
|
||||
signup: 'Signup',
|
||||
menu: 'Menu',
|
||||
},
|
||||
common: {
|
||||
selectOption: 'Select Option...',
|
||||
|
||||
@@ -18,6 +18,7 @@ export const JP: Translation = {
|
||||
knownIssues: '既知の問題',
|
||||
login: 'ログイン',
|
||||
signup: '新規登録',
|
||||
menu: 'メニュー',
|
||||
},
|
||||
common: {
|
||||
selectOption: 'オプションを選択...',
|
||||
|
||||
@@ -18,6 +18,7 @@ export const KR: Translation = {
|
||||
knownIssues: '알려진 문제',
|
||||
login: '로그인',
|
||||
signup: '회원가입',
|
||||
menu: '메뉴',
|
||||
},
|
||||
common: {
|
||||
selectOption: '옵션 선택...',
|
||||
|
||||
Reference in new issue
Block a user