ol 10.0.1-dev.1724093928963 → 10.0.1-dev.1724094100697

package/events/condition.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"condition.d.ts","sourceRoot":"","sources":["condition.js"],"names":[],"mappings":"AAQA;;;;;GAKG;AAEH;;;;GAIG;AACH,2CAFY,SAAS,CAkBpB;AAUM,4CAJI,4CAAuC,GACtC,OAAO,CAYlB;AAUM,kDAJI,4CAAuC,GACtC,OAAO,CAYlB;AAUM,6BAJI,4CAAuC,GACtC,OAAO,CAOlB;AAQM,yCAHI,4CAAuC,GACtC,OAAO,CAMlB;AAED;;;;;;GAMG;AACH,iCAA2B;AASpB,uCAJI,4CAAuC,GACtC,OAAO,CAKlB;AAWM,mDAHI,4CAAuC,GACtC,OAAO,CAOlB;AAED;;;;;;GAMG;AACH,iCAA2B;AAUpB,6CAJI,4CAAuC,GACtC,OAAO,CAKlB;AASM,6CAJI,4CAAuC,GACtC,OAAO,CAKlB;AASM,6CAJI,4CAAuC,GACtC,OAAO,CAKlB;AAUM,gDAJI,4CAAuC,GACtC,OAAO,CAYlB;AAWM,yDAJI,4CAAuC,GACtC,OAAO,CAYlB;AAUM,qDAJI,4CAAuC,GACtC,OAAO,CAQlB;AAUM,8CAJI,4CAAuC,GACtC,OAAO,CAYlB;AAWM,mDAJI,4CAAuC,GACtC,OAAO,CAiBlB;AASM,2CAJI,4CAAuC,GACtC,OAAO,CAalB;AASM,2CAJI,4CAAuC,GACtC,OAAO,CAalB;AASM,yCAJI,4CAAuC,GACtC,OAAO,CAalB;AAWM,+CAJI,4CAAuC,GACtC,OAAO,CAYlB;;;;;wBAtVY,CAAS,IAAO,EAAD,OAAC,EAAE,IAAuC,EAAvC,4CAAuC,KAAG,OAAO;qBARtD,iBAAiB;sBAAjB,iBAAiB"}
+{"version":3,"file":"condition.d.ts","sourceRoot":"","sources":["condition.js"],"names":[],"mappings":"AAQA;;;;;GAKG;AAEH;;;;GAIG;AACH,2CAFY,SAAS,CAkBpB;AAUM,4CAJI,4CAAuC,GACtC,OAAO,CAYlB;AAUM,kDAJI,4CAAuC,GACtC,OAAO,CAYlB;AAUM,6BAJI,4CAAuC,GACtC,OAAO,CAWlB;AAQM,yCAHI,4CAAuC,GACtC,OAAO,CASlB;AAED;;;;;;GAMG;AACH,iCAA2B;AASpB,uCAJI,4CAAuC,GACtC,OAAO,CAKlB;AAWM,mDAHI,4CAAuC,GACtC,OAAO,CAOlB;AAED;;;;;;GAMG;AACH,iCAA2B;AAUpB,6CAJI,4CAAuC,GACtC,OAAO,CAKlB;AASM,6CAJI,4CAAuC,GACtC,OAAO,CAKlB;AASM,6CAJI,4CAAuC,GACtC,OAAO,CAKlB;AAUM,gDAJI,4CAAuC,GACtC,OAAO,CAYlB;AAWM,yDAJI,4CAAuC,GACtC,OAAO,CAYlB;AAUM,qDAJI,4CAAuC,GACtC,OAAO,CAQlB;AAUM,8CAJI,4CAAuC,GACtC,OAAO,CAYlB;AAWM,mDAJI,4CAAuC,GACtC,OAAO,CAiBlB;AASM,2CAJI,4CAAuC,GACtC,OAAO,CAalB;AASM,2CAJI,4CAAuC,GACtC,OAAO,CAalB;AASM,yCAJI,4CAAuC,GACtC,OAAO,CAalB;AAWM,+CAJI,4CAAuC,GACtC,OAAO,CAYlB;;;;;wBA7VY,CAAS,IAAO,EAAD,OAAC,EAAE,IAAuC,EAAvC,4CAAuC,KAAG,OAAO;qBARtD,iBAAiB;sBAAjB,iBAAiB"}

package/events/condition.js

@@ -84,8 +84,12 @@ export const altShiftKeysOnly = function (mapBrowserEvent) {
  */
 export const focus = function (event) {
   const targetElement = event.map.getTargetElement();
+  const rootNode = targetElement.getRootNode();
   const activeElement = event.map.getOwnerDocument().activeElement;
-  return targetElement.contains(activeElement);
+
+  return rootNode instanceof ShadowRoot
+    ? rootNode.host.contains(activeElement)
+    : targetElement.contains(activeElement);
 };
 
 /**
@@ -95,9 +99,12 @@ export const focus = function (event) {
  * @return {boolean} The map container has the focus or no 'tabindex' attribute.
  */
 export const focusWithTabindex = function (event) {
-  return event.map.getTargetElement().hasAttribute('tabindex')
-    ? focus(event)
-    : true;
+  const targetElement = event.map.getTargetElement();
+  const rootNode = targetElement.getRootNode();
+  const tabIndexCandidate =
+    rootNode instanceof ShadowRoot ? rootNode.host : targetElement;
+
+  return tabIndexCandidate.hasAttribute('tabindex') ? focus(event) : true;
 };
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ol",
-  "version": "10.0.1-dev.1724093928963",
+  "version": "10.0.1-dev.1724094100697",
   "description": "OpenLayers mapping library",
   "keywords": [
     "map",

package/util.js

@@ -33,4 +33,4 @@ export function getUid(obj) {
  * OpenLayers version.
  * @type {string}
  */
-export const VERSION = '10.0.1-dev.1724093928963';
+export const VERSION = '10.0.1-dev.1724094100697';