feat: 모바일 메인 패널 순서 설정 추가
This commit is contained in:
@@ -1231,7 +1231,9 @@ test('내 정보&설정의 지난 플레이는 기본 탐색과 분리되어 오
|
|||||||
const actions = element.querySelector<HTMLElement>('.title-actions')!.getBoundingClientRect();
|
const actions = element.querySelector<HTMLElement>('.title-actions')!.getBoundingClientRect();
|
||||||
const navigation = element.querySelector<HTMLElement>('.navigation-actions')!.getBoundingClientRect();
|
const navigation = element.querySelector<HTMLElement>('.navigation-actions')!.getBoundingClientRect();
|
||||||
const back = element.querySelector<HTMLAnchorElement>('.navigation-actions a')!.getBoundingClientRect();
|
const back = element.querySelector<HTMLAnchorElement>('.navigation-actions a')!.getBoundingClientRect();
|
||||||
const refresh = element.querySelector<HTMLButtonElement>('.navigation-actions button')!.getBoundingClientRect();
|
const refresh = element
|
||||||
|
.querySelector<HTMLButtonElement>('.navigation-actions button')!
|
||||||
|
.getBoundingClientRect();
|
||||||
const past = element.querySelector<HTMLAnchorElement>('.past-plays-link')!.getBoundingClientRect();
|
const past = element.querySelector<HTMLAnchorElement>('.past-plays-link')!.getBoundingClientRect();
|
||||||
const pastStyle = getComputedStyle(element.querySelector<HTMLAnchorElement>('.past-plays-link')!);
|
const pastStyle = getComputedStyle(element.querySelector<HTMLAnchorElement>('.past-plays-link')!);
|
||||||
return {
|
return {
|
||||||
@@ -1269,6 +1271,77 @@ test('내 정보&설정의 지난 플레이는 기본 탐색과 분리되어 오
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('내 정보&설정에서 모바일 메인 패널을 드래그하거나 버튼으로 재정렬하고 Ref 순서로 복원한다', async ({ page }) => {
|
||||||
|
const state: FixtureState = { permission: 'head', myset: 3, settingMutations: [], accessPages: [] };
|
||||||
|
await install(page, state);
|
||||||
|
await page.setViewportSize({ width: 390, height: 844 });
|
||||||
|
await page.goto('my-page');
|
||||||
|
|
||||||
|
await page.getByRole('button', { name: '순서 바꾸기', exact: true }).click();
|
||||||
|
const dialog = page.getByRole('dialog', { name: '모바일 레이아웃 순서 바꾸기' });
|
||||||
|
await expect(dialog).toBeVisible();
|
||||||
|
const readOrder = () =>
|
||||||
|
dialog
|
||||||
|
.locator('[data-mobile-layout-id]')
|
||||||
|
.evaluateAll((elements) => elements.map((element) => element.getAttribute('data-mobile-layout-id')));
|
||||||
|
const defaultOrder = [
|
||||||
|
'commands',
|
||||||
|
'nation-menu',
|
||||||
|
'nation',
|
||||||
|
'general',
|
||||||
|
'city',
|
||||||
|
'map',
|
||||||
|
'records',
|
||||||
|
'global-menu',
|
||||||
|
'messages',
|
||||||
|
];
|
||||||
|
await expect.poll(readOrder).toEqual(defaultOrder);
|
||||||
|
|
||||||
|
await dialog
|
||||||
|
.locator('[data-mobile-layout-id="messages"]')
|
||||||
|
.dragTo(dialog.locator('[data-mobile-layout-id="commands"]'));
|
||||||
|
await expect
|
||||||
|
.poll(readOrder)
|
||||||
|
.toEqual(['messages', 'commands', 'nation-menu', 'nation', 'general', 'city', 'map', 'records', 'global-menu']);
|
||||||
|
await dialog.getByRole('button', { name: '지도 위로' }).click();
|
||||||
|
await expect
|
||||||
|
.poll(readOrder)
|
||||||
|
.toEqual(['messages', 'commands', 'nation-menu', 'nation', 'general', 'map', 'city', 'records', 'global-menu']);
|
||||||
|
|
||||||
|
const dialogGeometry = await dialog.evaluate((element) => {
|
||||||
|
const rect = element.getBoundingClientRect();
|
||||||
|
const firstItem = element.querySelector<HTMLElement>('[data-mobile-layout-id]')?.getBoundingClientRect();
|
||||||
|
const moveButton = element.querySelector<HTMLButtonElement>('[aria-label$="아래로"]')?.getBoundingClientRect();
|
||||||
|
return {
|
||||||
|
rect: rect.toJSON(),
|
||||||
|
firstItem: firstItem?.toJSON() ?? null,
|
||||||
|
moveButton: moveButton?.toJSON() ?? null,
|
||||||
|
overflowX: getComputedStyle(element).overflowX,
|
||||||
|
documentWidth: document.documentElement.scrollWidth,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
expect(dialogGeometry.rect.left).toBeGreaterThanOrEqual(0);
|
||||||
|
expect(dialogGeometry.rect.right).toBeLessThanOrEqual(390);
|
||||||
|
expect(dialogGeometry.firstItem?.height).toBeGreaterThanOrEqual(44);
|
||||||
|
expect(dialogGeometry.moveButton?.width).toBeGreaterThanOrEqual(36);
|
||||||
|
expect(dialogGeometry.documentWidth).toBe(390);
|
||||||
|
await persistParityArtifact(page, 'core-my-page-mobile-layout-order-dialog', dialogGeometry);
|
||||||
|
|
||||||
|
await dialog.getByRole('button', { name: '적용', exact: true }).click();
|
||||||
|
await expect(dialog).toBeHidden();
|
||||||
|
await expect
|
||||||
|
.poll(() => page.evaluate(() => JSON.parse(localStorage.getItem('sam.mobileMainPanelOrder.v1') ?? '[]')))
|
||||||
|
.toEqual(['messages', 'commands', 'nation-menu', 'nation', 'general', 'map', 'city', 'records', 'global-menu']);
|
||||||
|
|
||||||
|
await page.getByRole('button', { name: '순서 바꾸기', exact: true }).click();
|
||||||
|
await dialog.getByRole('button', { name: 'Ref 초깃값' }).click();
|
||||||
|
await expect.poll(readOrder).toEqual(defaultOrder);
|
||||||
|
await dialog.getByRole('button', { name: '적용', exact: true }).click();
|
||||||
|
await expect
|
||||||
|
.poll(() => page.evaluate(() => JSON.parse(localStorage.getItem('sam.mobileMainPanelOrder.v1') ?? '[]')))
|
||||||
|
.toEqual(defaultOrder);
|
||||||
|
});
|
||||||
|
|
||||||
for (const [label, failure] of [
|
for (const [label, failure] of [
|
||||||
['daemon timeout', 'TIMEOUT'],
|
['daemon timeout', 'TIMEOUT'],
|
||||||
['engine transaction 오류', 'INTERNAL_SERVER_ERROR'],
|
['engine transaction 오류', 'INTERNAL_SERVER_ERROR'],
|
||||||
|
|||||||
@@ -95,11 +95,10 @@ type DashboardBundleInput = {
|
|||||||
const operationInput = (route: Route, index: number): DashboardBundleInput => {
|
const operationInput = (route: Route, index: number): DashboardBundleInput => {
|
||||||
const request = route.request();
|
const request = route.request();
|
||||||
const queryInput = new URL(request.url()).searchParams.get('input');
|
const queryInput = new URL(request.url()).searchParams.get('input');
|
||||||
const parsed = (request.postData()
|
const parsed = (request.postData() ? request.postDataJSON() : queryInput ? JSON.parse(queryInput) : {}) as Record<
|
||||||
? request.postDataJSON()
|
string,
|
||||||
: queryInput
|
unknown
|
||||||
? JSON.parse(queryInput)
|
>;
|
||||||
: {}) as Record<string, unknown>;
|
|
||||||
const entry = (parsed[String(index)] ?? parsed) as { json?: DashboardBundleInput };
|
const entry = (parsed[String(index)] ?? parsed) as { json?: DashboardBundleInput };
|
||||||
return entry.json ?? (entry as DashboardBundleInput);
|
return entry.json ?? (entry as DashboardBundleInput);
|
||||||
};
|
};
|
||||||
@@ -1558,10 +1557,7 @@ test('message targets keep reply behavior and use nation-color contrast in label
|
|||||||
|
|
||||||
await page.setViewportSize({ width: 500, height: 900 });
|
await page.setViewportSize({ width: 500, height: 900 });
|
||||||
const mobilePanel = page.locator('.mobile-message-panel');
|
const mobilePanel = page.locator('.mobile-message-panel');
|
||||||
await expect(mobilePanel.locator('.msg-plate[data-id="101"] .msg-target')).toHaveCSS(
|
await expect(mobilePanel.locator('.msg-plate[data-id="101"] .msg-target')).toHaveCSS('color', 'rgb(255, 255, 255)');
|
||||||
'color',
|
|
||||||
'rgb(255, 255, 255)'
|
|
||||||
);
|
|
||||||
await expect(mobilePanel.locator('.msg-plate[data-id="103"] .msg-target')).toHaveCSS('color', 'rgb(0, 0, 0)');
|
await expect(mobilePanel.locator('.msg-plate[data-id="103"] .msg-target')).toHaveCSS('color', 'rgb(0, 0, 0)');
|
||||||
await expect(mobilePanel.locator('#mailbox_list optgroup[label="밝은국"]')).toHaveCSS('color', 'rgb(0, 0, 0)');
|
await expect(mobilePanel.locator('#mailbox_list optgroup[label="밝은국"]')).toHaveCSS('color', 'rgb(0, 0, 0)');
|
||||||
await persistArtifact(page, `${basePath.slice(1)}-message-nation-contrast-mobile-500`);
|
await persistArtifact(page, `${basePath.slice(1)}-message-nation-contrast-mobile-500`);
|
||||||
@@ -2217,6 +2213,49 @@ test('the 939/940 boundary switches to the Ref-style 500px single document', asy
|
|||||||
]) {
|
]) {
|
||||||
await expect(page.locator(selector)).toBeVisible();
|
await expect(page.locator(selector)).toBeVisible();
|
||||||
}
|
}
|
||||||
|
const readMobilePanelOrder = () =>
|
||||||
|
page
|
||||||
|
.locator('.layout-mobile > [data-mobile-panel-id]')
|
||||||
|
.evaluateAll((elements) => elements.map((element) => element.getAttribute('data-mobile-panel-id')));
|
||||||
|
await expect
|
||||||
|
.poll(readMobilePanelOrder)
|
||||||
|
.toEqual(['commands', 'nation-menu', 'nation', 'general', 'city', 'map', 'records', 'global-menu', 'messages']);
|
||||||
|
await page.evaluate(() => {
|
||||||
|
localStorage.setItem(
|
||||||
|
'sam.mobileMainPanelOrder.v1',
|
||||||
|
JSON.stringify([
|
||||||
|
'messages',
|
||||||
|
'map',
|
||||||
|
'commands',
|
||||||
|
'nation-menu',
|
||||||
|
'nation',
|
||||||
|
'general',
|
||||||
|
'city',
|
||||||
|
'records',
|
||||||
|
'global-menu',
|
||||||
|
])
|
||||||
|
);
|
||||||
|
document.dispatchEvent(new CustomEvent('sam-mobile-main-panel-order-changed'));
|
||||||
|
});
|
||||||
|
await expect
|
||||||
|
.poll(readMobilePanelOrder)
|
||||||
|
.toEqual(['messages', 'map', 'commands', 'nation-menu', 'nation', 'general', 'city', 'records', 'global-menu']);
|
||||||
|
const customPanelGeometry = await page.locator('.layout-mobile > [data-mobile-panel-id]').evaluateAll((elements) =>
|
||||||
|
elements.map((element) => {
|
||||||
|
const rect = element.getBoundingClientRect();
|
||||||
|
return {
|
||||||
|
id: element.getAttribute('data-mobile-panel-id'),
|
||||||
|
top: rect.top,
|
||||||
|
bottom: rect.bottom,
|
||||||
|
left: rect.left,
|
||||||
|
right: rect.right,
|
||||||
|
};
|
||||||
|
})
|
||||||
|
);
|
||||||
|
expect(customPanelGeometry.every(({ left, right }) => left >= 0 && right <= 500)).toBe(true);
|
||||||
|
expect(
|
||||||
|
customPanelGeometry.every((panel, index) => index === 0 || panel.top >= customPanelGeometry[index - 1]!.bottom)
|
||||||
|
).toBe(true);
|
||||||
await persistArtifact(page, `${basePath.slice(1)}-mobile-500`);
|
await persistArtifact(page, `${basePath.slice(1)}-mobile-500`);
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -3040,9 +3079,9 @@ for (const viewport of [
|
|||||||
await refreshActivityAndCommands();
|
await refreshActivityAndCommands();
|
||||||
await expect(picker.getByLabel('장비 종류', { exact: true })).toHaveValue('weapon');
|
await expect(picker.getByLabel('장비 종류', { exact: true })).toHaveValue('weapon');
|
||||||
await expect(picker.getByLabel('장비', { exact: true })).toHaveValue('청룡언월도');
|
await expect(picker.getByLabel('장비', { exact: true })).toHaveValue('청룡언월도');
|
||||||
await expect.poll(() => page.evaluate(() => document.documentElement.scrollWidth)).toBeLessThanOrEqual(
|
await expect
|
||||||
viewport.width
|
.poll(() => page.evaluate(() => document.documentElement.scrollWidth))
|
||||||
);
|
.toBeLessThanOrEqual(viewport.width);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,85 @@
|
|||||||
|
export const MOBILE_MAIN_PANEL_ORDER_STORAGE_KEY = 'sam.mobileMainPanelOrder.v1';
|
||||||
|
export const MOBILE_MAIN_PANEL_ORDER_CHANGED_EVENT = 'sam-mobile-main-panel-order-changed';
|
||||||
|
|
||||||
|
export const MOBILE_MAIN_PANEL_DEFINITIONS = [
|
||||||
|
{ id: 'commands', label: '명령 목록' },
|
||||||
|
{ id: 'nation-menu', label: '국가 메뉴' },
|
||||||
|
{ id: 'nation', label: '국가 정보' },
|
||||||
|
{ id: 'general', label: '장수 정보' },
|
||||||
|
{ id: 'city', label: '도시 정보' },
|
||||||
|
{ id: 'map', label: '지도' },
|
||||||
|
{ id: 'records', label: '기록 영역' },
|
||||||
|
{ id: 'global-menu', label: '공통 메뉴' },
|
||||||
|
{ id: 'messages', label: '서신' },
|
||||||
|
] as const;
|
||||||
|
|
||||||
|
export type MobileMainPanelId = (typeof MOBILE_MAIN_PANEL_DEFINITIONS)[number]['id'];
|
||||||
|
|
||||||
|
export const DEFAULT_MOBILE_MAIN_PANEL_ORDER: readonly MobileMainPanelId[] = MOBILE_MAIN_PANEL_DEFINITIONS.map(
|
||||||
|
({ id }) => id
|
||||||
|
);
|
||||||
|
|
||||||
|
const mobilePanelIds = new Set<string>(DEFAULT_MOBILE_MAIN_PANEL_ORDER);
|
||||||
|
|
||||||
|
export const normalizeMobileMainPanelOrder = (value: unknown): MobileMainPanelId[] => {
|
||||||
|
const source = Array.isArray(value) ? value : [];
|
||||||
|
const seen = new Set<string>();
|
||||||
|
const normalized: MobileMainPanelId[] = [];
|
||||||
|
|
||||||
|
for (const item of source) {
|
||||||
|
if (typeof item !== 'string' || !mobilePanelIds.has(item) || seen.has(item)) continue;
|
||||||
|
seen.add(item);
|
||||||
|
normalized.push(item as MobileMainPanelId);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (const item of DEFAULT_MOBILE_MAIN_PANEL_ORDER) {
|
||||||
|
if (!seen.has(item)) normalized.push(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
return normalized;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const parseMobileMainPanelOrder = (raw: string | null): MobileMainPanelId[] => {
|
||||||
|
if (!raw) return [...DEFAULT_MOBILE_MAIN_PANEL_ORDER];
|
||||||
|
try {
|
||||||
|
return normalizeMobileMainPanelOrder(JSON.parse(raw));
|
||||||
|
} catch {
|
||||||
|
return [...DEFAULT_MOBILE_MAIN_PANEL_ORDER];
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const loadMobileMainPanelOrder = (storage: Pick<Storage, 'getItem'> = window.localStorage) =>
|
||||||
|
parseMobileMainPanelOrder(storage.getItem(MOBILE_MAIN_PANEL_ORDER_STORAGE_KEY));
|
||||||
|
|
||||||
|
export const saveMobileMainPanelOrder = (
|
||||||
|
value: readonly MobileMainPanelId[],
|
||||||
|
storage: Pick<Storage, 'setItem'> = window.localStorage
|
||||||
|
): MobileMainPanelId[] => {
|
||||||
|
const normalized = normalizeMobileMainPanelOrder(value);
|
||||||
|
storage.setItem(MOBILE_MAIN_PANEL_ORDER_STORAGE_KEY, JSON.stringify(normalized));
|
||||||
|
if (typeof document !== 'undefined') {
|
||||||
|
document.dispatchEvent(new CustomEvent(MOBILE_MAIN_PANEL_ORDER_CHANGED_EVENT));
|
||||||
|
}
|
||||||
|
return normalized;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const moveMobileMainPanel = (
|
||||||
|
value: readonly MobileMainPanelId[],
|
||||||
|
fromIndex: number,
|
||||||
|
toIndex: number
|
||||||
|
): MobileMainPanelId[] => {
|
||||||
|
const normalized = normalizeMobileMainPanelOrder(value);
|
||||||
|
if (
|
||||||
|
fromIndex < 0 ||
|
||||||
|
fromIndex >= normalized.length ||
|
||||||
|
toIndex < 0 ||
|
||||||
|
toIndex >= normalized.length ||
|
||||||
|
fromIndex === toIndex
|
||||||
|
) {
|
||||||
|
return normalized;
|
||||||
|
}
|
||||||
|
const [moved] = normalized.splice(fromIndex, 1);
|
||||||
|
if (!moved) return normalized;
|
||||||
|
normalized.splice(toIndex, 0, moved);
|
||||||
|
return normalized;
|
||||||
|
};
|
||||||
@@ -29,6 +29,12 @@ import { useMainDashboardStore } from '../stores/mainDashboard';
|
|||||||
import { useGameFeedback } from '../composables/useGameFeedback';
|
import { useGameFeedback } from '../composables/useGameFeedback';
|
||||||
import { trpc } from '../utils/trpc';
|
import { trpc } from '../utils/trpc';
|
||||||
import type { CommandPatternEntry } from '../components/command/types';
|
import type { CommandPatternEntry } from '../components/command/types';
|
||||||
|
import {
|
||||||
|
loadMobileMainPanelOrder,
|
||||||
|
MOBILE_MAIN_PANEL_ORDER_CHANGED_EVENT,
|
||||||
|
MOBILE_MAIN_PANEL_ORDER_STORAGE_KEY,
|
||||||
|
type MobileMainPanelId,
|
||||||
|
} from '../utils/mobileMainPanelOrder';
|
||||||
|
|
||||||
const session = useSessionStore();
|
const session = useSessionStore();
|
||||||
const dashboard = useMainDashboardStore();
|
const dashboard = useMainDashboardStore();
|
||||||
@@ -38,8 +44,20 @@ const isMobile = useMediaQuery('(max-width: 939.98px)');
|
|||||||
const npcMode = ref(0);
|
const npcMode = ref(0);
|
||||||
const globalNavigation = ref<MainNavigationEntry[]>(defaultGlobalNavigation);
|
const globalNavigation = ref<MainNavigationEntry[]>(defaultGlobalNavigation);
|
||||||
const versionDialog = ref<HTMLDialogElement | null>(null);
|
const versionDialog = ref<HTMLDialogElement | null>(null);
|
||||||
|
const mobilePanelOrder = ref(loadMobileMainPanelOrder());
|
||||||
const navigationUrl = (import.meta.env.VITE_GATEWAY_API_URL ?? '/api/trpc').replace(/\/trpc\/?$/u, '/navigation');
|
const navigationUrl = (import.meta.env.VITE_GATEWAY_API_URL ?? '/api/trpc').replace(/\/trpc\/?$/u, '/navigation');
|
||||||
|
|
||||||
|
const reloadMobilePanelOrder = () => {
|
||||||
|
mobilePanelOrder.value = loadMobileMainPanelOrder();
|
||||||
|
};
|
||||||
|
const handleMobilePanelStorage = (event: StorageEvent) => {
|
||||||
|
if (event.key === MOBILE_MAIN_PANEL_ORDER_STORAGE_KEY) reloadMobilePanelOrder();
|
||||||
|
};
|
||||||
|
const isFlushMobilePanel = (panelId: MobileMainPanelId, index: number): boolean => {
|
||||||
|
const previous = mobilePanelOrder.value[index - 1];
|
||||||
|
return (panelId === 'general' && previous === 'nation') || (panelId === 'city' && previous === 'general');
|
||||||
|
};
|
||||||
|
|
||||||
const {
|
const {
|
||||||
loading,
|
loading,
|
||||||
refreshing,
|
refreshing,
|
||||||
@@ -100,10 +118,14 @@ onUnmounted(() => {
|
|||||||
clearTimeout(surveyNoticeTimer);
|
clearTimeout(surveyNoticeTimer);
|
||||||
}
|
}
|
||||||
dashboard.stopRealtime();
|
dashboard.stopRealtime();
|
||||||
|
window.removeEventListener('storage', handleMobilePanelStorage);
|
||||||
|
document.removeEventListener(MOBILE_MAIN_PANEL_ORDER_CHANGED_EVENT, reloadMobilePanelOrder);
|
||||||
});
|
});
|
||||||
|
|
||||||
onMounted(() => {
|
onMounted(() => {
|
||||||
dashboard.startRealtime();
|
dashboard.startRealtime();
|
||||||
|
window.addEventListener('storage', handleMobilePanelStorage);
|
||||||
|
document.addEventListener(MOBILE_MAIN_PANEL_ORDER_CHANGED_EVENT, reloadMobilePanelOrder);
|
||||||
void fetch(navigationUrl, { headers: { Accept: 'application/json' } })
|
void fetch(navigationUrl, { headers: { Accept: 'application/json' } })
|
||||||
.then(async (response) => {
|
.then(async (response) => {
|
||||||
if (!response.ok) throw new Error(`메뉴 설정 조회 실패: HTTP ${response.status}`);
|
if (!response.ok) throw new Error(`메뉴 설정 조회 실패: HTTP ${response.status}`);
|
||||||
@@ -130,10 +152,7 @@ const repeatGeneralTurns = (amount: number) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const loadMainData = async () => {
|
const loadMainData = async () => {
|
||||||
const [, worldState] = await Promise.all([
|
const [, worldState] = await Promise.all([dashboard.loadMainData(), trpc.world.getState.query().catch(() => null)]);
|
||||||
dashboard.loadMainData(),
|
|
||||||
trpc.world.getState.query().catch(() => null),
|
|
||||||
]);
|
|
||||||
npcMode.value = worldState?.config.npcMode ?? 0;
|
npcMode.value = worldState?.config.npcMode ?? 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -239,7 +258,8 @@ watch(
|
|||||||
</aside>
|
</aside>
|
||||||
|
|
||||||
<section v-if="isMobile" class="layout-mobile">
|
<section v-if="isMobile" class="layout-mobile">
|
||||||
<div class="mobile-panel">
|
<template v-for="(panelId, panelIndex) in mobilePanelOrder" :key="panelId">
|
||||||
|
<div v-if="panelId === 'commands'" class="mobile-panel" data-mobile-panel-id="commands">
|
||||||
<PanelCard title="명령 목록" subtitle="예턴/명령 배치 영역" data-main-target="commands">
|
<PanelCard title="명령 목록" subtitle="예턴/명령 배치 영역" data-main-target="commands">
|
||||||
<CommandListPanel
|
<CommandListPanel
|
||||||
:command-table="commandTable"
|
:command-table="commandTable"
|
||||||
@@ -261,7 +281,7 @@ watch(
|
|||||||
</PanelCard>
|
</PanelCard>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mobile-panel">
|
<div v-else-if="panelId === 'nation-menu'" class="mobile-panel" data-mobile-panel-id="nation-menu">
|
||||||
<MainNationMenu
|
<MainNationMenu
|
||||||
class="nation-menu-middle"
|
class="nation-menu-middle"
|
||||||
:access="nationAccess"
|
:access="nationAccess"
|
||||||
@@ -270,25 +290,45 @@ watch(
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mobile-panel">
|
<div v-else-if="panelId === 'nation'" class="mobile-panel" data-mobile-panel-id="nation">
|
||||||
<PanelCard title="국가 정보" data-main-target="nation">
|
<PanelCard title="국가 정보" data-main-target="nation">
|
||||||
<NationBasicCard :nation="nation" :loading="loading" />
|
<NationBasicCard :nation="nation" :loading="loading" />
|
||||||
</PanelCard>
|
</PanelCard>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-else-if="panelId === 'general'"
|
||||||
|
class="mobile-panel"
|
||||||
|
:class="{ 'mobile-panel--flush': isFlushMobilePanel(panelId, panelIndex) }"
|
||||||
|
data-mobile-panel-id="general"
|
||||||
|
>
|
||||||
<PanelCard title="장수 스탯" data-main-target="general">
|
<PanelCard title="장수 스탯" data-main-target="general">
|
||||||
<GeneralBasicCard :general="general" :loading="loading" :nation-color="nation?.color" />
|
<GeneralBasicCard :general="general" :loading="loading" :nation-color="nation?.color" />
|
||||||
</PanelCard>
|
</PanelCard>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div
|
||||||
|
v-else-if="panelId === 'city'"
|
||||||
|
class="mobile-panel"
|
||||||
|
:class="{ 'mobile-panel--flush': isFlushMobilePanel(panelId, panelIndex) }"
|
||||||
|
data-mobile-panel-id="city"
|
||||||
|
>
|
||||||
<PanelCard title="도시 정보" data-main-target="city">
|
<PanelCard title="도시 정보" data-main-target="city">
|
||||||
<CityBasicCard :city="city" :loading="loading" />
|
<CityBasicCard :city="city" :loading="loading" />
|
||||||
</PanelCard>
|
</PanelCard>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mobile-panel">
|
<div v-else-if="panelId === 'map'" class="mobile-panel" data-mobile-panel-id="map">
|
||||||
<PanelCard title="지도" data-main-target="map">
|
<PanelCard title="지도" data-main-target="map">
|
||||||
<MapViewer :map-data="worldMap" :map-layout="mapLayout" :loading="loading" />
|
<MapViewer :map-data="worldMap" :map-layout="mapLayout" :loading="loading" />
|
||||||
</PanelCard>
|
</PanelCard>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mobile-panel record-zone-mobile">
|
<div
|
||||||
|
v-else-if="panelId === 'records'"
|
||||||
|
class="mobile-panel record-zone-mobile"
|
||||||
|
data-mobile-panel-id="records"
|
||||||
|
>
|
||||||
<RecordPanel title="장수 동향" data-main-target="global-records">
|
<RecordPanel title="장수 동향" data-main-target="global-records">
|
||||||
<SkeletonLines v-if="loading" :lines="4" />
|
<SkeletonLines v-if="loading" :lines="4" />
|
||||||
<div v-else-if="recordsError" class="record-error" role="alert">{{ recordsError }}</div>
|
<div v-else-if="recordsError" class="record-error" role="alert">{{ recordsError }}</div>
|
||||||
@@ -334,15 +374,17 @@ watch(
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<MainGlobalMenu
|
<MainGlobalMenu
|
||||||
|
v-else-if="panelId === 'global-menu'"
|
||||||
class="common-menu-middle"
|
class="common-menu-middle"
|
||||||
data-menu-position="middle"
|
data-menu-position="middle"
|
||||||
|
data-mobile-panel-id="global-menu"
|
||||||
:npc-mode="npcMode"
|
:npc-mode="npcMode"
|
||||||
:vote-active="voteActive"
|
:vote-active="voteActive"
|
||||||
:entries="globalNavigation"
|
:entries="globalNavigation"
|
||||||
@action="handleNavigationAction"
|
@action="handleNavigationAction"
|
||||||
/>
|
/>
|
||||||
|
|
||||||
<div class="mobile-panel">
|
<div v-else class="mobile-panel" data-mobile-panel-id="messages">
|
||||||
<MessagePanel
|
<MessagePanel
|
||||||
class="mobile-message-panel"
|
class="mobile-message-panel"
|
||||||
:messages="messages"
|
:messages="messages"
|
||||||
@@ -364,6 +406,7 @@ watch(
|
|||||||
@delete="dashboard.deleteMessage"
|
@delete="dashboard.deleteMessage"
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
</template>
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section v-else class="layout-desktop">
|
<section v-else class="layout-desktop">
|
||||||
@@ -798,8 +841,8 @@ button {
|
|||||||
gap: 0;
|
gap: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
.layout-mobile > .mobile-panel:nth-of-type(3) {
|
.layout-mobile > .mobile-panel--flush {
|
||||||
gap: 0;
|
margin-top: -4px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.layout-mobile [data-main-target='commands'] {
|
.layout-mobile [data-main-target='commands'] {
|
||||||
|
|||||||
@@ -9,11 +9,19 @@ import { resolveGeneralIconUrl, useDefaultGeneralIcon } from '../utils/generalIc
|
|||||||
import LegacyGeneralProgress from '../components/ui/LegacyGeneralProgress.vue';
|
import LegacyGeneralProgress from '../components/ui/LegacyGeneralProgress.vue';
|
||||||
import GeneralBasicCard from '../components/main/GeneralBasicCard.vue';
|
import GeneralBasicCard from '../components/main/GeneralBasicCard.vue';
|
||||||
import { useGameFeedback } from '../composables/useGameFeedback';
|
import { useGameFeedback } from '../composables/useGameFeedback';
|
||||||
|
import {
|
||||||
|
DEFAULT_MOBILE_MAIN_PANEL_ORDER,
|
||||||
|
loadMobileMainPanelOrder,
|
||||||
|
MOBILE_MAIN_PANEL_DEFINITIONS,
|
||||||
|
moveMobileMainPanel,
|
||||||
|
saveMobileMainPanelOrder,
|
||||||
|
type MobileMainPanelId,
|
||||||
|
} from '../utils/mobileMainPanelOrder';
|
||||||
|
|
||||||
const SCREEN_MODE_KEY = 'sam.screenMode';
|
const SCREEN_MODE_KEY = 'sam.screenMode';
|
||||||
const CUSTOM_CSS_KEY = 'sam_customCSS';
|
const CUSTOM_CSS_KEY = 'sam_customCSS';
|
||||||
const PENDING_DIE_ON_PRESTART_KEY = 'sam.pending.dieOnPrestart';
|
const PENDING_DIE_ON_PRESTART_KEY = 'sam.pending.dieOnPrestart';
|
||||||
const { error: showErrorToast, showDialog } = useGameFeedback();
|
const { success: showSuccessToast, error: showErrorToast, showDialog } = useGameFeedback();
|
||||||
type ScreenMode = 'auto' | '500px' | '1000px';
|
type ScreenMode = 'auto' | '500px' | '1000px';
|
||||||
type LogType = 'generalHistory' | 'battleDetail' | 'battleResult' | 'generalAction';
|
type LogType = 'generalHistory' | 'battleDetail' | 'battleResult' | 'generalAction';
|
||||||
type ItemSlotKey = 'horse' | 'weapon' | 'book' | 'item';
|
type ItemSlotKey = 'horse' | 'weapon' | 'book' | 'item';
|
||||||
@@ -48,6 +56,9 @@ const screenMode = ref<ScreenMode>('auto');
|
|||||||
const customCss = ref('');
|
const customCss = ref('');
|
||||||
const selectedIconId = ref('');
|
const selectedIconId = ref('');
|
||||||
const cssSaving = ref(false);
|
const cssSaving = ref(false);
|
||||||
|
const mobileLayoutDialog = ref<HTMLDialogElement | null>(null);
|
||||||
|
const mobileLayoutOrder = ref<MobileMainPanelId[]>(loadMobileMainPanelOrder());
|
||||||
|
const mobileLayoutDragIndex = ref<number | null>(null);
|
||||||
const session = useSessionStore();
|
const session = useSessionStore();
|
||||||
let cssTimer: number | null = null;
|
let cssTimer: number | null = null;
|
||||||
const readPendingDieOnPrestartId = (): string => {
|
const readPendingDieOnPrestartId = (): string => {
|
||||||
@@ -169,6 +180,43 @@ const items = computed<Array<{ key: ItemSlotKey; slotName: string; displayName:
|
|||||||
);
|
);
|
||||||
const iconChoices = computed(() => data.value?.iconChoices ?? []);
|
const iconChoices = computed(() => data.value?.iconChoices ?? []);
|
||||||
const selectedIcon = computed(() => iconChoices.value.find((icon) => icon.id === selectedIconId.value) ?? null);
|
const selectedIcon = computed(() => iconChoices.value.find((icon) => icon.id === selectedIconId.value) ?? null);
|
||||||
|
const mobileLayoutLabels = Object.fromEntries(
|
||||||
|
MOBILE_MAIN_PANEL_DEFINITIONS.map(({ id, label }) => [id, label])
|
||||||
|
) as Record<MobileMainPanelId, string>;
|
||||||
|
|
||||||
|
const openMobileLayoutDialog = () => {
|
||||||
|
mobileLayoutOrder.value = loadMobileMainPanelOrder();
|
||||||
|
mobileLayoutDialog.value?.showModal();
|
||||||
|
window.requestAnimationFrame(() => mobileLayoutDialog.value?.querySelector<HTMLButtonElement>('button')?.focus());
|
||||||
|
};
|
||||||
|
|
||||||
|
const moveMobileLayoutItem = (fromIndex: number, toIndex: number) => {
|
||||||
|
mobileLayoutOrder.value = moveMobileMainPanel(mobileLayoutOrder.value, fromIndex, toIndex);
|
||||||
|
};
|
||||||
|
|
||||||
|
const startMobileLayoutDrag = (event: DragEvent, index: number) => {
|
||||||
|
mobileLayoutDragIndex.value = index;
|
||||||
|
event.dataTransfer?.setData('text/plain', mobileLayoutOrder.value[index] ?? '');
|
||||||
|
if (event.dataTransfer) event.dataTransfer.effectAllowed = 'move';
|
||||||
|
};
|
||||||
|
|
||||||
|
const dropMobileLayoutItem = (event: DragEvent, targetIndex: number) => {
|
||||||
|
event.preventDefault();
|
||||||
|
const sourceIndex = mobileLayoutDragIndex.value;
|
||||||
|
mobileLayoutDragIndex.value = null;
|
||||||
|
if (sourceIndex === null) return;
|
||||||
|
moveMobileLayoutItem(sourceIndex, targetIndex);
|
||||||
|
};
|
||||||
|
|
||||||
|
const resetMobileLayoutOrder = () => {
|
||||||
|
mobileLayoutOrder.value = [...DEFAULT_MOBILE_MAIN_PANEL_ORDER];
|
||||||
|
};
|
||||||
|
|
||||||
|
const applyMobileLayoutOrder = () => {
|
||||||
|
mobileLayoutOrder.value = saveMobileMainPanelOrder(mobileLayoutOrder.value);
|
||||||
|
mobileLayoutDialog.value?.close();
|
||||||
|
showSuccessToast('모바일 메인 레이아웃 순서를 저장했습니다.');
|
||||||
|
};
|
||||||
|
|
||||||
const autorunUser = computed(() => asRecord(world.value?.meta.autorun_user));
|
const autorunUser = computed(() => asRecord(world.value?.meta.autorun_user));
|
||||||
const showAutoNationTurn = computed(() => asRecord(autorunUser.value.options).chief !== false);
|
const showAutoNationTurn = computed(() => asRecord(autorunUser.value.options).chief !== false);
|
||||||
@@ -581,6 +629,16 @@ onMounted(() => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<div class="mobile-layout-setting-row">
|
||||||
|
<span>
|
||||||
|
모바일 레이아웃 순서 바꾸기<br />
|
||||||
|
<small>500px 메인 화면의 패널 순서를 이 기기에 저장합니다.</small>
|
||||||
|
</span>
|
||||||
|
<button class="mobile-layout-open" type="button" @click="openMobileLayoutDialog">
|
||||||
|
순서 바꾸기
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="item-title">아이템 파기</div>
|
<div class="item-title">아이템 파기</div>
|
||||||
<div class="item-group">
|
<div class="item-group">
|
||||||
<button
|
<button
|
||||||
@@ -635,6 +693,61 @@ onMounted(() => {
|
|||||||
삼국지 모의전투 HiDCHe / KOEI의 이미지를 사용, 응용하였습니다 / 제작: HideD / Credit
|
삼국지 모의전투 HiDCHe / KOEI의 이미지를 사용, 응용하였습니다 / 제작: HideD / Credit
|
||||||
</footer>
|
</footer>
|
||||||
</main>
|
</main>
|
||||||
|
<dialog
|
||||||
|
ref="mobileLayoutDialog"
|
||||||
|
class="mobile-layout-dialog"
|
||||||
|
aria-labelledby="mobile-layout-dialog-title"
|
||||||
|
@close="mobileLayoutDragIndex = null"
|
||||||
|
>
|
||||||
|
<div class="mobile-layout-dialog__header">
|
||||||
|
<h2 id="mobile-layout-dialog-title">모바일 레이아웃 순서 바꾸기</h2>
|
||||||
|
<form method="dialog">
|
||||||
|
<button type="submit" aria-label="모바일 레이아웃 순서 창 닫기">×</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
<p>항목을 끌어 놓거나 위·아래 버튼으로 상대 순서를 바꿉니다.</p>
|
||||||
|
<ol class="mobile-layout-list">
|
||||||
|
<li
|
||||||
|
v-for="(panelId, index) in mobileLayoutOrder"
|
||||||
|
:key="panelId"
|
||||||
|
:data-mobile-layout-id="panelId"
|
||||||
|
draggable="true"
|
||||||
|
@dragstart="startMobileLayoutDrag($event, index)"
|
||||||
|
@dragend="mobileLayoutDragIndex = null"
|
||||||
|
@dragover.prevent
|
||||||
|
@drop.stop="dropMobileLayoutItem($event, index)"
|
||||||
|
>
|
||||||
|
<span class="mobile-layout-handle" aria-hidden="true">≡</span>
|
||||||
|
<span class="mobile-layout-label">
|
||||||
|
<span class="mobile-layout-position">{{ index + 1 }}</span>
|
||||||
|
{{ mobileLayoutLabels[panelId] }}
|
||||||
|
</span>
|
||||||
|
<span class="mobile-layout-move-buttons">
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
:aria-label="`${mobileLayoutLabels[panelId]} 위로`"
|
||||||
|
:disabled="index === 0"
|
||||||
|
@click="moveMobileLayoutItem(index, index - 1)"
|
||||||
|
>
|
||||||
|
↑
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
type="button"
|
||||||
|
:aria-label="`${mobileLayoutLabels[panelId]} 아래로`"
|
||||||
|
:disabled="index === mobileLayoutOrder.length - 1"
|
||||||
|
@click="moveMobileLayoutItem(index, index + 1)"
|
||||||
|
>
|
||||||
|
↓
|
||||||
|
</button>
|
||||||
|
</span>
|
||||||
|
</li>
|
||||||
|
</ol>
|
||||||
|
<div class="mobile-layout-dialog__actions">
|
||||||
|
<button type="button" @click="resetMobileLayoutOrder">Ref 초깃값</button>
|
||||||
|
<form method="dialog"><button type="submit">취소</button></form>
|
||||||
|
<button class="mobile-layout-apply" type="button" @click="applyMobileLayoutOrder">적용</button>
|
||||||
|
</div>
|
||||||
|
</dialog>
|
||||||
<div class="my-page-mobile-scroll-spacer" aria-hidden="true"></div>
|
<div class="my-page-mobile-scroll-spacer" aria-hidden="true"></div>
|
||||||
</template>
|
</template>
|
||||||
|
|
||||||
@@ -822,6 +935,125 @@ button:disabled {
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
margin: 14px 0;
|
margin: 14px 0;
|
||||||
}
|
}
|
||||||
|
.mobile-layout-setting-row {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: minmax(0, 1fr) 128px;
|
||||||
|
align-items: center;
|
||||||
|
gap: 8px;
|
||||||
|
margin: 14px 0;
|
||||||
|
}
|
||||||
|
.mobile-layout-setting-row small {
|
||||||
|
color: orange;
|
||||||
|
}
|
||||||
|
.mobile-layout-open {
|
||||||
|
min-height: 34px;
|
||||||
|
background: #315f86;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
.mobile-layout-dialog {
|
||||||
|
box-sizing: border-box;
|
||||||
|
width: min(460px, calc(100vw - 24px));
|
||||||
|
max-height: calc(100dvh - 24px);
|
||||||
|
margin: auto;
|
||||||
|
overflow: auto;
|
||||||
|
border: 1px solid #777;
|
||||||
|
border-radius: 4px;
|
||||||
|
padding: 12px;
|
||||||
|
background: #171717 var(--sammo-texture-walnut);
|
||||||
|
color: #fff;
|
||||||
|
font: 14px/1.3 var(--sammo-font-sans);
|
||||||
|
}
|
||||||
|
.mobile-layout-dialog::backdrop {
|
||||||
|
background: rgb(0 0 0 / 72%);
|
||||||
|
}
|
||||||
|
.mobile-layout-dialog__header,
|
||||||
|
.mobile-layout-dialog__actions,
|
||||||
|
.mobile-layout-move-buttons {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
}
|
||||||
|
.mobile-layout-dialog__header {
|
||||||
|
justify-content: space-between;
|
||||||
|
gap: 12px;
|
||||||
|
}
|
||||||
|
.mobile-layout-dialog__header h2,
|
||||||
|
.mobile-layout-dialog p {
|
||||||
|
margin: 0 0 10px;
|
||||||
|
}
|
||||||
|
.mobile-layout-dialog__header h2 {
|
||||||
|
color: skyblue;
|
||||||
|
font-size: 18px;
|
||||||
|
}
|
||||||
|
.mobile-layout-dialog__header form,
|
||||||
|
.mobile-layout-dialog__actions form {
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
.mobile-layout-dialog__header button {
|
||||||
|
min-width: 32px;
|
||||||
|
min-height: 32px;
|
||||||
|
font-size: 20px;
|
||||||
|
}
|
||||||
|
.mobile-layout-list {
|
||||||
|
display: grid;
|
||||||
|
gap: 6px;
|
||||||
|
margin: 0;
|
||||||
|
padding: 0;
|
||||||
|
list-style: none;
|
||||||
|
}
|
||||||
|
.mobile-layout-list > li {
|
||||||
|
display: grid;
|
||||||
|
grid-template-columns: 28px minmax(0, 1fr) auto;
|
||||||
|
min-height: 44px;
|
||||||
|
align-items: center;
|
||||||
|
border: 1px solid #777;
|
||||||
|
background: #172a52 var(--sammo-texture-blue);
|
||||||
|
cursor: grab;
|
||||||
|
}
|
||||||
|
.mobile-layout-list > li:active {
|
||||||
|
cursor: grabbing;
|
||||||
|
}
|
||||||
|
.mobile-layout-handle {
|
||||||
|
color: #aaa;
|
||||||
|
text-align: center;
|
||||||
|
font-size: 20px;
|
||||||
|
}
|
||||||
|
.mobile-layout-label {
|
||||||
|
min-width: 0;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
.mobile-layout-position {
|
||||||
|
display: inline-grid;
|
||||||
|
width: 22px;
|
||||||
|
height: 22px;
|
||||||
|
place-items: center;
|
||||||
|
margin-right: 4px;
|
||||||
|
border: 1px solid #7186a7;
|
||||||
|
border-radius: 50%;
|
||||||
|
font-size: 12px;
|
||||||
|
}
|
||||||
|
.mobile-layout-move-buttons {
|
||||||
|
gap: 4px;
|
||||||
|
padding-right: 5px;
|
||||||
|
}
|
||||||
|
.mobile-layout-move-buttons button {
|
||||||
|
width: 36px;
|
||||||
|
min-height: 34px;
|
||||||
|
background: #315f86;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
|
.mobile-layout-dialog__actions {
|
||||||
|
justify-content: flex-end;
|
||||||
|
gap: 6px;
|
||||||
|
margin-top: 12px;
|
||||||
|
}
|
||||||
|
.mobile-layout-dialog__actions button {
|
||||||
|
min-height: 34px;
|
||||||
|
padding: 4px 10px;
|
||||||
|
}
|
||||||
|
.mobile-layout-dialog__actions .mobile-layout-apply {
|
||||||
|
background: #225500;
|
||||||
|
font-weight: 700;
|
||||||
|
}
|
||||||
.button-group {
|
.button-group {
|
||||||
display: flex;
|
display: flex;
|
||||||
}
|
}
|
||||||
@@ -933,6 +1165,12 @@ button:disabled {
|
|||||||
grid-template-columns: 1fr;
|
grid-template-columns: 1fr;
|
||||||
gap: 6px;
|
gap: 6px;
|
||||||
}
|
}
|
||||||
|
.mobile-layout-setting-row {
|
||||||
|
grid-template-columns: 1fr;
|
||||||
|
}
|
||||||
|
.mobile-layout-open {
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
.button-group {
|
.button-group {
|
||||||
overflow-x: auto;
|
overflow-x: auto;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,55 @@
|
|||||||
|
import assert from 'node:assert/strict';
|
||||||
|
import test from 'node:test';
|
||||||
|
|
||||||
|
import {
|
||||||
|
DEFAULT_MOBILE_MAIN_PANEL_ORDER,
|
||||||
|
MOBILE_MAIN_PANEL_ORDER_STORAGE_KEY,
|
||||||
|
loadMobileMainPanelOrder,
|
||||||
|
moveMobileMainPanel,
|
||||||
|
normalizeMobileMainPanelOrder,
|
||||||
|
parseMobileMainPanelOrder,
|
||||||
|
saveMobileMainPanelOrder,
|
||||||
|
} from '../src/utils/mobileMainPanelOrder.ts';
|
||||||
|
|
||||||
|
void test('uses the Ref mobile panel order as the default', () => {
|
||||||
|
assert.deepEqual(DEFAULT_MOBILE_MAIN_PANEL_ORDER, [
|
||||||
|
'commands',
|
||||||
|
'nation-menu',
|
||||||
|
'nation',
|
||||||
|
'general',
|
||||||
|
'city',
|
||||||
|
'map',
|
||||||
|
'records',
|
||||||
|
'global-menu',
|
||||||
|
'messages',
|
||||||
|
]);
|
||||||
|
assert.deepEqual(parseMobileMainPanelOrder(null), DEFAULT_MOBILE_MAIN_PANEL_ORDER);
|
||||||
|
});
|
||||||
|
|
||||||
|
void test('keeps known unique entries and appends newly introduced panels', () => {
|
||||||
|
assert.deepEqual(normalizeMobileMainPanelOrder(['messages', 'commands', 'messages', 'unknown']), [
|
||||||
|
'messages',
|
||||||
|
'commands',
|
||||||
|
'nation-menu',
|
||||||
|
'nation',
|
||||||
|
'general',
|
||||||
|
'city',
|
||||||
|
'map',
|
||||||
|
'records',
|
||||||
|
'global-menu',
|
||||||
|
]);
|
||||||
|
assert.deepEqual(parseMobileMainPanelOrder('{broken'), DEFAULT_MOBILE_MAIN_PANEL_ORDER);
|
||||||
|
});
|
||||||
|
|
||||||
|
void test('moves and persists the normalized order', () => {
|
||||||
|
const values = new Map<string, string>();
|
||||||
|
const storage = {
|
||||||
|
getItem: (key: string) => values.get(key) ?? null,
|
||||||
|
setItem: (key: string, value: string) => values.set(key, value),
|
||||||
|
};
|
||||||
|
const moved = moveMobileMainPanel(DEFAULT_MOBILE_MAIN_PANEL_ORDER, 8, 0);
|
||||||
|
assert.equal(moved[0], 'messages');
|
||||||
|
assert.deepEqual(saveMobileMainPanelOrder(moved, storage), moved);
|
||||||
|
assert.equal(values.has(MOBILE_MAIN_PANEL_ORDER_STORAGE_KEY), true);
|
||||||
|
assert.deepEqual(loadMobileMainPanelOrder(storage), moved);
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user