diff --git a/js/view.js b/js/view.js
index bd6802d..6a4d4e0 100644
--- a/js/view.js
+++ b/js/view.js
@@ -185,6 +185,63 @@ function syncAuxContext() {
}
subscribe(Change.GRAPH, syncAuxContext);
+// ── The last view, reopened from the header ──
+// One button in the workspace strip (and one in the phone's workspace pill)
+// opens whichever view the tool window showed last. It names that view, since
+// what a click does changes with use and an icon alone would have to be
+// decoded every time. Library until something else has been opened, as the
+// first of the four. Remembered per reader, like maximize.
+const AUX_LAST_KEY = 'automata-aux-last';
+const LAST_VIEW_BUTTONS = ['hdr-last-view', 'mobile-last-view'];
+let lastAuxView = (() => {
+ try {
+ const v = localStorage.getItem(AUX_LAST_KEY);
+ return AUX_VIEWS.includes(v) ? v : AUX_VIEWS[0];
+ } catch (e) { return AUX_VIEWS[0]; }
+})();
+
+export function lastAuxViewId() { return lastAuxView; }
+
+function rememberAuxView(v) {
+ if (v === lastAuxView) return;
+ lastAuxView = v;
+ try { localStorage.setItem(AUX_LAST_KEY, v); } catch (e) { }
+}
+
+// On a phone the window opens below the header, so the button is still there
+// while its view is showing: it is lit then, and a second press puts the view
+// away — the same press that opened it.
+export function openLastAuxView() {
+ if (App.view === lastAuxView) closeAuxView();
+ else setView(lastAuxView);
+}
+
+function syncLastViewButtons() {
+ const meta = AUX_META[lastAuxView];
+ const open = App.view === lastAuxView;
+ for (const id of LAST_VIEW_BUTTONS) {
+ const btn = $(id);
+ if (!btn) continue;
+ // Wired on first sync rather than at module scope: init's setView('build')
+ // is the first sync, and by then the element is the page's own.
+ if (!btn.dataset.wired) {
+ btn.dataset.wired = '1';
+ btn.addEventListener('click', openLastAuxView);
+ }
+ // Rebuilt only when the view changes, so a repaint never swaps the
+ // glyph out from under a hover.
+ if (btn.dataset.view !== lastAuxView) {
+ btn.dataset.view = lastAuxView;
+ btn.innerHTML = `
${meta.icon}`
+ + `
${meta.title}`;
+ btn.setAttribute('aria-label', `Open ${meta.title}`);
+ btn.setAttribute('data-tip', `Open ${meta.title}`);
+ btn.setAttribute('data-tip-kbd', auxViewKey(lastAuxView));
+ }
+ btn.classList.toggle('is-open', open);
+ }
+}
+
// Populates the shared modal chrome for the given aux view.
export function applyAuxChrome(v) {
ensureAuxChrome();
@@ -224,6 +281,8 @@ export function setView(v) {
else delete document.body.dataset.auxView;
applyAuxChrome(v);
+ if (isAux) rememberAuxView(v);
+ syncLastViewButtons();
// Keep the trigger lit while an aux view is up, and mark the open item. The
// trigger is now the More button, because that menu is where the three
diff --git a/tests/aux-window.test.js b/tests/aux-window.test.js
index c7ffb2e..96eaf81 100644
--- a/tests/aux-window.test.js
+++ b/tests/aux-window.test.js
@@ -132,3 +132,70 @@ test('Library comes first, and the More menu, the strip and the digits agree on
assert.deepEqual(tabs(h).map(t => t.getAttribute('data-tip-kbd')), ['2', '3', '4', '5']);
h.context.setView('build');
});
+
+// ── The last view, reopened from the header ──
+
+function lastView(h, id = 'hdr-last-view') {
+ return h.getElement(id);
+}
+
+test('the header button names the view the window showed last, Library before any', () => {
+ const h = createHarness();
+ // The remembered view is module state an earlier test may have set, so the
+ // Library default is pinned on the source rather than observed here.
+ assert.match(readFileSync(join(ROOT, 'js/view.js'), 'utf8'),
+ /AUX_VIEWS\.includes\(v\) \? v : AUX_VIEWS\[0\]/);
+ h.context.setView('build');
+ const btn = lastView(h);
+ h.context.setView('grammar');
+ h.context.setView('build');
+ assert.equal(btn.dataset.view, 'grammar');
+ assert.match(btn.innerHTML, /Grammar/);
+ assert.equal(btn.getAttribute('aria-label'), 'Open Grammar');
+ assert.equal(btn.getAttribute('data-tip-kbd'), h.context.auxViewKey('grammar'));
+ assert.equal(h.context.localStorage.getItem('automata-aux-last'), 'grammar');
+});
+
+test('pressing it opens that view, and on a phone a second press puts it away', () => {
+ const h = createHarness();
+ h.context.setView('reference');
+ h.context.setView('build');
+ lastView(h)._listeners.click();
+ assert.equal(h.context.App.view, 'reference');
+ assert.equal(lastView(h).classList.contains('is-open'), true);
+ lastView(h, 'mobile-last-view')._listeners.click();
+ assert.equal(h.context.App.view, 'build');
+ assert.equal(lastView(h, 'mobile-last-view').classList.contains('is-open'), false);
+});
+
+test('the desktop and phone buttons always name the same view', () => {
+ const h = createHarness();
+ for (const v of h.context.AUX_VIEWS) {
+ h.context.setView(v);
+ h.context.setView('build');
+ assert.equal(lastView(h).dataset.view, v);
+ assert.equal(lastView(h, 'mobile-last-view').dataset.view, v);
+ }
+});
+
+test('the button and the tab chevron sit inside the strip frame, outside the scroller', () => {
+ const strip = html.slice(html.indexOf('
0, 'the scroller is inside the frame');
+ const scrollerEnd = strip.indexOf('
', scroller);
+ for (const id of ['tab-overflow-btn', 'hdr-last-view']) {
+ const at = strip.indexOf(`id="${id}"`);
+ assert.ok(at > scrollerEnd, `${id} is in the frame, after the scroller`);
+ }
+ // The frame holds the border, so nothing in it scrolls away with the tabs.
+ const layout = readFileSync(join(ROOT, 'css/layout.css'), 'utf8');
+ const rule = name => (layout.match(new RegExp(`\\n${name.replace('.', '\\.')} \\{[^}]*\\}`)) || [''])[0];
+ assert.match(rule('.tab-strip'), /border: 1px solid/);
+ assert.doesNotMatch(rule('.tab-bar'), /border:/);
+});
+
+test('on a phone the button shares the workspace pill', () => {
+ const pill = html.slice(html.indexOf('
0 && pill.indexOf('id="mobile-ws-btn"') < end);
+});