@vaadin/scroller 24.8.4 → 25.0.0-alpha10

package/README.md

@@ -34,29 +34,6 @@ Once installed, import the component in your application:
 import '@vaadin/scroller';
 ```
 
-## Themes
-
-Vaadin components come with two built-in [themes](https://vaadin.com/docs/latest/styling), Lumo and Material.
-The [main entrypoint](https://github.com/vaadin/web-components/blob/main/packages/scroller/vaadin-scroller.js) of the package uses the Lumo theme.
-
-To use the Material theme, import the component from the `theme/material` folder:
-
-```js
-import '@vaadin/scroller/theme/material/vaadin-scroller.js';
-```
-
-You can also import the Lumo version of the component explicitly:
-
-```js
-import '@vaadin/scroller/theme/lumo/vaadin-scroller.js';
-```
-
-Finally, you can import the un-themed component from the `src` folder to get a minimal starting point:
-
-```js
-import '@vaadin/scroller/src/vaadin-scroller.js';
-```
-
 ## Contributing
 
 Read the [contributing guide](https://vaadin.com/docs/latest/contributing) to learn about our development process, how to propose bugfixes and improvements, and how to test your changes to Vaadin components.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vaadin/scroller",
-  "version": "24.8.4",
+  "version": "25.0.0-alpha10",
   "publishConfig": {
     "access": "public"
   },
@@ -21,6 +21,8 @@
   "type": "module",
   "files": [
     "src",
+    "!src/styles/*-base-styles.d.ts",
+    "!src/styles/*-base-styles.js",
     "theme",
     "vaadin-*.d.ts",
     "vaadin-*.js",
@@ -31,27 +33,24 @@
     "Vaadin",
     "vaadin-scroller",
     "web-components",
-    "web-component",
-    "polymer"
+    "web-component"
   ],
   "dependencies": {
     "@open-wc/dedupe-mixin": "^1.3.0",
-    "@polymer/polymer": "^3.0.0",
-    "@vaadin/a11y-base": "~24.8.4",
-    "@vaadin/component-base": "~24.8.4",
-    "@vaadin/vaadin-lumo-styles": "~24.8.4",
-    "@vaadin/vaadin-material-styles": "~24.8.4",
-    "@vaadin/vaadin-themable-mixin": "~24.8.4",
+    "@vaadin/a11y-base": "25.0.0-alpha10",
+    "@vaadin/component-base": "25.0.0-alpha10",
+    "@vaadin/vaadin-lumo-styles": "25.0.0-alpha10",
+    "@vaadin/vaadin-themable-mixin": "25.0.0-alpha10",
     "lit": "^3.0.0"
   },
   "devDependencies": {
-    "@vaadin/chai-plugins": "~24.8.4",
-    "@vaadin/test-runner-commands": "~24.8.4",
-    "@vaadin/testing-helpers": "^1.1.0"
+    "@vaadin/chai-plugins": "25.0.0-alpha10",
+    "@vaadin/test-runner-commands": "25.0.0-alpha10",
+    "@vaadin/testing-helpers": "^2.0.0"
   },
   "web-types": [
     "web-types.json",
     "web-types.lit.json"
   ],
-  "gitHead": "849e54e967563080a685965e2dced02060b3ab23"
+  "gitHead": "6cc6c94079e805fa5b2f0af4dbf3b2a7485e57d0"
 }

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,57 @@
+/**
+ * @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/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-indicators'])::before,
+  :host([theme~='overflow-indicators'])::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));
+  }
+
+  :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;
+  }
+`;

package/src/styles/vaadin-scroller-core-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-core-styles.js

@@ -0,0 +1,29 @@
+/**
+ * @license
+ * Copyright (c) 2020 - 2025 Vaadin Ltd.
+ * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
+ */
+import { css } from 'lit';
+
+export const scrollerStyles = 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;
+  }
+
+  :host([scroll-direction='none']) {
+    overflow: hidden;
+  }
+`;

package/src/vaadin-scroller.d.ts

@@ -3,7 +3,6 @@
  * Copyright (c) 2020 - 2025 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { ControllerMixin } from '@vaadin/component-base/src/controller-mixin.js';
 import { ElementMixin } from '@vaadin/component-base/src/element-mixin.js';
 import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
 import { ScrollerMixin } from './vaadin-scroller-mixin.js';
@@ -11,7 +10,7 @@ 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>
@@ -24,7 +23,7 @@ import { ScrollerMixin } from './vaadin-scroller-mixin.js';
  * `focused`    | Set when the element is focused.
  * `overflow`   | Set to `top`, `bottom`, `start`, `end`, all of them, or none.
  */
-declare class Scroller extends ScrollerMixin(ThemableMixin(ElementMixin(ControllerMixin(HTMLElement)))) {}
+declare class Scroller extends ScrollerMixin(ThemableMixin(ElementMixin(HTMLElement))) {}
 
 declare global {
   interface HTMLElementTagNameMap {

package/src/vaadin-scroller.js

@@ -3,18 +3,20 @@
  * Copyright (c) 2020 - 2025 Vaadin Ltd.
  * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
  */
-import { html, PolymerElement } from '@polymer/polymer/polymer-element.js';
-import { ControllerMixin } from '@vaadin/component-base/src/controller-mixin.js';
+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-core-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>
@@ -30,42 +32,27 @@ import { ScrollerMixin } from './vaadin-scroller-mixin.js';
  * @customElement
  * @extends HTMLElement
  * @mixes ThemableMixin
- * @mixes ControllerMixin
  * @mixes ElementMixin
  * @mixes ScrollerMixin
  */
-class Scroller extends ScrollerMixin(ElementMixin(ControllerMixin(ThemableMixin(PolymerElement)))) {
-  static get template() {
-    return html`
-      <style>
-        :host([hidden]) {
-          display: none !important;
-        }
-
-        :host {
-          display: block;
-          overflow: auto;
-        }
-
-        :host([scroll-direction='vertical']) {
-          overflow-x: hidden;
-        }
-
-        :host([scroll-direction='horizontal']) {
-          overflow-y: hidden;
-        }
+class Scroller extends ScrollerMixin(ElementMixin(ThemableMixin(PolylitMixin(LumoInjectionMixin(LitElement))))) {
+  static get is() {
+    return 'vaadin-scroller';
+  }
 
-        :host([scroll-direction='none']) {
-          overflow: hidden;
-        }
-      </style>
+  static get styles() {
+    return scrollerStyles;
+  }
 
-      <slot></slot>
-    `;
+  static get lumoInjector() {
+    return {
+      includeBaseStyles: true,
+    };
   }
 
-  static get is() {
-    return 'vaadin-scroller';
+  /** @protected */
+  render() {
+    return html`<slot></slot>`;
   }
 
   /** @protected */

package/web-types.json

@@ -1,14 +1,14 @@
 {
   "$schema": "https://json.schemastore.org/web-types",
   "name": "@vaadin/scroller",
-  "version": "24.8.4",
+  "version": "25.0.0-alpha10",
   "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```\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": "24.8.4",
+  "version": "25.0.0-alpha10",
   "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```\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/src/vaadin-lit-scroller.js

@@ -1,69 +0,0 @@
-/**
- * @license
- * 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 { 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 { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-import { ScrollerMixin } from './vaadin-scroller-mixin.js';
-
-/**
- * LitElement based version of `<vaadin-scroller>` web component.
- *
- * ## Disclaimer
- *
- * This component is an experiment and not yet a part of Vaadin platform.
- * There is no ETA regarding specific Vaadin version where it'll land.
- * Feel free to try this code in your apps as per Apache 2.0 license.
- */
-class Scroller extends ScrollerMixin(ElementMixin(ThemableMixin(PolylitMixin(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;
-      }
-
-      :host([scroll-direction='none']) {
-        overflow: hidden;
-      }
-    `;
-  }
-
-  /** @protected */
-  render() {
-    return html`<slot></slot>`;
-  }
-
-  /** @protected */
-  ready() {
-    super.ready();
-
-    this.__overflowController = new OverflowController(this);
-    this.addController(this.__overflowController);
-  }
-}
-
-defineCustomElement(Scroller);
-
-export { Scroller };

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

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

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

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

package/theme/material/vaadin-lit-scroller.d.ts

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

package/theme/material/vaadin-lit-scroller.js

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

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

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

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

@@ -1,16 +0,0 @@
-import '@vaadin/vaadin-material-styles/color.js';
-import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
-
-const scroller = css`
-  :host {
-    outline: none;
-  }
-
-  :host([focus-ring]) {
-    box-shadow: 0 0 0 2px var(--material-primary-color);
-  }
-`;
-
-registerStyles('vaadin-scroller', scroller, { moduleId: 'material-scroller' });
-
-export { scroller };

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

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

package/theme/material/vaadin-scroller.js

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

package/vaadin-lit-scroller.d.ts

@@ -1 +0,0 @@
-export * from './src/vaadin-scroller.js';

package/vaadin-lit-scroller.js

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