Fix issue #15: Dragonroll Frontend: Map Viewer adjustmentes
This commit is contained in:
@@ -3,6 +3,7 @@ import { computed, nextTick, onBeforeUnmount, onMounted, ref, watch } from 'vue'
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
import { useCampaignService } from '~/services/Campaign.js';
|
||||
import { AnchorMap, AnchoredMap, ClearAnchoredMap, SetActivePane } from '~/services/Content.js';
|
||||
import { emitter } from '~/services/Emitter';
|
||||
import Server from '~/services/Server';
|
||||
import { ClearWindow, CreateWindow, GetFirstWindowId } from '~/services/Windows';
|
||||
@@ -207,6 +208,9 @@ async function fetchCampaignEntries(entityType = activeSection.value, silent = f
|
||||
function selectSection(section) {
|
||||
activeSection.value = section;
|
||||
if (isEntrySection(section)) fetchCampaignEntries(section);
|
||||
// The content area follows the sidebar: maps shows the anchored map, everything else the
|
||||
// notes that are currently open.
|
||||
SetActivePane(section === 'maps' && AnchoredMap.value ? 'map' : 'notes');
|
||||
}
|
||||
|
||||
function createEntry(entityType) {
|
||||
@@ -272,6 +276,7 @@ function showEntryMenu(entry, entityType) {
|
||||
const response = await Server().post(`/${entityType}/delete`, { id: entry._id });
|
||||
if (response.data.status === 'ok' && list) {
|
||||
list.value = list.value.filter((current) => current._id !== entry._id);
|
||||
if (entityType === 'map' && isAnchoredMap(entry)) ClearAnchoredMap();
|
||||
}
|
||||
} catch (error) {} finally { HideContextMenu(); }
|
||||
}
|
||||
@@ -294,13 +299,17 @@ async function openCharacterSheet(actor) {
|
||||
CreateWindow('character_sheet', { actor });
|
||||
}
|
||||
|
||||
async function openMapViewer(map) {
|
||||
const existingWindowId = GetFirstWindowId('map_viewer');
|
||||
if (existingWindowId !== undefined) {
|
||||
ClearWindow({ id: existingWindowId });
|
||||
await nextTick();
|
||||
}
|
||||
CreateWindow('map_viewer', { map, campaign: campaignId.value });
|
||||
// Maps are anchored on the note container instead of opening a window: the notes that were open
|
||||
// stay open, and the sidebar's notes/maps buttons switch between the two.
|
||||
function openMapViewer(map) {
|
||||
if (!map) return;
|
||||
const floatingViewer = GetFirstWindowId('map_viewer');
|
||||
if (floatingViewer !== undefined) ClearWindow({ id: floatingViewer });
|
||||
AnchorMap(map);
|
||||
}
|
||||
|
||||
function isAnchoredMap(map) {
|
||||
return AnchoredMap.value?._id === map._id;
|
||||
}
|
||||
|
||||
function createNote() {
|
||||
@@ -324,6 +333,7 @@ watch(campaignId, (newVal) => {
|
||||
actors.value = [];
|
||||
items.value = [];
|
||||
maps.value = [];
|
||||
ClearAnchoredMap();
|
||||
fetchCampaignNotes();
|
||||
if (isEntrySection(activeSection.value)) fetchCampaignEntries(activeSection.value);
|
||||
} else {
|
||||
@@ -334,6 +344,7 @@ watch(campaignId, (newVal) => {
|
||||
maps.value = [];
|
||||
notesError.value = '';
|
||||
entriesError.value = '';
|
||||
ClearAnchoredMap();
|
||||
}
|
||||
});
|
||||
|
||||
@@ -502,8 +513,11 @@ onBeforeUnmount(() => {
|
||||
<div v-if="loadingEntries" class="sidebar-state">{{ t('campaigns.states.loading') }}</div>
|
||||
<div v-else-if="entriesError" class="sidebar-state error">{{ entriesError }}</div>
|
||||
<div v-else-if="maps.length === 0" class="sidebar-state">{{ t('campaigns.states.empty-maps') }}</div>
|
||||
<div v-for="map in maps" :key="map._id" class="entity-entry" role="button" tabindex="0" @click="openMapViewer(map)" @keydown.enter="openMapViewer(map)" @keydown.space.prevent="openMapViewer(map)" @contextmenu.prevent="showEntryMenu(map, 'map')">
|
||||
<span class="entity-entry-name">{{ map.name }}</span>
|
||||
<div v-for="map in maps" :key="map._id" class="entity-entry" :class="{ anchored: isAnchoredMap(map) }" role="button" tabindex="0" @click="openMapViewer(map)" @keydown.enter="openMapViewer(map)" @keydown.space.prevent="openMapViewer(map)" @contextmenu.prevent="showEntryMenu(map, 'map')">
|
||||
<span class="entity-entry-name-row">
|
||||
<span class="entity-entry-name">{{ map.name }}</span>
|
||||
<span v-if="isAnchoredMap(map)" class="entity-entry-sync">{{ t('campaigns.map.anchored') }}</span>
|
||||
</span>
|
||||
<span class="entity-entry-meta">{{ mapSummary(map) }}</span>
|
||||
<span v-if="!map.image" class="entity-entry-description">{{ t('campaigns.map.no-image') }}</span>
|
||||
</div>
|
||||
@@ -654,6 +668,8 @@ onBeforeUnmount(() => {
|
||||
}
|
||||
.entity-entry:hover { border-color: var(--color-border); background: var(--color-background-soft); }
|
||||
.entity-entry:focus-visible { outline: 1px solid var(--color-link); }
|
||||
/* The map currently anchored on the note container. */
|
||||
.entity-entry.anchored { border-color: var(--color-link); background: var(--color-background-soft); }
|
||||
.entity-entry-name-row { display: flex; align-items: baseline; gap: 6px; }
|
||||
.entity-entry-name { font-weight: bold; }
|
||||
.entity-entry-sync {
|
||||
|
||||
Reference in New Issue
Block a user