From a8dee13560044ee5556780670553894a1e0b4f4c Mon Sep 17 00:00:00 2001
From: Dan Leech <dan.leech@defra.gov.uk>
Date: Wed, 15 Apr 2026 14:55:06 +0100
Subject: [PATCH 1/2] Keyboard hint moved to bottom

---
 demo/js/planning.js                           |   2 +-
 plugins/beta/scale-bar/src/scaleBar.scss      |   1 +
 src/App/components/Viewport/Viewport.jsx      |  20 +--
 .../components/Viewport/Viewport.module.scss  |   2 +
 src/App/components/Viewport/Viewport.test.jsx |  49 ++-----
 src/App/hooks/useLayoutMeasurements.js        | 137 +++++++++---------
 src/App/layout/Layout.jsx                     |   2 +-
 src/App/layout/layout.module.scss             |   8 -
 8 files changed, 91 insertions(+), 130 deletions(-)

diff --git a/demo/js/planning.js b/demo/js/planning.js
index 0fa09350..7b59b391 100755
--- a/demo/js/planning.js
+++ b/demo/js/planning.js
@@ -36,7 +36,7 @@ const interactPlugin = createInteractPlugin({
 		backgroundColor: { outdoor: '#0b0c0c', dark: '#ffffff' },
 		foregroundColor: { outdoor: '#ffff', dark: '#0b0c0c' }
 	},
-	// interactionModes: ['selectMarker'], // e.g. ['selectMarker'], ['selectFeature'], ['placeMarker'], or combinations
+	interactionModes: ['placeMarker'], // e.g. ['selectMarker'], ['selectFeature'], ['placeMarker'], or combinations
 	// multiSelect: true
 })
 
diff --git a/plugins/beta/scale-bar/src/scaleBar.scss b/plugins/beta/scale-bar/src/scaleBar.scss
index bcfcf31d..45e0c025 100755
--- a/plugins/beta/scale-bar/src/scaleBar.scss
+++ b/plugins/beta/scale-bar/src/scaleBar.scss
@@ -7,6 +7,7 @@
 .im-c-scale-bar {
     position: relative;
     margin-left: auto;
+    margin-bottom: 1px; // Account for halo
     text-align: right;
     padding-bottom: 5px;
     color: var(--map-overlay-foreground-color);
diff --git a/src/App/components/Viewport/Viewport.jsx b/src/App/components/Viewport/Viewport.jsx
index a6166dfe..d294bbbd 100755
--- a/src/App/components/Viewport/Viewport.jsx
+++ b/src/App/components/Viewport/Viewport.jsx
@@ -2,6 +2,7 @@ import React, { useRef, useEffect, useState } from 'react'
 import { EVENTS as events } from '../../../config/events.js'
 import { createPortal } from 'react-dom'
 import { useConfig } from '../../store/configContext.js'
+
 import { useApp } from '../../store/appContext.js'
 import { useMap } from '../../store/mapContext.js'
 import { MapController } from './MapController.jsx'
@@ -14,9 +15,10 @@ import { Markers } from '../Markers/Markers'
 
 // eslint-disable-next-line camelcase, react/jsx-pascal-case
 // sonarjs/disable-next-line function-name
-export const Viewport = ({ keyboardHintPortalRef }) => {
+export const Viewport = () => {
   const { id, mapProvider, mapLabel, keyboardHintText } = useConfig()
   const { interfaceType, mode, previousMode, layoutRefs, safeZoneInset } = useApp()
+  const { appContainerRef } = layoutRefs
   const { mapSize } = useMap()
 
   const mapContainerRef = useRef(null)
@@ -49,18 +51,6 @@ export const Viewport = ({ keyboardHintPortalRef }) => {
     }
   }, [mode])
 
-  // Toggle external class based on keyboard hint
-  useEffect(() => {
-    const mainEl = layoutRefs.mainRef?.current
-    if (!mainEl) {
-      return undefined
-    }
-
-    mainEl.classList.toggle('im-o-app__main--keyboard-hint-visible', showHint)
-
-    return () => mainEl?.classList.remove('im-o-app__main--keyboard-hint-visible')
-  }, [showHint])
-
   return (
     <>
       <MapController mapContainerRef={mapContainerRef} />
@@ -74,14 +64,14 @@ export const Viewport = ({ keyboardHintPortalRef }) => {
         onBlur={handleBlur}
         ref={layoutRefs.viewportRef}
       >
-        {showHint && keyboardHintPortalRef?.current && createPortal(
+        {showHint && appContainerRef?.current && createPortal(
           <div
             className='im-c-viewport__keyboard-hint'
             aria-hidden='true'
             ref={keyboardHintRef}
             dangerouslySetInnerHTML={{ __html: keyboardHintText }}
           />,
-          keyboardHintPortalRef.current
+          appContainerRef.current
         )}
         <div className='im-c-viewport__map-container' ref={mapContainerRef} />
         <div className='im-c-viewport__features' />
diff --git a/src/App/components/Viewport/Viewport.module.scss b/src/App/components/Viewport/Viewport.module.scss
index 587dc4bf..1a8a58bb 100755
--- a/src/App/components/Viewport/Viewport.module.scss
+++ b/src/App/components/Viewport/Viewport.module.scss
@@ -31,8 +31,10 @@
 
 .im-c-viewport__keyboard-hint {
     position: absolute;
+    bottom: var(--keyboard-hint-bottom, var(--primary-gap));
     left: 50%;
     transform: translateX(-50%);
+    z-index: 1001;
     text-wrap: nowrap;
 
     color: var(--tooltip-foreground-color);
diff --git a/src/App/components/Viewport/Viewport.test.jsx b/src/App/components/Viewport/Viewport.test.jsx
index c14dee10..ac0846ad 100755
--- a/src/App/components/Viewport/Viewport.test.jsx
+++ b/src/App/components/Viewport/Viewport.test.jsx
@@ -1,5 +1,5 @@
 import React from 'react'
-import { render, fireEvent, cleanup } from '@testing-library/react'
+import { render, cleanup } from '@testing-library/react'
 import { Viewport } from './Viewport.jsx'
 import { useConfig } from '../../store/configContext.js'
 import { useApp } from '../../store/appContext.js'
@@ -23,15 +23,18 @@ jest.mock('../CrossHair/CrossHair', () => ({ CrossHair: jest.fn(() => <div data-
 jest.mock('../Markers/Markers', () => ({ Markers: jest.fn(() => <div data-testid='markers' />) }))
 
 describe('Viewport', () => {
-  let keyboardHintPortalRef
+  let viewportEl
+  let appContainerEl
   const mockMapProvider = { initMap: jest.fn(), updateMap: jest.fn(), clearHighlightedLabel: jest.fn() }
 
   beforeEach(() => {
     cleanup()
     jest.clearAllMocks()
 
-    keyboardHintPortalRef = { current: document.createElement('div') }
-    document.body.appendChild(keyboardHintPortalRef.current)
+    viewportEl = document.createElement('div')
+    appContainerEl = document.createElement('div')
+    document.body.appendChild(viewportEl)
+    document.body.appendChild(appContainerEl)
 
     // ---------------------------
     // Hook mocks
@@ -47,7 +50,7 @@ describe('Viewport', () => {
       interfaceType: 'desktop',
       mode: 'default',
       previousMode: 'default',
-      layoutRefs: { viewportRef: { current: null }, mainRef: { current: null }, safeZoneRef: { current: null } },
+      layoutRefs: { appContainerRef: { current: appContainerEl }, viewportRef: { current: viewportEl }, mainRef: { current: null }, safeZoneRef: { current: null } },
       safeZoneInset: {}
     })
 
@@ -75,14 +78,17 @@ describe('Viewport', () => {
     useMapEvents.mockImplementation(() => {})
   })
 
-  afterEach(() => document.body.removeChild(keyboardHintPortalRef.current))
+  afterEach(() => {
+    viewportEl.remove()
+    appContainerEl.remove()
+  })
 
   const renderViewport = () => {
-    const { container, rerender, unmount } = render(<Viewport keyboardHintPortalRef={keyboardHintPortalRef} />)
+    const { container, rerender, unmount } = render(<Viewport />)
     const viewport = container.querySelector('.im-c-viewport')
     const mapContainer = container.querySelector('.im-c-viewport__map-container')
     const safeZone = container.querySelector('.im-c-viewport__safezone')
-    const keyboardHint = keyboardHintPortalRef.current.querySelector('.im-c-viewport__keyboard-hint')
+    const keyboardHint = appContainerEl.querySelector('.im-c-viewport__keyboard-hint')
     const crossHair = container.querySelector('[data-testid="cross-hair"]')
     const markers = container.querySelector('[data-testid="markers"]')
     return { viewport, mapContainer, safeZone, keyboardHint, crossHair, markers, rerender, unmount }
@@ -109,14 +115,6 @@ describe('Viewport', () => {
     expect(keyboardHint.innerHTML).toBe('Press arrow keys')
   })
 
-  it('handles focus and blur events updating keyboard hint visibility', () => {
-    const { viewport, keyboardHint } = renderViewport()
-    fireEvent.focus(viewport)
-    fireEvent.blur(viewport)
-    expect(keyboardHint).toBeInTheDocument()
-    expect(keyboardHint.innerHTML).toBe('Press arrow keys')
-  })
-
   it('attaches keyboard shortcuts', () => {
     renderViewport()
     expect(useKeyboardShortcuts).toHaveBeenCalled()
@@ -137,25 +135,10 @@ describe('Viewport', () => {
       interfaceType: 'desktop',
       mode: 'edit',
       previousMode: 'default',
-      layoutRefs: { viewportRef: { current: viewport }, mainRef: { current: null }, safeZoneRef: { current: null } },
+      layoutRefs: { appContainerRef: { current: appContainerEl }, viewportRef: { current: viewport }, mainRef: { current: null }, safeZoneRef: { current: null } },
       safeZoneInset: {}
     })
-    rerender(<Viewport keyboardHintPortalRef={keyboardHintPortalRef} />)
+    rerender(<Viewport />)
     expect(focusMock).toHaveBeenCalled()
   })
-
-  it('toggles main element class for keyboard hint and cleans up on unmount', () => {
-    const mainEl = document.createElement('div')
-    useApp.mockReturnValueOnce({
-      interfaceType: 'desktop',
-      mode: 'default',
-      previousMode: 'default',
-      layoutRefs: { viewportRef: { current: null }, mainRef: { current: mainEl }, safeZoneRef: { current: null } },
-      safeZoneInset: {}
-    })
-    const { unmount } = renderViewport()
-    expect(mainEl.classList.contains('im-o-app__main--keyboard-hint-visible')).toBe(true)
-    unmount()
-    expect(mainEl.classList.contains('im-o-app__main--keyboard-hint-visible')).toBe(false)
-  })
 })
diff --git a/src/App/hooks/useLayoutMeasurements.js b/src/App/hooks/useLayoutMeasurements.js
index 9bb4736d..c8960ecf 100755
--- a/src/App/hooks/useLayoutMeasurements.js
+++ b/src/App/hooks/useLayoutMeasurements.js
@@ -51,80 +51,73 @@ const subSlotMaxHeight = (columnHeight, siblingButtons, gap) =>
  * It does not dispatch the safe zone — safe zone dispatch is owned entirely by
  * Effect 3 to prevent jumps on panel open/close and other non-structural resizes.
  */
-export function useLayoutMeasurements () {
-  const { dispatch, breakpoint, layoutRefs, arePluginsEvaluated, appVisible, isFullscreen } = useApp()
-  const { mapSize, isMapReady } = useMap()
-
+function calculateLayout (layoutRefs) {
   const {
-    appContainerRef,
-    mainRef,
-    bannerRef,
-    topRef,
-    topLeftColRef,
-    topRightColRef,
-    leftTopRef,
-    leftBottomRef,
-    rightTopRef,
-    rightBottomRef,
-    bottomRef,
-    bottomRightRef,
-    attributionsRef,
-    drawerRef,
-    actionsRef
+    appContainerRef, mainRef, topRef, topLeftColRef, topRightColRef,
+    bottomRef, attributionsRef, bottomRightRef, leftTopRef, leftBottomRef,
+    rightTopRef, rightBottomRef
   } = layoutRefs
 
-  // --------------------------------
-  // 1. Calculate layout CSS vars (pure side effect, no dispatch)
-  // --------------------------------
-  const calculateLayout = () => {
-    const appContainer = appContainerRef.current
-    const main = mainRef.current
-    const top = topRef.current
-    const topLeftCol = topLeftColRef.current
-    const topRightCol = topRightColRef.current
-    const bottom = bottomRef.current
-    const attributions = attributionsRef.current
-
-    if ([main, top, bottom].some(r => !r)) {
-      return
-    }
+  const appContainer = appContainerRef.current
+  const main = mainRef.current
+  const top = topRef.current
+  const topLeftCol = topLeftColRef.current
+  const topRightCol = topRightColRef.current
+  const bottom = bottomRef.current
+  const attributions = attributionsRef.current
 
-    const root = document.documentElement
-    const dividerGap = Number.parseInt(getComputedStyle(root).getPropertyValue('--divider-gap'), 10)
-
-    // === Top column width ===
-    appContainer.style.setProperty('--top-col-width', `${topColWidth(topLeftCol.offsetWidth, topRightCol.offsetWidth)}px`)
-
-    // === Left container offsets ===
-    const leftOffsetTop = topLeftCol.offsetHeight + top.offsetTop
-    const leftColumnHeight = bottom.offsetTop - leftOffsetTop - dividerGap
-    appContainer.style.setProperty('--left-offset-top', `${leftOffsetTop}px`)
-    appContainer.style.setProperty('--left-offset-bottom', `${main.offsetHeight - bottom.offsetTop + dividerGap}px`)
-    appContainer.style.setProperty('--left-top-max-height', `${leftColumnHeight}px`)
-
-    // === Right container offsets ===
-    // Mirrors the top formula (topRightCol.offsetHeight + top.offsetTop):
-    // bottomRight.offsetHeight is 0 when no buttons so the offset collapses to just
-    // the padding between the bottom of the bottom container and the bottom of main.
-    const bottomRightHeight = bottomRightRef?.current?.offsetHeight ?? 0
-    const bottomContainerPad = main.offsetHeight - bottom.offsetTop - bottom.offsetHeight
-    const rightOffsetTop = topRightCol.offsetHeight + top.offsetTop
-    const rightEffectiveBottom = bottom.offsetTop + bottom.offsetHeight - bottomRightHeight
-    const rightColumnHeight = rightEffectiveBottom - rightOffsetTop - dividerGap
-    const rightOffsetBottom = bottomContainerPad + (bottomRightHeight > 0 ? (bottomRightHeight + dividerGap) : attributions.offsetHeight)
-    appContainer.style.setProperty('--right-offset-top', `${rightOffsetTop}px`)
-    appContainer.style.setProperty('--right-offset-bottom', `${rightOffsetBottom}px`)
-    appContainer.style.setProperty('--right-top-max-height', `${rightColumnHeight}px`)
-
-    // === Sub-slot panel max-heights ===
-    appContainer.style.setProperty('--left-top-panel-max-height', `${subSlotMaxHeight(leftColumnHeight, buttonHeight(leftBottomRef), dividerGap)}px`)
-    appContainer.style.setProperty('--left-bottom-panel-max-height', `${subSlotMaxHeight(leftColumnHeight, buttonHeight(leftTopRef), dividerGap)}px`)
-    appContainer.style.setProperty('--right-top-panel-max-height', `${subSlotMaxHeight(rightColumnHeight, buttonHeight(rightBottomRef), dividerGap)}px`)
-    appContainer.style.setProperty('--right-bottom-panel-max-height', `${subSlotMaxHeight(rightColumnHeight, buttonHeight(rightTopRef), dividerGap)}px`)
+  if ([main, top, bottom].some(r => !r)) {
+    return
   }
 
+  const root = document.documentElement
+  const dividerGap = Number.parseInt(getComputedStyle(root).getPropertyValue('--divider-gap'), 10)
+
+  // === Top column width ===
+  appContainer.style.setProperty('--top-col-width', `${topColWidth(topLeftCol.offsetWidth, topRightCol.offsetWidth)}px`)
+
+  // === Left container offsets ===
+  const leftOffsetTop = topLeftCol.offsetHeight + top.offsetTop
+  const leftColumnHeight = bottom.offsetTop - leftOffsetTop - dividerGap
+  appContainer.style.setProperty('--left-offset-top', `${leftOffsetTop}px`)
+  appContainer.style.setProperty('--left-offset-bottom', `${main.offsetHeight - bottom.offsetTop + dividerGap}px`)
+  appContainer.style.setProperty('--left-top-max-height', `${leftColumnHeight}px`)
+
+  // === Right container offsets ===
+  // Mirrors the top formula (topRightCol.offsetHeight + top.offsetTop):
+  // bottomRight.offsetHeight is 0 when no buttons so the offset collapses to just
+  // the padding between the bottom of the bottom container and the bottom of main.
+  const bottomRightHeight = bottomRightRef?.current?.offsetHeight ?? 0
+  const bottomContainerPad = main.offsetHeight - bottom.offsetTop - bottom.offsetHeight
+  const rightOffsetTop = topRightCol.offsetHeight + top.offsetTop
+  const rightEffectiveBottom = bottom.offsetTop + bottom.offsetHeight - bottomRightHeight
+  const rightColumnHeight = rightEffectiveBottom - rightOffsetTop - dividerGap
+  const rightOffsetBottom = bottomContainerPad + (bottomRightHeight > 0 ? (bottomRightHeight + dividerGap) : attributions.offsetHeight)
+  appContainer.style.setProperty('--right-offset-top', `${rightOffsetTop}px`)
+  appContainer.style.setProperty('--right-offset-bottom', `${rightOffsetBottom}px`)
+  appContainer.style.setProperty('--right-top-max-height', `${rightColumnHeight}px`)
+
+  // === Keyboard hint bottom offset ===
+  // Positions the hint at the bottom of im-o-app__bottom (above drawers on mobile)
+  const appRect = appContainer.getBoundingClientRect()
+  const bottomRect = bottom.getBoundingClientRect()
+  appContainer.style.setProperty('--keyboard-hint-bottom', `${Math.max(0, appRect.bottom - bottomRect.bottom)}px`)
+
+  // === Sub-slot panel max-heights ===
+  appContainer.style.setProperty('--left-top-panel-max-height', `${subSlotMaxHeight(leftColumnHeight, buttonHeight(leftBottomRef), dividerGap)}px`)
+  appContainer.style.setProperty('--left-bottom-panel-max-height', `${subSlotMaxHeight(leftColumnHeight, buttonHeight(leftTopRef), dividerGap)}px`)
+  appContainer.style.setProperty('--right-top-panel-max-height', `${subSlotMaxHeight(rightColumnHeight, buttonHeight(rightBottomRef), dividerGap)}px`)
+  appContainer.style.setProperty('--right-bottom-panel-max-height', `${subSlotMaxHeight(rightColumnHeight, buttonHeight(rightTopRef), dividerGap)}px`)
+}
+
+export function useLayoutMeasurements () {
+  const { dispatch, breakpoint, layoutRefs, arePluginsEvaluated, appVisible, isFullscreen } = useApp()
+  const { mapSize, isMapReady } = useMap()
+
+  const { bannerRef, mainRef, topRef, topLeftColRef, topRightColRef, bottomRef, bottomRightRef, leftTopRef, leftBottomRef, rightTopRef, rightBottomRef, drawerRef, actionsRef } = layoutRefs
+
   // --------------------------------
-  // 2. Clear the evaluated flag when structural inputs change so the safe zone
+  // 1. Clear the evaluated flag when structural inputs change so the safe zone
   //    is not dispatched until useButtonStateEvaluator has completed a full
   //    pass with the new app/map state and set PLUGINS_EVALUATED.
   // --------------------------------
@@ -133,7 +126,7 @@ export function useLayoutMeasurements () {
   }, [breakpoint, mapSize, isMapReady, appVisible, isFullscreen])
 
   // --------------------------------
-  // 3. Once all plugin button props have been evaluated (arePluginsEvaluated),
+  // 2. Once all plugin button props have been evaluated (arePluginsEvaluated),
   //    recalculate layout and dispatch the safe zone inset.
   //    RAF required to ensure browser layout is committed before measuring.
   // --------------------------------
@@ -142,7 +135,7 @@ export function useLayoutMeasurements () {
       return
     }
     requestAnimationFrame(() => {
-      calculateLayout()
+      calculateLayout(layoutRefs)
       const safeZoneInset = getSafeZoneInset(layoutRefs)
       if (safeZoneInset) {
         dispatch({ type: 'SET_SAFE_ZONE_INSET', payload: { safeZoneInset } })
@@ -151,13 +144,13 @@ export function useLayoutMeasurements () {
   }, [arePluginsEvaluated])
 
   // --------------------------------
-  // 4. Recalculate CSS vars whenever observed elements resize (panels, banner,
+  // 3. Recalculate CSS vars whenever observed elements resize (panels, banner,
   //    actions buttons, etc.). Safe zone is intentionally not dispatched here —
-  //    that is Effect 3's responsibility.
+  //    that is Effect 2's responsibility.
   // --------------------------------
   useResizeObserver([bannerRef, mainRef, topRef, topLeftColRef, topRightColRef, actionsRef, bottomRef, bottomRightRef, leftTopRef, leftBottomRef, rightTopRef, rightBottomRef, drawerRef], () => {
     requestAnimationFrame(() => {
-      calculateLayout()
+      calculateLayout(layoutRefs)
     })
   })
 }
diff --git a/src/App/layout/Layout.jsx b/src/App/layout/Layout.jsx
index 286f93f3..7a814c31 100755
--- a/src/App/layout/Layout.jsx
+++ b/src/App/layout/Layout.jsx
@@ -36,7 +36,7 @@ export const Layout = () => {
       style={{ backgroundColor: mapStyle?.backgroundColor || undefined, ...getMapThemeVars(mapStyle) }}
       ref={layoutRefs.appContainerRef}
     >
-      <Viewport keyboardHintPortalRef={layoutRefs.topRef} />
+      <Viewport />
       <div className={`im-o-app__overlay${isLayoutReady ? '' : ' im-o-app__overlay--not-ready'}`}>
         <div className='im-o-app__side' ref={layoutRefs.sideRef}>
           <SlotRenderer slot={layoutSlots.SIDE} />
diff --git a/src/App/layout/layout.module.scss b/src/App/layout/layout.module.scss
index 50eafb88..bdb1c252 100755
--- a/src/App/layout/layout.module.scss
+++ b/src/App/layout/layout.module.scss
@@ -439,14 +439,6 @@
   box-sizing: border-box;
 }
 
-// Hide containers when keyboard hint is visible
-.im-o-app__main--keyboard-hint-visible {
-  .im-o-app__top-col,
-  .im-o-app__right,
-  .im-o-app__right-bottom {
-    opacity: 0;
-  }
-}
 
 // Avoid refresh jump if layout clacs are not ready
 .im-o-app__overlay--not-ready {

From ed640900f28b87ff5c120c86367c05d5ec665c0a Mon Sep 17 00:00:00 2001
From: Dan Leech <dan.leech@defra.gov.uk>
Date: Wed, 15 Apr 2026 15:01:58 +0100
Subject: [PATCH 2/2] Horizontal postion fix

---
 src/App/components/Viewport/Viewport.jsx      |  6 +++---
 src/App/components/Viewport/Viewport.test.jsx | 14 +++++++-------
 src/App/hooks/useLayoutMeasurements.js        |  7 +++----
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/App/components/Viewport/Viewport.jsx b/src/App/components/Viewport/Viewport.jsx
index d294bbbd..860b5f2f 100755
--- a/src/App/components/Viewport/Viewport.jsx
+++ b/src/App/components/Viewport/Viewport.jsx
@@ -18,7 +18,7 @@ import { Markers } from '../Markers/Markers'
 export const Viewport = () => {
   const { id, mapProvider, mapLabel, keyboardHintText } = useConfig()
   const { interfaceType, mode, previousMode, layoutRefs, safeZoneInset } = useApp()
-  const { appContainerRef } = layoutRefs
+  const { mainRef } = layoutRefs
   const { mapSize } = useMap()
 
   const mapContainerRef = useRef(null)
@@ -64,14 +64,14 @@ export const Viewport = () => {
         onBlur={handleBlur}
         ref={layoutRefs.viewportRef}
       >
-        {showHint && appContainerRef?.current && createPortal(
+        {showHint && mainRef?.current && createPortal(
           <div
             className='im-c-viewport__keyboard-hint'
             aria-hidden='true'
             ref={keyboardHintRef}
             dangerouslySetInnerHTML={{ __html: keyboardHintText }}
           />,
-          appContainerRef.current
+          mainRef.current
         )}
         <div className='im-c-viewport__map-container' ref={mapContainerRef} />
         <div className='im-c-viewport__features' />
diff --git a/src/App/components/Viewport/Viewport.test.jsx b/src/App/components/Viewport/Viewport.test.jsx
index ac0846ad..20cdac3c 100755
--- a/src/App/components/Viewport/Viewport.test.jsx
+++ b/src/App/components/Viewport/Viewport.test.jsx
@@ -24,7 +24,7 @@ jest.mock('../Markers/Markers', () => ({ Markers: jest.fn(() => <div data-testid
 
 describe('Viewport', () => {
   let viewportEl
-  let appContainerEl
+  let mainEl
   const mockMapProvider = { initMap: jest.fn(), updateMap: jest.fn(), clearHighlightedLabel: jest.fn() }
 
   beforeEach(() => {
@@ -32,9 +32,9 @@ describe('Viewport', () => {
     jest.clearAllMocks()
 
     viewportEl = document.createElement('div')
-    appContainerEl = document.createElement('div')
+    mainEl = document.createElement('div')
     document.body.appendChild(viewportEl)
-    document.body.appendChild(appContainerEl)
+    document.body.appendChild(mainEl)
 
     // ---------------------------
     // Hook mocks
@@ -50,7 +50,7 @@ describe('Viewport', () => {
       interfaceType: 'desktop',
       mode: 'default',
       previousMode: 'default',
-      layoutRefs: { appContainerRef: { current: appContainerEl }, viewportRef: { current: viewportEl }, mainRef: { current: null }, safeZoneRef: { current: null } },
+      layoutRefs: { mainRef: { current: mainEl }, viewportRef: { current: viewportEl }, safeZoneRef: { current: null } },
       safeZoneInset: {}
     })
 
@@ -80,7 +80,7 @@ describe('Viewport', () => {
 
   afterEach(() => {
     viewportEl.remove()
-    appContainerEl.remove()
+    mainEl.remove()
   })
 
   const renderViewport = () => {
@@ -88,7 +88,7 @@ describe('Viewport', () => {
     const viewport = container.querySelector('.im-c-viewport')
     const mapContainer = container.querySelector('.im-c-viewport__map-container')
     const safeZone = container.querySelector('.im-c-viewport__safezone')
-    const keyboardHint = appContainerEl.querySelector('.im-c-viewport__keyboard-hint')
+    const keyboardHint = mainEl.querySelector('.im-c-viewport__keyboard-hint')
     const crossHair = container.querySelector('[data-testid="cross-hair"]')
     const markers = container.querySelector('[data-testid="markers"]')
     return { viewport, mapContainer, safeZone, keyboardHint, crossHair, markers, rerender, unmount }
@@ -135,7 +135,7 @@ describe('Viewport', () => {
       interfaceType: 'desktop',
       mode: 'edit',
       previousMode: 'default',
-      layoutRefs: { appContainerRef: { current: appContainerEl }, viewportRef: { current: viewport }, mainRef: { current: null }, safeZoneRef: { current: null } },
+      layoutRefs: { mainRef: { current: mainEl }, viewportRef: { current: viewport }, safeZoneRef: { current: null } },
       safeZoneInset: {}
     })
     rerender(<Viewport />)
diff --git a/src/App/hooks/useLayoutMeasurements.js b/src/App/hooks/useLayoutMeasurements.js
index c8960ecf..69256b06 100755
--- a/src/App/hooks/useLayoutMeasurements.js
+++ b/src/App/hooks/useLayoutMeasurements.js
@@ -98,10 +98,9 @@ function calculateLayout (layoutRefs) {
   appContainer.style.setProperty('--right-top-max-height', `${rightColumnHeight}px`)
 
   // === Keyboard hint bottom offset ===
-  // Positions the hint at the bottom of im-o-app__bottom (above drawers on mobile)
-  const appRect = appContainer.getBoundingClientRect()
-  const bottomRect = bottom.getBoundingClientRect()
-  appContainer.style.setProperty('--keyboard-hint-bottom', `${Math.max(0, appRect.bottom - bottomRect.bottom)}px`)
+  // Distance from the bottom of im-o-app__bottom to the bottom of im-o-app__main.
+  // Used to position the hint above the bottom bar (and above drawers on mobile).
+  appContainer.style.setProperty('--keyboard-hint-bottom', `${main.offsetHeight - bottom.offsetTop - bottom.offsetHeight}px`)
 
   // === Sub-slot panel max-heights ===
   appContainer.style.setProperty('--left-top-panel-max-height', `${subSlotMaxHeight(leftColumnHeight, buttonHeight(leftBottomRef), dividerGap)}px`)