diff --git a/changelog.d/1893-phone-context-no-contacts.md b/changelog.d/1893-phone-context-no-contacts.md new file mode 100644 index 0000000000..457e66bb06 --- /dev/null +++ b/changelog.d/1893-phone-context-no-contacts.md @@ -0,0 +1,2 @@ +- Opening the phone Context tab with an aircraft tracked shows its card and no + longer switches Contacts on (samehkhamis, #1893). diff --git a/docs/CURRENT-STATE.md b/docs/CURRENT-STATE.md index 231777d4a9..ada8897b97 100644 --- a/docs/CURRENT-STATE.md +++ b/docs/CURRENT-STATE.md @@ -3752,9 +3752,10 @@ that misses onto the map surface, it searches at most eight hits in a 14px squar and accepts the first registered layer hit, stopping at non-map objects. Civil and military aircraft and vessels share this rule; fine pointers stay exact. -Manually opening Context with a tracked civilian or military aircraft enters -the existing Contacts mode when Context is off. Contacts adopts that aircraft -without restarting its tracking. Programmatic sheet changes and closing the tab do not activate a mode. +Opening the Context tab only presents the Context panel, as on desktop: with +an aircraft tracked it shows that aircraft's card (a click on it opened the card +whether or not the panel was open). It never switches Contacts or any other +Context mode on, and changes no layer or detection. Sheets borrow panels. Opening one expands its panels without persisting them or claiming a user choice, and share links keep reporting each borrowed panel's diff --git a/src/ui/applicationShell.js b/src/ui/applicationShell.js index 905c2e1101..8bad25216d 100644 --- a/src/ui/applicationShell.js +++ b/src/ui/applicationShell.js @@ -908,9 +908,6 @@ export class StyleManager extends ShellFacade { this._panelChrome.setPanelCollapsed(panelId, collapsed, options), readPanel: (panel) => this._panelChrome._shownPanel(panel), onSheetsClosed: () => this._syncShareState(), - onTabOpened: (sheet) => { - void this._onMobileTabOpened(sheet); - }, publish: (view) => useDisplayStore(applicationPinia()).publishPhoneShell(view), afterPublish: (callback) => { @@ -919,32 +916,6 @@ export class StyleManager extends ShellFacade { }); } - /** Reveal a tracked aircraft through Contacts when its phone tab is opened. */ - async _onMobileTabOpened(sheet) { - const context = this.getContextModeState(); - if ( - sheet !== 'context' || - this._disposed || - !context || - context.mode || - context.changing || - context.entering || - !this.getAircraftTrackingTarget() - ) - return false; - try { - const result = await this.setContextMode('contacts'); - if (result?.ok) return true; - if (result?.cancelled || this._disposed) return false; - } catch { - if (this._disposed) return false; - } - this._showToast( - t('Contacts could not complete the requested transition; try again'), - ); - return false; - } - /** * Renders the owner-approved map stack chip row from the matching controller * entries. Cesium ion/Bing chips remain keyboard-focusable but unavailable, diff --git a/src/ui/mobileShell.js b/src/ui/mobileShell.js index 2980827fbe..7a229d3ca5 100644 --- a/src/ui/mobileShell.js +++ b/src/ui/mobileShell.js @@ -98,8 +98,6 @@ function currentSheetOf(body) { * @param {(callback: () => void) => number} [input.requestFrame] * @param {() => void} [input.onSheetsClosed] Runs after the last sheet closes * and its panels are put back (e.g. to refresh the share link). - * @param {(sheet: string) => void} [input.onTabOpened] Runs only when the user - * opens a sheet from its tab, never on close or programmatic presentation. * @param {(view: ?{enabled: boolean, sheet: string|null, tabs: typeof MOBILE_TABS}) => void} [input.publish] * Receives the tab bar: whether the shell is on, the open sheet and the * tabs; null once the shell is destroyed. @@ -117,7 +115,6 @@ export function initMobileShell({ ResizeObserverImpl = globalThis.ResizeObserver, requestFrame = globalThis.requestAnimationFrame?.bind(globalThis), onSheetsClosed = () => {}, - onTabOpened = () => {}, publish = () => {}, afterPublish = (callback) => callback(), } = {}) { @@ -351,7 +348,6 @@ export function initMobileShell({ // Closing from the tab bar returns focus to the tab that was pressed. if (!sheet) returnFocus = button; setSheet(sheet); - if (sheet && currentSheetOf(body) === sheet) onTabOpened(sheet); }); // Touch events let native scrolling continue until a downward pull at the // top is intentional. Pointer capture/touch-action:none would also seize diff --git a/src/ui/mobileShell.test.mjs b/src/ui/mobileShell.test.mjs index 2f1b6c3bc6..6e0f4f2559 100644 --- a/src/ui/mobileShell.test.mjs +++ b/src/ui/mobileShell.test.mjs @@ -2,7 +2,6 @@ import assert from 'node:assert/strict'; import { readFileSync } from 'node:fs'; import test from 'node:test'; import { StyleManager } from './applicationShell.js'; -import { ContextControls } from './contextControls.js'; import { MOBILE_SHEET_PANELS, MOBILE_TABS, @@ -10,7 +9,6 @@ import { nextSheet, sheetForPanelId, } from './mobileShell.js'; -import { withEntityRecord } from '../data/entityRecords.js'; function element(tag, document) { const node = new EventTarget(); @@ -111,12 +109,7 @@ function element(tag, document) { const PANEL_IDS = [...new Set(Object.values(MOBILE_SHEET_PANELS).flat())]; -function fixture({ - mobile = true, - expanded = [], - onTabOpened = () => {}, - afterPublish, -} = {}) { +function fixture({ mobile = true, expanded = [], afterPublish } = {}) { const document = new EventTarget(); document.ids = new Map(); document.createElement = (tag) => element(tag, document); @@ -208,7 +201,6 @@ function fixture({ } const shell = initMobileShell({ documentRef: document, - onTabOpened, publish, afterPublish, matchMedia: () => media, @@ -587,7 +579,9 @@ test('the phone shell keeps the required attribution visible', () => { }; const lift = (block) => Number( - /bottom: calc\(var\(--mobile-tab-space\) \+ (\d+)px \+ var\(--world-timeline-lift, 0px\)\)/.exec(block)?.[1], + /bottom: calc\(var\(--mobile-tab-space\) \+ (\d+)px \+ var\(--world-timeline-lift, 0px\)\)/.exec( + block, + )?.[1], ); const z = (block) => Number(/z-index: (\d+);/.exec(block)?.[1]); const idleCredit = rule( @@ -803,157 +797,19 @@ test('touches outside the active sheet and destroyed listeners cannot dismiss or assert.equal(shell.getSheet(), null); }); -test('the tab-open callback reports only a successful manual opening', () => { - const opened = []; - const phone = fixture({ onTabOpened: (sheet) => opened.push(sheet) }); - phone.shell.setSheet('context'); - assert.deepEqual(opened, []); - phone.press('context'); - assert.deepEqual(opened, [], 'closing is not a new context request'); - phone.press('context'); - assert.deepEqual(opened, ['context']); - phone.setBodyClass('cockpit-mode'); +test('opening the Context tab only presents its panel and starts no Context mode', () => { + const phone = fixture(); phone.press('context'); + assert.equal(phone.shell.getSheet(), 'context'); assert.deepEqual( - opened, - ['context'], - 'blocked sheets cannot activate a mode', + phone.calls.map(({ panelId, collapsed }) => ({ panelId, collapsed })), + [{ panelId: 'global-context-panel', collapsed: false }], ); + // The application shell no longer starts Contacts when the tab opens. + assert.equal(StyleManager.prototype._onMobileTabOpened, undefined); phone.shell.destroy(); }); -test('manual Context opens the existing transaction without disabling the tracked aircraft', async () => { - const calls = []; - const tracked = { layerId: 'flights', icao24: 'abc123', callsign: 'EJA225' }; - const viewer = { trackedEntity: withEntityRecord({}, { trackedId: 'flights:abc123' }) }; - const entity = viewer.trackedEntity; - const enabled = new Set(['flights', 'weather']); - const controls = new ContextControls({ - elements: {}, - installations: {}, - actions: { - getCockpit: () => null, - claimVisualAuthority: () => calls.push('claim'), - syncDetection() {}, - scheduleLayout() {}, - showToast() {}, - }, - }); - controls.connect({ - layers: new Map( - ['flights', 'weather', 'military-awareness'].map((id) => [id, {}]), - ), - getEnabledLayerIds: () => [...enabled], - getLayerParams: () => ({}), - isEffectivelyEnabled: (id) => enabled.has(id), - isEnabled: (id) => enabled.has(id), - setLayerParams: (id, params) => calls.push({ id, params }), - setEnabled: async (id, value) => { - calls.push({ id, value }); - if (!value) enabled.delete(id); - if (id === 'flights' && !value) viewer.trackedEntity = null; - return true; - }, - _setEnabledWithIntent: (id, value) => { - calls.push({ id, value }); - enabled.add(id); - return { intentEpoch: 1, promise: Promise.resolve(true) }; - }, - }); - const shell = { - cockpitView: { - readAircraftInfo: () => (viewer.trackedEntity ? tracked : null), - }, - getAircraftTrackingTarget: StyleManager.prototype.getAircraftTrackingTarget, - getContextModeState: () => controls.getContextModeState(), - setContextMode: (mode) => controls.setContextMode(mode), - _showToast: () => assert.fail('successful entry must not report a failure'), - }; - try { - assert.equal( - await StyleManager.prototype._onMobileTabOpened.call(shell, 'context'), - true, - ); - assert.equal(controls.getContextModeState().mode, 'flights'); - assert.equal(viewer.trackedEntity, entity); - assert.deepEqual(shell.getAircraftTrackingTarget(), { - layerId: 'flights', - id: 'abc123', - }); - assert.ok(enabled.has('flights')); - assert.ok( - calls.some( - (call) => call.id === 'military-awareness' && call.value === true, - ), - ); - assert.ok(!calls.some((call) => call.id === 'flights')); - const count = calls.length; - assert.equal( - await StyleManager.prototype._onMobileTabOpened.call(shell, 'context'), - false, - ); - assert.equal( - calls.length, - count, - 'an already active Contacts session is not restarted', - ); - } finally { - controls.stop(); - controls.disconnect(); - } -}); - -test('manual Context respects an active mode, busy transitions, missing tracks and disposal', async () => { - for (const state of [ - { mode: 'flights' }, - { changing: true }, - { entering: 'flights' }, - { noTrack: true }, - { disposed: true }, - { sheet: 'layers' }, - ]) { - const shell = { - _disposed: state.disposed, - getContextModeState: () => state, - getAircraftTrackingTarget: () => - state.noTrack ? null : { layerId: 'flights', id: 'abc123' }, - setContextMode: () => - assert.fail('guarded tab must not mutate Context or tracking'), - }; - assert.equal( - await StyleManager.prototype._onMobileTabOpened.call( - shell, - state.sheet || 'context', - ), - false, - ); - } -}); - -test('failed mobile Contacts entry uses the existing notice and cancelled/disposed entries stay quiet', async () => { - for (const outcome of ['failure', 'throw', 'cancelled', 'disposed']) { - const notices = []; - const shell = { - getContextModeState: () => ({ mode: null }), - getAircraftTrackingTarget: () => ({ layerId: 'flights', id: 'abc123' }), - setContextMode: async () => { - if (outcome === 'throw') throw new Error('source unavailable'); - if (outcome === 'disposed') shell._disposed = true; - return { ok: false, cancelled: outcome === 'cancelled' }; - }, - _showToast: (message) => notices.push(message), - }; - assert.equal( - await StyleManager.prototype._onMobileTabOpened.call(shell, 'context'), - false, - ); - assert.equal( - notices.length, - ['failure', 'throw'].includes(outcome) ? 1 : 0, - ); - } -}); - test('a slow downward pull is claimed before Android native scroll takes ownership', () => { const { document, shell, press } = fixture(); press('layers');