@vaadin/map 25.0.0-alpha2 → 25.0.0-alpha20

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/map",
-  "version": "25.0.0-alpha2",
+  "version": "25.0.0-alpha20",
   "publishConfig": {
     "access": "public"
   },
@@ -21,7 +21,6 @@
   "type": "module",
   "files": [
     "src",
-    "theme",
     "vaadin-*.d.ts",
     "vaadin-*.js",
     "web-types.json",
@@ -35,23 +34,23 @@
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@vaadin/a11y-base": "25.0.0-alpha2",
-    "@vaadin/component-base": "25.0.0-alpha2",
-    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha2",
-    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha2",
+    "@vaadin/a11y-base": "25.0.0-alpha20",
+    "@vaadin/component-base": "25.0.0-alpha20",
+    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha20",
     "lit": "^3.0.0",
-    "ol": "6.13.0"
+    "ol": "10.6.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "25.0.0-alpha2",
-    "@vaadin/test-runner-commands": "25.0.0-alpha2",
+    "@vaadin/chai-plugins": "25.0.0-alpha20",
+    "@vaadin/test-runner-commands": "25.0.0-alpha20",
     "@vaadin/testing-helpers": "^2.0.0",
-    "sinon": "^18.0.0"
+    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha20",
+    "sinon": "^21.0.0"
   },
   "cvdlName": "vaadin-map",
   "web-types": [
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "67ffcd5355cf21ce1b5039c598525109fc4c164b"
+  "gitHead": "c948aae591a30b432f3784000d4677674cae56e0"
 }

package/src/{vaadin-map-styles.js → styles/vaadin-map-base-styles.js}

@@ -8,7 +8,8 @@
  * See https://vaadin.com/commercial-license-and-service-terms for the full
  * license.
  */
-import { css } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
+import '@vaadin/component-base/src/styles/style-props.js';
+import { css } from 'lit';
 
 export const mapStyles = css`
   :host {
@@ -23,6 +24,25 @@ export const mapStyles = css`
     display: none !important;
   }
 
+  :host([focus-ring]) {
+    outline: var(--vaadin-focus-ring-width) solid var(--vaadin-focus-ring-color);
+  }
+
+  :host(:not([theme~='no-border'])) {
+    border-radius: var(--vaadin-map-border-radius, var(--vaadin-radius-m));
+    position: relative;
+  }
+
+  :host(:not([theme~='no-border']))::before {
+    content: '';
+    position: absolute;
+    inset: 0;
+    border: 1px solid var(--vaadin-map-border-color, var(--vaadin-border-color-secondary));
+    border-radius: inherit;
+    z-index: 1;
+    pointer-events: none;
+  }
+
   #map {
     width: 100%;
     height: 100%;
@@ -92,7 +112,7 @@ export const mapStyles = css`
     display: grid;
     grid-template-columns: min-content 1fr min-content;
     grid-template-rows: min-content 1fr min-content min-content min-content min-content;
-    padding: var(--vaadin-map-controls-inset, 0.25em);
+    padding: var(--vaadin-map-controls-inset, 4px);
     box-sizing: border-box;
     grid-template-areas:
       'scale mouse-position fullscreen'
@@ -142,7 +162,7 @@ export const mapStyles = css`
 
   .ol-scale-step-text {
     position: absolute;
-    top: 0.75em;
+    top: 12px;
     font-size: 0.625em;
     color: #000;
     filter: drop-shadow(0 0 1px #fff) drop-shadow(0 0 1px #fff);
@@ -153,31 +173,33 @@ export const mapStyles = css`
   .ol-scale-text {
     position: absolute;
     font-size: 0.625em;
-    top: 2em;
+    top: 32px;
     color: #000;
     white-space: nowrap;
     filter: drop-shadow(0 0 1px #fff) drop-shadow(0 0 1px #fff);
   }
 
   .ol-scale-singlebar {
-    height: 0.25em;
+    height: 4px;
     opacity: 0.5;
   }
 
   .ol-control {
-    margin: 0.25em;
+    margin: 4px;
+    border-radius: var(--vaadin-button-border-radius, var(--vaadin-radius-m));
   }
 
   .ol-control button {
-    -webkit-appearance: none;
+    appearance: none;
+    display: block;
     border: 0;
     margin: 0;
     padding: 0;
-    background: #fff;
-    font: inherit;
     color: inherit;
-    width: 1.5em;
-    height: 1.5em;
+    font: inherit;
+    width: var(--vaadin-map-control-size, 24px);
+    height: var(--vaadin-map-control-size, 24px);
+    border-radius: inherit;
   }
 
   .ol-control button::-moz-focus-inner {
@@ -195,14 +217,7 @@ export const mapStyles = css`
     grid-area: zoom;
     display: flex;
     flex-direction: column;
-  }
-
-  .ol-zoom-in:empty::before {
-    content: var(--vaadin-map-icon-zoom-in, '+');
-  }
-
-  .ol-zoom-out:empty::before {
-    content: var(--vaadin-map-icon-zoom-out, '\\2013');
+    gap: 2px;
   }
 
   .ol-attribution {
@@ -213,8 +228,9 @@ export const mapStyles = css`
   }
 
   .ol-attribution.ol-uncollapsible {
-    margin-inline-end: calc(var(--vaadin-map-controls-inset, 0.25em) * -1);
-    margin-block-end: calc(var(--vaadin-map-controls-inset, 0.25em) * -1);
+    margin-inline-end: calc(var(--vaadin-map-controls-inset, 4px) * -1);
+    margin-block-end: calc(var(--vaadin-map-controls-inset, 4px) * -1);
+    border-radius: var(--vaadin-radius) 0 0 0;
   }
 
   .ol-attribution button span:empty::before {
@@ -231,7 +247,8 @@ export const mapStyles = css`
     gap: 1em;
     list-style: none;
     margin: 0;
-    padding: 0.25em 0.5em;
+    color: var(--vaadin-map-attribution-color, var(--vaadin-text-color-secondary));
+    padding: var(--vaadin-padding-container);
     font-size: 0.8em;
   }
 
@@ -248,7 +265,7 @@ export const mapStyles = css`
   }
 
   .ol-compass:empty::before {
-    content: var(--vaadin-map-icon-compass, '\\2191');
+    mask-image: var(--_vaadin-icon-arrow-up);
   }
 
   .ol-full-screen {
@@ -256,11 +273,11 @@ export const mapStyles = css`
   }
 
   .ol-full-screen button:empty::before {
-    content: var(--vaadin-map-icon-fullscreen, '\\2922');
+    mask-image: var(--_vaadin-icon-fullscreen);
   }
 
   .ol-full-screen .ol-full-screen-true:empty::before {
-    content: var(--vaadin-map-icon-close, '\\00D7');
+    mask-image: var(--_vaadin-icon-cross);
   }
 
   .ol-overviewmap {
@@ -269,18 +286,16 @@ export const mapStyles = css`
     width: max-content;
   }
 
-  .ol-overviewmap button span:empty::before {
-    content: var(--vaadin-map-icon-overview-map-collapse, '\\25BE');
-  }
-
-  .ol-overviewmap.ol-collapsed button span:empty::before {
-    content: var(--vaadin-map-icon-overview-map-expand, '\\25B4');
+  .ol-overviewmap-map {
+    height: 160px;
+    width: 160px;
+    margin: 4px;
+    border: 0;
+    border-radius: var(--vaadin-button-border-radius, var(--vaadin-radius));
   }
 
-  .ol-overviewmap-map {
-    height: 10em;
-    width: 10em;
-    border: 1px solid rgba(0, 0, 0, 0.5);
+  .ol-overviewmap:not(.ol-uncollapsible) .ol-overviewmap-map {
+    margin-bottom: 0;
   }
 
   .ol-overviewmap.ol-collapsed .ol-overviewmap-map,
@@ -297,12 +312,12 @@ export const mapStyles = css`
 
   .ol-zoomslider {
     grid-area: zoom-slider;
-    height: 8em;
+    height: 128px;
   }
 
   .ol-zoomslider button {
     position: relative;
-    height: 0.5em;
+    height: 8px;
     display: block;
     border-radius: inherit;
   }
@@ -311,4 +326,90 @@ export const mapStyles = css`
     grid-area: zoom-extent;
     align-self: end;
   }
+
+  /* icons & controls styles */
+  .ol-overviewmap button span:empty {
+    display: contents;
+  }
+
+  .ol-overviewmap button span:empty::before {
+    mask-image: var(--vaadin-map-icon-overview-map-collapse, var(--_vaadin-icon-chevron-down));
+  }
+
+  .ol-overviewmap.ol-collapsed button {
+    rotate: 180deg;
+  }
+
+  .ol-overviewmap button span:empty::before,
+  .ol-zoom-in:empty::before,
+  .ol-zoom-out:empty::before,
+  .ol-compass:empty::before,
+  .ol-full-screen button:empty::before,
+  .ol-full-screen-true:empty::before {
+    content: '';
+    display: block;
+    background: currentColor;
+    width: var(--vaadin-icon-size, 1lh);
+    height: var(--vaadin-icon-size, 1lh);
+    flex: none;
+  }
+
+  .ol-zoom-in:empty::before {
+    mask-image: var(--vaadin-map-icon-zoom-in, var(--_vaadin-icon-plus));
+  }
+
+  .ol-zoom-out:empty::before {
+    mask-image: var(--vaadin-map-icon-zoom-out, var(--_vaadin-icon-minus));
+  }
+
+  .ol-zoom button.ol-zoom-in {
+    border-bottom-left-radius: 0;
+    border-bottom-right-radius: 0;
+  }
+
+  .ol-zoom button.ol-zoom-out {
+    border-top-left-radius: 0;
+    border-top-right-radius: 0;
+  }
+
+  .ol-control button,
+  .ol-attribution:not(.ol-uncollapsible) ul {
+    transition: 0.15s opacity;
+    background: var(--vaadin-map-control-background, var(--vaadin-background-color));
+    color: var(--vaadin-map-control-color, var(--vaadin-subtle));
+    opacity: 0.65;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .ol-control:not(.ol-uncollapsible):hover {
+    box-shadow: var(--vaadin-map-control-shadow, 0 3px 8px -1px rgba(0, 0, 0, 0.2));
+  }
+
+  .ol-attribution a {
+    color: inherit;
+    cursor: pointer;
+  }
+
+  .ol-control:hover button,
+  .ol-control button:focus,
+  .ol-attribution:hover ul {
+    opacity: 1;
+  }
+
+  .ol-control button:hover {
+    color: var(--vaadin-map-control-color-hover, var(--vaadin-text-color));
+  }
+
+  .ol-control button:focus-visible {
+    outline: var(--vaadin-focus-ring-width) solid var(--vaadin-focus-ring-color);
+  }
+
+  .ol-overviewmap:not(.ol-collapsed),
+  .ol-overviewmap:not(.ol-collapsed):hover {
+    background: var(--vaadin-map-control-background, var(--vaadin-background-color));
+    box-shadow: var(--vaadin-map-control-shadow, 0 3px 8px -1px rgba(0, 0, 0, 0.2));
+    transition: 0.15s box-shadow;
+  }
 `;

package/src/vaadin-map.js

@@ -12,9 +12,10 @@ import { html, LitElement } from 'lit';
 import { defineCustomElement } from '@vaadin/component-base/src/define.js';
 import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
 import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
+import { LumoInjectionMixin } from '@vaadin/vaadin-themable-mixin/lumo-injection-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
+import { mapStyles } from './styles/vaadin-map-base-styles.js';
 import { MapMixin } from './vaadin-map-mixin.js';
-import { mapStyles } from './vaadin-map-styles.js';
 
 /**
  * `vaadin-map` is a web component for displaying web maps.
@@ -56,7 +57,7 @@ import { mapStyles } from './vaadin-map-styles.js';
  * @mixes ThemableMixin
  * @mixes ElementMixin
  */
-class Map extends MapMixin(ThemableMixin(ElementMixin(PolylitMixin(LitElement)))) {
+class Map extends MapMixin(ThemableMixin(ElementMixin(PolylitMixin(LumoInjectionMixin(LitElement))))) {
   static get is() {
     return 'vaadin-map';
   }
@@ -69,6 +70,12 @@ class Map extends MapMixin(ThemableMixin(ElementMixin(PolylitMixin(LitElement)))
     return mapStyles;
   }
 
+  static get lumoInjector() {
+    return {
+      includeBaseStyles: true,
+    };
+  }
+
   /** @protected */
   render() {
     return html``;

package/vaadin-map.js

@@ -1,2 +1,2 @@
-import './theme/lumo/vaadin-map.js';
+import './src/vaadin-map.js';
 export * from './src/vaadin-map.js';

package/web-types.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/map",
-  "version": "25.0.0-alpha2",
+  "version": "25.0.0-alpha20",
   "description-markup": "markdown",
   "contributions": {
     "html": {

package/web-types.lit.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/map",
-  "version": "25.0.0-alpha2",
+  "version": "25.0.0-alpha20",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {

package/theme/lumo/vaadin-map-styles.d.ts

@@ -1,16 +0,0 @@
-/**
- * @license
- * Copyright (c) 2000 - 2025 Vaadin Ltd.
- *
- * This program is available under Vaadin Commercial License and Service Terms.
- *
- *
- * See https://vaadin.com/commercial-license-and-service-terms for the full
- * license.
- */
-import '@vaadin/vaadin-lumo-styles/color.js';
-import '@vaadin/vaadin-lumo-styles/typography.js';
-import '@vaadin/vaadin-lumo-styles/sizing.js';
-import '@vaadin/vaadin-lumo-styles/spacing.js';
-import '@vaadin/vaadin-lumo-styles/style.js';
-import '@vaadin/vaadin-lumo-styles/font-icons.js';

package/theme/lumo/vaadin-map-styles.js

@@ -1,195 +0,0 @@
-/**
- * @license
- * Copyright (c) 2000 - 2025 Vaadin Ltd.
- *
- * This program is available under Vaadin Commercial License and Service Terms.
- *
- *
- * See https://vaadin.com/commercial-license-and-service-terms for the full
- * license.
- */
-import '@vaadin/vaadin-lumo-styles/color.js';
-import '@vaadin/vaadin-lumo-styles/typography.js';
-import '@vaadin/vaadin-lumo-styles/sizing.js';
-import '@vaadin/vaadin-lumo-styles/spacing.js';
-import '@vaadin/vaadin-lumo-styles/style.js';
-import '@vaadin/vaadin-lumo-styles/font-icons.js';
-import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-
-registerStyles(
-  'vaadin-map',
-  css`
-    :host {
-      font-family: var(--lumo-font-family);
-      font-size: var(--lumo-font-size-m);
-      --vaadin-map-controls-inset: var(--lumo-space-xs);
-      --vaadin-map-icon-zoom-in: var(--lumo-icons-plus);
-      --vaadin-map-icon-zoom-out: var(--lumo-icons-minus);
-      --vaadin-map-icon-compass: var(--lumo-icons-arrow-up);
-      --vaadin-map-icon-overview-map-collapse: var(--lumo-icons-angle-down);
-      --vaadin-map-icon-overview-map-expand: var(--lumo-icons-angle-up);
-      --vaadin-map-icon-close: var(--lumo-icons-cross);
-      --vaadin-map-icon-attribution-collapse: var(--lumo-icons-angle-right);
-      --_focus-ring-color: var(--vaadin-focus-ring-color, var(--lumo-primary-color-50pct));
-      --_focus-ring-width: var(--vaadin-focus-ring-width, 2px);
-    }
-
-    :host(:not([theme~='borderless'])) {
-      border-radius: var(--lumo-border-radius-l);
-      position: relative;
-    }
-
-    :host(:not([theme~='borderless']))::before {
-      content: '';
-      position: absolute;
-      inset: 0;
-      border: 1px solid var(--lumo-contrast-10pct);
-      border-radius: inherit;
-      z-index: 1;
-      pointer-events: none;
-    }
-
-    :host([focus-ring]) {
-      box-shadow: 0 0 0 var(--_focus-ring-width) var(--_focus-ring-color);
-    }
-
-    .ol-control,
-    .ol-scale-bar,
-    .ol-scale-line {
-      margin: var(--lumo-space-xs);
-    }
-
-    .ol-control {
-      border-radius: var(--lumo-border-radius-m);
-      transition:
-        0.15s box-shadow,
-        0.15s background-color;
-      -webkit-backdrop-filter: blur(8px);
-    }
-
-    .ol-control:hover {
-      background-color: var(--lumo-base-color);
-    }
-
-    .ol-control:not(.ol-uncollapsible):hover {
-      box-shadow: var(--lumo-box-shadow-s);
-      background-color: var(--lumo-shade-20pct);
-    }
-
-    .ol-control button {
-      width: var(--lumo-size-s);
-      height: var(--lumo-size-s);
-      border-radius: inherit;
-      font-family: 'lumo-icons';
-      font-size: var(--lumo-icon-size-s);
-      font-weight: 400;
-    }
-
-    .ol-control button,
-    .ol-attribution:not(.ol-uncollapsible) ul {
-      transition: 0.15s opacity;
-      background-color: var(--lumo-base-color);
-      color: var(--lumo-body-text-color);
-      opacity: 0.65;
-    }
-
-    .ol-control:hover button,
-    .ol-control button:focus,
-    .ol-attribution:hover ul {
-      opacity: 1;
-    }
-
-    .ol-control button:hover {
-      color: var(--lumo-primary-text-color);
-    }
-
-    .ol-control button:active {
-      background: var(--lumo-base-color) linear-gradient(var(--lumo-contrast-5pct), var(--lumo-contrast-5pct));
-    }
-
-    @supports not selector(:focus-visible) {
-      .ol-control button:focus {
-        outline: none;
-        box-shadow: 0 0 0 var(--_focus-ring-width) var(--_focus-ring-color);
-      }
-    }
-
-    .ol-control button:focus-visible {
-      outline: none;
-      box-shadow: 0 0 0 var(--_focus-ring-width) var(--_focus-ring-color);
-    }
-
-    .ol-zoom {
-      gap: 2px;
-    }
-
-    button.ol-zoom-in {
-      border-bottom-left-radius: 0;
-      border-bottom-right-radius: 0;
-    }
-
-    button.ol-zoom-out {
-      border-top-left-radius: 0;
-      border-top-right-radius: 0;
-    }
-
-    .ol-attribution.ol-uncollapsible {
-      border-radius: var(--lumo-border-radius-m) 0 0 0;
-    }
-
-    .ol-attribution ul {
-      font-size: var(--lumo-font-size-xxs);
-      color: var(--lumo-secondary-text-color);
-      padding: var(--lumo-space-xs) var(--lumo-space-s);
-      cursor: default;
-    }
-
-    .ol-attribution:not(.ol-uncollapsible) ul {
-      background-color: var(--lumo-base-color);
-    }
-
-    .ol-attribution a {
-      color: inherit;
-      cursor: pointer;
-    }
-
-    .ol-scale-bar-inner {
-      border-radius: var(--lumo-border-radius-s);
-    }
-
-    .ol-full-screen {
-      height: var(--lumo-size-s);
-    }
-
-    .ol-overviewmap:not(.ol-collapsed),
-    .ol-overviewmap:not(.ol-collapsed):hover {
-      background-color: var(--lumo-base-color);
-      box-shadow: var(--lumo-box-shadow-s);
-      transition: 0.15s box-shadow;
-    }
-
-    .ol-overviewmap-map {
-      margin: var(--lumo-space-xs);
-      border: 0;
-      border-radius: var(--lumo-border-radius-s);
-    }
-
-    .ol-overviewmap:not(.ol-uncollapsible) .ol-overviewmap-map {
-      margin-bottom: 0;
-    }
-
-    .ol-zoomslider:not(.ol-uncollapsible):hover {
-      box-shadow: none;
-      overflow: visible;
-    }
-
-    .ol-zoomslider button {
-      height: var(--lumo-space-m);
-    }
-
-    .ol-zoomslider:hover button {
-      box-shadow: var(--lumo-box-shadow-s);
-    }
-  `,
-  { moduleId: 'lumo-map' },
-);

package/theme/lumo/vaadin-map.d.ts

@@ -1,12 +0,0 @@
-/**
- * @license
- * Copyright (c) 2000 - 2025 Vaadin Ltd.
- *
- * This program is available under Vaadin Commercial License and Service Terms.
- *
- *
- * See https://vaadin.com/commercial-license-and-service-terms for the full
- * license.
- */
-import './vaadin-map-styles.js';
-import '../../src/vaadin-map.js';

package/theme/lumo/vaadin-map.js

@@ -1,12 +0,0 @@
-/**
- * @license
- * Copyright (c) 2000 - 2025 Vaadin Ltd.
- *
- * This program is available under Vaadin Commercial License and Service Terms.
- *
- *
- * See https://vaadin.com/commercial-license-and-service-terms for the full
- * license.
- */
-import './vaadin-map-styles.js';
-import '../../src/vaadin-map.js';