@vaadin/scroller 25.0.0-alpha2 → 25.0.0-alpha21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/scroller",
-  "version": "25.0.0-alpha2",
+  "version": "25.0.0-alpha21",
   "publishConfig": {
     "access": "public"
   },
@@ -21,7 +21,6 @@
   "type": "module",
   "files": [
     "src",
-    "theme",
     "vaadin-*.d.ts",
     "vaadin-*.js",
     "web-types.json",
@@ -35,20 +34,20 @@
   ],
   "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-alpha21",
+    "@vaadin/component-base": "25.0.0-alpha21",
+    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha21",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "25.0.0-alpha2",
-    "@vaadin/test-runner-commands": "25.0.0-alpha2",
-    "@vaadin/testing-helpers": "^2.0.0"
+    "@vaadin/chai-plugins": "25.0.0-alpha21",
+    "@vaadin/test-runner-commands": "25.0.0-alpha21",
+    "@vaadin/testing-helpers": "^2.0.0",
+    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha21"
   },
   "web-types": [
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "67ffcd5355cf21ce1b5039c598525109fc4c164b"
+  "gitHead": "8fb9e9710c01449edf623a1aaac4655cdc11a933"
 }

package/src/styles/vaadin-scroller-base-styles.d.ts

@@ -0,0 +1,8 @@
+/**
+ * @license
+ * Copyright (c) 2020 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import type { CSSResult } from 'lit';
+
+export const scrollerStyles: CSSResult;

package/src/styles/vaadin-scroller-base-styles.js

@@ -0,0 +1,59 @@
+/**
+ * @license
+ * Copyright (c) 2020 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import '@vaadin/component-base/src/styles/style-props.js';
+import { css } from 'lit';
+
+export const scrollerStyles = css`
+  :host {
+    display: block;
+    overflow: auto;
+    outline: none;
+  }
+
+  :host([focus-ring]) {
+    outline: var(--vaadin-focus-ring-width) solid var(--vaadin-focus-ring-color);
+  }
+
+  :host([hidden]) {
+    display: none !important;
+  }
+
+  :host([scroll-direction='vertical']) {
+    overflow-x: hidden;
+  }
+
+  :host([scroll-direction='horizontal']) {
+    overflow-y: hidden;
+  }
+
+  :host([scroll-direction='none']) {
+    overflow: hidden;
+  }
+
+  :host([theme*='overflow-indicator'])::before,
+  :host([theme*='overflow-indicator'])::after {
+    content: '';
+    display: none;
+    position: sticky;
+    inset: 0;
+    z-index: 9999;
+    height: 1px;
+    margin-bottom: -1px;
+    background: var(--vaadin-scroller-border-color, var(--vaadin-border-color-secondary));
+  }
+
+  :host([theme*='overflow-indicator'])::after {
+    margin-bottom: 0;
+    margin-top: -1px;
+  }
+
+  :host([theme~='overflow-indicator-top'][overflow~='top'])::before,
+  :host([theme~='overflow-indicators'][overflow~='top'])::before,
+  :host([theme~='overflow-indicators'][overflow~='bottom'])::after,
+  :host([theme~='overflow-indicator-bottom'][overflow~='bottom'])::after {
+    display: block;
+  }
+`;

package/src/vaadin-scroller.d.ts

@@ -10,11 +10,12 @@ import { ScrollerMixin } from './vaadin-scroller-mixin.js';
 /**
  * `<vaadin-scroller>` provides a simple way to enable scrolling when its content is overflowing.
  *
- * ```
+ * ```html
  * <vaadin-scroller>
  *   <div>Content</div>
  * </vaadin-scroller>
  * ```
+ *
  * The following attributes are exposed for styling:
  *
  * Attribute    | Description

package/src/vaadin-scroller.js

@@ -3,22 +3,25 @@
  * Copyright (c) 2020 - 2025 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { css, html, LitElement } from 'lit';
+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 { OverflowController } from '@vaadin/component-base/src/overflow-controller.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 { scrollerStyles } from './styles/vaadin-scroller-base-styles.js';
 import { ScrollerMixin } from './vaadin-scroller-mixin.js';
 
 /**
  * `<vaadin-scroller>` provides a simple way to enable scrolling when its content is overflowing.
  *
- * ```
+ * ```html
  * <vaadin-scroller>
  *   <div>Content</div>
  * </vaadin-scroller>
  * ```
+ *
  * The following attributes are exposed for styling:
  *
  * Attribute    | Description
@@ -33,34 +36,19 @@ import { ScrollerMixin } from './vaadin-scroller-mixin.js';
  * @mixes ElementMixin
  * @mixes ScrollerMixin
  */
-class Scroller extends ScrollerMixin(ElementMixin(ThemableMixin(PolylitMixin(LitElement)))) {
+class Scroller extends ScrollerMixin(ElementMixin(ThemableMixin(PolylitMixin(LumoInjectionMixin(LitElement))))) {
   static get is() {
     return 'vaadin-scroller';
   }
 
   static get styles() {
-    return css`
-      :host {
-        display: block;
-        overflow: auto;
-      }
-
-      :host([hidden]) {
-        display: none !important;
-      }
-
-      :host([scroll-direction='vertical']) {
-        overflow-x: hidden;
-      }
-
-      :host([scroll-direction='horizontal']) {
-        overflow-y: hidden;
-      }
+    return scrollerStyles;
+  }
 
-      :host([scroll-direction='none']) {
-        overflow: hidden;
-      }
-    `;
+  static get lumoInjector() {
+    return {
+      includeBaseStyles: true,
+    };
   }
 
   /** @protected */

package/vaadin-scroller.js

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

package/web-types.json

@@ -1,14 +1,14 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/scroller",
-  "version": "25.0.0-alpha2",
+  "version": "25.0.0-alpha21",
   "description-markup": "markdown",
   "contributions": {
     "html": {
       "elements": [
         {
           "name": "vaadin-scroller",
-          "description": "`<vaadin-scroller>` provides a simple way to enable scrolling when its content is overflowing.\n\n```\n<vaadin-scroller>\n  <div>Content</div>\n</vaadin-scroller>\n```\nThe following attributes are exposed for styling:\n\nAttribute    | Description\n-------------| -----------\n`focus-ring` | Set when the element is focused using the keyboard.\n`focused`    | Set when the element is focused.\n`overflow`   | Set to `top`, `bottom`, `start`, `end`, all of them, or none.",
+          "description": "`<vaadin-scroller>` provides a simple way to enable scrolling when its content is overflowing.\n\n```html\n<vaadin-scroller>\n  <div>Content</div>\n</vaadin-scroller>\n```\n\nThe following attributes are exposed for styling:\n\nAttribute    | Description\n-------------| -----------\n`focus-ring` | Set when the element is focused using the keyboard.\n`focused`    | Set when the element is focused.\n`overflow`   | Set to `top`, `bottom`, `start`, `end`, all of them, or none.",
           "attributes": [
             {
               "name": "scroll-direction",

package/web-types.lit.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/scroller",
-  "version": "25.0.0-alpha2",
+  "version": "25.0.0-alpha21",
   "description-markup": "markdown",
   "framework": "lit",
   "framework-config": {
@@ -16,7 +16,7 @@
       "elements": [
         {
           "name": "vaadin-scroller",
-          "description": "`<vaadin-scroller>` provides a simple way to enable scrolling when its content is overflowing.\n\n```\n<vaadin-scroller>\n  <div>Content</div>\n</vaadin-scroller>\n```\nThe following attributes are exposed for styling:\n\nAttribute    | Description\n-------------| -----------\n`focus-ring` | Set when the element is focused using the keyboard.\n`focused`    | Set when the element is focused.\n`overflow`   | Set to `top`, `bottom`, `start`, `end`, all of them, or none.",
+          "description": "`<vaadin-scroller>` provides a simple way to enable scrolling when its content is overflowing.\n\n```html\n<vaadin-scroller>\n  <div>Content</div>\n</vaadin-scroller>\n```\n\nThe following attributes are exposed for styling:\n\nAttribute    | Description\n-------------| -----------\n`focus-ring` | Set when the element is focused using the keyboard.\n`focused`    | Set when the element is focused.\n`overflow`   | Set to `top`, `bottom`, `start`, `end`, all of them, or none.",
           "extension": true,
           "attributes": [
             {

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

@@ -1,4 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/color.js';
-import '@vaadin/vaadin-lumo-styles/style.js';
-declare const scroller: import("lit").CSSResult;
-export { scroller };

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

@@ -1,43 +0,0 @@
-import '@vaadin/vaadin-lumo-styles/color.js';
-import '@vaadin/vaadin-lumo-styles/style.js';
-import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-
-const scroller = css`
-  :host {
-    outline: none;
-    --_focus-ring-color: var(--vaadin-focus-ring-color, var(--lumo-primary-color-50pct));
-    --_focus-ring-width: var(--vaadin-focus-ring-width, 2px);
-  }
-
-  :host([focus-ring]) {
-    box-shadow: 0 0 0 var(--_focus-ring-width) var(--_focus-ring-color);
-  }
-
-  /* Show dividers when content overflows */
-
-  :host([theme~='overflow-indicators'])::before,
-  :host([theme~='overflow-indicators'])::after {
-    content: '';
-    display: none;
-    position: sticky;
-    inset: 0;
-    z-index: 9999;
-    height: 1px;
-    margin-bottom: -1px;
-    background: var(--lumo-contrast-10pct);
-  }
-
-  :host([theme~='overflow-indicators'])::after {
-    margin-bottom: 0;
-    margin-top: -1px;
-  }
-
-  :host([theme~='overflow-indicators'][overflow~='top'])::before,
-  :host([theme~='overflow-indicators'][overflow~='bottom'])::after {
-    display: block;
-  }
-`;
-
-registerStyles('vaadin-scroller', scroller, { moduleId: 'lumo-scroller' });
-
-export { scroller };

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

@@ -1,2 +0,0 @@
-import './vaadin-scroller-styles.js';
-import '../../src/vaadin-scroller.js';

package/theme/lumo/vaadin-scroller.js

@@ -1,2 +0,0 @@
-import './vaadin-scroller-styles.js';
-import '../../src/vaadin-scroller.js';