Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 56 additions & 0 deletions web/e2e/game.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -375,3 +375,59 @@ test.describe('Mobile viewport', () => {
await expect(page.getByRole('button', { name: 'Close menu' })).toBeHidden()
})
})

/* ------------------------------------------------------------------ */
/* Mobile toolbar overflow fix */
/* ------------------------------------------------------------------ */

test.describe('Mobile toolbar overflow fix', () => {
test.use({ viewport: { width: 390, height: 844 } })

test.beforeEach(async ({ page }) => {
await page.goto(APP_URL)
await expect(page.locator('.loading-spinner')).toBeVisible({
timeout: 10_000,
})
await injectMockGameState(page)
})

test('Quicksave, Quickload, Save, Load, Help are hidden in toolbar on mobile', async ({
page,
}) => {
await expect(
page.getByRole('button', { name: /Quicksave/i }).first(),
).toBeHidden()
await expect(
page.getByRole('button', { name: /Quickload/i }).first(),
).toBeHidden()
await expect(
page.getByRole('button', { name: /^💾 Save$/i }),
).toBeHidden()
await expect(
page.getByRole('button', { name: /^📂 Load$/i }),
).toBeHidden()
await expect(
page.getByRole('button', { name: /^❓ Help$/i }),
).toBeHidden()
})

test('drawer shows Quicksave, Quickload, Save, Load, Help action chips', async ({
page,
}) => {
await page.getByRole('button', { name: 'Open sidebar' }).click()
const drawer = page.getByTestId('mobile-drawer-panel')
await expect(drawer.getByRole('button', { name: /Quicksave/i })).toBeVisible()
await expect(drawer.getByRole('button', { name: /Quickload/i })).toBeVisible()
await expect(drawer.getByRole('button', { name: /Save/i }).first()).toBeVisible()
await expect(drawer.getByRole('button', { name: /Load/i }).first()).toBeVisible()
await expect(drawer.getByRole('button', { name: /Help/i }).first()).toBeVisible()
})

test('tapping a drawer action chip closes the drawer', async ({ page }) => {
await page.getByRole('button', { name: 'Open sidebar' }).click()
const drawer = page.getByTestId('mobile-drawer-panel')
await expect(drawer).toBeVisible()
await drawer.getByRole('button', { name: /Quicksave/i }).click()
await expect(drawer).toBeHidden()
})
})
5 changes: 5 additions & 0 deletions web/src/components/GameLayout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,11 @@ function closeMenus() {
@close="showDrawer = false"
@inventory-click="onInventoryClick"
@spell-click="onSpellClick"
@quick-save="store.saveGame()"
@quick-load="store.loadGame()"
@save="onOpenSaveDialog"
@load="onOpenLoadDialog"
@help="onHelp"
/>

<QuestModal
Expand Down
52 changes: 51 additions & 1 deletion web/src/components/MobileDrawer.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,27 @@ defineProps<{
spells: NamedItem[]
}>()

defineEmits<{
const emit = defineEmits<{
close: []
inventoryClick: [event: MouseEvent, name: string]
spellClick: [event: MouseEvent, name: string]
quickSave: []
quickLoad: []
save: []
load: []
help: []
}>()

function emitAndClose(
action: 'quickSave' | 'quickLoad' | 'save' | 'load' | 'help',
) {
if (action === 'quickSave') emit('quickSave')
else if (action === 'quickLoad') emit('quickLoad')
else if (action === 'save') emit('save')
else if (action === 'load') emit('load')
else emit('help')
emit('close')
}
</script>

<template>
Expand All @@ -50,6 +66,40 @@ defineEmits<{
</button>
</div>

<!-- Action chips -->
<div class="flex flex-wrap gap-2 pb-3 border-b border-border mb-3">
<button
class="bg-chip-bg text-text-primary border border-border rounded-md px-3 py-1.5 cursor-pointer text-sm transition-colors hover:bg-chip-hover"
@click="emitAndClose('quickSave')"
>
⚡ Quicksave
</button>
<button
class="bg-chip-bg text-text-primary border border-border rounded-md px-3 py-1.5 cursor-pointer text-sm transition-colors hover:bg-chip-hover"
@click="emitAndClose('quickLoad')"
>
⚡ Quickload
</button>
<button
class="bg-chip-bg text-text-primary border border-border rounded-md px-3 py-1.5 cursor-pointer text-sm transition-colors hover:bg-chip-hover"
@click="emitAndClose('save')"
>
💾 Save
</button>
<button
class="bg-chip-bg text-text-primary border border-border rounded-md px-3 py-1.5 cursor-pointer text-sm transition-colors hover:bg-chip-hover"
@click="emitAndClose('load')"
>
📂 Load
</button>
<button
class="bg-chip-bg text-text-primary border border-border rounded-md px-3 py-1.5 cursor-pointer text-sm transition-colors hover:bg-chip-hover"
@click="emitAndClose('help')"
>
❓ Help
</button>
</div>

<!-- Active Quests -->
<div class="mb-4">
<div class="text-xs uppercase tracking-widest text-text-secondary mb-2">
Expand Down
10 changes: 5 additions & 5 deletions web/src/components/TopBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,25 @@ defineEmits<{
<div class="flex items-center gap-2">
<div class="flex gap-2">
<button
class="bg-chip-bg text-text-primary border border-border rounded-md px-3.5 py-1.5 cursor-pointer text-sm transition-colors hover:bg-chip-hover"
class="max-md:hidden bg-chip-bg text-text-primary border border-border rounded-md px-3.5 py-1.5 cursor-pointer text-sm transition-colors hover:bg-chip-hover"
@click="$emit('quickSave')"
>
⚡ Quicksave
</button>
<button
class="bg-chip-bg text-text-primary border border-border rounded-md px-3.5 py-1.5 cursor-pointer text-sm transition-colors hover:bg-chip-hover"
class="max-md:hidden bg-chip-bg text-text-primary border border-border rounded-md px-3.5 py-1.5 cursor-pointer text-sm transition-colors hover:bg-chip-hover"
@click="$emit('quickLoad')"
>
⚡ Quickload
</button>
<button
class="bg-chip-bg text-text-primary border border-border rounded-md px-3.5 py-1.5 cursor-pointer text-sm transition-colors hover:bg-chip-hover"
class="max-md:hidden bg-chip-bg text-text-primary border border-border rounded-md px-3.5 py-1.5 cursor-pointer text-sm transition-colors hover:bg-chip-hover"
@click="$emit('save')"
>
💾 Save
</button>
<button
class="bg-chip-bg text-text-primary border border-border rounded-md px-3.5 py-1.5 cursor-pointer text-sm transition-colors hover:bg-chip-hover"
class="max-md:hidden bg-chip-bg text-text-primary border border-border rounded-md px-3.5 py-1.5 cursor-pointer text-sm transition-colors hover:bg-chip-hover"
@click="$emit('load')"
>
📂 Load
Expand All @@ -67,7 +67,7 @@ defineEmits<{
{{ soundMuted ? '🔕' : '🔔' }}
</button>
<button
class="bg-chip-bg text-text-primary border border-border rounded-md px-3.5 py-1.5 cursor-pointer text-sm transition-colors hover:bg-chip-hover"
class="max-md:hidden bg-chip-bg text-text-primary border border-border rounded-md px-3.5 py-1.5 cursor-pointer text-sm transition-colors hover:bg-chip-hover"
@click="$emit('help')"
>
❓ Help
Expand Down
Loading