mirror of
https://github.com/bilawalsidhu/gods-eye-view.git
synced 2026-11-19 09:42:21 +00:00
Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1f34210f71 | ||
|
|
ec4a5b6afe | ||
|
|
2d7b7be890 |
No files matched your search
+36
-1
@@ -38,7 +38,7 @@ one-panel rule too. Share links continue to record which panels are open.
|
||||
|
||||
`src/ui/kit/` holds the generic components: `UiRail`, `UiTooltip`, `UiIcon`,
|
||||
`UiButton`, `UiCloseButton`, `UiPanel`, `UiSegmented`, `UiSlider`, `UiChip`,
|
||||
`UiSelect`, `UiSearchField`, `UiBadge` and `UiEmpty` so far, with more
|
||||
`UiSelect`, `UiSearchField`, `UiCheckbox`, `UiDialog`, `UiBadge` and `UiEmpty` so far, with more
|
||||
joining as the controls they serve are converted. One component
|
||||
serves every use of a control, with props for the differences (`UiPanel`'s
|
||||
`sideways`, `glow`, `scroll`), rather than a copy per panel. The components
|
||||
@@ -55,6 +55,8 @@ never copied:
|
||||
| `UiButton` `variant="icon"` | the 22px square glyph button of a panel's collapse toggle | `src/ui/styles/controls.css` |
|
||||
| `UiCloseButton` | a close, dismiss or clear button: a bare glyph (× with `glyph="times"`, the Material `close` symbol with `glyph="icon"`) with no padding, border or background of its own and a pointer; the site's feature class sets size, colour, hover and any surface, and `bare` leaves the look off for a skin that keeps the browser's padding | `src/ui/styles/close-button.css` |
|
||||
| `UiSearchField` | a search field: the Material `search` glyph and a search input in a flex row, the input bare (no border or background, free to shrink); the site's feature classes set the frame's size, surface and focus ring and the input's type and outline, and the browser's own cancel button is left to each skin | `src/ui/styles/search-field.css` |
|
||||
| `UiCheckbox` | a checkbox: a label wrapping a native box and its words in a centred flex row; the box keeps each site's size, margin and accent colour, and the site's feature class sets the row's gap, direction and colour | `src/ui/styles/checkbox.css` |
|
||||
| `UiDialog` | none: a native modal `<dialog>`; the site's feature class or inline style draws it | — |
|
||||
| `UiChip` | the read-only chip (a pill of uppercase mono text); `selected` takes the accent | `src/ui/styles/chip.css` |
|
||||
| `UiEmpty` | the one-line empty state (dim mono text), its hint on a line below | `src/ui/styles/empty-state.css` |
|
||||
| `UiBadge` | the read-only badge (`gev-status-badge`) | `src/ui/styles/status-badge.css` |
|
||||
@@ -120,6 +122,39 @@ focuses the input. The Context search and the Layer Finder's are
|
||||
`UiSearchField`s; the locale picker's combobox, the Omnibar's location
|
||||
field and the Data Library's labelled search are other controls. Its kit rules hold the declarations both search
|
||||
skins had in common, moved rather than copied, and load before them.
|
||||
`UiCheckbox` is a `<label>` wrapping a native `<input type="checkbox">` and
|
||||
its default slot; `trailing` puts the box after the words, as the Visual
|
||||
panel's rows have it. It takes `v-model` (the change emits the checked state)
|
||||
and emits `change` with its event; without a `modelValue` the box is the
|
||||
browser's own, as the welcome card's "Don't show this again" is, whose
|
||||
owner puts a refused save back itself. `restore` puts the box back to
|
||||
`modelValue` once a change has rendered without the owner taking it, so the
|
||||
voice panel's quick commands and Voice Preview show the applied value after
|
||||
a refused change. Attributes and classes go to the label; `inputId` and
|
||||
`inputAttrs` (such as `aria-describedby` or a data hook) to the box. The
|
||||
Visual panel's Scope, sky and application toggles, the voice and chat
|
||||
preferences, the Data Library's filter and the welcome card's box are
|
||||
`UiCheckbox`es (`src/ui/kit/checkboxes.test.mjs` pins it); Story Explore's
|
||||
filters are not converted yet. Its kit rule holds the centred row the
|
||||
checkbox-only labels drew, moved rather than copied.
|
||||
`UiDialog` is a native `<dialog>` its owner opens and closes with `open`:
|
||||
true opens it with `showModal()` (on mount, for one mounted open), false
|
||||
closes it, and unmounting closes it. Each change is applied once the content
|
||||
has rendered and then emitted as `opened` or `closed`, so the Data Library
|
||||
focuses its search field on open and returns focus to Browse on close.
|
||||
Escape's `cancel` is prevented and emitted as `dismiss`, so the owner
|
||||
decides; `backdropDismiss` makes a click on the dialog itself, outside its
|
||||
content, a `dismiss` too. When the browser closes the dialog on its own
|
||||
while `open` is still true (an Escape the page may not cancel),
|
||||
`browserClose` tells the owner; closing on unmount reports nothing. A DOM
|
||||
without `showModal()` leaves it closed rather than failing. Attributes,
|
||||
classes, styles and listeners go to the dialog, and `element` is exposed.
|
||||
The Data Library and the scene sharing dialogs are `UiDialog`s
|
||||
(`src/ui/kit/dialogs.test.mjs` pins it); the panels drawn as
|
||||
`role="dialog"` (key setup, the welcome launcher, the CCTV popup, Story
|
||||
Explore's filter, the credits) and the render failure's `alertdialog` are
|
||||
other controls. The two dialogs share no declarations, so it has no kit
|
||||
rules.
|
||||
`UiSlider` keeps the native range input rather than drawing a
|
||||
`role="slider"` track, so Core's keyboard, form behaviour and styling stay;
|
||||
it takes `v-model`, `min`, `max`, `step` and `disabled`, emits a
|
||||
|
||||
@@ -1336,6 +1336,13 @@
|
||||
"src/ui/kit/UiSearchField.vue",
|
||||
"src/ui/kit/UiSearchField.test.mjs",
|
||||
"src/ui/styles/search-field.css",
|
||||
"src/ui/kit/UiCheckbox.vue",
|
||||
"src/ui/kit/UiCheckbox.test.mjs",
|
||||
"src/ui/kit/checkboxes.test.mjs",
|
||||
"src/ui/styles/checkbox.css",
|
||||
"src/ui/kit/UiDialog.vue",
|
||||
"src/ui/kit/UiDialog.test.mjs",
|
||||
"src/ui/kit/dialogs.test.mjs",
|
||||
"src/ui/styles/chip.css",
|
||||
"src/ui/styles/empty-state.css",
|
||||
"src/ui/rail/RailChips.vue",
|
||||
|
||||
@@ -243,6 +243,8 @@
|
||||
"src/ui/kit/UiBadge.vue",
|
||||
"src/ui/kit/UiCloseButton.vue",
|
||||
"src/ui/kit/UiSearchField.vue",
|
||||
"src/ui/kit/UiCheckbox.vue",
|
||||
"src/ui/kit/UiDialog.vue",
|
||||
"src/ui/stores/globeActions.js",
|
||||
"src/ui/views/panels/GlobeActions.vue",
|
||||
"src/ui/views/panels/RenderFailure.vue",
|
||||
|
||||
@@ -454,10 +454,10 @@ const MUTATIONS = [
|
||||
to: '<button type="button" data-first-run-start="zzz-environmental"',
|
||||
},
|
||||
{
|
||||
defect: 'the "don\'t show again" checkbox is removed',
|
||||
defect: 'the "don\'t show again" checkbox loses its hook',
|
||||
file: 'html',
|
||||
from: '<input type="checkbox" data-first-run-suppress @change="onSuppress" />',
|
||||
to: '<span data-first-run-suppress-removed></span>',
|
||||
from: '<UiCheckbox class="first-run-suppress" :input-attrs="suppressBoxAttrs" @change="onSuppress">',
|
||||
to: '<UiCheckbox class="first-run-suppress" @change="onSuppress">',
|
||||
},
|
||||
{
|
||||
defect: 'the status line stops being a polite live region',
|
||||
|
||||
@@ -768,7 +768,10 @@ test('markup, startup ordering and accessibility remain pinned', async () => {
|
||||
html,
|
||||
/data-first-run-status[^>]*role="status"[^>]*aria-live="polite"/,
|
||||
);
|
||||
assert.match(html, /<input type="checkbox" data-first-run-suppress\s*\/?>/);
|
||||
assert.match(
|
||||
html,
|
||||
/<input type="checkbox" class="ui-checkbox__input" data-first-run-suppress\s*\/?>/,
|
||||
);
|
||||
|
||||
assert.match(startup, /styleManager\.initialRestorePromise/);
|
||||
assert.ok(
|
||||
|
||||
@@ -24,7 +24,8 @@ test('HUD sliders and location search have descriptive explicit names', () => {
|
||||
test('the first-run checkbox keeps its native visible label', () => {
|
||||
// The span may carry a data-i18n extraction attribute; the native wrapping
|
||||
// label contract is what this guards.
|
||||
assert.match(html, /<label\b[^>]*class="first-run-suppress"[^>]*>\s*<input type="checkbox" data-first-run-suppress\s*\/?>\s*<span\b[^>]*>Don't show this again<\/span>\s*<\/label>/);
|
||||
// UiCheckbox leaves Vue's placeholder comment where its unused slot would be.
|
||||
assert.match(html, /<label\b[^>]*class="ui-checkbox first-run-suppress"[^>]*>(?:\s*<!--v-if-->)?\s*<input type="checkbox" class="ui-checkbox__input" data-first-run-suppress\s*\/?>\s*<span\b[^>]*>Don't show this again<\/span>(?:\s*<!--v-if-->)?\s*<\/label>/);
|
||||
});
|
||||
|
||||
test('generated style sliders use the visible parameter label as their name', () => {
|
||||
|
||||
@@ -0,0 +1,162 @@
|
||||
import { after, before, test } from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { installVueDom } from '../../testSupport/vueDom.mjs';
|
||||
|
||||
let mount;
|
||||
let nextTick;
|
||||
let UiCheckbox;
|
||||
let uninstall;
|
||||
before(async () => {
|
||||
uninstall = installVueDom();
|
||||
({ mount } = await import('@vue/test-utils'));
|
||||
({ nextTick } = await import('vue'));
|
||||
UiCheckbox = (await import('./UiCheckbox.vue')).default;
|
||||
});
|
||||
after(() => uninstall());
|
||||
|
||||
/** A checkbox whose v-model writes back into its props, as a parent's would. */
|
||||
function bound(props = {}, attrs = {}) {
|
||||
const wrapper = mount(UiCheckbox, {
|
||||
attachTo: document.body,
|
||||
props: {
|
||||
modelValue: false,
|
||||
...props,
|
||||
'onUpdate:modelValue': (value) => wrapper.setProps({ modelValue: value }),
|
||||
},
|
||||
attrs,
|
||||
slots: { default: '<span class="words">Scope</span>' },
|
||||
});
|
||||
return wrapper;
|
||||
}
|
||||
|
||||
/** Tick the box as a person does: flip it, then the change event. */
|
||||
async function tick(input) {
|
||||
input.element.checked = !input.element.checked;
|
||||
await input.trigger('change');
|
||||
}
|
||||
|
||||
test('a checkbox is a label wrapping a native box, then its words', () => {
|
||||
const wrapper = bound();
|
||||
const root = wrapper.get('label');
|
||||
assert.ok(root.classes().includes('ui-checkbox'));
|
||||
const input = wrapper.get('input');
|
||||
assert.equal(input.attributes('type'), 'checkbox');
|
||||
assert.ok(input.classes().includes('ui-checkbox__input'));
|
||||
assert.equal(input.attributes('id'), undefined);
|
||||
const elements = [...root.element.children];
|
||||
assert.deepEqual(
|
||||
elements.map((el) => el.tagName),
|
||||
['INPUT', 'SPAN'],
|
||||
);
|
||||
wrapper.unmount();
|
||||
});
|
||||
|
||||
test('trailing puts the box after its words', () => {
|
||||
const wrapper = bound({ trailing: true });
|
||||
assert.deepEqual(
|
||||
[...wrapper.get('label').element.children].map((el) => el.tagName),
|
||||
['SPAN', 'INPUT'],
|
||||
);
|
||||
wrapper.unmount();
|
||||
});
|
||||
|
||||
test('attributes and classes go to the label; inputId and inputAttrs to the box', () => {
|
||||
const wrapper = bound(
|
||||
{
|
||||
inputId: 'scope-toggle',
|
||||
inputAttrs: { 'aria-describedby': 'note', 'data-hook': '' },
|
||||
},
|
||||
{ class: 'pp-scope-toggle', title: 'Scope', id: 'scope-row' },
|
||||
);
|
||||
const root = wrapper.get('label');
|
||||
assert.ok(root.classes().includes('pp-scope-toggle'));
|
||||
assert.equal(root.attributes('title'), 'Scope');
|
||||
assert.equal(root.attributes('id'), 'scope-row');
|
||||
const input = wrapper.get('input');
|
||||
assert.equal(input.attributes('id'), 'scope-toggle');
|
||||
assert.equal(input.attributes('aria-describedby'), 'note');
|
||||
assert.equal(input.attributes('data-hook'), '');
|
||||
assert.equal(input.attributes('title'), undefined);
|
||||
assert.ok(!input.classes().includes('pp-scope-toggle'));
|
||||
wrapper.unmount();
|
||||
});
|
||||
|
||||
test('v-model shows the value and reports each change', async () => {
|
||||
const wrapper = bound({ modelValue: true });
|
||||
const input = wrapper.get('input');
|
||||
assert.equal(input.element.checked, true);
|
||||
await tick(input);
|
||||
assert.deepEqual(wrapper.emitted('update:modelValue').at(-1), [false]);
|
||||
assert.equal(wrapper.emitted('change').at(-1)[0].target, input.element);
|
||||
assert.equal(input.element.checked, false);
|
||||
await tick(input);
|
||||
assert.deepEqual(wrapper.emitted('update:modelValue').at(-1), [true]);
|
||||
// A parent that resets its value resets the box.
|
||||
await wrapper.setProps({ modelValue: false });
|
||||
assert.equal(input.element.checked, false);
|
||||
wrapper.unmount();
|
||||
});
|
||||
|
||||
test('without restore a change the owner ignores stays ticked, as :checked did', async () => {
|
||||
const wrapper = mount(UiCheckbox, { props: { modelValue: false } });
|
||||
const input = wrapper.get('input');
|
||||
await tick(input);
|
||||
await nextTick();
|
||||
assert.deepEqual(wrapper.emitted('update:modelValue'), [[true]]);
|
||||
assert.equal(input.element.checked, true);
|
||||
wrapper.unmount();
|
||||
});
|
||||
|
||||
test('restore puts a refused change back and keeps an accepted one', async () => {
|
||||
// Refused: the owner keeps its value.
|
||||
const refused = mount(UiCheckbox, {
|
||||
props: { modelValue: true, restore: true },
|
||||
});
|
||||
const box = refused.get('input');
|
||||
await tick(box);
|
||||
assert.deepEqual(refused.emitted('update:modelValue'), [[false]]);
|
||||
await nextTick();
|
||||
assert.equal(box.element.checked, true);
|
||||
refused.unmount();
|
||||
// Accepted: the owner takes the change before the box is checked again.
|
||||
const accepted = bound({ modelValue: true, restore: true });
|
||||
const input = accepted.get('input');
|
||||
await tick(input);
|
||||
await nextTick();
|
||||
assert.equal(input.element.checked, false);
|
||||
assert.equal(accepted.props('modelValue'), false);
|
||||
accepted.unmount();
|
||||
});
|
||||
|
||||
test('without a modelValue the box is the browser’s own', async () => {
|
||||
const wrapper = mount(UiCheckbox, {
|
||||
props: { inputAttrs: { 'data-first-run-suppress': '' } },
|
||||
});
|
||||
const input = wrapper.get('input');
|
||||
assert.equal(input.element.checked, false);
|
||||
await tick(input);
|
||||
assert.equal(input.element.checked, true);
|
||||
assert.equal(wrapper.emitted('change').length, 1);
|
||||
// Rendering again leaves what was ticked alone.
|
||||
await wrapper.setProps({ inputId: 'suppress' });
|
||||
assert.equal(input.attributes('id'), 'suppress');
|
||||
assert.equal(input.element.checked, true);
|
||||
wrapper.unmount();
|
||||
});
|
||||
|
||||
test('a change listener sees the box as the event’s current target', async () => {
|
||||
let seen = null;
|
||||
const wrapper = mount(UiCheckbox, {
|
||||
attrs: {
|
||||
onChange: (event) => {
|
||||
seen = event.currentTarget;
|
||||
},
|
||||
},
|
||||
});
|
||||
const input = wrapper.get('input');
|
||||
await tick(input);
|
||||
assert.equal(seen, input.element);
|
||||
// The label itself does not hear the box's change a second time.
|
||||
assert.equal(wrapper.emitted('change').length, 1);
|
||||
wrapper.unmount();
|
||||
});
|
||||
@@ -0,0 +1,57 @@
|
||||
<script setup>
|
||||
import { nextTick, ref } from 'vue';
|
||||
|
||||
// Core's checkbox: a `<label>` wrapping a native `<input type="checkbox">`
|
||||
// and the default slot, which names it. The box comes first, or after the
|
||||
// slot with `trailing`. Attributes and classes pass through to the label, so
|
||||
// each site keeps its feature class and tip; the input takes `inputId` and
|
||||
// `inputAttrs` (other attributes it needs, such as aria-describedby or a
|
||||
// data hook). With v-model the box shows `modelValue` and a change emits the
|
||||
// checked state; `change` is emitted with the event too. Without a
|
||||
// modelValue the box is the browser's own and keeps whatever is ticked.
|
||||
// `restore` puts the box back to `modelValue` after a change its owner did
|
||||
// not take, so a refused preference shows the applied value again. The kit
|
||||
// classes `ui-checkbox` and `ui-checkbox__input` (checkbox.css) are the
|
||||
// label's centred flex row and the box, which keeps each skin's look.
|
||||
const props = defineProps({
|
||||
modelValue: { type: Boolean, default: undefined },
|
||||
inputId: { type: String, default: undefined },
|
||||
inputAttrs: { type: Object, default: undefined },
|
||||
trailing: { type: Boolean, default: false },
|
||||
restore: { type: Boolean, default: false },
|
||||
});
|
||||
const emit = defineEmits(['update:modelValue', 'change']);
|
||||
const input = ref(null);
|
||||
|
||||
function onChange(event) {
|
||||
emit('update:modelValue', event.target.checked);
|
||||
emit('change', event);
|
||||
if (!props.restore) return;
|
||||
// The owner has answered once the update it caused has rendered.
|
||||
nextTick(() => {
|
||||
const box = input.value;
|
||||
if (
|
||||
box &&
|
||||
props.modelValue !== undefined &&
|
||||
box.checked !== props.modelValue
|
||||
)
|
||||
box.checked = props.modelValue;
|
||||
});
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<label class="ui-checkbox">
|
||||
<slot v-if="props.trailing" />
|
||||
<input
|
||||
ref="input"
|
||||
type="checkbox"
|
||||
:id="props.inputId"
|
||||
class="ui-checkbox__input"
|
||||
v-bind="props.inputAttrs"
|
||||
:checked="props.modelValue"
|
||||
@change="onChange"
|
||||
/>
|
||||
<slot v-if="!props.trailing" />
|
||||
</label>
|
||||
</template>
|
||||
@@ -0,0 +1,200 @@
|
||||
import { after, before, test } from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { installVueDom } from '../../testSupport/vueDom.mjs';
|
||||
|
||||
let mount;
|
||||
let nextTick;
|
||||
let UiDialog;
|
||||
let uninstall;
|
||||
before(async () => {
|
||||
uninstall = installVueDom();
|
||||
({ mount } = await import('@vue/test-utils'));
|
||||
({ nextTick } = await import('vue'));
|
||||
UiDialog = (await import('./UiDialog.vue')).default;
|
||||
});
|
||||
after(() => uninstall());
|
||||
|
||||
/**
|
||||
* A dialog that records what it emits, each with whether the dialog was open
|
||||
* then; its content is a paragraph. One is mounted at a time.
|
||||
*/
|
||||
function dialog(props = {}, attrs = {}) {
|
||||
const events = [];
|
||||
const record = (name) => () =>
|
||||
events.push(
|
||||
name,
|
||||
document.querySelector('dialog').open ? 'shown' : 'hidden',
|
||||
);
|
||||
const wrapper = mount(UiDialog, {
|
||||
attachTo: document.body,
|
||||
props: {
|
||||
...props,
|
||||
onDismiss: record('dismiss'),
|
||||
onBrowserClose: record('browserClose'),
|
||||
onOpened: record('opened'),
|
||||
onClosed: record('closed'),
|
||||
},
|
||||
attrs,
|
||||
slots: { default: '<p class="content">Words</p>' },
|
||||
});
|
||||
return { wrapper, events };
|
||||
}
|
||||
|
||||
test('a dialog mounted closed stays closed until open', async () => {
|
||||
const { wrapper, events } = dialog();
|
||||
const element = wrapper.element;
|
||||
assert.equal(element.tagName, 'DIALOG');
|
||||
assert.equal(element.open, false);
|
||||
assert.equal(wrapper.vm.element, element, 'element is exposed');
|
||||
await wrapper.setProps({ open: true });
|
||||
assert.equal(element.open, true);
|
||||
assert.deepEqual(events, ['opened', 'shown']);
|
||||
await wrapper.setProps({ open: false });
|
||||
assert.equal(element.open, false);
|
||||
assert.deepEqual(events, ['opened', 'shown', 'closed', 'hidden']);
|
||||
wrapper.unmount();
|
||||
});
|
||||
|
||||
test('a dialog mounted open opens modal on mount; unmounting closes it', async () => {
|
||||
const modal = [];
|
||||
const showModal = HTMLDialogElement.prototype.showModal;
|
||||
HTMLDialogElement.prototype.showModal = function () {
|
||||
modal.push(this);
|
||||
return showModal.call(this);
|
||||
};
|
||||
try {
|
||||
const { wrapper, events } = dialog({ open: true });
|
||||
const element = wrapper.element;
|
||||
assert.deepEqual(modal, [element]);
|
||||
assert.equal(element.open, true);
|
||||
assert.deepEqual(events, ['opened', 'shown']);
|
||||
wrapper.unmount();
|
||||
assert.equal(element.open, false);
|
||||
assert.deepEqual(events, ['opened', 'shown'], 'no dismiss on unmount');
|
||||
} finally {
|
||||
HTMLDialogElement.prototype.showModal = showModal;
|
||||
}
|
||||
});
|
||||
|
||||
test('the open state follows the content: opened comes after it renders', async () => {
|
||||
// The content changes in the same update that opens the dialog, so an
|
||||
// opened emitted before that update renders would see the old words.
|
||||
const { h } = await import('vue');
|
||||
let seen;
|
||||
const Host = {
|
||||
props: { open: Boolean, words: String },
|
||||
setup(props) {
|
||||
return () =>
|
||||
h(
|
||||
UiDialog,
|
||||
{
|
||||
open: props.open,
|
||||
onOpened: () => {
|
||||
seen = document.querySelector('dialog .content')?.textContent;
|
||||
},
|
||||
},
|
||||
() => h('p', { class: 'content' }, props.words),
|
||||
);
|
||||
},
|
||||
};
|
||||
const wrapper = mount(Host, {
|
||||
attachTo: document.body,
|
||||
props: { open: false, words: 'Before' },
|
||||
});
|
||||
await wrapper.setProps({ open: true, words: 'After' });
|
||||
assert.equal(seen, 'After');
|
||||
wrapper.unmount();
|
||||
});
|
||||
|
||||
test('Escape is prevented and emitted as dismiss; the owner decides', async () => {
|
||||
const { wrapper, events } = dialog({ open: true });
|
||||
events.length = 0;
|
||||
const cancel = new Event('cancel', { cancelable: true });
|
||||
wrapper.element.dispatchEvent(cancel);
|
||||
assert.equal(cancel.defaultPrevented, true);
|
||||
assert.equal(wrapper.element.open, true);
|
||||
assert.deepEqual(events, ['dismiss', 'shown']);
|
||||
wrapper.unmount();
|
||||
});
|
||||
|
||||
test('a close the browser made while open is reported once; the owner’s is not', async () => {
|
||||
const { wrapper, events } = dialog({ open: true });
|
||||
events.length = 0;
|
||||
wrapper.element.close();
|
||||
assert.deepEqual(events, ['browserClose', 'hidden']);
|
||||
events.length = 0;
|
||||
// The owner then closes it too: nothing to close, closed is still emitted.
|
||||
await wrapper.setProps({ open: false });
|
||||
assert.deepEqual(events, ['closed', 'hidden']);
|
||||
await wrapper.setProps({ open: true });
|
||||
events.length = 0;
|
||||
await wrapper.setProps({ open: false });
|
||||
assert.deepEqual(events, ['closed', 'hidden'], 'no browserClose');
|
||||
wrapper.unmount();
|
||||
});
|
||||
|
||||
test('a late close event from an earlier close is not reported once open again', async () => {
|
||||
const { wrapper, events } = dialog({ open: true });
|
||||
await wrapper.setProps({ open: false });
|
||||
await wrapper.setProps({ open: true });
|
||||
events.length = 0;
|
||||
// The browser's queued close event from the first close lands now.
|
||||
wrapper.element.dispatchEvent(new Event('close'));
|
||||
assert.deepEqual(events, [], 'no browserClose');
|
||||
wrapper.unmount();
|
||||
});
|
||||
|
||||
test('a backdrop click dismisses only when asked, and only on the dialog', async () => {
|
||||
const plain = dialog({ open: true });
|
||||
plain.events.length = 0;
|
||||
plain.wrapper.element.click();
|
||||
assert.deepEqual(plain.events, []);
|
||||
plain.wrapper.unmount();
|
||||
|
||||
const backdrop = dialog({ open: true, backdropDismiss: true });
|
||||
backdrop.events.length = 0;
|
||||
backdrop.wrapper.get('.content').element.click();
|
||||
assert.deepEqual(backdrop.events, [], 'a click inside is content');
|
||||
backdrop.wrapper.element.click();
|
||||
assert.deepEqual(backdrop.events, ['dismiss', 'shown']);
|
||||
backdrop.wrapper.unmount();
|
||||
});
|
||||
|
||||
test('attributes, classes, styles and listeners pass through to the dialog', async () => {
|
||||
const clicks = [];
|
||||
const { wrapper } = dialog(
|
||||
{},
|
||||
{
|
||||
id: 'library',
|
||||
class: 'library-dialog',
|
||||
style: { width: '40px' },
|
||||
'aria-label': 'Library',
|
||||
'data-panel-surface': '',
|
||||
onClick: () => clicks.push('click'),
|
||||
},
|
||||
);
|
||||
const element = wrapper.element;
|
||||
assert.equal(element.id, 'library');
|
||||
assert.ok(element.classList.contains('library-dialog'));
|
||||
assert.equal(element.style.width, '40px');
|
||||
assert.equal(element.getAttribute('aria-label'), 'Library');
|
||||
assert.equal(element.getAttribute('data-panel-surface'), '');
|
||||
element.click();
|
||||
assert.deepEqual(clicks, ['click']);
|
||||
wrapper.unmount();
|
||||
});
|
||||
|
||||
test('a DOM without showModal leaves the dialog closed rather than failing', async () => {
|
||||
const showModal = HTMLDialogElement.prototype.showModal;
|
||||
HTMLDialogElement.prototype.showModal = undefined;
|
||||
try {
|
||||
const { wrapper, events } = dialog({ open: true });
|
||||
assert.equal(wrapper.element.open, false);
|
||||
assert.deepEqual(events, ['opened', 'hidden']);
|
||||
await wrapper.setProps({ open: false });
|
||||
await nextTick();
|
||||
wrapper.unmount();
|
||||
} finally {
|
||||
HTMLDialogElement.prototype.showModal = showModal;
|
||||
}
|
||||
});
|
||||
@@ -0,0 +1,74 @@
|
||||
<script setup>
|
||||
import { onBeforeUnmount, onMounted, useTemplateRef, watch } from 'vue';
|
||||
|
||||
// Core's modal dialog: a native `<dialog>` the owner opens and closes with
|
||||
// `open`. True opens it with showModal() (once mounted, so a dialog mounted
|
||||
// open opens straight away), false closes it, and unmounting closes it.
|
||||
// Each change is applied after the content has rendered and is then emitted
|
||||
// (`opened`, `closed`), so the owner can move focus into the content it
|
||||
// shows or back to the control that opened it. Escape's `cancel` is
|
||||
// prevented and emitted as `dismiss`, so the owner decides; with
|
||||
// `backdropDismiss`, a click on the backdrop (the dialog element itself,
|
||||
// outside its content) is a `dismiss` too. When the browser closes the
|
||||
// dialog on its own while `open` is still true (an Escape it does not let
|
||||
// the page cancel), `browserClose` tells the owner. A DOM without
|
||||
// showModal() (a test's) leaves the dialog closed rather than failing.
|
||||
// Attributes, classes, styles and listeners pass through to the dialog; the
|
||||
// content is the default slot. `element` is the dialog element.
|
||||
const props = defineProps({
|
||||
open: { type: Boolean, default: false },
|
||||
backdropDismiss: { type: Boolean, default: false },
|
||||
});
|
||||
const emit = defineEmits(['dismiss', 'browserClose', 'opened', 'closed']);
|
||||
const element = useTemplateRef('element');
|
||||
let unmounting = false;
|
||||
|
||||
function show() {
|
||||
const dialog = element.value;
|
||||
if (!dialog) return;
|
||||
if (!dialog.open) dialog.showModal?.();
|
||||
emit('opened');
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
if (props.open) show();
|
||||
});
|
||||
watch(
|
||||
() => props.open,
|
||||
(open) => {
|
||||
if (open) return show();
|
||||
const dialog = element.value;
|
||||
if (!dialog) return;
|
||||
// The browser may already have closed it.
|
||||
if (dialog.open) dialog.close();
|
||||
emit('closed');
|
||||
},
|
||||
{ flush: 'post' },
|
||||
);
|
||||
onBeforeUnmount(() => {
|
||||
unmounting = true;
|
||||
if (element.value?.open) element.value.close();
|
||||
});
|
||||
|
||||
function onCancel(event) {
|
||||
event.preventDefault();
|
||||
emit('dismiss');
|
||||
}
|
||||
// The browser queues its close event, so one from an earlier close can land
|
||||
// after the dialog has been opened again; only a dialog still shut reports it.
|
||||
function onClose() {
|
||||
if (!unmounting && props.open && !element.value?.open) emit('browserClose');
|
||||
}
|
||||
function onClick(event) {
|
||||
if (props.backdropDismiss && event.target === event.currentTarget)
|
||||
emit('dismiss');
|
||||
}
|
||||
|
||||
defineExpose({ element });
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<dialog ref="element" @cancel="onCancel" @close="onClose" @click="onClick">
|
||||
<slot />
|
||||
</dialog>
|
||||
</template>
|
||||
@@ -0,0 +1,70 @@
|
||||
// Every checkbox in a Vue view is a UiCheckbox: no SFC template hand-writes
|
||||
// `<input type="checkbox">`. Story Explore's filters are not converted yet.
|
||||
import { test } from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { readFileSync, readdirSync } from 'node:fs';
|
||||
import path from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
|
||||
const SRC_ROOT = fileURLToPath(new URL('../../', import.meta.url));
|
||||
const REPO_ROOT = path.resolve(SRC_ROOT, '..');
|
||||
const NOT_YET = new Set([
|
||||
'src/ui/kit/UiCheckbox.vue',
|
||||
'src/ui/views/stories/ExploreScreen.vue',
|
||||
]);
|
||||
|
||||
/** Every SFC under src. */
|
||||
function sfcFiles(directory = SRC_ROOT) {
|
||||
const files = [];
|
||||
for (const entry of readdirSync(directory, { withFileTypes: true })) {
|
||||
const absolute = path.join(directory, entry.name);
|
||||
if (entry.isDirectory()) files.push(...sfcFiles(absolute));
|
||||
else if (entry.isFile() && entry.name.endsWith('.vue'))
|
||||
files.push(absolute);
|
||||
}
|
||||
return files.sort();
|
||||
}
|
||||
|
||||
/** The template block: everything outside script and style. */
|
||||
function template(source) {
|
||||
return source.replace(/<(script|style)\b[\s\S]*?<\/\1\s*>/g, '');
|
||||
}
|
||||
|
||||
// An opening tag's attributes, quoted values may hold `>` (`() => x`).
|
||||
const ATTRS = String.raw`(?:[^>"']|"[^"]*"|'[^']*')*`;
|
||||
const HAND_WRITTEN_CHECKBOX = new RegExp(
|
||||
String.raw`<input\b${ATTRS}\btype="checkbox"${ATTRS}>`,
|
||||
'gi',
|
||||
);
|
||||
|
||||
/** Hand-written checkboxes in an SFC's template. */
|
||||
function handWrittenCheckboxes(source) {
|
||||
return [...template(source).matchAll(HAND_WRITTEN_CHECKBOX)].map((m) =>
|
||||
m[0].replace(/\s+/g, ' '),
|
||||
);
|
||||
}
|
||||
|
||||
test('the scan finds each hand-written checkbox', () => {
|
||||
for (const markup of [
|
||||
'<template><input type="checkbox" id="x" @change="on" /></template>',
|
||||
'<template><input\n :checked="a > b"\n type="checkbox"\n/></template>',
|
||||
])
|
||||
assert.equal(handWrittenCheckboxes(markup).length, 1, markup);
|
||||
for (const markup of [
|
||||
'<template><UiCheckbox input-id="x" v-model="on">On</UiCheckbox></template>',
|
||||
'<template><input type="search" /></template>',
|
||||
'<script>const html = \'<input type="checkbox">\';</script><template><p /></template>',
|
||||
])
|
||||
assert.equal(handWrittenCheckboxes(markup).length, 0, markup);
|
||||
});
|
||||
|
||||
test('no SFC hand-writes a checkbox; each is a UiCheckbox', () => {
|
||||
const found = [];
|
||||
for (const file of sfcFiles()) {
|
||||
const relative = path.relative(REPO_ROOT, file).split(path.sep).join('/');
|
||||
if (NOT_YET.has(relative)) continue;
|
||||
for (const markup of handWrittenCheckboxes(readFileSync(file, 'utf8')))
|
||||
found.push(`${relative}: ${markup}`);
|
||||
}
|
||||
assert.deepEqual(found, []);
|
||||
});
|
||||
@@ -0,0 +1,66 @@
|
||||
// Every modal dialog in a Vue view is a UiDialog: no SFC template hand-writes
|
||||
// `<dialog>`. Panels drawn as `role="dialog"` (key setup, the welcome
|
||||
// launcher, the CCTV popup, Story Explore's filter) and the render failure's
|
||||
// `alertdialog` are other controls.
|
||||
import { test } from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import { readFileSync, readdirSync } from 'node:fs';
|
||||
import path from 'node:path';
|
||||
import { fileURLToPath } from 'node:url';
|
||||
|
||||
const SRC_ROOT = fileURLToPath(new URL('../../', import.meta.url));
|
||||
const REPO_ROOT = path.resolve(SRC_ROOT, '..');
|
||||
const KIT = 'src/ui/kit/UiDialog.vue';
|
||||
|
||||
/** Every SFC under src. */
|
||||
function sfcFiles(directory = SRC_ROOT) {
|
||||
const files = [];
|
||||
for (const entry of readdirSync(directory, { withFileTypes: true })) {
|
||||
const absolute = path.join(directory, entry.name);
|
||||
if (entry.isDirectory()) files.push(...sfcFiles(absolute));
|
||||
else if (entry.isFile() && entry.name.endsWith('.vue'))
|
||||
files.push(absolute);
|
||||
}
|
||||
return files.sort();
|
||||
}
|
||||
|
||||
/** The template block: everything outside script and style. */
|
||||
function template(source) {
|
||||
return source.replace(/<(script|style)\b[\s\S]*?<\/\1\s*>/g, '');
|
||||
}
|
||||
|
||||
// An opening tag's attributes, quoted values may hold `>` (`() => x`).
|
||||
const ATTRS = String.raw`(?:[^>"']|"[^"]*"|'[^']*')*`;
|
||||
const HAND_WRITTEN_DIALOG = new RegExp(String.raw`<dialog\b${ATTRS}>`, 'gi');
|
||||
|
||||
/** Hand-written dialogs in an SFC's template. */
|
||||
function handWrittenDialogs(source) {
|
||||
return [...template(source).matchAll(HAND_WRITTEN_DIALOG)].map((m) =>
|
||||
m[0].replace(/\s+/g, ' '),
|
||||
);
|
||||
}
|
||||
|
||||
test('the scan finds each hand-written dialog', () => {
|
||||
for (const markup of [
|
||||
'<template><dialog id="x" @cancel.prevent="on"><p /></dialog></template>',
|
||||
'<template><dialog\n :open="a > b"\n class="x"\n>…</dialog></template>',
|
||||
])
|
||||
assert.equal(handWrittenDialogs(markup).length, 1, markup);
|
||||
for (const markup of [
|
||||
'<template><UiDialog :open="on" @dismiss="off"><p /></UiDialog></template>',
|
||||
'<template><div role="dialog" aria-modal="true" /></template>',
|
||||
"<script>const html = '<dialog open>';</script><template><p /></template>",
|
||||
])
|
||||
assert.equal(handWrittenDialogs(markup).length, 0, markup);
|
||||
});
|
||||
|
||||
test('no SFC hand-writes a dialog; each is a UiDialog', () => {
|
||||
const found = [];
|
||||
for (const file of sfcFiles()) {
|
||||
const relative = path.relative(REPO_ROOT, file).split(path.sep).join('/');
|
||||
if (relative === KIT) continue;
|
||||
for (const markup of handWrittenDialogs(readFileSync(file, 'utf8')))
|
||||
found.push(`${relative}: ${markup}`);
|
||||
}
|
||||
assert.deepEqual(found, []);
|
||||
});
|
||||
@@ -188,6 +188,31 @@ test('UiSearchField owns the row and bare input both search skins drew', () => {
|
||||
}
|
||||
});
|
||||
|
||||
test('UiCheckbox owns the centred row the checkbox-only labels drew', () => {
|
||||
const label = ruleWith('.ui-checkbox');
|
||||
assert.deepEqual(label.selectors, ['.ui-checkbox']);
|
||||
assert.match(label.body, /display:\s*flex;/);
|
||||
assert.match(label.body, /align-items:\s*center;/);
|
||||
// The box keeps each skin's size, margin and accent colour.
|
||||
assert.ok(
|
||||
!all.some((rule) =>
|
||||
rule.selectors.some((s) => s.startsWith('.ui-checkbox__input')),
|
||||
),
|
||||
);
|
||||
// Labels that hold only a checkbox leave the row to the kit; the Visual
|
||||
// and voice rows share their classes with buttons and other labels, so
|
||||
// theirs stay.
|
||||
for (const selector of ['.first-run-suppress', '.data-library-check']) {
|
||||
const feature = ruleWith(selector);
|
||||
for (const property of ['display', 'align-items'])
|
||||
assert.doesNotMatch(
|
||||
feature.body,
|
||||
new RegExp(`(^|[\\s;])${property}:`),
|
||||
`${selector} leaves ${property} to the kit`,
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
test('the kit’s skins load before the feature stylesheets that restyle them', () => {
|
||||
const at = (selector) => css.indexOf(selector);
|
||||
for (const [kit, feature] of [
|
||||
@@ -209,6 +234,10 @@ test('the kit’s skins load before the feature stylesheets that restyle them',
|
||||
['.ui-search-field {', '.layer-finder__field {'],
|
||||
['.ui-search-field__input {', '.context-search__input {'],
|
||||
['.ui-search-field__input {', '.layer-finder__field input {'],
|
||||
['.ui-checkbox {', '.pp-toggle-btn {'],
|
||||
['.ui-checkbox {', '.gev-voice-preference {'],
|
||||
['.ui-checkbox {', '.data-library-check {'],
|
||||
['.ui-checkbox {', '.first-run-suppress {'],
|
||||
]) {
|
||||
assert.ok(
|
||||
at(kit) >= 0 && at(feature) > at(kit),
|
||||
|
||||
@@ -178,12 +178,31 @@ test('Cancel and Escape close through the owner; dispose removes the dialog', as
|
||||
$('dialog').dispatchEvent(cancel);
|
||||
assert.equal(cancel.defaultPrevented, true);
|
||||
assert.equal(closes, 2);
|
||||
const root = $('dialog');
|
||||
assert.equal(root.open, true, 'Escape leaves closing to the owner');
|
||||
dialog.dispose();
|
||||
await nextTick();
|
||||
assert.equal($('dialog'), null);
|
||||
assert.equal(root.open, false, 'the removed dialog is closed');
|
||||
assert.equal(store.controls, null);
|
||||
});
|
||||
|
||||
test('a close the browser makes on its own also closes through the owner', async (t) => {
|
||||
// A repeated Escape can close a modal without a cancel the page may stop.
|
||||
const { store } = fixture(t);
|
||||
let closes = 0;
|
||||
const dialog = createSceneDialog(
|
||||
'Share selected scene',
|
||||
() => closes++,
|
||||
store,
|
||||
);
|
||||
await nextTick();
|
||||
$('dialog').close();
|
||||
assert.equal(closes, 1);
|
||||
dialog.dispose();
|
||||
await nextTick();
|
||||
});
|
||||
|
||||
test('a replaced dialog opens fresh and its late dispose leaves the new one', async (t) => {
|
||||
const { store } = fixture(t);
|
||||
opened.length = 0;
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
/* Core's checkboxes are a label wrapping the box and its words, laid out in
|
||||
* a centred flex row: the kit's UiCheckbox wears it as .ui-checkbox. The rule
|
||||
* selects one class and loads before the feature stylesheets, so a feature
|
||||
* rule still sets the row's gap, direction, size and colour. The box,
|
||||
* .ui-checkbox__input, keeps each skin's size, margin and accent colour. */
|
||||
.ui-checkbox {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
}
|
||||
@@ -1576,8 +1576,6 @@ a.first-run-link-card:focus-visible .first-run-link-badge {
|
||||
}
|
||||
|
||||
.first-run-suppress {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 0.4rem;
|
||||
color: rgba(199, 225, 231, 0.66);
|
||||
text-transform: none;
|
||||
|
||||
@@ -133,8 +133,6 @@
|
||||
|
||||
.data-library-check {
|
||||
grid-column: 1 / -1;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
color: var(--text-secondary);
|
||||
}
|
||||
|
||||
@@ -3,6 +3,7 @@ import { storeToRefs } from 'pinia';
|
||||
import { nextTick, ref, watch } from 'vue';
|
||||
import { msg, t } from '../../i18n/index.js';
|
||||
import { FIRST_RUN_LINKS, environmentalLabel } from '../../firstRunCopy.js';
|
||||
import UiCheckbox from '../kit/UiCheckbox.vue';
|
||||
import { useFirstRunStore } from '../stores/firstRun.js';
|
||||
import { useStoriesStore } from '../stores/stories.js';
|
||||
|
||||
@@ -24,6 +25,9 @@ function selectStart(choice) {
|
||||
|
||||
// Three short steps instead of one dense card: mode, where to start, then the
|
||||
// three things worth knowing. Back and Next move between them; Skip closes.
|
||||
// The suppress box's hook, as one object, so the box is not rendered again
|
||||
// with every render of the welcome.
|
||||
const suppressBoxAttrs = { 'data-first-run-suppress': '' };
|
||||
const STEPS = 3;
|
||||
const step = ref(1);
|
||||
const direction = ref('forward');
|
||||
@@ -291,10 +295,9 @@ function onSuppress(event) {
|
||||
</Transition>
|
||||
</div>
|
||||
<div class="first-run-footer">
|
||||
<label class="first-run-suppress">
|
||||
<input type="checkbox" data-first-run-suppress @change="onSuppress" />
|
||||
<UiCheckbox class="first-run-suppress" :input-attrs="suppressBoxAttrs" @change="onSuppress">
|
||||
<span>{{ t('Don\'t show this again') }}</span>
|
||||
</label>
|
||||
</UiCheckbox>
|
||||
<!-- The status line: empty until a mission reports progress or an
|
||||
error. It sits in the footer row, so it never changes the card's
|
||||
height. -->
|
||||
|
||||
@@ -139,6 +139,30 @@ test('Browse opens a modal on the search field, packs last; Escape returns to Br
|
||||
assert.equal(document.activeElement, $('#data-library-browse'));
|
||||
});
|
||||
|
||||
test('a backdrop click and a close the browser made itself return to Browse', async (t_) => {
|
||||
const { owner } = mount(t_);
|
||||
owner.open();
|
||||
await settle();
|
||||
$('#data-library .data-library-intro').click();
|
||||
await settle();
|
||||
assert.equal($('#data-library').open, true, 'a click inside keeps it open');
|
||||
$('#data-library').click();
|
||||
await settle();
|
||||
assert.equal($('#data-library').open, false);
|
||||
assert.equal(document.activeElement, $('#data-library-browse'));
|
||||
owner.open();
|
||||
await settle();
|
||||
assert.equal(document.activeElement, $('#data-library input[type="search"]'));
|
||||
// An Escape the page may not cancel: the browser closes it first.
|
||||
$('#data-library').close();
|
||||
await settle();
|
||||
assert.equal($('#data-library').open, false);
|
||||
assert.equal(document.activeElement, $('#data-library-browse'));
|
||||
owner.open();
|
||||
await settle();
|
||||
assert.equal($('#data-library').open, true, 'the owner closed it too');
|
||||
});
|
||||
|
||||
test('filters narrow the list as the viewer types and picks', async (t_) => {
|
||||
const { owner } = mount(t_);
|
||||
owner.open();
|
||||
|
||||
@@ -3,7 +3,9 @@ import { storeToRefs } from 'pinia';
|
||||
import { computed, nextTick, useTemplateRef, watch } from 'vue';
|
||||
import { formatNumber, t, tn } from '../../../i18n/index.js';
|
||||
import UiButton from '../../kit/UiButton.vue';
|
||||
import UiCheckbox from '../../kit/UiCheckbox.vue';
|
||||
import UiCloseButton from '../../kit/UiCloseButton.vue';
|
||||
import UiDialog from '../../kit/UiDialog.vue';
|
||||
import UiSelect from '../../kit/UiSelect.js';
|
||||
import {
|
||||
libraryStatTiles,
|
||||
@@ -23,27 +25,18 @@ const { controls } = storeToRefs(useDataLibraryStore());
|
||||
const root = useTemplateRef('root');
|
||||
const search = useTemplateRef('search');
|
||||
|
||||
watch(
|
||||
() => props.view.open,
|
||||
async (open, wasOpen) => {
|
||||
await nextTick();
|
||||
const dialog = root.value;
|
||||
if (!dialog) return;
|
||||
if (open) {
|
||||
if (!dialog.open) dialog.showModal?.();
|
||||
search.value?.focus();
|
||||
return;
|
||||
}
|
||||
if (dialog.open) dialog.close();
|
||||
// The browser may already have closed it (Escape is not always
|
||||
// cancelable); either way focus returns to Browse, unless the viewer
|
||||
// has moved it somewhere else meanwhile.
|
||||
const active = document.activeElement;
|
||||
if (wasOpen && (!active || active === document.body || dialog.contains(active)))
|
||||
document.getElementById('data-library-browse')?.focus();
|
||||
},
|
||||
{ immediate: true },
|
||||
);
|
||||
// UiDialog opens and closes the dialog as `view.open` says, once the content
|
||||
// has rendered; Escape and a click on the backdrop dismiss.
|
||||
const onOpened = () => search.value?.focus();
|
||||
// The browser may already have closed it (Escape is not always cancelable);
|
||||
// either way focus returns to Browse, unless the viewer has moved it
|
||||
// somewhere else meanwhile.
|
||||
const onClosed = () => {
|
||||
const dialog = root.value?.element;
|
||||
const active = document.activeElement;
|
||||
if (!active || active === document.body || dialog?.contains(active))
|
||||
document.getElementById('data-library-browse')?.focus();
|
||||
};
|
||||
watch(
|
||||
() => props.view.focusSearch,
|
||||
async () => {
|
||||
@@ -80,24 +73,22 @@ const resetLabel = computed(() =>
|
||||
? t('Confirm: remove every added entry from Data Layers')
|
||||
: t('Remove every added entry from Data Layers'),
|
||||
);
|
||||
// A click on the backdrop (the dialog box itself, outside its content)
|
||||
// dismisses, like Escape.
|
||||
const onDialogClick = (event) => {
|
||||
if (event.target === event.currentTarget) controls.value?.close();
|
||||
};
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<dialog
|
||||
<UiDialog
|
||||
id="data-library"
|
||||
ref="root"
|
||||
class="data-library-dialog"
|
||||
data-panel-surface
|
||||
aria-labelledby="data-library-title"
|
||||
aria-describedby="data-library-intro"
|
||||
@cancel.prevent="controls?.close()"
|
||||
@close="view.open && controls?.close()"
|
||||
@click="onDialogClick"
|
||||
:open="view.open"
|
||||
backdrop-dismiss
|
||||
@dismiss="controls?.close()"
|
||||
@browser-close="controls?.close()"
|
||||
@opened="onOpened"
|
||||
@closed="onClosed"
|
||||
>
|
||||
<header class="data-library-header" data-panel-header>
|
||||
<h2 id="data-library-title" class="panel-title panel-surface-title">
|
||||
@@ -153,14 +144,13 @@ const onDialogClick = (event) => {
|
||||
@update:model-value="controls?.setFamily($event)"
|
||||
/>
|
||||
</label>
|
||||
<label class="data-library-check">
|
||||
<input
|
||||
type="checkbox"
|
||||
:checked="view.filter.availableOnly"
|
||||
@change="controls?.setAvailableOnly($event.target.checked)"
|
||||
/>
|
||||
<UiCheckbox
|
||||
class="data-library-check"
|
||||
:model-value="view.filter.availableOnly"
|
||||
@update:model-value="controls?.setAvailableOnly($event)"
|
||||
>
|
||||
<span>{{ t('Only what this instance serves') }}</span>
|
||||
</label>
|
||||
</UiCheckbox>
|
||||
</div>
|
||||
<div class="data-library-toolbar">
|
||||
<p class="data-library-status" role="status" aria-live="polite">
|
||||
@@ -188,5 +178,5 @@ const onDialogClick = (event) => {
|
||||
/>
|
||||
</ul>
|
||||
</div>
|
||||
</dialog>
|
||||
</UiDialog>
|
||||
</template>
|
||||
@@ -11,6 +11,7 @@ import UiSegmented from '../../kit/UiSegmented.vue';
|
||||
import UiSlider from '../../kit/UiSlider.js';
|
||||
import { useDisplayStore } from '../../stores/display.js';
|
||||
import UiButton from '../../kit/UiButton.vue';
|
||||
import UiCheckbox from '../../kit/UiCheckbox.vue';
|
||||
import UiSelect from '../../kit/UiSelect.js';
|
||||
import { StyleParameterRows } from '../../styleParameters.js';
|
||||
import VisualPresets from './VisualPresets.vue';
|
||||
@@ -182,11 +183,10 @@ const allocationOptions = computed(() => [
|
||||
</div>
|
||||
</Teleport>
|
||||
<div class="pp-toggle-group">
|
||||
<label class="pp-toggle-btn pp-scope-toggle" :title="t('Scope — the circular viewport mask')">
|
||||
<UiCheckbox class="pp-toggle-btn pp-scope-toggle" :title="t('Scope — the circular viewport mask')" input-id="scope-toggle" trailing :model-value="scopeOn" @update:model-value="act('setScopeEnabled', $event)">
|
||||
<span class="pp-icon material-symbols-outlined" aria-hidden="true">adjust</span>
|
||||
<span class="pp-label">{{ t('Scope') }}</span>
|
||||
<input type="checkbox" id="scope-toggle" @change="act('setScopeEnabled', $event.target.checked)" :checked="scopeOn" />
|
||||
</label>
|
||||
</UiCheckbox>
|
||||
<div class="pp-slider-row visible" id="scope-slider-row">
|
||||
<span class="pp-slider-mini-label">{{ t('Feather') }}</span>
|
||||
<UiSlider class="pp-slider" id="scope-feather-slider" @update:model-value="act('setScopeFeather', $event)" min="0" max="200" :model-value="scopeFeather" :disabled="!scopeOn" :aria-label="t('Scope edge feather')" :title="t('Scope edge feather as a percentage of the keyhole radius')" />
|
||||
@@ -211,11 +211,10 @@ const allocationOptions = computed(() => [
|
||||
</div>
|
||||
<!-- Sky: only where the renderer has a sky to set. -->
|
||||
<div v-if="sky" class="pp-toggle-group" id="sky-group">
|
||||
<label v-for="row in skyRows" :key="row.key" class="pp-toggle-btn pp-scope-toggle" :id="`sky-${row.key}-row`">
|
||||
<UiCheckbox v-for="row in skyRows" :key="row.key" class="pp-toggle-btn pp-scope-toggle" :id="`sky-${row.key}-row`" :input-id="`sky-${row.key}-toggle`" trailing :model-value="sky.switches[row.key]" @update:model-value="act('setSkySwitch', row.key, $event)">
|
||||
<span class="pp-icon material-symbols-outlined" aria-hidden="true">{{ row.icon }}</span>
|
||||
<span class="pp-label">{{ row.label }}</span>
|
||||
<input type="checkbox" :id="`sky-${row.key}-toggle`" @change="act('setSkySwitch', row.key, $event.target.checked)" :checked="sky.switches[row.key]" />
|
||||
</label>
|
||||
</UiCheckbox>
|
||||
<div class="pp-slider-row visible" id="sky-milkyway-row">
|
||||
<span class="pp-slider-mini-label">{{ t('Milky Way') }}</span>
|
||||
<UiSlider class="pp-slider" id="sky-milkyway-slider" @update:model-value="act('setSkyMilkyWay', $event)" min="0" max="100" :model-value="sky.milkyWay" :aria-label="t('Milky Way')" />
|
||||
@@ -225,11 +224,10 @@ const allocationOptions = computed(() => [
|
||||
<!-- Groups the application adds (store `publishGroup`). -->
|
||||
<div v-for="group in groups" :key="group.id" class="pp-toggle-group" :id="`${group.id}-group`">
|
||||
<template v-for="row in group.rows" :key="row.id">
|
||||
<label v-if="row.kind === 'toggle'" class="pp-toggle-btn pp-scope-toggle" :title="row.title">
|
||||
<UiCheckbox v-if="row.kind === 'toggle'" class="pp-toggle-btn pp-scope-toggle" :title="row.title" :input-id="`${group.id}-${row.id}-toggle`" trailing :model-value="row.checked" @update:model-value="row.onChange?.($event)">
|
||||
<span v-if="row.icon" class="pp-icon material-symbols-outlined" aria-hidden="true">{{ row.icon }}</span>
|
||||
<span class="pp-label">{{ row.label }}</span>
|
||||
<input type="checkbox" :id="`${group.id}-${row.id}-toggle`" @change="row.onChange?.($event.target.checked)" :checked="row.checked" />
|
||||
</label>
|
||||
</UiCheckbox>
|
||||
<div v-else-if="row.kind === 'note'" class="pp-slider-row visible" :id="`${group.id}-${row.id}`">
|
||||
<span class="pp-slider-mini-label">{{ row.text }}</span>
|
||||
</div>
|
||||
|
||||
@@ -1,21 +1,17 @@
|
||||
<script setup>
|
||||
import { storeToRefs } from 'pinia';
|
||||
import { computed, onBeforeUnmount, onMounted, shallowRef, useTemplateRef } from 'vue';
|
||||
import { computed, shallowRef } from 'vue';
|
||||
import { t, tn } from '../../../i18n/index.js';
|
||||
import UiDialog from '../../kit/UiDialog.vue';
|
||||
import { vStatusText } from '../../rail/statusText.js';
|
||||
import { useSceneSharingStore } from '../../stores/sceneSharing.js';
|
||||
|
||||
// One open scene sharing dialog, as src/ui/sceneSharing.js presents it. The
|
||||
// parent keys this by dialog, so each one opens as a fresh modal.
|
||||
// parent keys this by dialog, so each one opens as a fresh modal: UiDialog
|
||||
// opens it on mount and closes it on unmount.
|
||||
const props = defineProps({ view: { type: Object, required: true } });
|
||||
const { controls } = storeToRefs(useSceneSharingStore());
|
||||
|
||||
const root = useTemplateRef('root');
|
||||
onMounted(() => root.value?.showModal?.());
|
||||
onBeforeUnmount(() => {
|
||||
if (root.value?.open) root.value.close();
|
||||
});
|
||||
|
||||
const bodyItems = computed(() => props.view.items.filter((item) => item.place === 'body'));
|
||||
const footerItems = computed(() => props.view.items.filter((item) => item.place === 'footer'));
|
||||
// Typing reaches the item before any republish, so a field is rewritten only
|
||||
@@ -46,7 +42,7 @@ const chooserStyle = (focused) => ({ padding: '3px 9px', border: '1px solid #397
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<dialog ref="root" data-director-dialog class="director-sharing-dialog" :aria-label="view.title" :style="dialogStyle" @cancel.prevent="controls?.cancel()">
|
||||
<UiDialog open data-director-dialog class="director-sharing-dialog" :aria-label="view.title" :style="dialogStyle" @dismiss="controls?.cancel()" @browser-close="controls?.cancel()">
|
||||
<h2 style="margin-bottom: 12px">{{ view.title }}</h2>
|
||||
<div>
|
||||
<template v-for="item in bodyItems" :key="item.id">
|
||||
@@ -60,5 +56,5 @@ const chooserStyle = (focused) => ({ padding: '3px 9px', border: '1px solid #397
|
||||
<div>
|
||||
<button v-for="item in footerItems" :key="item.id" type="button" :style="buttonStyle" :disabled="item.disabled" :autofocus="item.autofocus || undefined" v-bind="item.hook ? { [item.hook]: '' } : {}" @click="controls?.click(item.id)">{{ item.label }}</button>
|
||||
</div>
|
||||
</dialog>
|
||||
</UiDialog>
|
||||
</template>
|
||||
@@ -9,6 +9,7 @@ import VoiceVisualizer from './VoiceVisualizer.vue';
|
||||
import ChatPanel from './ChatPanel.vue';
|
||||
import PanelLayoutButtons from './PanelLayoutButtons.vue';
|
||||
import UiButton from '../../kit/UiButton.vue';
|
||||
import UiCheckbox from '../../kit/UiCheckbox.vue';
|
||||
import UiCloseButton from '../../kit/UiCloseButton.vue';
|
||||
import UiSelect from '../../kit/UiSelect.js';
|
||||
|
||||
@@ -19,16 +20,9 @@ defineProps({ view: { type: Object, required: true } });
|
||||
const { controls } = storeToRefs(useVoiceStore());
|
||||
const emit = (name, ...args) => controls.value?.emit(name, ...args);
|
||||
|
||||
// A value the owner may restore after a refused change; written on every
|
||||
// render, as the owner's own writes were.
|
||||
const vChecked = {
|
||||
mounted(el, { value }) {
|
||||
el.checked = value;
|
||||
},
|
||||
updated(el, { value }) {
|
||||
if (el.checked !== value) el.checked = value;
|
||||
},
|
||||
};
|
||||
// The Voice Preview box's note, as one object, so the panel's other renders
|
||||
// do not render the box again.
|
||||
const previewBoxAttrs = { 'aria-describedby': 'gev-voice-preview-note' };
|
||||
// The minutes field holds a draft until it changes: write it only when its
|
||||
// owner does, not on every render (the waveform renders each frame).
|
||||
const vOwnedValue = {
|
||||
@@ -127,11 +121,11 @@ const frameStyle = (panel) => ({
|
||||
</label>
|
||||
<p class="gev-voice-settings-note">{{ t('The selected AI provider is shared by voice and chat.') }}</p>
|
||||
<div id="gev-settings-chat">
|
||||
<label class="gev-voice-preference gev-voice-preference-toggle"><input id="gev-chat-quick" type="checkbox" v-checked="view.chat.quickChecked" @change="emit('chat-quick-change', $event.target.checked)" /><span>{{ t('Show quick commands') }}</span></label>
|
||||
<UiCheckbox class="gev-voice-preference gev-voice-preference-toggle" input-id="gev-chat-quick" restore :model-value="view.chat.quickChecked" @update:model-value="emit('chat-quick-change', $event)"><span>{{ t('Show quick commands') }}</span></UiCheckbox>
|
||||
<p>{{ t('Chat replies are silent. No microphone access is needed.') }}</p>
|
||||
</div>
|
||||
<div id="gev-settings-voice">
|
||||
<label class="gev-voice-preference gev-voice-preference-toggle"><input id="gev-voice-preview-enabled" type="checkbox" aria-describedby="gev-voice-preview-note" v-checked="view.preferences.previewChecked" @change="emit('preview-change', $event.target.checked)" /><span>{{ t('Show Voice Preview') }}</span></label>
|
||||
<UiCheckbox class="gev-voice-preference gev-voice-preference-toggle" input-id="gev-voice-preview-enabled" :input-attrs="previewBoxAttrs" restore :model-value="view.preferences.previewChecked" @update:model-value="emit('preview-change', $event)"><span>{{ t('Show Voice Preview') }}</span></UiCheckbox>
|
||||
<p id="gev-voice-preview-note" class="gev-voice-settings-note">{{ view.preferences.previewNote }}</p>
|
||||
<div class="gev-voice-timeout-group">
|
||||
<label class="gev-voice-preference gev-voice-setting-title" for="gev-voice-timeout-select">{{ t('Voice inactivity timeout') }}</label>
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
@import './src/ui/styles/action-button.css';
|
||||
@import './src/ui/styles/close-button.css';
|
||||
@import './src/ui/styles/search-field.css';
|
||||
@import './src/ui/styles/checkbox.css';
|
||||
@import './src/ui/styles/form-field.css';
|
||||
@import './src/ui/styles/status-badge.css';
|
||||
@import './src/ui/styles/chip.css';
|
||||
|
||||
Reference in new issue
Block a user