fix(frontend): size global diplomacy by nations
This commit is contained in:
@@ -130,7 +130,12 @@ const emptyMessages = {
|
|||||||
canRespondDiplomacy: false,
|
canRespondDiplomacy: false,
|
||||||
};
|
};
|
||||||
|
|
||||||
const install = async (page: Page, mode: 'member' | 'wanderer' | 'admin' = 'member', trade: number | null = 100) => {
|
const install = async (
|
||||||
|
page: Page,
|
||||||
|
mode: 'member' | 'wanderer' | 'admin' = 'member',
|
||||||
|
trade: number | null = 100,
|
||||||
|
globalNationCount = 2
|
||||||
|
) => {
|
||||||
await page.addInitScript((profile) => {
|
await page.addInitScript((profile) => {
|
||||||
localStorage.setItem('sammo-game-token', 'ga_info');
|
localStorage.setItem('sammo-game-token', 'ga_info');
|
||||||
localStorage.setItem('sammo-game-profile', profile);
|
localStorage.setItem('sammo-game-profile', profile);
|
||||||
@@ -250,7 +255,7 @@ const install = async (page: Page, mode: 'member' | 'wanderer' | 'admin' = 'memb
|
|||||||
generalCount: 1,
|
generalCount: 1,
|
||||||
cities: ['허창'],
|
cities: ['허창'],
|
||||||
},
|
},
|
||||||
],
|
].slice(0, globalNationCount),
|
||||||
diplomacy: { 1: { 1: 2, 2: 0 }, 2: { 1: 0, 2: 2 } },
|
diplomacy: { 1: { 1: 2, 2: 0 }, 2: { 1: 0, 2: 2 } },
|
||||||
conflict: [],
|
conflict: [],
|
||||||
map,
|
map,
|
||||||
@@ -375,6 +380,24 @@ test('global-info renders the ref nation summary columns beside the map', async
|
|||||||
await page.setViewportSize({ width: 1200, height: 900 });
|
await page.setViewportSize({ width: 1200, height: 900 });
|
||||||
await go(page, 'global-info');
|
await go(page, 'global-info');
|
||||||
|
|
||||||
|
await expect
|
||||||
|
.poll(async () => {
|
||||||
|
const [matrixWrapBox, matrixBox] = await Promise.all([
|
||||||
|
page.locator('.matrix-wrap').boundingBox(),
|
||||||
|
page.locator('.matrix').boundingBox(),
|
||||||
|
]);
|
||||||
|
if (!matrixWrapBox || !matrixBox) return null;
|
||||||
|
return Math.abs(matrixWrapBox.height - matrixBox.height);
|
||||||
|
})
|
||||||
|
.toBeLessThan(1);
|
||||||
|
|
||||||
|
await expect
|
||||||
|
.poll(() =>
|
||||||
|
page
|
||||||
|
.locator('.map-area .city-icon')
|
||||||
|
.evaluateAll((images: HTMLImageElement[]) => images.every((image) => image.complete && image.naturalWidth > 0))
|
||||||
|
)
|
||||||
|
.toBe(true);
|
||||||
const castleGeometry = await page.locator('.map-area').evaluate((mapArea) => {
|
const castleGeometry = await page.locator('.map-area').evaluate((mapArea) => {
|
||||||
const mapRect = mapArea.getBoundingClientRect();
|
const mapRect = mapArea.getBoundingClientRect();
|
||||||
return Array.from(mapArea.querySelectorAll<HTMLImageElement>('.city-icon')).map((image) => {
|
return Array.from(mapArea.querySelectorAll<HTMLImageElement>('.city-icon')).map((image) => {
|
||||||
@@ -494,6 +517,62 @@ test('global-info renders the ref nation summary columns beside the map', async
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('global-info diplomacy height follows the active nation count', async ({ page }) => {
|
||||||
|
await install(page, 'member', 100, 1);
|
||||||
|
await go(page, 'global-info');
|
||||||
|
|
||||||
|
const matrixWrap = page.locator('.matrix-wrap');
|
||||||
|
const matrix = page.locator('.matrix');
|
||||||
|
const mapSection = page.locator('.map-section');
|
||||||
|
await expect(matrix.locator('tbody tr')).toHaveCount(1);
|
||||||
|
|
||||||
|
for (const viewport of [
|
||||||
|
{ name: 'desktop', width: 1200, height: 900 },
|
||||||
|
{ name: 'mobile', width: 390, height: 844 },
|
||||||
|
]) {
|
||||||
|
await page.setViewportSize(viewport);
|
||||||
|
await expect
|
||||||
|
.poll(async () => {
|
||||||
|
const [wrapBox, matrixBox] = await Promise.all([matrixWrap.boundingBox(), matrix.boundingBox()]);
|
||||||
|
if (!wrapBox || !matrixBox) return null;
|
||||||
|
return Math.abs(wrapBox.height - matrixBox.height);
|
||||||
|
})
|
||||||
|
.toBeLessThan(1);
|
||||||
|
|
||||||
|
const geometry = await page.evaluate(() => {
|
||||||
|
const rect = (selector: string) => document.querySelector(selector)?.getBoundingClientRect();
|
||||||
|
const diplomacy = rect('.section');
|
||||||
|
const matrix = rect('.matrix');
|
||||||
|
const matrixWrap = rect('.matrix-wrap');
|
||||||
|
const mapSection = rect('.map-section');
|
||||||
|
return {
|
||||||
|
diplomacyHeight: diplomacy?.height ?? null,
|
||||||
|
matrixHeight: matrix?.height ?? null,
|
||||||
|
matrixWrapHeight: matrixWrap?.height ?? null,
|
||||||
|
gapToMap: matrixWrap && mapSection ? mapSection.top - matrixWrap.bottom : null,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
expect(geometry.matrixHeight).not.toBeNull();
|
||||||
|
expect(geometry.matrixWrapHeight).toBeCloseTo(geometry.matrixHeight!, 0);
|
||||||
|
expect(geometry.diplomacyHeight).toBeLessThan(200);
|
||||||
|
expect(geometry.gapToMap).toBe(21);
|
||||||
|
await expect(mapSection).toBeInViewport();
|
||||||
|
|
||||||
|
if (artifactRoot) {
|
||||||
|
await mkdir(artifactRoot, { recursive: true });
|
||||||
|
await writeFile(
|
||||||
|
resolve(artifactRoot, `core-global-info-one-nation-${viewport.name}.json`),
|
||||||
|
`${JSON.stringify(geometry, null, 2)}\n`,
|
||||||
|
'utf8'
|
||||||
|
);
|
||||||
|
await page.screenshot({
|
||||||
|
path: resolve(artifactRoot, `core-global-info-one-nation-${viewport.name}.png`),
|
||||||
|
fullPage: true,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
test('current-city hides values and general rows for a wandering user', async ({ page }) => {
|
test('current-city hides values and general rows for a wandering user', async ({ page }) => {
|
||||||
await install(page, 'wanderer');
|
await install(page, 'wanderer');
|
||||||
await go(page, 'current-city');
|
await go(page, 'current-city');
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { computed, onMounted, ref } from 'vue';
|
import { computed, onMounted, ref, watch } from 'vue';
|
||||||
import { useRouter } from 'vue-router';
|
import { useRouter } from 'vue-router';
|
||||||
import MapViewer from '../components/main/MapViewer.vue';
|
import MapViewer from '../components/main/MapViewer.vue';
|
||||||
import { trpc } from '../utils/trpc';
|
import { trpc } from '../utils/trpc';
|
||||||
@@ -10,6 +10,8 @@ type Layout = Awaited<ReturnType<typeof trpc.world.getMapLayout.query>>;
|
|||||||
const data = ref<Result | null>(null);
|
const data = ref<Result | null>(null);
|
||||||
const layout = ref<Layout | null>(null);
|
const layout = ref<Layout | null>(null);
|
||||||
const error = ref('');
|
const error = ref('');
|
||||||
|
const matrixElement = ref<HTMLTableElement | null>(null);
|
||||||
|
const matrixHeight = ref<number | null>(null);
|
||||||
const router = useRouter();
|
const router = useRouter();
|
||||||
const goBack = () => router.push('/');
|
const goBack = () => router.push('/');
|
||||||
const state = (value: number) => ({ 0: '★', 1: '▲', 2: '', 7: '@' })[value] ?? 'ㆍ';
|
const state = (value: number) => ({ 0: '★', 1: '▲', 2: '', 7: '@' })[value] ?? 'ㆍ';
|
||||||
@@ -19,6 +21,23 @@ const nationNameStyle = (color: string) => ({
|
|||||||
backgroundColor: color,
|
backgroundColor: color,
|
||||||
color: legacyNationTextColor(color),
|
color: legacyNationTextColor(color),
|
||||||
});
|
});
|
||||||
|
watch(
|
||||||
|
matrixElement,
|
||||||
|
(element, _previousElement, onCleanup) => {
|
||||||
|
if (!element) {
|
||||||
|
matrixHeight.value = null;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
const updateHeight = () => {
|
||||||
|
matrixHeight.value = element.getBoundingClientRect().height;
|
||||||
|
};
|
||||||
|
const observer = new ResizeObserver(updateHeight);
|
||||||
|
observer.observe(element);
|
||||||
|
updateHeight();
|
||||||
|
onCleanup(() => observer.disconnect());
|
||||||
|
},
|
||||||
|
{ flush: 'post' }
|
||||||
|
);
|
||||||
onMounted(async () => {
|
onMounted(async () => {
|
||||||
try {
|
try {
|
||||||
[data.value, layout.value] = await Promise.all([
|
[data.value, layout.value] = await Promise.all([
|
||||||
@@ -39,8 +58,8 @@ onMounted(async () => {
|
|||||||
<p v-if="error" class="error">{{ error }}</p>
|
<p v-if="error" class="error">{{ error }}</p>
|
||||||
<section v-if="data" class="section">
|
<section v-if="data" class="section">
|
||||||
<h2 class="blue">외교 현황</h2>
|
<h2 class="blue">외교 현황</h2>
|
||||||
<div class="matrix-wrap">
|
<div class="matrix-wrap" :style="{ height: matrixHeight === null ? undefined : `${matrixHeight}px` }">
|
||||||
<table class="matrix">
|
<table ref="matrixElement" class="matrix">
|
||||||
<thead>
|
<thead>
|
||||||
<tr>
|
<tr>
|
||||||
<th></th>
|
<th></th>
|
||||||
@@ -194,7 +213,6 @@ onMounted(async () => {
|
|||||||
background: green;
|
background: green;
|
||||||
}
|
}
|
||||||
.matrix-wrap {
|
.matrix-wrap {
|
||||||
height: 1212.5px;
|
|
||||||
overflow-x: auto;
|
overflow-x: auto;
|
||||||
overflow-y: hidden;
|
overflow-y: hidden;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user