mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-19 17:52:21 +00:00
Go to a shot by clicking its row; move shots up and down
Clicking anywhere on a shot row (its number, title or summary line), or pressing Enter or Space on its title, now selects the shot and loads it, which is what the row's LOAD button did; the LOAD button is gone. In its place, up and down arrows swap the shot with its neighbour through SceneDirector.moveShot, which saves the project and publishes shot-moved. The arrows are disabled at the ends and while the scene plays, and neither they nor DEL load the shot.
This commit is contained in:
1 parent
09cead6a0e
commit
6b78d72f52
24 files changed
+312
-74
No files matched your search
@@ -86,7 +86,7 @@ async function importChosen(event) {
|
||||
<UiButton id="scene-update-shot-btn" type="button" :disabled="off('update')" @click="scenes.act('update')" class="gev-action-button scene-btn" :title="t('Replace the selected shot with the current view')">{{ t('UPDATE SHOT') }}</UiButton>
|
||||
</div>
|
||||
<SceneShotList />
|
||||
<p class="scene-shot-hint">{{ t('Click a shot to select it, double-click to rename.') }}</p>
|
||||
<p class="scene-shot-hint">{{ t('Click a shot to go to it, double-click to rename.') }}</p>
|
||||
<p class="scene-step-heading">{{ t('PREVIEW') }}</p>
|
||||
<div class="scene-controls">
|
||||
<UiButton variant="primary" id="scene-start-btn" type="button" class="gev-action-button scene-btn scene-btn-primary" :title="t('Play from this scene through the rest of the project')" :disabled="off('start')" @click="scenes.act('start')">{{ scene?.playLabel ?? t('PLAY', { context: 'scene' }) }}</UiButton>
|
||||
|
||||
@@ -4,14 +4,19 @@ import { storeToRefs } from 'pinia';
|
||||
import { t } from '../../i18n/index.js';
|
||||
import { describeShot } from '../scenePresentation.js';
|
||||
import UiButton from '../kit/UiButton.vue';
|
||||
import UiIcon from '../kit/UiIcon.vue';
|
||||
import { useSceneStore } from '../stores/scenes.js';
|
||||
import UiEmpty from '../kit/UiEmpty.vue';
|
||||
|
||||
// The selected scene's shots. Rows keep their identity across selection so a
|
||||
// click followed by a double-click lands on the same label.
|
||||
// click followed by a double-click lands on the same label. A click anywhere
|
||||
// on a row (or Enter or Space on its title) goes to the shot: it is selected
|
||||
// and loaded. The row's buttons move it up or down, or delete it.
|
||||
const store = useSceneStore();
|
||||
const { scenes, selectedSceneId, selectedShotId, attached } =
|
||||
const { scenes, selectedSceneId, selectedShotId, attached, panel } =
|
||||
storeToRefs(store);
|
||||
const running = computed(() => !!panel.value?.running);
|
||||
const list = ref(null);
|
||||
const scene = computed(
|
||||
() => scenes.value.find((item) => item.id === selectedSceneId.value) ?? null,
|
||||
);
|
||||
@@ -41,6 +46,38 @@ function act(name, shot, ...args) {
|
||||
if (scene.value) store.act(name, scene.value.id, shot.id, ...args);
|
||||
}
|
||||
|
||||
/** What on a row is not for going to the shot: its buttons and the name being typed. */
|
||||
const NOT_GOING = '.scene-shot-actions, .scene-shot-rename';
|
||||
|
||||
/** Go to a shot: select it and load its look, layers and camera. */
|
||||
function go(shot, event) {
|
||||
if (isEditing(shot) || !scene.value || event?.target?.closest?.(NOT_GOING))
|
||||
return;
|
||||
store.act('select', shot.id);
|
||||
act('load', shot);
|
||||
}
|
||||
|
||||
function onLabelKey(shot, event) {
|
||||
if (event.key !== 'Enter' && event.key !== ' ') return;
|
||||
event.preventDefault();
|
||||
go(shot);
|
||||
}
|
||||
|
||||
/**
|
||||
* Swap a shot with its neighbour (`step` -1 up, 1 down). The focus stays on
|
||||
* the button pressed, or moves to the other one once the shot reaches an end.
|
||||
*/
|
||||
async function move(shot, index, step) {
|
||||
act('move', shot, index + step);
|
||||
await nextTick();
|
||||
const row = [...(list.value?.children ?? [])].find(
|
||||
(item) => item.dataset.sceneShotId === shot.id,
|
||||
);
|
||||
const [up, down] = row?.querySelectorAll('.scene-shot-move') ?? [];
|
||||
const pressed = step < 0 ? up : down;
|
||||
(pressed && !pressed.disabled ? pressed : step < 0 ? down : up)?.focus();
|
||||
}
|
||||
|
||||
async function startRename(shot) {
|
||||
if (isEditing(shot) || !scene.value) return;
|
||||
editing.value = { sceneId: scene.value.id, shotId: shot.id };
|
||||
@@ -72,7 +109,7 @@ function onRenameKey(shot, event) {
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div id="scene-shot-list" class="scene-shot-list ui-scroll">
|
||||
<div id="scene-shot-list" ref="list" class="scene-shot-list ui-scroll">
|
||||
<template v-if="attached">
|
||||
<UiEmpty
|
||||
v-if="!scene?.shots.length"
|
||||
@@ -81,17 +118,22 @@ function onRenameKey(shot, event) {
|
||||
/>
|
||||
<template v-else>
|
||||
<div
|
||||
v-for="shot in scene.shots"
|
||||
v-for="(shot, index) in scene.shots"
|
||||
:key="shot.id"
|
||||
class="scene-shot-row"
|
||||
:class="{ active: shot.id === selectedShotId }"
|
||||
:data-scene-shot-id="shot.id"
|
||||
@click="go(shot, $event)"
|
||||
>
|
||||
<div class="scene-shot-top">
|
||||
<div
|
||||
class="scene-shot-label"
|
||||
:title="t('Double-click to rename')"
|
||||
@click="store.act('select', shot.id)"
|
||||
:role="isEditing(shot) ? undefined : 'button'"
|
||||
:tabindex="isEditing(shot) ? undefined : 0"
|
||||
:aria-current="shot.id === selectedShotId ? 'true' : undefined"
|
||||
:aria-describedby="`scene-shot-meta-${shot.id}`"
|
||||
:title="t('Go to this shot. Double-click to rename.')"
|
||||
@keydown="onLabelKey(shot, $event)"
|
||||
@dblclick="startRename(shot)"
|
||||
><input
|
||||
v-if="isEditing(shot)"
|
||||
@@ -103,12 +145,21 @@ function onRenameKey(shot, event) {
|
||||
@blur="finishRename(shot, $event.target, true)"
|
||||
/><template v-else>{{ shownTitle(shot) }}</template></div
|
||||
>
|
||||
<div class="scene-shot-actions">
|
||||
<div class="scene-shot-actions" @dblclick.stop>
|
||||
<UiButton
|
||||
class="gev-action-button gev-action-button--compact scene-shot-btn"
|
||||
@click="act('load', shot)"
|
||||
>{{ t('LOAD') }}</UiButton
|
||||
>
|
||||
class="gev-action-button gev-action-button--compact scene-shot-btn scene-shot-move"
|
||||
:label="t('Move up')"
|
||||
:disabled="running || index === 0"
|
||||
@click="move(shot, index, -1)"
|
||||
><UiIcon name="arrow_upward" :size="12"
|
||||
/></UiButton>
|
||||
<UiButton
|
||||
class="gev-action-button gev-action-button--compact scene-shot-btn scene-shot-move"
|
||||
:label="t('Move down')"
|
||||
:disabled="running || index === scene.shots.length - 1"
|
||||
@click="move(shot, index, 1)"
|
||||
><UiIcon name="arrow_downward" :size="12"
|
||||
/></UiButton>
|
||||
<UiButton
|
||||
tone="alert"
|
||||
class="gev-action-button gev-action-button--danger gev-action-button--compact scene-shot-btn scene-shot-danger"
|
||||
@@ -117,7 +168,9 @@ function onRenameKey(shot, event) {
|
||||
>
|
||||
</div>
|
||||
</div>
|
||||
<div class="scene-shot-meta">{{ describeShot(shot) }}</div>
|
||||
<div :id="`scene-shot-meta-${shot.id}`" class="scene-shot-meta">
|
||||
{{ describeShot(shot) }}
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
</template>
|
||||
|
||||
Reference in new issue
Block a user