@defra/interactive-map 0.0.43-alpha → 0.0.44-alpha

package/plugins/draw/dist/umd/index.js

@@ -1,2 +1,2 @@
 /*! For license information please see index.js.LICENSE.txt */
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define("defra",[],t):"object"==typeof exports?exports.defra=t():(e.defra=e.defra||{},e.defra.drawPlugin=t())}(this,()=>(()=>{"use strict";var e,t,r={738(e){e.exports=preactCompat}},n={};function o(e){var t=n[e];if(void 0!==t)return t.exports;var i=n[e]={exports:{}};return r[e].call(i.exports,i,i.exports,o),i.exports}o.m=r,o.d=(e,t)=>{for(var r in t)o.o(t,r)&&!o.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},o.f={},o.e=e=>Promise.all(Object.keys(o.f).reduce((t,r)=>(o.f[r](e,t),t),[])),o.u=e=>({356:"im-draw-ml-adapter",568:"im-draw-plugin",722:"im-draw-ol-adapter"}[e]+".js"),o.miniCssF=e=>{},o.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),o.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),e={},t="defra.drawPlugin:",o.l=(r,n,i,a)=>{if(e[r])e[r].push(n);else{var u,c;if(void 0!==i)for(var f=document.getElementsByTagName("script"),p=0;p<f.length;p++){var l=f[p];if(l.getAttribute("src")==r||l.getAttribute("data-webpack")==t+i){u=l;break}}u||(c=!0,(u=document.createElement("script")).charset="utf-8",o.nc&&u.setAttribute("nonce",o.nc),u.setAttribute("data-webpack",t+i),u.src=r),e[r]=[n];var s=(t,n)=>{u.onerror=u.onload=null,clearTimeout(d);var o=e[r];if(delete e[r],u.parentNode&&u.parentNode.removeChild(u),o&&o.forEach(e=>e(n)),t)return t(n)},d=setTimeout(s.bind(null,void 0,{type:"timeout",target:u}),12e4);u.onerror=s.bind(null,u.onerror),u.onload=s.bind(null,u.onload),c&&document.head.appendChild(u)}},o.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},(()=>{var e;o.g.importScripts&&(e=o.g.location+"");var t=o.g.document;if(!e&&t&&(t.currentScript&&"SCRIPT"===t.currentScript.tagName.toUpperCase()&&(e=t.currentScript.src),!e)){var r=t.getElementsByTagName("script");if(r.length)for(var n=r.length-1;n>-1&&(!e||!/^http(s?):/.test(e));)e=r[n--].src}if(!e)throw new Error("Automatic publicPath is not supported in this browser");e=e.replace(/^blob:/,"").replace(/#.*$/,"").replace(/\?.*$/,"").replace(/\/[^\/]+$/,"/"),o.p=e})(),(()=>{var e={57:0};o.f.j=(t,r)=>{var n=o.o(e,t)?e[t]:void 0;if(0!==n)if(n)r.push(n[2]);else{var i=new Promise((r,o)=>n=e[t]=[r,o]);r.push(n[2]=i);var a=o.p+o.u(t),u=new Error;o.l(a,r=>{if(o.o(e,t)&&(0!==(n=e[t])&&(e[t]=void 0),n)){var i=r&&("load"===r.type?"missing":r.type),a=r&&r.target&&r.target.src;u.message="Loading chunk "+t+" failed.\n("+i+": "+a+")",u.name="ChunkLoadError",u.type=i,u.request=a,n[1](u)}},"chunk-"+t,t)}};var t=(t,r)=>{var n,i,[a,u,c]=r,f=0;if(a.some(t=>0!==e[t])){for(n in u)o.o(u,n)&&(o.m[n]=u[n]);c&&c(o)}for(t&&t(r);f<a.length;f++)i=a[f],o.o(e,i)&&e[i]&&e[i][0](),e[i]=0},r=this.webpackChunkdefra_DefraMap=this.webpackChunkdefra_DefraMap||[];r.forEach(t.bind(null,0)),r.push=t.bind(null,r.push.bind(r))})();var i={};function a(e){return a="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},a(e)}function u(){var e,t,r="function"==typeof Symbol?Symbol:{},n=r.iterator||"@@iterator",o=r.toStringTag||"@@toStringTag";function i(r,n,o,i){var u=n&&n.prototype instanceof f?n:f,p=Object.create(u.prototype);return c(p,"_invoke",function(r,n,o){var i,u,c,f=0,p=o||[],l=!1,s={p:0,n:0,v:e,a:d,f:d.bind(e,4),d:function(t,r){return i=t,u=0,c=e,s.n=r,a}};function d(r,n){for(u=r,c=n,t=0;!l&&f&&!o&&t<p.length;t++){var o,i=p[t],d=s.p,b=i[2];r>3?(o=b===n)&&(c=i[(u=i[4])?5:(u=3,3)],i[4]=i[5]=e):i[0]<=d&&((o=r<2&&d<i[1])?(u=0,s.v=n,s.n=i[1]):d<b&&(o=r<3||i[0]>n||n>b)&&(i[4]=r,i[5]=n,s.n=b,u=0))}if(o||r>1)return a;throw l=!0,n}return function(o,p,b){if(f>1)throw TypeError("Generator is already running");for(l&&1===p&&d(p,b),u=p,c=b;(t=u<2?e:c)||!l;){i||(u?u<3?(u>1&&(s.n=-1),d(u,c)):s.n=c:s.v=c);try{if(f=2,i){if(u||(o="next"),t=i[o]){if(!(t=t.call(i,c)))throw TypeError("iterator result is not an object");if(!t.done)return t;c=t.value,u<2&&(u=0)}else 1===u&&(t=i.return)&&t.call(i),u<2&&(c=TypeError("The iterator does not provide a '"+o+"' method"),u=1);i=e}else if((t=(l=s.n<0)?c:r.call(n,s))!==a)break}catch(t){i=e,u=1,c=t}finally{f=1}}return{value:t,done:l}}}(r,o,i),!0),p}var a={};function f(){}function p(){}function l(){}t=Object.getPrototypeOf;var s=[][n]?t(t([][n]())):(c(t={},n,function(){return this}),t),d=l.prototype=f.prototype=Object.create(s);function b(e){return Object.setPrototypeOf?Object.setPrototypeOf(e,l):(e.__proto__=l,c(e,o,"GeneratorFunction")),e.prototype=Object.create(d),e}return p.prototype=l,c(d,"constructor",l),c(l,"constructor",p),p.displayName="GeneratorFunction",c(l,o,"GeneratorFunction"),c(d),c(d,o,"Generator"),c(d,n,function(){return this}),c(d,"toString",function(){return"[object Generator]"}),(u=function(){return{w:i,m:b}})()}function c(e,t,r,n){var o=Object.defineProperty;try{o({},"",{})}catch(e){o=0}c=function(e,t,r,n){function i(t,r){c(e,t,function(e){return this._invoke(t,r,e)})}t?o?o(e,t,{value:r,enumerable:!n,configurable:!n,writable:!n}):e[t]=r:(i("next",0),i("throw",1),i("return",2))},c(e,t,r,n)}function f(e,t,r,n,o,i,a){try{var u=e[i](a),c=u.value}catch(e){return void r(e)}u.done?t(c):Promise.resolve(c).then(n,o)}function p(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),r.push.apply(r,n)}return r}function l(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?p(Object(r),!0).forEach(function(t){s(e,t,r[t])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):p(Object(r)).forEach(function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))})}return e}function s(e,t,r){return(t=function(e){var t=function(e){if("object"!=a(e)||!e)return e;var t=e[Symbol.toPrimitive];if(void 0!==t){var r=t.call(e,"string");if("object"!=a(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(e)}(e);return"symbol"==a(t)?t:t+""}(t))in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function d(){var e,t;return l(l({},arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}),{},{id:"draw",load:(e=u().m(function e(){var t;return u().w(function(e){for(;;)switch(e.n){case 0:return e.n=1,o.e(568).then(o.bind(o,203));case 1:return t=e.v.manifest,e.a(2,t)}},e)}),t=function(){var t=this,r=arguments;return new Promise(function(n,o){var i=e.apply(t,r);function a(e){f(i,n,o,a,u,"next",e)}function u(e){f(i,n,o,a,u,"throw",e)}a(void 0)})},function(){return t.apply(this,arguments)})})}return o.d(i,{default:()=>d}),i.default})());
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define("defra",[],t):"object"==typeof exports?exports.defra=t():(e.defra=e.defra||{},e.defra.drawPlugin=t())}(this,()=>(()=>{"use strict";var e,t,r={738(e){e.exports=preactCompat},287(e){e.exports=preactJsxRuntime}},n={};function o(e){var t=n[e];if(void 0!==t)return t.exports;var i=n[e]={exports:{}};return r[e].call(i.exports,i,i.exports,o),i.exports}o.m=r,o.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return o.d(t,{a:t}),t},o.d=(e,t)=>{for(var r in t)o.o(t,r)&&!o.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},o.f={},o.e=e=>Promise.all(Object.keys(o.f).reduce((t,r)=>(o.f[r](e,t),t),[])),o.u=e=>({356:"im-draw-ml-adapter",568:"im-draw-plugin",722:"im-draw-ol-adapter"}[e]+".js"),o.miniCssF=e=>{},o.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),o.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),e={},t="defra.drawPlugin:",o.l=(r,n,i,a)=>{if(e[r])e[r].push(n);else{var u,c;if(void 0!==i)for(var f=document.getElementsByTagName("script"),p=0;p<f.length;p++){var l=f[p];if(l.getAttribute("src")==r||l.getAttribute("data-webpack")==t+i){u=l;break}}u||(c=!0,(u=document.createElement("script")).charset="utf-8",o.nc&&u.setAttribute("nonce",o.nc),u.setAttribute("data-webpack",t+i),u.src=r),e[r]=[n];var s=(t,n)=>{u.onerror=u.onload=null,clearTimeout(d);var o=e[r];if(delete e[r],u.parentNode&&u.parentNode.removeChild(u),o&&o.forEach(e=>e(n)),t)return t(n)},d=setTimeout(s.bind(null,void 0,{type:"timeout",target:u}),12e4);u.onerror=s.bind(null,u.onerror),u.onload=s.bind(null,u.onload),c&&document.head.appendChild(u)}},o.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},(()=>{var e;o.g.importScripts&&(e=o.g.location+"");var t=o.g.document;if(!e&&t&&(t.currentScript&&"SCRIPT"===t.currentScript.tagName.toUpperCase()&&(e=t.currentScript.src),!e)){var r=t.getElementsByTagName("script");if(r.length)for(var n=r.length-1;n>-1&&(!e||!/^http(s?):/.test(e));)e=r[n--].src}if(!e)throw new Error("Automatic publicPath is not supported in this browser");e=e.replace(/^blob:/,"").replace(/#.*$/,"").replace(/\?.*$/,"").replace(/\/[^\/]+$/,"/"),o.p=e})(),(()=>{var e={57:0};o.f.j=(t,r)=>{var n=o.o(e,t)?e[t]:void 0;if(0!==n)if(n)r.push(n[2]);else{var i=new Promise((r,o)=>n=e[t]=[r,o]);r.push(n[2]=i);var a=o.p+o.u(t),u=new Error;o.l(a,r=>{if(o.o(e,t)&&(0!==(n=e[t])&&(e[t]=void 0),n)){var i=r&&("load"===r.type?"missing":r.type),a=r&&r.target&&r.target.src;u.message="Loading chunk "+t+" failed.\n("+i+": "+a+")",u.name="ChunkLoadError",u.type=i,u.request=a,n[1](u)}},"chunk-"+t,t)}};var t=(t,r)=>{var n,i,[a,u,c]=r,f=0;if(a.some(t=>0!==e[t])){for(n in u)o.o(u,n)&&(o.m[n]=u[n]);c&&c(o)}for(t&&t(r);f<a.length;f++)i=a[f],o.o(e,i)&&e[i]&&e[i][0](),e[i]=0},r=this.webpackChunkdefra_DefraMap=this.webpackChunkdefra_DefraMap||[];r.forEach(t.bind(null,0)),r.push=t.bind(null,r.push.bind(r))})();var i={};function a(e){return a="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(e){return typeof e}:function(e){return e&&"function"==typeof Symbol&&e.constructor===Symbol&&e!==Symbol.prototype?"symbol":typeof e},a(e)}function u(){var e,t,r="function"==typeof Symbol?Symbol:{},n=r.iterator||"@@iterator",o=r.toStringTag||"@@toStringTag";function i(r,n,o,i){var u=n&&n.prototype instanceof f?n:f,p=Object.create(u.prototype);return c(p,"_invoke",function(r,n,o){var i,u,c,f=0,p=o||[],l=!1,s={p:0,n:0,v:e,a:d,f:d.bind(e,4),d:function(t,r){return i=t,u=0,c=e,s.n=r,a}};function d(r,n){for(u=r,c=n,t=0;!l&&f&&!o&&t<p.length;t++){var o,i=p[t],d=s.p,b=i[2];r>3?(o=b===n)&&(c=i[(u=i[4])?5:(u=3,3)],i[4]=i[5]=e):i[0]<=d&&((o=r<2&&d<i[1])?(u=0,s.v=n,s.n=i[1]):d<b&&(o=r<3||i[0]>n||n>b)&&(i[4]=r,i[5]=n,s.n=b,u=0))}if(o||r>1)return a;throw l=!0,n}return function(o,p,b){if(f>1)throw TypeError("Generator is already running");for(l&&1===p&&d(p,b),u=p,c=b;(t=u<2?e:c)||!l;){i||(u?u<3?(u>1&&(s.n=-1),d(u,c)):s.n=c:s.v=c);try{if(f=2,i){if(u||(o="next"),t=i[o]){if(!(t=t.call(i,c)))throw TypeError("iterator result is not an object");if(!t.done)return t;c=t.value,u<2&&(u=0)}else 1===u&&(t=i.return)&&t.call(i),u<2&&(c=TypeError("The iterator does not provide a '"+o+"' method"),u=1);i=e}else if((t=(l=s.n<0)?c:r.call(n,s))!==a)break}catch(t){i=e,u=1,c=t}finally{f=1}}return{value:t,done:l}}}(r,o,i),!0),p}var a={};function f(){}function p(){}function l(){}t=Object.getPrototypeOf;var s=[][n]?t(t([][n]())):(c(t={},n,function(){return this}),t),d=l.prototype=f.prototype=Object.create(s);function b(e){return Object.setPrototypeOf?Object.setPrototypeOf(e,l):(e.__proto__=l,c(e,o,"GeneratorFunction")),e.prototype=Object.create(d),e}return p.prototype=l,c(d,"constructor",l),c(l,"constructor",p),p.displayName="GeneratorFunction",c(l,o,"GeneratorFunction"),c(d),c(d,o,"Generator"),c(d,n,function(){return this}),c(d,"toString",function(){return"[object Generator]"}),(u=function(){return{w:i,m:b}})()}function c(e,t,r,n){var o=Object.defineProperty;try{o({},"",{})}catch(e){o=0}c=function(e,t,r,n){function i(t,r){c(e,t,function(e){return this._invoke(t,r,e)})}t?o?o(e,t,{value:r,enumerable:!n,configurable:!n,writable:!n}):e[t]=r:(i("next",0),i("throw",1),i("return",2))},c(e,t,r,n)}function f(e,t,r,n,o,i,a){try{var u=e[i](a),c=u.value}catch(e){return void r(e)}u.done?t(c):Promise.resolve(c).then(n,o)}function p(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter(function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable})),r.push.apply(r,n)}return r}function l(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?p(Object(r),!0).forEach(function(t){s(e,t,r[t])}):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):p(Object(r)).forEach(function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))})}return e}function s(e,t,r){return(t=function(e){var t=function(e){if("object"!=a(e)||!e)return e;var t=e[Symbol.toPrimitive];if(void 0!==t){var r=t.call(e,"string");if("object"!=a(r))return r;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(e)}(e);return"symbol"==a(t)?t:t+""}(t))in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function d(){var e,t;return l(l({},arguments.length>0&&void 0!==arguments[0]?arguments[0]:{}),{},{id:"draw",load:(e=u().m(function e(){var t;return u().w(function(e){for(;;)switch(e.n){case 0:return e.n=1,o.e(568).then(o.bind(o,646));case 1:return t=e.v.manifest,e.a(2,t)}},e)}),t=function(){var t=this,r=arguments;return new Promise(function(n,o){var i=e.apply(t,r);function a(e){f(i,n,o,a,u,"next",e)}function u(e){f(i,n,o,a,u,"throw",e)}a(void 0)})},function(){return t.apply(this,arguments)})})}return o.d(i,{default:()=>d}),i.default})());

package/plugins/draw/src/DrawInit.jsx

@@ -2,22 +2,11 @@ import { useEffect, useRef } from 'react'
 import { EVENTS } from '../../../src/config/events.js'
 import { loadDrawAdapter } from './adapters/loadDrawAdapter.js'
 import { attachEvents } from './events.js'
+import { useSpatialList } from './hooks/useSpatialList.js'
 
-export const DrawInit = ({ appState, appConfig, mapState, pluginConfig, pluginState, services, mapProvider, buttonConfig }) => {
-  const { eventBus, hints } = services
-  const { crossHair } = mapState
-  const isTouchOrKeyboard = ['touch', 'keyboard'].includes(appState.interfaceType)
-
-  // Mirrored directly in the render body (not a separate effect — matches useVisibleGeometry.js's
-  // own latestRef convention) so the crosshair effect's cleanup below can read the CURRENT
-  // shouldShowCrosshair decision rather than the stale one captured when that effect last ran.
-  // Without this, closing MoveControls (or leaving touch/keyboard) would fail to hide it: React
-  // runs the old effect's cleanup with its original closure, which still sees the OLD
-  // expandedButtons/interfaceType that made it visible in the first place.
-  const shouldShowCrosshairRef = useRef(false)
-  shouldShowCrosshairRef.current = ['draw_polygon', 'draw_line', 'draw_point'].includes(pluginState.mode) &&
-    (isTouchOrKeyboard || appState.expandedButtons?.has('moveControls'))
-
+// Loads the draw adapter once the map is ready and this plugin instance is in scope for the
+// current app mode; tears it down (and releases MapControls' D-pad) on cleanup.
+function useLoadDrawAdapter ({ mapState, appState, pluginConfig, pluginState, mapProvider, eventBus }) {
   useEffect(() => {
     const inModeWhitelist = pluginConfig.includeModes?.includes(appState.mode) ?? true
     const inExcludeModes = pluginConfig.excludeModes?.includes(appState.mode) ?? false
@@ -45,16 +34,35 @@ export const DrawInit = ({ appState, appConfig, mapState, pluginConfig, pluginSt
       isMounted = false
       mapProvider.draw?.remove()
       mapProvider.draw = null
-      // Release MoveControls' D-pad if this plugin instance still held it.
+      // Release MapControls' D-pad if this plugin instance still held it.
       mapProvider.activeMoveTarget = null
     }
   }, [mapState.isMapReady, appState.mode])
+}
+
+export const DrawInit = ({ appState, appConfig, mapState, pluginConfig, pluginState, services, mapProvider, buttonConfig }) => {
+  const { eventBus, hints } = services
+  const { crossHair } = mapState
+  const isTouchOrKeyboard = ['touch', 'keyboard'].includes(appState.interfaceType)
+
+  useSpatialList({ mapState, pluginState, services, mapProvider, spatialListRegistry: appState.spatialListRegistry, viewportRef: appState.layoutRefs.viewportRef })
+
+  // Mirrored in the render body so the crosshair effect's cleanup below can read the CURRENT
+  // shouldShowCrosshair decision, not the stale one its closure captured when it last ran.
+  const shouldShowCrosshairRef = useRef(false)
+  shouldShowCrosshairRef.current = ['draw_polygon', 'draw_line', 'draw_point'].includes(pluginState.mode) &&
+    (isTouchOrKeyboard || appState.expandedButtons?.has('mapControls'))
+
+  useLoadDrawAdapter({ mapState, appState, pluginConfig, pluginState, mapProvider, eventBus })
 
-  // Suppresses the accessible features list for the whole time a draw/edit session holds exclusive control of map interaction.
+  // Suppresses the accessible spatial list for every draw/edit mode except edit_vertex, which
+  // supplies its own list instead (useSpatialList.js above, claimed exclusively via the
+  // registry) — every other mode still has nothing meaningful to show.
   useEffect(() => {
-    eventBus.emit(EVENTS.MAP_SET_FEATURES_SUPPRESSED, { suppressed: pluginState.mode !== null })
+    const suppressed = pluginState.mode !== null && pluginState.mode !== 'edit_vertex'
+    eventBus.emit(EVENTS.MAP_SET_SPATIAL_LIST_SUPPRESSED, { suppressed })
     return () => {
-      eventBus.emit(EVENTS.MAP_SET_FEATURES_SUPPRESSED, { suppressed: false })
+      eventBus.emit(EVENTS.MAP_SET_SPATIAL_LIST_SUPPRESSED, { suppressed: false })
     }
   }, [pluginState.mode, eventBus])
 
@@ -65,19 +73,16 @@ export const DrawInit = ({ appState, appConfig, mapState, pluginConfig, pluginSt
     const wasAlreadyVisible = crossHair.isVisible
     crossHair.fixAtCenter()
     return () => {
-      // Only hide the crosshair if it wasn't visible before drawing AND it's not still needed
-      // now (re-checked live via the ref, not this closure's original values — the user might
-      // have switched input devices, or opened/closed MoveControls, since this effect last ran).
+      // Only hide it if it wasn't visible before AND isn't still needed now (checked live via
+      // the ref, since input device or MapControls state may have changed since this ran).
       if (!wasAlreadyVisible && !shouldShowCrosshairRef.current) {
         crossHair.hide()
       }
     }
   }, [pluginState.mode, appState.interfaceType, appState.expandedButtons])
 
-  // Keep the active draw/edit session in sync with the global interface type so
-  // the touch offset target shows/hides, and the rubber band keeps following the
-  // map, immediately when the input device changes mid-session (e.g. the user
-  // starts drawing with the mouse then switches to touch and pans via MoveControls).
+  // Keep the active draw/edit session's interface type in sync so the touch offset target and
+  // rubber band update immediately if the input device changes mid-session.
   useEffect(() => {
     if (!['edit_vertex', 'edit_point', 'draw_polygon', 'draw_line', 'draw_point'].includes(pluginState.mode) || !mapProvider.draw) {
       return undefined

package/plugins/draw/src/DrawInit.test.jsx

@@ -3,16 +3,18 @@ import { EVENTS } from '../../../src/config/events.js'
 import { DrawInit } from './DrawInit.jsx'
 import { loadDrawAdapter } from './adapters/loadDrawAdapter.js'
 import { attachEvents } from './events.js'
+import { useSpatialList } from './hooks/useSpatialList.js'
 
 jest.mock('./adapters/loadDrawAdapter.js', () => ({ loadDrawAdapter: jest.fn() }))
 jest.mock('./events.js', () => ({ attachEvents: jest.fn(() => jest.fn()) }))
+jest.mock('./hooks/useSpatialList.js', () => ({ useSpatialList: jest.fn() }))
 
 const makeProps = (overrides = {}) => {
   const adapter = { remove: jest.fn(), setInterfaceType: jest.fn() }
   loadDrawAdapter.mockResolvedValue(adapter)
 
   const props = {
-    appState: { interfaceType: 'mouse', mode: null },
+    appState: { interfaceType: 'mouse', mode: null, spatialListRegistry: { registerItemProvider: jest.fn() }, layoutRefs: { viewportRef: { current: null } } },
     appConfig: { id: 'app' },
     mapState: {
       isMapReady: true,
@@ -60,7 +62,7 @@ describe('adapter lifecycle', () => {
 
   test('does not load when the app mode is excluded', async () => {
     const { props } = makeProps({
-      appState: { interfaceType: 'mouse', mode: 'measure' },
+      appState: { interfaceType: 'mouse', mode: 'measure', layoutRefs: { viewportRef: { current: null } } },
       pluginConfig: { snapLayers: [], excludeModes: ['measure'] }
     })
     await renderInit(props)
@@ -69,7 +71,7 @@ describe('adapter lifecycle', () => {
 
   test('does not load when the app mode is outside the include list', async () => {
     const { props } = makeProps({
-      appState: { interfaceType: 'mouse', mode: 'other' },
+      appState: { interfaceType: 'mouse', mode: 'other', layoutRefs: { viewportRef: { current: null } } },
       pluginConfig: { snapLayers: [], includeModes: ['draw'] }
     })
     await renderInit(props)
@@ -108,7 +110,17 @@ describe('features list suppression', () => {
     const { props } = makeProps({ pluginState: { dispatch: jest.fn(), mode: 'draw_polygon' } })
     await renderInit(props)
     expect(props.services.eventBus.emit).toHaveBeenCalledWith(
-      EVENTS.MAP_SET_FEATURES_SUPPRESSED, { suppressed: true }
+      EVENTS.MAP_SET_SPATIAL_LIST_SUPPRESSED, { suppressed: true }
+    )
+  })
+
+  // edit_vertex is the one exception — useSpatialList.js supplies its own list there
+  // (claimed exclusively via the registry) instead of hiding it.
+  test('does not suppress during edit_vertex', async () => {
+    const { props } = makeProps({ pluginState: { dispatch: jest.fn(), mode: 'edit_vertex' } })
+    await renderInit(props)
+    expect(props.services.eventBus.emit).toHaveBeenCalledWith(
+      EVENTS.MAP_SET_SPATIAL_LIST_SUPPRESSED, { suppressed: false }
     )
   })
 
@@ -116,15 +128,15 @@ describe('features list suppression', () => {
     const { props } = makeProps({ pluginState: { dispatch: jest.fn(), mode: null } })
     await renderInit(props)
     expect(props.services.eventBus.emit).toHaveBeenCalledWith(
-      EVENTS.MAP_SET_FEATURES_SUPPRESSED, { suppressed: false }
+      EVENTS.MAP_SET_SPATIAL_LIST_SUPPRESSED, { suppressed: false }
     )
   })
 
   test('re-suppresses/unsuppresses as the mode changes across re-renders', async () => {
-    const { props } = makeProps({ pluginState: { dispatch: jest.fn(), mode: 'edit_vertex' } })
+    const { props } = makeProps({ pluginState: { dispatch: jest.fn(), mode: 'draw_polygon' } })
     const result = await renderInit(props)
     expect(props.services.eventBus.emit).toHaveBeenCalledWith(
-      EVENTS.MAP_SET_FEATURES_SUPPRESSED, { suppressed: true }
+      EVENTS.MAP_SET_SPATIAL_LIST_SUPPRESSED, { suppressed: true }
     )
 
     props.services.eventBus.emit.mockClear()
@@ -132,7 +144,23 @@ describe('features list suppression', () => {
     result.rerender(<DrawInit {...props} />)
 
     expect(props.services.eventBus.emit).toHaveBeenCalledWith(
-      EVENTS.MAP_SET_FEATURES_SUPPRESSED, { suppressed: false }
+      EVENTS.MAP_SET_SPATIAL_LIST_SUPPRESSED, { suppressed: false }
+    )
+  })
+
+  test('unsuppresses on entering edit_vertex, then re-suppresses leaving it for another mode', async () => {
+    const { props } = makeProps({ pluginState: { dispatch: jest.fn(), mode: 'edit_vertex' } })
+    const result = await renderInit(props)
+    expect(props.services.eventBus.emit).toHaveBeenCalledWith(
+      EVENTS.MAP_SET_SPATIAL_LIST_SUPPRESSED, { suppressed: false }
+    )
+
+    props.services.eventBus.emit.mockClear()
+    props.pluginState = { ...props.pluginState, mode: 'draw_polygon' }
+    result.rerender(<DrawInit {...props} />)
+
+    expect(props.services.eventBus.emit).toHaveBeenCalledWith(
+      EVENTS.MAP_SET_SPATIAL_LIST_SUPPRESSED, { suppressed: true }
     )
   })
 
@@ -144,15 +172,30 @@ describe('features list suppression', () => {
     result.unmount()
 
     expect(props.services.eventBus.emit).toHaveBeenCalledWith(
-      EVENTS.MAP_SET_FEATURES_SUPPRESSED, { suppressed: false }
+      EVENTS.MAP_SET_SPATIAL_LIST_SUPPRESSED, { suppressed: false }
     )
   })
 })
 
+describe('useSpatialList wiring', () => {
+  test('is called with the plugin state/services/mapProvider, the app-level spatialListRegistry, and the viewport ref', async () => {
+    const { props } = makeProps({ pluginState: { dispatch: jest.fn(), mode: 'edit_vertex' } })
+    await renderInit(props)
+    expect(useSpatialList).toHaveBeenCalledWith({
+      mapState: props.mapState,
+      pluginState: props.pluginState,
+      services: props.services,
+      mapProvider: props.mapProvider,
+      spatialListRegistry: props.appState.spatialListRegistry,
+      viewportRef: props.appState.layoutRefs.viewportRef
+    })
+  })
+})
+
 describe('crosshair', () => {
   test('fixes the crosshair at centre while drawing on a touch interface', async () => {
     const { props } = makeProps({
-      appState: { interfaceType: 'touch', mode: null },
+      appState: { interfaceType: 'touch', mode: null, layoutRefs: { viewportRef: { current: null } } },
       pluginState: { dispatch: jest.fn(), mode: 'draw_polygon' }
     })
     await renderInit(props)
@@ -161,7 +204,7 @@ describe('crosshair', () => {
 
   test('leaves the crosshair alone when not drawing', async () => {
     const { props } = makeProps({
-      appState: { interfaceType: 'touch', mode: null },
+      appState: { interfaceType: 'touch', mode: null, layoutRefs: { viewportRef: { current: null } } },
       pluginState: { dispatch: jest.fn(), mode: 'edit_vertex' }
     })
     await renderInit(props)
@@ -170,7 +213,7 @@ describe('crosshair', () => {
 
   test('hides the crosshair on cleanup when it was hidden before and the interface has left touch/keyboard', async () => {
     const { props } = makeProps({
-      appState: { interfaceType: 'touch', mode: null },
+      appState: { interfaceType: 'touch', mode: null, layoutRefs: { viewportRef: { current: null } } },
       pluginState: { dispatch: jest.fn(), mode: 'draw_polygon' }
     })
     const result = await renderInit(props)