diff --git a/.github/workflows/visual-tests.yml b/.github/workflows/visual-tests.yml index ca69db24996..860f2a9e83a 100644 --- a/.github/workflows/visual-tests.yml +++ b/.github/workflows/visual-tests.yml @@ -79,40 +79,3 @@ jobs: path: | packages/*/test/visual/lumo/screenshots/*/failed/*.png packages/vaadin-lumo-styles/test/visual/screenshots/failed/*.png - material: - name: Material - runs-on: ubuntu-latest - if: github.repository_owner == 'vaadin' - - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: '0' - - - name: Setup Node - uses: actions/setup-node@v4 - with: - node-version: '22' - cache: 'yarn' - - - name: Install Dependencies - run: yarn --frozen-lockfile --no-progress --non-interactive - - - name: Visual tests - uses: nick-fields/retry@v3 - env: - SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }} - SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }} - with: - timeout_minutes: 20 - retry_wait_seconds: 60 - max_attempts: 3 - command: yarn test:material - - - uses: actions/upload-artifact@v4 - if: ${{ failure() }} - with: - name: screenshots - path: | - packages/*/test/visual/material/screenshots/*/failed/*.png - packages/vaadin-material-styles/test/visual/screenshots/failed/*.png diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 158c30e8f30..2feb6007836 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -138,24 +138,12 @@ Run tests for Lumo: yarn test:lumo ``` -Run tests for Material: - -```sh -yarn test:material -``` - Update reference screenshots for Lumo: ```sh yarn update:lumo ``` -Update reference screenshots for Material: - -```sh -yarn update:material -``` - Update screenshots for single package: ```sh diff --git a/dev/charts/material/area.html b/dev/charts/material/area.html deleted file mode 100644 index 69bc471d74b..00000000000 --- a/dev/charts/material/area.html +++ /dev/null @@ -1,36 +0,0 @@ - - - - Vaadin charts | area - - - - - - - - - - - - - - - - - - - - - diff --git a/dev/charts/material/arearange.html b/dev/charts/material/arearange.html deleted file mode 100644 index 842c49c0775..00000000000 --- a/dev/charts/material/arearange.html +++ /dev/null @@ -1,44 +0,0 @@ - - - - Vaadin charts | area range - - - - - - - - - - - - - - diff --git a/dev/charts/material/areaspline.html b/dev/charts/material/areaspline.html deleted file mode 100644 index 27cfc902e88..00000000000 --- a/dev/charts/material/areaspline.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - Vaadin charts | area spline - - - - - - - - - - - - - - diff --git a/dev/charts/material/areasplinerange.html b/dev/charts/material/areasplinerange.html deleted file mode 100644 index a2efa2a4a0c..00000000000 --- a/dev/charts/material/areasplinerange.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - Vaadin charts | area spline range - - - - - - - - - - - - - - diff --git a/dev/charts/material/bar.html b/dev/charts/material/bar.html deleted file mode 100644 index 5b4598b8c95..00000000000 --- a/dev/charts/material/bar.html +++ /dev/null @@ -1,46 +0,0 @@ - - - - Vaadin charts | bar - - - - - - - - - - - - - - - diff --git a/dev/charts/material/boxplot.html b/dev/charts/material/boxplot.html deleted file mode 100644 index de8ceba19e2..00000000000 --- a/dev/charts/material/boxplot.html +++ /dev/null @@ -1,70 +0,0 @@ - - - - Vaadin charts | box plot - - - - - - - - - - - - - diff --git a/dev/charts/material/bubble.html b/dev/charts/material/bubble.html deleted file mode 100644 index 1876c96c988..00000000000 --- a/dev/charts/material/bubble.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - Vaadin charts | bubble - - - - - - - - - - - - - diff --git a/dev/charts/material/bullet.html b/dev/charts/material/bullet.html deleted file mode 100644 index 1c6b24f06b3..00000000000 --- a/dev/charts/material/bullet.html +++ /dev/null @@ -1,168 +0,0 @@ - - - - Vaadin charts | bullet - - - - - - - - - - - - - - - - - - - - - diff --git a/dev/charts/material/candlestick.html b/dev/charts/material/candlestick.html deleted file mode 100644 index becaa64a06a..00000000000 --- a/dev/charts/material/candlestick.html +++ /dev/null @@ -1,48 +0,0 @@ - - - - Vaadin charts | candle stick - - - - - - - - - - - - - - diff --git a/dev/charts/material/column.html b/dev/charts/material/column.html deleted file mode 100644 index 3b183b45874..00000000000 --- a/dev/charts/material/column.html +++ /dev/null @@ -1,55 +0,0 @@ - - - - Vaadin charts | column - - - - - - - - - - - - - - - - diff --git a/dev/charts/material/columnrange.html b/dev/charts/material/columnrange.html deleted file mode 100644 index 9fff0db579f..00000000000 --- a/dev/charts/material/columnrange.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - Vaadin charts | column range - - - - - - - - - - - - - - diff --git a/dev/charts/material/errorbar.html b/dev/charts/material/errorbar.html deleted file mode 100644 index 9231074ffd2..00000000000 --- a/dev/charts/material/errorbar.html +++ /dev/null @@ -1,58 +0,0 @@ - - - - Vaadin charts | error bar - - - - - - - - - - - - - - - - diff --git a/dev/charts/material/funnel.html b/dev/charts/material/funnel.html deleted file mode 100644 index b00a15f2358..00000000000 --- a/dev/charts/material/funnel.html +++ /dev/null @@ -1,49 +0,0 @@ - - - - Vaadin charts | funnel - - - - - - - - - - - - - diff --git a/dev/charts/material/gantt.html b/dev/charts/material/gantt.html deleted file mode 100644 index ad7a4d605cd..00000000000 --- a/dev/charts/material/gantt.html +++ /dev/null @@ -1,80 +0,0 @@ - - - - Vaadin charts | gantt - - - - - - - - - - - - - - - - diff --git a/dev/charts/material/gauge.html b/dev/charts/material/gauge.html deleted file mode 100644 index ad05bbaec66..00000000000 --- a/dev/charts/material/gauge.html +++ /dev/null @@ -1,72 +0,0 @@ - - - - Vaadin charts | gauge - - - - - - - - - - - - diff --git a/dev/charts/material/gaugedual.html b/dev/charts/material/gaugedual.html deleted file mode 100644 index 3751d3db896..00000000000 --- a/dev/charts/material/gaugedual.html +++ /dev/null @@ -1,71 +0,0 @@ - - - - Vaadin charts | gauge with dual axes - - - - - - - - - - - - diff --git a/dev/charts/material/heatmap.html b/dev/charts/material/heatmap.html deleted file mode 100644 index 7e7d693a917..00000000000 --- a/dev/charts/material/heatmap.html +++ /dev/null @@ -1,67 +0,0 @@ - - - - Vaadin charts | heatmap - - - - - - - - - - - - diff --git a/dev/charts/material/line.html b/dev/charts/material/line.html deleted file mode 100644 index 3e4744f255d..00000000000 --- a/dev/charts/material/line.html +++ /dev/null @@ -1,54 +0,0 @@ - - - - Vaadin charts | line - - - - - - - - - - - - - - - - diff --git a/dev/charts/material/ohlc.html b/dev/charts/material/ohlc.html deleted file mode 100644 index 27f08207f02..00000000000 --- a/dev/charts/material/ohlc.html +++ /dev/null @@ -1,38 +0,0 @@ - - - - Vaadin charts | ohlc - - - - - - - - - - - - - diff --git a/dev/charts/material/organization.html b/dev/charts/material/organization.html deleted file mode 100644 index da9fa3458c7..00000000000 --- a/dev/charts/material/organization.html +++ /dev/null @@ -1,124 +0,0 @@ - - - - Vaadin charts | organization - - - - - - - - - - - - - diff --git a/dev/charts/material/pie.html b/dev/charts/material/pie.html deleted file mode 100644 index 3f3c140965a..00000000000 --- a/dev/charts/material/pie.html +++ /dev/null @@ -1,81 +0,0 @@ - - - - Vaadin charts | pie - - - - - - - - - - - - - diff --git a/dev/charts/material/polar.html b/dev/charts/material/polar.html deleted file mode 100644 index a5ab1756d3c..00000000000 --- a/dev/charts/material/polar.html +++ /dev/null @@ -1,53 +0,0 @@ - - - - Vaadin charts | polar - - - - - - - - - - - - - - - diff --git a/dev/charts/material/polygon.html b/dev/charts/material/polygon.html deleted file mode 100644 index 5d40e831e88..00000000000 --- a/dev/charts/material/polygon.html +++ /dev/null @@ -1,70 +0,0 @@ - - - - Vaadin charts | polygon - - - - - - - - - - - - - - - diff --git a/dev/charts/material/pyramid.html b/dev/charts/material/pyramid.html deleted file mode 100644 index 2da60a95e57..00000000000 --- a/dev/charts/material/pyramid.html +++ /dev/null @@ -1,45 +0,0 @@ - - - - Vaadin charts | pyramid - - - - - - - - - - - - diff --git a/dev/charts/material/scatter.html b/dev/charts/material/scatter.html deleted file mode 100644 index 0139159578a..00000000000 --- a/dev/charts/material/scatter.html +++ /dev/null @@ -1,84 +0,0 @@ - - - - Vaadin charts | scatter - - - - - - - - - - - - - - diff --git a/dev/charts/material/solidgauge.html b/dev/charts/material/solidgauge.html deleted file mode 100644 index a5a2237342d..00000000000 --- a/dev/charts/material/solidgauge.html +++ /dev/null @@ -1,166 +0,0 @@ - - - - Vaadin charts | solid gauge - - - - - - - - - - - - -
- - - - - - - - - - - -
- - diff --git a/dev/charts/material/spiderweb.html b/dev/charts/material/spiderweb.html deleted file mode 100644 index 6a0c0675992..00000000000 --- a/dev/charts/material/spiderweb.html +++ /dev/null @@ -1,47 +0,0 @@ - - - - Vaadin charts | spiderweb - - - - - - - - - - - - - - diff --git a/dev/charts/material/timeline.html b/dev/charts/material/timeline.html deleted file mode 100644 index e382db2d55a..00000000000 --- a/dev/charts/material/timeline.html +++ /dev/null @@ -1,65 +0,0 @@ - - - - Vaadin charts | timeline - - - - - - - - - - - - diff --git a/dev/charts/material/treemap.html b/dev/charts/material/treemap.html deleted file mode 100644 index b0f518ebe62..00000000000 --- a/dev/charts/material/treemap.html +++ /dev/null @@ -1,101 +0,0 @@ - - - - Vaadin charts | treemap - - - - - - - - - - - - - diff --git a/dev/charts/material/waterfall.html b/dev/charts/material/waterfall.html deleted file mode 100644 index b55edc54af8..00000000000 --- a/dev/charts/material/waterfall.html +++ /dev/null @@ -1,50 +0,0 @@ - - - - Vaadin charts | treemap - - - - - - - - - - - - - diff --git a/dev/multi-select-combo-box.html b/dev/multi-select-combo-box.html index b793c244037..e1656021d1b 100644 --- a/dev/multi-select-combo-box.html +++ b/dev/multi-select-combo-box.html @@ -10,7 +10,6 @@ diff --git a/dev/tabsheet.html b/dev/tabsheet.html index 749d44da248..00f9ec730c9 100644 --- a/dev/tabsheet.html +++ b/dev/tabsheet.html @@ -13,11 +13,6 @@ import '@vaadin/checkbox-group'; import '@vaadin/radio-group'; - // import '@vaadin/tabsheet/theme/material/vaadin-tabsheet.js'; - // import '@vaadin/button/theme/material/vaadin-button.js'; - // import '@vaadin/checkbox-group/theme/material/vaadin-checkbox-group.js'; - // import '@vaadin/radio-group/theme/material/vaadin-radio-group.js'; - import '@vaadin/icon'; import '@vaadin/icons/vaadin-iconset.js'; diff --git a/package.json b/package.json index 9088a3b73cf..dd37556a488 100644 --- a/package.json +++ b/package.json @@ -27,17 +27,14 @@ "test:it": "yarn test --config web-test-runner-it.config.js", "test:lumo": "yarn test --config web-test-runner-lumo.config.js", "test:local:lumo": "yarn test --config web-test-runner-lumo.config.js --local", - "test:material": "yarn test --config web-test-runner-material.config.js", "test:snapshots": "yarn test --config web-test-runner-snapshots.config.js", "test:webkit": "yarn test --config web-test-runner-webkit.config.js", "update:base": "TEST_ENV=update yarn test --config web-test-runner-base.config.js", "update:local:lumo": "TEST_ENV=update yarn test --config web-test-runner-lumo.config.js --local", "update:lumo": "TEST_ENV=update yarn test --config web-test-runner-lumo.config.js", - "update:material": "TEST_ENV=update yarn test --config web-test-runner-material.config.js", "update:snapshots": "yarn test --config web-test-runner-snapshots.config.js --update-snapshots" }, "devDependencies": { - "@fontsource/roboto": "^4.5.8", "@polymer/iron-component-page": "^4.0.1", "@rollup/plugin-terser": "^0.4.4", "@types/mocha": "^10.0.7", diff --git a/packages/accordion/package.json b/packages/accordion/package.json index 4d85bc3663f..26dcabcbc7a 100644 --- a/packages/accordion/package.json +++ b/packages/accordion/package.json @@ -45,7 +45,6 @@ "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/details": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/accordion/test/visual/material/accordion.test.js b/packages/accordion/test/visual/material/accordion.test.js deleted file mode 100644 index 848e50a624e..00000000000 --- a/packages/accordion/test/visual/material/accordion.test.js +++ /dev/null @@ -1,51 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-accordion.js'; - -describe('accordion', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.padding = '10px'; - - element = fixtureSync( - ` - - - Panel 1 -
Content 1
-
- - Panel 2 -
Content 2
-
- - Panel 3 -
Content 3
-
-
- `, - div, - ); - }); - - it('opened-start', async () => { - await visualDiff(div, 'opened-start'); - }); - - it('opened-middle', async () => { - element.opened = 1; - await visualDiff(div, 'opened-middle'); - }); - - it('opened-end', async () => { - element.opened = 2; - await visualDiff(div, 'opened-end'); - }); - - it('closed', async () => { - element.opened = null; - await visualDiff(div, 'closed'); - }); -}); diff --git a/packages/accordion/test/visual/material/screenshots/accordion/baseline/closed.png b/packages/accordion/test/visual/material/screenshots/accordion/baseline/closed.png deleted file mode 100644 index 2dce1c15b0e..00000000000 Binary files a/packages/accordion/test/visual/material/screenshots/accordion/baseline/closed.png and /dev/null differ diff --git a/packages/accordion/test/visual/material/screenshots/accordion/baseline/opened-end.png b/packages/accordion/test/visual/material/screenshots/accordion/baseline/opened-end.png deleted file mode 100644 index b4eb566196d..00000000000 Binary files a/packages/accordion/test/visual/material/screenshots/accordion/baseline/opened-end.png and /dev/null differ diff --git a/packages/accordion/test/visual/material/screenshots/accordion/baseline/opened-middle.png b/packages/accordion/test/visual/material/screenshots/accordion/baseline/opened-middle.png deleted file mode 100644 index 2fcf2ee2604..00000000000 Binary files a/packages/accordion/test/visual/material/screenshots/accordion/baseline/opened-middle.png and /dev/null differ diff --git a/packages/accordion/test/visual/material/screenshots/accordion/baseline/opened-start.png b/packages/accordion/test/visual/material/screenshots/accordion/baseline/opened-start.png deleted file mode 100644 index 36b69a70ce1..00000000000 Binary files a/packages/accordion/test/visual/material/screenshots/accordion/baseline/opened-start.png and /dev/null differ diff --git a/packages/accordion/theme/material/vaadin-accordion-heading-styles.js b/packages/accordion/theme/material/vaadin-accordion-heading-styles.js deleted file mode 100644 index 0389b39d47b..00000000000 --- a/packages/accordion/theme/material/vaadin-accordion-heading-styles.js +++ /dev/null @@ -1,44 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import { detailsSummary } from '@vaadin/details/theme/material/vaadin-details-summary-styles.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const accordionHeading = css` - :host(:not([opened]))::after { - content: ''; - position: absolute; - bottom: -1px; - left: 0; - right: 0; - height: 1px; - opacity: 1; - z-index: 1; - background-color: var(--material-divider-color); - } - - :host([opened])::before { - opacity: 0; - } - - [part='content'] { - font-weight: normal; - } - - [part='content'] ::slotted(*) { - display: flex; - margin-right: 16px; - color: var(--material-body-text-color); - } - - [part='content'] ::slotted([theme='primary']) { - flex-basis: 33.33%; - flex-shrink: 0; - } - - [part='content'] ::slotted([theme='secondary']) { - color: var(--material-secondary-text-color); - } -`; - -registerStyles('vaadin-accordion-heading', [detailsSummary, accordionHeading], { - moduleId: 'material-accordion-heading', -}); diff --git a/packages/accordion/theme/material/vaadin-accordion-heading.js b/packages/accordion/theme/material/vaadin-accordion-heading.js deleted file mode 100644 index 1eb70960eaf..00000000000 --- a/packages/accordion/theme/material/vaadin-accordion-heading.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-accordion-heading-styles.js'; -import '../../src/vaadin-accordion-heading.js'; diff --git a/packages/accordion/theme/material/vaadin-accordion-panel-styles.js b/packages/accordion/theme/material/vaadin-accordion-panel-styles.js deleted file mode 100644 index 5cdf6dc3489..00000000000 --- a/packages/accordion/theme/material/vaadin-accordion-panel-styles.js +++ /dev/null @@ -1,17 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import { details } from '@vaadin/details/theme/material/vaadin-details-styles.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const accordionPanel = css` - :host([opened]:not(:first-child)) { - margin-top: 16px; - } - - :host([opened]:not(:last-child)) { - margin-bottom: 16px; - } -`; - -registerStyles('vaadin-accordion-panel', [details, accordionPanel], { - moduleId: 'material-accordion-panel', -}); diff --git a/packages/accordion/theme/material/vaadin-accordion-panel.js b/packages/accordion/theme/material/vaadin-accordion-panel.js deleted file mode 100644 index 4a521c56dee..00000000000 --- a/packages/accordion/theme/material/vaadin-accordion-panel.js +++ /dev/null @@ -1,3 +0,0 @@ -import './vaadin-accordion-heading.js'; -import './vaadin-accordion-panel-styles.js'; -import '../../src/vaadin-accordion-panel.js'; diff --git a/packages/accordion/theme/material/vaadin-accordion.js b/packages/accordion/theme/material/vaadin-accordion.js deleted file mode 100644 index cdf52452a47..00000000000 --- a/packages/accordion/theme/material/vaadin-accordion.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-accordion-panel.js'; -import '../../src/vaadin-accordion.js'; diff --git a/packages/accordion/theme/material/vaadin-lit-accordion-heading.js b/packages/accordion/theme/material/vaadin-lit-accordion-heading.js deleted file mode 100644 index e5a37bda23e..00000000000 --- a/packages/accordion/theme/material/vaadin-lit-accordion-heading.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-accordion-heading-styles.js'; -import '../../src/vaadin-lit-accordion-heading.js'; diff --git a/packages/accordion/theme/material/vaadin-lit-accordion-panel.js b/packages/accordion/theme/material/vaadin-lit-accordion-panel.js deleted file mode 100644 index 522977dd537..00000000000 --- a/packages/accordion/theme/material/vaadin-lit-accordion-panel.js +++ /dev/null @@ -1,3 +0,0 @@ -import './vaadin-lit-accordion-heading.js'; -import './vaadin-accordion-panel-styles.js'; -import '../../src/vaadin-lit-accordion-panel.js'; diff --git a/packages/accordion/theme/material/vaadin-lit-accordion.js b/packages/accordion/theme/material/vaadin-lit-accordion.js deleted file mode 100644 index 55343d133f5..00000000000 --- a/packages/accordion/theme/material/vaadin-lit-accordion.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-lit-accordion-panel.js'; -import '../../src/vaadin-lit-accordion.js'; diff --git a/packages/app-layout/package.json b/packages/app-layout/package.json index a9f7c6fc485..0c64eef92d8 100644 --- a/packages/app-layout/package.json +++ b/packages/app-layout/package.json @@ -41,7 +41,6 @@ "@vaadin/button": "25.0.0-alpha0", "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/app-layout/test/visual/material/app-layout.test.js b/packages/app-layout/test/visual/material/app-layout.test.js deleted file mode 100644 index 48e775f90b6..00000000000 --- a/packages/app-layout/test/visual/material/app-layout.test.js +++ /dev/null @@ -1,61 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-app-layout.js'; -import '../../../theme/material/vaadin-drawer-toggle.js'; - -describe('app-layout', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.height = '100%'; - - element = fixtureSync( - ` - - -

App Name

-
Drawer content
-
Page content
-
- `, - div, - ); - }); - - ['ltr', 'rtl'].forEach((dir) => { - describe(dir, () => { - before(() => { - document.documentElement.setAttribute('dir', dir); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - it('basic', async () => { - await visualDiff(div, `${dir}-basic`); - }); - - it('primary-drawer', async () => { - element.primarySection = 'drawer'; - await visualDiff(div, `${dir}-primary-drawer`); - }); - - it('overlay', async () => { - // See https://github.com/vaadin/vaadin-app-layout/issues/183 - element.style.setProperty('--vaadin-app-layout-drawer-overlay', ' true'); - window.dispatchEvent(new Event('resize')); - await visualDiff(div, `${dir}-overlay`); - }); - - it('primary-drawer-overlay-opened', async () => { - element.primarySection = 'drawer'; - element.style.setProperty('--vaadin-app-layout-drawer-overlay', ' true'); - window.dispatchEvent(new Event('resize')); - element.drawerOpened = true; - await visualDiff(div, `${dir}-primary-drawer-overlay-opened`); - }); - }); - }); -}); diff --git a/packages/app-layout/test/visual/material/screenshots/app-layout/baseline/ltr-basic.png b/packages/app-layout/test/visual/material/screenshots/app-layout/baseline/ltr-basic.png deleted file mode 100644 index c565ead431f..00000000000 Binary files a/packages/app-layout/test/visual/material/screenshots/app-layout/baseline/ltr-basic.png and /dev/null differ diff --git a/packages/app-layout/test/visual/material/screenshots/app-layout/baseline/ltr-overlay.png b/packages/app-layout/test/visual/material/screenshots/app-layout/baseline/ltr-overlay.png deleted file mode 100644 index 2b3d4d3c7dc..00000000000 Binary files a/packages/app-layout/test/visual/material/screenshots/app-layout/baseline/ltr-overlay.png and /dev/null differ diff --git a/packages/app-layout/test/visual/material/screenshots/app-layout/baseline/ltr-primary-drawer-overlay-opened.png b/packages/app-layout/test/visual/material/screenshots/app-layout/baseline/ltr-primary-drawer-overlay-opened.png deleted file mode 100644 index f4630c20234..00000000000 Binary files a/packages/app-layout/test/visual/material/screenshots/app-layout/baseline/ltr-primary-drawer-overlay-opened.png and /dev/null differ diff --git a/packages/app-layout/test/visual/material/screenshots/app-layout/baseline/ltr-primary-drawer.png b/packages/app-layout/test/visual/material/screenshots/app-layout/baseline/ltr-primary-drawer.png deleted file mode 100644 index 93db5c8691f..00000000000 Binary files a/packages/app-layout/test/visual/material/screenshots/app-layout/baseline/ltr-primary-drawer.png and /dev/null differ diff --git a/packages/app-layout/test/visual/material/screenshots/app-layout/baseline/rtl-basic.png b/packages/app-layout/test/visual/material/screenshots/app-layout/baseline/rtl-basic.png deleted file mode 100644 index 09f1a397496..00000000000 Binary files a/packages/app-layout/test/visual/material/screenshots/app-layout/baseline/rtl-basic.png and /dev/null differ diff --git a/packages/app-layout/test/visual/material/screenshots/app-layout/baseline/rtl-overlay.png b/packages/app-layout/test/visual/material/screenshots/app-layout/baseline/rtl-overlay.png deleted file mode 100644 index 9f81dac9e0a..00000000000 Binary files a/packages/app-layout/test/visual/material/screenshots/app-layout/baseline/rtl-overlay.png and /dev/null differ diff --git a/packages/app-layout/test/visual/material/screenshots/app-layout/baseline/rtl-primary-drawer-overlay-opened.png b/packages/app-layout/test/visual/material/screenshots/app-layout/baseline/rtl-primary-drawer-overlay-opened.png deleted file mode 100644 index e8f121a892b..00000000000 Binary files a/packages/app-layout/test/visual/material/screenshots/app-layout/baseline/rtl-primary-drawer-overlay-opened.png and /dev/null differ diff --git a/packages/app-layout/test/visual/material/screenshots/app-layout/baseline/rtl-primary-drawer.png b/packages/app-layout/test/visual/material/screenshots/app-layout/baseline/rtl-primary-drawer.png deleted file mode 100644 index 07013d677c7..00000000000 Binary files a/packages/app-layout/test/visual/material/screenshots/app-layout/baseline/rtl-primary-drawer.png and /dev/null differ diff --git a/packages/app-layout/theme/material/vaadin-app-layout-styles.js b/packages/app-layout/theme/material/vaadin-app-layout-styles.js deleted file mode 100644 index 2a67ccc5e52..00000000000 --- a/packages/app-layout/theme/material/vaadin-app-layout-styles.js +++ /dev/null @@ -1,53 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/shadow.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-app-layout', - css` - :host { - background-color: var(--material-background-color); - } - - [part='navbar'] { - padding: 0.25em 0.5em; - background: var(--vaadin-app-layout-navbar-background, var(--material-secondary-background-color)); - box-shadow: var(--material-shadow-elevation-8dp); - } - - [part='drawer'] { - background: var(--material-background-color); - border-inline-end: 1px solid var(--material-secondary-background-color); - } - - :host([primary-section='drawer']) [part='drawer'] { - z-index: 2; - } - - :host([primary-section='navbar']:not([overlay])) [part='navbar'] { - z-index: 1; - } - - [part] ::slotted(h2), - [part] ::slotted(h3), - [part] ::slotted(h4) { - line-height: 2.5rem; - margin-top: 0.25rem !important; - margin-bottom: 0.25rem !important; - } - - [part='navbar'][bottom] { - padding: 0 1em; - box-shadow: var(--material-shadow-elevation-4dp); - } - - @media (min-width: 700px) { - [part='navbar'] { - padding: 0.5em 0.75em; - box-shadow: var(--material-shadow-elevation-4dp); - } - } - `, - { moduleId: 'material-app-layout' }, -); diff --git a/packages/app-layout/theme/material/vaadin-app-layout.js b/packages/app-layout/theme/material/vaadin-app-layout.js deleted file mode 100644 index b32f0537210..00000000000 --- a/packages/app-layout/theme/material/vaadin-app-layout.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-app-layout-styles.js'; -import '../../src/vaadin-app-layout.js'; diff --git a/packages/app-layout/theme/material/vaadin-drawer-toggle-styles.js b/packages/app-layout/theme/material/vaadin-drawer-toggle-styles.js deleted file mode 100644 index 39b1924bfd0..00000000000 --- a/packages/app-layout/theme/material/vaadin-drawer-toggle-styles.js +++ /dev/null @@ -1,39 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import { button } from '@vaadin/button/theme/material/vaadin-button-styles.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const drawerToggle = css` - :host { - min-width: 0 !important; - width: 48px; - height: 48px; - padding: 0; - border-radius: 50%; - margin-inline-end: 1em; - } - - [part='icon'] { - top: 18px; - left: 15px; - } - - [part='icon'], - [part='icon']::after, - [part='icon']::before { - background-color: currentColor; - height: 2px; - width: 18px; - } - - [part='icon']::after { - top: 5px; - } - - [part='icon']::before { - top: 10px; - } -`; - -registerStyles('vaadin-drawer-toggle', [button, drawerToggle], { - moduleId: 'material-drawer-toggle', -}); diff --git a/packages/app-layout/theme/material/vaadin-drawer-toggle.js b/packages/app-layout/theme/material/vaadin-drawer-toggle.js deleted file mode 100644 index db7114ff52e..00000000000 --- a/packages/app-layout/theme/material/vaadin-drawer-toggle.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-drawer-toggle-styles.js'; -import '../../src/vaadin-drawer-toggle.js'; diff --git a/packages/app-layout/theme/material/vaadin-lit-app-layout.js b/packages/app-layout/theme/material/vaadin-lit-app-layout.js deleted file mode 100644 index e709ff0f2ce..00000000000 --- a/packages/app-layout/theme/material/vaadin-lit-app-layout.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-app-layout-styles.js'; -import '../../src/vaadin-lit-app-layout.js'; diff --git a/packages/app-layout/theme/material/vaadin-lit-drawer-toggle.js b/packages/app-layout/theme/material/vaadin-lit-drawer-toggle.js deleted file mode 100644 index ccff83489e0..00000000000 --- a/packages/app-layout/theme/material/vaadin-lit-drawer-toggle.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-drawer-toggle-styles.js'; -import '../../src/vaadin-lit-drawer-toggle.js'; diff --git a/packages/avatar-group/package.json b/packages/avatar-group/package.json index fd11dd425c8..929bb915a60 100644 --- a/packages/avatar-group/package.json +++ b/packages/avatar-group/package.json @@ -46,7 +46,6 @@ "@vaadin/overlay": "25.0.0-alpha0", "@vaadin/tooltip": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/avatar-group/test/visual/material/avatar-group.test.js b/packages/avatar-group/test/visual/material/avatar-group.test.js deleted file mode 100644 index 5af10cc563a..00000000000 --- a/packages/avatar-group/test/visual/material/avatar-group.test.js +++ /dev/null @@ -1,79 +0,0 @@ -import { fixtureSync, nextRender } from '@vaadin/testing-helpers'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-avatar-group.js'; - -describe('avatar-group', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - div.style.padding = '10px'; - element = fixtureSync('', div); - }); - - it('basic', async () => { - element.items = [{ name: 'Abc Def' }, { name: 'Ghi Jkl' }, { name: 'Mno Pqr' }, { name: 'Stu Vwx' }]; - await visualDiff(div, 'basic'); - }); - - it('max-items-visible', async () => { - element.maxItemsVisible = 3; - element.items = [{ name: 'Abc Def' }, { name: 'Ghi Jkl' }, { name: 'Mno Pqr' }, { name: 'Stu Vwx' }]; - await visualDiff(div, 'max-items-visible'); - }); - - it('color-index', async () => { - element.items = [ - { colorIndex: 0 }, - { abbr: '11', colorIndex: 1 }, - { abbr: '22', colorIndex: 2 }, - { abbr: '33', colorIndex: 3 }, - { abbr: '44', colorIndex: 4 }, - { abbr: '55', colorIndex: 5 }, - { abbr: '66', colorIndex: 6 }, - ]; - await visualDiff(div, 'color-index'); - }); - - it('theme-xlarge', async () => { - element.items = [{ name: 'Abc Def' }, { name: 'Ghi Jkl' }, { name: 'Mno Pqr' }, { name: 'Stu Vwx' }]; - element.setAttribute('theme', 'xlarge'); - await visualDiff(div, 'theme-xlarge'); - }); - - it('theme-large', async () => { - element.items = [{ name: 'Abc Def' }, { name: 'Ghi Jkl' }, { name: 'Mno Pqr' }, { name: 'Stu Vwx' }]; - element.setAttribute('theme', 'large'); - await visualDiff(div, 'theme-large'); - }); - - it('theme-small', async () => { - element.items = [{ name: 'Abc Def' }, { name: 'Ghi Jkl' }, { name: 'Mno Pqr' }, { name: 'Stu Vwx' }]; - element.setAttribute('theme', 'small'); - await visualDiff(div, 'theme-small'); - }); - - it('theme-xsmall', async () => { - element.items = [{ name: 'Abc Def' }, { name: 'Ghi Jkl' }, { name: 'Mno Pqr' }, { name: 'Stu Vwx' }]; - element.setAttribute('theme', 'xsmall'); - await visualDiff(div, 'theme-xsmall'); - }); - - it('opened', async () => { - document.body.style.height = '200px'; - document.body.style.width = '220px'; - element.maxItemsVisible = 3; - element.items = [{ name: 'Abc Def' }, { name: 'Ghi Jkl' }, { name: 'Mno Pqr' }, { name: 'Stu Vwx' }]; - await nextRender(element); - element._overflow.click(); - await nextRender(element); - await visualDiff(document.body, 'opened'); - }); - - it('avatar-size', async () => { - element.items = [{ name: 'Abc Def' }, { name: 'Ghi Jkl' }, { name: 'Mno Pqr' }, { name: 'Stu Vwx' }]; - element.style.setProperty('--vaadin-avatar-size', '45px'); - await visualDiff(div, 'avatar-size'); - }); -}); diff --git a/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/avatar-size.png b/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/avatar-size.png deleted file mode 100644 index 5185ac6e7d5..00000000000 Binary files a/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/avatar-size.png and /dev/null differ diff --git a/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/basic.png b/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/basic.png deleted file mode 100644 index 440cc019aae..00000000000 Binary files a/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/basic.png and /dev/null differ diff --git a/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/color-index.png b/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/color-index.png deleted file mode 100644 index 47b6f873c7e..00000000000 Binary files a/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/color-index.png and /dev/null differ diff --git a/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/max-items-visible.png b/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/max-items-visible.png deleted file mode 100644 index a1684ddcca8..00000000000 Binary files a/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/max-items-visible.png and /dev/null differ diff --git a/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/opened.png b/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/opened.png deleted file mode 100644 index 49218214d45..00000000000 Binary files a/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/opened.png and /dev/null differ diff --git a/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/theme-large.png b/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/theme-large.png deleted file mode 100644 index 15b8f33ad17..00000000000 Binary files a/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/theme-large.png and /dev/null differ diff --git a/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/theme-small.png b/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/theme-small.png deleted file mode 100644 index 1cb1b6e3c03..00000000000 Binary files a/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/theme-small.png and /dev/null differ diff --git a/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/theme-xlarge.png b/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/theme-xlarge.png deleted file mode 100644 index 64eb58533e8..00000000000 Binary files a/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/theme-xlarge.png and /dev/null differ diff --git a/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/theme-xsmall.png b/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/theme-xsmall.png deleted file mode 100644 index 437783245ae..00000000000 Binary files a/packages/avatar-group/test/visual/material/screenshots/avatar-group/baseline/theme-xsmall.png and /dev/null differ diff --git a/packages/avatar-group/theme/material/vaadin-avatar-group-styles.js b/packages/avatar-group/theme/material/vaadin-avatar-group-styles.js deleted file mode 100644 index 745627b9f78..00000000000 --- a/packages/avatar-group/theme/material/vaadin-avatar-group-styles.js +++ /dev/null @@ -1,78 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import { item } from '@vaadin/item/theme/material/vaadin-item-styles.js'; -import { listBox } from '@vaadin/list-box/theme/material/vaadin-list-box-styles.js'; -import { menuOverlay } from '@vaadin/vaadin-material-styles/mixins/menu-overlay.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-avatar-group', - css` - :host { - --vaadin-avatar-size: 2.25rem; - } - - :host([theme~='xlarge']) { - --vaadin-avatar-group-overlap: 12px; - --vaadin-avatar-group-overlap-border: 3px; - --vaadin-avatar-size: 3.5rem; - } - - :host([theme~='large']) { - --vaadin-avatar-group-overlap: 10px; - --vaadin-avatar-group-overlap-border: 3px; - --vaadin-avatar-size: 2.75rem; - } - - :host([theme~='small']) { - --vaadin-avatar-group-overlap: 6px; - --vaadin-avatar-group-overlap-border: 2px; - --vaadin-avatar-size: 1.875rem; - } - - :host([theme~='xsmall']) { - --vaadin-avatar-group-overlap: 4px; - --vaadin-avatar-group-overlap-border: 2px; - --vaadin-avatar-size: 1.625rem; - } - `, - { moduleId: 'material-avatar-group' }, -); - -const avatarGroupOverlay = css` - [part='overlay'] { - outline: none; - } -`; - -registerStyles('vaadin-avatar-group-overlay', [menuOverlay, avatarGroupOverlay], { - moduleId: 'material-avatar-group-overlay', -}); - -registerStyles('vaadin-avatar-group-menu', listBox, { moduleId: 'material-avatar-group-menu' }); - -registerStyles( - 'vaadin-avatar-group-menu-item', - [ - item, - css` - :host { - padding: 8px; - padding-inline-end: 24px; - } - - [part='content'] { - display: flex; - align-items: center; - } - - [part='checkmark']::before { - display: none; - } - - [part='content'] ::slotted(vaadin-avatar) { - margin-inline-end: 8px; - } - `, - ], - { moduleId: 'material-avatar-group-menu-item' }, -); diff --git a/packages/avatar-group/theme/material/vaadin-avatar-group.js b/packages/avatar-group/theme/material/vaadin-avatar-group.js deleted file mode 100644 index 030d6ee525c..00000000000 --- a/packages/avatar-group/theme/material/vaadin-avatar-group.js +++ /dev/null @@ -1,3 +0,0 @@ -import '@vaadin/avatar/theme/material/vaadin-avatar.js'; -import './vaadin-avatar-group-styles.js'; -import '../../src/vaadin-avatar-group.js'; diff --git a/packages/avatar-group/theme/material/vaadin-lit-avatar-group.js b/packages/avatar-group/theme/material/vaadin-lit-avatar-group.js deleted file mode 100644 index bbb2e178bdb..00000000000 --- a/packages/avatar-group/theme/material/vaadin-lit-avatar-group.js +++ /dev/null @@ -1,3 +0,0 @@ -import '@vaadin/avatar/theme/material/vaadin-lit-avatar.js'; -import './vaadin-avatar-group-styles.js'; -import '../../src/vaadin-lit-avatar-group.js'; diff --git a/packages/avatar/package.json b/packages/avatar/package.json index 0632862ad8b..e5693649d9d 100644 --- a/packages/avatar/package.json +++ b/packages/avatar/package.json @@ -42,7 +42,6 @@ "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/tooltip": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/avatar/test/visual/material/avatar.test.js b/packages/avatar/test/visual/material/avatar.test.js deleted file mode 100644 index bed65e6f9d4..00000000000 --- a/packages/avatar/test/visual/material/avatar.test.js +++ /dev/null @@ -1,81 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-avatar.js'; -import { Tooltip } from '@vaadin/tooltip/src/vaadin-tooltip.js'; - -describe('avatar', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - div.style.padding = '10px'; - element = fixtureSync('', div); - }); - - before(() => { - Tooltip.setDefaultFocusDelay(0); - Tooltip.setDefaultHoverDelay(0); - Tooltip.setDefaultHideDelay(0); - }); - - it('basic', async () => { - await visualDiff(div, 'basic'); - }); - - it('name', async () => { - element.name = 'Foo Bar'; - await visualDiff(div, 'name'); - }); - - it('name', async () => { - element.abbr = 'YY'; - await visualDiff(div, 'abbr'); - }); - - it('img', async () => { - /* prettier-ignore */ - element.img = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iNTEyIiBoZWlnaHQ9IjUxMiI+PHBhdGggZmlsbD0iIzAyMDIwMSIgZD0iTTQ1NC40MjYgMzkyLjU4MmMtNS40MzktMTYuMzItMTUuMjk4LTMyLjc4Mi0yOS44MzktNDIuMzYyLTI3Ljk3OS0xOC41NzItNjAuNTc4LTI4LjQ3OS05Mi4wOTktMzkuMDg1LTcuNjA0LTIuNjY0LTE1LjMzLTUuNTY4LTIyLjI3OS05LjctNi4yMDQtMy42ODYtOC41MzMtMTEuMjQ2LTkuOTc0LTE3Ljg4Ni0uNjM2LTMuNTEyLTEuMDI2LTcuMTE2LTEuMjI4LTEwLjY2MSAyMi44NTctMzEuMjY3IDM4LjAxOS04Mi4yOTUgMzguMDE5LTEyNC4xMzYgMC02NS4yOTgtMzYuODk2LTgzLjQ5NS04Mi40MDItODMuNDk1LTQ1LjUxNSAwLTgyLjQwMyAxOC4xNy04Mi40MDMgODMuNDY4IDAgNDMuMzM4IDE2LjI1NSA5Ni41IDQwLjQ4OSAxMjcuMzgzLS4yMjEgMi40MzgtLjUxMSA0Ljg3Ni0uOTUgNy4zMDMtMS40NDQgNi42MzktMy43NyAxNC4wNTgtOS45NyAxNy43NDMtNi45NTcgNC4xMzMtMTQuNjgyIDYuNzU2LTIyLjI4NyA5LjQyLTMxLjUyMSAxMC42MDUtNjQuMTE5IDE5Ljk1Ny05Mi4wOTEgMzguNTI5LTE0LjU0OSA5LjU4LTI0LjQwMyAyNy4xNTktMjkuODM4IDQzLjQ3OS01LjU5NyAxNi45MzgtNy44ODYgMzcuOTE3LTcuNTQxIDU0LjkxN2g0MTEuOTMyYy4zNDgtMTYuOTk5LTEuOTQ2LTM3Ljk3OC03LjUzOS01NC45MTd6Ii8+PC9zdmc+Cg=='; - await visualDiff(div, 'img'); - }); - - it('color-index', async () => { - element.colorIndex = '0'; - await visualDiff(div, 'color-index'); - }); - - it('theme-xlarge', async () => { - element.setAttribute('theme', 'xlarge'); - await visualDiff(div, 'theme-xlarge'); - }); - - it('theme-large', async () => { - element.setAttribute('theme', 'large'); - await visualDiff(div, 'theme-large'); - }); - - it('theme-small', async () => { - element.setAttribute('theme', 'small'); - await visualDiff(div, 'theme-small'); - }); - - it('theme-xsmall', async () => { - element.setAttribute('theme', 'xsmall'); - await visualDiff(div, 'theme-xsmall'); - }); - - /** - * Tests that images rendered in preserve their aspect ratio using object-fit: cover, instead of being - * stretched. Uses the Vaadin `}` as test image, which is higher than it is wide. - */ - it('aspect-ratio', async () => { - /* prettier-ignore */ - element.img = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAABGCAYAAADb7SQ4AAABeWlDQ1BJQ0MgUHJvZmlsZQAAKJF9kE0rRFEYx38GESOFBWVxY1gNMWpio8wklMU0KG+bO3fe1Lzc7lwhGwtlqyix8bbgE7CxUNZKKVKy8wWIjXQ9x4zGS3nqOc/vPOc5/875g8urm2aqrAvSGdsKDwW0yalpreKRcpqow027buTMgVBoFImv+jNebyhR9bpDaf09/zeqo7GcASWVwv2GadnCw8KtC7apWOk1WPIo4RXFiTxvKo7k+fhzZjwcFD4T1oykHhW+F/YaSSsNLqXviXybSXzjdGreKLxH/cQdy0yMSW2RbCZHmCECaIwwSBA/3fTJ6qcDH52yw44t2upyMGsuWXOJpK0NiBMxbSRjdHo1X5dPZpSvv/0q9rJ70PsCpevFXmQLTteg8a7Y8+xC7SqcXJi6pX+2SiVd8Tg8HUHNFNRfQdVMLt7jy//IHYDyB8d5boOKDXhfd5y3fcd5P5DL4tF5Ju9RQYvDWxhfhtFL2N6BdtGunf0AHOpnKSG+GKUAAACYZVhJZk1NACoAAAAIAAYBEgADAAAAAQABAAABGgAFAAAAAQAAAFYBGwAFAAAAAQAAAF4BKAADAAAAAQACAAABMgACAAAAFAAAAGaHaQAEAAAAAQAAAHoAAAAAAAAASAAAAAEAAABIAAAAATIwMjE6MDU6MjUgMTg6MTE6NTQAAAKgAgAEAAAAAQAAAB6gAwAEAAAAAQAAAEYAAAAASCyRNQAAAAlwSFlzAAALEwAACxMBAJqcGAAABklpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDYuMC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6ZXhpZj0iaHR0cDovL25zLmFkb2JlLmNvbS9leGlmLzEuMC8iCiAgICAgICAgICAgIHhtbG5zOnRpZmY9Imh0dHA6Ly9ucy5hZG9iZS5jb20vdGlmZi8xLjAvIgogICAgICAgICAgICB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIKICAgICAgICAgICAgeG1sbnM6c3RFdnQ9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZUV2ZW50IyIKICAgICAgICAgICAgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIgogICAgICAgICAgICB4bWxuczpwaG90b3Nob3A9Imh0dHA6Ly9ucy5hZG9iZS5jb20vcGhvdG9zaG9wLzEuMC8iPgogICAgICAgICA8ZXhpZjpDb2xvclNwYWNlPjE8L2V4aWY6Q29sb3JTcGFjZT4KICAgICAgICAgPGV4aWY6UGl4ZWxYRGltZW5zaW9uPjMwMDwvZXhpZjpQaXhlbFhEaW1lbnNpb24+CiAgICAgICAgIDxleGlmOlBpeGVsWURpbWVuc2lvbj43MDwvZXhpZjpQaXhlbFlEaW1lbnNpb24+CiAgICAgICAgIDx0aWZmOkltYWdlV2lkdGg+MzAwPC90aWZmOkltYWdlV2lkdGg+CiAgICAgICAgIDx0aWZmOlJlc29sdXRpb25Vbml0PjI8L3RpZmY6UmVzb2x1dGlvblVuaXQ+CiAgICAgICAgIDx0aWZmOkltYWdlTGVuZ3RoPjcwPC90aWZmOkltYWdlTGVuZ3RoPgogICAgICAgICA8dGlmZjpPcmllbnRhdGlvbj4xPC90aWZmOk9yaWVudGF0aW9uPgogICAgICAgICA8eG1wTU06SGlzdG9yeT4KICAgICAgICAgICAgPHJkZjpTZXE+CiAgICAgICAgICAgICAgIDxyZGY6bGkgcmRmOnBhcnNlVHlwZT0iUmVzb3VyY2UiPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6c29mdHdhcmVBZ2VudD5BZmZpbml0eSBEZXNpZ25lciAxLjkuMzwvc3RFdnQ6c29mdHdhcmVBZ2VudD4KICAgICAgICAgICAgICAgICAgPHN0RXZ0OmFjdGlvbj5wcm9kdWNlZDwvc3RFdnQ6YWN0aW9uPgogICAgICAgICAgICAgICAgICA8c3RFdnQ6d2hlbj4yMDIxLTA1LTI1VDE4OjExOjU0KzAyOjAwPC9zdEV2dDp3aGVuPgogICAgICAgICAgICAgICA8L3JkZjpsaT4KICAgICAgICAgICAgPC9yZGY6U2VxPgogICAgICAgICA8L3htcE1NOkhpc3Rvcnk+CiAgICAgICAgIDx4bXA6TW9kaWZ5RGF0ZT4yMDIxLTA1LTI1VDE4OjExOjU0KzAyOjAwPC94bXA6TW9kaWZ5RGF0ZT4KICAgICAgICAgPHhtcDpNZXRhZGF0YURhdGU+MjAyMS0wNS0yNVQxODoxMTo1NCswMjowMDwveG1wOk1ldGFkYXRhRGF0ZT4KICAgICAgICAgPHBob3Rvc2hvcDpJQ0NQcm9maWxlPnNSR0IgSUVDNjE5NjYtMi4xPC9waG90b3Nob3A6SUNDUHJvZmlsZT4KICAgICAgICAgPHBob3Rvc2hvcDpDb2xvck1vZGU+MzwvcGhvdG9zaG9wOkNvbG9yTW9kZT4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+Cox8CL8AAAOgSURBVGgF7Vo9aBRBFH5vE1ES410kgqKFYiwUBdEEtBEEY5FLxCIWaqWNP6U2dqZICkGx1kJBUCsVuds0SRoLUYwQUCIooqLGiHC581AJudvxvdtsbrM3t/cmm+v2wdzMvPe9982+mYWZnUPwJD3dAtg6DKBOkGqzp9bUX0DBBCC8AnBs6Fv/VoOpq8JFRCb/lEiPLfZljSIgDkHLumE4jEWZi4tyiTPZ3QDWGxPHAHYCVPE49Hd8D+hrdq2yRcG2mgiZoQuw+a4M6qJc4qZVL6irTBw12B6wc+c0eq3KJe5t+0VzdVOLMFEquA6j2YTExSVmZCpxmX4vUhmnFfuV6m9UClRMZC3MWd0Sh8qq1qGVQrDz+8h0mwrXErkCfclr9YCVJ9YhERUFeU2mI7QEfuggGl2XRlelCif24H3JWQC843XDa9wYbnetMmLGIk5JAkoxcmJHlaRBJTg5sSSaASYmNkhWNGic6mj5M/COU22QrGjQONXR8mfgHac6JFlqLsRobJKnurnpnSy6s12CkxO/bPtAAf/VD4qbIJOjzWG4yIkH0aGzxv3wcJ5V3QN79pDX09Xh++qgx0hhAzil96ROBk01+pwlLjO0WRynQ8MDD2dGzF7pbD+g9ZBarV4Qca3gEfQnBxhvTsxe9uxeUPiEWlu5aySIp/nJ5XPsj55qn4S/iU4a9lEqfDydpEKbfoEo8iFZHjF7TtFSU6pIv/PU468B0n13+TjczDGMxc7uAZV/TDPVaeyLMMo+5k+czveCsp6TrzkpL66FlW22uNK/OwAdfp3aedQC8b9OY0TKb0NZzFKNzhB5CUhxmgZ4ElLtzxZ4qir5Ew8qC7ry/IWgpSpKtaKHztVj1eqKRj7H3QWeUwEpHeDrkDK9nBhKOyvjDWtZH8Osnk1O7OAaz2klajnxSrD5YsTEvmQ0thmnurH59UWPU+1LRmObcaobm19f9DjVvmQEmhY2BTSRuvJUK7UrElPAWUacydHOUp0N+NboqpkahiXqcGK+/snk9pMH7RjpwC2TCQls6b46k7tAZ6EB2gLuoJrvnPjWrE0SyIfh66K6UiG28zfoEHaJ6KLcMhZgtUP3yvXF3dC7J/2fBJdv8HWxEc5DKnlLZwrq3DkuzR+ITAp0ChSS8iBcYoRPwREZ9vni+oyJj0tcvudHuqo3FjqU41VoTRw0uS1nlsriUn9OLfw5gT+ObAkZwmey0RPSnxPQGVnunxP+A4MGyxoOtdJvAAAAAElFTkSuQmCC'; - await visualDiff(div, 'aspect-ratio'); - }); - - it('avatar-size', async () => { - element.style.setProperty('--vaadin-avatar-size', '45px'); - await visualDiff(div, 'avatar-size'); - }); -}); diff --git a/packages/avatar/test/visual/material/screenshots/avatar/baseline/abbr.png b/packages/avatar/test/visual/material/screenshots/avatar/baseline/abbr.png deleted file mode 100644 index 2d3ac4da3a2..00000000000 Binary files a/packages/avatar/test/visual/material/screenshots/avatar/baseline/abbr.png and /dev/null differ diff --git a/packages/avatar/test/visual/material/screenshots/avatar/baseline/aspect-ratio.png b/packages/avatar/test/visual/material/screenshots/avatar/baseline/aspect-ratio.png deleted file mode 100644 index f3ec41300a2..00000000000 Binary files a/packages/avatar/test/visual/material/screenshots/avatar/baseline/aspect-ratio.png and /dev/null differ diff --git a/packages/avatar/test/visual/material/screenshots/avatar/baseline/avatar-size.png b/packages/avatar/test/visual/material/screenshots/avatar/baseline/avatar-size.png deleted file mode 100644 index 35bcb39fe82..00000000000 Binary files a/packages/avatar/test/visual/material/screenshots/avatar/baseline/avatar-size.png and /dev/null differ diff --git a/packages/avatar/test/visual/material/screenshots/avatar/baseline/basic.png b/packages/avatar/test/visual/material/screenshots/avatar/baseline/basic.png deleted file mode 100644 index 643a29882b7..00000000000 Binary files a/packages/avatar/test/visual/material/screenshots/avatar/baseline/basic.png and /dev/null differ diff --git a/packages/avatar/test/visual/material/screenshots/avatar/baseline/color-index.png b/packages/avatar/test/visual/material/screenshots/avatar/baseline/color-index.png deleted file mode 100644 index 45d3f70dfec..00000000000 Binary files a/packages/avatar/test/visual/material/screenshots/avatar/baseline/color-index.png and /dev/null differ diff --git a/packages/avatar/test/visual/material/screenshots/avatar/baseline/img.png b/packages/avatar/test/visual/material/screenshots/avatar/baseline/img.png deleted file mode 100644 index 14c2ceb94ac..00000000000 Binary files a/packages/avatar/test/visual/material/screenshots/avatar/baseline/img.png and /dev/null differ diff --git a/packages/avatar/test/visual/material/screenshots/avatar/baseline/name.png b/packages/avatar/test/visual/material/screenshots/avatar/baseline/name.png deleted file mode 100644 index c90169ce53c..00000000000 Binary files a/packages/avatar/test/visual/material/screenshots/avatar/baseline/name.png and /dev/null differ diff --git a/packages/avatar/test/visual/material/screenshots/avatar/baseline/theme-large.png b/packages/avatar/test/visual/material/screenshots/avatar/baseline/theme-large.png deleted file mode 100644 index 0d81c1e59bf..00000000000 Binary files a/packages/avatar/test/visual/material/screenshots/avatar/baseline/theme-large.png and /dev/null differ diff --git a/packages/avatar/test/visual/material/screenshots/avatar/baseline/theme-small.png b/packages/avatar/test/visual/material/screenshots/avatar/baseline/theme-small.png deleted file mode 100644 index 91569071192..00000000000 Binary files a/packages/avatar/test/visual/material/screenshots/avatar/baseline/theme-small.png and /dev/null differ diff --git a/packages/avatar/test/visual/material/screenshots/avatar/baseline/theme-xlarge.png b/packages/avatar/test/visual/material/screenshots/avatar/baseline/theme-xlarge.png deleted file mode 100644 index 3a6dd76ca26..00000000000 Binary files a/packages/avatar/test/visual/material/screenshots/avatar/baseline/theme-xlarge.png and /dev/null differ diff --git a/packages/avatar/test/visual/material/screenshots/avatar/baseline/theme-xsmall.png b/packages/avatar/test/visual/material/screenshots/avatar/baseline/theme-xsmall.png deleted file mode 100644 index 71bed9504d7..00000000000 Binary files a/packages/avatar/test/visual/material/screenshots/avatar/baseline/theme-xsmall.png and /dev/null differ diff --git a/packages/avatar/theme/material/vaadin-avatar-styles.js b/packages/avatar/theme/material/vaadin-avatar-styles.js deleted file mode 100644 index c5775b1b604..00000000000 --- a/packages/avatar/theme/material/vaadin-avatar-styles.js +++ /dev/null @@ -1,61 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import '@vaadin/vaadin-material-styles/user-colors.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const globalStyle = document.createElement('style'); -globalStyle.textContent = 'html { --vaadin-avatar-size: 2.25rem; }'; -document.head.appendChild(globalStyle); - -registerStyles( - 'vaadin-avatar', - css` - :host { - color: var(--material-secondary-text-color); - background-color: var(--material-secondary-background-color); - border-radius: 50%; - cursor: default; - outline: none; - user-select: none; - -webkit-tap-highlight-color: transparent; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - } - - :host([has-color-index]) { - color: var(--material-primary-contrast-color); - } - - :host([focus-ring]) { - border-color: var(--material-primary-color); - } - - [part='icon'], - [part='abbr'] { - fill: currentColor; - } - - [part='abbr'] { - font-family: var(--material-font-family); - font-size: 3em; - font-weight: 500; - } - - :host([theme~='xlarge']) { - --vaadin-avatar-size: 3.5rem; - } - - :host([theme~='large']) { - --vaadin-avatar-size: 2.75rem; - } - - :host([theme~='small']) { - --vaadin-avatar-size: 1.875rem; - } - - :host([theme~='xsmall']) { - --vaadin-avatar-size: 1.625rem; - } - `, - { moduleId: 'material-avatar' }, -); diff --git a/packages/avatar/theme/material/vaadin-avatar.js b/packages/avatar/theme/material/vaadin-avatar.js deleted file mode 100644 index 2422a40ec17..00000000000 --- a/packages/avatar/theme/material/vaadin-avatar.js +++ /dev/null @@ -1,3 +0,0 @@ -import '@vaadin/tooltip/theme/material/vaadin-tooltip.js'; -import './vaadin-avatar-styles.js'; -import '../../src/vaadin-avatar.js'; diff --git a/packages/avatar/theme/material/vaadin-lit-avatar.js b/packages/avatar/theme/material/vaadin-lit-avatar.js deleted file mode 100644 index 5f1b2046699..00000000000 --- a/packages/avatar/theme/material/vaadin-lit-avatar.js +++ /dev/null @@ -1,3 +0,0 @@ -import '@vaadin/tooltip/theme/material/vaadin-lit-tooltip.js'; -import './vaadin-avatar-styles.js'; -import '../../src/vaadin-lit-avatar.js'; diff --git a/packages/board/test/visual/material/board.test.js b/packages/board/test/visual/material/board.test.js deleted file mode 100644 index d62ca50dff2..00000000000 --- a/packages/board/test/visual/material/board.test.js +++ /dev/null @@ -1,36 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-board.js'; - -describe('board', () => { - let element; - - beforeEach(() => { - element = fixtureSync(` - - -
Cell 1
-
Cell 2
-
Cell 3
-
Cell 4
-
- -
Cell 5
-
Cell 6
-
Cell 7
-
- -
Cell 8
-
Cell 9
-
- -
Cell 10
-
-
- `); - }); - - it('basic', async () => { - await visualDiff(element, 'multiple-rows'); - }); -}); diff --git a/packages/board/test/visual/material/screenshots/board/baseline/multiple-rows.png b/packages/board/test/visual/material/screenshots/board/baseline/multiple-rows.png deleted file mode 100644 index 98ecba5844c..00000000000 Binary files a/packages/board/test/visual/material/screenshots/board/baseline/multiple-rows.png and /dev/null differ diff --git a/packages/board/theme/material/vaadin-board-row.js b/packages/board/theme/material/vaadin-board-row.js deleted file mode 100644 index db1f56cb54d..00000000000 --- a/packages/board/theme/material/vaadin-board-row.js +++ /dev/null @@ -1 +0,0 @@ -import '../../src/vaadin-board-row.js'; diff --git a/packages/board/theme/material/vaadin-board.js b/packages/board/theme/material/vaadin-board.js deleted file mode 100644 index 0cfdbfa2362..00000000000 --- a/packages/board/theme/material/vaadin-board.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-board-row.js'; -import '../../src/vaadin-board.js'; diff --git a/packages/board/theme/material/vaadin-lit-board-row.js b/packages/board/theme/material/vaadin-lit-board-row.js deleted file mode 100644 index adb8b76e26f..00000000000 --- a/packages/board/theme/material/vaadin-lit-board-row.js +++ /dev/null @@ -1 +0,0 @@ -import '../../src/vaadin-lit-board-row.js'; diff --git a/packages/board/theme/material/vaadin-lit-board.js b/packages/board/theme/material/vaadin-lit-board.js deleted file mode 100644 index 755bee155ad..00000000000 --- a/packages/board/theme/material/vaadin-lit-board.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-lit-board-row.js'; -import '../../src/vaadin-lit-board.js'; diff --git a/packages/button/package.json b/packages/button/package.json index 5479cd9376a..4e6346363cd 100644 --- a/packages/button/package.json +++ b/packages/button/package.json @@ -41,7 +41,6 @@ "@vaadin/a11y-base": "25.0.0-alpha0", "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/button/test/visual/material/button.test.js b/packages/button/test/visual/material/button.test.js deleted file mode 100644 index 37b4dd0cc03..00000000000 --- a/packages/button/test/visual/material/button.test.js +++ /dev/null @@ -1,110 +0,0 @@ -import { resetMouse, sendKeys, sendMouseToElement } from '@vaadin/test-runner-commands'; -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '@vaadin/icon/theme/material/vaadin-icon.js'; -import '@vaadin/vaadin-lumo-styles/vaadin-iconset.js'; -import '../../../theme/material/vaadin-button.js'; - -describe('button', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - div.style.padding = '10px'; - element = fixtureSync('Button', div); - }); - - afterEach(async () => { - await resetMouse(); - }); - - describe('basic', () => { - it('basic', async () => { - await visualDiff(div, 'basic'); - }); - - it('focus-ring', async () => { - // Focus on the button - await sendKeys({ press: 'Tab' }); - - await visualDiff(div, 'focus-ring'); - }); - - it('disabled', async () => { - element.disabled = true; - await visualDiff(div, 'disabled'); - }); - - it('flex-shrink', async () => { - const wrapper = fixtureSync(` -
- This is a button - - Sibling -
- `); - await visualDiff(wrapper, 'flex-shrink'); - }); - }); - - ['outlined', 'contained', 'text'].forEach((variant) => { - describe(variant, () => { - it(variant, async () => { - element.setAttribute('theme', `${variant}`); - await visualDiff(div, `theme-${variant}`); - }); - - it(`${variant} disabled`, async () => { - element.setAttribute('theme', `${variant}`); - element.disabled = true; - await visualDiff(div, `theme-${variant}-disabled`); - }); - - it(`${variant} hover`, async () => { - element.setAttribute('theme', `${variant}`); - await new Promise((resolve) => { - element.addEventListener('transitionend', resolve, { once: true }); - sendMouseToElement({ type: 'move', element }); - }); - await visualDiff(div, `theme-${variant}-hover`); - }); - }); - }); - - describe('icon', () => { - let icon; - - beforeEach(() => { - icon = document.createElement('vaadin-icon'); - icon.setAttribute('icon', 'lumo:plus'); - }); - - it('prefix', async () => { - icon.setAttribute('slot', 'prefix'); - element.appendChild(icon); - await visualDiff(div, 'icon-prefix'); - }); - - it('suffix', async () => { - icon.setAttribute('slot', 'suffix'); - element.appendChild(icon); - await visualDiff(div, 'icon-suffix'); - }); - - it('icon only', async () => { - element.textContent = ''; - icon.setAttribute('slot', 'prefix'); - element.appendChild(icon); - await visualDiff(div, 'icon-only'); - }); - }); - - describe('modified line-height', () => { - it('should keep label center-aligned when increasing line-height on container', async () => { - element.setAttribute('theme', 'outlined'); - div.style['line-height'] = 4; - await visualDiff(div, 'modified-line-height-label-center-aligned'); - }); - }); -}); diff --git a/packages/button/test/visual/material/screenshots/button/baseline/basic.png b/packages/button/test/visual/material/screenshots/button/baseline/basic.png deleted file mode 100644 index b9e5adf0661..00000000000 Binary files a/packages/button/test/visual/material/screenshots/button/baseline/basic.png and /dev/null differ diff --git a/packages/button/test/visual/material/screenshots/button/baseline/disabled.png b/packages/button/test/visual/material/screenshots/button/baseline/disabled.png deleted file mode 100644 index 1f3aa062509..00000000000 Binary files a/packages/button/test/visual/material/screenshots/button/baseline/disabled.png and /dev/null differ diff --git a/packages/button/test/visual/material/screenshots/button/baseline/flex-shrink.png b/packages/button/test/visual/material/screenshots/button/baseline/flex-shrink.png deleted file mode 100644 index 2a548ddbe9c..00000000000 Binary files a/packages/button/test/visual/material/screenshots/button/baseline/flex-shrink.png and /dev/null differ diff --git a/packages/button/test/visual/material/screenshots/button/baseline/focus-ring.png b/packages/button/test/visual/material/screenshots/button/baseline/focus-ring.png deleted file mode 100644 index c63dc144b5d..00000000000 Binary files a/packages/button/test/visual/material/screenshots/button/baseline/focus-ring.png and /dev/null differ diff --git a/packages/button/test/visual/material/screenshots/button/baseline/icon-only.png b/packages/button/test/visual/material/screenshots/button/baseline/icon-only.png deleted file mode 100644 index 5121067e543..00000000000 Binary files a/packages/button/test/visual/material/screenshots/button/baseline/icon-only.png and /dev/null differ diff --git a/packages/button/test/visual/material/screenshots/button/baseline/icon-prefix.png b/packages/button/test/visual/material/screenshots/button/baseline/icon-prefix.png deleted file mode 100644 index a94e4aa4f4a..00000000000 Binary files a/packages/button/test/visual/material/screenshots/button/baseline/icon-prefix.png and /dev/null differ diff --git a/packages/button/test/visual/material/screenshots/button/baseline/icon-suffix.png b/packages/button/test/visual/material/screenshots/button/baseline/icon-suffix.png deleted file mode 100644 index f1ae961d7e6..00000000000 Binary files a/packages/button/test/visual/material/screenshots/button/baseline/icon-suffix.png and /dev/null differ diff --git a/packages/button/test/visual/material/screenshots/button/baseline/modified-line-height-label-center-aligned.png b/packages/button/test/visual/material/screenshots/button/baseline/modified-line-height-label-center-aligned.png deleted file mode 100644 index 8988e8cd3df..00000000000 Binary files a/packages/button/test/visual/material/screenshots/button/baseline/modified-line-height-label-center-aligned.png and /dev/null differ diff --git a/packages/button/test/visual/material/screenshots/button/baseline/theme-contained-disabled.png b/packages/button/test/visual/material/screenshots/button/baseline/theme-contained-disabled.png deleted file mode 100644 index 1bebdd40350..00000000000 Binary files a/packages/button/test/visual/material/screenshots/button/baseline/theme-contained-disabled.png and /dev/null differ diff --git a/packages/button/test/visual/material/screenshots/button/baseline/theme-contained-hover.png b/packages/button/test/visual/material/screenshots/button/baseline/theme-contained-hover.png deleted file mode 100644 index 2d3a4004095..00000000000 Binary files a/packages/button/test/visual/material/screenshots/button/baseline/theme-contained-hover.png and /dev/null differ diff --git a/packages/button/test/visual/material/screenshots/button/baseline/theme-contained.png b/packages/button/test/visual/material/screenshots/button/baseline/theme-contained.png deleted file mode 100644 index fed8184b651..00000000000 Binary files a/packages/button/test/visual/material/screenshots/button/baseline/theme-contained.png and /dev/null differ diff --git a/packages/button/test/visual/material/screenshots/button/baseline/theme-outlined-disabled.png b/packages/button/test/visual/material/screenshots/button/baseline/theme-outlined-disabled.png deleted file mode 100644 index 7f2c67c7314..00000000000 Binary files a/packages/button/test/visual/material/screenshots/button/baseline/theme-outlined-disabled.png and /dev/null differ diff --git a/packages/button/test/visual/material/screenshots/button/baseline/theme-outlined-hover.png b/packages/button/test/visual/material/screenshots/button/baseline/theme-outlined-hover.png deleted file mode 100644 index 70cc7df9a08..00000000000 Binary files a/packages/button/test/visual/material/screenshots/button/baseline/theme-outlined-hover.png and /dev/null differ diff --git a/packages/button/test/visual/material/screenshots/button/baseline/theme-outlined.png b/packages/button/test/visual/material/screenshots/button/baseline/theme-outlined.png deleted file mode 100644 index 2a9520915ff..00000000000 Binary files a/packages/button/test/visual/material/screenshots/button/baseline/theme-outlined.png and /dev/null differ diff --git a/packages/button/test/visual/material/screenshots/button/baseline/theme-text-disabled.png b/packages/button/test/visual/material/screenshots/button/baseline/theme-text-disabled.png deleted file mode 100644 index 1f3aa062509..00000000000 Binary files a/packages/button/test/visual/material/screenshots/button/baseline/theme-text-disabled.png and /dev/null differ diff --git a/packages/button/test/visual/material/screenshots/button/baseline/theme-text-hover.png b/packages/button/test/visual/material/screenshots/button/baseline/theme-text-hover.png deleted file mode 100644 index c63dc144b5d..00000000000 Binary files a/packages/button/test/visual/material/screenshots/button/baseline/theme-text-hover.png and /dev/null differ diff --git a/packages/button/test/visual/material/screenshots/button/baseline/theme-text.png b/packages/button/test/visual/material/screenshots/button/baseline/theme-text.png deleted file mode 100644 index b9e5adf0661..00000000000 Binary files a/packages/button/test/visual/material/screenshots/button/baseline/theme-text.png and /dev/null differ diff --git a/packages/button/theme/material/vaadin-button-styles.js b/packages/button/theme/material/vaadin-button-styles.js deleted file mode 100644 index a461353885a..00000000000 --- a/packages/button/theme/material/vaadin-button-styles.js +++ /dev/null @@ -1,169 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/shadow.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const button = css` - :host { - padding: 8px; - min-width: 64px; - box-sizing: border-box; - display: inline-flex; - align-items: baseline; - justify-content: center; - border-radius: 4px; - color: var(--material-primary-text-color); - font-family: var(--material-font-family); - text-transform: uppercase; - font-size: var(--material-button-font-size); - line-height: 20px; - font-weight: 500; - letter-spacing: 0.05em; - white-space: nowrap; - overflow: hidden; - transition: box-shadow 0.2s; - -webkit-tap-highlight-color: transparent; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - flex-shrink: 0; - } - - :host::before, - :host::after { - content: ''; - pointer-events: none; - position: absolute; - border-radius: inherit; - opacity: 0; - background-color: currentColor; - } - - :host::before { - width: 100%; - height: 100%; - top: 0; - left: 0; - transition: opacity 0.5s; - } - - :host::after { - border-radius: 50%; - width: 320px; - height: 320px; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - transition: all 0.9s; - } - - [part='label'] ::slotted(*) { - vertical-align: middle; - } - - :host(:hover:not([disabled]))::before, - :host([focus-ring])::before { - opacity: 0.08; - transition-duration: 0.2s; - } - - :host([active])::before { - opacity: 0.16; - transition: opacity 0.4s; - } - - :host([active])::after { - transform: translate(-50%, -50%) scale(0.0000001); /* animation works weirdly with scale(0) */ - opacity: 0.1; - transition: 0s; - } - - :host(:hover:not([active]):not([disabled]))::after { - transform: translate(-50%, -50%) scale(1); - opacity: 0; - } - - :host([disabled]) { - color: var(--material-disabled-text-color); - } - - /* Contained and outline variants */ - :host([theme~='contained']), - :host([theme~='outlined']) { - padding: 8px 16px; - } - - :host([theme~='outlined']) { - box-shadow: inset 0 0 0 1px var(--_material-button-outline-color, rgba(0, 0, 0, 0.2)); - } - - :host([theme~='contained']:not([disabled])) { - background-color: var(--material-primary-color); - color: var(--material-primary-contrast-color); - box-shadow: var(--material-shadow-elevation-2dp); - } - - :host([theme~='contained'][disabled]) { - background-color: var(--material-secondary-background-color); - } - - :host([theme~='contained']:not([disabled]):hover) { - box-shadow: var(--material-shadow-elevation-4dp); - } - - :host([theme~='contained'][active]) { - box-shadow: var(--material-shadow-elevation-8dp); - } - - /* Icon alignment */ - - [part] ::slotted(vaadin-icon) { - display: block; - width: 18px; - height: 18px; - } - - [part='prefix'] ::slotted(vaadin-icon) { - margin-right: 8px; - margin-left: -4px; - } - - [part='suffix'] ::slotted(vaadin-icon) { - margin-left: 8px; - margin-right: -4px; - } - - /* RTL specific styles */ - - :host([dir='rtl'])::before { - left: auto; - right: 0; - } - - :host([dir='rtl'])::after { - left: auto; - right: 50%; - transform: translate(50%, -50%); - } - - :host([active][dir='rtl'])::after { - transform: translate(50%, -50%) scale(0.0000001); - } - - :host(:hover:not([active]):not([disabled])[dir='rtl'])::after { - transform: translate(50%, -50%) scale(1); - } - - :host([dir='rtl']) [part='prefix'] ::slotted(vaadin-icon) { - margin-right: -4px; - margin-left: 8px; - } - - :host([dir='rtl']) [part='suffix'] ::slotted(vaadin-icon) { - margin-left: -4px; - margin-right: 8px; - } -`; - -registerStyles('vaadin-button', button, { moduleId: 'material-button' }); - -export { button }; diff --git a/packages/button/theme/material/vaadin-button.js b/packages/button/theme/material/vaadin-button.js deleted file mode 100644 index 2fc97517cb6..00000000000 --- a/packages/button/theme/material/vaadin-button.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-button-styles.js'; -import '../../src/vaadin-button.js'; diff --git a/packages/button/theme/material/vaadin-lit-button.js b/packages/button/theme/material/vaadin-lit-button.js deleted file mode 100644 index 87549d0f5cc..00000000000 --- a/packages/button/theme/material/vaadin-lit-button.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-button-styles.js'; -import '../../src/vaadin-lit-button.js'; diff --git a/packages/card/package.json b/packages/card/package.json index 2423f5f41d9..6467feaa46b 100644 --- a/packages/card/package.json +++ b/packages/card/package.json @@ -36,7 +36,6 @@ "dependencies": { "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/card/test/visual/material/card.test.js b/packages/card/test/visual/material/card.test.js deleted file mode 100644 index 50eeb112c7d..00000000000 --- a/packages/card/test/visual/material/card.test.js +++ /dev/null @@ -1,214 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-card.js'; -import '@vaadin/button/theme/material/vaadin-button.js'; -import '@vaadin/vaadin-material-styles/color-global.js'; -import '@vaadin/vaadin-material-styles/typography-global.js'; -import '@vaadin/icon'; -import '@vaadin/icons'; -import '@vaadin/avatar/theme/material/vaadin-avatar.js'; - -window.Vaadin ||= {}; -window.Vaadin.featureFlags ||= {}; -window.Vaadin.featureFlags.cardComponent = true; - -const content = '
Content
'; -const title = '
Title
'; -const subTitle = '
Subtitle
'; -const header = '
Header
'; -const avatar = ''; -const suffix = '
Suffix
'; -const button = 'Button'; -const image = ''; - -const complexCard = ` - ${image} - ${title} - ${subTitle} - ${suffix} -
Content lorem ipsum dolor sit amet.
- ${button} -
`; - -const complexCardWithIcon = ` - - ${title} - ${subTitle} - ${suffix} -
Content lorem ipsum dolor sit amet.
- ${button} -
`; - -describe('card', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - div.style.padding = '20px'; - }); - - const cardFixture = (content) => fixtureSync(`${content}`, div); - - describe('slot', () => { - it('content', async () => { - element = cardFixture(content); - await visualDiff(div, 'slot-content'); - }); - - it('title', async () => { - element = cardFixture(title); - await visualDiff(div, 'slot-title'); - }); - - it('string title', async () => { - element = cardFixture(); - element.cardTitle = 'Title lorem ipsum'; - await visualDiff(div, 'string-title'); - }); - - it('subtitle', async () => { - element = cardFixture(subTitle); - await visualDiff(div, 'slot-subtitle'); - }); - - it('title-subtitle', async () => { - element = cardFixture(`${avatar}${title}${subTitle}`); - await visualDiff(div, 'slot-title-subtitle'); - }); - - it('title-subtitle-header', async () => { - element = cardFixture(`${avatar}${header}${title}${subTitle}`); - await visualDiff(div, 'slot-title-subtitle-header'); - }); - - it('header', async () => { - element = cardFixture(header); - await visualDiff(div, 'slot-header'); - }); - - it('header-prefix', async () => { - element = cardFixture('
Prefix
'); - await visualDiff(div, 'slot-header-prefix'); - }); - - it('header-suffix', async () => { - element = cardFixture(suffix); - await visualDiff(div, 'slot-header-suffix'); - }); - - it('footer', async () => { - element = cardFixture('
Footer
'); - await visualDiff(div, 'slot-footer'); - }); - - it('media', async () => { - element = cardFixture(image); - await new Promise((resolve) => { - element.querySelector('img').onload = async () => { - await visualDiff(div, 'slot-media'); - resolve(); - }; - }); - }); - - it('multiple', async () => { - element = fixtureSync(complexCard, div); - await new Promise((resolve) => { - element.querySelector('img').onload = async () => { - await visualDiff(div, 'slot-multiple'); - resolve(); - }; - }); - }); - }); - - describe('theme', () => { - it('outlined', async () => { - element = cardFixture(content); - element.setAttribute('theme', 'outlined'); - await visualDiff(div, 'theme-outlined'); - }); - - it('elevated', async () => { - element = cardFixture(content); - div.style.setProperty('background', 'var(--material-secondary-background-color)'); - element.setAttribute('theme', 'elevated'); - await visualDiff(div, 'theme-elevated'); - }); - - it('outlined-elevated', async () => { - element = cardFixture(content); - div.style.setProperty('background', 'var(--material-secondary-background-color)'); - element.setAttribute('theme', 'outlined elevated'); - await visualDiff(div, 'theme-outlined-elevated'); - }); - - it('stretch-media', async () => { - element = fixtureSync(complexCard, div); - element.setAttribute('theme', 'stretch-media'); - element.style.setProperty('width', '300px'); - await new Promise((resolve) => { - element.querySelector('img').onload = async () => { - await visualDiff(div, 'theme-media-stretch'); - resolve(); - }; - }); - }); - - it('cover-media-image', async () => { - element = fixtureSync(complexCard, div); - element.setAttribute('theme', 'cover-media'); - element.style.setProperty('width', '300px'); - await new Promise((resolve) => { - element.querySelector('img').onload = async () => { - await visualDiff(div, 'theme-media-cover-image'); - resolve(); - }; - }); - }); - - it('cover-media-icon', async () => { - element = fixtureSync(complexCardWithIcon, div); - element.setAttribute('theme', 'cover-media'); - element.style.setProperty('width', '300px'); - await visualDiff(div, 'theme-media-cover-icon'); - }); - - it('horizontal', async () => { - element = fixtureSync(complexCard, div); - element.setAttribute('theme', 'horizontal'); - element.style.setProperty('width', '400px'); - await new Promise((resolve) => { - element.querySelector('img').onload = async () => { - await visualDiff(div, 'theme-horizontal'); - resolve(); - }; - }); - }); - - it('horizontal-cover-media', async () => { - element = fixtureSync(complexCard, div); - element.setAttribute('theme', 'horizontal cover-media'); - element.style.setProperty('width', '400px'); - await new Promise((resolve) => { - element.querySelector('img').onload = async () => { - await visualDiff(div, 'theme-horizontal-media-cover'); - resolve(); - }; - }); - }); - - it('horizontal-stretch-media', async () => { - element = fixtureSync(complexCard, div); - element.setAttribute('theme', 'horizontal stretch-media'); - element.style.setProperty('width', '400px'); - await new Promise((resolve) => { - element.querySelector('img').onload = async () => { - await visualDiff(div, 'theme-horizontal-media-stretch'); - resolve(); - }; - }); - }); - }); -}); diff --git a/packages/card/test/visual/material/screenshots/card/baseline/slot-content.png b/packages/card/test/visual/material/screenshots/card/baseline/slot-content.png deleted file mode 100644 index a0f9018b9f5..00000000000 Binary files a/packages/card/test/visual/material/screenshots/card/baseline/slot-content.png and /dev/null differ diff --git a/packages/card/test/visual/material/screenshots/card/baseline/slot-footer.png b/packages/card/test/visual/material/screenshots/card/baseline/slot-footer.png deleted file mode 100644 index 569bc152942..00000000000 Binary files a/packages/card/test/visual/material/screenshots/card/baseline/slot-footer.png and /dev/null differ diff --git a/packages/card/test/visual/material/screenshots/card/baseline/slot-header-prefix.png b/packages/card/test/visual/material/screenshots/card/baseline/slot-header-prefix.png deleted file mode 100644 index 1adfbba2c2b..00000000000 Binary files a/packages/card/test/visual/material/screenshots/card/baseline/slot-header-prefix.png and /dev/null differ diff --git a/packages/card/test/visual/material/screenshots/card/baseline/slot-header-suffix.png b/packages/card/test/visual/material/screenshots/card/baseline/slot-header-suffix.png deleted file mode 100644 index 4052b4e15f3..00000000000 Binary files a/packages/card/test/visual/material/screenshots/card/baseline/slot-header-suffix.png and /dev/null differ diff --git a/packages/card/test/visual/material/screenshots/card/baseline/slot-header.png b/packages/card/test/visual/material/screenshots/card/baseline/slot-header.png deleted file mode 100644 index 963e8fa69a2..00000000000 Binary files a/packages/card/test/visual/material/screenshots/card/baseline/slot-header.png and /dev/null differ diff --git a/packages/card/test/visual/material/screenshots/card/baseline/slot-media.png b/packages/card/test/visual/material/screenshots/card/baseline/slot-media.png deleted file mode 100644 index 4f47f20df30..00000000000 Binary files a/packages/card/test/visual/material/screenshots/card/baseline/slot-media.png and /dev/null differ diff --git a/packages/card/test/visual/material/screenshots/card/baseline/slot-multiple.png b/packages/card/test/visual/material/screenshots/card/baseline/slot-multiple.png deleted file mode 100644 index 5c673290ca3..00000000000 Binary files a/packages/card/test/visual/material/screenshots/card/baseline/slot-multiple.png and /dev/null differ diff --git a/packages/card/test/visual/material/screenshots/card/baseline/slot-subtitle.png b/packages/card/test/visual/material/screenshots/card/baseline/slot-subtitle.png deleted file mode 100644 index c62f871ec52..00000000000 Binary files a/packages/card/test/visual/material/screenshots/card/baseline/slot-subtitle.png and /dev/null differ diff --git a/packages/card/test/visual/material/screenshots/card/baseline/slot-title-subtitle-header.png b/packages/card/test/visual/material/screenshots/card/baseline/slot-title-subtitle-header.png deleted file mode 100644 index 52e3ceedc25..00000000000 Binary files a/packages/card/test/visual/material/screenshots/card/baseline/slot-title-subtitle-header.png and /dev/null differ diff --git a/packages/card/test/visual/material/screenshots/card/baseline/slot-title-subtitle.png b/packages/card/test/visual/material/screenshots/card/baseline/slot-title-subtitle.png deleted file mode 100644 index 5f60b911b73..00000000000 Binary files a/packages/card/test/visual/material/screenshots/card/baseline/slot-title-subtitle.png and /dev/null differ diff --git a/packages/card/test/visual/material/screenshots/card/baseline/slot-title.png b/packages/card/test/visual/material/screenshots/card/baseline/slot-title.png deleted file mode 100644 index 348588e0d19..00000000000 Binary files a/packages/card/test/visual/material/screenshots/card/baseline/slot-title.png and /dev/null differ diff --git a/packages/card/test/visual/material/screenshots/card/baseline/string-title.png b/packages/card/test/visual/material/screenshots/card/baseline/string-title.png deleted file mode 100644 index b263088713c..00000000000 Binary files a/packages/card/test/visual/material/screenshots/card/baseline/string-title.png and /dev/null differ diff --git a/packages/card/test/visual/material/screenshots/card/baseline/theme-elevated.png b/packages/card/test/visual/material/screenshots/card/baseline/theme-elevated.png deleted file mode 100644 index 4a5651cac30..00000000000 Binary files a/packages/card/test/visual/material/screenshots/card/baseline/theme-elevated.png and /dev/null differ diff --git a/packages/card/test/visual/material/screenshots/card/baseline/theme-horizontal-media-cover.png b/packages/card/test/visual/material/screenshots/card/baseline/theme-horizontal-media-cover.png deleted file mode 100644 index f071bf4143d..00000000000 Binary files a/packages/card/test/visual/material/screenshots/card/baseline/theme-horizontal-media-cover.png and /dev/null differ diff --git a/packages/card/test/visual/material/screenshots/card/baseline/theme-horizontal-media-stretch.png b/packages/card/test/visual/material/screenshots/card/baseline/theme-horizontal-media-stretch.png deleted file mode 100644 index 9110a75ce96..00000000000 Binary files a/packages/card/test/visual/material/screenshots/card/baseline/theme-horizontal-media-stretch.png and /dev/null differ diff --git a/packages/card/test/visual/material/screenshots/card/baseline/theme-horizontal.png b/packages/card/test/visual/material/screenshots/card/baseline/theme-horizontal.png deleted file mode 100644 index 60262c0e803..00000000000 Binary files a/packages/card/test/visual/material/screenshots/card/baseline/theme-horizontal.png and /dev/null differ diff --git a/packages/card/test/visual/material/screenshots/card/baseline/theme-media-cover-icon.png b/packages/card/test/visual/material/screenshots/card/baseline/theme-media-cover-icon.png deleted file mode 100644 index 32a9bc31908..00000000000 Binary files a/packages/card/test/visual/material/screenshots/card/baseline/theme-media-cover-icon.png and /dev/null differ diff --git a/packages/card/test/visual/material/screenshots/card/baseline/theme-media-cover-image.png b/packages/card/test/visual/material/screenshots/card/baseline/theme-media-cover-image.png deleted file mode 100644 index 6171b85e818..00000000000 Binary files a/packages/card/test/visual/material/screenshots/card/baseline/theme-media-cover-image.png and /dev/null differ diff --git a/packages/card/test/visual/material/screenshots/card/baseline/theme-media-stretch.png b/packages/card/test/visual/material/screenshots/card/baseline/theme-media-stretch.png deleted file mode 100644 index 89ae9288472..00000000000 Binary files a/packages/card/test/visual/material/screenshots/card/baseline/theme-media-stretch.png and /dev/null differ diff --git a/packages/card/test/visual/material/screenshots/card/baseline/theme-outlined-elevated.png b/packages/card/test/visual/material/screenshots/card/baseline/theme-outlined-elevated.png deleted file mode 100644 index dafd32065eb..00000000000 Binary files a/packages/card/test/visual/material/screenshots/card/baseline/theme-outlined-elevated.png and /dev/null differ diff --git a/packages/card/test/visual/material/screenshots/card/baseline/theme-outlined.png b/packages/card/test/visual/material/screenshots/card/baseline/theme-outlined.png deleted file mode 100644 index 18c1bead02c..00000000000 Binary files a/packages/card/test/visual/material/screenshots/card/baseline/theme-outlined.png and /dev/null differ diff --git a/packages/card/theme/material/vaadin-card-styles.js b/packages/card/theme/material/vaadin-card-styles.js deleted file mode 100644 index b036a5a055e..00000000000 --- a/packages/card/theme/material/vaadin-card-styles.js +++ /dev/null @@ -1,63 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/shadow.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import { addGlobalThemeStyles, css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; - -const cardProps = css` - html { - --vaadin-card-background: var(--material-secondary-background-color); - --vaadin-card-border-radius: 8px; - --vaadin-card-border-width: 0; - --vaadin-card-border-color: var(--material-divider-color); - --vaadin-card-padding: 16px; - --vaadin-card-gap: 16px; - } -`; - -addGlobalThemeStyles('card-props', cardProps); - -const card = css` - :host { - background: var(--vaadin-card-background); - border-radius: var(--vaadin-card-border-radius); - box-shadow: var(--vaadin-card-box-shadow); - position: relative; - } - - /* Could be an inset outline on the host as well, but rounded outlines only work since Safari 16.4 */ - :host::before { - content: ''; - position: absolute; - inset: 0; - pointer-events: none; - border-radius: inherit; - border: var(--vaadin-card-border, var(--vaadin-card-border-width) solid var(--vaadin-card-border-color)); - } - - :host([theme~='outlined']) { - --vaadin-card-border-width: 1px; - --vaadin-card-background: transparent; - } - - :host([theme~='elevated']) { - --vaadin-card-background: var(--material-background-color); - --vaadin-card-box-shadow: var(--material-shadow-elevation-2dp); - } - - :host(:where([theme~='stretch-media'])) ::slotted([slot='media']:is(img, video, svg, vaadin-icon)) { - border-radius: 4px; - } - - ::slotted([slot='title']) { - font-size: var(--material-h6-font-size); - font-weight: 700; - } - - ::slotted([slot='subtitle']) { - color: var(--material-secondary-text-color); - } -`; - -registerStyles('vaadin-card', card, { moduleId: 'material-card' }); - -export { card }; diff --git a/packages/card/theme/material/vaadin-card.js b/packages/card/theme/material/vaadin-card.js deleted file mode 100644 index e3164eb32ba..00000000000 --- a/packages/card/theme/material/vaadin-card.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-card-styles.js'; -import '../../src/vaadin-card.js'; diff --git a/packages/charts/package.json b/packages/charts/package.json index 3744c1cec40..c6de01efb9a 100644 --- a/packages/charts/package.json +++ b/packages/charts/package.json @@ -39,7 +39,6 @@ "@polymer/polymer": "^3.0.0", "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "highcharts": "9.2.2", "lit": "^3.0.0" diff --git a/packages/charts/test/visual/material/chart.test.js b/packages/charts/test/visual/material/chart.test.js deleted file mode 100644 index 6ca04cf51cb..00000000000 --- a/packages/charts/test/visual/material/chart.test.js +++ /dev/null @@ -1,95 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-chart.js'; - -describe('chart', () => { - let element; - - describe('empty', () => { - beforeEach(() => { - element = fixtureSync(''); - }); - - it('empty with title', async () => { - await visualDiff(element, 'empty-title'); - }); - }); - - describe('pie', () => { - beforeEach(() => { - element = fixtureSync(` - - - - `); - }); - - it('pie', async () => { - await visualDiff(element, 'pie'); - }); - - it('pie-gradient', async () => { - element.setAttribute('theme', 'gradient'); - await visualDiff(element, 'pie-gradient'); - }); - - it('pie-monotone', async () => { - element.setAttribute('theme', 'monotone'); - await visualDiff(element, 'pie-monotone'); - }); - - it('pie-classic', async () => { - element.setAttribute('theme', 'classic'); - await visualDiff(element, 'pie-classic'); - }); - }); -}); diff --git a/packages/charts/test/visual/material/screenshots/chart/baseline/empty-title.png b/packages/charts/test/visual/material/screenshots/chart/baseline/empty-title.png deleted file mode 100644 index b36695e59fc..00000000000 Binary files a/packages/charts/test/visual/material/screenshots/chart/baseline/empty-title.png and /dev/null differ diff --git a/packages/charts/test/visual/material/screenshots/chart/baseline/pie-classic.png b/packages/charts/test/visual/material/screenshots/chart/baseline/pie-classic.png deleted file mode 100644 index c35ac42ae92..00000000000 Binary files a/packages/charts/test/visual/material/screenshots/chart/baseline/pie-classic.png and /dev/null differ diff --git a/packages/charts/test/visual/material/screenshots/chart/baseline/pie-gradient.png b/packages/charts/test/visual/material/screenshots/chart/baseline/pie-gradient.png deleted file mode 100644 index 937292003dd..00000000000 Binary files a/packages/charts/test/visual/material/screenshots/chart/baseline/pie-gradient.png and /dev/null differ diff --git a/packages/charts/test/visual/material/screenshots/chart/baseline/pie-monotone.png b/packages/charts/test/visual/material/screenshots/chart/baseline/pie-monotone.png deleted file mode 100644 index c2cb4506617..00000000000 Binary files a/packages/charts/test/visual/material/screenshots/chart/baseline/pie-monotone.png and /dev/null differ diff --git a/packages/charts/test/visual/material/screenshots/chart/baseline/pie.png b/packages/charts/test/visual/material/screenshots/chart/baseline/pie.png deleted file mode 100644 index dfe985f9ec9..00000000000 Binary files a/packages/charts/test/visual/material/screenshots/chart/baseline/pie.png and /dev/null differ diff --git a/packages/charts/theme/material/vaadin-chart-styles.js b/packages/charts/theme/material/vaadin-chart-styles.js deleted file mode 100644 index 07600fab6b8..00000000000 --- a/packages/charts/theme/material/vaadin-chart-styles.js +++ /dev/null @@ -1,97 +0,0 @@ -import '../vaadin-chart-base-theme.js'; -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; - -const chartColors = css` - :host { - --vaadin-charts-color-0: #6200ee; - --vaadin-charts-color-1: #2fa69a; - --vaadin-charts-color-2: #ec611f; - --vaadin-charts-color-3: #fec02f; - --vaadin-charts-color-4: #ff4193; - --vaadin-charts-color-5: #007dee; - --vaadin-charts-color-6: #b064fc; - --vaadin-charts-color-7: #0c5d56; - --vaadin-charts-color-8: #42c6ff; - --vaadin-charts-color-9: #b00020; - --vaadin-charts-color-positive: var(--vaadin-charts-color-1, #2fa69a); - --vaadin-charts-color-negative: var(--vaadin-charts-color-9, #b00020); - } - - :host([theme~='gradient']) { - --vaadin-charts-color-0: #6200ee; - --vaadin-charts-color-1: #6962e8; - --vaadin-charts-color-2: #619fe1; - --vaadin-charts-color-3: #2fbfd3; - --vaadin-charts-color-4: #03dac6; - --vaadin-charts-color-5: #5bd091; - --vaadin-charts-color-6: #acc65e; - --vaadin-charts-color-7: #ffbc2b; - --vaadin-charts-color-8: #fe9940; - --vaadin-charts-color-9: #fd695e; - --vaadin-charts-color-positive: var(--vaadin-charts-color-6); - --vaadin-charts-color-negative: var(--vaadin-charts-color-9); - } - - :host([theme~='monotone']) { - --vaadin-charts-color-0: #6200ee; - --vaadin-charts-color-1: #7f39fb; - --vaadin-charts-color-2: #985eff; - --vaadin-charts-color-3: #bb86fc; - --vaadin-charts-color-4: #dbb2ff; - --vaadin-charts-color-5: #ecddfd; - --vaadin-charts-color-6: #9fe3eb; - --vaadin-charts-color-7: #03dac6; - --vaadin-charts-color-8: #00c4b4; - --vaadin-charts-color-9: #01a299; - --vaadin-charts-color-positive: var(--vaadin-charts-color-8); - --vaadin-charts-color-negative: var(--vaadin-charts-color-0); - } - - :host([theme~='classic']) { - --vaadin-charts-color-0: #7cb5ec; - --vaadin-charts-color-1: #434348; - --vaadin-charts-color-2: #90ed7d; - --vaadin-charts-color-3: #f7a35c; - --vaadin-charts-color-4: #8085e9; - --vaadin-charts-color-5: #f15c80; - --vaadin-charts-color-6: #e4d354; - --vaadin-charts-color-7: #2b908f; - --vaadin-charts-color-8: #f45b5b; - --vaadin-charts-color-9: #91e8e1; - } -`; - -const chartTheme = css` - :host { - --vaadin-charts-background: var(--material-background-color); - --vaadin-charts-title-label: var(--material-body-text-color); - --vaadin-charts-axis-title: var(--material-secondary-text-color); - --vaadin-charts-axis-label: var(--material-secondary-text-color); - --vaadin-charts-data-label: var(--material-body-text-color); - --vaadin-charts-secondary-label: var(--material-secondary-text-color); - --vaadin-charts-axis-line: var(--vaadin-charts-contrast-5pct); - --vaadin-charts-grid-line: var(--vaadin-charts-contrast-10pct); - --vaadin-charts-disabled-label: var(--material-disabled-text-color); - --vaadin-charts-contrast: var(--material-body-text-color); - --vaadin-charts-contrast-5pct: var(--material-secondary-background-color); - --vaadin-charts-contrast-10pct: var(--material-divider-color); - --vaadin-charts-contrast-20pct: var(--material-disabled-color); - --vaadin-charts-contrast-60pct: var(--material-secondary-text-color); - --vaadin-charts-tooltip-background: var(--material-background-color); - --vaadin-charts-tooltip-border-color: var(--material-background-color); - --vaadin-charts-button-label: var(--material-primary-color); - --vaadin-charts-button-background: var(--material-background-color); - --vaadin-charts-button-hover-background: var(--material-secondary-background-color); - --vaadin-charts-button-active-label: var(--material-primary-contrast-color); - --vaadin-charts-button-active-background: var(--material-primary-color); - --vaadin-charts-xaxis-line-width: 0; - --vaadin-charts-tooltip-background-opacity: 1; - font-family: var(--material-font-family); - } -`; - -registerStyles('vaadin-chart', [chartColors, chartTheme], { moduleId: 'material-chart' }); - -export { chartColors, chartTheme }; diff --git a/packages/charts/theme/material/vaadin-chart.js b/packages/charts/theme/material/vaadin-chart.js deleted file mode 100644 index 2227dcb5966..00000000000 --- a/packages/charts/theme/material/vaadin-chart.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-chart-styles.js'; -import '../../src/vaadin-chart.js'; diff --git a/packages/charts/theme/material/vaadin-lit-chart.js b/packages/charts/theme/material/vaadin-lit-chart.js deleted file mode 100644 index 30b439e42f9..00000000000 --- a/packages/charts/theme/material/vaadin-lit-chart.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-chart-styles.js'; -import '../../src/vaadin-lit-chart.js'; diff --git a/packages/checkbox-group/package.json b/packages/checkbox-group/package.json index 225cd621adc..bfd40f22ae6 100644 --- a/packages/checkbox-group/package.json +++ b/packages/checkbox-group/package.json @@ -42,7 +42,6 @@ "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/field-base": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/checkbox-group/test/visual/material/checkbox-group.test.js b/packages/checkbox-group/test/visual/material/checkbox-group.test.js deleted file mode 100644 index 17f3c3571a6..00000000000 --- a/packages/checkbox-group/test/visual/material/checkbox-group.test.js +++ /dev/null @@ -1,133 +0,0 @@ -import { sendKeys } from '@vaadin/test-runner-commands'; -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../common.js'; -import '../../../theme/material/vaadin-checkbox-group.js'; - -describe('checkbox-group', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - div.style.padding = '10px'; - - element = fixtureSync( - ` - - - - - - `, - div, - ); - }); - - describe('default', () => { - it('basic', async () => { - await visualDiff(div, 'basic'); - }); - - it('disabled', async () => { - element.disabled = true; - await visualDiff(div, 'disabled'); - }); - - it('vertical', async () => { - element.setAttribute('theme', 'vertical'); - await visualDiff(div, 'vertical'); - }); - - it('label', async () => { - element.label = 'Label'; - await visualDiff(div, 'label'); - }); - - it('label focused', async () => { - element.label = 'Label'; - await sendKeys({ press: 'Tab' }); - await visualDiff(div, 'label-focused'); - }); - - it('label disabled', async () => { - element.label = 'Label'; - element.disabled = true; - await visualDiff(div, 'label-disabled'); - }); - - it('value', async () => { - element.value = ['a', 'c']; - await visualDiff(div, 'value'); - }); - - it('readonly', async () => { - element.readonly = true; - element.value = ['a', 'c']; - await visualDiff(div, 'readonly'); - }); - - it('required', async () => { - element.label = 'Label'; - element.required = true; - await visualDiff(div, 'required'); - }); - - it('error message', async () => { - element.label = 'Label'; - element.errorMessage = 'This field is required'; - element.required = true; - element.validate(); - await visualDiff(div, 'error-message'); - }); - - it('helper text', async () => { - element.helperText = 'Helper text'; - await visualDiff(div, 'helper-text'); - }); - - it('wrapped', async () => { - element.style.width = '150px'; - await visualDiff(div, 'wrapped'); - }); - - it('full width', async () => { - div.style.width = '300px'; - div.style.padding = '0'; - element.style.width = '100%'; - element.querySelectorAll('vaadin-checkbox').forEach((checkbox) => { - checkbox.style.width = '33%'; - // Compensate inline-block whitespace - checkbox.style.marginRight = '-3px'; - }); - await visualDiff(div, 'full-width'); - }); - }); - - describe('RTL', () => { - before(() => { - document.documentElement.setAttribute('dir', 'rtl'); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - it('RTL basic', async () => { - await visualDiff(div, 'rtl-basic'); - }); - - it('RTL error message', async () => { - element.label = 'Label'; - element.errorMessage = 'This field is required'; - element.required = true; - element.validate(); - await visualDiff(div, 'rtl-error-message'); - }); - - it('RTL wrapped', async () => { - element.style.width = '150px'; - await visualDiff(div, 'rtl-wrapped'); - }); - }); -}); diff --git a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/basic.png b/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/basic.png deleted file mode 100644 index 44b7ee698c2..00000000000 Binary files a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/basic.png and /dev/null differ diff --git a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/disabled.png b/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/disabled.png deleted file mode 100644 index 02e176cbda5..00000000000 Binary files a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/disabled.png and /dev/null differ diff --git a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/error-message.png b/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/error-message.png deleted file mode 100644 index 5968da3bfe6..00000000000 Binary files a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/error-message.png and /dev/null differ diff --git a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/full-width.png b/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/full-width.png deleted file mode 100644 index 5efee7df905..00000000000 Binary files a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/full-width.png and /dev/null differ diff --git a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/helper-text.png b/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/helper-text.png deleted file mode 100644 index 7c9580881cb..00000000000 Binary files a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/helper-text.png and /dev/null differ diff --git a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/label-disabled.png b/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/label-disabled.png deleted file mode 100644 index 31c093d25f7..00000000000 Binary files a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/label-disabled.png and /dev/null differ diff --git a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/label-focused.png b/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/label-focused.png deleted file mode 100644 index 3b4f1c0e6d1..00000000000 Binary files a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/label-focused.png and /dev/null differ diff --git a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/label.png b/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/label.png deleted file mode 100644 index b99b6af0d57..00000000000 Binary files a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/label.png and /dev/null differ diff --git a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/readonly.png b/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/readonly.png deleted file mode 100644 index b8a67f8fa2c..00000000000 Binary files a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/readonly.png and /dev/null differ diff --git a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/required.png b/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/required.png deleted file mode 100644 index f6ba100fbaf..00000000000 Binary files a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/required.png and /dev/null differ diff --git a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/rtl-basic.png b/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/rtl-basic.png deleted file mode 100644 index 238318bf19e..00000000000 Binary files a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/rtl-basic.png and /dev/null differ diff --git a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/rtl-error-message.png b/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/rtl-error-message.png deleted file mode 100644 index 69274126660..00000000000 Binary files a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/rtl-error-message.png and /dev/null differ diff --git a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/rtl-wrapped.png b/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/rtl-wrapped.png deleted file mode 100644 index 584341b3da3..00000000000 Binary files a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/rtl-wrapped.png and /dev/null differ diff --git a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/value.png b/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/value.png deleted file mode 100644 index 9f7657eff40..00000000000 Binary files a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/value.png and /dev/null differ diff --git a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/vertical.png b/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/vertical.png deleted file mode 100644 index 6125ba5af54..00000000000 Binary files a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/vertical.png and /dev/null differ diff --git a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/wrapped.png b/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/wrapped.png deleted file mode 100644 index 5c26e0c028b..00000000000 Binary files a/packages/checkbox-group/test/visual/material/screenshots/checkbox-group/baseline/wrapped.png and /dev/null differ diff --git a/packages/checkbox-group/theme/material/vaadin-checkbox-group-styles.js b/packages/checkbox-group/theme/material/vaadin-checkbox-group-styles.js deleted file mode 100644 index 9b7dcc44bfc..00000000000 --- a/packages/checkbox-group/theme/material/vaadin-checkbox-group-styles.js +++ /dev/null @@ -1,45 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import { helper } from '@vaadin/vaadin-material-styles/mixins/helper.js'; -import { requiredField } from '@vaadin/vaadin-material-styles/mixins/required-field.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const checkboxGroup = css` - :host { - display: inline-flex; - position: relative; - padding-top: 8px; - margin-bottom: 8px; - outline: none; - color: var(--material-body-text-color); - font-size: var(--material-body-font-size); - line-height: 24px; - font-family: var(--material-font-family); - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - } - - :host::before { - line-height: 32px; - } - - :host([has-label]) { - padding-top: 24px; - } - - :host([theme~='vertical']) [part='group-field'] { - flex-direction: column; - } - - :host([disabled]) [part='label'] { - color: var(--material-disabled-text-color); - -webkit-text-fill-color: var(--material-disabled-text-color); - } - - :host([focused]:not([invalid])) [part='label'] { - color: var(--material-primary-text-color); - } -`; - -registerStyles('vaadin-checkbox-group', [requiredField, helper, checkboxGroup], { - moduleId: 'material-checkbox-group', -}); diff --git a/packages/checkbox-group/theme/material/vaadin-checkbox-group.js b/packages/checkbox-group/theme/material/vaadin-checkbox-group.js deleted file mode 100644 index 26e236a4ae4..00000000000 --- a/packages/checkbox-group/theme/material/vaadin-checkbox-group.js +++ /dev/null @@ -1,3 +0,0 @@ -import '@vaadin/checkbox/theme/material/vaadin-checkbox.js'; -import './vaadin-checkbox-group-styles.js'; -import '../../src/vaadin-checkbox-group.js'; diff --git a/packages/checkbox-group/theme/material/vaadin-lit-checkbox-group.js b/packages/checkbox-group/theme/material/vaadin-lit-checkbox-group.js deleted file mode 100644 index d5ec3159032..00000000000 --- a/packages/checkbox-group/theme/material/vaadin-lit-checkbox-group.js +++ /dev/null @@ -1,3 +0,0 @@ -import '@vaadin/checkbox/theme/material/vaadin-lit-checkbox.js'; -import './vaadin-checkbox-group-styles.js'; -import '../../src/vaadin-lit-checkbox-group.js'; diff --git a/packages/checkbox/package.json b/packages/checkbox/package.json index 5ac7a015e2f..a0ce0a00ed4 100644 --- a/packages/checkbox/package.json +++ b/packages/checkbox/package.json @@ -41,7 +41,6 @@ "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/field-base": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/checkbox/test/visual/material/checkbox.test.js b/packages/checkbox/test/visual/material/checkbox.test.js deleted file mode 100644 index ee909706f86..00000000000 --- a/packages/checkbox/test/visual/material/checkbox.test.js +++ /dev/null @@ -1,156 +0,0 @@ -import { sendKeys } from '@vaadin/test-runner-commands'; -import { fixtureSync } from '@vaadin/testing-helpers'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../common.js'; -import '../../../theme/material/vaadin-checkbox.js'; - -describe('checkbox', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - div.style.padding = '10px'; - element = fixtureSync('', div); - }); - - it('basic', async () => { - await visualDiff(div, 'basic'); - }); - - it('empty', async () => { - element.label = ''; - await visualDiff(div, 'empty'); - }); - - it('checked', async () => { - element.checked = true; - await visualDiff(div, 'checked'); - }); - - it('indeterminate', async () => { - element.indeterminate = true; - await visualDiff(div, 'indeterminate'); - }); - - it('focus-ring', async () => { - await sendKeys({ press: 'Tab' }); - await visualDiff(div, 'focus-ring'); - }); - - it('checked focus-ring', async () => { - element.checked = true; - await sendKeys({ press: 'Tab' }); - await visualDiff(div, 'checked-focus-ring'); - }); - - it('required', async () => { - element.required = true; - await visualDiff(div, 'required'); - }); - - it('required empty', async () => { - element.required = true; - element.label = ''; - await visualDiff(div, 'required-empty'); - }); - - it('error message', async () => { - element.errorMessage = 'This field is required'; - element.required = true; - element.validate(); - await visualDiff(div, 'error-message'); - }); - - it('helper text', async () => { - element.helperText = 'Helper text'; - await visualDiff(div, 'helper-text'); - }); - - describe('readonly', () => { - beforeEach(() => { - element.readonly = true; - }); - - it('basic', async () => { - await visualDiff(div, 'readonly'); - }); - - it('checked', async () => { - element.checked = true; - await visualDiff(div, 'readonly-checked'); - }); - - it('checked focus-ring', async () => { - element.checked = true; - await sendKeys({ press: 'Tab' }); - await visualDiff(div, 'readonly-checked-focus-ring'); - }); - - it('indeterminate', async () => { - element.indeterminate = true; - await visualDiff(div, 'readonly-indeterminate'); - }); - }); - - describe('disabled', () => { - beforeEach(() => { - element.disabled = true; - }); - - it('basic', async () => { - await visualDiff(div, 'disabled'); - }); - - it('checked', async () => { - element.checked = true; - await visualDiff(div, 'disabled-checked'); - }); - - it('indeterminate', async () => { - element.indeterminate = true; - await visualDiff(div, 'disabled-indeterminate'); - }); - - it('required', async () => { - element.required = true; - await visualDiff(div, 'disabled-required'); - }); - - it('readonly checked', async () => { - element.readonly = true; - element.checked = true; - await visualDiff(div, 'disabled-readonly-checked'); - }); - - it('readonly indeterminate', async () => { - element.readonly = true; - element.indeterminate = true; - await visualDiff(div, 'disabled-readonly-indeterminate'); - }); - }); - - describe('RTL', () => { - before(() => { - document.documentElement.setAttribute('dir', 'rtl'); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - it('basic', async () => { - await visualDiff(div, 'rtl'); - }); - - it('empty', async () => { - element.label = ''; - await visualDiff(div, 'rtl-empty'); - }); - - it('required', async () => { - element.required = true; - await visualDiff(div, 'rtl-required'); - }); - }); -}); diff --git a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/basic.png b/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/basic.png deleted file mode 100644 index be01e8d0d11..00000000000 Binary files a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/basic.png and /dev/null differ diff --git a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/checked-focus-ring.png b/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/checked-focus-ring.png deleted file mode 100644 index 015e54a3859..00000000000 Binary files a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/checked-focus-ring.png and /dev/null differ diff --git a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/checked.png b/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/checked.png deleted file mode 100644 index 25f4d2a8d6a..00000000000 Binary files a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/checked.png and /dev/null differ diff --git a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/disabled-checked.png b/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/disabled-checked.png deleted file mode 100644 index 01d7c7c2fa7..00000000000 Binary files a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/disabled-checked.png and /dev/null differ diff --git a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/disabled-indeterminate.png b/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/disabled-indeterminate.png deleted file mode 100644 index 135d6b13fae..00000000000 Binary files a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/disabled-indeterminate.png and /dev/null differ diff --git a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/disabled-readonly-checked.png b/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/disabled-readonly-checked.png deleted file mode 100644 index 01d7c7c2fa7..00000000000 Binary files a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/disabled-readonly-checked.png and /dev/null differ diff --git a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/disabled-readonly-indeterminate.png b/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/disabled-readonly-indeterminate.png deleted file mode 100644 index 135d6b13fae..00000000000 Binary files a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/disabled-readonly-indeterminate.png and /dev/null differ diff --git a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/disabled-required.png b/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/disabled-required.png deleted file mode 100644 index 49a149d9d7e..00000000000 Binary files a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/disabled-required.png and /dev/null differ diff --git a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/disabled.png b/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/disabled.png deleted file mode 100644 index 8ce28b4bc01..00000000000 Binary files a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/disabled.png and /dev/null differ diff --git a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/empty.png b/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/empty.png deleted file mode 100644 index 77e47bfadf2..00000000000 Binary files a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/empty.png and /dev/null differ diff --git a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/error-message.png b/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/error-message.png deleted file mode 100644 index d01f729141e..00000000000 Binary files a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/error-message.png and /dev/null differ diff --git a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/focus-ring.png b/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/focus-ring.png deleted file mode 100644 index 7bab3d4815a..00000000000 Binary files a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/focus-ring.png and /dev/null differ diff --git a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/helper-text.png b/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/helper-text.png deleted file mode 100644 index 62bcc543868..00000000000 Binary files a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/helper-text.png and /dev/null differ diff --git a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/indeterminate.png b/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/indeterminate.png deleted file mode 100644 index 9f0ae8a423f..00000000000 Binary files a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/indeterminate.png and /dev/null differ diff --git a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/readonly-checked-focus-ring.png b/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/readonly-checked-focus-ring.png deleted file mode 100644 index 4370989cb41..00000000000 Binary files a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/readonly-checked-focus-ring.png and /dev/null differ diff --git a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/readonly-checked.png b/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/readonly-checked.png deleted file mode 100644 index b852caefa34..00000000000 Binary files a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/readonly-checked.png and /dev/null differ diff --git a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/readonly-indeterminate.png b/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/readonly-indeterminate.png deleted file mode 100644 index fbb1319ac4d..00000000000 Binary files a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/readonly-indeterminate.png and /dev/null differ diff --git a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/readonly.png b/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/readonly.png deleted file mode 100644 index be01e8d0d11..00000000000 Binary files a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/readonly.png and /dev/null differ diff --git a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/required-empty.png b/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/required-empty.png deleted file mode 100644 index 77e47bfadf2..00000000000 Binary files a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/required-empty.png and /dev/null differ diff --git a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/required.png b/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/required.png deleted file mode 100644 index 3bbd7ed56fc..00000000000 Binary files a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/required.png and /dev/null differ diff --git a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/rtl-empty.png b/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/rtl-empty.png deleted file mode 100644 index 77e47bfadf2..00000000000 Binary files a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/rtl-empty.png and /dev/null differ diff --git a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/rtl-required.png b/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/rtl-required.png deleted file mode 100644 index ccc605da691..00000000000 Binary files a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/rtl-required.png and /dev/null differ diff --git a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/rtl.png b/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/rtl.png deleted file mode 100644 index 6ff91fb7920..00000000000 Binary files a/packages/checkbox/test/visual/material/screenshots/checkbox/baseline/rtl.png and /dev/null differ diff --git a/packages/checkbox/theme/material/vaadin-checkbox-styles.js b/packages/checkbox/theme/material/vaadin-checkbox-styles.js deleted file mode 100644 index bc4cbbcc6cf..00000000000 --- a/packages/checkbox/theme/material/vaadin-checkbox-styles.js +++ /dev/null @@ -1,189 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-checkbox', - css` - :host { - display: inline-block; - -webkit-user-select: none; - user-select: none; - outline: none; - -webkit-tap-highlight-color: transparent; - --_checkbox-size: var(--vaadin-checkbox-size, 16px); - } - - [part='label'] { - display: flex; - position: relative; - max-width: max-content; - } - - :host([has-label]) ::slotted(label) { - padding: 3px 12px 3px 6px; - } - - [part='checkbox'] { - width: var(--_checkbox-size); - height: var(--_checkbox-size); - margin: 4px; - position: relative; - border-radius: 2px; - box-shadow: inset 0 0 0 2px var(--material-secondary-text-color); - background-color: transparent; - } - - /* Used for the ripple */ - [part='checkbox']::before { - pointer-events: none; - width: 100%; - height: 100%; - line-height: var(--_checkbox-size); - border-radius: 50%; - background-color: var(--material-disabled-text-color); - transform: scale(0); - opacity: 0; - transition: - transform 0s 0.8s, - opacity 0.8s; - will-change: transform, opacity; - } - - /* Used for the checkmark */ - [part='checkbox']::after { - content: ''; - pointer-events: none; - display: inline-block; - width: 10px; - height: 19px; - border: 0 solid var(--material-background-color); - border-width: 3px 0 0 3px; - box-sizing: border-box; - transform-origin: 0 0; - position: absolute; - top: 12px; - left: 6px; - transform: scale(0) rotate(-135deg); - transition: transform 0.2s; - } - - :host([indeterminate]) [part='checkbox'], - :host([checked]) [part='checkbox'] { - background-color: var(--material-primary-color); - box-shadow: none; - } - - :host([checked]) [part='checkbox']::after { - transform: scale(0.55) rotate(-135deg); - } - - :host(:not([checked]):not([indeterminate]):not([disabled]):hover) [part='checkbox'] { - background-color: transparent; - } - - :host([focus-ring]) [part='checkbox']::before, - :host([active]) [part='checkbox']::before { - transition-duration: 0.08s, 0.01s; - transition-delay: 0s, 0s; - transform: scale(2.5); - opacity: 0.15; - } - - :host([checked]) [part='checkbox']::before { - background-color: var(--material-primary-color); - } - - :host([indeterminate]) [part='checkbox']::after { - transform: none; - opacity: 1; - top: 45%; - height: 10%; - left: 22%; - right: 22%; - width: auto; - border: 0; - background-color: var(--material-background-color); - transition: opacity 0.4s; - } - - :host([disabled]) { - pointer-events: none; - color: var(--material-disabled-text-color); - } - - :host([disabled]) ::slotted(label) { - color: inherit; - } - - :host([disabled]:not([checked]):not([indeterminate])) [part='checkbox'] { - box-shadow: inset 0 0 0 2px var(--material-disabled-color); - } - - :host([disabled][checked]) [part='checkbox'], - :host([disabled][indeterminate]) [part='checkbox'] { - background-color: var(--material-disabled-color); - } - - :host([readonly][checked]:not([disabled])) [part='checkbox'], - :host([readonly][indeterminate]:not([disabled])) [part='checkbox'], - :host([readonly]:not([disabled])) [part='checkbox']::before { - background-color: var(--material-secondary-text-color); - } - - /* RTL specific styles */ - :host([dir='rtl'][has-label]) ::slotted(label) { - padding: 3px 6px 3px 12px; - } - - /* Required */ - :host([required]) [part='required-indicator'] { - position: absolute; - top: 3px; - right: 2px; - } - - :host([dir='rtl'][required]) [part='required-indicator'] { - right: auto; - left: 2px; - } - - :host([required]:not([disabled])) [part='required-indicator'] { - color: var(--material-secondary-text-color); - } - - :host([required]) [part='required-indicator']::after { - content: '*'; - } - - :host([invalid]) [part='required-indicator']::after { - color: var(--material-error-text-color); - } - - :host(:not([has-label])) [part='required-indicator'] { - display: none; - } - - [part='error-message'], - [part='helper-text'] { - font-size: 0.75em; - line-height: 1; - padding-left: 6px; - } - - [part='error-message'] { - color: var(--material-error-text-color); - } - - [part='helper-text'] { - color: var(--material-secondary-text-color); - } - - :host([has-error-message]) [part='error-message']::before, - :host([has-helper]) [part='helper-text']::before { - content: ''; - display: block; - height: 6px; - } - `, - { moduleId: 'material-checkbox' }, -); diff --git a/packages/checkbox/theme/material/vaadin-checkbox.js b/packages/checkbox/theme/material/vaadin-checkbox.js deleted file mode 100644 index feb64346ee4..00000000000 --- a/packages/checkbox/theme/material/vaadin-checkbox.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-checkbox-styles.js'; -import '../../src/vaadin-checkbox.js'; diff --git a/packages/checkbox/theme/material/vaadin-lit-checkbox.js b/packages/checkbox/theme/material/vaadin-lit-checkbox.js deleted file mode 100644 index bc64a926737..00000000000 --- a/packages/checkbox/theme/material/vaadin-lit-checkbox.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-checkbox-styles.js'; -import '../../src/vaadin-lit-checkbox.js'; diff --git a/packages/combo-box/package.json b/packages/combo-box/package.json index 4690b431be7..53b62802f8e 100644 --- a/packages/combo-box/package.json +++ b/packages/combo-box/package.json @@ -46,7 +46,6 @@ "@vaadin/lit-renderer": "25.0.0-alpha0", "@vaadin/overlay": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/combo-box/test/visual/material/combo-box.test.js b/packages/combo-box/test/visual/material/combo-box.test.js deleted file mode 100644 index b009ea99a99..00000000000 --- a/packages/combo-box/test/visual/material/combo-box.test.js +++ /dev/null @@ -1,101 +0,0 @@ -import { sendKeys } from '@vaadin/test-runner-commands'; -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../common.js'; -import '../../not-animated-styles.js'; -import '../../../theme/material/vaadin-combo-box.js'; - -describe('combo-box', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - div.style.padding = '10px'; - element = fixtureSync('', div); - }); - - it('basic', async () => { - await visualDiff(div, 'basic'); - }); - - it('opened', async () => { - div.style.height = '200px'; - div.style.width = '200px'; - element.items = ['Foo', 'Bar', 'Baz']; - element.click(); - await visualDiff(div, 'opened'); - }); - - it('focus-ring', async () => { - await sendKeys({ press: 'Tab' }); - - await visualDiff(div, 'focus-ring'); - }); - - it('disabled', async () => { - element.disabled = true; - await visualDiff(div, 'disabled'); - }); - - it('readonly', async () => { - element.readonly = true; - await visualDiff(div, 'readonly'); - }); - - it('flex', async () => { - div.style.display = 'inline-flex'; - div.style.height = '200px'; - await visualDiff(div, 'flex'); - }); - - it('label', async () => { - element.label = 'Label'; - await visualDiff(div, 'label'); - }); - - it('placeholder', async () => { - element.placeholder = 'Placeholder'; - await visualDiff(div, 'placeholder'); - }); - - it('value', async () => { - element.allowCustomValue = true; - element.value = 'value'; - await visualDiff(div, 'value'); - }); - - it('required', async () => { - element.label = 'Label'; - element.required = true; - await visualDiff(div, 'required'); - }); - - it('error message', async () => { - element.label = 'Label'; - element.errorMessage = 'This field is required'; - element.required = true; - element.validate(); - await visualDiff(div, 'error-message'); - }); - - it('helper text', async () => { - element.helperText = 'Helper text'; - await visualDiff(div, 'helper-text'); - }); - - it('clear button', async () => { - element.allowCustomValue = true; - element.value = 'value'; - element.clearButtonVisible = true; - await visualDiff(div, 'clear-button'); - }); - - it('prefix slot', async () => { - const span = document.createElement('span'); - span.setAttribute('slot', 'prefix'); - span.textContent = '$'; - element.appendChild(span); - await visualDiff(div, 'prefix'); - }); -}); diff --git a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/basic.png b/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/basic.png deleted file mode 100644 index 7edfa5e273f..00000000000 Binary files a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/basic.png and /dev/null differ diff --git a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/clear-button.png b/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/clear-button.png deleted file mode 100644 index 5003d175bc6..00000000000 Binary files a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/clear-button.png and /dev/null differ diff --git a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/disabled.png b/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/disabled.png deleted file mode 100644 index d504a6c1cc1..00000000000 Binary files a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/disabled.png and /dev/null differ diff --git a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/error-message.png b/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/error-message.png deleted file mode 100644 index a578ba5a158..00000000000 Binary files a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/error-message.png and /dev/null differ diff --git a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/flex.png b/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/flex.png deleted file mode 100644 index 576de584adb..00000000000 Binary files a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/flex.png and /dev/null differ diff --git a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/focus-ring.png b/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/focus-ring.png deleted file mode 100644 index cad4824eb7b..00000000000 Binary files a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/focus-ring.png and /dev/null differ diff --git a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/helper-text.png b/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/helper-text.png deleted file mode 100644 index 602041823c7..00000000000 Binary files a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/helper-text.png and /dev/null differ diff --git a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/label.png b/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/label.png deleted file mode 100644 index ff74f44f9ee..00000000000 Binary files a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/label.png and /dev/null differ diff --git a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/opened.png b/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/opened.png deleted file mode 100644 index 6aa9db1449b..00000000000 Binary files a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/opened.png and /dev/null differ diff --git a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/placeholder.png b/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/placeholder.png deleted file mode 100644 index 85feb1c9c9d..00000000000 Binary files a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/placeholder.png and /dev/null differ diff --git a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/prefix.png b/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/prefix.png deleted file mode 100644 index 0173e6c20cd..00000000000 Binary files a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/prefix.png and /dev/null differ diff --git a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/readonly.png b/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/readonly.png deleted file mode 100644 index 46c2b4cd4d6..00000000000 Binary files a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/readonly.png and /dev/null differ diff --git a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/required.png b/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/required.png deleted file mode 100644 index 0902cbc2493..00000000000 Binary files a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/required.png and /dev/null differ diff --git a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/value.png b/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/value.png deleted file mode 100644 index f70a69a8700..00000000000 Binary files a/packages/combo-box/test/visual/material/screenshots/combo-box/baseline/value.png and /dev/null differ diff --git a/packages/combo-box/theme/material/vaadin-combo-box-item-styles.js b/packages/combo-box/theme/material/vaadin-combo-box-item-styles.js deleted file mode 100644 index 1995e291112..00000000000 --- a/packages/combo-box/theme/material/vaadin-combo-box-item-styles.js +++ /dev/null @@ -1,20 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/font-icons.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import { item } from '@vaadin/item/theme/material/vaadin-item-styles.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const comboBoxItem = css` - :host { - cursor: pointer; - -webkit-tap-highlight-color: transparent; - padding: 4px 10px; - --_material-item-selected-icon-display: block; - } -`; - -registerStyles('vaadin-combo-box-item', [item, comboBoxItem], { - moduleId: 'material-combo-box-item', -}); - -export { comboBoxItem }; diff --git a/packages/combo-box/theme/material/vaadin-combo-box-overlay-styles.js b/packages/combo-box/theme/material/vaadin-combo-box-overlay-styles.js deleted file mode 100644 index 4ee898eb57e..00000000000 --- a/packages/combo-box/theme/material/vaadin-combo-box-overlay-styles.js +++ /dev/null @@ -1,51 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import { loader } from '@vaadin/vaadin-material-styles/mixins/loader.js'; -import { menuOverlay } from '@vaadin/vaadin-material-styles/mixins/menu-overlay.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const comboBoxOverlay = css` - [part='overlay'] { - position: relative; - border-top-left-radius: 0; - border-top-right-radius: 0; - } - - /* Overflow needs to be auto by default to make overlay sizing logic work */ - /* When loading, overflow needs to be visible to make loading indicator visible */ - :host([loading]) [part='overlay'] { - overflow: visible; - } - - [part='content'] { - padding: 0; - } -`; - -const comboBoxLoader = css` - [part~='loader'] { - position: absolute; - z-index: 1; - top: -2px; - left: 0; - right: 0; - } -`; - -registerStyles( - 'vaadin-combo-box-overlay', - [ - menuOverlay, - comboBoxOverlay, - loader, - comboBoxLoader, - css` - :host { - --_vaadin-combo-box-items-container-border-width: 8px 0; - --_vaadin-combo-box-items-container-border-style: solid; - } - `, - ], - { moduleId: 'material-combo-box-overlay' }, -); - -export { comboBoxLoader, comboBoxOverlay }; diff --git a/packages/combo-box/theme/material/vaadin-combo-box-styles.js b/packages/combo-box/theme/material/vaadin-combo-box-styles.js deleted file mode 100644 index cc337705a7e..00000000000 --- a/packages/combo-box/theme/material/vaadin-combo-box-styles.js +++ /dev/null @@ -1,21 +0,0 @@ -import '@vaadin/input-container/theme/material/vaadin-input-container-styles.js'; -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/font-icons.js'; -import { inputFieldShared } from '@vaadin/vaadin-material-styles/mixins/input-field-shared.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const comboBox = css` - :host { - -webkit-tap-highlight-color: transparent; - } - - [part='toggle-button']::before { - content: var(--material-icons-dropdown); - } - - :host([opened]) [part='toggle-button'] { - transform: rotate(180deg); - } -`; - -registerStyles('vaadin-combo-box', [inputFieldShared, comboBox], { moduleId: 'material-combo-box' }); diff --git a/packages/combo-box/theme/material/vaadin-combo-box.js b/packages/combo-box/theme/material/vaadin-combo-box.js deleted file mode 100644 index e3cfc6cf389..00000000000 --- a/packages/combo-box/theme/material/vaadin-combo-box.js +++ /dev/null @@ -1,4 +0,0 @@ -import './vaadin-combo-box-item-styles.js'; -import './vaadin-combo-box-overlay-styles.js'; -import './vaadin-combo-box-styles.js'; -import '../../src/vaadin-combo-box.js'; diff --git a/packages/combo-box/theme/material/vaadin-lit-combo-box.js b/packages/combo-box/theme/material/vaadin-lit-combo-box.js deleted file mode 100644 index f470c67fd6e..00000000000 --- a/packages/combo-box/theme/material/vaadin-lit-combo-box.js +++ /dev/null @@ -1,4 +0,0 @@ -import './vaadin-combo-box-item-styles.js'; -import './vaadin-combo-box-overlay-styles.js'; -import './vaadin-combo-box-styles.js'; -import '../../src/vaadin-lit-combo-box.js'; diff --git a/packages/confirm-dialog/package.json b/packages/confirm-dialog/package.json index 9e62224744f..b4e9c80166a 100644 --- a/packages/confirm-dialog/package.json +++ b/packages/confirm-dialog/package.json @@ -42,7 +42,6 @@ "@vaadin/dialog": "25.0.0-alpha0", "@vaadin/overlay": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/confirm-dialog/test/visual/material/confirm-dialog.test.js b/packages/confirm-dialog/test/visual/material/confirm-dialog.test.js deleted file mode 100644 index eebfcd9a12c..00000000000 --- a/packages/confirm-dialog/test/visual/material/confirm-dialog.test.js +++ /dev/null @@ -1,44 +0,0 @@ -import { fixtureSync, oneEvent } from '@vaadin/testing-helpers'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '@vaadin/vaadin-material-styles/test/autoload.js'; -import '../../../theme/material/vaadin-confirm-dialog.js'; -import '../../not-animated-styles.js'; - -describe('confirm-dialog', () => { - let div, element; - - beforeEach(async () => { - div = document.createElement('div'); - div.style.height = '100%'; - - element = fixtureSync( - ` - - Please press a button to confirm. - - `, - div, - ); - await oneEvent(element.$.dialog.$.overlay, 'vaadin-overlay-open'); - }); - - it('basic', async () => { - await visualDiff(div, 'basic'); - }); - - it('cancel', async () => { - element.cancelButtonVisible = true; - await visualDiff(div, 'cancel'); - }); - - it('reject', async () => { - element.rejectButtonVisible = true; - await visualDiff(div, 'reject'); - }); - - it('cancel reject', async () => { - element.cancelButtonVisible = true; - element.rejectButtonVisible = true; - await visualDiff(div, 'cancel-reject'); - }); -}); diff --git a/packages/confirm-dialog/test/visual/material/screenshots/confirm-dialog/baseline/basic.png b/packages/confirm-dialog/test/visual/material/screenshots/confirm-dialog/baseline/basic.png deleted file mode 100644 index da8218ca1e2..00000000000 Binary files a/packages/confirm-dialog/test/visual/material/screenshots/confirm-dialog/baseline/basic.png and /dev/null differ diff --git a/packages/confirm-dialog/test/visual/material/screenshots/confirm-dialog/baseline/cancel-reject.png b/packages/confirm-dialog/test/visual/material/screenshots/confirm-dialog/baseline/cancel-reject.png deleted file mode 100644 index ce76a19b497..00000000000 Binary files a/packages/confirm-dialog/test/visual/material/screenshots/confirm-dialog/baseline/cancel-reject.png and /dev/null differ diff --git a/packages/confirm-dialog/test/visual/material/screenshots/confirm-dialog/baseline/cancel.png b/packages/confirm-dialog/test/visual/material/screenshots/confirm-dialog/baseline/cancel.png deleted file mode 100644 index e76122be586..00000000000 Binary files a/packages/confirm-dialog/test/visual/material/screenshots/confirm-dialog/baseline/cancel.png and /dev/null differ diff --git a/packages/confirm-dialog/test/visual/material/screenshots/confirm-dialog/baseline/reject.png b/packages/confirm-dialog/test/visual/material/screenshots/confirm-dialog/baseline/reject.png deleted file mode 100644 index f2602ea02ff..00000000000 Binary files a/packages/confirm-dialog/test/visual/material/screenshots/confirm-dialog/baseline/reject.png and /dev/null differ diff --git a/packages/confirm-dialog/theme/material/vaadin-confirm-dialog-styles.js b/packages/confirm-dialog/theme/material/vaadin-confirm-dialog-styles.js deleted file mode 100644 index ab81b52a78c..00000000000 --- a/packages/confirm-dialog/theme/material/vaadin-confirm-dialog-styles.js +++ /dev/null @@ -1,41 +0,0 @@ -import { dialogOverlay } from '@vaadin/dialog/theme/material/vaadin-dialog-styles.js'; -import { overlay } from '@vaadin/vaadin-material-styles/mixins/overlay.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-confirm-dialog-overlay', - [ - overlay, - dialogOverlay, - css` - [part='overlay'] { - max-width: 100%; - min-width: 0; - } - - [part='content'] { - min-width: 0; - } - - [part='header'] ::slotted(h3) { - margin-top: 0 !important; - margin-bottom: 0 !important; - margin-inline-start: 8px; - } - - [part='message'] { - width: 25em; - max-width: 100%; - margin-inline-end: 24px; - } - - @media (max-width: 360px) { - [part='footer'] { - flex-direction: column-reverse; - align-items: flex-end; - } - } - `, - ], - { moduleId: 'material-confirm-dialog-overlay' }, -); diff --git a/packages/confirm-dialog/theme/material/vaadin-confirm-dialog.js b/packages/confirm-dialog/theme/material/vaadin-confirm-dialog.js deleted file mode 100644 index d6ac01b7588..00000000000 --- a/packages/confirm-dialog/theme/material/vaadin-confirm-dialog.js +++ /dev/null @@ -1,3 +0,0 @@ -import '@vaadin/button/theme/material/vaadin-button.js'; -import './vaadin-confirm-dialog-styles.js'; -import '../../src/vaadin-confirm-dialog.js'; diff --git a/packages/confirm-dialog/theme/material/vaadin-lit-confirm-dialog.js b/packages/confirm-dialog/theme/material/vaadin-lit-confirm-dialog.js deleted file mode 100644 index 3508c453410..00000000000 --- a/packages/confirm-dialog/theme/material/vaadin-lit-confirm-dialog.js +++ /dev/null @@ -1,3 +0,0 @@ -import '@vaadin/button/theme/material/vaadin-lit-button.js'; -import './vaadin-confirm-dialog-styles.js'; -import '../../src/vaadin-lit-confirm-dialog.js'; diff --git a/packages/context-menu/package.json b/packages/context-menu/package.json index 493d6040195..f411478b434 100644 --- a/packages/context-menu/package.json +++ b/packages/context-menu/package.json @@ -46,7 +46,6 @@ "@vaadin/lit-renderer": "25.0.0-alpha0", "@vaadin/overlay": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/context-menu/test/visual/material/context-menu.test.js b/packages/context-menu/test/visual/material/context-menu.test.js deleted file mode 100644 index 8df7d710be0..00000000000 --- a/packages/context-menu/test/visual/material/context-menu.test.js +++ /dev/null @@ -1,129 +0,0 @@ -import { fixtureSync, nextRender } from '@vaadin/testing-helpers'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '@vaadin/item/theme/material/vaadin-item.js'; -import '@vaadin/list-box/theme/material/vaadin-list-box.js'; -import '../../../theme/material/vaadin-context-menu.js'; -import '../../not-animated-styles.js'; -import { openSubMenus } from '../../helpers.js'; - -describe('context-menu', () => { - let element; - - ['ltr', 'rtl'].forEach((dir) => { - const contextmenu = (target) => { - const domRect = target.getBoundingClientRect(); - const clientX = dir === 'rtl' ? domRect.right : domRect.left; - const e = new MouseEvent('contextmenu', { - bubbles: true, - cancelable: true, - clientX, - clientY: domRect.y, - }); - - target.listenOn.dispatchEvent(e); - }; - - describe(dir, () => { - before(() => { - document.documentElement.setAttribute('dir', dir); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - describe('basic', () => { - beforeEach(() => { - element = fixtureSync(` - -
Target
-
- `); - element.renderer = (root) => { - root.innerHTML = ` - - Item 1 - Item 2 - - `; - }; - }); - - it('basic', async () => { - contextmenu(element); - await visualDiff(document.body, `${dir}-basic`); - }); - }); - - describe('long', () => { - beforeEach(() => { - element = fixtureSync(` - -
Target
-
- `); - element.renderer = (root) => { - root.innerHTML = ` - - ${new Array(30) - .fill(0) - .map((_, idx) => `Item ${idx}`) - .join('')} - - `; - }; - }); - - it('basic', async () => { - contextmenu(element); - await visualDiff(document.body, `${dir}-long`); - }); - - it('bottom', async () => { - element.style.position = 'absolute'; - element.style.bottom = '50px'; - element.style.right = '50px'; - contextmenu(element); - await visualDiff(document.body, `${dir}-long-bottom`); - }); - }); - - describe('items', () => { - beforeEach(() => { - element = fixtureSync(` - -
Target
-
- `); - }); - - it('items', async () => { - element.items = [ - { text: 'Menu Item 1' }, - { component: 'hr' }, - { - text: 'Menu Item 2', - children: [ - { text: 'Menu Item 2-1' }, - { - text: 'Menu Item 2-2', - children: [ - { text: 'Menu Item 2-2-1', checked: true }, - { text: 'Menu Item 2-2-2', disabled: true }, - { component: 'hr' }, - { text: 'Menu Item 2-2-3' }, - ], - }, - ], - }, - { text: 'Menu Item 3', disabled: true }, - ]; - contextmenu(element); - await openSubMenus(element); - await nextRender(element); - await visualDiff(document.body, `${dir}-items`); - }); - }); - }); - }); -}); diff --git a/packages/context-menu/test/visual/material/screenshots/context-menu/baseline/ltr-basic.png b/packages/context-menu/test/visual/material/screenshots/context-menu/baseline/ltr-basic.png deleted file mode 100644 index 33bd990e7f0..00000000000 Binary files a/packages/context-menu/test/visual/material/screenshots/context-menu/baseline/ltr-basic.png and /dev/null differ diff --git a/packages/context-menu/test/visual/material/screenshots/context-menu/baseline/ltr-items.png b/packages/context-menu/test/visual/material/screenshots/context-menu/baseline/ltr-items.png deleted file mode 100644 index e07c0501aec..00000000000 Binary files a/packages/context-menu/test/visual/material/screenshots/context-menu/baseline/ltr-items.png and /dev/null differ diff --git a/packages/context-menu/test/visual/material/screenshots/context-menu/baseline/ltr-long-bottom.png b/packages/context-menu/test/visual/material/screenshots/context-menu/baseline/ltr-long-bottom.png deleted file mode 100644 index 44d53dbd1aa..00000000000 Binary files a/packages/context-menu/test/visual/material/screenshots/context-menu/baseline/ltr-long-bottom.png and /dev/null differ diff --git a/packages/context-menu/test/visual/material/screenshots/context-menu/baseline/ltr-long.png b/packages/context-menu/test/visual/material/screenshots/context-menu/baseline/ltr-long.png deleted file mode 100644 index 8ee88b089e6..00000000000 Binary files a/packages/context-menu/test/visual/material/screenshots/context-menu/baseline/ltr-long.png and /dev/null differ diff --git a/packages/context-menu/test/visual/material/screenshots/context-menu/baseline/rtl-basic.png b/packages/context-menu/test/visual/material/screenshots/context-menu/baseline/rtl-basic.png deleted file mode 100644 index b43200fd725..00000000000 Binary files a/packages/context-menu/test/visual/material/screenshots/context-menu/baseline/rtl-basic.png and /dev/null differ diff --git a/packages/context-menu/test/visual/material/screenshots/context-menu/baseline/rtl-items.png b/packages/context-menu/test/visual/material/screenshots/context-menu/baseline/rtl-items.png deleted file mode 100644 index a499d5a4f40..00000000000 Binary files a/packages/context-menu/test/visual/material/screenshots/context-menu/baseline/rtl-items.png and /dev/null differ diff --git a/packages/context-menu/test/visual/material/screenshots/context-menu/baseline/rtl-long-bottom.png b/packages/context-menu/test/visual/material/screenshots/context-menu/baseline/rtl-long-bottom.png deleted file mode 100644 index 932728152f4..00000000000 Binary files a/packages/context-menu/test/visual/material/screenshots/context-menu/baseline/rtl-long-bottom.png and /dev/null differ diff --git a/packages/context-menu/test/visual/material/screenshots/context-menu/baseline/rtl-long.png b/packages/context-menu/test/visual/material/screenshots/context-menu/baseline/rtl-long.png deleted file mode 100644 index 3d66c48782a..00000000000 Binary files a/packages/context-menu/test/visual/material/screenshots/context-menu/baseline/rtl-long.png and /dev/null differ diff --git a/packages/context-menu/theme/material/vaadin-context-menu-item-styles.js b/packages/context-menu/theme/material/vaadin-context-menu-item-styles.js deleted file mode 100644 index 7ef0b5e5426..00000000000 --- a/packages/context-menu/theme/material/vaadin-context-menu-item-styles.js +++ /dev/null @@ -1,36 +0,0 @@ -import '@vaadin/vaadin-material-styles/font-icons.js'; -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import { item } from '@vaadin/item/theme/material/vaadin-item-styles.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const contextMenuItem = css` - :host([aria-haspopup='true'])::after { - font-family: material-icons; - font-size: var(--material-icon-font-size); - } - - :host(:not([dir='rtl'])[aria-haspopup='true'])::after { - content: var(--material-icons-chevron-right); - padding-left: 9px; - margin-right: -9px; - } - - :host([dir='rtl'][aria-haspopup='true'])::after { - content: var(--material-icons-chevron-left); - padding-right: 9px; - margin-left: -9px; - } - - :host([menu-item-checked]) [part='checkmark']::before { - content: var(--material-icons-check); - } - - :host([expanded]) { - background-color: var(--material-secondary-background-color); - } -`; - -registerStyles('vaadin-context-menu-item', [item, contextMenuItem], { moduleId: 'material-context-menu-item' }); - -export { contextMenuItem }; diff --git a/packages/context-menu/theme/material/vaadin-context-menu-list-box-styles.js b/packages/context-menu/theme/material/vaadin-context-menu-list-box-styles.js deleted file mode 100644 index 03d716ec72d..00000000000 --- a/packages/context-menu/theme/material/vaadin-context-menu-list-box-styles.js +++ /dev/null @@ -1,38 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import { listBox } from '@vaadin/list-box/theme/material/vaadin-list-box-styles.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const contextMenuListBox = css` - [part='items'] ::slotted([role='menuitem']) { - min-height: 36px; - padding: 8px 32px 8px 10px; - font-size: var(--material-small-font-size); - line-height: 24px; - } - - :host([dir='rtl']) [part='items'] ::slotted([role='menuitem']) { - padding: 8px 10px 8px 32px; - } - - [part='items'] ::slotted([role='menuitem']:hover:not([disabled])) { - background-color: var(--material-secondary-background-color); - } - - [part='items'] ::slotted([role='menuitem'][focused]:not([disabled])) { - background-color: var(--material-divider-color); - } - - @media (pointer: coarse) { - [part='items'] ::slotted([role='menuitem']:hover:not([disabled])), - [part='items'] ::slotted([role='menuitem'][focused]:not([disabled])) { - background-color: transparent; - } - } -`; - -registerStyles('vaadin-context-menu-list-box', [listBox, contextMenuListBox], { - moduleId: 'material-context-menu-list-box', -}); - -export { contextMenuListBox }; diff --git a/packages/context-menu/theme/material/vaadin-context-menu-overlay-styles.js b/packages/context-menu/theme/material/vaadin-context-menu-overlay-styles.js deleted file mode 100644 index 97be44d3f6c..00000000000 --- a/packages/context-menu/theme/material/vaadin-context-menu-overlay-styles.js +++ /dev/null @@ -1,15 +0,0 @@ -import { menuOverlay } from '@vaadin/vaadin-material-styles/mixins/menu-overlay.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const contextMenuOverlay = css` - [part='overlay'] { - outline: none; - will-change: transform, opacity; - } -`; - -registerStyles('vaadin-context-menu-overlay', [menuOverlay, contextMenuOverlay], { - moduleId: 'material-context-menu-overlay', -}); - -export { contextMenuOverlay }; diff --git a/packages/context-menu/theme/material/vaadin-context-menu.js b/packages/context-menu/theme/material/vaadin-context-menu.js deleted file mode 100644 index 746dad2b93c..00000000000 --- a/packages/context-menu/theme/material/vaadin-context-menu.js +++ /dev/null @@ -1,4 +0,0 @@ -import './vaadin-context-menu-item-styles.js'; -import './vaadin-context-menu-list-box-styles.js'; -import './vaadin-context-menu-overlay-styles.js'; -import '../../src/vaadin-context-menu.js'; diff --git a/packages/context-menu/theme/material/vaadin-lit-context-menu.js b/packages/context-menu/theme/material/vaadin-lit-context-menu.js deleted file mode 100644 index fa4196106ad..00000000000 --- a/packages/context-menu/theme/material/vaadin-lit-context-menu.js +++ /dev/null @@ -1,4 +0,0 @@ -import './vaadin-context-menu-item-styles.js'; -import './vaadin-context-menu-list-box-styles.js'; -import './vaadin-context-menu-overlay-styles.js'; -import '../../src/vaadin-lit-context-menu.js'; diff --git a/packages/cookie-consent/package.json b/packages/cookie-consent/package.json index 020081674dc..1217267c1aa 100644 --- a/packages/cookie-consent/package.json +++ b/packages/cookie-consent/package.json @@ -39,7 +39,6 @@ "@polymer/polymer": "^3.0.0", "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "cookieconsent": "^3.0.6", "lit": "^3.0.0" }, diff --git a/packages/cookie-consent/test/visual/material/cookie-consent.test.js b/packages/cookie-consent/test/visual/material/cookie-consent.test.js deleted file mode 100644 index 6adcf83cabf..00000000000 --- a/packages/cookie-consent/test/visual/material/cookie-consent.test.js +++ /dev/null @@ -1,16 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-cookie-consent.js'; - -describe('cookie-consent', () => { - let element; - - beforeEach(() => { - element = fixtureSync(''); - }); - - it('basic', async () => { - element._show(); - await visualDiff(document.body, 'basic'); - }); -}); diff --git a/packages/cookie-consent/test/visual/material/screenshots/cookie-consent/baseline/basic.png b/packages/cookie-consent/test/visual/material/screenshots/cookie-consent/baseline/basic.png deleted file mode 100644 index 065a9642272..00000000000 Binary files a/packages/cookie-consent/test/visual/material/screenshots/cookie-consent/baseline/basic.png and /dev/null differ diff --git a/packages/cookie-consent/theme/material/vaadin-cookie-consent.js b/packages/cookie-consent/theme/material/vaadin-cookie-consent.js deleted file mode 100644 index ea6f1daafe6..00000000000 --- a/packages/cookie-consent/theme/material/vaadin-cookie-consent.js +++ /dev/null @@ -1 +0,0 @@ -import '../../src/vaadin-cookie-consent.js'; diff --git a/packages/cookie-consent/theme/material/vaadin-lit-cookie-consent.js b/packages/cookie-consent/theme/material/vaadin-lit-cookie-consent.js deleted file mode 100644 index 0bc81bfe590..00000000000 --- a/packages/cookie-consent/theme/material/vaadin-lit-cookie-consent.js +++ /dev/null @@ -1 +0,0 @@ -import '../../src/vaadin-lit-cookie-consent.js'; diff --git a/packages/crud/package.json b/packages/crud/package.json index 4d9b049174b..9151837f357 100644 --- a/packages/crud/package.json +++ b/packages/crud/package.json @@ -47,7 +47,6 @@ "@vaadin/overlay": "25.0.0-alpha0", "@vaadin/text-field": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/crud/test/visual/material/crud.test.js b/packages/crud/test/visual/material/crud.test.js deleted file mode 100644 index d48e3c703b8..00000000000 --- a/packages/crud/test/visual/material/crud.test.js +++ /dev/null @@ -1,96 +0,0 @@ -import { fixtureSync, nextRender } from '@vaadin/testing-helpers'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../not-animated-styles.js'; -import '../../../theme/material/vaadin-crud.js'; - -describe('crud', () => { - let div, element; - - beforeEach(async () => { - div = document.createElement('div'); - div.style.height = '100%'; - element = fixtureSync('', div); - element.items = [{ name: { first: 'Susan', last: 'Smith' } }]; - await nextRender(element); - }); - - it('basic', async () => { - await visualDiff(div, 'basic'); - }); - - it('edit-button-focus', async () => { - const button = element.querySelector('vaadin-crud-edit'); - button.focus(); - button.setAttribute('focus-ring', ''); - await visualDiff(div, 'edit-button-focus'); - }); - - it('no-toolbar', async () => { - element.noToolbar = true; - await visualDiff(div, 'no-toolbar'); - }); - - describe('flex', () => { - beforeEach(async () => { - div.style.display = 'flex'; - // Reset height to default - div.style.height = 'auto'; - element.style.height = '400px'; - element.editorPosition = 'aside'; - await nextRender(element); - }); - - it('row', async () => { - element.editedItem = element.items[0]; - await visualDiff(div, 'flex-layout'); - }); - - it('column', async () => { - div.style.flexDirection = 'column'; - element.editedItem = element.items[0]; - await visualDiff(div, 'flex-column-layout'); - }); - }); - - ['ltr', 'rtl'].forEach((dir) => { - describe(dir, () => { - before(() => { - document.documentElement.setAttribute('dir', dir); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - ['default', 'aside', 'bottom', 'fullscreen'].forEach((position) => { - describe(`${dir}-editor-position-${position}`, () => { - beforeEach(async () => { - switch (position) { - case 'aside': - case 'bottom': - element.editorPosition = position; - await nextRender(element); - break; - case 'fullscreen': - element._fullscreen = true; - await nextRender(element); - break; - default: - // Do nothing - } - }); - - it(`editor-position-${position}-new`, async () => { - element.editedItem = {}; - await visualDiff(div, `${dir}-editor-position-${position}-new`); - }); - - it(`editor-position-${position}-edit`, async () => { - element.editedItem = element.items[0]; - await visualDiff(div, `${dir}-editor-position-${position}-edit`); - }); - }); - }); - }); - }); -}); diff --git a/packages/crud/test/visual/material/screenshots/crud/baseline/basic.png b/packages/crud/test/visual/material/screenshots/crud/baseline/basic.png deleted file mode 100644 index 87bd28c6ec6..00000000000 Binary files a/packages/crud/test/visual/material/screenshots/crud/baseline/basic.png and /dev/null differ diff --git a/packages/crud/test/visual/material/screenshots/crud/baseline/edit-button-focus.png b/packages/crud/test/visual/material/screenshots/crud/baseline/edit-button-focus.png deleted file mode 100644 index 7ca7dcc3d9e..00000000000 Binary files a/packages/crud/test/visual/material/screenshots/crud/baseline/edit-button-focus.png and /dev/null differ diff --git a/packages/crud/test/visual/material/screenshots/crud/baseline/flex-column-layout.png b/packages/crud/test/visual/material/screenshots/crud/baseline/flex-column-layout.png deleted file mode 100644 index 8a29eb5a376..00000000000 Binary files a/packages/crud/test/visual/material/screenshots/crud/baseline/flex-column-layout.png and /dev/null differ diff --git a/packages/crud/test/visual/material/screenshots/crud/baseline/flex-layout.png b/packages/crud/test/visual/material/screenshots/crud/baseline/flex-layout.png deleted file mode 100644 index 8a29eb5a376..00000000000 Binary files a/packages/crud/test/visual/material/screenshots/crud/baseline/flex-layout.png and /dev/null differ diff --git a/packages/crud/test/visual/material/screenshots/crud/baseline/ltr-editor-position-aside-edit.png b/packages/crud/test/visual/material/screenshots/crud/baseline/ltr-editor-position-aside-edit.png deleted file mode 100644 index 73889765781..00000000000 Binary files a/packages/crud/test/visual/material/screenshots/crud/baseline/ltr-editor-position-aside-edit.png and /dev/null differ diff --git a/packages/crud/test/visual/material/screenshots/crud/baseline/ltr-editor-position-aside-new.png b/packages/crud/test/visual/material/screenshots/crud/baseline/ltr-editor-position-aside-new.png deleted file mode 100644 index 7d131eaea63..00000000000 Binary files a/packages/crud/test/visual/material/screenshots/crud/baseline/ltr-editor-position-aside-new.png and /dev/null differ diff --git a/packages/crud/test/visual/material/screenshots/crud/baseline/ltr-editor-position-bottom-edit.png b/packages/crud/test/visual/material/screenshots/crud/baseline/ltr-editor-position-bottom-edit.png deleted file mode 100644 index bd72dd8738c..00000000000 Binary files a/packages/crud/test/visual/material/screenshots/crud/baseline/ltr-editor-position-bottom-edit.png and /dev/null differ diff --git a/packages/crud/test/visual/material/screenshots/crud/baseline/ltr-editor-position-bottom-new.png b/packages/crud/test/visual/material/screenshots/crud/baseline/ltr-editor-position-bottom-new.png deleted file mode 100644 index 2bdb0011ad2..00000000000 Binary files a/packages/crud/test/visual/material/screenshots/crud/baseline/ltr-editor-position-bottom-new.png and /dev/null differ diff --git a/packages/crud/test/visual/material/screenshots/crud/baseline/ltr-editor-position-default-edit.png b/packages/crud/test/visual/material/screenshots/crud/baseline/ltr-editor-position-default-edit.png deleted file mode 100644 index 1123dd02b6e..00000000000 Binary files a/packages/crud/test/visual/material/screenshots/crud/baseline/ltr-editor-position-default-edit.png and /dev/null differ diff --git a/packages/crud/test/visual/material/screenshots/crud/baseline/ltr-editor-position-default-new.png b/packages/crud/test/visual/material/screenshots/crud/baseline/ltr-editor-position-default-new.png deleted file mode 100644 index ba6fb446d7f..00000000000 Binary files a/packages/crud/test/visual/material/screenshots/crud/baseline/ltr-editor-position-default-new.png and /dev/null differ diff --git a/packages/crud/test/visual/material/screenshots/crud/baseline/ltr-editor-position-fullscreen-edit.png b/packages/crud/test/visual/material/screenshots/crud/baseline/ltr-editor-position-fullscreen-edit.png deleted file mode 100644 index 7e8369ad605..00000000000 Binary files a/packages/crud/test/visual/material/screenshots/crud/baseline/ltr-editor-position-fullscreen-edit.png and /dev/null differ diff --git a/packages/crud/test/visual/material/screenshots/crud/baseline/ltr-editor-position-fullscreen-new.png b/packages/crud/test/visual/material/screenshots/crud/baseline/ltr-editor-position-fullscreen-new.png deleted file mode 100644 index b17d834a8f2..00000000000 Binary files a/packages/crud/test/visual/material/screenshots/crud/baseline/ltr-editor-position-fullscreen-new.png and /dev/null differ diff --git a/packages/crud/test/visual/material/screenshots/crud/baseline/no-toolbar.png b/packages/crud/test/visual/material/screenshots/crud/baseline/no-toolbar.png deleted file mode 100644 index 250b4c51d24..00000000000 Binary files a/packages/crud/test/visual/material/screenshots/crud/baseline/no-toolbar.png and /dev/null differ diff --git a/packages/crud/test/visual/material/screenshots/crud/baseline/rtl-editor-position-aside-edit.png b/packages/crud/test/visual/material/screenshots/crud/baseline/rtl-editor-position-aside-edit.png deleted file mode 100644 index f6c24971ab7..00000000000 Binary files a/packages/crud/test/visual/material/screenshots/crud/baseline/rtl-editor-position-aside-edit.png and /dev/null differ diff --git a/packages/crud/test/visual/material/screenshots/crud/baseline/rtl-editor-position-aside-new.png b/packages/crud/test/visual/material/screenshots/crud/baseline/rtl-editor-position-aside-new.png deleted file mode 100644 index 42f7d50f110..00000000000 Binary files a/packages/crud/test/visual/material/screenshots/crud/baseline/rtl-editor-position-aside-new.png and /dev/null differ diff --git a/packages/crud/test/visual/material/screenshots/crud/baseline/rtl-editor-position-bottom-edit.png b/packages/crud/test/visual/material/screenshots/crud/baseline/rtl-editor-position-bottom-edit.png deleted file mode 100644 index df7b8ac5ac4..00000000000 Binary files a/packages/crud/test/visual/material/screenshots/crud/baseline/rtl-editor-position-bottom-edit.png and /dev/null differ diff --git a/packages/crud/test/visual/material/screenshots/crud/baseline/rtl-editor-position-bottom-new.png b/packages/crud/test/visual/material/screenshots/crud/baseline/rtl-editor-position-bottom-new.png deleted file mode 100644 index b1974a45f38..00000000000 Binary files a/packages/crud/test/visual/material/screenshots/crud/baseline/rtl-editor-position-bottom-new.png and /dev/null differ diff --git a/packages/crud/test/visual/material/screenshots/crud/baseline/rtl-editor-position-default-edit.png b/packages/crud/test/visual/material/screenshots/crud/baseline/rtl-editor-position-default-edit.png deleted file mode 100644 index 531173d88a0..00000000000 Binary files a/packages/crud/test/visual/material/screenshots/crud/baseline/rtl-editor-position-default-edit.png and /dev/null differ diff --git a/packages/crud/test/visual/material/screenshots/crud/baseline/rtl-editor-position-default-new.png b/packages/crud/test/visual/material/screenshots/crud/baseline/rtl-editor-position-default-new.png deleted file mode 100644 index e5a79e35b0a..00000000000 Binary files a/packages/crud/test/visual/material/screenshots/crud/baseline/rtl-editor-position-default-new.png and /dev/null differ diff --git a/packages/crud/test/visual/material/screenshots/crud/baseline/rtl-editor-position-fullscreen-edit.png b/packages/crud/test/visual/material/screenshots/crud/baseline/rtl-editor-position-fullscreen-edit.png deleted file mode 100644 index 2f042e2593c..00000000000 Binary files a/packages/crud/test/visual/material/screenshots/crud/baseline/rtl-editor-position-fullscreen-edit.png and /dev/null differ diff --git a/packages/crud/test/visual/material/screenshots/crud/baseline/rtl-editor-position-fullscreen-new.png b/packages/crud/test/visual/material/screenshots/crud/baseline/rtl-editor-position-fullscreen-new.png deleted file mode 100644 index 6f6f7a401d8..00000000000 Binary files a/packages/crud/test/visual/material/screenshots/crud/baseline/rtl-editor-position-fullscreen-new.png and /dev/null differ diff --git a/packages/crud/theme/material/vaadin-crud-styles.js b/packages/crud/theme/material/vaadin-crud-styles.js deleted file mode 100644 index 62d8f6766ae..00000000000 --- a/packages/crud/theme/material/vaadin-crud-styles.js +++ /dev/null @@ -1,157 +0,0 @@ -import '@vaadin/vaadin-material-styles/typography.js'; -import '@vaadin/vaadin-material-styles/color.js'; -import { dialogOverlay } from '@vaadin/dialog/theme/material/vaadin-dialog-styles.js'; -import { overlay } from '@vaadin/vaadin-material-styles/mixins/overlay.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-crud-edit', - css` - :host { - display: block; - min-width: auto; - font-size: var(--material-button-font-size); - line-height: 1; - color: var(--material-text-color); - position: relative; - background-color: var(--material-secondary-background-color); - border-radius: 4px; - width: 2em; - height: 2em; - outline: none; - /* Reset button styles */ - letter-spacing: normal; - -webkit-font-smoothing: auto; - -moz-font-smoothing: auto; - } - - [part='icon']::before { - font-family: serif; - font-size: var(--material-button-font-size); - color: var(--material-primary-text-color); - content: '\\270E'; - width: 2em; - height: 2em; - line-height: 2em; - text-align: center; - position: absolute; - top: 0; - left: 0; - } - `, - { moduleId: 'material-crud-grid-edit' }, -); - -/** - * Shared styles used for the CRUD editor content and buttons regardless of `editorPosition`. - * They are applied to both `vaadin-crud` and `vaadin-crud-dialog-overlay` components. - */ -const editorStyles = css` - [part='footer'] { - background-color: var(--material-secondary-background-color); - } - - :host(:not([dir='rtl'])) ::slotted([slot='delete-button']) { - margin-right: auto; - } - - :host([dir='rtl']) ::slotted([slot='delete-button']) { - margin-left: auto; - } -`; - -registerStyles( - 'vaadin-crud', - [ - editorStyles, - css` - :host { - font-family: var(--material-font-family); - } - - [part='scroller'] { - padding: 16px; - background: var(--material-background-color); - } - - [part='editor'] { - position: relative; - } - - [part='editor']:focus::before { - position: absolute; - inset: 0; - content: ''; - box-shadow: inset 0 0 0 2px var(--material-primary-color); - pointer-events: none; - } - - [part='toolbar'] { - padding: 8px; - background-color: var(--material-secondary-background-color); - } - - [part='footer'] { - padding: 8px 4px; - } - - [part='footer'] ::slotted(*) { - margin-left: 4px; - margin-right: 4px; - } - - :host(:not([editor-position=''])) [part='editor']:not([hidden]) { - box-shadow: var(--material-shadow-elevation-12dp); - } - - :host(:not([dir='rtl'])) [part='toolbar'] ::slotted(*:not(:first-child)) { - margin-left: 0.5em; - } - - :host([dir='rtl']) [part='toolbar'] ::slotted(*:not(:first-child)) { - margin-right: 0.5em; - } - `, - ], - { moduleId: 'material-crud' }, -); - -registerStyles( - 'vaadin-crud-dialog-overlay', - [ - overlay, - dialogOverlay, - editorStyles, - css` - [part='overlay'] { - max-width: 54em; - min-width: 20em; - } - - @keyframes material-overlay-dummy-animation { - 0% { - opacity: 1; - } - - 100% { - opacity: 1; - } - } - - :host([opening]), - :host([closing]) { - animation: 0.25s material-overlay-dummy-animation; - } - - [part='header'] ::slotted(h3) { - margin-top: 0 !important; - margin-bottom: 0 !important; - } - - [part='content'] { - padding: 0 16px 16px; - } - `, - ], - { moduleId: 'material-crud-dialog-overlay' }, -); diff --git a/packages/crud/theme/material/vaadin-crud.js b/packages/crud/theme/material/vaadin-crud.js deleted file mode 100644 index a6b1d756dd9..00000000000 --- a/packages/crud/theme/material/vaadin-crud.js +++ /dev/null @@ -1,8 +0,0 @@ -import '@vaadin/button/theme/material/vaadin-button.js'; -import '@vaadin/confirm-dialog/theme/material/vaadin-confirm-dialog.js'; -import '@vaadin/form-layout/theme/material/vaadin-form-layout.js'; -import '@vaadin/grid/theme/material/vaadin-grid.js'; -import '@vaadin/grid/theme/material/vaadin-grid-sorter.js'; -import '@vaadin/text-field/theme/material/vaadin-text-field.js'; -import './vaadin-crud-styles.js'; -import '../../src/vaadin-crud.js'; diff --git a/packages/crud/theme/material/vaadin-lit-crud.js b/packages/crud/theme/material/vaadin-lit-crud.js deleted file mode 100644 index f2cf2254c0e..00000000000 --- a/packages/crud/theme/material/vaadin-lit-crud.js +++ /dev/null @@ -1,8 +0,0 @@ -import '@vaadin/button/theme/material/vaadin-lit-button.js'; -import '@vaadin/confirm-dialog/theme/material/vaadin-lit-confirm-dialog.js'; -import '@vaadin/form-layout/theme/material/vaadin-lit-form-layout.js'; -import '@vaadin/grid/theme/material/vaadin-lit-grid.js'; -import '@vaadin/grid/theme/material/vaadin-lit-grid-sorter.js'; -import '@vaadin/text-field/theme/material/vaadin-lit-text-field.js'; -import './vaadin-crud-styles.js'; -import '../../src/vaadin-lit-crud.js'; diff --git a/packages/custom-field/package.json b/packages/custom-field/package.json index 810cb19c112..01b43a179fc 100644 --- a/packages/custom-field/package.json +++ b/packages/custom-field/package.json @@ -40,7 +40,6 @@ "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/field-base": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/custom-field/test/visual/material/custom-field.test.js b/packages/custom-field/test/visual/material/custom-field.test.js deleted file mode 100644 index 2a2a8b1cab0..00000000000 --- a/packages/custom-field/test/visual/material/custom-field.test.js +++ /dev/null @@ -1,222 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../common.js'; -import '@vaadin/combo-box/theme/material/vaadin-combo-box.js'; -import '@vaadin/date-picker/theme/material/vaadin-date-picker.js'; -import '@vaadin/form-layout/theme/material/vaadin-form-item.js'; -import '@vaadin/form-layout/theme/material/vaadin-form-layout.js'; -import '@vaadin/email-field/theme/material/vaadin-email-field.js'; -import '@vaadin/number-field/theme/material/vaadin-number-field.js'; -import '@vaadin/password-field/theme/material/vaadin-password-field.js'; -import '@vaadin/select/theme/material/vaadin-select.js'; -import '@vaadin/text-area/theme/material/vaadin-text-area.js'; -import '@vaadin/text-field/theme/material/vaadin-text-field.js'; -import '@vaadin/time-picker/theme/material/vaadin-time-picker.js'; -import '../../../theme/material/vaadin-custom-field.js'; - -describe('custom-field', () => { - describe('basic', () => { - let element, inputs; - - beforeEach(() => { - element = fixtureSync(` - - - - - `); - inputs = element.querySelectorAll('input'); - }); - - it('basic', async () => { - await visualDiff(element, 'basic-default'); - }); - - it('label', async () => { - element.label = 'Home address'; - await visualDiff(element, 'basic-label'); - }); - - it('value', async () => { - element.label = 'Home address'; - inputs[0].value = 'Foo street'; - inputs[1].value = 42; - await visualDiff(element, 'basic-value'); - }); - - it('disabled', async () => { - element.disabled = true; - inputs[0].disabled = true; - inputs[1].disabled = true; - await visualDiff(element, 'basic-disabled'); - }); - - it('required', async () => { - element.label = 'Home address'; - element.required = true; - await visualDiff(element, 'basic-required'); - }); - - it('invalid', async () => { - element.label = 'Home address'; - element.required = true; - element.invalid = true; - await visualDiff(element, 'basic-invalid'); - }); - - it('error message', async () => { - element.label = 'Home address'; - element.required = true; - element.errorMessage = 'foo'; - element.invalid = true; - await visualDiff(element, 'basic-error-message'); - }); - - it('disabled required', async () => { - element.label = 'Home address'; - element.required = true; - element.disabled = true; - inputs[0].disabled = true; - inputs[1].disabled = true; - await visualDiff(element, 'basic-disabled-required'); - }); - - it('helper text', async () => { - element.helperText = 'Helper text'; - await visualDiff(element, 'basic-helper-text'); - }); - }); - - describe('alignment', () => { - let wrapper; - - describe('error message', () => { - beforeEach(() => { - wrapper = fixtureSync(` -
- - - - - - -
- `); - }); - - it('error message alignment', async () => { - await visualDiff(wrapper, 'alignment-error-message'); - }); - }); - - describe('label', () => { - beforeEach(() => { - wrapper = fixtureSync(` -
- - - - - - -
- `); - }); - - it('label alignment', async () => { - await visualDiff(wrapper, 'alignment-label'); - }); - }); - - describe('label + error message', () => { - beforeEach(() => { - wrapper = fixtureSync(` -
- - - - - - -
- `); - }); - - it('label + error message alignment', async () => { - await visualDiff(wrapper, 'alignment-label-error-message'); - }); - }); - - describe('label + helper text', () => { - beforeEach(() => { - wrapper = fixtureSync(` -
- - - - - - -
- `); - }); - - it('label + helper text alignment', async () => { - await visualDiff(wrapper, 'alignment-label-helper-text'); - }); - }); - }); - - describe('form-layout', () => { - let layout; - - describe('label + error message', () => { - beforeEach(() => { - layout = fixtureSync(` - - - - - - - `); - }); - - it('label in form layout', async () => { - await visualDiff(layout, 'form-layout-label-error-message'); - }); - }); - - describe('form-item', () => { - beforeEach(() => { - layout = fixtureSync(` - - - - - - - - - - - - - `); - }); - - it('label in form layout', async () => { - await visualDiff(layout, 'form-layout-item-text-area'); - }); - }); - }); -}); diff --git a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/alignment-error-message.png b/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/alignment-error-message.png deleted file mode 100644 index b333523b36c..00000000000 Binary files a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/alignment-error-message.png and /dev/null differ diff --git a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/alignment-label-error-message.png b/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/alignment-label-error-message.png deleted file mode 100644 index 1cffc4c0556..00000000000 Binary files a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/alignment-label-error-message.png and /dev/null differ diff --git a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/alignment-label-helper-text.png b/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/alignment-label-helper-text.png deleted file mode 100644 index 55dbaee7586..00000000000 Binary files a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/alignment-label-helper-text.png and /dev/null differ diff --git a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/alignment-label.png b/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/alignment-label.png deleted file mode 100644 index 6bad67013cb..00000000000 Binary files a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/alignment-label.png and /dev/null differ diff --git a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-default.png b/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-default.png deleted file mode 100644 index d358fc47cee..00000000000 Binary files a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-default.png and /dev/null differ diff --git a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-disabled-required.png b/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-disabled-required.png deleted file mode 100644 index 7dd83777667..00000000000 Binary files a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-disabled-required.png and /dev/null differ diff --git a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-disabled.png b/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-disabled.png deleted file mode 100644 index 82e78da0a6c..00000000000 Binary files a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-disabled.png and /dev/null differ diff --git a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-error-message.png b/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-error-message.png deleted file mode 100644 index a1629bd3f33..00000000000 Binary files a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-error-message.png and /dev/null differ diff --git a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-helper-text.png b/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-helper-text.png deleted file mode 100644 index b9024c154ee..00000000000 Binary files a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-helper-text.png and /dev/null differ diff --git a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-invalid.png b/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-invalid.png deleted file mode 100644 index 1605ac417a9..00000000000 Binary files a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-invalid.png and /dev/null differ diff --git a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-label.png b/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-label.png deleted file mode 100644 index d3dae37fdef..00000000000 Binary files a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-label.png and /dev/null differ diff --git a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-required.png b/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-required.png deleted file mode 100644 index f20acd07a15..00000000000 Binary files a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-required.png and /dev/null differ diff --git a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-value.png b/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-value.png deleted file mode 100644 index bd69da4f6b7..00000000000 Binary files a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/basic-value.png and /dev/null differ diff --git a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/form-layout-item-text-area.png b/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/form-layout-item-text-area.png deleted file mode 100644 index 6ad97c98753..00000000000 Binary files a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/form-layout-item-text-area.png and /dev/null differ diff --git a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/form-layout-label-error-message.png b/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/form-layout-label-error-message.png deleted file mode 100644 index 12d928b516f..00000000000 Binary files a/packages/custom-field/test/visual/material/screenshots/custom-field/baseline/form-layout-label-error-message.png and /dev/null differ diff --git a/packages/custom-field/theme/material/vaadin-custom-field-styles.js b/packages/custom-field/theme/material/vaadin-custom-field-styles.js deleted file mode 100644 index 94c69b36892..00000000000 --- a/packages/custom-field/theme/material/vaadin-custom-field-styles.js +++ /dev/null @@ -1,51 +0,0 @@ -/** - * @license - * Copyright (c) 2019 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import { helper } from '@vaadin/vaadin-material-styles/mixins/helper.js'; -import { requiredField } from '@vaadin/vaadin-material-styles/mixins/required-field.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const customField = css` - :host { - display: inline-flex; - position: relative; - margin-bottom: 8px; - outline: none; - color: var(--material-body-text-color); - font-size: var(--material-body-font-size); - font-family: var(--material-font-family); - line-height: 48px; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - } - - /* align with text-field label */ - :host([has-label]) { - padding-top: 16px; - } - - /* align with text-field error message */ - :host([has-error-message]) [part='error-message'], - :host([has-helper]) [part='helper-text'] { - margin-top: -8px; - } - - :host([disabled]) [part='label'] { - color: var(--material-disabled-text-color); - -webkit-text-fill-color: var(--material-disabled-text-color); - } - - :host([focused]:not([invalid])) [part='label'] { - color: var(--material-primary-text-color); - } -`; - -registerStyles('vaadin-custom-field', [requiredField, helper, customField], { - moduleId: 'material-custom-field', -}); - -export { customField }; diff --git a/packages/custom-field/theme/material/vaadin-custom-field.js b/packages/custom-field/theme/material/vaadin-custom-field.js deleted file mode 100644 index f4d8499f6fd..00000000000 --- a/packages/custom-field/theme/material/vaadin-custom-field.js +++ /dev/null @@ -1,7 +0,0 @@ -/** - * @license - * Copyright (c) 2019 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import './vaadin-custom-field-styles.js'; -import '../../src/vaadin-custom-field.js'; diff --git a/packages/custom-field/theme/material/vaadin-lit-custom-field.js b/packages/custom-field/theme/material/vaadin-lit-custom-field.js deleted file mode 100644 index f577a7f9c19..00000000000 --- a/packages/custom-field/theme/material/vaadin-lit-custom-field.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-custom-field-styles.js'; -import '../../src/vaadin-lit-custom-field.js'; diff --git a/packages/dashboard/package.json b/packages/dashboard/package.json index 2fe16cdab9a..5adc7ac0ff6 100644 --- a/packages/dashboard/package.json +++ b/packages/dashboard/package.json @@ -40,7 +40,6 @@ "@vaadin/button": "25.0.0-alpha0", "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/dashboard/test/visual/material/dashboard.test.ts b/packages/dashboard/test/visual/material/dashboard.test.ts deleted file mode 100644 index fd40e6bc9e3..00000000000 --- a/packages/dashboard/test/visual/material/dashboard.test.ts +++ /dev/null @@ -1,3 +0,0 @@ -describe('dashboard', () => { - // Dashboard has no material theme -}); diff --git a/packages/dashboard/theme/material/vaadin-dashboard-layout.js b/packages/dashboard/theme/material/vaadin-dashboard-layout.js deleted file mode 100644 index 523bb302e6d..00000000000 --- a/packages/dashboard/theme/material/vaadin-dashboard-layout.js +++ /dev/null @@ -1 +0,0 @@ -import '../../src/vaadin-dashboard-layout.js'; diff --git a/packages/dashboard/theme/material/vaadin-dashboard-section.js b/packages/dashboard/theme/material/vaadin-dashboard-section.js deleted file mode 100644 index 9f87341afeb..00000000000 --- a/packages/dashboard/theme/material/vaadin-dashboard-section.js +++ /dev/null @@ -1 +0,0 @@ -import '../../src/vaadin-dashboard-section.js'; diff --git a/packages/dashboard/theme/material/vaadin-dashboard-widget.js b/packages/dashboard/theme/material/vaadin-dashboard-widget.js deleted file mode 100644 index dd4483955ba..00000000000 --- a/packages/dashboard/theme/material/vaadin-dashboard-widget.js +++ /dev/null @@ -1 +0,0 @@ -import '../../src/vaadin-dashboard-widget.js'; diff --git a/packages/dashboard/theme/material/vaadin-dashboard.js b/packages/dashboard/theme/material/vaadin-dashboard.js deleted file mode 100644 index 523f18cc050..00000000000 --- a/packages/dashboard/theme/material/vaadin-dashboard.js +++ /dev/null @@ -1,3 +0,0 @@ -import './vaadin-dashboard-section.js'; -import './vaadin-dashboard-widget.js'; -import '../../src/vaadin-dashboard.js'; diff --git a/packages/date-picker/package.json b/packages/date-picker/package.json index d766fcbd387..40f744bec5a 100644 --- a/packages/date-picker/package.json +++ b/packages/date-picker/package.json @@ -43,7 +43,6 @@ "@vaadin/input-container": "25.0.0-alpha0", "@vaadin/overlay": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/date-picker/test/visual/material/date-picker.test.js b/packages/date-picker/test/visual/material/date-picker.test.js deleted file mode 100644 index 947a4b6270f..00000000000 --- a/packages/date-picker/test/visual/material/date-picker.test.js +++ /dev/null @@ -1,127 +0,0 @@ -import { sendKeys } from '@vaadin/test-runner-commands'; -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../not-animated-styles.js'; -import '../common.js'; -import '../../../theme/material/vaadin-date-picker.js'; -import { untilOverlayRendered } from '../../helpers.js'; - -describe('date-picker', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - div.style.padding = '10px'; - element = fixtureSync('', div); - }); - - it('basic', async () => { - await visualDiff(div, 'basic'); - }); - - it('disabled', async () => { - element.disabled = true; - await visualDiff(div, 'disabled'); - }); - - it('readonly', async () => { - element.readonly = true; - await visualDiff(div, 'readonly'); - }); - - it('flex', async () => { - div.style.display = 'inline-flex'; - div.style.height = '200px'; - await visualDiff(div, 'flex'); - }); - - it('focus-ring', async () => { - await sendKeys({ press: 'Tab' }); - - await visualDiff(div, 'focus-ring'); - }); - - ['ltr', 'rtl'].forEach((dir) => { - describe(dir, () => { - before(() => { - document.documentElement.setAttribute('dir', dir); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - it('label', async () => { - element.label = 'Label'; - await visualDiff(div, `${dir}-label`); - }); - - it('placeholder', async () => { - element.placeholder = 'Placeholder'; - await visualDiff(div, `${dir}-placeholder`); - }); - - it('value', async () => { - element.value = '1991-12-20'; - await visualDiff(div, `${dir}-value`); - }); - - it('required', async () => { - element.label = 'Label'; - element.required = true; - await visualDiff(div, `${dir}-required`); - }); - - it('error message', async () => { - element.label = 'Label'; - element.errorMessage = 'This field is required'; - element.required = true; - element.validate(); - await visualDiff(div, `${dir}-error-message`); - }); - - it('helper text', async () => { - element.helperText = 'Helper text'; - await visualDiff(div, `${dir}-helper-text`); - }); - - it('clear button', async () => { - element.value = '1991-12-20'; - element.clearButtonVisible = true; - await visualDiff(div, `${dir}-clear-button`); - }); - - it('prefix slot', async () => { - const span = document.createElement('span'); - span.setAttribute('slot', 'prefix'); - span.textContent = '$'; - element.appendChild(span); - await visualDiff(div, `${dir}-prefix`); - }); - - describe('dropdown', () => { - async function openOverlay() { - element.opened = true; - div.style.height = `${element.offsetHeight + element.$.overlay.$.overlay.offsetHeight}px`; - div.style.width = `${element.$.overlay.$.overlay.offsetWidth}px`; - await untilOverlayRendered(element); - } - - it('default', async () => { - element.value = '2000-01-01'; - await openOverlay(); - await visualDiff(div, `${dir}-dropdown`); - }); - - it('week numbers', async () => { - element.value = '2000-01-01'; - element.showWeekNumbers = true; - element.i18n = { firstDayOfWeek: 1 }; - await openOverlay(); - await visualDiff(div, `${dir}-week-numbers`); - }); - }); - }); - }); -}); diff --git a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/basic.png b/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/basic.png deleted file mode 100644 index a6a2654d397..00000000000 Binary files a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/basic.png and /dev/null differ diff --git a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/disabled.png b/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/disabled.png deleted file mode 100644 index 8410bb89f69..00000000000 Binary files a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/disabled.png and /dev/null differ diff --git a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/flex.png b/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/flex.png deleted file mode 100644 index d6ae2c35f5a..00000000000 Binary files a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/flex.png and /dev/null differ diff --git a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/focus-ring.png b/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/focus-ring.png deleted file mode 100644 index 216cf9b9018..00000000000 Binary files a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/focus-ring.png and /dev/null differ diff --git a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-clear-button.png b/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-clear-button.png deleted file mode 100644 index 5b0e400ec54..00000000000 Binary files a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-clear-button.png and /dev/null differ diff --git a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-dropdown.png b/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-dropdown.png deleted file mode 100644 index f475a90ed59..00000000000 Binary files a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-dropdown.png and /dev/null differ diff --git a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-error-message.png b/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-error-message.png deleted file mode 100644 index 5aa86509c20..00000000000 Binary files a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-error-message.png and /dev/null differ diff --git a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-helper-text.png b/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-helper-text.png deleted file mode 100644 index 953e56a93d7..00000000000 Binary files a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-helper-text.png and /dev/null differ diff --git a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-label.png b/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-label.png deleted file mode 100644 index 533639f3c35..00000000000 Binary files a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-label.png and /dev/null differ diff --git a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-placeholder.png b/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-placeholder.png deleted file mode 100644 index ae84bd17e8b..00000000000 Binary files a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-placeholder.png and /dev/null differ diff --git a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-prefix.png b/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-prefix.png deleted file mode 100644 index 46d84ca28f7..00000000000 Binary files a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-prefix.png and /dev/null differ diff --git a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-required.png b/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-required.png deleted file mode 100644 index e8f13da0838..00000000000 Binary files a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-required.png and /dev/null differ diff --git a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-value.png b/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-value.png deleted file mode 100644 index 607d8f77aac..00000000000 Binary files a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-value.png and /dev/null differ diff --git a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-week-numbers.png b/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-week-numbers.png deleted file mode 100644 index 58ecae3ec04..00000000000 Binary files a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/ltr-week-numbers.png and /dev/null differ diff --git a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/readonly.png b/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/readonly.png deleted file mode 100644 index 851567a4bcd..00000000000 Binary files a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/readonly.png and /dev/null differ diff --git a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-clear-button.png b/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-clear-button.png deleted file mode 100644 index 5b0e400ec54..00000000000 Binary files a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-clear-button.png and /dev/null differ diff --git a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-dropdown.png b/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-dropdown.png deleted file mode 100644 index f1aeeb7d062..00000000000 Binary files a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-dropdown.png and /dev/null differ diff --git a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-error-message.png b/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-error-message.png deleted file mode 100644 index 85647d1390b..00000000000 Binary files a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-error-message.png and /dev/null differ diff --git a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-helper-text.png b/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-helper-text.png deleted file mode 100644 index b28b8494734..00000000000 Binary files a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-helper-text.png and /dev/null differ diff --git a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-label.png b/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-label.png deleted file mode 100644 index 129911addca..00000000000 Binary files a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-label.png and /dev/null differ diff --git a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-placeholder.png b/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-placeholder.png deleted file mode 100644 index ae84bd17e8b..00000000000 Binary files a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-placeholder.png and /dev/null differ diff --git a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-prefix.png b/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-prefix.png deleted file mode 100644 index 46d84ca28f7..00000000000 Binary files a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-prefix.png and /dev/null differ diff --git a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-required.png b/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-required.png deleted file mode 100644 index 053b1d85f6f..00000000000 Binary files a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-required.png and /dev/null differ diff --git a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-value.png b/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-value.png deleted file mode 100644 index 607d8f77aac..00000000000 Binary files a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-value.png and /dev/null differ diff --git a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-week-numbers.png b/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-week-numbers.png deleted file mode 100644 index 8b66889c1ba..00000000000 Binary files a/packages/date-picker/test/visual/material/screenshots/date-picker/baseline/rtl-week-numbers.png and /dev/null differ diff --git a/packages/date-picker/theme/material/vaadin-date-picker-overlay-content-styles.js b/packages/date-picker/theme/material/vaadin-date-picker-overlay-content-styles.js deleted file mode 100644 index d2f819c415c..00000000000 --- a/packages/date-picker/theme/material/vaadin-date-picker-overlay-content-styles.js +++ /dev/null @@ -1,132 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/font-icons.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import '@vaadin/vaadin-material-styles/shadow.js'; -import '@vaadin/button/theme/material/vaadin-button-styles.js'; -import './vaadin-date-picker-year-styles.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-date-picker-overlay-content', - css` - :host { - background: var(--material-background-color); - font-family: var(--material-font-family); - font-size: var(--material-body-font-size); - -webkit-text-size-adjust: 100%; - line-height: 1.4; - } - - :host([fullscreen]) { - position: absolute; - } - - [part='overlay-header'] { - display: flex; - align-items: baseline; - position: relative; - color: var(--material-body-text-color); - background: var(--material-secondary-background-color); - border-bottom: 2px solid var(--material-primary-color); - padding: 8px; - box-shadow: var(--material-shadow-elevation-4dp); - } - - [part='label'] { - padding: 0 8px; - flex: auto; - } - - [part='clear-button'], - [part='toggle-button'] { - font-family: 'material-icons'; - font-size: var(--material-icon-font-size); - line-height: 24px; - width: 24px; - height: 24px; - text-align: center; - padding: 8px; - color: var(--material-secondary-text-color); - } - - [part='clear-button']:hover, - [part='toggle-button']:hover, - [part='years-toggle-button']:hover { - color: inherit; - } - - [part='clear-button']::before { - content: var(--material-icons-clear); - } - - [part='toggle-button']::before { - content: var(--material-icons-calendar); - } - - [part='years-toggle-button'] { - padding: 4px 8px; - font-size: var(--material-body-font-size); - font-weight: 500; - line-height: 24px; - letter-spacing: 0.05em; - color: var(--material-secondary-text-color); - } - - [part='years-toggle-button']::after { - content: var(--material-icons-play); - display: inline-block; - width: 24px; - font-family: 'material-icons'; - font-size: var(--material-icon-font-size); - line-height: 24px; - text-align: center; - transition: transform 100ms cubic-bezier(0.4, 0, 0.2, 1); - } - - :host([years-visible]) [part='years-toggle-button']::after { - transform: rotate(90deg); - } - - ::slotted([slot='months']) { - --vaadin-infinite-scroller-item-height: 328px; - text-align: center; - } - - ::slotted([slot='years']) { - background: var(--material-secondary-text-color); - color: var(--material-background-color); - font-size: var(--material-body-font-size); - font-weight: 400; - line-height: 1.4; - text-align: center; - } - - ::slotted([slot='years'])::before { - border: 0; - width: 8px; - height: 8px; - transform: translateX(-50%) rotate(-45deg); - background: var(--material-background-color); - } - - [part='toolbar'] { - display: flex; - justify-content: flex-end; - padding: 8px 4px; - border-top: 1px solid var(--material-divider-color); - } - - ::slotted([slot='cancel-button']) { - order: 1; - } - - ::slotted([slot='today-button']) { - order: 2; - } - - ::slotted(vaadin-button) { - margin: 0 4px; - } - `, - { moduleId: 'material-date-picker-overlay-content' }, -); diff --git a/packages/date-picker/theme/material/vaadin-date-picker-overlay-styles.js b/packages/date-picker/theme/material/vaadin-date-picker-overlay-styles.js deleted file mode 100644 index d651092aad1..00000000000 --- a/packages/date-picker/theme/material/vaadin-date-picker-overlay-styles.js +++ /dev/null @@ -1,47 +0,0 @@ -import { overlay } from '@vaadin/vaadin-material-styles/mixins/overlay.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const datePickerOverlay = css` - :host([fullscreen]) { - /* stylelint-disable declaration-block-no-redundant-longhand-properties */ - top: 0 !important; - right: 0 !important; - bottom: var(--vaadin-overlay-viewport-bottom) !important; - left: 0 !important; - /* stylelint-enable declaration-block-no-redundant-longhand-properties */ - align-items: stretch; - justify-content: stretch; - } - - [part='overlay'] { - overflow: hidden; - -webkit-overflow-scrolling: auto; - } - - :host(:not([fullscreen])) [part='overlay'] { - width: 360px; - max-height: 500px; - border-radius: 0 4px 4px; - } - - :host(:not([dir='rtl']):not([fullscreen])[end-aligned]) [part='overlay'], - :host([dir='rtl']:not([fullscreen])[start-aligned]) [part='overlay'] { - border-radius: 4px 0 4px 4px; - } - - :host(:not([fullscreen])[bottom-aligned]) [part='overlay'] { - border-radius: 4px; - } - - :host(:not([fullscreen])[show-week-numbers]) [part='overlay'] { - width: 396px; - } - - [part='content'] { - padding: 0; - } -`; - -registerStyles('vaadin-date-picker-overlay', [overlay, datePickerOverlay], { - moduleId: 'material-date-picker-overlay', -}); diff --git a/packages/date-picker/theme/material/vaadin-date-picker-styles.js b/packages/date-picker/theme/material/vaadin-date-picker-styles.js deleted file mode 100644 index 640dde28439..00000000000 --- a/packages/date-picker/theme/material/vaadin-date-picker-styles.js +++ /dev/null @@ -1,22 +0,0 @@ -import '@vaadin/input-container/theme/material/vaadin-input-container-styles.js'; -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/font-icons.js'; -import { inputFieldShared } from '@vaadin/vaadin-material-styles/mixins/input-field-shared.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const datePicker = css` - :host { - display: inline-flex; - -webkit-tap-highlight-color: transparent; - } - - [part='clear-button']::before { - content: var(--material-icons-clear); - } - - [part='toggle-button']::before { - content: var(--material-icons-calendar); - } -`; - -registerStyles('vaadin-date-picker', [inputFieldShared, datePicker], { moduleId: 'material-date-picker' }); diff --git a/packages/date-picker/theme/material/vaadin-date-picker-year-styles.js b/packages/date-picker/theme/material/vaadin-date-picker-year-styles.js deleted file mode 100644 index be11dfca505..00000000000 --- a/packages/date-picker/theme/material/vaadin-date-picker-year-styles.js +++ /dev/null @@ -1,28 +0,0 @@ -import '@vaadin/vaadin-material-styles/typography.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-date-picker-year', - css` - [part='year-number'] { - font-size: var(--material-small-font-size); - line-height: 10px; /* NOTE(platosha): chosen to align years to months */ - } - - [part='year-separator'] { - display: flex; - align-items: center; - justify-content: center; - height: calc(100% - 10px); - } - - [part='year-separator']::before { - content: ''; - background-color: currentColor; - width: 4px; - height: 4px; - border-radius: 50%; - } - `, - { moduleId: 'material-date-picker-year' }, -); diff --git a/packages/date-picker/theme/material/vaadin-date-picker.js b/packages/date-picker/theme/material/vaadin-date-picker.js deleted file mode 100644 index 1be902a65d9..00000000000 --- a/packages/date-picker/theme/material/vaadin-date-picker.js +++ /dev/null @@ -1,5 +0,0 @@ -import './vaadin-date-picker-overlay-styles.js'; -import './vaadin-date-picker-overlay-content-styles.js'; -import './vaadin-month-calendar-styles.js'; -import './vaadin-date-picker-styles.js'; -import '../../src/vaadin-date-picker.js'; diff --git a/packages/date-picker/theme/material/vaadin-lit-date-picker.js b/packages/date-picker/theme/material/vaadin-lit-date-picker.js deleted file mode 100644 index 1859e2a7392..00000000000 --- a/packages/date-picker/theme/material/vaadin-lit-date-picker.js +++ /dev/null @@ -1,5 +0,0 @@ -import './vaadin-date-picker-overlay-styles.js'; -import './vaadin-date-picker-overlay-content-styles.js'; -import './vaadin-month-calendar-styles.js'; -import './vaadin-date-picker-styles.js'; -import '../../src/vaadin-lit-date-picker.js'; diff --git a/packages/date-picker/theme/material/vaadin-month-calendar-styles.js b/packages/date-picker/theme/material/vaadin-month-calendar-styles.js deleted file mode 100644 index eb0c9827e49..00000000000 --- a/packages/date-picker/theme/material/vaadin-month-calendar-styles.js +++ /dev/null @@ -1,120 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-month-calendar', - css` - :host { - color: var(--material-body-text-color); - padding: 0 calc(50% / 8 - 0.5em + 8px); - } - - :host([show-week-numbers]) { - padding: 0 calc(50% / 9 - 0.5em + 8px); - } - - [part='month-header'] { - font-size: var(--material-h6-font-size); - line-height: 1; - padding-top: 20px; - margin-bottom: 8px; - } - - [part='week-number'], - [part='weekday'] { - font-size: var(--material-caption-font-size); - line-height: 44px; - height: 40px; - color: var(--material-secondary-text-color); - } - - :host([disabled]), - :host([disabled]) [part='week-number'], - :host([disabled]) [part='weekday'] { - color: var(--material-disabled-text-color); - } - - [part~='date'] { - position: relative; - font-size: var(--material-body-font-size); - line-height: 42px; - height: 40px; - cursor: default; - } - - [part~='date']::after { - content: ''; - position: absolute; - z-index: -4; - top: 50%; - left: 50%; - transform: translate(-50%, -50%); - width: 38px; - height: 38px; - box-sizing: border-box; - border-radius: 50%; - border: 2px solid transparent; - } - - /* Today */ - - [part~='date'][part~='today'] { - color: var(--material-primary-text-color); - } - - /* Hover */ - - [part~='date']:not([part~='disabled']):hover::after { - background-color: var(--material-secondary-background-color); - border-color: var(--material-secondary-background-color); - z-index: -3; - } - - /* Hide for touch devices */ - @media (hover: none) { - [part~='date']:not([part~='disabled']):hover::after { - background-color: transparent; - border-color: transparent; - z-index: -4; - } - } - - /* Selected */ - - [part~='date'][part~='selected'] { - font-weight: 500; - } - - [part~='date']:not([part~='disabled'])[part~='selected']::after, - [part~='date'][part~='selected']::after { - background-color: transparent; - border-color: currentColor; - z-index: -2; - } - - /* Focused */ - - [part~='date']:not([part~='disabled'])[part~='focused'], - [part~='date']:not([part~='disabled']):active { - color: var(--material-primary-contrast-color); - } - - [part~='date']:not([part~='disabled'])[part~='focused']::after, - [part~='date']:not([part~='disabled']):active::after { - opacity: 0.7; - background-color: var(--material-primary-color); - border-color: var(--material-primary-color); - z-index: -1; - } - - [part~='date'][part~='disabled'] { - color: var(--material-disabled-text-color); - } - - :host([focused]) [part~='date']:not([part~='disabled'])[part~='focused']::after { - opacity: 1; - } - `, - { moduleId: 'material-date-picker-month-calendar' }, -); diff --git a/packages/date-time-picker/package.json b/packages/date-time-picker/package.json index 603cd00ea97..6b03bac57a7 100644 --- a/packages/date-time-picker/package.json +++ b/packages/date-time-picker/package.json @@ -44,7 +44,6 @@ "@vaadin/field-base": "25.0.0-alpha0", "@vaadin/time-picker": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/date-time-picker/test/visual/material/date-time-picker.test.js b/packages/date-time-picker/test/visual/material/date-time-picker.test.js deleted file mode 100644 index b13cf265956..00000000000 --- a/packages/date-time-picker/test/visual/material/date-time-picker.test.js +++ /dev/null @@ -1,94 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../common.js'; -import '../../../theme/material/vaadin-date-time-picker.js'; - -describe('date-time-picker', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - div.style.padding = '10px'; - element = fixtureSync('', div); - }); - - describe('default', () => { - it('basic', async () => { - await visualDiff(div, 'basic'); - }); - - it('disabled', async () => { - element.disabled = true; - await visualDiff(div, 'disabled'); - }); - - it('readonly', async () => { - element.readonly = true; - await visualDiff(div, 'readonly'); - }); - - it('label', async () => { - element.label = 'Label'; - await visualDiff(div, 'label'); - }); - - it('focused', async () => { - element.label = 'Label'; - element.focus(); - await visualDiff(div, 'focused'); - }); - - it('placeholder', async () => { - element.datePlaceholder = 'Date'; - element.timePlaceholder = 'Time'; - await visualDiff(div, 'placeholder'); - }); - - it('value', async () => { - element.value = '2019-09-16T15:00'; - await visualDiff(div, 'value'); - }); - - it('required', async () => { - element.label = 'Label'; - element.required = true; - await visualDiff(div, 'required'); - }); - - it('error message', async () => { - element.label = 'Label'; - element.errorMessage = 'This field is required'; - element.required = true; - element.validate(); - await visualDiff(div, 'error-message'); - }); - - it('helper text', async () => { - element.helperText = 'Helper text'; - await visualDiff(div, 'helper-text'); - }); - }); - - describe('RTL', () => { - before(() => { - document.documentElement.setAttribute('dir', 'rtl'); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - it('RTL', async () => { - await visualDiff(div, 'rtl-basic'); - }); - - it('RTL error message', async () => { - element.label = 'Label'; - element.errorMessage = 'This field is required'; - element.required = true; - element.validate(); - await visualDiff(div, 'rtl-error-message'); - }); - }); -}); diff --git a/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/basic.png b/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/basic.png deleted file mode 100644 index b50ccad2eef..00000000000 Binary files a/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/basic.png and /dev/null differ diff --git a/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/disabled.png b/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/disabled.png deleted file mode 100644 index 6c5df862a8d..00000000000 Binary files a/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/disabled.png and /dev/null differ diff --git a/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/error-message.png b/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/error-message.png deleted file mode 100644 index 59ad8884888..00000000000 Binary files a/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/error-message.png and /dev/null differ diff --git a/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/focused.png b/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/focused.png deleted file mode 100644 index a8adb0d81b7..00000000000 Binary files a/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/focused.png and /dev/null differ diff --git a/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/helper-text.png b/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/helper-text.png deleted file mode 100644 index 6758c0b30aa..00000000000 Binary files a/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/helper-text.png and /dev/null differ diff --git a/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/label.png b/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/label.png deleted file mode 100644 index 1f432f0bedd..00000000000 Binary files a/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/label.png and /dev/null differ diff --git a/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/placeholder.png b/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/placeholder.png deleted file mode 100644 index 3ba64ad62b5..00000000000 Binary files a/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/placeholder.png and /dev/null differ diff --git a/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/readonly.png b/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/readonly.png deleted file mode 100644 index a7911fab539..00000000000 Binary files a/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/readonly.png and /dev/null differ diff --git a/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/required.png b/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/required.png deleted file mode 100644 index 7195489892b..00000000000 Binary files a/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/required.png and /dev/null differ diff --git a/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/rtl-basic.png b/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/rtl-basic.png deleted file mode 100644 index ebff48e8a6d..00000000000 Binary files a/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/rtl-basic.png and /dev/null differ diff --git a/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/rtl-error-message.png b/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/rtl-error-message.png deleted file mode 100644 index bed1ab502d3..00000000000 Binary files a/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/rtl-error-message.png and /dev/null differ diff --git a/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/value.png b/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/value.png deleted file mode 100644 index d6601ecde01..00000000000 Binary files a/packages/date-time-picker/test/visual/material/screenshots/date-time-picker/baseline/value.png and /dev/null differ diff --git a/packages/date-time-picker/theme/material/vaadin-date-time-picker-styles.js b/packages/date-time-picker/theme/material/vaadin-date-time-picker-styles.js deleted file mode 100644 index ce966aac2f4..00000000000 --- a/packages/date-time-picker/theme/material/vaadin-date-time-picker-styles.js +++ /dev/null @@ -1,8 +0,0 @@ -import { customField } from '@vaadin/custom-field/theme/material/vaadin-custom-field-styles.js'; -import { helper } from '@vaadin/vaadin-material-styles/mixins/helper.js'; -import { requiredField } from '@vaadin/vaadin-material-styles/mixins/required-field.js'; -import { registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles('vaadin-date-time-picker', [requiredField, helper, customField], { - moduleId: 'material-date-time-picker', -}); diff --git a/packages/date-time-picker/theme/material/vaadin-date-time-picker.js b/packages/date-time-picker/theme/material/vaadin-date-time-picker.js deleted file mode 100644 index 0304e660ebb..00000000000 --- a/packages/date-time-picker/theme/material/vaadin-date-time-picker.js +++ /dev/null @@ -1,4 +0,0 @@ -import '@vaadin/date-picker/theme/material/vaadin-date-picker.js'; -import '@vaadin/time-picker/theme/material/vaadin-time-picker.js'; -import './vaadin-date-time-picker-styles.js'; -import '../../src/vaadin-date-time-picker.js'; diff --git a/packages/date-time-picker/theme/material/vaadin-lit-date-time-picker.js b/packages/date-time-picker/theme/material/vaadin-lit-date-time-picker.js deleted file mode 100644 index 49f8c3bce60..00000000000 --- a/packages/date-time-picker/theme/material/vaadin-lit-date-time-picker.js +++ /dev/null @@ -1,4 +0,0 @@ -import '@vaadin/date-picker/theme/material/vaadin-lit-date-picker.js'; -import '@vaadin/time-picker/theme/material/vaadin-lit-time-picker.js'; -import './vaadin-date-time-picker-styles.js'; -import '../../src/vaadin-lit-date-time-picker.js'; diff --git a/packages/details/package.json b/packages/details/package.json index ef8ec7d0e92..152bc71a8f3 100644 --- a/packages/details/package.json +++ b/packages/details/package.json @@ -43,7 +43,6 @@ "@vaadin/button": "25.0.0-alpha0", "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/details/test/visual/material/details.test.js b/packages/details/test/visual/material/details.test.js deleted file mode 100644 index a3139f64be3..00000000000 --- a/packages/details/test/visual/material/details.test.js +++ /dev/null @@ -1,68 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-details.js'; - -describe('details', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.padding = '10px'; - - element = fixtureSync( - ` - - Summary - Content - - `, - div, - ); - }); - - describe('default', () => { - it('basic', async () => { - await visualDiff(div, 'basic'); - }); - - it('opened', async () => { - element.opened = true; - await visualDiff(div, 'opened'); - }); - - it('focus-ring', async () => { - element.setAttribute('focus-ring', ''); - await visualDiff(div, 'focus-ring'); - }); - - it('disabled', async () => { - element.disabled = true; - await visualDiff(div, 'disabled'); - }); - - it('disabled opened', async () => { - element.opened = true; - element.disabled = true; - await visualDiff(div, 'disabled-opened'); - }); - }); - - describe('RTL', () => { - before(() => { - document.documentElement.setAttribute('dir', 'rtl'); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - it('RTL basic', async () => { - await visualDiff(div, 'rtl-basic'); - }); - - it('RTL opened', async () => { - element.opened = true; - await visualDiff(div, 'rtl-opened'); - }); - }); -}); diff --git a/packages/details/test/visual/material/screenshots/details/baseline/basic.png b/packages/details/test/visual/material/screenshots/details/baseline/basic.png deleted file mode 100644 index e95eed04b5f..00000000000 Binary files a/packages/details/test/visual/material/screenshots/details/baseline/basic.png and /dev/null differ diff --git a/packages/details/test/visual/material/screenshots/details/baseline/disabled-opened.png b/packages/details/test/visual/material/screenshots/details/baseline/disabled-opened.png deleted file mode 100644 index 92ab10cd33f..00000000000 Binary files a/packages/details/test/visual/material/screenshots/details/baseline/disabled-opened.png and /dev/null differ diff --git a/packages/details/test/visual/material/screenshots/details/baseline/disabled.png b/packages/details/test/visual/material/screenshots/details/baseline/disabled.png deleted file mode 100644 index 51023b5a73f..00000000000 Binary files a/packages/details/test/visual/material/screenshots/details/baseline/disabled.png and /dev/null differ diff --git a/packages/details/test/visual/material/screenshots/details/baseline/focus-ring.png b/packages/details/test/visual/material/screenshots/details/baseline/focus-ring.png deleted file mode 100644 index a6c292e88a3..00000000000 Binary files a/packages/details/test/visual/material/screenshots/details/baseline/focus-ring.png and /dev/null differ diff --git a/packages/details/test/visual/material/screenshots/details/baseline/opened.png b/packages/details/test/visual/material/screenshots/details/baseline/opened.png deleted file mode 100644 index d447b643c5d..00000000000 Binary files a/packages/details/test/visual/material/screenshots/details/baseline/opened.png and /dev/null differ diff --git a/packages/details/test/visual/material/screenshots/details/baseline/rtl-basic.png b/packages/details/test/visual/material/screenshots/details/baseline/rtl-basic.png deleted file mode 100644 index 67318ea4ee0..00000000000 Binary files a/packages/details/test/visual/material/screenshots/details/baseline/rtl-basic.png and /dev/null differ diff --git a/packages/details/test/visual/material/screenshots/details/baseline/rtl-opened.png b/packages/details/test/visual/material/screenshots/details/baseline/rtl-opened.png deleted file mode 100644 index 90073a6984c..00000000000 Binary files a/packages/details/test/visual/material/screenshots/details/baseline/rtl-opened.png and /dev/null differ diff --git a/packages/details/theme/material/vaadin-details-styles.js b/packages/details/theme/material/vaadin-details-styles.js deleted file mode 100644 index a5a0d0eed85..00000000000 --- a/packages/details/theme/material/vaadin-details-styles.js +++ /dev/null @@ -1,24 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/shadow.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const details = css` - :host { - font-family: var(--material-font-family); - box-shadow: var(--material-shadow-elevation-2dp); - outline: none; - } - - :host([focus-ring]) ::slotted([slot='summary']) { - background-color: var(--material-secondary-background-color); - } - - [part='content'] { - padding: 8px 24px 24px; - } -`; - -registerStyles('vaadin-details', details, { moduleId: 'material-details' }); - -export { details }; diff --git a/packages/details/theme/material/vaadin-details-summary-styles.js b/packages/details/theme/material/vaadin-details-summary-styles.js deleted file mode 100644 index 7820a9f441e..00000000000 --- a/packages/details/theme/material/vaadin-details-summary-styles.js +++ /dev/null @@ -1,106 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/font-icons.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const detailsSummary = css` - :host { - display: flex; - align-items: center; - justify-content: space-between; - width: 100%; - position: relative; - outline: none; - min-height: 48px; - padding: 0 24px; - box-sizing: border-box; - font-weight: 500; - font-size: var(--material-small-font-size); - background-color: var(--material-background-color); - color: var(--material-body-text-color); - cursor: default; - -webkit-tap-highlight-color: transparent; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - } - - :host([disabled]) { - color: var(--material-disabled-text-color); - background-color: var(--material-disabled-color); - } - - [part='content'] { - margin: 0; - position: relative; - } - - [part='toggle'] { - position: relative; - order: 1; - margin-inline-start: auto; - right: -8px; - width: 24px; - height: 24px; - padding: 4px; - color: var(--material-secondary-text-color); - line-height: 24px; - text-align: center; - transform: rotate(90deg); - transition: transform 0.1s cubic-bezier(0.4, 0, 0.2, 0.1); - } - - [part='toggle']::before { - font-family: 'material-icons'; - font-size: 24px; - width: 24px; - display: inline-block; - content: var(--material-icons-chevron-right); - } - - [part='toggle']::after { - display: inline-block; - content: ''; - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - border-radius: 50%; - background-color: var(--material-disabled-text-color); - transform: scale(0); - opacity: 0; - transition: - transform 0s 0.8s, - opacity 0.8s; - will-change: transform, opacity; - } - - :host([disabled]) [part='toggle'] { - color: var(--material-disabled-color); - } - - :host([active]:not([disabled])) [part='toggle']::after { - transition-duration: 0.08s, 0.01s; - transition-delay: 0s, 0s; - transform: scale(1.25); - opacity: 0.15; - } - - :host([opened]) [part='toggle'] { - transform: rotate(270deg); - } - - /* RTL specific styles */ - :host([dir='rtl']) [part='toggle'] { - right: 8px; - } - - :host([dir='rtl']) [part='toggle']::after { - left: auto; - right: 0; - } -`; - -registerStyles('vaadin-details-summary', detailsSummary, { moduleId: 'material-details-summary' }); - -export { detailsSummary }; diff --git a/packages/details/theme/material/vaadin-details-summary.js b/packages/details/theme/material/vaadin-details-summary.js deleted file mode 100644 index 8d2b0693467..00000000000 --- a/packages/details/theme/material/vaadin-details-summary.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-details-summary-styles.js'; -import '../../src/vaadin-details-summary.js'; diff --git a/packages/details/theme/material/vaadin-details.js b/packages/details/theme/material/vaadin-details.js deleted file mode 100644 index 042b1af42e7..00000000000 --- a/packages/details/theme/material/vaadin-details.js +++ /dev/null @@ -1,3 +0,0 @@ -import './vaadin-details-summary.js'; -import './vaadin-details-styles.js'; -import '../../src/vaadin-details.js'; diff --git a/packages/details/theme/material/vaadin-lit-details-summary.js b/packages/details/theme/material/vaadin-lit-details-summary.js deleted file mode 100644 index 8978a9f679d..00000000000 --- a/packages/details/theme/material/vaadin-lit-details-summary.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-details-summary-styles.js'; -import '../../src/vaadin-lit-details-summary.js'; diff --git a/packages/details/theme/material/vaadin-lit-details.js b/packages/details/theme/material/vaadin-lit-details.js deleted file mode 100644 index 86cf6f19edf..00000000000 --- a/packages/details/theme/material/vaadin-lit-details.js +++ /dev/null @@ -1,3 +0,0 @@ -import './vaadin-lit-details-summary.js'; -import './vaadin-details-styles.js'; -import '../../src/vaadin-lit-details.js'; diff --git a/packages/dialog/package.json b/packages/dialog/package.json index 77a48773d13..88d7a6cd701 100644 --- a/packages/dialog/package.json +++ b/packages/dialog/package.json @@ -43,7 +43,6 @@ "@vaadin/lit-renderer": "25.0.0-alpha0", "@vaadin/overlay": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/dialog/test/visual/material/dialog.test.js b/packages/dialog/test/visual/material/dialog.test.js deleted file mode 100644 index 9a73a190e90..00000000000 --- a/packages/dialog/test/visual/material/dialog.test.js +++ /dev/null @@ -1,86 +0,0 @@ -import { fixtureSync, nextRender, nextUpdate } from '@vaadin/testing-helpers'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../not-animated-styles.js'; -import '../../../theme/material/vaadin-dialog.js'; -import { createRenderer } from '../../helpers.js'; - -describe('dialog', () => { - let div, element; - - beforeEach(async () => { - div = document.createElement('div'); - div.style.height = '100%'; - - element = fixtureSync(``, div); - element.renderer = createRenderer('Simple dialog with text'); - element.opened = true; - await nextRender(); - }); - - it('basic', async () => { - await visualDiff(div, 'basic'); - }); - - it('modeless', async () => { - element.modeless = true; - await nextUpdate(element); - await visualDiff(div, 'modeless'); - }); - - it('title', async () => { - element.headerTitle = 'Title'; - await nextUpdate(element); - await visualDiff(div, 'header-title'); - }); - - it('header renderer', async () => { - element.headerRenderer = createRenderer('Header'); - await nextUpdate(element); - await visualDiff(div, 'header-renderer'); - }); - - it('title and header renderer', async () => { - element.headerTitle = 'Title'; - element.headerRenderer = createRenderer('Header'); - await nextUpdate(element); - await visualDiff(div, 'header-title-renderer'); - }); - - it('footer renderer', async () => { - element.footerRenderer = createRenderer('Footer'); - await nextUpdate(element); - await visualDiff(div, 'footer-renderer'); - }); - - it('header and footer renderer', async () => { - element.headerRenderer = createRenderer('Header'); - element.footerRenderer = createRenderer('Footer'); - await nextUpdate(element); - await visualDiff(div, 'header-footer-renderer'); - }); - - it('long title and header renderer', async () => { - element.$.overlay.style.maxWidth = '20rem'; - element.headerTitle = 'Long title that wraps in multiple lines'; - element.headerRenderer = createRenderer('Header'); - await nextUpdate(element); - await visualDiff(div, 'header-title-multiple-lines'); - }); - - it('long single word title and header renderer', async () => { - element.$.overlay.style.maxWidth = '20rem'; - element.headerTitle = 'InternationalizationConfigurationHelper'; - element.headerRenderer = createRenderer('Header'); - await nextUpdate(element); - await visualDiff(div, 'header-title-long-single-word'); - }); - - it('should not contain padding with no-padding theme', async () => { - element.setAttribute('theme', 'no-padding'); - const contentStyles = new CSSStyleSheet(); - contentStyles.insertRule('vaadin-dialog-overlay::part(content) { padding: 20px; }'); - document.adoptedStyleSheets = [contentStyles]; - await nextUpdate(element); - await visualDiff(div, 'content-no-padding-theme'); - }); -}); diff --git a/packages/dialog/test/visual/material/screenshots/dialog/baseline/basic.png b/packages/dialog/test/visual/material/screenshots/dialog/baseline/basic.png deleted file mode 100644 index 3686d43dd52..00000000000 Binary files a/packages/dialog/test/visual/material/screenshots/dialog/baseline/basic.png and /dev/null differ diff --git a/packages/dialog/test/visual/material/screenshots/dialog/baseline/content-no-padding-theme.png b/packages/dialog/test/visual/material/screenshots/dialog/baseline/content-no-padding-theme.png deleted file mode 100644 index 5b7c6556f21..00000000000 Binary files a/packages/dialog/test/visual/material/screenshots/dialog/baseline/content-no-padding-theme.png and /dev/null differ diff --git a/packages/dialog/test/visual/material/screenshots/dialog/baseline/footer-renderer.png b/packages/dialog/test/visual/material/screenshots/dialog/baseline/footer-renderer.png deleted file mode 100644 index 574a3819fd5..00000000000 Binary files a/packages/dialog/test/visual/material/screenshots/dialog/baseline/footer-renderer.png and /dev/null differ diff --git a/packages/dialog/test/visual/material/screenshots/dialog/baseline/header-footer-renderer.png b/packages/dialog/test/visual/material/screenshots/dialog/baseline/header-footer-renderer.png deleted file mode 100644 index e54d9175b55..00000000000 Binary files a/packages/dialog/test/visual/material/screenshots/dialog/baseline/header-footer-renderer.png and /dev/null differ diff --git a/packages/dialog/test/visual/material/screenshots/dialog/baseline/header-renderer.png b/packages/dialog/test/visual/material/screenshots/dialog/baseline/header-renderer.png deleted file mode 100644 index 4236ba3b5ed..00000000000 Binary files a/packages/dialog/test/visual/material/screenshots/dialog/baseline/header-renderer.png and /dev/null differ diff --git a/packages/dialog/test/visual/material/screenshots/dialog/baseline/header-title-long-single-word.png b/packages/dialog/test/visual/material/screenshots/dialog/baseline/header-title-long-single-word.png deleted file mode 100644 index a69e13f624e..00000000000 Binary files a/packages/dialog/test/visual/material/screenshots/dialog/baseline/header-title-long-single-word.png and /dev/null differ diff --git a/packages/dialog/test/visual/material/screenshots/dialog/baseline/header-title-multiple-lines.png b/packages/dialog/test/visual/material/screenshots/dialog/baseline/header-title-multiple-lines.png deleted file mode 100644 index b44e2662181..00000000000 Binary files a/packages/dialog/test/visual/material/screenshots/dialog/baseline/header-title-multiple-lines.png and /dev/null differ diff --git a/packages/dialog/test/visual/material/screenshots/dialog/baseline/header-title-renderer.png b/packages/dialog/test/visual/material/screenshots/dialog/baseline/header-title-renderer.png deleted file mode 100644 index 1fd7821265c..00000000000 Binary files a/packages/dialog/test/visual/material/screenshots/dialog/baseline/header-title-renderer.png and /dev/null differ diff --git a/packages/dialog/test/visual/material/screenshots/dialog/baseline/header-title.png b/packages/dialog/test/visual/material/screenshots/dialog/baseline/header-title.png deleted file mode 100644 index 3b920922314..00000000000 Binary files a/packages/dialog/test/visual/material/screenshots/dialog/baseline/header-title.png and /dev/null differ diff --git a/packages/dialog/test/visual/material/screenshots/dialog/baseline/modeless.png b/packages/dialog/test/visual/material/screenshots/dialog/baseline/modeless.png deleted file mode 100644 index 68b7f3de1eb..00000000000 Binary files a/packages/dialog/test/visual/material/screenshots/dialog/baseline/modeless.png and /dev/null differ diff --git a/packages/dialog/theme/material/vaadin-dialog-styles.js b/packages/dialog/theme/material/vaadin-dialog-styles.js deleted file mode 100644 index c8a48b8aad1..00000000000 --- a/packages/dialog/theme/material/vaadin-dialog-styles.js +++ /dev/null @@ -1,64 +0,0 @@ -import '@vaadin/vaadin-material-styles/shadow.js'; -import '@vaadin/vaadin-material-styles/color.js'; -import { overlay } from '@vaadin/vaadin-material-styles/mixins/overlay.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const dialogOverlay = css` - [part='overlay'] { - box-shadow: var(--material-shadow-elevation-24dp); - outline: none; - max-width: 560px; - min-width: 280px; - -webkit-tap-highlight-color: transparent; - } - - [part='content'] { - padding: 24px; - } - - [part='header'] { - padding: 16px; - } - - :host(:is([has-header], [has-title])) [part='header'] + [part='content'] { - padding-top: 0; - } - - [part='header'], - [part='header-content'], - [part='footer'] { - gap: 8px; - line-height: 1.2; - } - - [part='title'] { - font-size: var(--material-h5-font-size); - font-weight: 500; - margin-inline-start: 8px; - } - - [part='footer'] { - padding: 8px; - } - - @media (min-height: 320px) { - :host([overflow~='top']) [part='header'] { - box-shadow: 0 1px 0 0 var(--material-divider-color); - } - - :host([overflow~='bottom']) [part='footer'] { - box-shadow: 0 -1px 0 0 var(--material-divider-color); - } - } - - /* No padding */ - :host([theme~='no-padding']) [part='content'] { - padding: 0 !important; - } -`; - -registerStyles('vaadin-dialog-overlay', [overlay, dialogOverlay], { - moduleId: 'material-dialog', -}); - -export { dialogOverlay }; diff --git a/packages/dialog/theme/material/vaadin-dialog.js b/packages/dialog/theme/material/vaadin-dialog.js deleted file mode 100644 index 35dfaf16f7b..00000000000 --- a/packages/dialog/theme/material/vaadin-dialog.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-dialog-styles.js'; -import '../../src/vaadin-dialog.js'; diff --git a/packages/dialog/theme/material/vaadin-lit-dialog.js b/packages/dialog/theme/material/vaadin-lit-dialog.js deleted file mode 100644 index 1d37602429c..00000000000 --- a/packages/dialog/theme/material/vaadin-lit-dialog.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-dialog-styles.js'; -import '../../src/vaadin-lit-dialog.js'; diff --git a/packages/email-field/package.json b/packages/email-field/package.json index 5ab4cd3a3fe..7f6c1b9c281 100644 --- a/packages/email-field/package.json +++ b/packages/email-field/package.json @@ -38,7 +38,6 @@ "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/text-field": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/email-field/test/visual/material/email-field.test.js b/packages/email-field/test/visual/material/email-field.test.js deleted file mode 100644 index a9f1b564a08..00000000000 --- a/packages/email-field/test/visual/material/email-field.test.js +++ /dev/null @@ -1,44 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-email-field.js'; - -describe('email-field', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - div.style.padding = '10px'; - element = fixtureSync('', div); - }); - - it('placeholder', async () => { - element.placeholder = 'Placeholder'; - await visualDiff(div, 'placeholder'); - }); - - it('value', async () => { - element.value = 'serguey.kulikov@gmail.com'; - await visualDiff(div, 'value'); - }); - - describe('RTL', () => { - before(() => { - document.documentElement.setAttribute('dir', 'rtl'); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - it('RTL value', async () => { - element.value = 'serguey.kulikov@gmail.com'; - await visualDiff(div, 'rtl-value'); - }); - - it('RTL placeholder', async () => { - element.placeholder = 'Placeholder'; - await visualDiff(div, 'rtl-placeholder'); - }); - }); -}); diff --git a/packages/email-field/test/visual/material/screenshots/email-field/baseline/placeholder.png b/packages/email-field/test/visual/material/screenshots/email-field/baseline/placeholder.png deleted file mode 100644 index b0681b6bf52..00000000000 Binary files a/packages/email-field/test/visual/material/screenshots/email-field/baseline/placeholder.png and /dev/null differ diff --git a/packages/email-field/test/visual/material/screenshots/email-field/baseline/rtl-placeholder.png b/packages/email-field/test/visual/material/screenshots/email-field/baseline/rtl-placeholder.png deleted file mode 100644 index b0681b6bf52..00000000000 Binary files a/packages/email-field/test/visual/material/screenshots/email-field/baseline/rtl-placeholder.png and /dev/null differ diff --git a/packages/email-field/test/visual/material/screenshots/email-field/baseline/rtl-value.png b/packages/email-field/test/visual/material/screenshots/email-field/baseline/rtl-value.png deleted file mode 100644 index fec732bd2b2..00000000000 Binary files a/packages/email-field/test/visual/material/screenshots/email-field/baseline/rtl-value.png and /dev/null differ diff --git a/packages/email-field/test/visual/material/screenshots/email-field/baseline/value.png b/packages/email-field/test/visual/material/screenshots/email-field/baseline/value.png deleted file mode 100644 index fec732bd2b2..00000000000 Binary files a/packages/email-field/test/visual/material/screenshots/email-field/baseline/value.png and /dev/null differ diff --git a/packages/email-field/theme/material/vaadin-email-field-styles.js b/packages/email-field/theme/material/vaadin-email-field-styles.js deleted file mode 100644 index bea4293592d..00000000000 --- a/packages/email-field/theme/material/vaadin-email-field-styles.js +++ /dev/null @@ -1,11 +0,0 @@ -/** - * @license - * Copyright (c) 2021 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import { inputFieldShared } from '@vaadin/vaadin-material-styles/mixins/input-field-shared.js'; -import { registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles('vaadin-email-field', inputFieldShared, { - moduleId: 'material-email-field', -}); diff --git a/packages/email-field/theme/material/vaadin-email-field.js b/packages/email-field/theme/material/vaadin-email-field.js deleted file mode 100644 index 0f28ce03469..00000000000 --- a/packages/email-field/theme/material/vaadin-email-field.js +++ /dev/null @@ -1,8 +0,0 @@ -/** - * @license - * Copyright (c) 2021 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import '@vaadin/text-field/theme/material/vaadin-text-field.js'; -import './vaadin-email-field-styles.js'; -import '../../src/vaadin-email-field.js'; diff --git a/packages/email-field/theme/material/vaadin-lit-email-field.js b/packages/email-field/theme/material/vaadin-lit-email-field.js deleted file mode 100644 index 7b877f5171e..00000000000 --- a/packages/email-field/theme/material/vaadin-lit-email-field.js +++ /dev/null @@ -1,3 +0,0 @@ -import '@vaadin/text-field/theme/material/vaadin-lit-text-field.js'; -import './vaadin-email-field-styles.js'; -import '../../src/vaadin-lit-email-field.js'; diff --git a/packages/field-highlighter/package.json b/packages/field-highlighter/package.json index e4164dbcf65..65a4f385d26 100644 --- a/packages/field-highlighter/package.json +++ b/packages/field-highlighter/package.json @@ -38,7 +38,6 @@ "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/overlay": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/field-highlighter/test/visual/material/field-highlighter.test.js b/packages/field-highlighter/test/visual/material/field-highlighter.test.js deleted file mode 100644 index eb43673b40d..00000000000 --- a/packages/field-highlighter/test/visual/material/field-highlighter.test.js +++ /dev/null @@ -1,211 +0,0 @@ -import { sendKeys } from '@vaadin/test-runner-commands'; -import { fixtureSync, nextFrame } from '@vaadin/testing-helpers'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '@vaadin/checkbox/theme/material/vaadin-checkbox.js'; -import '@vaadin/checkbox-group/theme/material/vaadin-checkbox-group.js'; -import '@vaadin/date-time-picker/theme/material/vaadin-date-time-picker.js'; -import '@vaadin/item/theme/material/vaadin-item.js'; -import '@vaadin/list-box/theme/material/vaadin-list-box.js'; -import '@vaadin/radio-group/theme/material/vaadin-radio-group.js'; -import '@vaadin/text-area/theme/material/vaadin-text-area.js'; -import '@vaadin/text-field/theme/material/vaadin-text-field.js'; -import '../common.js'; -import '../../../theme/material/vaadin-field-highlighter.js'; -import { setUsers } from '../helpers.js'; - -describe('field-highlighter', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - div.style.padding = '20px'; - div.style.height = '150px'; - }); - - describe('checkbox', () => { - beforeEach(async () => { - element = fixtureSync(``, div); - setUsers(element); - await nextFrame(); - }); - - it('default', async () => { - await visualDiff(div, 'checkbox'); - }); - - it('focused', async () => { - await sendKeys({ press: 'Tab' }); - await nextFrame(); - await visualDiff(div, 'checkbox-focused'); - }); - }); - - describe('checkbox-group', () => { - beforeEach(async () => { - element = fixtureSync( - ` - - - - - - - `, - div, - ); - setUsers(element); - await nextFrame(); - }); - - it('default', async () => { - await visualDiff(div, 'checkbox-group'); - }); - - it('focused', async () => { - await sendKeys({ press: 'Tab' }); - await nextFrame(); - await visualDiff(div, 'checkbox-group-focused'); - }); - }); - - describe('date-time-picker', () => { - beforeEach(async () => { - element = fixtureSync(``, div); - setUsers(element); - await nextFrame(); - }); - - it('default', async () => { - await visualDiff(div, 'date-time-picker'); - }); - - it('focused', async () => { - await sendKeys({ press: 'Tab' }); - await nextFrame(); - await visualDiff(div, 'date-time-picker-focused'); - }); - }); - - describe('list-box', () => { - beforeEach(async () => { - div.style.height = '250px'; - element = fixtureSync( - ` - - Option one - Option two - Option three - Option four - - `, - div, - ); - await nextFrame(); - setUsers(element); - await nextFrame(); - }); - - it('default', async () => { - await visualDiff(div, 'list-box'); - }); - - it('focused', async () => { - await sendKeys({ press: 'Tab' }); - await sendKeys({ press: 'Space' }); - await nextFrame(); - await visualDiff(div, 'list-box-focused'); - }); - }); - - describe('radio-button', () => { - beforeEach(async () => { - element = fixtureSync(``, div); - setUsers(element); - await nextFrame(); - }); - - it('default', async () => { - await visualDiff(div, 'radio-button'); - }); - - it('focused', async () => { - await sendKeys({ press: 'Tab' }); - await nextFrame(); - await visualDiff(div, 'radio-button-focused'); - }); - }); - - describe('radio-group', () => { - beforeEach(async () => { - element = fixtureSync( - ` - - - - - - - `, - div, - ); - setUsers(element); - await nextFrame(); - }); - - it('default', async () => { - await visualDiff(div, 'radio-group'); - }); - - it('focused', async () => { - await sendKeys({ press: 'Tab' }); - await nextFrame(); - await visualDiff(div, 'radio-group-focused'); - }); - }); - - describe('text-area', () => { - beforeEach(async () => { - div.style.height = '250px'; - element = fixtureSync( - ` - - `, - div, - ); - setUsers(element); - await nextFrame(); - }); - - it('default', async () => { - await visualDiff(div, 'text-area'); - }); - - it('focused', async () => { - await sendKeys({ press: 'Tab' }); - await nextFrame(); - await visualDiff(div, 'text-area-focused'); - }); - }); - - describe('text-field', () => { - beforeEach(async () => { - element = fixtureSync(``, div); - setUsers(element); - await nextFrame(); - }); - - it('default', async () => { - await visualDiff(div, 'text-field'); - }); - - it('focused', async () => { - await sendKeys({ press: 'Tab' }); - await nextFrame(); - await visualDiff(div, 'text-field-focused'); - }); - }); -}); diff --git a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/checkbox-focused.png b/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/checkbox-focused.png deleted file mode 100644 index 9e68e9927b1..00000000000 Binary files a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/checkbox-focused.png and /dev/null differ diff --git a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/checkbox-group-focused.png b/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/checkbox-group-focused.png deleted file mode 100644 index dff258fb303..00000000000 Binary files a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/checkbox-group-focused.png and /dev/null differ diff --git a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/checkbox-group.png b/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/checkbox-group.png deleted file mode 100644 index 331aff2498c..00000000000 Binary files a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/checkbox-group.png and /dev/null differ diff --git a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/checkbox.png b/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/checkbox.png deleted file mode 100644 index 1e511ba17b8..00000000000 Binary files a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/checkbox.png and /dev/null differ diff --git a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/date-time-picker-focused.png b/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/date-time-picker-focused.png deleted file mode 100644 index b5ae212d000..00000000000 Binary files a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/date-time-picker-focused.png and /dev/null differ diff --git a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/date-time-picker.png b/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/date-time-picker.png deleted file mode 100644 index c10f3d5d67a..00000000000 Binary files a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/date-time-picker.png and /dev/null differ diff --git a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/list-box-focused.png b/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/list-box-focused.png deleted file mode 100644 index 6a7e3b185a7..00000000000 Binary files a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/list-box-focused.png and /dev/null differ diff --git a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/list-box.png b/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/list-box.png deleted file mode 100644 index f32703d2850..00000000000 Binary files a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/list-box.png and /dev/null differ diff --git a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/radio-button-focused.png b/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/radio-button-focused.png deleted file mode 100644 index 278ddb88e2f..00000000000 Binary files a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/radio-button-focused.png and /dev/null differ diff --git a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/radio-button.png b/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/radio-button.png deleted file mode 100644 index 263b45202ec..00000000000 Binary files a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/radio-button.png and /dev/null differ diff --git a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/radio-group-focused.png b/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/radio-group-focused.png deleted file mode 100644 index 4012fe9d0c8..00000000000 Binary files a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/radio-group-focused.png and /dev/null differ diff --git a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/radio-group.png b/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/radio-group.png deleted file mode 100644 index 1d9e9715731..00000000000 Binary files a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/radio-group.png and /dev/null differ diff --git a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/text-area-focused.png b/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/text-area-focused.png deleted file mode 100644 index d5cd8845771..00000000000 Binary files a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/text-area-focused.png and /dev/null differ diff --git a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/text-area.png b/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/text-area.png deleted file mode 100644 index 66a66799da7..00000000000 Binary files a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/text-area.png and /dev/null differ diff --git a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/text-field-focused.png b/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/text-field-focused.png deleted file mode 100644 index 94ebbe40aa9..00000000000 Binary files a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/text-field-focused.png and /dev/null differ diff --git a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/text-field.png b/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/text-field.png deleted file mode 100644 index 1d51b1e2cdd..00000000000 Binary files a/packages/field-highlighter/test/visual/material/screenshots/field-highlighter/baseline/text-field.png and /dev/null differ diff --git a/packages/field-highlighter/theme/material/vaadin-field-highlighter.js b/packages/field-highlighter/theme/material/vaadin-field-highlighter.js deleted file mode 100644 index 4b6f733a3cc..00000000000 --- a/packages/field-highlighter/theme/material/vaadin-field-highlighter.js +++ /dev/null @@ -1,9 +0,0 @@ -/** - * @license - * Copyright (c) 2021 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import '@vaadin/vaadin-material-styles/user-colors.js'; -import './vaadin-field-outline-styles.js'; -import './vaadin-user-tags.js'; -import '../../src/vaadin-field-highlighter.js'; diff --git a/packages/field-highlighter/theme/material/vaadin-field-outline-styles.js b/packages/field-highlighter/theme/material/vaadin-field-outline-styles.js deleted file mode 100644 index 57cb500b27b..00000000000 --- a/packages/field-highlighter/theme/material/vaadin-field-outline-styles.js +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @license - * Copyright (c) 2021 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-field-outline', - css` - :host { - transition: opacity 0.3s; - padding: 0 !important; - } - - :host([context$='picker']), - :host([context$='combo-box']), - :host([context$='select']), - :host([context$='area']), - :host([context$='field']) { - top: auto; - height: 2px; - z-index: 1; - background-color: var(--_active-user-color); - } - - :host([context$='checkbox']), - :host([context$='radio-button']) { - border-radius: 50%; - background-color: var(--_active-user-color); - transform: scale(2.5); - opacity: 0.15; - } - - :host([context$='item'])::before { - display: block; - height: 100%; - content: ''; - box-shadow: inset 0 0 0 2px var(--_active-user-color); - } - `, - { moduleId: 'material-field-outline' }, -); diff --git a/packages/field-highlighter/theme/material/vaadin-user-tags-styles.js b/packages/field-highlighter/theme/material/vaadin-user-tags-styles.js deleted file mode 100644 index 6bd53021f39..00000000000 --- a/packages/field-highlighter/theme/material/vaadin-user-tags-styles.js +++ /dev/null @@ -1,36 +0,0 @@ -/** - * @license - * Copyright (c) 2021 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/shadow.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import { overlay } from '@vaadin/vaadin-material-styles/mixins/overlay.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles('vaadin-user-tags-overlay', [overlay], { - moduleId: 'material-user-tags-overlay', -}); - -registerStyles( - 'vaadin-user-tag', - css` - :host { - font-family: var(--material-font-family); - font-size: 0.75rem; - border-radius: 0.25rem; - box-shadow: var(--material-shadow-elevation-2dp); - } - - [part='name'] { - background-color: var(--vaadin-user-tag-color); - color: var(--material-primary-contrast-color); - padding: 0.3em; - line-height: 1; - font-weight: 500; - min-width: 1.75em; - } - `, - { moduleId: 'material-user-tag' }, -); diff --git a/packages/field-highlighter/theme/material/vaadin-user-tags.js b/packages/field-highlighter/theme/material/vaadin-user-tags.js deleted file mode 100644 index c0d52d52cc5..00000000000 --- a/packages/field-highlighter/theme/material/vaadin-user-tags.js +++ /dev/null @@ -1,7 +0,0 @@ -/** - * @license - * Copyright (c) 2021 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import './vaadin-user-tags-styles.js'; -import '../../src/vaadin-user-tags.js'; diff --git a/packages/form-layout/package.json b/packages/form-layout/package.json index 01027dbecc5..4ba9df4fd66 100644 --- a/packages/form-layout/package.json +++ b/packages/form-layout/package.json @@ -40,7 +40,6 @@ "@vaadin/a11y-base": "25.0.0-alpha0", "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/form-layout/test/visual/material/form-layout-auto-responsive.test.js b/packages/form-layout/test/visual/material/form-layout-auto-responsive.test.js deleted file mode 100644 index 079a6419a94..00000000000 --- a/packages/form-layout/test/visual/material/form-layout-auto-responsive.test.js +++ /dev/null @@ -1,447 +0,0 @@ -import { nextResize } from '@vaadin/testing-helpers'; -import { fixtureSync } from '@vaadin/testing-helpers'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-form-layout.js'; -import '../../../theme/material/vaadin-form-item.js'; -import '../../../theme/material/vaadin-form-row.js'; - -const DEFAULT_COLUMN_WIDTH = '12em'; - -describe('form-layout auto responsive', () => { - let container, element; - - beforeEach(() => { - container = document.createElement('div'); - container.style.display = 'inline-block'; - container.style.border = '10px solid #f3f3f3'; - container.style.maxWidth = '100%'; - container.style.boxSizing = 'border-box'; - }); - - describe('basic', () => { - beforeEach(async () => { - element = fixtureSync( - ` - - - - - - - `, - container, - ); - await nextResize(element); - }); - - it('basic', async () => { - await visualDiff(container, 'basic'); - }); - - it('maxColumns', async () => { - element.autoRows = true; - element.maxColumns = 2; - await nextResize(element); - await visualDiff(container, 'max-columns'); - }); - - it('columnWidth', async () => { - element.autoRows = true; - element.maxColumns = 2; - element.columnWidth = '320px'; - await nextResize(element); - await visualDiff(container, 'column-width'); - }); - - it('expandFields', async () => { - element.expandFields = true; - await nextResize(element); - await visualDiff(container, 'expand-fields'); - }); - - it('custom CSS properties', async () => { - element.autoRows = true; - element.maxColumns = 2; - element.style.setProperty('--vaadin-field-default-width', '320px'); - element.style.setProperty('--vaadin-form-layout-row-spacing', '64px'); - element.style.setProperty('--vaadin-form-layout-column-spacing', '64px'); - await nextResize(element); - await visualDiff(container, 'custom-css-properties'); - }); - }); - - describe('minColumns', () => { - beforeEach(async () => { - element = fixtureSync( - ` - - - - - - - - - - - - - - - - - - - `, - container, - ); - await nextResize(element); - }); - - it('wide container (space for 3 columns)', async () => { - await visualDiff(container, 'min-columns-wide-container'); - }); - - it('medium container (space for 2 columns)', async () => { - container.style.width = '250px'; - await nextResize(element); - await visualDiff(container, 'min-columns-medium-container'); - }); - - it('narrow container (space for 1 column only)', async () => { - container.style.width = '100px'; - await nextResize(element); - await visualDiff(container, 'min-columns-narrow-container'); - }); - - // TODO There is an issue with native inputs not shrinking, leading to - // overflowing items. The baseline image should be updated one this - // issue is fixed. - it('labelsAside', async () => { - element.labelsAside = true; - container.style.width = '800px'; - await nextResize(element); - await visualDiff(container, 'min-columns-labels-aside'); - }); - - it('labelsAside with narrow container', async () => { - element.labelsAside = true; - container.style.width = '200px'; - await nextResize(element); - await visualDiff(container, 'min-columns-labels-aside-narrow-container'); - }); - }); - - describe('explicit rows', () => { - beforeEach(async () => { - element = fixtureSync( - ` - - - - - - - - - - - - - - `, - container, - ); - await nextResize(element); - }); - - it('default', async () => { - await visualDiff(container, 'explicit-rows'); - }); - }); - - describe('autoRows', () => { - beforeEach(async () => { - element = fixtureSync( - ` - - - -
- - - -
- `, - container, - ); - await nextResize(element); - }); - - it('default', async () => { - await visualDiff(container, 'auto-rows'); - }); - }); - - describe('autoRows with explicit rows', () => { - beforeEach(async () => { - element = fixtureSync( - ` - - - - - - - - - `, - container, - ); - await nextResize(element); - }); - - it('default', async () => { - await visualDiff(container, 'auto-rows-with-explicit-rows'); - }); - }); - - describe('form items', () => { - beforeEach(async () => { - element = fixtureSync( - ` - - - - - - - - - - - `, - container, - ); - await nextResize(element); - }); - - it('default', async () => { - await visualDiff(container, 'form-items'); - }); - - it('expandFields', async () => { - element.expandFields = true; - await nextResize(element); - await visualDiff(container, 'form-items-expand-fields'); - }); - - it('expandColumns in narrow container', async () => { - container.style.width = `calc(${DEFAULT_COLUMN_WIDTH} + 6em)`; - element.expandFields = true; - element.expandColumns = true; - await nextResize(element); - await visualDiff(container, 'form-items-expand-columns-narrow-container'); - }); - - it('expandColumns in wide container', async () => { - container.style.width = '50em'; - element.expandFields = true; - element.expandColumns = true; - await nextResize(element); - await visualDiff(container, 'form-items-expand-columns-wide-container'); - }); - - it('labelsAside in narrow container', async () => { - container.style.width = `calc(${DEFAULT_COLUMN_WIDTH} + 6em)`; - element.expandFields = true; - element.labelsAside = true; - await nextResize(element); - await visualDiff(container, 'form-items-labels-aside-narrow-container'); - }); - - it('labelsAside in wide container', async () => { - container.style.width = '50em'; - element.expandFields = true; - element.labelsAside = true; - await nextResize(element); - await visualDiff(container, 'form-items-labels-aside-wide-container'); - }); - - it('labelsAside + expandColumns in narrow container', async () => { - container.style.width = `calc(${DEFAULT_COLUMN_WIDTH} + 6em)`; - element.expandFields = true; - element.labelsAside = true; - element.expandColumns = true; - await nextResize(element); - await visualDiff(container, 'form-items-labels-aside-expand-columns-narrow-container'); - }); - - it('labelsAside + expandColumns in wide container', async () => { - container.style.width = '50em'; - element.expandFields = true; - element.labelsAside = true; - element.expandColumns = true; - await nextResize(element); - await visualDiff(container, 'form-items-labels-aside-expand-columns-wide-container'); - }); - - it('labelsAside + custom CSS properties', async () => { - element.expandFields = true; - element.labelsAside = true; - element.style.setProperty('--vaadin-form-layout-label-width', '200px'); - element.style.setProperty('--vaadin-form-layout-label-spacing', '60px'); - await nextResize(element); - await visualDiff(container, 'form-items-labels-aside-custom-css-properties'); - }); - }); - - describe('form items with explicit rows', () => { - beforeEach(async () => { - element = fixtureSync( - ` - - - - - - - - - - - - - - - - - - - - - - - - `, - container, - ); - await nextResize(element); - }); - - it('default', async () => { - await visualDiff(container, 'form-items-with-explicit-rows'); - }); - - it('labelsAside', async () => { - element.labelsAside = true; - await nextResize(element); - await visualDiff(container, 'form-items-with-explicit-rows-labels-aside'); - }); - }); - - describe('colspan', () => { - beforeEach(async () => { - element = fixtureSync( - ` - - - - - - - - `, - container, - ); - await nextResize(element); - }); - - it('default', async () => { - await visualDiff(container, 'colspan'); - }); - - it('colspan in narrow container', async () => { - container.style.width = `calc(${DEFAULT_COLUMN_WIDTH} + 6em)`; - await nextResize(element); - await visualDiff(container, 'colspan-narrow-container'); - }); - - it('colspan in wide container', async () => { - container.style.width = '50em'; - await nextResize(element); - await visualDiff(container, 'colspan-wide-container'); - }); - }); - - describe('colspan with explicit rows', () => { - beforeEach(async () => { - element = fixtureSync( - ` - - - - - - - - - - - - - - `, - container, - ); - await nextResize(element); - }); - - it('default', async () => { - await visualDiff(container, 'colspan-with-explicit-rows'); - }); - }); - - describe('fields with explicit width', () => { - beforeEach(async () => { - element = fixtureSync( - ` - - - - - - - - - - - - - - - - - `, - container, - ); - await nextResize(element); - }); - - it('default', async () => { - await visualDiff(container, 'fields-with-explicit-width'); - }); - - it('expandFields', async () => { - element.expandFields = true; - await nextResize(element); - await visualDiff(container, 'fields-with-explicit-width-expand-fields'); - }); - }); -}); diff --git a/packages/form-layout/test/visual/material/form-layout.test.js b/packages/form-layout/test/visual/material/form-layout.test.js deleted file mode 100644 index a9b34c0a3f6..00000000000 --- a/packages/form-layout/test/visual/material/form-layout.test.js +++ /dev/null @@ -1,249 +0,0 @@ -import { nextFrame } from '@vaadin/testing-helpers'; -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-form-layout.js'; -import '../../../theme/material/vaadin-form-item.js'; - -describe('form-layout', () => { - let element; - - describe('basic', () => { - beforeEach(() => { - element = fixtureSync(` - - - - - - - - - - - - - - - - - - Date of Birth - - - -
- Example: 1900-01-01 -
- - - - - - - - - Subscribe to our Newsletter - -
- `); - }); - - it('basic', async () => { - await visualDiff(element, 'basic'); - }); - }); - - describe('new line', () => { - beforeEach(() => { - element = fixtureSync(` - - - - - -
- - - - -
- `); - }); - - it('new line', async () => { - await visualDiff(element, 'br'); - }); - }); - - describe('colspan', () => { - beforeEach(() => { - element = fixtureSync(` - - - - - - - - - - - - - - - - - `); - }); - - it('colspan', async () => { - await visualDiff(element, 'colspan'); - }); - }); - - describe('CSS properties', () => { - let div; - - beforeEach(() => { - div = fixtureSync(` -
- - - - - - - - - - - - - - - - - -
- `); - element = div.querySelector('vaadin-form-layout'); - }); - - it('CSS properties', async () => { - await visualDiff(element, 'css-properties'); - }); - }); - - describe('responsiveSteps', () => { - beforeEach(() => { - element = fixtureSync(` - - - - - - - - - - - - - - - - - `); - }); - - it('responsiveSteps', async () => { - await visualDiff(element, 'responsive-steps'); - }); - }); - - describe('single column', () => { - beforeEach(() => { - element = fixtureSync(` - - - - - - - - - - - - - - - - - `); - }); - - it('single column', async () => { - await visualDiff(element, 'single-column'); - }); - }); - - describe('required indicator', () => { - beforeEach(async () => { - element = fixtureSync(` - - - - - - - - - - - - - - - - - `); - - await nextFrame(); - - // Make the second input validate so that it becomes invalid - element.querySelectorAll('input')[1].dispatchEvent(new CustomEvent('change')); - }); - - it('required indicator - labels aside', async () => { - await visualDiff(element, 'required-indicator-labels-aside'); - }); - - it('required-indicator - labels on top', async () => { - element.responsiveSteps = element.responsiveSteps.map((step) => { - step.labelsPosition = 'top'; - return step; - }); - await visualDiff(element, 'required-indicator-labels-on-top'); - }); - }); -}); diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/auto-rows-with-explicit-rows.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/auto-rows-with-explicit-rows.png deleted file mode 100644 index 6f659c6846c..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/auto-rows-with-explicit-rows.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/auto-rows.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/auto-rows.png deleted file mode 100644 index e885ff894e1..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/auto-rows.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/basic.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/basic.png deleted file mode 100644 index afb8e2ee4f8..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/basic.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/colspan-narrow-container.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/colspan-narrow-container.png deleted file mode 100644 index c03ed731c0f..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/colspan-narrow-container.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/colspan-wide-container.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/colspan-wide-container.png deleted file mode 100644 index 03b735522ae..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/colspan-wide-container.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/colspan-with-explicit-rows.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/colspan-with-explicit-rows.png deleted file mode 100644 index 8897b28623e..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/colspan-with-explicit-rows.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/colspan.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/colspan.png deleted file mode 100644 index 8897b28623e..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/colspan.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/column-width.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/column-width.png deleted file mode 100644 index f0ebbba7aba..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/column-width.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/custom-css-properties.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/custom-css-properties.png deleted file mode 100644 index c35f7536206..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/custom-css-properties.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/expand-fields.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/expand-fields.png deleted file mode 100644 index 7912342b882..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/expand-fields.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/explicit-rows.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/explicit-rows.png deleted file mode 100644 index e885ff894e1..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/explicit-rows.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/fields-with-explicit-width-expand-fields.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/fields-with-explicit-width-expand-fields.png deleted file mode 100644 index cffb47b657c..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/fields-with-explicit-width-expand-fields.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/fields-with-explicit-width.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/fields-with-explicit-width.png deleted file mode 100644 index 11ebb53a9a7..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/fields-with-explicit-width.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-expand-columns-narrow-container.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-expand-columns-narrow-container.png deleted file mode 100644 index f65cba27644..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-expand-columns-narrow-container.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-expand-columns-wide-container.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-expand-columns-wide-container.png deleted file mode 100644 index 44188eb2958..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-expand-columns-wide-container.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-expand-fields.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-expand-fields.png deleted file mode 100644 index 90ebee1a529..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-expand-fields.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-labels-aside-custom-css-properties.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-labels-aside-custom-css-properties.png deleted file mode 100644 index d25ce123041..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-labels-aside-custom-css-properties.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-labels-aside-expand-columns-narrow-container.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-labels-aside-expand-columns-narrow-container.png deleted file mode 100644 index f65cba27644..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-labels-aside-expand-columns-narrow-container.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-labels-aside-expand-columns-wide-container.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-labels-aside-expand-columns-wide-container.png deleted file mode 100644 index eb7e6cb784d..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-labels-aside-expand-columns-wide-container.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-labels-aside-narrow-container.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-labels-aside-narrow-container.png deleted file mode 100644 index c6803f65628..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-labels-aside-narrow-container.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-labels-aside-wide-container.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-labels-aside-wide-container.png deleted file mode 100644 index dd0ae3aa824..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-labels-aside-wide-container.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-with-explicit-rows-labels-aside.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-with-explicit-rows-labels-aside.png deleted file mode 100644 index 792010db2ad..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-with-explicit-rows-labels-aside.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-with-explicit-rows.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-with-explicit-rows.png deleted file mode 100644 index e017a8ce783..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items-with-explicit-rows.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items.png deleted file mode 100644 index a4ebefd7196..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/form-items.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/max-columns.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/max-columns.png deleted file mode 100644 index 971e3fb3563..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/max-columns.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/min-columns-labels-aside-narrow-container.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/min-columns-labels-aside-narrow-container.png deleted file mode 100644 index 01dc8115cc0..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/min-columns-labels-aside-narrow-container.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/min-columns-labels-aside.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/min-columns-labels-aside.png deleted file mode 100644 index 4f60e72875f..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/min-columns-labels-aside.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/min-columns-medium-container.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/min-columns-medium-container.png deleted file mode 100644 index a1c191d807b..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/min-columns-medium-container.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/min-columns-narrow-container.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/min-columns-narrow-container.png deleted file mode 100644 index 5cc896167a9..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/min-columns-narrow-container.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/min-columns-wide-container.png b/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/min-columns-wide-container.png deleted file mode 100644 index 9c3fe24f5a0..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout-auto-responsive/baseline/min-columns-wide-container.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout/baseline/basic.png b/packages/form-layout/test/visual/material/screenshots/form-layout/baseline/basic.png deleted file mode 100644 index a47433c1d47..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout/baseline/basic.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout/baseline/br.png b/packages/form-layout/test/visual/material/screenshots/form-layout/baseline/br.png deleted file mode 100644 index da12a6dc63a..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout/baseline/br.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout/baseline/colspan.png b/packages/form-layout/test/visual/material/screenshots/form-layout/baseline/colspan.png deleted file mode 100644 index 6371307c8b7..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout/baseline/colspan.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout/baseline/css-properties.png b/packages/form-layout/test/visual/material/screenshots/form-layout/baseline/css-properties.png deleted file mode 100644 index fe4589aca80..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout/baseline/css-properties.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout/baseline/required-indicator-labels-aside.png b/packages/form-layout/test/visual/material/screenshots/form-layout/baseline/required-indicator-labels-aside.png deleted file mode 100644 index bb19cafa70a..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout/baseline/required-indicator-labels-aside.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout/baseline/required-indicator-labels-on-top.png b/packages/form-layout/test/visual/material/screenshots/form-layout/baseline/required-indicator-labels-on-top.png deleted file mode 100644 index 57968b209dd..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout/baseline/required-indicator-labels-on-top.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout/baseline/responsive-steps.png b/packages/form-layout/test/visual/material/screenshots/form-layout/baseline/responsive-steps.png deleted file mode 100644 index df866e4bb29..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout/baseline/responsive-steps.png and /dev/null differ diff --git a/packages/form-layout/test/visual/material/screenshots/form-layout/baseline/single-column.png b/packages/form-layout/test/visual/material/screenshots/form-layout/baseline/single-column.png deleted file mode 100644 index 5da11f703cc..00000000000 Binary files a/packages/form-layout/test/visual/material/screenshots/form-layout/baseline/single-column.png and /dev/null differ diff --git a/packages/form-layout/theme/material/vaadin-form-item-styles.js b/packages/form-layout/theme/material/vaadin-form-item-styles.js deleted file mode 100644 index aeafb1c0058..00000000000 --- a/packages/form-layout/theme/material/vaadin-form-item-styles.js +++ /dev/null @@ -1,28 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-form-item', - css` - [part='label'] { - font-family: var(--material-font-family); - font-size: var(--material-small-font-size); - color: var(--material-secondary-text-color); - line-height: 16px; - font-weight: 400; - margin-top: 16px; - margin-bottom: 8px; - } - - :host([required]) [part='required-indicator']::after { - content: ' *'; - color: inherit; - } - - :host([invalid]) [part='label'] { - color: var(--material-error-text-color); - } - `, - { moduleId: 'material-form-item' }, -); diff --git a/packages/form-layout/theme/material/vaadin-form-item.js b/packages/form-layout/theme/material/vaadin-form-item.js deleted file mode 100644 index 10eaa10968f..00000000000 --- a/packages/form-layout/theme/material/vaadin-form-item.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-form-item-styles.js'; -import '../../src/vaadin-form-item.js'; diff --git a/packages/form-layout/theme/material/vaadin-form-layout.js b/packages/form-layout/theme/material/vaadin-form-layout.js deleted file mode 100644 index 71b4605df77..00000000000 --- a/packages/form-layout/theme/material/vaadin-form-layout.js +++ /dev/null @@ -1 +0,0 @@ -import '../../src/vaadin-form-layout.js'; diff --git a/packages/form-layout/theme/material/vaadin-form-row.js b/packages/form-layout/theme/material/vaadin-form-row.js deleted file mode 100644 index c56ad4975b4..00000000000 --- a/packages/form-layout/theme/material/vaadin-form-row.js +++ /dev/null @@ -1 +0,0 @@ -import '../../src/vaadin-form-row.js'; diff --git a/packages/form-layout/theme/material/vaadin-lit-form-item.js b/packages/form-layout/theme/material/vaadin-lit-form-item.js deleted file mode 100644 index 6df64e795fd..00000000000 --- a/packages/form-layout/theme/material/vaadin-lit-form-item.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-form-item-styles.js'; -import '../../src/vaadin-lit-form-item.js'; diff --git a/packages/form-layout/theme/material/vaadin-lit-form-layout.js b/packages/form-layout/theme/material/vaadin-lit-form-layout.js deleted file mode 100644 index baed6f49db9..00000000000 --- a/packages/form-layout/theme/material/vaadin-lit-form-layout.js +++ /dev/null @@ -1 +0,0 @@ -import '../../src/vaadin-lit-form-layout.js'; diff --git a/packages/form-layout/theme/material/vaadin-lit-form-row.js b/packages/form-layout/theme/material/vaadin-lit-form-row.js deleted file mode 100644 index ef87f054ff5..00000000000 --- a/packages/form-layout/theme/material/vaadin-lit-form-row.js +++ /dev/null @@ -1 +0,0 @@ -import '../../src/vaadin-lit-form-row.js'; diff --git a/packages/grid-pro/package.json b/packages/grid-pro/package.json index ec2b09d0424..f9f140fb7d4 100644 --- a/packages/grid-pro/package.json +++ b/packages/grid-pro/package.json @@ -46,7 +46,6 @@ "@vaadin/select": "25.0.0-alpha0", "@vaadin/text-field": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/grid-pro/test/visual/material/grid-pro.test.js b/packages/grid-pro/test/visual/material/grid-pro.test.js deleted file mode 100644 index 68af008bd68..00000000000 --- a/packages/grid-pro/test/visual/material/grid-pro.test.js +++ /dev/null @@ -1,124 +0,0 @@ -import { sendKeys } from '@vaadin/test-runner-commands'; -import { fixtureSync, nextRender } from '@vaadin/testing-helpers'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-grid-pro.js'; -import '../../../theme/material/vaadin-grid-pro-edit-column.js'; -import '../../not-animated-styles.js'; -import { getContainerCell } from '../../helpers.js'; -import { users } from '../users.js'; - -describe('grid-pro', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - div.style.width = '200px'; - }); - - describe('editable-cell', () => { - beforeEach(async () => { - element = fixtureSync( - ` - - - - - `, - div, - ); - element.items = users; - await nextRender(element); - div.style.width = '300px'; - element.focus(); - }); - - it('editable-cell focus', async () => { - // Focus the header cell - await sendKeys({ press: 'Tab' }); - - // Focus the editable cell - await sendKeys({ press: 'Tab' }); - - await visualDiff(div, 'editable-cell-focus'); - }); - - it('read-only-cell focus', async () => { - // Focus the header cell - await sendKeys({ press: 'Tab' }); - - // Focus the editable cell - await sendKeys({ press: 'Tab' }); - - // Focus the read-only cell - await sendKeys({ press: 'ArrowRight' }); - - await visualDiff(div, 'read-only-cell-focus'); - }); - }); - - describe('edit-column-text', () => { - beforeEach(async () => { - element = fixtureSync( - ` - - - - `, - div, - ); - element.items = users; - await nextRender(element); - }); - - it('text', async () => { - const cell = getContainerCell(element.$.items, 0, 0); - cell._content.dispatchEvent(new CustomEvent('dblclick', { bubbles: true })); - await visualDiff(div, 'edit-column-text'); - }); - }); - - describe('edit-column-checkbox', () => { - beforeEach(async () => { - element = fixtureSync( - ` - - - - `, - div, - ); - element.items = users; - await nextRender(element); - }); - - it('checkbox', async () => { - const cell = getContainerCell(element.$.items, 0, 0); - cell._content.dispatchEvent(new CustomEvent('dblclick', { bubbles: true })); - await visualDiff(div, 'edit-column-checkbox'); - }); - }); - - describe('edit-column-select', () => { - beforeEach(async () => { - element = fixtureSync( - ` - - - - `, - div, - ); - element.items = users; - const column = element.querySelector('vaadin-grid-pro-edit-column'); - column.editorOptions = ['mr', 'mrs', 'ms']; - await nextRender(element); - }); - - it('select', async () => { - const cell = getContainerCell(element.$.items, 0, 0); - cell._content.dispatchEvent(new CustomEvent('dblclick', { bubbles: true })); - await visualDiff(div, 'edit-column-select'); - }); - }); -}); diff --git a/packages/grid-pro/test/visual/material/screenshots/grid-pro/baseline/edit-column-checkbox.png b/packages/grid-pro/test/visual/material/screenshots/grid-pro/baseline/edit-column-checkbox.png deleted file mode 100644 index b0403f4055d..00000000000 Binary files a/packages/grid-pro/test/visual/material/screenshots/grid-pro/baseline/edit-column-checkbox.png and /dev/null differ diff --git a/packages/grid-pro/test/visual/material/screenshots/grid-pro/baseline/edit-column-select.png b/packages/grid-pro/test/visual/material/screenshots/grid-pro/baseline/edit-column-select.png deleted file mode 100644 index 259e20b7b46..00000000000 Binary files a/packages/grid-pro/test/visual/material/screenshots/grid-pro/baseline/edit-column-select.png and /dev/null differ diff --git a/packages/grid-pro/test/visual/material/screenshots/grid-pro/baseline/edit-column-text.png b/packages/grid-pro/test/visual/material/screenshots/grid-pro/baseline/edit-column-text.png deleted file mode 100644 index 8543b240281..00000000000 Binary files a/packages/grid-pro/test/visual/material/screenshots/grid-pro/baseline/edit-column-text.png and /dev/null differ diff --git a/packages/grid-pro/test/visual/material/screenshots/grid-pro/baseline/editable-cell-focus.png b/packages/grid-pro/test/visual/material/screenshots/grid-pro/baseline/editable-cell-focus.png deleted file mode 100644 index b2f89006afa..00000000000 Binary files a/packages/grid-pro/test/visual/material/screenshots/grid-pro/baseline/editable-cell-focus.png and /dev/null differ diff --git a/packages/grid-pro/test/visual/material/screenshots/grid-pro/baseline/read-only-cell-focus.png b/packages/grid-pro/test/visual/material/screenshots/grid-pro/baseline/read-only-cell-focus.png deleted file mode 100644 index 2fc39a6040f..00000000000 Binary files a/packages/grid-pro/test/visual/material/screenshots/grid-pro/baseline/read-only-cell-focus.png and /dev/null differ diff --git a/packages/grid-pro/theme/material/vaadin-grid-pro-edit-checkbox.js b/packages/grid-pro/theme/material/vaadin-grid-pro-edit-checkbox.js deleted file mode 100644 index 6e1fd4715e8..00000000000 --- a/packages/grid-pro/theme/material/vaadin-grid-pro-edit-checkbox.js +++ /dev/null @@ -1,2 +0,0 @@ -import '@vaadin/checkbox/theme/material/vaadin-checkbox.js'; -import '../../src/vaadin-grid-pro-edit-checkbox.js'; diff --git a/packages/grid-pro/theme/material/vaadin-grid-pro-edit-column.js b/packages/grid-pro/theme/material/vaadin-grid-pro-edit-column.js deleted file mode 100644 index cc1a12959d7..00000000000 --- a/packages/grid-pro/theme/material/vaadin-grid-pro-edit-column.js +++ /dev/null @@ -1,4 +0,0 @@ -import './vaadin-grid-pro-edit-checkbox.js'; -import './vaadin-grid-pro-edit-select.js'; -import './vaadin-grid-pro-edit-text-field.js'; -import '../../src/vaadin-grid-pro-edit-column.js'; diff --git a/packages/grid-pro/theme/material/vaadin-grid-pro-edit-select-styles.js b/packages/grid-pro/theme/material/vaadin-grid-pro-edit-select-styles.js deleted file mode 100644 index 07d8f9bb3ea..00000000000 --- a/packages/grid-pro/theme/material/vaadin-grid-pro-edit-select-styles.js +++ /dev/null @@ -1,16 +0,0 @@ -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; -import { gridProEditor } from './vaadin-grid-pro-editor-styles.js'; - -const gridProEditSelect = css` - :host([theme~='grid-pro-editor']) [part='input-field'] ::slotted([slot='value']) { - box-sizing: border-box; - font-size: inherit; - /* prevent selection on editor focus */ - -webkit-user-select: none; - user-select: none; - } -`; - -registerStyles('vaadin-grid-pro-edit-select', [gridProEditor, gridProEditSelect], { - moduleId: 'material-grid-pro-edit-select', -}); diff --git a/packages/grid-pro/theme/material/vaadin-grid-pro-edit-select.js b/packages/grid-pro/theme/material/vaadin-grid-pro-edit-select.js deleted file mode 100644 index eb37d9dc2c8..00000000000 --- a/packages/grid-pro/theme/material/vaadin-grid-pro-edit-select.js +++ /dev/null @@ -1,3 +0,0 @@ -import '@vaadin/select/theme/material/vaadin-select.js'; -import './vaadin-grid-pro-edit-select-styles.js'; -import '../../src/vaadin-grid-pro-edit-select.js'; diff --git a/packages/grid-pro/theme/material/vaadin-grid-pro-edit-text-field-styles.js b/packages/grid-pro/theme/material/vaadin-grid-pro-edit-text-field-styles.js deleted file mode 100644 index 562b5299c9f..00000000000 --- a/packages/grid-pro/theme/material/vaadin-grid-pro-edit-text-field-styles.js +++ /dev/null @@ -1,6 +0,0 @@ -import { registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; -import { gridProEditor } from './vaadin-grid-pro-editor-styles.js'; - -registerStyles('vaadin-grid-pro-edit-text-field', gridProEditor, { - moduleId: 'material-grid-pro-edit-text-field', -}); diff --git a/packages/grid-pro/theme/material/vaadin-grid-pro-edit-text-field.js b/packages/grid-pro/theme/material/vaadin-grid-pro-edit-text-field.js deleted file mode 100644 index 1cb2baa215b..00000000000 --- a/packages/grid-pro/theme/material/vaadin-grid-pro-edit-text-field.js +++ /dev/null @@ -1,3 +0,0 @@ -import '@vaadin/text-field/theme/material/vaadin-text-field.js'; -import './vaadin-grid-pro-edit-text-field-styles.js'; -import '../../src/vaadin-grid-pro-edit-text-field.js'; diff --git a/packages/grid-pro/theme/material/vaadin-grid-pro-editor-styles.js b/packages/grid-pro/theme/material/vaadin-grid-pro-editor-styles.js deleted file mode 100644 index d340b22db06..00000000000 --- a/packages/grid-pro/theme/material/vaadin-grid-pro-editor-styles.js +++ /dev/null @@ -1,21 +0,0 @@ -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const gridProEditor = css` - :host([theme~='grid-pro-editor']) { - width: 100%; - margin: -6px 0 0; - padding: 0; - top: 6px; - will-change: transform; - font-size: inherit; - } - - :host([theme~='grid-pro-editor']) ::slotted(input) { - box-sizing: border-box; - font-size: inherit; - } -`; - -registerStyles('', gridProEditor, { moduleId: 'material-grid-pro-editor' }); - -export { gridProEditor }; diff --git a/packages/grid-pro/theme/material/vaadin-grid-pro-styles.js b/packages/grid-pro/theme/material/vaadin-grid-pro-styles.js deleted file mode 100644 index b0c6d3bd29e..00000000000 --- a/packages/grid-pro/theme/material/vaadin-grid-pro-styles.js +++ /dev/null @@ -1,23 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/grid/theme/material/vaadin-grid-styles.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-grid-pro', - css` - :host([navigating]) [part~='cell']:active { - box-shadow: inset 0 0 0 2px var(--material-primary-color); - } - - [part~='editable-cell'], - [part~='editable-cell'] ::slotted(vaadin-grid-cell-content) { - cursor: pointer; - } - - [part~='row'] > [part~='editable-cell']:hover, - [part~='row'] > [part~='editable-cell']:focus { - background: var(--material-background-color) linear-gradient(rgba(0, 0, 0, 0.08), rgba(0, 0, 0, 0.08)); - } - `, - { moduleId: 'material-grid-pro' }, -); diff --git a/packages/grid-pro/theme/material/vaadin-grid-pro.js b/packages/grid-pro/theme/material/vaadin-grid-pro.js deleted file mode 100644 index 9902ed54d2d..00000000000 --- a/packages/grid-pro/theme/material/vaadin-grid-pro.js +++ /dev/null @@ -1,3 +0,0 @@ -import '@vaadin/grid/theme/material/vaadin-grid-styles.js'; -import './vaadin-grid-pro-styles.js'; -import '../../src/vaadin-grid-pro.js'; diff --git a/packages/grid-pro/theme/material/vaadin-lit-grid-pro-edit-checkbox.js b/packages/grid-pro/theme/material/vaadin-lit-grid-pro-edit-checkbox.js deleted file mode 100644 index 6ba4c23cc04..00000000000 --- a/packages/grid-pro/theme/material/vaadin-lit-grid-pro-edit-checkbox.js +++ /dev/null @@ -1,2 +0,0 @@ -import '@vaadin/checkbox/theme/material/vaadin-checkbox-styles.js'; -import '../../src/vaadin-lit-grid-pro-edit-checkbox.js'; diff --git a/packages/grid-pro/theme/material/vaadin-lit-grid-pro-edit-column.js b/packages/grid-pro/theme/material/vaadin-lit-grid-pro-edit-column.js deleted file mode 100644 index eefae87ad64..00000000000 --- a/packages/grid-pro/theme/material/vaadin-lit-grid-pro-edit-column.js +++ /dev/null @@ -1,4 +0,0 @@ -import './vaadin-lit-grid-pro-edit-checkbox.js'; -import './vaadin-lit-grid-pro-edit-select.js'; -import './vaadin-lit-grid-pro-edit-text-field.js'; -import '../../src/vaadin-lit-grid-pro-edit-column.js'; diff --git a/packages/grid-pro/theme/material/vaadin-lit-grid-pro-edit-select.js b/packages/grid-pro/theme/material/vaadin-lit-grid-pro-edit-select.js deleted file mode 100644 index fee4d167ad0..00000000000 --- a/packages/grid-pro/theme/material/vaadin-lit-grid-pro-edit-select.js +++ /dev/null @@ -1,3 +0,0 @@ -import '@vaadin/select/theme/material/vaadin-select-styles.js'; -import './vaadin-grid-pro-edit-select-styles.js'; -import '../../src/vaadin-lit-grid-pro-edit-select.js'; diff --git a/packages/grid-pro/theme/material/vaadin-lit-grid-pro-edit-text-field.js b/packages/grid-pro/theme/material/vaadin-lit-grid-pro-edit-text-field.js deleted file mode 100644 index ca5c2846cee..00000000000 --- a/packages/grid-pro/theme/material/vaadin-lit-grid-pro-edit-text-field.js +++ /dev/null @@ -1,3 +0,0 @@ -import '@vaadin/text-field/theme/material/vaadin-text-field-styles.js'; -import './vaadin-grid-pro-edit-text-field-styles.js'; -import '../../src/vaadin-lit-grid-pro-edit-text-field.js'; diff --git a/packages/grid-pro/theme/material/vaadin-lit-grid-pro.js b/packages/grid-pro/theme/material/vaadin-lit-grid-pro.js deleted file mode 100644 index ff3b2ef8857..00000000000 --- a/packages/grid-pro/theme/material/vaadin-lit-grid-pro.js +++ /dev/null @@ -1,3 +0,0 @@ -import '@vaadin/grid/theme/material/vaadin-grid-styles.js'; -import './vaadin-grid-pro-styles.js'; -import '../../src/vaadin-lit-grid-pro.js'; diff --git a/packages/grid/package.json b/packages/grid/package.json index 48fffb69013..d10738de564 100644 --- a/packages/grid/package.json +++ b/packages/grid/package.json @@ -52,7 +52,6 @@ "@vaadin/lit-renderer": "25.0.0-alpha0", "@vaadin/text-field": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/grid/test/resizing-material.test.js b/packages/grid/test/resizing-material.test.js deleted file mode 100644 index 83eefc0f3d1..00000000000 --- a/packages/grid/test/resizing-material.test.js +++ /dev/null @@ -1,24 +0,0 @@ -import { expect } from '@vaadin/chai-plugins'; -import { fixtureSync } from '@vaadin/testing-helpers'; -import '../theme/material/vaadin-grid.js'; -import { flushGrid, infiniteDataProvider } from './helpers.js'; - -describe('resizing material grid', () => { - let grid; - - beforeEach(() => { - grid = fixtureSync(` - - - - - - `); - grid.dataProvider = infiniteDataProvider; - flushGrid(grid); - }); - - it('should not overflow with last resizable column', () => { - expect(grid.$.table.scrollWidth).to.be.equal(grid.$.table.clientWidth); - }); -}); diff --git a/packages/grid/test/visual/material/grid.test.js b/packages/grid/test/visual/material/grid.test.js deleted file mode 100644 index 7960f736b1c..00000000000 --- a/packages/grid/test/visual/material/grid.test.js +++ /dev/null @@ -1,7 +0,0 @@ -import '../../../theme/material/vaadin-grid.js'; -import '../../../theme/material/vaadin-grid-column-group.js'; -import '../../../theme/material/vaadin-grid-selection-column.js'; -import '../../../theme/material/vaadin-grid-sorter.js'; -import '../../../theme/material/vaadin-grid-sort-column.js'; -import '../../../theme/material/vaadin-grid-tree-column.js'; -import '../grid.common.js'; diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/disabled.png b/packages/grid/test/visual/material/screenshots/grid/baseline/disabled.png deleted file mode 100644 index a0d1f302a4c..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/disabled.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/dragover-below-last-row-all-rows-visible.png b/packages/grid/test/visual/material/screenshots/grid/baseline/dragover-below-last-row-all-rows-visible.png deleted file mode 100644 index aad2d42864e..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/dragover-below-last-row-all-rows-visible.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/dragover.png b/packages/grid/test/visual/material/screenshots/grid/baseline/dragover.png deleted file mode 100644 index 6b438e6cff0..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/dragover.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/empty-state.png b/packages/grid/test/visual/material/screenshots/grid/baseline/empty-state.png deleted file mode 100644 index 0dcf3c20132..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/empty-state.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-column-groups.png b/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-column-groups.png deleted file mode 100644 index d849f3f0ae2..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-column-groups.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-frozen-end.png b/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-frozen-end.png deleted file mode 100644 index d31de5b1d9d..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-frozen-end.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-frozen-middle.png b/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-frozen-middle.png deleted file mode 100644 index acbebea20be..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-frozen-middle.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-frozen-start.png b/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-frozen-start.png deleted file mode 100644 index 8b2a8fc6c60..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-frozen-start.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-header-footer.png b/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-header-footer.png deleted file mode 100644 index 8145a108495..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-header-footer.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-row-details.png b/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-row-details.png deleted file mode 100644 index feac42da48b..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-row-details.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-row-focus-header.png b/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-row-focus-header.png deleted file mode 100644 index 5591e2a6b90..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-row-focus-header.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-row-focus.png b/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-row-focus.png deleted file mode 100644 index 5aa066d7341..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-row-focus.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-selection-end-frozen.png b/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-selection-end-frozen.png deleted file mode 100644 index 8dde4182a8e..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-selection-end-frozen.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-selection-end-initial.png b/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-selection-end-initial.png deleted file mode 100644 index 62c913972ba..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-selection-end-initial.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-selection-start-frozen.png b/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-selection-start-frozen.png deleted file mode 100644 index 0085f815207..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-selection-start-frozen.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-selection-start-initial.png b/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-selection-start-initial.png deleted file mode 100644 index ecbe507e84b..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-selection-start-initial.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-sorting-initial.png b/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-sorting-initial.png deleted file mode 100644 index a9a0c4b4224..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-sorting-initial.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-sorting-multi-asc-asc.png b/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-sorting-multi-asc-asc.png deleted file mode 100644 index 1a3545afefd..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-sorting-multi-asc-asc.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-sorting-multi-asc-desc.png b/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-sorting-multi-asc-desc.png deleted file mode 100644 index 4d55f3ef499..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-sorting-multi-asc-desc.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-sorting-single-asc.png b/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-sorting-single-asc.png deleted file mode 100644 index 99b001fecbd..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-sorting-single-asc.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-sorting-single-desc.png b/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-sorting-single-desc.png deleted file mode 100644 index 51397a53c5a..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/ltr-sorting-single-desc.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/row-dragover-above-details.png b/packages/grid/test/visual/material/screenshots/grid/baseline/row-dragover-above-details.png deleted file mode 100644 index 0f287a4e432..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/row-dragover-above-details.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/row-dragover-above.png b/packages/grid/test/visual/material/screenshots/grid/baseline/row-dragover-above.png deleted file mode 100644 index c666bfe5913..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/row-dragover-above.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/row-dragover-below-details.png b/packages/grid/test/visual/material/screenshots/grid/baseline/row-dragover-below-details.png deleted file mode 100644 index ade61ff2544..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/row-dragover-below-details.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/row-dragover-below.png b/packages/grid/test/visual/material/screenshots/grid/baseline/row-dragover-below.png deleted file mode 100644 index e70afe33e67..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/row-dragover-below.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/row-dragover-on-top.png b/packages/grid/test/visual/material/screenshots/grid/baseline/row-dragover-on-top.png deleted file mode 100644 index 910102baff5..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/row-dragover-on-top.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/row-dragstart.png b/packages/grid/test/visual/material/screenshots/grid/baseline/row-dragstart.png deleted file mode 100644 index c5123845bf2..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/row-dragstart.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-column-groups.png b/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-column-groups.png deleted file mode 100644 index 9e5348fe74a..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-column-groups.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-frozen-end.png b/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-frozen-end.png deleted file mode 100644 index b56694a4ffe..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-frozen-end.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-frozen-middle.png b/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-frozen-middle.png deleted file mode 100644 index 357dde7669e..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-frozen-middle.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-frozen-start.png b/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-frozen-start.png deleted file mode 100644 index 5d305a6de7c..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-frozen-start.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-header-footer.png b/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-header-footer.png deleted file mode 100644 index 84c705cde54..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-header-footer.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-row-details.png b/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-row-details.png deleted file mode 100644 index 4b64878cebe..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-row-details.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-row-focus-header.png b/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-row-focus-header.png deleted file mode 100644 index 21a2935137b..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-row-focus-header.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-row-focus.png b/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-row-focus.png deleted file mode 100644 index 172c9469e7d..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-row-focus.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-selection-end-frozen.png b/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-selection-end-frozen.png deleted file mode 100644 index 7ba6619b8b4..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-selection-end-frozen.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-selection-end-initial.png b/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-selection-end-initial.png deleted file mode 100644 index 4f2ce316d7a..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-selection-end-initial.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-selection-start-frozen.png b/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-selection-start-frozen.png deleted file mode 100644 index f06cdc9378b..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-selection-start-frozen.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-selection-start-initial.png b/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-selection-start-initial.png deleted file mode 100644 index 140f4bc05c1..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-selection-start-initial.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-sorting-initial.png b/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-sorting-initial.png deleted file mode 100644 index a3d0e34820d..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-sorting-initial.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-sorting-multi-asc-asc.png b/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-sorting-multi-asc-asc.png deleted file mode 100644 index 869a799a2b1..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-sorting-multi-asc-asc.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-sorting-multi-asc-desc.png b/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-sorting-multi-asc-desc.png deleted file mode 100644 index 398c010ed30..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-sorting-multi-asc-desc.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-sorting-single-asc.png b/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-sorting-single-asc.png deleted file mode 100644 index 10d69423cef..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-sorting-single-asc.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-sorting-single-desc.png b/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-sorting-single-desc.png deleted file mode 100644 index b8b224bea3a..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/rtl-sorting-single-desc.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/tree-default.png b/packages/grid/test/visual/material/screenshots/grid/baseline/tree-default.png deleted file mode 100644 index 3dc0412b108..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/tree-default.png and /dev/null differ diff --git a/packages/grid/test/visual/material/screenshots/grid/baseline/tree-overflow.png b/packages/grid/test/visual/material/screenshots/grid/baseline/tree-overflow.png deleted file mode 100644 index 2dabeab80ec..00000000000 Binary files a/packages/grid/test/visual/material/screenshots/grid/baseline/tree-overflow.png and /dev/null differ diff --git a/packages/grid/theme/material/all-imports.js b/packages/grid/theme/material/all-imports.js deleted file mode 100644 index 9c9b07d9a3a..00000000000 --- a/packages/grid/theme/material/all-imports.js +++ /dev/null @@ -1,11 +0,0 @@ -import './vaadin-grid-column-group.js'; -import './vaadin-grid-column.js'; -import './vaadin-grid-filter.js'; -import './vaadin-grid-filter-column.js'; -import './vaadin-grid-selection-column.js'; -import './vaadin-grid-sorter.js'; -import './vaadin-grid-sort-column.js'; -import './vaadin-grid-tree-toggle.js'; -import './vaadin-grid-tree-column.js'; -import './vaadin-grid.js'; -import '../../src/all-imports.js'; diff --git a/packages/grid/theme/material/lit-all-imports.js b/packages/grid/theme/material/lit-all-imports.js deleted file mode 100644 index 26a786206fc..00000000000 --- a/packages/grid/theme/material/lit-all-imports.js +++ /dev/null @@ -1,11 +0,0 @@ -import './vaadin-lit-grid-column-group.js'; -import './vaadin-lit-grid-column.js'; -import './vaadin-lit-grid-filter.js'; -import './vaadin-lit-grid-filter-column.js'; -import './vaadin-lit-grid-selection-column.js'; -import './vaadin-lit-grid-sorter.js'; -import './vaadin-lit-grid-sort-column.js'; -import './vaadin-lit-grid-tree-toggle.js'; -import './vaadin-lit-grid-tree-column.js'; -import './vaadin-lit-grid.js'; -import '../../src/lit-all-imports.js'; diff --git a/packages/grid/theme/material/vaadin-grid-column-group.js b/packages/grid/theme/material/vaadin-grid-column-group.js deleted file mode 100644 index f9133c40371..00000000000 --- a/packages/grid/theme/material/vaadin-grid-column-group.js +++ /dev/null @@ -1 +0,0 @@ -import '../../src/vaadin-grid-column-group.js'; diff --git a/packages/grid/theme/material/vaadin-grid-column.js b/packages/grid/theme/material/vaadin-grid-column.js deleted file mode 100644 index dd5ae0757ac..00000000000 --- a/packages/grid/theme/material/vaadin-grid-column.js +++ /dev/null @@ -1 +0,0 @@ -import '../../src/vaadin-grid-column.js'; diff --git a/packages/grid/theme/material/vaadin-grid-filter-column.js b/packages/grid/theme/material/vaadin-grid-filter-column.js deleted file mode 100644 index 672539b5c9e..00000000000 --- a/packages/grid/theme/material/vaadin-grid-filter-column.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-grid-filter.js'; -import '../../src/vaadin-grid-filter-column.js'; diff --git a/packages/grid/theme/material/vaadin-grid-filter.js b/packages/grid/theme/material/vaadin-grid-filter.js deleted file mode 100644 index 18feca40dfc..00000000000 --- a/packages/grid/theme/material/vaadin-grid-filter.js +++ /dev/null @@ -1,2 +0,0 @@ -import '@vaadin/text-field/theme/material/vaadin-text-field.js'; -import '../../src/vaadin-grid-filter.js'; diff --git a/packages/grid/theme/material/vaadin-grid-selection-column.js b/packages/grid/theme/material/vaadin-grid-selection-column.js deleted file mode 100644 index ab6eb4cdeca..00000000000 --- a/packages/grid/theme/material/vaadin-grid-selection-column.js +++ /dev/null @@ -1,2 +0,0 @@ -import '@vaadin/checkbox/theme/material/vaadin-checkbox.js'; -import '../../src/vaadin-grid-selection-column.js'; diff --git a/packages/grid/theme/material/vaadin-grid-sort-column.js b/packages/grid/theme/material/vaadin-grid-sort-column.js deleted file mode 100644 index 11d0693c20c..00000000000 --- a/packages/grid/theme/material/vaadin-grid-sort-column.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-grid-sorter.js'; -import '../../src/vaadin-grid-sort-column.js'; diff --git a/packages/grid/theme/material/vaadin-grid-sorter-styles.js b/packages/grid/theme/material/vaadin-grid-sorter-styles.js deleted file mode 100644 index 797a87cd468..00000000000 --- a/packages/grid/theme/material/vaadin-grid-sorter-styles.js +++ /dev/null @@ -1,73 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/font-icons.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-grid-sorter', - css` - :host { - justify-content: flex-start; - height: 100%; - align-items: center; - -webkit-user-select: none; - user-select: none; - } - - :host([direction]) { - color: var(--material-body-text-color); - } - - [part='indicators'] { - order: -1; - } - - [part='indicators']::before { - display: inline-block; - width: 24px; - font-family: 'material-icons'; - font-size: 18px; - line-height: 18px; - transition: - 0.1s opacity cubic-bezier(0.4, 0, 0.2, 0.1), - 0.1s width cubic-bezier(0.4, 0, 0.2, 0.1); - opacity: 0.5; - } - - :host(:not([direction])) [part='indicators']::before { - content: var(--material-icons-arrow-upward); - width: 0; - opacity: 0; - } - - :host([direction]) [part='indicators']::before { - opacity: 1; - } - - :host([direction='asc']) [part='indicators']::before { - content: var(--material-icons-arrow-upward); - } - - :host([direction='desc']) [part='indicators']::before { - content: var(--material-icons-arrow-downward); - } - - :host(:hover) [part='indicators']::before { - width: 24px; - opacity: 1; - } - - [part='order'] { - right: 4px; - top: -8px; - font-size: 10px; - } - - /* RTL specific styles */ - - :host([dir='rtl']) [part='order'] { - left: 4px; - right: auto; - } - `, - { moduleId: 'material-grid-sorter' }, -); diff --git a/packages/grid/theme/material/vaadin-grid-sorter.js b/packages/grid/theme/material/vaadin-grid-sorter.js deleted file mode 100644 index 6f932f3d436..00000000000 --- a/packages/grid/theme/material/vaadin-grid-sorter.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-grid-sorter-styles.js'; -import '../../src/vaadin-grid-sorter.js'; diff --git a/packages/grid/theme/material/vaadin-grid-styles.js b/packages/grid/theme/material/vaadin-grid-styles.js deleted file mode 100644 index 42dea8babec..00000000000 --- a/packages/grid/theme/material/vaadin-grid-styles.js +++ /dev/null @@ -1,266 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-grid', - css` - :host { - background-color: var(--material-background-color); - font-family: var(--material-font-family); - font-size: var(--material-small-font-size); - line-height: 20px; - color: var(--material-body-text-color); - } - - :host([disabled]) { - opacity: 0.7; - } - - [part~='cell'] { - min-height: 48px; - -webkit-tap-highlight-color: transparent; - --_cell-padding: var(--vaadin-grid-cell-padding, var(--_cell-default-padding)); - --_cell-default-padding: 8px 16px; - } - - [part~='cell'] ::slotted(vaadin-grid-cell-content) { - padding: var(--_cell-padding); - } - - [part~='details-cell'] { - --_cell-default-padding: 14px 16px; - } - - [part~='header-cell'], - [part~='footer-cell'] { - background-color: var(--vaadin-grid-cell-background, var(--material-background-color)); - color: var(--material-secondary-text-color); - font-size: var(--material-caption-font-size); - font-weight: 500; - } - - /* Header and footer divider between body rows */ - - [part~='body-cell'], - [part~='details-cell'], - [part~='row']:last-child > [part~='header-cell'] { - border-bottom: 1px solid var(--material-divider-color); - } - - [part~='row']:first-child > [part~='footer-cell'] { - border-top: 1px solid var(--material-divider-color); - } - - /* Body rows/cells */ - - [part~='body-cell'] { - background-color: var(--vaadin-grid-cell-background, var(--material-background-color)); - } - - [part~='row']:hover > [part~='body-cell'] { - background: var( - --vaadin-grid-cell-background, - linear-gradient( - var(--_material-grid-row-hover-background-color, rgba(0, 0, 0, 0.04)), - var(--_material-grid-row-hover-background-color, rgba(0, 0, 0, 0.04)) - ) - var(--material-background-color) - ); - } - - @media (hover: none) { - [part~='row']:hover > [part~='body-cell'] { - background: var(--material-background-color); - } - } - - /* Selected row */ - - [part~='body-cell']::before { - content: ''; - pointer-events: none; - position: absolute; - inset: 0; - background-color: var(--material-primary-color); - opacity: 0; - transition: opacity 0.1s cubic-bezier(0.4, 0, 0.2, 0.1); - } - - :host(:not([reordering])) [part~='row'][selected] > [part~='body-cell']::before { - opacity: var(--_material-grid-row-selected-overlay-opacity, 0.08); - } - - [part~='body-cell'] ::slotted(vaadin-grid-cell-content) { - /* NOTE(platosha): Raise cell content above background cell pseudo elements */ - position: relative; - } - - /* Column reordering */ - - :host([reordering]) [part~='cell'] { - background: var(--material-secondary-background-color); - } - - :host([reordering]) [part~='cell'][reorder-status='allowed'] { - background: var(--material-background-color); - } - - :host([reordering]) [part~='cell'][reorder-status='dragging'] { - background: var(--material-background-color); - } - - /* Frozen columns */ - - [part~='cell'][last-frozen] { - border-right: 1px solid var(--material-divider-color); - } - - [part~='cell'][first-frozen-to-end] { - border-left: 1px solid var(--material-divider-color); - } - - /* Column resizing */ - - [part~='cell']:not([last-frozen]) [part='resize-handle'] { - border-right: 1px solid var(--material-divider-color); - } - - /* Keyboard navigation */ - - [part~='row'] { - position: relative; - } - - [part~='row']:focus, - [part~='focused-cell']:focus { - outline: none; - } - - :host([navigating]) [part~='row']:focus::before, - :host([navigating]) [part~='focused-cell']:focus { - box-shadow: inset 0 0 0 2px var(--material-primary-color); - } - - :host([navigating]) [part~='row']:focus::before { - content: ''; - position: absolute; - inset: 0; - pointer-events: none; - transform: translateX(calc(-1 * var(--_grid-horizontal-scroll-position))); - z-index: 3; - } - - /* Empty state */ - [part~='empty-state'] { - padding: 16px; - color: var(--material-secondary-text-color); - } - - /* Drag and Drop styles */ - :host([dragover])::after { - content: ''; - position: absolute; - z-index: 100; - inset: 0; - pointer-events: none; - box-shadow: inset 0 0 0 2px var(--material-primary-color); - } - - [part~='row'][dragover] { - z-index: 100 !important; - } - - [part~='row'][dragover] [part~='cell'] { - overflow: visible; - } - - [part~='row'][dragover] [part~='cell']::after { - content: ''; - position: absolute; - inset: 0; - height: 3px; - pointer-events: none; - background: var(--material-primary-color); - } - - [part~='row'][dragover='below'] [part~='cell']::after { - top: 100%; - bottom: auto; - margin-top: -1px; - } - - :host([all-rows-visible]) [part~='last-row'][dragover='below'] [part~='cell']::after { - height: 1px; - } - - [part~='row'][dragover='above'] [part~='cell']::after { - top: auto; - bottom: 100%; - margin-bottom: -1px; - } - - [part~='row'][details-opened][dragover='below'] [part~='cell']:not([part~='details-cell'])::after, - [part~='row'][details-opened][dragover='above'] [part~='details-cell']::after { - display: none; - } - - [part~='row'][dragover][dragover='on-top'] [part~='cell']::after { - height: 100%; - opacity: 0.5; - } - - [part~='row'][dragstart] { - z-index: 100 !important; - opacity: 0.9; - } - - [part~='row'][dragstart] [part~='cell'] { - border: none !important; - box-shadow: none !important; - } - - #scroller [part~='row'][dragstart]:not([dragstart=''])::after { - display: block; - position: absolute; - left: var(--_grid-drag-start-x); - top: var(--_grid-drag-start-y); - z-index: 100; - content: attr(dragstart); - align-items: center; - justify-content: center; - box-sizing: border-box; - padding: 4px; - color: var(--material-primary-contrast-color); - background-color: var(--material-error-color); - min-width: 24px; - border-radius: 2px; - font-size: var(--material-caption-font-size); - text-align: center; - line-height: 1; - } - - /* RTL specific styles */ - - :host([dir='rtl']) [part~='cell'][last-frozen] { - border-right: none; - border-left: 1px solid var(--material-divider-color); - } - - :host([dir='rtl']) [part~='cell'][first-frozen-to-end] { - border-left: none; - border-right: 1px solid var(--material-divider-color); - } - - :host([dir='rtl']) [part~='cell']:not([last-frozen]) [part='resize-handle'] { - border-right: none; - border-left: 1px solid var(--material-divider-color); - } - - :host([dir='rtl']) #scroller [part~='row'][dragstart]:not([dragstart=''])::after { - left: auto; - right: var(--_grid-drag-start-x); - } - `, - { moduleId: 'material-grid' }, -); diff --git a/packages/grid/theme/material/vaadin-grid-tree-column.js b/packages/grid/theme/material/vaadin-grid-tree-column.js deleted file mode 100644 index bddf850c563..00000000000 --- a/packages/grid/theme/material/vaadin-grid-tree-column.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-grid-tree-toggle.js'; -import '../../src/vaadin-grid-tree-column.js'; diff --git a/packages/grid/theme/material/vaadin-grid-tree-toggle-styles.js b/packages/grid/theme/material/vaadin-grid-tree-toggle-styles.js deleted file mode 100644 index c0857cef60b..00000000000 --- a/packages/grid/theme/material/vaadin-grid-tree-toggle-styles.js +++ /dev/null @@ -1,42 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/font-icons.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-grid-tree-toggle', - css` - :host { - --_material-grid-tree-toggle-collapsed-icon-transform: rotate(0); - } - - :host([dir='rtl']) { - --_material-grid-tree-toggle-collapsed-icon-transform: rotate(180deg); - } - - [part='toggle'] { - width: calc(var(--material-icon-font-size) + 8px); - position: relative; - align-self: stretch; /* NOTE(platosha): helps to maintain baseline */ - } - - [part='toggle']::before { - font-family: 'material-icons'; - font-size: var(--material-icon-font-size); - width: var(--material-icon-font-size); - position: absolute; /* NOTE(platosha): helps to maintain baseline */ - transform: var(--_material-grid-tree-toggle-collapsed-icon-transform); - transition: transform 0.1s cubic-bezier(0.4, 0, 0.2, 0.1); - } - - :host(:not([expanded])) [part='toggle']::before, - :host([expanded]) [part='toggle']::before { - content: var(--material-icons-chevron-right); - } - - :host([expanded]) [part='toggle']::before { - transform: rotate(90deg); - } - `, - { moduleId: 'material-grid-tree-toggle' }, -); diff --git a/packages/grid/theme/material/vaadin-grid-tree-toggle.js b/packages/grid/theme/material/vaadin-grid-tree-toggle.js deleted file mode 100644 index dfa87558a2a..00000000000 --- a/packages/grid/theme/material/vaadin-grid-tree-toggle.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-grid-tree-toggle-styles.js'; -import '../../src/vaadin-grid-tree-toggle.js'; diff --git a/packages/grid/theme/material/vaadin-grid.js b/packages/grid/theme/material/vaadin-grid.js deleted file mode 100644 index db613f72178..00000000000 --- a/packages/grid/theme/material/vaadin-grid.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-grid-styles.js'; -import '../../src/vaadin-grid.js'; diff --git a/packages/grid/theme/material/vaadin-lit-grid-column-group.js b/packages/grid/theme/material/vaadin-lit-grid-column-group.js deleted file mode 100644 index 05213e75aae..00000000000 --- a/packages/grid/theme/material/vaadin-lit-grid-column-group.js +++ /dev/null @@ -1 +0,0 @@ -import '../../src/vaadin-lit-grid-column-group.js'; diff --git a/packages/grid/theme/material/vaadin-lit-grid-column.js b/packages/grid/theme/material/vaadin-lit-grid-column.js deleted file mode 100644 index 70f84c24c2d..00000000000 --- a/packages/grid/theme/material/vaadin-lit-grid-column.js +++ /dev/null @@ -1 +0,0 @@ -import '../../src/vaadin-lit-grid-column.js'; diff --git a/packages/grid/theme/material/vaadin-lit-grid-filter-column.js b/packages/grid/theme/material/vaadin-lit-grid-filter-column.js deleted file mode 100644 index 3107cf7235e..00000000000 --- a/packages/grid/theme/material/vaadin-lit-grid-filter-column.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-lit-grid-filter.js'; -import '../../src/vaadin-lit-grid-filter-column.js'; diff --git a/packages/grid/theme/material/vaadin-lit-grid-filter.js b/packages/grid/theme/material/vaadin-lit-grid-filter.js deleted file mode 100644 index ae7ca0bba74..00000000000 --- a/packages/grid/theme/material/vaadin-lit-grid-filter.js +++ /dev/null @@ -1,2 +0,0 @@ -import '@vaadin/text-field/theme/material/vaadin-lit-text-field.js'; -import '../../src/vaadin-lit-grid-filter.js'; diff --git a/packages/grid/theme/material/vaadin-lit-grid-selection-column.js b/packages/grid/theme/material/vaadin-lit-grid-selection-column.js deleted file mode 100644 index 7a8a4b1a3f0..00000000000 --- a/packages/grid/theme/material/vaadin-lit-grid-selection-column.js +++ /dev/null @@ -1,2 +0,0 @@ -import '@vaadin/checkbox/theme/material/vaadin-lit-checkbox.js'; -import '../../src/vaadin-lit-grid-selection-column.js'; diff --git a/packages/grid/theme/material/vaadin-lit-grid-sort-column.js b/packages/grid/theme/material/vaadin-lit-grid-sort-column.js deleted file mode 100644 index 3c717675724..00000000000 --- a/packages/grid/theme/material/vaadin-lit-grid-sort-column.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-lit-grid-sorter.js'; -import '../../src/vaadin-lit-grid-sort-column.js'; diff --git a/packages/grid/theme/material/vaadin-lit-grid-sorter.js b/packages/grid/theme/material/vaadin-lit-grid-sorter.js deleted file mode 100644 index 954d24dc849..00000000000 --- a/packages/grid/theme/material/vaadin-lit-grid-sorter.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-grid-sorter-styles.js'; -import '../../src/vaadin-lit-grid-sorter.js'; diff --git a/packages/grid/theme/material/vaadin-lit-grid-tree-column.js b/packages/grid/theme/material/vaadin-lit-grid-tree-column.js deleted file mode 100644 index bdd553ce845..00000000000 --- a/packages/grid/theme/material/vaadin-lit-grid-tree-column.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-lit-grid-tree-toggle.js'; -import '../../src/vaadin-lit-grid-tree-column.js'; diff --git a/packages/grid/theme/material/vaadin-lit-grid-tree-toggle.js b/packages/grid/theme/material/vaadin-lit-grid-tree-toggle.js deleted file mode 100644 index 36730705972..00000000000 --- a/packages/grid/theme/material/vaadin-lit-grid-tree-toggle.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-grid-tree-toggle-styles.js'; -import '../../src/vaadin-lit-grid-tree-toggle.js'; diff --git a/packages/grid/theme/material/vaadin-lit-grid.js b/packages/grid/theme/material/vaadin-lit-grid.js deleted file mode 100644 index 48a61b8ef92..00000000000 --- a/packages/grid/theme/material/vaadin-lit-grid.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-grid-styles.js'; -import '../../src/vaadin-lit-grid.js'; diff --git a/packages/horizontal-layout/package.json b/packages/horizontal-layout/package.json index 50359b2baad..4605d4b541a 100644 --- a/packages/horizontal-layout/package.json +++ b/packages/horizontal-layout/package.json @@ -38,7 +38,6 @@ "@polymer/polymer": "^3.0.0", "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/horizontal-layout/test/visual/material/horizontal-layout.test.js b/packages/horizontal-layout/test/visual/material/horizontal-layout.test.js deleted file mode 100644 index c0a61938bb2..00000000000 --- a/packages/horizontal-layout/test/visual/material/horizontal-layout.test.js +++ /dev/null @@ -1,135 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-horizontal-layout.js'; - -describe('horizontal-layout', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'flex'; - element = fixtureSync( - ` - -
Item 1
-
Item 2
-
- `, - div, - ); - }); - - it('basic', async () => { - await visualDiff(div, 'basic'); - }); - - it('theme-margin', async () => { - element.setAttribute('theme', 'margin'); - await visualDiff(div, 'theme-margin'); - }); - - it('theme-padding', async () => { - element.setAttribute('theme', 'padding'); - await visualDiff(div, 'theme-padding'); - }); - - it('theme-spacing', async () => { - element.setAttribute('theme', 'spacing'); - await visualDiff(div, 'theme-spacing'); - }); - - it('theme-margin-padding', async () => { - element.setAttribute('theme', 'margin padding'); - await visualDiff(div, 'theme-margin-padding'); - }); - - it('theme-margin-spacing', async () => { - element.setAttribute('theme', 'margin spacing'); - await visualDiff(div, 'theme-margin-spacing'); - }); - - it('theme-margin-padding-spacing', async () => { - element.setAttribute('theme', 'margin padding spacing'); - await visualDiff(div, 'theme-margin-padding-spacing'); - }); - - it('theme-wrap', async () => { - element.setAttribute('theme', 'wrap'); - element.style.width = '100px'; - await visualDiff(div, 'theme-wrap'); - }); - - describe('slots', () => { - describe('all', () => { - beforeEach(() => { - element = fixtureSync( - ` - -
Start
-
Start
-
Middle
-
End
-
- `, - ); - }); - - it('default', async () => { - await visualDiff(element, 'slots-all'); - }); - }); - - describe('without end', () => { - beforeEach(() => { - element = fixtureSync( - ` - -
Start
-
Start
-
Middle
-
- `, - ); - }); - - it('default', async () => { - await visualDiff(element, 'slots-without-end'); - }); - }); - - describe('without start', () => { - beforeEach(() => { - element = fixtureSync( - ` - -
Middle
-
End
-
End
-
- `, - ); - }); - - it('default', async () => { - await visualDiff(element, 'slots-without-start'); - }); - }); - - describe('without middle', () => { - beforeEach(() => { - element = fixtureSync( - ` - -
Start
-
End
-
- `, - ); - }); - - it('default', async () => { - await visualDiff(element, 'slots-without-middle'); - }); - }); - }); -}); diff --git a/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/basic.png b/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/basic.png deleted file mode 100644 index eb2919dc5de..00000000000 Binary files a/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/basic.png and /dev/null differ diff --git a/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/slots-all.png b/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/slots-all.png deleted file mode 100644 index c1192941c32..00000000000 Binary files a/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/slots-all.png and /dev/null differ diff --git a/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/slots-without-end.png b/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/slots-without-end.png deleted file mode 100644 index 89d90e060c4..00000000000 Binary files a/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/slots-without-end.png and /dev/null differ diff --git a/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/slots-without-middle.png b/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/slots-without-middle.png deleted file mode 100644 index 238a3ff6c09..00000000000 Binary files a/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/slots-without-middle.png and /dev/null differ diff --git a/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/slots-without-start.png b/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/slots-without-start.png deleted file mode 100644 index f0f8077cb97..00000000000 Binary files a/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/slots-without-start.png and /dev/null differ diff --git a/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/theme-margin-padding-spacing.png b/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/theme-margin-padding-spacing.png deleted file mode 100644 index 80a5ec784ad..00000000000 Binary files a/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/theme-margin-padding-spacing.png and /dev/null differ diff --git a/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/theme-margin-padding.png b/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/theme-margin-padding.png deleted file mode 100644 index d2a9d484229..00000000000 Binary files a/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/theme-margin-padding.png and /dev/null differ diff --git a/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/theme-margin-spacing.png b/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/theme-margin-spacing.png deleted file mode 100644 index 44572c6267b..00000000000 Binary files a/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/theme-margin-spacing.png and /dev/null differ diff --git a/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/theme-margin.png b/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/theme-margin.png deleted file mode 100644 index ac8132a8d8c..00000000000 Binary files a/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/theme-margin.png and /dev/null differ diff --git a/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/theme-padding.png b/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/theme-padding.png deleted file mode 100644 index bcbed6480fe..00000000000 Binary files a/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/theme-padding.png and /dev/null differ diff --git a/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/theme-spacing.png b/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/theme-spacing.png deleted file mode 100644 index 32a1c91030f..00000000000 Binary files a/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/theme-spacing.png and /dev/null differ diff --git a/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/theme-wrap.png b/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/theme-wrap.png deleted file mode 100644 index e34c9c3b8ea..00000000000 Binary files a/packages/horizontal-layout/test/visual/material/screenshots/horizontal-layout/baseline/theme-wrap.png and /dev/null differ diff --git a/packages/horizontal-layout/theme/material/vaadin-horizontal-layout-styles.js b/packages/horizontal-layout/theme/material/vaadin-horizontal-layout-styles.js deleted file mode 100644 index 871cd929571..00000000000 --- a/packages/horizontal-layout/theme/material/vaadin-horizontal-layout-styles.js +++ /dev/null @@ -1,37 +0,0 @@ -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const horizontalLayout = css` - [theme~='margin'] { - margin: 16px; - } - - [theme~='padding'] { - padding: 16px; - } - - :host([theme~='spacing-xs']) { - gap: 4px; - } - - :host([theme~='spacing-s']) { - gap: 8px; - } - - :host([theme~='spacing']) { - gap: 16px; - } - - :host([theme~='spacing-l']) { - gap: 24px; - } - - :host([theme~='spacing-xl']) { - gap: 40px; - } - - :host([theme~='wrap']) { - flex-wrap: wrap; - } -`; - -registerStyles('vaadin-horizontal-layout', horizontalLayout, { moduleId: 'material-horizontal-layout' }); diff --git a/packages/horizontal-layout/theme/material/vaadin-horizontal-layout.js b/packages/horizontal-layout/theme/material/vaadin-horizontal-layout.js deleted file mode 100644 index 290dcfaed1b..00000000000 --- a/packages/horizontal-layout/theme/material/vaadin-horizontal-layout.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-horizontal-layout-styles.js'; -import '../../src/vaadin-horizontal-layout.js'; diff --git a/packages/horizontal-layout/theme/material/vaadin-lit-horizontal-layout.js b/packages/horizontal-layout/theme/material/vaadin-lit-horizontal-layout.js deleted file mode 100644 index 9c6d67e4429..00000000000 --- a/packages/horizontal-layout/theme/material/vaadin-lit-horizontal-layout.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-horizontal-layout-styles.js'; -import '../../src/vaadin-lit-horizontal-layout.js'; diff --git a/packages/icon/test/visual/material/icon.test.js b/packages/icon/test/visual/material/icon.test.js deleted file mode 100644 index 80a90e73fbe..00000000000 --- a/packages/icon/test/visual/material/icon.test.js +++ /dev/null @@ -1,2 +0,0 @@ -import '../../../theme/material/vaadin-icon.js'; -import '../icon.common.js'; diff --git a/packages/icon/test/visual/material/screenshots/icon/baseline/font-icons.png b/packages/icon/test/visual/material/screenshots/icon/baseline/font-icons.png deleted file mode 100644 index fd7ee775b0a..00000000000 Binary files a/packages/icon/test/visual/material/screenshots/icon/baseline/font-icons.png and /dev/null differ diff --git a/packages/icon/theme/material/vaadin-icon-styles.js b/packages/icon/theme/material/vaadin-icon-styles.js deleted file mode 100644 index 3c2522d4b71..00000000000 --- a/packages/icon/theme/material/vaadin-icon-styles.js +++ /dev/null @@ -1,12 +0,0 @@ -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-icon', - css` - :host { - width: 24px; - height: 24px; - } - `, - { moduleId: 'material-icon' }, -); diff --git a/packages/icon/theme/material/vaadin-icon.js b/packages/icon/theme/material/vaadin-icon.js deleted file mode 100644 index 168ebf9853b..00000000000 --- a/packages/icon/theme/material/vaadin-icon.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-icon-styles.js'; -import '../../src/vaadin-icon.js'; diff --git a/packages/icon/theme/material/vaadin-lit-icon.js b/packages/icon/theme/material/vaadin-lit-icon.js deleted file mode 100644 index f702e8d238f..00000000000 --- a/packages/icon/theme/material/vaadin-lit-icon.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-icon-styles.js'; -import '../../src/vaadin-lit-icon.js'; diff --git a/packages/input-container/package.json b/packages/input-container/package.json index ad6af40713e..3e021b48b6b 100644 --- a/packages/input-container/package.json +++ b/packages/input-container/package.json @@ -35,7 +35,6 @@ "@polymer/polymer": "^3.0.0", "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/input-container/test/visual/material/input-container.test.js b/packages/input-container/test/visual/material/input-container.test.js deleted file mode 100644 index edfac2a3dc6..00000000000 --- a/packages/input-container/test/visual/material/input-container.test.js +++ /dev/null @@ -1,56 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '@vaadin/icon/vaadin-icon.js'; -import '@vaadin/vaadin-lumo-styles/vaadin-iconset.js'; -import '../../../theme/material/vaadin-input-container.js'; - -describe('input-container', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - div.style.padding = '10px'; - element = fixtureSync('', div); - }); - - ['empty', 'non-empty'].forEach((initialState) => { - describe(initialState, () => { - beforeEach(() => { - if (initialState === 'non-empty') { - element.querySelector('input').value = 'Some text'; - } - }); - - it('basic', async () => { - await visualDiff(div, `${initialState}-basic`); - }); - - it('disabled', async () => { - element.disabled = true; - await visualDiff(div, `${initialState}-disabled`); - }); - - it('invalid', async () => { - element.invalid = true; - await visualDiff(div, `${initialState}-invalid`); - }); - }); - }); - - it('prefix icon', async () => { - const icon = document.createElement('vaadin-icon'); - icon.setAttribute('slot', 'prefix'); - icon.icon = 'lumo:user'; - element.appendChild(icon); - await visualDiff(div, 'prefix-icon'); - }); - - it('suffix icon', async () => { - const icon = document.createElement('vaadin-icon'); - icon.setAttribute('slot', 'suffix'); - icon.icon = 'lumo:user'; - element.appendChild(icon); - await visualDiff(div, 'suffix-icon'); - }); -}); diff --git a/packages/input-container/test/visual/material/screenshots/input-container/baseline/empty-basic.png b/packages/input-container/test/visual/material/screenshots/input-container/baseline/empty-basic.png deleted file mode 100644 index 452a10e758e..00000000000 Binary files a/packages/input-container/test/visual/material/screenshots/input-container/baseline/empty-basic.png and /dev/null differ diff --git a/packages/input-container/test/visual/material/screenshots/input-container/baseline/empty-disabled.png b/packages/input-container/test/visual/material/screenshots/input-container/baseline/empty-disabled.png deleted file mode 100644 index 592d22e1c49..00000000000 Binary files a/packages/input-container/test/visual/material/screenshots/input-container/baseline/empty-disabled.png and /dev/null differ diff --git a/packages/input-container/test/visual/material/screenshots/input-container/baseline/empty-invalid.png b/packages/input-container/test/visual/material/screenshots/input-container/baseline/empty-invalid.png deleted file mode 100644 index 4836959bf80..00000000000 Binary files a/packages/input-container/test/visual/material/screenshots/input-container/baseline/empty-invalid.png and /dev/null differ diff --git a/packages/input-container/test/visual/material/screenshots/input-container/baseline/non-empty-basic.png b/packages/input-container/test/visual/material/screenshots/input-container/baseline/non-empty-basic.png deleted file mode 100644 index 3ca05e9e70b..00000000000 Binary files a/packages/input-container/test/visual/material/screenshots/input-container/baseline/non-empty-basic.png and /dev/null differ diff --git a/packages/input-container/test/visual/material/screenshots/input-container/baseline/non-empty-disabled.png b/packages/input-container/test/visual/material/screenshots/input-container/baseline/non-empty-disabled.png deleted file mode 100644 index 9a20f20c1c2..00000000000 Binary files a/packages/input-container/test/visual/material/screenshots/input-container/baseline/non-empty-disabled.png and /dev/null differ diff --git a/packages/input-container/test/visual/material/screenshots/input-container/baseline/non-empty-invalid.png b/packages/input-container/test/visual/material/screenshots/input-container/baseline/non-empty-invalid.png deleted file mode 100644 index f2c745e1201..00000000000 Binary files a/packages/input-container/test/visual/material/screenshots/input-container/baseline/non-empty-invalid.png and /dev/null differ diff --git a/packages/input-container/test/visual/material/screenshots/input-container/baseline/prefix-icon.png b/packages/input-container/test/visual/material/screenshots/input-container/baseline/prefix-icon.png deleted file mode 100644 index cd625e4cd6c..00000000000 Binary files a/packages/input-container/test/visual/material/screenshots/input-container/baseline/prefix-icon.png and /dev/null differ diff --git a/packages/input-container/test/visual/material/screenshots/input-container/baseline/suffix-icon.png b/packages/input-container/test/visual/material/screenshots/input-container/baseline/suffix-icon.png deleted file mode 100644 index c5b905f99ec..00000000000 Binary files a/packages/input-container/test/visual/material/screenshots/input-container/baseline/suffix-icon.png and /dev/null differ diff --git a/packages/input-container/theme/material/vaadin-input-container-styles.js b/packages/input-container/theme/material/vaadin-input-container-styles.js deleted file mode 100644 index 10efd0a318a..00000000000 --- a/packages/input-container/theme/material/vaadin-input-container-styles.js +++ /dev/null @@ -1,80 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-input-container', - css` - :host { - position: relative; - top: -0.2px; /* NOTE(platosha): Adjusts for wrong flex baseline in Chrome & Safari */ - height: 32px; - padding-left: 0; - padding-right: 0; - background-color: transparent; - margin: 0; - } - - :host::before, - :host::after { - content: ''; - position: absolute; - bottom: 0; - left: 0; - right: 0; - height: 1px; - transform-origin: 50% 0%; - background-color: var(--_material-text-field-input-line-background-color, #000); - opacity: var(--_material-text-field-input-line-opacity, 0.42); - } - - :host::after { - background-color: var(--material-primary-color); - opacity: 0; - height: 2px; - bottom: 0; - transform: scaleX(0); - transition: opacity 0.175s; - } - - ::slotted(:not([slot$='fix'])) { - padding: 8px 0; - } - - ::slotted([slot$='fix']) { - color: var(--material-secondary-text-color); - } - - /* Disabled */ - :host([disabled]) { - color: var(--material-disabled-text-color); - } - - :host([disabled])::before { - background-color: transparent; - background-image: linear-gradient( - 90deg, - var(--_material-text-field-input-line-background-color, #000) 0, - var(--_material-text-field-input-line-background-color, #000) 2px, - transparent 2px - ); - background-size: 4px 1px; - background-repeat: repeat-x; - } - - :host([disabled]) ::slotted(:not([slot$='fix'])) { - color: var(--material-disabled-text-color); - -webkit-text-fill-color: var(--material-disabled-text-color); - } - - /* Invalid */ - :host([invalid])::after { - background-color: var(--material-error-color); - opacity: 1; - transform: none; - transition: - transform 0.175s, - opacity 0.175s; - } - `, - { moduleId: 'material-input-container' }, -); diff --git a/packages/input-container/theme/material/vaadin-input-container.js b/packages/input-container/theme/material/vaadin-input-container.js deleted file mode 100644 index 99c2c5fa08c..00000000000 --- a/packages/input-container/theme/material/vaadin-input-container.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-input-container-styles.js'; -import '../../src/vaadin-input-container.js'; diff --git a/packages/integer-field/package.json b/packages/integer-field/package.json index b94d616b5cf..42400de5805 100644 --- a/packages/integer-field/package.json +++ b/packages/integer-field/package.json @@ -37,8 +37,7 @@ "@polymer/polymer": "^3.0.0", "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/number-field": "25.0.0-alpha0", - "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0" + "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0" }, "devDependencies": { "@vaadin/chai-plugins": "25.0.0-alpha0", diff --git a/packages/integer-field/test/visual/material/integer-field.test.js b/packages/integer-field/test/visual/material/integer-field.test.js deleted file mode 100644 index 8a431231bbd..00000000000 --- a/packages/integer-field/test/visual/material/integer-field.test.js +++ /dev/null @@ -1,35 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-integer-field.js'; - -describe('integer-field', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - div.style.padding = '10px'; - element = fixtureSync('', div); - }); - - it('basic', async () => { - await visualDiff(div, 'basic'); - }); - - it('value', async () => { - element.value = 10; - await visualDiff(div, 'value'); - }); - - it('clear button', async () => { - element.value = 10; - element.clearButtonVisible = true; - await visualDiff(div, 'clear-button'); - }); - - it('step buttons visible', async () => { - element.stepButtonsVisible = true; - element.value = 5; - await visualDiff(div, 'step-buttons-visible'); - }); -}); diff --git a/packages/integer-field/test/visual/material/screenshots/integer-field/baseline/basic.png b/packages/integer-field/test/visual/material/screenshots/integer-field/baseline/basic.png deleted file mode 100644 index b3cd944a483..00000000000 Binary files a/packages/integer-field/test/visual/material/screenshots/integer-field/baseline/basic.png and /dev/null differ diff --git a/packages/integer-field/test/visual/material/screenshots/integer-field/baseline/clear-button.png b/packages/integer-field/test/visual/material/screenshots/integer-field/baseline/clear-button.png deleted file mode 100644 index 6dc128625d0..00000000000 Binary files a/packages/integer-field/test/visual/material/screenshots/integer-field/baseline/clear-button.png and /dev/null differ diff --git a/packages/integer-field/test/visual/material/screenshots/integer-field/baseline/step-buttons-visible.png b/packages/integer-field/test/visual/material/screenshots/integer-field/baseline/step-buttons-visible.png deleted file mode 100644 index 5f376d94f41..00000000000 Binary files a/packages/integer-field/test/visual/material/screenshots/integer-field/baseline/step-buttons-visible.png and /dev/null differ diff --git a/packages/integer-field/test/visual/material/screenshots/integer-field/baseline/value.png b/packages/integer-field/test/visual/material/screenshots/integer-field/baseline/value.png deleted file mode 100644 index fb9e1fbc682..00000000000 Binary files a/packages/integer-field/test/visual/material/screenshots/integer-field/baseline/value.png and /dev/null differ diff --git a/packages/integer-field/theme/material/vaadin-integer-field.js b/packages/integer-field/theme/material/vaadin-integer-field.js deleted file mode 100644 index 96e9b51f075..00000000000 --- a/packages/integer-field/theme/material/vaadin-integer-field.js +++ /dev/null @@ -1,7 +0,0 @@ -/** - * @license - * Copyright (c) 2021 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import '@vaadin/number-field/theme/material/vaadin-number-field.js'; -import '../../src/vaadin-integer-field.js'; diff --git a/packages/integer-field/theme/material/vaadin-lit-integer-field.js b/packages/integer-field/theme/material/vaadin-lit-integer-field.js deleted file mode 100644 index 82217bbb6e1..00000000000 --- a/packages/integer-field/theme/material/vaadin-lit-integer-field.js +++ /dev/null @@ -1,2 +0,0 @@ -import '@vaadin/number-field/theme/material/vaadin-lit-number-field.js'; -import '../../src/vaadin-lit-integer-field.js'; diff --git a/packages/item/package.json b/packages/item/package.json index 37507c1679a..1aedabb2e92 100644 --- a/packages/item/package.json +++ b/packages/item/package.json @@ -42,7 +42,6 @@ "@vaadin/a11y-base": "25.0.0-alpha0", "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/item/test/visual/material/item.test.js b/packages/item/test/visual/material/item.test.js deleted file mode 100644 index 3567457c70e..00000000000 --- a/packages/item/test/visual/material/item.test.js +++ /dev/null @@ -1,51 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-item.js'; - -describe('item', () => { - let div, element; - - function setIconVisible(container) { - container.style.setProperty('--_material-item-selected-icon-display', 'block'); - } - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - element = fixtureSync('Basic item', div); - }); - - ['ltr', 'rtl'].forEach((dir) => { - describe(dir, () => { - before(() => { - document.documentElement.setAttribute('dir', dir); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - it('basic', async () => { - await visualDiff(div, `${dir}-basic`); - }); - - it('checkmark', async () => { - setIconVisible(div); - await visualDiff(div, `${dir}-checkmark`); - }); - - it('selected', async () => { - setIconVisible(div); - element.setAttribute('selected', ''); - await visualDiff(div, `${dir}-selected`); - }); - - it('multi line', async () => { - const second = document.createElement('div'); - second.textContent = 'Second line'; - element.appendChild(second); - await visualDiff(div, `${dir}-multi-line`); - }); - }); - }); -}); diff --git a/packages/item/test/visual/material/screenshots/item/baseline/ltr-basic.png b/packages/item/test/visual/material/screenshots/item/baseline/ltr-basic.png deleted file mode 100644 index 4c7de123628..00000000000 Binary files a/packages/item/test/visual/material/screenshots/item/baseline/ltr-basic.png and /dev/null differ diff --git a/packages/item/test/visual/material/screenshots/item/baseline/ltr-checkmark.png b/packages/item/test/visual/material/screenshots/item/baseline/ltr-checkmark.png deleted file mode 100644 index e60ad82415f..00000000000 Binary files a/packages/item/test/visual/material/screenshots/item/baseline/ltr-checkmark.png and /dev/null differ diff --git a/packages/item/test/visual/material/screenshots/item/baseline/ltr-multi-line.png b/packages/item/test/visual/material/screenshots/item/baseline/ltr-multi-line.png deleted file mode 100644 index 26fea89bd1a..00000000000 Binary files a/packages/item/test/visual/material/screenshots/item/baseline/ltr-multi-line.png and /dev/null differ diff --git a/packages/item/test/visual/material/screenshots/item/baseline/ltr-selected.png b/packages/item/test/visual/material/screenshots/item/baseline/ltr-selected.png deleted file mode 100644 index dbb0dcc3bc3..00000000000 Binary files a/packages/item/test/visual/material/screenshots/item/baseline/ltr-selected.png and /dev/null differ diff --git a/packages/item/test/visual/material/screenshots/item/baseline/rtl-basic.png b/packages/item/test/visual/material/screenshots/item/baseline/rtl-basic.png deleted file mode 100644 index 2a9868807d7..00000000000 Binary files a/packages/item/test/visual/material/screenshots/item/baseline/rtl-basic.png and /dev/null differ diff --git a/packages/item/test/visual/material/screenshots/item/baseline/rtl-checkmark.png b/packages/item/test/visual/material/screenshots/item/baseline/rtl-checkmark.png deleted file mode 100644 index aa70dc8e2f5..00000000000 Binary files a/packages/item/test/visual/material/screenshots/item/baseline/rtl-checkmark.png and /dev/null differ diff --git a/packages/item/test/visual/material/screenshots/item/baseline/rtl-multi-line.png b/packages/item/test/visual/material/screenshots/item/baseline/rtl-multi-line.png deleted file mode 100644 index d958892a644..00000000000 Binary files a/packages/item/test/visual/material/screenshots/item/baseline/rtl-multi-line.png and /dev/null differ diff --git a/packages/item/test/visual/material/screenshots/item/baseline/rtl-selected.png b/packages/item/test/visual/material/screenshots/item/baseline/rtl-selected.png deleted file mode 100644 index ff4b6aba5b0..00000000000 Binary files a/packages/item/test/visual/material/screenshots/item/baseline/rtl-selected.png and /dev/null differ diff --git a/packages/item/theme/material/vaadin-item-styles.js b/packages/item/theme/material/vaadin-item-styles.js deleted file mode 100644 index 8cba47b0b55..00000000000 --- a/packages/item/theme/material/vaadin-item-styles.js +++ /dev/null @@ -1,73 +0,0 @@ -import '@vaadin/vaadin-material-styles/font-icons.js'; -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const item = css` - :host { - display: flex; - align-items: center; - box-sizing: border-box; - min-height: 36px; - padding: 8px 32px 8px 10px; - overflow: hidden; - font-family: var(--material-font-family); - font-size: var(--material-small-font-size); - line-height: 24px; - } - - /* It's the list-box's responsibility to add the focus style */ - :host([focused]) { - outline: none; - } - - /* Checkmark */ - [part='checkmark']::before { - display: var(--_material-item-selected-icon-display, none); - content: ''; - font-family: material-icons; - font-size: 24px; - line-height: 1; - font-weight: 400; - width: 24px; - text-align: center; - margin-right: 10px; - color: var(--material-secondary-text-color); - flex: none; - } - - :host([selected]) [part='checkmark']::before { - content: var(--material-icons-check); - } - - @media (any-hover: hover) { - :host(:hover:not([disabled])) { - background-color: var(--material-secondary-background-color); - } - } - - :host([focused]:not([disabled])) { - background-color: var(--material-divider-color); - } - - /* Disabled */ - :host([disabled]) { - color: var(--material-disabled-text-color); - cursor: default; - pointer-events: none; - } - - /* RTL specific styles */ - :host([dir='rtl']) { - padding: 8px 10px 8px 32px; - } - - :host([dir='rtl']) [part='checkmark']::before { - margin-right: 0; - margin-left: 10px; - } -`; - -registerStyles('vaadin-item', item, { moduleId: 'material-item' }); - -export { item }; diff --git a/packages/item/theme/material/vaadin-item.js b/packages/item/theme/material/vaadin-item.js deleted file mode 100644 index 443ed4850aa..00000000000 --- a/packages/item/theme/material/vaadin-item.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-item-styles.js'; -import '../../src/vaadin-item.js'; diff --git a/packages/item/theme/material/vaadin-lit-item.js b/packages/item/theme/material/vaadin-lit-item.js deleted file mode 100644 index 33a6654124e..00000000000 --- a/packages/item/theme/material/vaadin-lit-item.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-item-styles.js'; -import '../../src/vaadin-lit-item.js'; diff --git a/packages/list-box/package.json b/packages/list-box/package.json index 57205c9c448..20f650d6159 100644 --- a/packages/list-box/package.json +++ b/packages/list-box/package.json @@ -43,7 +43,6 @@ "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/item": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/list-box/test/visual/material/list-box.test.js b/packages/list-box/test/visual/material/list-box.test.js deleted file mode 100644 index 03077bd30a1..00000000000 --- a/packages/list-box/test/visual/material/list-box.test.js +++ /dev/null @@ -1,51 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '@vaadin/item/theme/material/vaadin-item.js'; -import '../../../theme/material/vaadin-list-box.js'; - -describe('list-box', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - div.style.padding = '10px'; - - element = fixtureSync( - ` - - Item 0 - Item 1 - Item 2 - Item 3 -
- Item 4 -
- `, - div, - ); - }); - - ['ltr', 'rtl'].forEach((dir) => { - describe(dir, () => { - before(() => { - document.documentElement.setAttribute('dir', dir); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - it('basic', async () => { - element.selected = 2; - await visualDiff(div, `${dir}-basic`); - }); - - it('multiple', async () => { - element.multiple = true; - element.selectedValues = [1, 2]; - await visualDiff(div, `${dir}-multiple`); - }); - }); - }); -}); diff --git a/packages/list-box/test/visual/material/screenshots/list-box/baseline/ltr-basic.png b/packages/list-box/test/visual/material/screenshots/list-box/baseline/ltr-basic.png deleted file mode 100644 index 652f4b2b109..00000000000 Binary files a/packages/list-box/test/visual/material/screenshots/list-box/baseline/ltr-basic.png and /dev/null differ diff --git a/packages/list-box/test/visual/material/screenshots/list-box/baseline/ltr-multiple.png b/packages/list-box/test/visual/material/screenshots/list-box/baseline/ltr-multiple.png deleted file mode 100644 index d03d7a7bda3..00000000000 Binary files a/packages/list-box/test/visual/material/screenshots/list-box/baseline/ltr-multiple.png and /dev/null differ diff --git a/packages/list-box/test/visual/material/screenshots/list-box/baseline/rtl-basic.png b/packages/list-box/test/visual/material/screenshots/list-box/baseline/rtl-basic.png deleted file mode 100644 index 7e31d1742c9..00000000000 Binary files a/packages/list-box/test/visual/material/screenshots/list-box/baseline/rtl-basic.png and /dev/null differ diff --git a/packages/list-box/test/visual/material/screenshots/list-box/baseline/rtl-multiple.png b/packages/list-box/test/visual/material/screenshots/list-box/baseline/rtl-multiple.png deleted file mode 100644 index 1c027600c1e..00000000000 Binary files a/packages/list-box/test/visual/material/screenshots/list-box/baseline/rtl-multiple.png and /dev/null differ diff --git a/packages/list-box/theme/material/vaadin-list-box-styles.js b/packages/list-box/theme/material/vaadin-list-box-styles.js deleted file mode 100644 index 969cbad54ec..00000000000 --- a/packages/list-box/theme/material/vaadin-list-box-styles.js +++ /dev/null @@ -1,27 +0,0 @@ -import '@vaadin/vaadin-material-styles/font-icons.js'; -import '@vaadin/vaadin-material-styles/color.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const listBox = css` - :host { - -webkit-tap-highlight-color: transparent; - --_material-item-selected-icon-display: block; - } - - [part='items'] ::slotted(*) { - cursor: default; - } - - /* Dividers */ - [part='items'] ::slotted(hr) { - height: 1px; - border: 0; - padding: 0; - margin: 8px 0; - background-color: var(--material-divider-color); - } -`; - -registerStyles('vaadin-list-box', listBox, { moduleId: 'material-list-box' }); - -export { listBox }; diff --git a/packages/list-box/theme/material/vaadin-list-box.js b/packages/list-box/theme/material/vaadin-list-box.js deleted file mode 100644 index 4c0cbf52158..00000000000 --- a/packages/list-box/theme/material/vaadin-list-box.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-list-box-styles.js'; -import '../../src/vaadin-list-box.js'; diff --git a/packages/list-box/theme/material/vaadin-lit-list-box.js b/packages/list-box/theme/material/vaadin-lit-list-box.js deleted file mode 100644 index d65128e482c..00000000000 --- a/packages/list-box/theme/material/vaadin-lit-list-box.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-list-box-styles.js'; -import '../../src/vaadin-lit-list-box.js'; diff --git a/packages/login/package.json b/packages/login/package.json index fccc6c50ba4..21ee5471d52 100644 --- a/packages/login/package.json +++ b/packages/login/package.json @@ -43,7 +43,6 @@ "@vaadin/password-field": "25.0.0-alpha0", "@vaadin/text-field": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/login/test/visual/material/login-overlay.test.js b/packages/login/test/visual/material/login-overlay.test.js deleted file mode 100644 index dfdbf267369..00000000000 --- a/packages/login/test/visual/material/login-overlay.test.js +++ /dev/null @@ -1,44 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../common.js'; -import '../../../theme/material/vaadin-login-overlay.js'; - -describe('login-overlay', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.height = '100%'; - element = fixtureSync('', div); - }); - - it('basic', async () => { - element.opened = true; - await visualDiff(div, 'basic'); - }); - - it('error', async () => { - element.error = true; - element.opened = true; - await visualDiff(div, 'error'); - }); - - it('additional field', async () => { - const field = document.createElement('vaadin-text-field'); - field.setAttribute('slot', 'custom-form-area'); - field.label = 'One-time code'; - element.appendChild(field); - element.opened = true; - await visualDiff(div, 'additional-field'); - }); - - it('footer', async () => { - const footer = document.createElement('div'); - footer.setAttribute('slot', 'footer'); - footer.style.textAlign = 'center'; - footer.textContent = 'Never tell your password to anyone'; - element.appendChild(footer); - element.opened = true; - await visualDiff(div, 'footer'); - }); -}); diff --git a/packages/login/test/visual/material/screenshots/login-overlay/baseline/additional-field.png b/packages/login/test/visual/material/screenshots/login-overlay/baseline/additional-field.png deleted file mode 100644 index c08c5909a99..00000000000 Binary files a/packages/login/test/visual/material/screenshots/login-overlay/baseline/additional-field.png and /dev/null differ diff --git a/packages/login/test/visual/material/screenshots/login-overlay/baseline/basic.png b/packages/login/test/visual/material/screenshots/login-overlay/baseline/basic.png deleted file mode 100644 index 0f56e8c3fc4..00000000000 Binary files a/packages/login/test/visual/material/screenshots/login-overlay/baseline/basic.png and /dev/null differ diff --git a/packages/login/test/visual/material/screenshots/login-overlay/baseline/error.png b/packages/login/test/visual/material/screenshots/login-overlay/baseline/error.png deleted file mode 100644 index 05637b37fb2..00000000000 Binary files a/packages/login/test/visual/material/screenshots/login-overlay/baseline/error.png and /dev/null differ diff --git a/packages/login/test/visual/material/screenshots/login-overlay/baseline/footer.png b/packages/login/test/visual/material/screenshots/login-overlay/baseline/footer.png deleted file mode 100644 index a71cd163f83..00000000000 Binary files a/packages/login/test/visual/material/screenshots/login-overlay/baseline/footer.png and /dev/null differ diff --git a/packages/login/theme/material/vaadin-lit-login-form.js b/packages/login/theme/material/vaadin-lit-login-form.js deleted file mode 100644 index 01d5dbccc0f..00000000000 --- a/packages/login/theme/material/vaadin-lit-login-form.js +++ /dev/null @@ -1,5 +0,0 @@ -import '@vaadin/button/theme/material/vaadin-button-styles.js'; -import '@vaadin/text-field/theme/material/vaadin-text-field-styles.js'; -import '@vaadin/password-field/theme/material/vaadin-password-field-styles.js'; -import './vaadin-login-form-wrapper-styles.js'; -import '../../src/vaadin-lit-login-form.js'; diff --git a/packages/login/theme/material/vaadin-lit-login-overlay.js b/packages/login/theme/material/vaadin-lit-login-overlay.js deleted file mode 100644 index 58506a4b66e..00000000000 --- a/packages/login/theme/material/vaadin-lit-login-overlay.js +++ /dev/null @@ -1,3 +0,0 @@ -import './vaadin-login-overlay-styles.js'; -import './vaadin-lit-login-form.js'; -import '../../src/vaadin-lit-login-overlay.js'; diff --git a/packages/login/theme/material/vaadin-login-form-wrapper-styles.js b/packages/login/theme/material/vaadin-login-form-wrapper-styles.js deleted file mode 100644 index 088e8be1e8f..00000000000 --- a/packages/login/theme/material/vaadin-login-form-wrapper-styles.js +++ /dev/null @@ -1,109 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import { typography } from '@vaadin/vaadin-material-styles/typography.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const loginFormWrapper = css` - :host { - background: var(--material-background-color) linear-gradient(hsla(0, 0%, 100%, 0.3), hsla(0, 0%, 100%, 0.3)); - } - - [part='form'] { - padding: 1.5rem; - flex: 1; - display: flex; - flex-direction: column; - box-sizing: border-box; - justify-content: center; - } - - [part='form-title'] { - margin-top: calc(var(--material-h3-font-size) - var(--material-h4-font-size)); - font-size: var(--material-h5-font-size); - font-weight: 300; - line-height: 1.1; - letter-spacing: -0.01em; - text-indent: -0.07em; - } - - ::slotted([slot='submit']) { - margin-top: 3em; - margin-bottom: 2em; - flex-grow: 0; - } - - @media only screen and (max-width: 1023px) { - ::slotted([slot='submit']) { - margin-top: 2.5em; - margin-bottom: 1em; - } - } - - ::slotted([slot='forgot-password']) { - margin: 0.5rem auto; - padding-bottom: 12px; - padding-top: 12px; - text-transform: none; - } - - [part='error-message'] { - background-color: hsla(3, 100%, 60%, 0.1); - padding: 1rem; - border-radius: 0.25em; - margin-top: 1rem; - margin-bottom: 0.5rem; - color: var(--material-error-text-color); - } - - :host(:not([dir='rtl'])) [part='error-message'] { - padding-left: 2.25rem; - } - - :host([dir='rtl']) [part='error-message'] { - padding-right: 2.25rem; - } - - [part='error-message']::before { - content: '!'; - font-size: 1.3em; - font-weight: 500; - position: absolute; - width: 2.25rem; - height: 1em; - line-height: 1; - text-align: center; - } - - /* Visual centering */ - :host(:not([dir='rtl'])) [part='error-message']::before { - margin-left: calc(2.25rem * -0.95); - } - - :host([dir='rtl']) [part='error-message']::before { - margin-right: calc(2.25rem * -0.95); - } - - [part='error-message-title'] { - display: block; - margin: 0 0 0.25em; - color: inherit; - line-height: 1.1; - text-indent: -0.025em; - } - - [part='error-message'] p { - font-size: var(--material-small-font-size); - line-height: 1.375; - margin: 0; - opacity: 0.9; - } - - [part='footer'] { - font-size: var(--material-small-font-size); - line-height: 1.375; - color: var(--material-secondary-text-color); - } -`; - -registerStyles('vaadin-login-form-wrapper', [typography, loginFormWrapper], { - moduleId: 'material-login-form-wrapper', -}); diff --git a/packages/login/theme/material/vaadin-login-form.js b/packages/login/theme/material/vaadin-login-form.js deleted file mode 100644 index 6ba31dbc749..00000000000 --- a/packages/login/theme/material/vaadin-login-form.js +++ /dev/null @@ -1,5 +0,0 @@ -import '@vaadin/button/theme/material/vaadin-button.js'; -import '@vaadin/text-field/theme/material/vaadin-text-field.js'; -import '@vaadin/password-field/theme/material/vaadin-password-field.js'; -import './vaadin-login-form-wrapper-styles.js'; -import '../../src/vaadin-login-form.js'; diff --git a/packages/login/theme/material/vaadin-login-overlay-styles.js b/packages/login/theme/material/vaadin-login-overlay-styles.js deleted file mode 100644 index 79922a88080..00000000000 --- a/packages/login/theme/material/vaadin-login-overlay-styles.js +++ /dev/null @@ -1,352 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import { overlay } from '@vaadin/vaadin-material-styles/mixins/overlay.js'; -import { typography } from '@vaadin/vaadin-material-styles/typography.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const loginOverlayWrapper = css` - :host { - inset: 0; - } - - [part='backdrop'] { - background: var(--material-background-color); - } - - [part='overlay'] { - background: var(--material-secondary-background-color); - border-radius: 0; - box-shadow: none; - width: 100%; - height: 100%; - } - - [part='content'] { - display: flex; - align-items: center; - justify-content: center; - padding: 0; - min-height: 100%; - } - - [part='card'] { - display: flex; - flex-direction: column; - box-sizing: border-box; - overflow: hidden; - background: var(--material-secondary-background-color); - max-width: 100%; - min-width: 400px; - height: 100%; - border-radius: 4px; - box-shadow: - 0 19px 38px rgba(0, 0, 0, 0.04), - 0 9px 12px rgba(0, 0, 0, 0.05); - margin: 0.5em; - } - - [part='brand'] { - display: flex; - flex-direction: column; - justify-content: flex-start; - flex-grow: 1; - flex-shrink: 0; - box-sizing: border-box; - overflow: hidden; - padding: 2.8rem 2.5rem 1.5rem 3.5rem; - background-color: var(--material-primary-color); - color: var(--material-primary-contrast-color); - min-height: 225px; - } - - [part='title'] { - color: inherit; - margin: 0; - font-weight: 500; - font-size: 2rem; - line-height: 1.1; - letter-spacing: -0.015em; - text-indent: -0.07em; - } - - [part='form'] { - width: 90%; - margin: auto; - margin-bottom: -65px; - background-color: var(--material-secondary-background-color); - } - - [part='description'] { - line-height: 1.375; - color: var(--material-secondary-background-color); - margin-bottom: 0; - } - - /* RTL styles */ - :host([dir='rtl']) [part='brand'] { - padding: 2.8rem 3.5rem 1.5rem 2.5rem; - } - - /* Small screen */ - @media only screen and (max-width: 1023px) { - [part='brand'] { - justify-content: center; - min-height: 330px; - padding: 0 2.5rem 5.5rem 2rem; - } - - [part='title'] { - font-weight: 500; - font-size: 1.8rem; - text-indent: 1rem; - } - - [part='form'] { - margin-top: -80px; - margin-bottom: 20px; - } - - /* RTL styles */ - :host([dir='rtl']) [part='brand'] { - padding: 0 2rem 5.5rem 2.5rem; - } - } - - /* Very small screen */ - @media only screen and (max-width: 413px) { - [part='overlay'], - [part='content'], - [part='card'] { - height: 100%; - } - - [part='content'] { - min-height: 100%; - background: var(--material-background-color); - align-items: flex-start; - } - - [part='card'] { - min-width: unset; - max-height: none; - overflow: auto; - } - - [part='card'], - [part='overlay'] { - width: 100%; - border-radius: 0; - box-shadow: none; - margin: 0; - } - - [part='brand'] { - flex-grow: unset; - justify-content: flex-start; - padding: 2.5rem 2.5rem 1.5rem; - min-height: 225px; - } - } - - /* Landscape small screen */ - @media only screen and (min-width: 600px) and (max-height: 600px) and (orientation: landscape) { - [part='content'] { - height: 100vh; - } - - [part='card'] { - flex-direction: row; - border-radius: 0; - margin: 0; - width: 100%; - height: 100%; - } - - [part='brand'] { - flex: auto; - flex-basis: 0; - box-sizing: border-box; - } - - [part='form'] { - flex: auto; - flex-basis: 0; - overflow: auto; - margin: 0; - height: 100%; - } - - [part='form'] ::slotted(*) { - display: flex; - bottom: 0; - min-height: 100%; - max-height: none; - margin: unset; - } - } - - /* Landscape big screen */ - @media only screen and (min-width: 1024px) { - [part='card'] { - flex-direction: row; - align-items: stretch; - width: 100%; - min-height: 0; - height: auto; - max-width: 760px; - } - - [part='content'] { - max-width: 950px; - margin: auto; - height: 100%; - } - - [part='brand'] { - justify-content: center; - padding: 1.5rem 2.5rem 1.5rem 1.5rem; - } - - [part='brand'], - [part='form'] { - flex: auto; - flex-basis: 0; - box-sizing: border-box; - } - - [part='title'] { - font-size: 2.5em; - } - - [part='form'] { - margin: 80px 30px 40px -20px; - overflow-x: visible; - } - - [part='form'] ::slotted(*) { - height: 100%; - } - - /* RTL styles */ - :host([dir='rtl']) [part='brand'] { - padding: 1.5rem 1.5rem 1.5rem 2.5rem; - } - - :host([dir='rtl']) [part='form'] { - margin: 80px -20px 40px 30px; - } - } - - /* Landscape really big screen */ - @media only screen and (min-width: 1440px) { - [part='content'] { - max-width: none; - margin: auto; - } - - [part='card'] { - max-width: 960px; - } - - [part='brand'] { - padding-left: 4rem; - padding-right: 1rem; - } - - [part='form'] { - height: 100%; - -webkit-overflow-scrolling: touch; - } - - :host(:not([dir='rtl'])) [part='form'] { - margin-right: 22px; - } - - :host(:not([dir='rtl'])) [part='form'] ::slotted(*) { - right: 80px; - } - - /* RTL styles */ - :host([dir='rtl']) [part='brand'] { - padding-right: 4rem; - padding-left: 1rem; - } - - :host([dir='rtl']) [part='form'] { - margin-left: 22px; - } - - :host([dir='rtl']) [part='form']::slotted(*) { - left: 80px; - } - } - - /* Handle iPhone X notch */ - @media only screen and (device-width: 375px) and (device-height: 812px) and (-webkit-device-pixel-ratio: 3) { - [part='card'] { - padding: 0 env(safe-area-inset-bottom); - } - - :host(:not([dir='rtl'])) [part='brand'] { - margin-left: calc(env(safe-area-inset-bottom) * -1); - padding-left: calc(1.5rem + env(safe-area-inset-bottom)); - } - - /* RTL styles */ - :host([dir='rtl']) [part='brand'] { - margin-right: calc(env(safe-area-inset-bottom) * -1); - padding-right: calc(1.5rem + env(safe-area-inset-bottom)); - } - } -`; - -registerStyles('vaadin-login-overlay-wrapper', [overlay, typography, loginOverlayWrapper], { - moduleId: 'material-login-overlay-wrapper', -}); - -const loginFormWrapper = css` - :host([theme~='with-overlay']) { - display: flex; - justify-content: center; - width: 100%; - } - - :host([theme~='with-overlay']) [part='form'] { - padding: 2rem 2.5rem 2rem 1.8rem; - } - - :host([theme~='with-overlay']) [part='form-title'] { - text-align: center; - font-size: 1.8em; - font-weight: 500; - } - - :host([theme~='with-overlay']) [part='form'] ::slotted(form) { - display: flex; - flex-direction: column; - } - - /* Small screen */ - @media only screen and (max-width: 413px) { - :host([theme~='with-overlay']) [part='form'] { - padding-top: 0.75rem; - } - } - - /* Landscape big screen */ - @media only screen and (min-width: 1024px) { - :host([theme~='with-overlay']) [part='form'] { - padding: 2em; - } - - :host([theme~='with-overlay']) [part='form'] ::slotted(form) { - margin-top: 15px; - } - } - - /* RTL styles */ - :host([dir='rtl'][theme~='with-overlay']) [part='form'] { - padding: 2rem 1.8rem 2rem 2.5rem; - } -`; - -registerStyles('vaadin-login-form-wrapper', [loginFormWrapper], { moduleId: 'material-login-overlay' }); diff --git a/packages/login/theme/material/vaadin-login-overlay.js b/packages/login/theme/material/vaadin-login-overlay.js deleted file mode 100644 index f863084ba71..00000000000 --- a/packages/login/theme/material/vaadin-login-overlay.js +++ /dev/null @@ -1,6 +0,0 @@ -import '@vaadin/text-field/theme/material/vaadin-text-field.js'; -import '@vaadin/password-field/theme/material/vaadin-password-field.js'; -import '@vaadin/button/theme/material/vaadin-button.js'; -import './vaadin-login-form.js'; -import './vaadin-login-overlay-styles.js'; -import '../../src/vaadin-login-overlay.js'; diff --git a/packages/map/package.json b/packages/map/package.json index 6278a18b614..d113a9246fe 100644 --- a/packages/map/package.json +++ b/packages/map/package.json @@ -40,7 +40,6 @@ "@vaadin/a11y-base": "25.0.0-alpha0", "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0", "ol": "6.13.0" diff --git a/packages/map/test/visual/material/map.test.js b/packages/map/test/visual/material/map.test.js deleted file mode 100644 index 0cc94794983..00000000000 --- a/packages/map/test/visual/material/map.test.js +++ /dev/null @@ -1,60 +0,0 @@ -import { sendKeys } from '@vaadin/test-runner-commands'; -import { fixtureSync } from '@vaadin/testing-helpers'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-map.js'; -import FullScreen from 'ol/control/FullScreen'; -import OverviewMap from 'ol/control/OverviewMap'; -import Rotate from 'ol/control/Rotate'; -import ScaleLine from 'ol/control/ScaleLine'; -import View from 'ol/View'; - -describe('map', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.width = '400px'; - div.style.height = '400px'; - div.style.position = 'relative'; - div.style.padding = '10px'; - element = fixtureSync('', div); - element.style.width = '100%'; - element.style.height = '100%'; - // Set non-white background to identify controls more clearly - element.style.background = '#eadbc8'; - // Force size refresh - element.configuration.updateSize(); - // Define a viewport - element.configuration.setView( - new View({ - center: [0, 0], - zoom: 3, - }), - ); - }); - - describe('controls', () => { - it('all controls', async () => { - // Add non-default controls - element.configuration.getControls().push(new FullScreen({ label: '', labelActive: '' })); - element.configuration.getControls().push(new Rotate({ label: '' })); - element.configuration.getControls().push(new ScaleLine()); - element.configuration.getControls().push(new OverviewMap({ label: '', collapseLabel: '' })); - await visualDiff(div, 'controls-all-controls'); - }); - }); - - describe('theme', () => { - it('borderless', async () => { - element.setAttribute('theme', 'borderless'); - await visualDiff(div, 'theme-borderless'); - }); - }); - - describe('accessibility', () => { - it('focus-ring', async () => { - await sendKeys({ press: 'Tab' }); - await visualDiff(div, 'accessibility-focus-ring'); - }); - }); -}); diff --git a/packages/map/test/visual/material/screenshots/map/baseline/accessibility-focus-ring.png b/packages/map/test/visual/material/screenshots/map/baseline/accessibility-focus-ring.png deleted file mode 100644 index 84478d5461a..00000000000 Binary files a/packages/map/test/visual/material/screenshots/map/baseline/accessibility-focus-ring.png and /dev/null differ diff --git a/packages/map/test/visual/material/screenshots/map/baseline/controls-all-controls.png b/packages/map/test/visual/material/screenshots/map/baseline/controls-all-controls.png deleted file mode 100644 index a8ebc851af9..00000000000 Binary files a/packages/map/test/visual/material/screenshots/map/baseline/controls-all-controls.png and /dev/null differ diff --git a/packages/map/test/visual/material/screenshots/map/baseline/theme-borderless.png b/packages/map/test/visual/material/screenshots/map/baseline/theme-borderless.png deleted file mode 100644 index 1c1540a5f6f..00000000000 Binary files a/packages/map/test/visual/material/screenshots/map/baseline/theme-borderless.png and /dev/null differ diff --git a/packages/map/theme/material/vaadin-lit-map.js b/packages/map/theme/material/vaadin-lit-map.js deleted file mode 100644 index 920c0a8c426..00000000000 --- a/packages/map/theme/material/vaadin-lit-map.js +++ /dev/null @@ -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-lit-map.js'; diff --git a/packages/map/theme/material/vaadin-map-styles.js b/packages/map/theme/material/vaadin-map-styles.js deleted file mode 100644 index 16eed0310e9..00000000000 --- a/packages/map/theme/material/vaadin-map-styles.js +++ /dev/null @@ -1,152 +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-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/shadow.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-map', - css` - :host { - font-family: var(--material-font-family); - font-size: var(--material-body-font-size); - } - - :host(:not([theme~='borderless'])) { - border-radius: 4px; - border: 1px solid var(--material-divider-color); - } - - :host([focus-ring]) { - box-shadow: 0 0 0 2px var(--material-primary-color); - } - - .ol-control { - border-radius: 4px; - transition: 0.1s box-shadow; - box-shadow: var(--material-shadow-elevation-2dp); - } - - .ol-control:hover { - background-color: var(--material-background-color); - } - - .ol-control:not(.ol-uncollapsible):hover { - box-shadow: var(--material-shadow-elevation-4dp); - background-color: rgba(0, 0, 0, 0.2); - } - - .ol-control button { - width: 2em; - height: 2em; - background-color: var(--material-background-color); - border-radius: inherit; - } - - .ol-control button, - .ol-attribution:not(.ol-uncollapsible) ul { - color: var(--material-secondary-text-color); - } - - .ol-control:hover button, - .ol-attribution:hover ul { - color: var(--material-body-text-color); - } - - .ol-control button:hover { - color: var(--material-primary-text-color); - } - - .ol-control button:active { - background-color: var(--material-secondary-background-color); - } - - @supports not selector(:focus-visible) { - .ol-control button:focus { - outline: none; - box-shadow: 0 0 0 2px var(--material-primary-color); - } - } - - .ol-control button:focus-visible { - outline: none; - box-shadow: 0 0 0 2px var(--material-primary-color); - } - - .ol-zoom { - gap: 1px; - } - - 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: 4px 0 0; - } - - .ol-attribution ul { - font-size: var(--material-caption-font-size); - cursor: default; - } - - .ol-attribution:not(.ol-uncollapsible) ul { - background-color: var(--material-background-color); - } - - .ol-attribution a { - color: inherit; - cursor: pointer; - } - - .ol-scale-bar-inner { - border-radius: 4px; - } - - .ol-full-screen { - height: 2em; - } - - .ol-overviewmap:not(.ol-collapsed), - .ol-overviewmap:not(.ol-collapsed):hover { - background-color: var(--material-background-color); - } - - .ol-overviewmap-map { - margin: 2px; - border: 0; - border-radius: 2px; - } - - .ol-zoomslider, - .ol-zoomslider:not(.ol-uncollapsible):hover { - box-shadow: none; - overflow: visible; - } - - .ol-zoomslider button { - height: 16px; - box-shadow: var(--material-shadow-elevation-2dp); - } - - .ol-zoomslider:hover button { - box-shadow: var(--material-shadow-elevation-4dp); - } - `, - { moduleId: 'material-map' }, -); diff --git a/packages/map/theme/material/vaadin-map.js b/packages/map/theme/material/vaadin-map.js deleted file mode 100644 index 79955c6d9ea..00000000000 --- a/packages/map/theme/material/vaadin-map.js +++ /dev/null @@ -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'; diff --git a/packages/markdown/package.json b/packages/markdown/package.json index bd4fdfcf1ef..cee0f7d0773 100644 --- a/packages/markdown/package.json +++ b/packages/markdown/package.json @@ -37,7 +37,6 @@ "@open-wc/dedupe-mixin": "^1.3.0", "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "dompurify": "^3.2.5", "lit": "^3.0.0", diff --git a/packages/markdown/theme/material/vaadin-markdown-styles.js b/packages/markdown/theme/material/vaadin-markdown-styles.js deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/packages/markdown/theme/material/vaadin-markdown.js b/packages/markdown/theme/material/vaadin-markdown.js deleted file mode 100644 index bd68ff2c60c..00000000000 --- a/packages/markdown/theme/material/vaadin-markdown.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-markdown-styles.js'; -import '../../src/vaadin-markdown.js'; diff --git a/packages/master-detail-layout/package.json b/packages/master-detail-layout/package.json index 77e6aeb6924..70ecf130815 100644 --- a/packages/master-detail-layout/package.json +++ b/packages/master-detail-layout/package.json @@ -37,7 +37,6 @@ "@vaadin/a11y-base": "25.0.0-alpha0", "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/master-detail-layout/test/visual/material/master-detail-layout.test.js b/packages/master-detail-layout/test/visual/material/master-detail-layout.test.js deleted file mode 100644 index 7b4054e95a4..00000000000 --- a/packages/master-detail-layout/test/visual/material/master-detail-layout.test.js +++ /dev/null @@ -1,62 +0,0 @@ -import { fixtureSync, nextRender } from '@vaadin/testing-helpers'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '@vaadin/vaadin-material-styles/color-global.js'; -import '../../../theme/material/vaadin-master-detail-layout.js'; - -window.Vaadin ||= {}; -window.Vaadin.featureFlags ||= {}; -window.Vaadin.featureFlags.masterDetailLayoutComponent = true; - -describe('master-detail-layout', () => { - let element; - - beforeEach(async () => { - element = fixtureSync(` - -
Master content
-
Detail content
-
- `); - await nextRender(); - }); - - ['ltr', 'rtl'].forEach((dir) => { - describe(dir, () => { - before(() => { - document.documentElement.setAttribute('dir', dir); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - describe('overlay', () => { - beforeEach(() => { - element.masterSize = '600px'; - element.detailSize = '300px'; - element.forceOverlay = true; - }); - - it('basic', async () => { - await visualDiff(element, `${dir}-overlay-default`); - }); - - it('viewport', async () => { - element.containment = 'viewport'; - await visualDiff(document.body, `${dir}-overlay-viewport`); - }); - - it('no detail', async () => { - element.querySelector('[slot="detail"').remove(); - await visualDiff(document.body, `${dir}-overlay-no-detail`); - }); - - it('dark', async () => { - document.documentElement.setAttribute('theme', 'dark'); - await visualDiff(element, `${dir}-overlay-dark`); - document.documentElement.removeAttribute('theme'); - }); - }); - }); - }); -}); diff --git a/packages/master-detail-layout/test/visual/material/screenshots/master-detail-layout/baseline/ltr-overlay-dark.png b/packages/master-detail-layout/test/visual/material/screenshots/master-detail-layout/baseline/ltr-overlay-dark.png deleted file mode 100644 index 76ef8c75fdb..00000000000 Binary files a/packages/master-detail-layout/test/visual/material/screenshots/master-detail-layout/baseline/ltr-overlay-dark.png and /dev/null differ diff --git a/packages/master-detail-layout/test/visual/material/screenshots/master-detail-layout/baseline/ltr-overlay-default.png b/packages/master-detail-layout/test/visual/material/screenshots/master-detail-layout/baseline/ltr-overlay-default.png deleted file mode 100644 index 0d7d83b875d..00000000000 Binary files a/packages/master-detail-layout/test/visual/material/screenshots/master-detail-layout/baseline/ltr-overlay-default.png and /dev/null differ diff --git a/packages/master-detail-layout/test/visual/material/screenshots/master-detail-layout/baseline/ltr-overlay-no-detail.png b/packages/master-detail-layout/test/visual/material/screenshots/master-detail-layout/baseline/ltr-overlay-no-detail.png deleted file mode 100644 index a2e624d4fe8..00000000000 Binary files a/packages/master-detail-layout/test/visual/material/screenshots/master-detail-layout/baseline/ltr-overlay-no-detail.png and /dev/null differ diff --git a/packages/master-detail-layout/test/visual/material/screenshots/master-detail-layout/baseline/ltr-overlay-viewport.png b/packages/master-detail-layout/test/visual/material/screenshots/master-detail-layout/baseline/ltr-overlay-viewport.png deleted file mode 100644 index 3e090f1b784..00000000000 Binary files a/packages/master-detail-layout/test/visual/material/screenshots/master-detail-layout/baseline/ltr-overlay-viewport.png and /dev/null differ diff --git a/packages/master-detail-layout/test/visual/material/screenshots/master-detail-layout/baseline/rtl-overlay-dark.png b/packages/master-detail-layout/test/visual/material/screenshots/master-detail-layout/baseline/rtl-overlay-dark.png deleted file mode 100644 index 6ba594d6c56..00000000000 Binary files a/packages/master-detail-layout/test/visual/material/screenshots/master-detail-layout/baseline/rtl-overlay-dark.png and /dev/null differ diff --git a/packages/master-detail-layout/test/visual/material/screenshots/master-detail-layout/baseline/rtl-overlay-default.png b/packages/master-detail-layout/test/visual/material/screenshots/master-detail-layout/baseline/rtl-overlay-default.png deleted file mode 100644 index bf89f048fa6..00000000000 Binary files a/packages/master-detail-layout/test/visual/material/screenshots/master-detail-layout/baseline/rtl-overlay-default.png and /dev/null differ diff --git a/packages/master-detail-layout/test/visual/material/screenshots/master-detail-layout/baseline/rtl-overlay-no-detail.png b/packages/master-detail-layout/test/visual/material/screenshots/master-detail-layout/baseline/rtl-overlay-no-detail.png deleted file mode 100644 index d2e0ea3e3a6..00000000000 Binary files a/packages/master-detail-layout/test/visual/material/screenshots/master-detail-layout/baseline/rtl-overlay-no-detail.png and /dev/null differ diff --git a/packages/master-detail-layout/test/visual/material/screenshots/master-detail-layout/baseline/rtl-overlay-viewport.png b/packages/master-detail-layout/test/visual/material/screenshots/master-detail-layout/baseline/rtl-overlay-viewport.png deleted file mode 100644 index b3277163de3..00000000000 Binary files a/packages/master-detail-layout/test/visual/material/screenshots/master-detail-layout/baseline/rtl-overlay-viewport.png and /dev/null differ diff --git a/packages/master-detail-layout/theme/material/vaadin-master-detail-layout-styles.js b/packages/master-detail-layout/theme/material/vaadin-master-detail-layout-styles.js deleted file mode 100644 index b8911db4f0c..00000000000 --- a/packages/master-detail-layout/theme/material/vaadin-master-detail-layout-styles.js +++ /dev/null @@ -1,30 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/style.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-master-detail-layout', - css` - :host(:is([drawer], [stack])) [part='detail'] { - background-color: var(--material-background-color); - } - - :host([drawer]) [part='detail'] { - box-shadow: var(--material-shadow-elevation-4dp); - } - - :host([drawer][orientation='horizontal']) [part='detail'] { - border-inline-start: 1px solid var(--material-divider-color); - } - - :host([drawer][orientation='vertical']) [part='detail'] { - border-block-start: 1px solid var(--material-divider-color); - } - - :host([drawer]) [part='backdrop'] { - background-color: var(--material-secondary-background-color); - opacity: 0.5; - } - `, - { moduleId: 'material-master-detail-layout' }, -); diff --git a/packages/master-detail-layout/theme/material/vaadin-master-detail-layout.js b/packages/master-detail-layout/theme/material/vaadin-master-detail-layout.js deleted file mode 100644 index cca04428ba2..00000000000 --- a/packages/master-detail-layout/theme/material/vaadin-master-detail-layout.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-master-detail-layout-styles.js'; -import '../../src/vaadin-master-detail-layout.js'; diff --git a/packages/menu-bar/package.json b/packages/menu-bar/package.json index ddeb0f846b3..92ef3209d81 100644 --- a/packages/menu-bar/package.json +++ b/packages/menu-bar/package.json @@ -45,7 +45,6 @@ "@vaadin/list-box": "25.0.0-alpha0", "@vaadin/overlay": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/menu-bar/test/visual/material/menu-bar.test.js b/packages/menu-bar/test/visual/material/menu-bar.test.js deleted file mode 100644 index 6e1eb024171..00000000000 --- a/packages/menu-bar/test/visual/material/menu-bar.test.js +++ /dev/null @@ -1,168 +0,0 @@ -import { arrowDown, fixtureSync, nextRender, oneEvent } from '@vaadin/testing-helpers'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '@vaadin/icon/theme/material/vaadin-icon.js'; -import '@vaadin/vaadin-lumo-styles/vaadin-iconset.js'; -import '../../../theme/material/vaadin-menu-bar.js'; -import '../../not-animated-styles.js'; - -describe('menu-bar', () => { - let div, element; - - // FIXME: overflow doesn't work correctly in RTL in older Chrome version - // See comments under https://github.com/vaadin/web-components/pull/7347 - ['ltr' /* , 'rtl' */].forEach((dir) => { - describe(dir, () => { - before(() => { - document.documentElement.setAttribute('dir', dir); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - describe('basic', () => { - beforeEach(async () => { - div = document.createElement('div'); - div.style.padding = '10px'; - - element = fixtureSync('', div); - await nextRender(); - - element.items = [ - { text: 'Home' }, - { - text: 'Reports', - children: [{ text: 'View Reports' }, { text: 'Generate Report' }], - }, - { text: 'Dashboard', disabled: true }, - { text: 'Help' }, - ]; - }); - - it('basic', async () => { - await visualDiff(document.body, `${dir}-basic`); - }); - - it('opened', async () => { - element._buttons[1].click(); - await nextRender(element); - await visualDiff(document.body, `${dir}-opened`); - }); - - it('reverse-collapse opened', async () => { - div.style.width = '250px'; - element.reverseCollapse = true; - element.setAttribute('theme', 'outlined'); - await nextRender(element); - element._buttons[4].click(); - const overlay = element._subMenu._overlayElement; - await oneEvent(overlay, 'vaadin-overlay-open'); - await visualDiff(document.body, `${dir}-reverse-collapse-opened`); - }); - }); - - describe('single button', () => { - beforeEach(async () => { - div = document.createElement('div'); - div.style.padding = '10px'; - - element = fixtureSync('', div); - await nextRender(); - - element.items = [{ text: 'Actions' }]; - element.setAttribute('theme', 'outlined'); - }); - - it('single button', async () => { - await visualDiff(document.body, `${dir}-single-button`); - }); - - it('single overflow button', async () => { - element.items = [{ text: 'View' }, { text: 'Edit' }]; - element.style.maxWidth = '100px'; - await visualDiff(document.body, `${dir}-single-button-overflow`); - }); - }); - - describe('theme', () => { - let overlay; - - function makeIcon(img) { - const item = document.createElement('vaadin-menu-bar-item'); - const icon = document.createElement('vaadin-icon'); - icon.setAttribute('icon', img); - item.appendChild(icon); - return item; - } - - beforeEach(async () => { - div = document.createElement('div'); - div.style.padding = '10px'; - - element = fixtureSync('', div); - await nextRender(); - - element.items = [ - { component: 'u', text: 'Home' }, - { - component: makeIcon('lumo:chevron-down'), - children: [{ text: 'Notifications' }, { text: 'Mark as read' }], - }, - { text: 'Manage', disabled: true }, - { - text: 'Reports', - children: [{ text: 'View Reports' }, { text: 'Generate Report' }], - }, - { text: 'Help' }, - ]; - overlay = element._subMenu._overlayElement; - }); - - it('outlined', async () => { - div.style.width = '320px'; - element.setAttribute('theme', 'outlined'); - arrowDown(element._buttons[1]); - await oneEvent(overlay, 'vaadin-overlay-open'); - await visualDiff(document.body, `${dir}-outlined`); - }); - - it('contained', async () => { - div.style.width = '320px'; - element.setAttribute('theme', 'contained'); - arrowDown(element._buttons[1]); - await oneEvent(overlay, 'vaadin-overlay-open'); - await visualDiff(document.body, `${dir}-contained`); - }); - - it('text', async () => { - div.style.width = '320px'; - element.setAttribute('theme', 'text'); - arrowDown(element._buttons[1]); - await oneEvent(overlay, 'vaadin-overlay-open'); - await visualDiff(document.body, `${dir}-text`); - }); - - it('end-aligned', async () => { - element.setAttribute('theme', 'end-aligned'); - await visualDiff(document.body, `${dir}-end-aligned`); - }); - - it('end-aligned overflow button', async () => { - element.style.width = '100px'; - element.setAttribute('theme', 'end-aligned'); - await visualDiff(document.body, `${dir}-end-aligned-overflow-button`); - }); - - it('end-aligned outlined', async () => { - element.setAttribute('theme', 'outlined end-aligned'); - await visualDiff(document.body, `${dir}-end-aligned-outlined`); - }); - - it('end-aligned contained', async () => { - element.setAttribute('theme', 'contained end-aligned'); - await visualDiff(document.body, `${dir}-end-aligned-contained`); - }); - }); - }); - }); -}); diff --git a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-basic.png b/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-basic.png deleted file mode 100644 index 6887caa258f..00000000000 Binary files a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-basic.png and /dev/null differ diff --git a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-contained.png b/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-contained.png deleted file mode 100644 index 780ad00efb7..00000000000 Binary files a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-contained.png and /dev/null differ diff --git a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-end-aligned-contained.png b/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-end-aligned-contained.png deleted file mode 100644 index 89d8ba54b3d..00000000000 Binary files a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-end-aligned-contained.png and /dev/null differ diff --git a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-end-aligned-outlined.png b/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-end-aligned-outlined.png deleted file mode 100644 index 9e64aba7f42..00000000000 Binary files a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-end-aligned-outlined.png and /dev/null differ diff --git a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-end-aligned-overflow-button.png b/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-end-aligned-overflow-button.png deleted file mode 100644 index 9cc989d6d25..00000000000 Binary files a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-end-aligned-overflow-button.png and /dev/null differ diff --git a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-end-aligned.png b/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-end-aligned.png deleted file mode 100644 index 882aff36f51..00000000000 Binary files a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-end-aligned.png and /dev/null differ diff --git a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-opened.png b/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-opened.png deleted file mode 100644 index cde72bf778b..00000000000 Binary files a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-opened.png and /dev/null differ diff --git a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-outlined.png b/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-outlined.png deleted file mode 100644 index 0b2bbe2b50f..00000000000 Binary files a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-outlined.png and /dev/null differ diff --git a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-reverse-collapse-opened.png b/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-reverse-collapse-opened.png deleted file mode 100644 index b79a6e55e59..00000000000 Binary files a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-reverse-collapse-opened.png and /dev/null differ diff --git a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-single-button-overflow.png b/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-single-button-overflow.png deleted file mode 100644 index 6f9028c618f..00000000000 Binary files a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-single-button-overflow.png and /dev/null differ diff --git a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-single-button.png b/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-single-button.png deleted file mode 100644 index d639fff6444..00000000000 Binary files a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-single-button.png and /dev/null differ diff --git a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-text.png b/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-text.png deleted file mode 100644 index 1a596484056..00000000000 Binary files a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/ltr-text.png and /dev/null differ diff --git a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-basic.png b/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-basic.png deleted file mode 100644 index 91a34d49c2a..00000000000 Binary files a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-basic.png and /dev/null differ diff --git a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-contained.png b/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-contained.png deleted file mode 100644 index 0e1302cc6ef..00000000000 Binary files a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-contained.png and /dev/null differ diff --git a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-end-aligned-contained.png b/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-end-aligned-contained.png deleted file mode 100644 index 0a3112d87f3..00000000000 Binary files a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-end-aligned-contained.png and /dev/null differ diff --git a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-end-aligned-outlined.png b/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-end-aligned-outlined.png deleted file mode 100644 index 9dd0981dfcb..00000000000 Binary files a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-end-aligned-outlined.png and /dev/null differ diff --git a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-end-aligned-overflow-button.png b/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-end-aligned-overflow-button.png deleted file mode 100644 index 888222cf8bb..00000000000 Binary files a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-end-aligned-overflow-button.png and /dev/null differ diff --git a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-end-aligned.png b/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-end-aligned.png deleted file mode 100644 index f9c82a2de4d..00000000000 Binary files a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-end-aligned.png and /dev/null differ diff --git a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-opened.png b/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-opened.png deleted file mode 100644 index c6f1473e8fa..00000000000 Binary files a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-opened.png and /dev/null differ diff --git a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-outlined.png b/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-outlined.png deleted file mode 100644 index 3bb84b32fd9..00000000000 Binary files a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-outlined.png and /dev/null differ diff --git a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-reverse-collapse-opened.png b/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-reverse-collapse-opened.png deleted file mode 100644 index 8088a20693a..00000000000 Binary files a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-reverse-collapse-opened.png and /dev/null differ diff --git a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-single-button-overflow.png b/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-single-button-overflow.png deleted file mode 100644 index 9cd447cf895..00000000000 Binary files a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-single-button-overflow.png and /dev/null differ diff --git a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-single-button.png b/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-single-button.png deleted file mode 100644 index 414013e6ed6..00000000000 Binary files a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-single-button.png and /dev/null differ diff --git a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-text.png b/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-text.png deleted file mode 100644 index ae2a9bf5384..00000000000 Binary files a/packages/menu-bar/test/visual/material/screenshots/menu-bar/baseline/rtl-text.png and /dev/null differ diff --git a/packages/menu-bar/theme/material/vaadin-lit-menu-bar.js b/packages/menu-bar/theme/material/vaadin-lit-menu-bar.js deleted file mode 100644 index d046f363b11..00000000000 --- a/packages/menu-bar/theme/material/vaadin-lit-menu-bar.js +++ /dev/null @@ -1,6 +0,0 @@ -import './vaadin-menu-bar-button-styles.js'; -import './vaadin-menu-bar-item-styles.js'; -import './vaadin-menu-bar-list-box-styles.js'; -import './vaadin-menu-bar-overlay-styles.js'; -import './vaadin-menu-bar-styles.js'; -import '../../src/vaadin-lit-menu-bar.js'; diff --git a/packages/menu-bar/theme/material/vaadin-menu-bar-button-styles.js b/packages/menu-bar/theme/material/vaadin-menu-bar-button-styles.js deleted file mode 100644 index da70db815ac..00000000000 --- a/packages/menu-bar/theme/material/vaadin-menu-bar-button-styles.js +++ /dev/null @@ -1,111 +0,0 @@ -import { button } from '@vaadin/button/theme/material/vaadin-button-styles'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const menuBarButton = css` - [part='label'] { - width: 100%; - } - - [part='label'] ::slotted(vaadin-menu-bar-item) { - line-height: 20px; - background-color: transparent; - margin: -8px; - padding: 8px; - justify-content: center; - } - - :host([theme~='outlined']), - :host([theme~='contained']) { - border-radius: 0; - } - - :host([theme~='contained']) ::slotted(vaadin-menu-bar-item), - :host([theme~='outlined']) ::slotted(vaadin-menu-bar-item) { - margin: -8px -16px; - padding: 8px 16px; - } - - :host([expanded])::before { - opacity: 0.08; - transition: opacity 0.4s; - } - - :host([expanded])::after { - transform: translate(-50%, -50%) scale(0.0000001); /* animation works weirdly with scale(0) */ - opacity: 0.1; - transition: 0s; - } - - :host([theme~='contained'][expanded]) { - box-shadow: var(--material-shadow-elevation-8dp); - } - - :host(:hover:not([expanded]))::after { - transform: translate(-50%, -50%) scale(1); - opacity: 0; - } - - :host([theme~='contained']:not([dir='rtl'])) { - margin-right: 1px; - } - - :host([first-visible]) { - border-radius: 4px 0 0 4px; - } - - :host([last-visible]), - :host([slot='overflow']) { - border-radius: 0 4px 4px 0; - } - - :host([slot='overflow']) { - padding-right: 8px; - padding-left: 8px; - min-width: 36px; - } - - :host([slot='overflow']) ::slotted(*) { - font-size: 24px; - } - - :host([theme~='outlined']:not([dir='rtl'])) { - margin-right: -1px; - } - - :host([theme~='outlined']:not([dir='rtl'])[last-visible]), - :host([theme~='outlined']:not([dir='rtl'])[slot='overflow']) { - margin-right: 0; - } - - :host([theme~='text']), - :host(:not([theme])) { - border-radius: 4px; - } - - /* RTL styles */ - :host([dir='rtl'][first-visible]) { - border-radius: 0 4px 4px 0; - } - - :host([dir='rtl'][last-visible]), - :host([dir='rtl'][slot='overflow']) { - border-radius: 4px 0 0 4px; - } - - :host([dir='rtl'][theme~='contained']) { - margin-left: 1px; - } - - :host([dir='rtl'][theme~='outlined']) { - margin-left: -1px; - } - - :host([theme~='outlined'][dir='rtl'][last-visible]), - :host([theme~='outlined'][dir='rtl'][slot='overflow']) { - margin-left: 0; - } -`; - -registerStyles('vaadin-menu-bar-button', [button, menuBarButton], { - moduleId: 'material-menu-bar-button', -}); diff --git a/packages/menu-bar/theme/material/vaadin-menu-bar-button.js b/packages/menu-bar/theme/material/vaadin-menu-bar-button.js deleted file mode 100644 index 5847cabead0..00000000000 --- a/packages/menu-bar/theme/material/vaadin-menu-bar-button.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-menu-bar-button-styles.js'; -import '../../src/vaadin-menu-bar-button.js'; diff --git a/packages/menu-bar/theme/material/vaadin-menu-bar-item-styles.js b/packages/menu-bar/theme/material/vaadin-menu-bar-item-styles.js deleted file mode 100644 index bfa5d18933e..00000000000 --- a/packages/menu-bar/theme/material/vaadin-menu-bar-item-styles.js +++ /dev/null @@ -1,23 +0,0 @@ -import '@vaadin/vaadin-material-styles/typography.js'; -import { contextMenuItem } from '@vaadin/context-menu/theme/material/vaadin-context-menu-item-styles.js'; -import { item } from '@vaadin/item/theme/material/vaadin-item-styles.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const menuBarItem = css` - [part='content'] { - display: flex; - /* tweak to inherit centering from menu bar button */ - align-items: inherit; - justify-content: inherit; - font-size: var(--material-button-font-size); - } - - [part='content'] ::slotted(vaadin-icon[icon^='vaadin:']) { - display: inline-block; - width: 18px; - height: 18px; - box-sizing: border-box !important; - } -`; - -registerStyles('vaadin-menu-bar-item', [item, contextMenuItem, menuBarItem], { moduleId: 'material-menu-bar-item' }); diff --git a/packages/menu-bar/theme/material/vaadin-menu-bar-list-box-styles.js b/packages/menu-bar/theme/material/vaadin-menu-bar-list-box-styles.js deleted file mode 100644 index db3900a1fcb..00000000000 --- a/packages/menu-bar/theme/material/vaadin-menu-bar-list-box-styles.js +++ /dev/null @@ -1,5 +0,0 @@ -import { contextMenuListBox } from '@vaadin/context-menu/theme/material/vaadin-context-menu-list-box-styles.js'; -import { listBox } from '@vaadin/list-box/theme/material/vaadin-list-box-styles.js'; -import { registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles('vaadin-menu-bar-list-box', [listBox, contextMenuListBox], { moduleId: 'material-menu-bar-list-box' }); diff --git a/packages/menu-bar/theme/material/vaadin-menu-bar-overlay-styles.js b/packages/menu-bar/theme/material/vaadin-menu-bar-overlay-styles.js deleted file mode 100644 index c77b48010b8..00000000000 --- a/packages/menu-bar/theme/material/vaadin-menu-bar-overlay-styles.js +++ /dev/null @@ -1,13 +0,0 @@ -import { contextMenuOverlay } from '@vaadin/context-menu/theme/material/vaadin-context-menu-overlay-styles.js'; -import { menuOverlay } from '@vaadin/vaadin-material-styles/mixins/menu-overlay.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const menuBarOverlay = css` - :host(:first-of-type) { - padding-top: 5px; - } -`; - -registerStyles('vaadin-menu-bar-overlay', [menuOverlay, contextMenuOverlay, menuBarOverlay], { - moduleId: 'material-menu-bar-overlay', -}); diff --git a/packages/menu-bar/theme/material/vaadin-menu-bar-styles.js b/packages/menu-bar/theme/material/vaadin-menu-bar-styles.js deleted file mode 100644 index d134ba67482..00000000000 --- a/packages/menu-bar/theme/material/vaadin-menu-bar-styles.js +++ /dev/null @@ -1,21 +0,0 @@ -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-menu-bar', - css` - [part='container'] { - /* To retain the box-shadow */ - padding-bottom: 5px; - } - - :host([has-single-button]) ::slotted(vaadin-menu-bar-button) { - border-radius: 4px; - } - - :host([theme~='end-aligned']) ::slotted(vaadin-menu-bar-button[first-visible]), - :host([theme~='end-aligned'][has-single-button]) ::slotted(vaadin-menu-bar-button) { - margin-inline-start: auto; - } - `, - { moduleId: 'material-menu-bar' }, -); diff --git a/packages/menu-bar/theme/material/vaadin-menu-bar.js b/packages/menu-bar/theme/material/vaadin-menu-bar.js deleted file mode 100644 index aa28bea58dc..00000000000 --- a/packages/menu-bar/theme/material/vaadin-menu-bar.js +++ /dev/null @@ -1,6 +0,0 @@ -import './vaadin-menu-bar-button.js'; -import './vaadin-menu-bar-item-styles.js'; -import './vaadin-menu-bar-list-box-styles.js'; -import './vaadin-menu-bar-styles.js'; -import './vaadin-menu-bar-overlay-styles.js'; -import '../../src/vaadin-menu-bar.js'; diff --git a/packages/message-input/package.json b/packages/message-input/package.json index dcce3e8e271..402aef06bce 100644 --- a/packages/message-input/package.json +++ b/packages/message-input/package.json @@ -41,7 +41,6 @@ "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/text-area": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/message-input/test/visual/material/message-input.test.js b/packages/message-input/test/visual/material/message-input.test.js deleted file mode 100644 index 8cf3b4f9e94..00000000000 --- a/packages/message-input/test/visual/material/message-input.test.js +++ /dev/null @@ -1,41 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-message-input.js'; - -describe('message-input', () => { - let div, element; - - ['ltr', 'rtl'].forEach((dir) => { - describe(dir, () => { - before(() => { - document.documentElement.setAttribute('dir', dir); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - describe('basic', () => { - beforeEach(() => { - div = document.createElement('div'); - div.style.padding = '10px'; - element = fixtureSync('', div); - }); - - it('basic', async () => { - await visualDiff(div, `${dir}-basic`); - }); - - it('value', async () => { - element.value = 'Hello'; - await visualDiff(div, `${dir}-value`); - }); - - it('disabled', async () => { - element.disabled = true; - await visualDiff(div, `${dir}-disabled`); - }); - }); - }); - }); -}); diff --git a/packages/message-input/test/visual/material/screenshots/message-input/baseline/ltr-basic.png b/packages/message-input/test/visual/material/screenshots/message-input/baseline/ltr-basic.png deleted file mode 100644 index 65b68a98c3a..00000000000 Binary files a/packages/message-input/test/visual/material/screenshots/message-input/baseline/ltr-basic.png and /dev/null differ diff --git a/packages/message-input/test/visual/material/screenshots/message-input/baseline/ltr-disabled.png b/packages/message-input/test/visual/material/screenshots/message-input/baseline/ltr-disabled.png deleted file mode 100644 index 9327a997029..00000000000 Binary files a/packages/message-input/test/visual/material/screenshots/message-input/baseline/ltr-disabled.png and /dev/null differ diff --git a/packages/message-input/test/visual/material/screenshots/message-input/baseline/ltr-value.png b/packages/message-input/test/visual/material/screenshots/message-input/baseline/ltr-value.png deleted file mode 100644 index 4b4a8456773..00000000000 Binary files a/packages/message-input/test/visual/material/screenshots/message-input/baseline/ltr-value.png and /dev/null differ diff --git a/packages/message-input/test/visual/material/screenshots/message-input/baseline/rtl-basic.png b/packages/message-input/test/visual/material/screenshots/message-input/baseline/rtl-basic.png deleted file mode 100644 index a9d26da1f1a..00000000000 Binary files a/packages/message-input/test/visual/material/screenshots/message-input/baseline/rtl-basic.png and /dev/null differ diff --git a/packages/message-input/test/visual/material/screenshots/message-input/baseline/rtl-disabled.png b/packages/message-input/test/visual/material/screenshots/message-input/baseline/rtl-disabled.png deleted file mode 100644 index 1f352fa7fd0..00000000000 Binary files a/packages/message-input/test/visual/material/screenshots/message-input/baseline/rtl-disabled.png and /dev/null differ diff --git a/packages/message-input/test/visual/material/screenshots/message-input/baseline/rtl-value.png b/packages/message-input/test/visual/material/screenshots/message-input/baseline/rtl-value.png deleted file mode 100644 index a5bb9ed2a83..00000000000 Binary files a/packages/message-input/test/visual/material/screenshots/message-input/baseline/rtl-value.png and /dev/null differ diff --git a/packages/message-input/theme/material/vaadin-lit-message-input.js b/packages/message-input/theme/material/vaadin-lit-message-input.js deleted file mode 100644 index 00a52199f82..00000000000 --- a/packages/message-input/theme/material/vaadin-lit-message-input.js +++ /dev/null @@ -1,4 +0,0 @@ -import '@vaadin/button/theme/material/vaadin-lit-button.js'; -import '@vaadin/text-area/theme/material/vaadin-lit-text-area.js'; -import './vaadin-message-input-styles.js'; -import '../../src/vaadin-lit-message-input.js'; diff --git a/packages/message-input/theme/material/vaadin-message-input-styles.js b/packages/message-input/theme/material/vaadin-message-input-styles.js deleted file mode 100644 index 59ed2509293..00000000000 --- a/packages/message-input/theme/material/vaadin-message-input-styles.js +++ /dev/null @@ -1,18 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-message-input', - css` - :host { - padding: 0.5em 1em; - } - - ::slotted([slot='textarea']) { - margin: 0; - margin-inline-end: 0.5em; - } - `, - { moduleId: 'material-message-input' }, -); diff --git a/packages/message-input/theme/material/vaadin-message-input.js b/packages/message-input/theme/material/vaadin-message-input.js deleted file mode 100644 index 9a0b93d2b26..00000000000 --- a/packages/message-input/theme/material/vaadin-message-input.js +++ /dev/null @@ -1,4 +0,0 @@ -import '@vaadin/button/theme/material/vaadin-button.js'; -import '@vaadin/text-area/theme/material/vaadin-text-area.js'; -import './vaadin-message-input-styles.js'; -import '../../src/vaadin-message-input.js'; diff --git a/packages/message-list/package.json b/packages/message-list/package.json index 35bdb749bf8..f139c074177 100644 --- a/packages/message-list/package.json +++ b/packages/message-list/package.json @@ -44,7 +44,6 @@ "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/markdown": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/message-list/test/visual/material/message-list.test.js b/packages/message-list/test/visual/material/message-list.test.js deleted file mode 100644 index 979c354aa26..00000000000 --- a/packages/message-list/test/visual/material/message-list.test.js +++ /dev/null @@ -1,74 +0,0 @@ -import { sendKeys } from '@vaadin/test-runner-commands'; -import { fixtureSync, nextFrame, nextRender } from '@vaadin/testing-helpers'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-message-list.js'; - -describe('message-list', () => { - let div, element; - - ['ltr', 'rtl'].forEach((dir) => { - describe(dir, () => { - before(() => { - document.documentElement.setAttribute('dir', dir); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - describe('basic', () => { - beforeEach(async () => { - div = document.createElement('div'); - div.style.padding = '10px'; - - element = fixtureSync('', div); - element.items = [ - { - text: 'Hello list', - time: 'yesterday', - userName: 'Matt Mambo', - userAbbr: 'MM', - userColorIndex: 1, - }, - { - text: 'Another message', - time: 'right now', - userName: 'Linsey Listy', - userAbbr: 'LL', - userColorIndex: 2, - userImg: - 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iNTEyIiBoZWlnaHQ9IjUxMiI+PHBhdGggZmlsbD0iIzAyMDIwMSIgZD0iTTQ1NC40MjYgMzkyLjU4MmMtNS40MzktMTYuMzItMTUuMjk4LTMyLjc4Mi0yOS44MzktNDIuMzYyLTI3Ljk3OS0xOC41NzItNjAuNTc4LTI4LjQ3OS05Mi4wOTktMzkuMDg1LTcuNjA0LTIuNjY0LTE1LjMzLTUuNTY4LTIyLjI3OS05LjctNi4yMDQtMy42ODYtOC41MzMtMTEuMjQ2LTkuOTc0LTE3Ljg4Ni0uNjM2LTMuNTEyLTEuMDI2LTcuMTE2LTEuMjI4LTEwLjY2MSAyMi44NTctMzEuMjY3IDM4LjAxOS04Mi4yOTUgMzguMDE5LTEyNC4xMzYgMC02NS4yOTgtMzYuODk2LTgzLjQ5NS04Mi40MDItODMuNDk1LTQ1LjUxNSAwLTgyLjQwMyAxOC4xNy04Mi40MDMgODMuNDY4IDAgNDMuMzM4IDE2LjI1NSA5Ni41IDQwLjQ4OSAxMjcuMzgzLS4yMjEgMi40MzgtLjUxMSA0Ljg3Ni0uOTUgNy4zMDMtMS40NDQgNi42MzktMy43NyAxNC4wNTgtOS45NyAxNy43NDMtNi45NTcgNC4xMzMtMTQuNjgyIDYuNzU2LTIyLjI4NyA5LjQyLTMxLjUyMSAxMC42MDUtNjQuMTE5IDE5Ljk1Ny05Mi4wOTEgMzguNTI5LTE0LjU0OSA5LjU4LTI0LjQwMyAyNy4xNTktMjkuODM4IDQzLjQ3OS01LjU5NyAxNi45MzgtNy44ODYgMzcuOTE3LTcuNTQxIDU0LjkxN2g0MTEuOTMyYy4zNDgtMTYuOTk5LTEuOTQ2LTM3Ljk3OC03LjUzOS01NC45MTd6Ii8+PC9zdmc+Cg==', - }, - { - text: 'Third message', - time: 'right now', - userName: 'Linsey Listy', - userAbbr: 'LL', - userColorIndex: 3, - }, - ]; - await nextRender(element); - }); - - it('basic', async () => { - await visualDiff(div, `${dir}-basic`); - }); - - it('focused', async () => { - element.querySelectorAll('vaadin-message')[0].focus(); - await sendKeys({ press: 'ArrowDown' }); - await visualDiff(div, `${dir}-focused`); - }); - - it('markdown', async () => { - element.items[0].text = 'This is a **bold text** in Markdown'; - element.items = [...element.items]; - element.markdown = true; - await customElements.whenDefined('vaadin-markdown'); - await nextFrame(); - await visualDiff(div, `${dir}-markdown`); - }); - }); - }); - }); -}); diff --git a/packages/message-list/test/visual/material/message.test.js b/packages/message-list/test/visual/material/message.test.js deleted file mode 100644 index 13674c5d364..00000000000 --- a/packages/message-list/test/visual/material/message.test.js +++ /dev/null @@ -1,66 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-message.js'; - -describe('message', () => { - let div, element; - - ['ltr', 'rtl'].forEach((dir) => { - describe(dir, () => { - before(() => { - document.documentElement.setAttribute('dir', dir); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - describe('basic', () => { - beforeEach(() => { - div = document.createElement('div'); - div.style.padding = '10px'; - element = fixtureSync( - `There is no real ending. It's just the place where you stop the story.`, - div, - ); - }); - - it('basic', async () => { - await visualDiff(div, `${dir}-basic`); - }); - - it('time', async () => { - element.time = '2021-01-28 10:43'; - await visualDiff(div, `${dir}-time`); - }); - - it('userName', async () => { - element.userName = 'Bob Ross'; - await visualDiff(div, `${dir}-user-name`); - }); - - it('userName time', async () => { - element.userName = 'Bob Ross'; - element.time = 'Moments ago'; - await visualDiff(div, `${dir}-user-name-time`); - }); - - it('userAbbr', async () => { - element.userAbbr = 'AF'; - await visualDiff(div, `${dir}-user-abbr`); - }); - - it('userImg', async () => { - /* prettier-ignore */ - element.userImg = 'data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz48IURPQ1RZUEUgc3ZnIFBVQkxJQyAiLS8vVzNDLy9EVEQgU1ZHIDEuMS8vRU4iICJodHRwOi8vd3d3LnczLm9yZy9HcmFwaGljcy9TVkcvMS4xL0RURC9zdmcxMS5kdGQiPjxzdmcgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB3aWR0aD0iNTEyIiBoZWlnaHQ9IjUxMiI+PHBhdGggZmlsbD0iIzAyMDIwMSIgZD0iTTQ1NC40MjYgMzkyLjU4MmMtNS40MzktMTYuMzItMTUuMjk4LTMyLjc4Mi0yOS44MzktNDIuMzYyLTI3Ljk3OS0xOC41NzItNjAuNTc4LTI4LjQ3OS05Mi4wOTktMzkuMDg1LTcuNjA0LTIuNjY0LTE1LjMzLTUuNTY4LTIyLjI3OS05LjctNi4yMDQtMy42ODYtOC41MzMtMTEuMjQ2LTkuOTc0LTE3Ljg4Ni0uNjM2LTMuNTEyLTEuMDI2LTcuMTE2LTEuMjI4LTEwLjY2MSAyMi44NTctMzEuMjY3IDM4LjAxOS04Mi4yOTUgMzguMDE5LTEyNC4xMzYgMC02NS4yOTgtMzYuODk2LTgzLjQ5NS04Mi40MDItODMuNDk1LTQ1LjUxNSAwLTgyLjQwMyAxOC4xNy04Mi40MDMgODMuNDY4IDAgNDMuMzM4IDE2LjI1NSA5Ni41IDQwLjQ4OSAxMjcuMzgzLS4yMjEgMi40MzgtLjUxMSA0Ljg3Ni0uOTUgNy4zMDMtMS40NDQgNi42MzktMy43NyAxNC4wNTgtOS45NyAxNy43NDMtNi45NTcgNC4xMzMtMTQuNjgyIDYuNzU2LTIyLjI4NyA5LjQyLTMxLjUyMSAxMC42MDUtNjQuMTE5IDE5Ljk1Ny05Mi4wOTEgMzguNTI5LTE0LjU0OSA5LjU4LTI0LjQwMyAyNy4xNTktMjkuODM4IDQzLjQ3OS01LjU5NyAxNi45MzgtNy44ODYgMzcuOTE3LTcuNTQxIDU0LjkxN2g0MTEuOTMyYy4zNDgtMTYuOTk5LTEuOTQ2LTM3Ljk3OC03LjUzOS01NC45MTd6Ii8+PC9zdmc+Cg=='; - await visualDiff(div, `${dir}-user-img`); - }); - - it('userColorIndex', async () => { - element.userColorIndex = 3; - await visualDiff(div, `${dir}-user-color-index`); - }); - }); - }); - }); -}); diff --git a/packages/message-list/test/visual/material/screenshots/message-list/baseline/ltr-basic.png b/packages/message-list/test/visual/material/screenshots/message-list/baseline/ltr-basic.png deleted file mode 100644 index e85e66f1bd9..00000000000 Binary files a/packages/message-list/test/visual/material/screenshots/message-list/baseline/ltr-basic.png and /dev/null differ diff --git a/packages/message-list/test/visual/material/screenshots/message-list/baseline/ltr-focused.png b/packages/message-list/test/visual/material/screenshots/message-list/baseline/ltr-focused.png deleted file mode 100644 index 4884140aa5c..00000000000 Binary files a/packages/message-list/test/visual/material/screenshots/message-list/baseline/ltr-focused.png and /dev/null differ diff --git a/packages/message-list/test/visual/material/screenshots/message-list/baseline/ltr-markdown.png b/packages/message-list/test/visual/material/screenshots/message-list/baseline/ltr-markdown.png deleted file mode 100644 index f191b613823..00000000000 Binary files a/packages/message-list/test/visual/material/screenshots/message-list/baseline/ltr-markdown.png and /dev/null differ diff --git a/packages/message-list/test/visual/material/screenshots/message-list/baseline/rtl-basic.png b/packages/message-list/test/visual/material/screenshots/message-list/baseline/rtl-basic.png deleted file mode 100644 index 9bd58672ed8..00000000000 Binary files a/packages/message-list/test/visual/material/screenshots/message-list/baseline/rtl-basic.png and /dev/null differ diff --git a/packages/message-list/test/visual/material/screenshots/message-list/baseline/rtl-focused.png b/packages/message-list/test/visual/material/screenshots/message-list/baseline/rtl-focused.png deleted file mode 100644 index d8650727003..00000000000 Binary files a/packages/message-list/test/visual/material/screenshots/message-list/baseline/rtl-focused.png and /dev/null differ diff --git a/packages/message-list/test/visual/material/screenshots/message-list/baseline/rtl-markdown.png b/packages/message-list/test/visual/material/screenshots/message-list/baseline/rtl-markdown.png deleted file mode 100644 index 5442e638031..00000000000 Binary files a/packages/message-list/test/visual/material/screenshots/message-list/baseline/rtl-markdown.png and /dev/null differ diff --git a/packages/message-list/test/visual/material/screenshots/message/baseline/ltr-basic.png b/packages/message-list/test/visual/material/screenshots/message/baseline/ltr-basic.png deleted file mode 100644 index 000888d7040..00000000000 Binary files a/packages/message-list/test/visual/material/screenshots/message/baseline/ltr-basic.png and /dev/null differ diff --git a/packages/message-list/test/visual/material/screenshots/message/baseline/ltr-time.png b/packages/message-list/test/visual/material/screenshots/message/baseline/ltr-time.png deleted file mode 100644 index a7c92bbea12..00000000000 Binary files a/packages/message-list/test/visual/material/screenshots/message/baseline/ltr-time.png and /dev/null differ diff --git a/packages/message-list/test/visual/material/screenshots/message/baseline/ltr-user-abbr.png b/packages/message-list/test/visual/material/screenshots/message/baseline/ltr-user-abbr.png deleted file mode 100644 index c9b5a6c70dc..00000000000 Binary files a/packages/message-list/test/visual/material/screenshots/message/baseline/ltr-user-abbr.png and /dev/null differ diff --git a/packages/message-list/test/visual/material/screenshots/message/baseline/ltr-user-color-index.png b/packages/message-list/test/visual/material/screenshots/message/baseline/ltr-user-color-index.png deleted file mode 100644 index d8becc6e475..00000000000 Binary files a/packages/message-list/test/visual/material/screenshots/message/baseline/ltr-user-color-index.png and /dev/null differ diff --git a/packages/message-list/test/visual/material/screenshots/message/baseline/ltr-user-img.png b/packages/message-list/test/visual/material/screenshots/message/baseline/ltr-user-img.png deleted file mode 100644 index a4444f7b170..00000000000 Binary files a/packages/message-list/test/visual/material/screenshots/message/baseline/ltr-user-img.png and /dev/null differ diff --git a/packages/message-list/test/visual/material/screenshots/message/baseline/ltr-user-name-time.png b/packages/message-list/test/visual/material/screenshots/message/baseline/ltr-user-name-time.png deleted file mode 100644 index 849b2bd3efb..00000000000 Binary files a/packages/message-list/test/visual/material/screenshots/message/baseline/ltr-user-name-time.png and /dev/null differ diff --git a/packages/message-list/test/visual/material/screenshots/message/baseline/ltr-user-name.png b/packages/message-list/test/visual/material/screenshots/message/baseline/ltr-user-name.png deleted file mode 100644 index 2312239eb0e..00000000000 Binary files a/packages/message-list/test/visual/material/screenshots/message/baseline/ltr-user-name.png and /dev/null differ diff --git a/packages/message-list/test/visual/material/screenshots/message/baseline/rtl-basic.png b/packages/message-list/test/visual/material/screenshots/message/baseline/rtl-basic.png deleted file mode 100644 index 950b5c9be76..00000000000 Binary files a/packages/message-list/test/visual/material/screenshots/message/baseline/rtl-basic.png and /dev/null differ diff --git a/packages/message-list/test/visual/material/screenshots/message/baseline/rtl-time.png b/packages/message-list/test/visual/material/screenshots/message/baseline/rtl-time.png deleted file mode 100644 index 8dfac0f1bf9..00000000000 Binary files a/packages/message-list/test/visual/material/screenshots/message/baseline/rtl-time.png and /dev/null differ diff --git a/packages/message-list/test/visual/material/screenshots/message/baseline/rtl-user-abbr.png b/packages/message-list/test/visual/material/screenshots/message/baseline/rtl-user-abbr.png deleted file mode 100644 index 5bd1806c559..00000000000 Binary files a/packages/message-list/test/visual/material/screenshots/message/baseline/rtl-user-abbr.png and /dev/null differ diff --git a/packages/message-list/test/visual/material/screenshots/message/baseline/rtl-user-color-index.png b/packages/message-list/test/visual/material/screenshots/message/baseline/rtl-user-color-index.png deleted file mode 100644 index cafda5df504..00000000000 Binary files a/packages/message-list/test/visual/material/screenshots/message/baseline/rtl-user-color-index.png and /dev/null differ diff --git a/packages/message-list/test/visual/material/screenshots/message/baseline/rtl-user-img.png b/packages/message-list/test/visual/material/screenshots/message/baseline/rtl-user-img.png deleted file mode 100644 index bdf7db35c53..00000000000 Binary files a/packages/message-list/test/visual/material/screenshots/message/baseline/rtl-user-img.png and /dev/null differ diff --git a/packages/message-list/test/visual/material/screenshots/message/baseline/rtl-user-name-time.png b/packages/message-list/test/visual/material/screenshots/message/baseline/rtl-user-name-time.png deleted file mode 100644 index c7acef408c0..00000000000 Binary files a/packages/message-list/test/visual/material/screenshots/message/baseline/rtl-user-name-time.png and /dev/null differ diff --git a/packages/message-list/test/visual/material/screenshots/message/baseline/rtl-user-name.png b/packages/message-list/test/visual/material/screenshots/message/baseline/rtl-user-name.png deleted file mode 100644 index e24a71b4ab9..00000000000 Binary files a/packages/message-list/test/visual/material/screenshots/message/baseline/rtl-user-name.png and /dev/null differ diff --git a/packages/message-list/theme/material/vaadin-lit-message-list.js b/packages/message-list/theme/material/vaadin-lit-message-list.js deleted file mode 100644 index ba0535d0d27..00000000000 --- a/packages/message-list/theme/material/vaadin-lit-message-list.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-message-list-styles.js'; -import '../../src/vaadin-lit-message-list.js'; diff --git a/packages/message-list/theme/material/vaadin-lit-message.js b/packages/message-list/theme/material/vaadin-lit-message.js deleted file mode 100644 index 03e723d02a0..00000000000 --- a/packages/message-list/theme/material/vaadin-lit-message.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-message-styles.js'; -import '../../src/vaadin-lit-message.js'; diff --git a/packages/message-list/theme/material/vaadin-message-list-styles.js b/packages/message-list/theme/material/vaadin-message-list-styles.js deleted file mode 100644 index f31fb24c94a..00000000000 --- a/packages/message-list/theme/material/vaadin-message-list-styles.js +++ /dev/null @@ -1,14 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import './vaadin-message-styles.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-message-list', - css` - [part='list'] { - padding: 8px 0; - } - `, - { moduleId: 'material-message-list' }, -); diff --git a/packages/message-list/theme/material/vaadin-message-list.js b/packages/message-list/theme/material/vaadin-message-list.js deleted file mode 100644 index ffeea275423..00000000000 --- a/packages/message-list/theme/material/vaadin-message-list.js +++ /dev/null @@ -1,3 +0,0 @@ -import '@vaadin/markdown/theme/material/vaadin-markdown-styles.js'; -import './vaadin-message-list-styles.js'; -import '../../src/vaadin-message-list.js'; diff --git a/packages/message-list/theme/material/vaadin-message-styles.js b/packages/message-list/theme/material/vaadin-message-styles.js deleted file mode 100644 index 1c572d0ce96..00000000000 --- a/packages/message-list/theme/material/vaadin-message-styles.js +++ /dev/null @@ -1,69 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import '@vaadin/avatar/theme/material/vaadin-avatar-styles.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-message', - css` - :host { - color: var(--material-body-text-color); - font-family: var(--material-font-family); - font-size: var(--material-body-font-size); - line-height: 1.5; - padding: 0.75rem 1rem; - -moz-osx-font-smoothing: grayscale; - -webkit-font-smoothing: antialiased; - -webkit-text-size-adjust: 100%; - } - - :host(:hover:not([disabled])) { - background-color: var(--material-secondary-background-color); - } - - :host([focused]:not([disabled])) { - background-color: var(--material-divider-color); - } - - @media (pointer: coarse) { - :host(:hover:not([disabled])), - :host([focused]:not([disabled])) { - background-color: transparent; - } - } - - [part='header'] { - min-height: calc(var(--material-body-font-size) * 1.5); - } - - [part='name'] { - margin-right: 0.5rem; - } - - [part='name']:empty { - margin-right: 0; - } - - :host([dir='rtl']) [part='name'] { - margin-left: 0.5rem; - margin-right: 0; - } - - :host([dir='rtl']) [part='name']:empty { - margin-left: 0; - } - - [part='time'] { - color: var(--material-secondary-text-color); - font-size: var(--material-small-font-size); - line-height: 1.25rem; - } - - ::slotted([slot='avatar']) { - --vaadin-avatar-size: 2.5rem; - margin-top: 0.25rem; - margin-inline-end: 1rem; - } - `, - { moduleId: 'material-message' }, -); diff --git a/packages/message-list/theme/material/vaadin-message.js b/packages/message-list/theme/material/vaadin-message.js deleted file mode 100644 index 9c0cc6969c0..00000000000 --- a/packages/message-list/theme/material/vaadin-message.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-message-styles.js'; -import '../../src/vaadin-message.js'; diff --git a/packages/multi-select-combo-box/package.json b/packages/multi-select-combo-box/package.json index e75614af02b..cb00e57883c 100644 --- a/packages/multi-select-combo-box/package.json +++ b/packages/multi-select-combo-box/package.json @@ -48,7 +48,6 @@ "@vaadin/lit-renderer": "25.0.0-alpha0", "@vaadin/overlay": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/multi-select-combo-box/test/visual/material/multi-select-combo-box.test.js b/packages/multi-select-combo-box/test/visual/material/multi-select-combo-box.test.js deleted file mode 100644 index b17dfab03c4..00000000000 --- a/packages/multi-select-combo-box/test/visual/material/multi-select-combo-box.test.js +++ /dev/null @@ -1,181 +0,0 @@ -import { sendKeys } from '@vaadin/test-runner-commands'; -import { fixtureSync, mousedown } from '@vaadin/testing-helpers'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../common.js'; -import '../../not-animated-styles.js'; -import '../../../theme/material/vaadin-multi-select-combo-box.js'; - -describe('multi-select-combo-box', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - div.style.padding = '10px'; - element = fixtureSync('', div); - element.items = ['Apple', 'Banana', 'Lemon', 'Pear']; - }); - - afterEach(() => { - // After tests which use sendKeys() the focus-utils.js -> isKeyboardActive is set to true. - // Click once here on body to reset it so other tests are not affected by it. - // An unwanted focus-ring would be shown in other tests otherwise. - mousedown(document.body); - }); - - it('basic', async () => { - await visualDiff(div, 'basic'); - }); - - it('focus-ring', async () => { - await sendKeys({ press: 'Tab' }); - - await visualDiff(div, 'focus-ring'); - }); - - it('disabled', async () => { - element.disabled = true; - await visualDiff(div, 'disabled'); - }); - - it('readonly', async () => { - element.readonly = true; - await visualDiff(div, 'readonly'); - }); - - it('label', async () => { - element.label = 'Label'; - await visualDiff(div, 'label'); - }); - - it('placeholder', async () => { - element.placeholder = 'Placeholder'; - await visualDiff(div, 'placeholder'); - }); - - it('custom value', async () => { - element.allowCustomValue = true; - element.selectedItems = ['Orange']; - await visualDiff(div, 'custom-value'); - }); - - it('required', async () => { - element.label = 'Label'; - element.required = true; - await visualDiff(div, 'required'); - }); - - it('error message', async () => { - element.label = 'Label'; - element.errorMessage = 'This field is required'; - element.required = true; - element.validate(); - await visualDiff(div, 'error-message'); - }); - - it('helper text', async () => { - element.helperText = 'Helper text'; - await visualDiff(div, 'helper-text'); - }); - - describe('selected items', () => { - beforeEach(() => { - element.style.width = '250px'; - element.selectedItems = ['Apple', 'Banana']; - }); - - it('default', async () => { - await visualDiff(div, 'selected'); - }); - - it('overflow 2', async () => { - element.selectedItems = ['Apple', 'Banana', 'Lemon']; - await visualDiff(div, 'selected-overflow-2'); - }); - - it('overflow 3', async () => { - element.selectedItems = ['Apple', 'Banana', 'Lemon', 'Pear']; - await visualDiff(div, 'selected-overflow-3'); - }); - - it('clear button', async () => { - element.clearButtonVisible = true; - await visualDiff(div, 'selected-clear-button'); - }); - - it('readonly', async () => { - element.readonly = true; - await visualDiff(div, 'selected-readonly'); - }); - - it('disabled', async () => { - element.disabled = true; - await visualDiff(div, 'selected-disabled'); - }); - - it('focused chip', async () => { - element.inputElement.focus(); - await sendKeys({ press: 'ArrowLeft' }); - await visualDiff(div, 'selected-focused-chip'); - }); - }); - - describe('auto expand', () => { - beforeEach(() => { - element.selectedItems = [...element.items]; - element.autoExpandHorizontally = true; - element.autoExpandVertically = true; - }); - - it('auto expand', async () => { - await visualDiff(div, 'auto-expand'); - }); - - it('auto expand max width', async () => { - element.style.maxWidth = '250px'; - await visualDiff(div, 'auto-expand-max-width'); - }); - - it('auto expand long chip', async () => { - element.style.maxWidth = '250px'; - const items = [...element.items]; - items[0] = 'Super long item that does not fit into input'; - element.items = element.selectedItems = [items[0]]; - await visualDiff(div, 'auto-expand-long-chip'); - }); - - it('auto expand long chip clear button', async () => { - element.style.maxWidth = '250px'; - element.clearButtonVisible = true; - const items = [...element.items]; - items[0] = 'Super long item that does not fit into input'; - element.items = element.selectedItems = [items[0]]; - await visualDiff(div, 'auto-expand-long-chip-clear-button'); - }); - }); - - describe('opened', () => { - beforeEach(() => { - div.style.height = '200px'; - }); - - it('opened', async () => { - element.$.comboBox.click(); - await visualDiff(div, 'opened'); - }); - - it('opened selected', async () => { - element.style.width = '250px'; - element.selectedItems = ['Apple', 'Banana']; - element.$.comboBox.click(); - await visualDiff(div, 'opened-selected'); - }); - - it('opened readonly', async () => { - element.selectedItems = ['Apple', 'Banana']; - element.readonly = true; - element.$.comboBox.click(); - await visualDiff(div, 'opened-readonly'); - }); - }); -}); diff --git a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/auto-expand-long-chip-clear-button.png b/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/auto-expand-long-chip-clear-button.png deleted file mode 100644 index 7c1c3ac988d..00000000000 Binary files a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/auto-expand-long-chip-clear-button.png and /dev/null differ diff --git a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/auto-expand-long-chip.png b/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/auto-expand-long-chip.png deleted file mode 100644 index 79786177a8b..00000000000 Binary files a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/auto-expand-long-chip.png and /dev/null differ diff --git a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/auto-expand-max-width.png b/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/auto-expand-max-width.png deleted file mode 100644 index 802f99e122e..00000000000 Binary files a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/auto-expand-max-width.png and /dev/null differ diff --git a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/auto-expand.png b/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/auto-expand.png deleted file mode 100644 index 9110f96d743..00000000000 Binary files a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/auto-expand.png and /dev/null differ diff --git a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/basic.png b/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/basic.png deleted file mode 100644 index 7edfa5e273f..00000000000 Binary files a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/basic.png and /dev/null differ diff --git a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/custom-value.png b/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/custom-value.png deleted file mode 100644 index 47fb2382941..00000000000 Binary files a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/custom-value.png and /dev/null differ diff --git a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/disabled.png b/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/disabled.png deleted file mode 100644 index d504a6c1cc1..00000000000 Binary files a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/disabled.png and /dev/null differ diff --git a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/error-message.png b/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/error-message.png deleted file mode 100644 index a578ba5a158..00000000000 Binary files a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/error-message.png and /dev/null differ diff --git a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/focus-ring.png b/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/focus-ring.png deleted file mode 100644 index cad4824eb7b..00000000000 Binary files a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/focus-ring.png and /dev/null differ diff --git a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/helper-text.png b/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/helper-text.png deleted file mode 100644 index 602041823c7..00000000000 Binary files a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/helper-text.png and /dev/null differ diff --git a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/label.png b/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/label.png deleted file mode 100644 index ff74f44f9ee..00000000000 Binary files a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/label.png and /dev/null differ diff --git a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/opened-readonly.png b/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/opened-readonly.png deleted file mode 100644 index b520ed8102c..00000000000 Binary files a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/opened-readonly.png and /dev/null differ diff --git a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/opened-selected.png b/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/opened-selected.png deleted file mode 100644 index 0708f4502fa..00000000000 Binary files a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/opened-selected.png and /dev/null differ diff --git a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/opened.png b/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/opened.png deleted file mode 100644 index 1adb360bdb0..00000000000 Binary files a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/opened.png and /dev/null differ diff --git a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/placeholder.png b/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/placeholder.png deleted file mode 100644 index 85feb1c9c9d..00000000000 Binary files a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/placeholder.png and /dev/null differ diff --git a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/readonly.png b/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/readonly.png deleted file mode 100644 index 46c2b4cd4d6..00000000000 Binary files a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/readonly.png and /dev/null differ diff --git a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/required.png b/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/required.png deleted file mode 100644 index 0902cbc2493..00000000000 Binary files a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/required.png and /dev/null differ diff --git a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/selected-clear-button.png b/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/selected-clear-button.png deleted file mode 100644 index 7170e881290..00000000000 Binary files a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/selected-clear-button.png and /dev/null differ diff --git a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/selected-disabled.png b/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/selected-disabled.png deleted file mode 100644 index b1360bd6960..00000000000 Binary files a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/selected-disabled.png and /dev/null differ diff --git a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/selected-focused-chip.png b/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/selected-focused-chip.png deleted file mode 100644 index b83142e7eeb..00000000000 Binary files a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/selected-focused-chip.png and /dev/null differ diff --git a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/selected-overflow-2.png b/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/selected-overflow-2.png deleted file mode 100644 index 3d881e78322..00000000000 Binary files a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/selected-overflow-2.png and /dev/null differ diff --git a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/selected-overflow-3.png b/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/selected-overflow-3.png deleted file mode 100644 index b041532bbb5..00000000000 Binary files a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/selected-overflow-3.png and /dev/null differ diff --git a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/selected-readonly.png b/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/selected-readonly.png deleted file mode 100644 index 505ee92d1ee..00000000000 Binary files a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/selected-readonly.png and /dev/null differ diff --git a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/selected.png b/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/selected.png deleted file mode 100644 index b2af03e3d2e..00000000000 Binary files a/packages/multi-select-combo-box/test/visual/material/screenshots/multi-select-combo-box/baseline/selected.png and /dev/null differ diff --git a/packages/multi-select-combo-box/theme/material/vaadin-lit-multi-select-combo-box.js b/packages/multi-select-combo-box/theme/material/vaadin-lit-multi-select-combo-box.js deleted file mode 100644 index 80c98af2896..00000000000 --- a/packages/multi-select-combo-box/theme/material/vaadin-lit-multi-select-combo-box.js +++ /dev/null @@ -1,3 +0,0 @@ -import './vaadin-multi-select-combo-box-chip-styles.js'; -import './vaadin-multi-select-combo-box-styles.js'; -import '../../src/vaadin-lit-multi-select-combo-box.js'; diff --git a/packages/multi-select-combo-box/theme/material/vaadin-multi-select-combo-box-chip-styles.js b/packages/multi-select-combo-box/theme/material/vaadin-multi-select-combo-box-chip-styles.js deleted file mode 100644 index eb9b73687db..00000000000 --- a/packages/multi-select-combo-box/theme/material/vaadin-multi-select-combo-box-chip-styles.js +++ /dev/null @@ -1,102 +0,0 @@ -/** - * @license - * Copyright (c) 2021 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/font-icons.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import { fieldButton } from '@vaadin/vaadin-material-styles/mixins/field-button.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const chip = css` - :host { - height: 1.25rem; - margin-inline-end: 0.25rem; - border-radius: 4px; - background-color: rgba(0, 0, 0, 0.08); - cursor: default; - font-family: var(--material-font-family); - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - } - - :host([focused]) { - background-color: rgba(0, 0, 0, 0.16); - } - - :host([slot='overflow']) { - position: relative; - margin-inline-start: 0.5rem; - } - - :host([slot='overflow'])::before, - :host([slot='overflow'])::after { - position: absolute; - content: ''; - width: 100%; - height: 100%; - border-left: 0.125rem solid; - border-radius: 0.25rem; - border-color: rgba(0, 0, 0, 0.08); - } - - :host([slot='overflow'])::before { - left: -0.25rem; - } - - :host([slot='overflow'])::after { - left: -0.5rem; - } - - :host([count='2']) { - margin-inline-start: 0.25rem; - } - - :host([count='2'])::after { - display: none; - } - - :host([count='1']) { - margin-inline-start: 0; - } - - :host([count='1'])::before, - :host([count='1'])::after { - display: none; - } - - [part='label'] { - font-size: var(--material-caption-font-size); - line-height: 1; - color: var(--material-body-text-color); - } - - /* Override field button */ - [part='remove-button'] { - display: flex; - align-items: center; - justify-content: center; - box-sizing: border-box; - width: 20px; - height: 20px; - margin-inline-start: auto; - line-height: 20px; - padding: 0; - font-size: 0.75em; - } - - [part='remove-button']::before { - content: var(--material-icons-clear); - } - - :host([disabled]) [part='label'] { - color: var(--material-disabled-text-color); - -webkit-text-fill-color: var(--material-disabled-text-color); - pointer-events: none; - } -`; - -registerStyles('vaadin-multi-select-combo-box-chip', [fieldButton, chip], { - moduleId: 'material-multi-select-combo-box-chip', -}); diff --git a/packages/multi-select-combo-box/theme/material/vaadin-multi-select-combo-box-styles.js b/packages/multi-select-combo-box/theme/material/vaadin-multi-select-combo-box-styles.js deleted file mode 100644 index eaa39eb510e..00000000000 --- a/packages/multi-select-combo-box/theme/material/vaadin-multi-select-combo-box-styles.js +++ /dev/null @@ -1,92 +0,0 @@ -/** - * @license - * Copyright (c) 2021 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import '@vaadin/input-container/theme/material/vaadin-input-container-styles.js'; -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/font-icons.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import { comboBoxItem } from '@vaadin/combo-box/theme/material/vaadin-combo-box-item-styles.js'; -import { comboBoxLoader, comboBoxOverlay } from '@vaadin/combo-box/theme/material/vaadin-combo-box-overlay-styles.js'; -import { item } from '@vaadin/item/theme/material/vaadin-item-styles.js'; -import { inputFieldShared } from '@vaadin/vaadin-material-styles/mixins/input-field-shared.js'; -import { loader } from '@vaadin/vaadin-material-styles/mixins/loader.js'; -import { menuOverlay } from '@vaadin/vaadin-material-styles/mixins/menu-overlay.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const multiSelectComboBoxItem = css` - @media (any-hover: hover) { - :host(:hover[readonly]) { - background-color: transparent; - cursor: default; - } - } -`; - -registerStyles('vaadin-multi-select-combo-box-item', [item, comboBoxItem, multiSelectComboBoxItem], { - moduleId: 'material-multi-select-combo-box-item', -}); - -registerStyles( - 'vaadin-multi-select-combo-box-overlay', - [ - menuOverlay, - comboBoxOverlay, - loader, - comboBoxLoader, - css` - :host { - --_vaadin-multi-select-combo-box-items-container-border-width: 8px 0; - --_vaadin-multi-select-combo-box-items-container-border-style: solid; - } - `, - ], - { moduleId: 'material-multi-select-combo-box-overlay' }, -); - -const multiSelectComboBox = css` - :host([has-value]) ::slotted(input:placeholder-shown) { - caret-color: var(--material-body-text-color) !important; - } - - /* Override input-container styles */ - ::slotted([slot='chip']), - ::slotted([slot='overflow']) { - padding: 0 0.5rem; - } - - :host([auto-expand-vertically]) ::slotted([slot='chip']) { - margin-top: 0.25rem; - align-self: flex-start; - } - - ::slotted([slot='chip']:not([readonly]):not([disabled])) { - padding-inline-end: 0; - } - - [part='input-field'] { - height: auto; - min-height: 32px; - } - - [part='input-field'] ::slotted(input) { - padding: 6px 0; - } - - [part='toggle-button']::before { - content: var(--material-icons-dropdown); - } - - :host([opened]) [part='toggle-button'] { - transform: rotate(180deg); - } - - :host([readonly][has-value]) [part='toggle-button'] { - color: var(--material-secondary-text-color); - } -`; - -registerStyles('vaadin-multi-select-combo-box', [inputFieldShared, multiSelectComboBox], { - moduleId: 'material-multi-select-combo-box', -}); diff --git a/packages/multi-select-combo-box/theme/material/vaadin-multi-select-combo-box.js b/packages/multi-select-combo-box/theme/material/vaadin-multi-select-combo-box.js deleted file mode 100644 index 3a5ebdb9bdc..00000000000 --- a/packages/multi-select-combo-box/theme/material/vaadin-multi-select-combo-box.js +++ /dev/null @@ -1,8 +0,0 @@ -/** - * @license - * Copyright (c) 2021 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import './vaadin-multi-select-combo-box-chip-styles.js'; -import './vaadin-multi-select-combo-box-styles.js'; -import '../../src/vaadin-multi-select-combo-box.js'; diff --git a/packages/notification/package.json b/packages/notification/package.json index 5eaa7e91022..26654c91f93 100644 --- a/packages/notification/package.json +++ b/packages/notification/package.json @@ -43,7 +43,6 @@ "@vaadin/lit-renderer": "25.0.0-alpha0", "@vaadin/overlay": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/notification/test/visual/material/notification.test.js b/packages/notification/test/visual/material/notification.test.js deleted file mode 100644 index dcd1c1e0f89..00000000000 --- a/packages/notification/test/visual/material/notification.test.js +++ /dev/null @@ -1,38 +0,0 @@ -import { fixtureSync, nextRender } from '@vaadin/testing-helpers'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../not-animated-styles.js'; -import '../../../theme/material/vaadin-notification.js'; - -describe('notification', () => { - let element; - - beforeEach(() => { - element = fixtureSync(''); - element.renderer = (root) => { - root.textContent = element.position; - }; - }); - - afterEach(() => { - element.opened = false; - }); - - [ - 'top-stretch', - 'top-start', - 'top-center', - 'top-end', - 'middle', - 'bottom-start', - 'bottom-center', - 'bottom-end', - 'bottom-stretch', - ].forEach((position) => { - it(position, async () => { - element.position = position; - element.opened = true; - await nextRender(element); - await visualDiff(document.body, `${position}`); - }); - }); -}); diff --git a/packages/notification/test/visual/material/screenshots/notification/baseline/bottom-center.png b/packages/notification/test/visual/material/screenshots/notification/baseline/bottom-center.png deleted file mode 100644 index 5c4c2fa4f62..00000000000 Binary files a/packages/notification/test/visual/material/screenshots/notification/baseline/bottom-center.png and /dev/null differ diff --git a/packages/notification/test/visual/material/screenshots/notification/baseline/bottom-end.png b/packages/notification/test/visual/material/screenshots/notification/baseline/bottom-end.png deleted file mode 100644 index 5cb6fa9c2a5..00000000000 Binary files a/packages/notification/test/visual/material/screenshots/notification/baseline/bottom-end.png and /dev/null differ diff --git a/packages/notification/test/visual/material/screenshots/notification/baseline/bottom-start.png b/packages/notification/test/visual/material/screenshots/notification/baseline/bottom-start.png deleted file mode 100644 index 687ccb97d17..00000000000 Binary files a/packages/notification/test/visual/material/screenshots/notification/baseline/bottom-start.png and /dev/null differ diff --git a/packages/notification/test/visual/material/screenshots/notification/baseline/bottom-stretch.png b/packages/notification/test/visual/material/screenshots/notification/baseline/bottom-stretch.png deleted file mode 100644 index 587d11116dc..00000000000 Binary files a/packages/notification/test/visual/material/screenshots/notification/baseline/bottom-stretch.png and /dev/null differ diff --git a/packages/notification/test/visual/material/screenshots/notification/baseline/middle.png b/packages/notification/test/visual/material/screenshots/notification/baseline/middle.png deleted file mode 100644 index 68beaec6242..00000000000 Binary files a/packages/notification/test/visual/material/screenshots/notification/baseline/middle.png and /dev/null differ diff --git a/packages/notification/test/visual/material/screenshots/notification/baseline/top-center.png b/packages/notification/test/visual/material/screenshots/notification/baseline/top-center.png deleted file mode 100644 index 58b997bfeac..00000000000 Binary files a/packages/notification/test/visual/material/screenshots/notification/baseline/top-center.png and /dev/null differ diff --git a/packages/notification/test/visual/material/screenshots/notification/baseline/top-end.png b/packages/notification/test/visual/material/screenshots/notification/baseline/top-end.png deleted file mode 100644 index 8fe07765f62..00000000000 Binary files a/packages/notification/test/visual/material/screenshots/notification/baseline/top-end.png and /dev/null differ diff --git a/packages/notification/test/visual/material/screenshots/notification/baseline/top-start.png b/packages/notification/test/visual/material/screenshots/notification/baseline/top-start.png deleted file mode 100644 index a85a33f5940..00000000000 Binary files a/packages/notification/test/visual/material/screenshots/notification/baseline/top-start.png and /dev/null differ diff --git a/packages/notification/test/visual/material/screenshots/notification/baseline/top-stretch.png b/packages/notification/test/visual/material/screenshots/notification/baseline/top-stretch.png deleted file mode 100644 index 5ef07f3988b..00000000000 Binary files a/packages/notification/test/visual/material/screenshots/notification/baseline/top-stretch.png and /dev/null differ diff --git a/packages/notification/theme/material/vaadin-lit-notification.js b/packages/notification/theme/material/vaadin-lit-notification.js deleted file mode 100644 index b5dbe7ec817..00000000000 --- a/packages/notification/theme/material/vaadin-lit-notification.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-notification-styles.js'; -import '../../src/vaadin-lit-notification.js'; diff --git a/packages/notification/theme/material/vaadin-notification-styles.js b/packages/notification/theme/material/vaadin-notification-styles.js deleted file mode 100644 index 718a7b8be0f..00000000000 --- a/packages/notification/theme/material/vaadin-notification-styles.js +++ /dev/null @@ -1,149 +0,0 @@ -import '@vaadin/vaadin-material-styles/typography.js'; -import '@vaadin/vaadin-material-styles/shadow.js'; -import { colorDark } from '@vaadin/vaadin-material-styles/color.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-notification-container', - css` - :host { - inset: 0 4px; - } - - @media (min-width: 420px) { - :host { - inset: 0 12px; - } - } - `, - { moduleId: 'material-notification-container' }, -); - -const notificationCard = css` - :host { - min-height: 48px; - margin: 8px 4px; - background-color: transparent; - } - - [part='overlay'] { - background-color: var(--material-background-color); - border-radius: 4px; - box-shadow: var(--material-shadow-elevation-6dp); - padding: 14px 16px; - justify-content: stretch; - } - - [part='content'] { - font-family: var(--material-font-family); - font-size: var(--material-small-font-size); - font-weight: 400; - line-height: 20px; - letter-spacing: 0; - text-transform: none; - box-sizing: border-box; - display: flex; - justify-content: space-between; - align-items: center; - } - - /* NOTE(platosha): Makes the button take exactly 1 line of vertical space */ - [part='content'] ::slotted(vaadin-button) { - margin: -8px 0; - } - - :host([slot$='stretch']) { - margin: 0 -4px; - } - - :host([slot$='stretch']) [part='overlay'] { - border-radius: 0; - } - - @media (min-width: 420px) { - :host { - margin: 24px 12px; - } - - :host([slot^='middle']) { - width: 372px; - margin: auto; - } - - :host([slot$='stretch']) { - margin: 0 -12px; - } - } - - @keyframes material-notification-exit-fade-out { - 100% { - opacity: 0; - } - } - - @keyframes material-notification-enter-fade-in { - 0% { - opacity: 0; - } - - 100% { - opacity: 1; - } - } - - @keyframes material-notification-enter-slide-down { - 0% { - transform: translateY(-200%); - opacity: 0; - } - } - - @keyframes material-notification-exit-slide-up { - 100% { - transform: translateY(-200%); - opacity: 0; - } - } - - @keyframes material-notification-enter-slide-up { - 0% { - transform: translateY(200%); - opacity: 0; - } - } - - @keyframes material-notification-exit-slide-down { - 100% { - transform: translateY(200%); - opacity: 0; - } - } - - :host([slot='middle'][opening]) { - animation: material-notification-enter-fade-in 300ms; - } - - :host([slot='middle'][closing]) { - animation: material-notification-exit-fade-out 300ms; - } - - :host([slot^='top'][opening]) { - animation: material-notification-enter-slide-down 300ms; - } - - :host([slot^='top'][closing]) { - animation: material-notification-exit-slide-up 300ms; - } - - :host([slot^='bottom'][opening]) { - animation: material-notification-enter-slide-up 300ms; - } - - :host([slot^='bottom'][closing]) { - animation: material-notification-exit-slide-down 300ms; - } -`; - -registerStyles('vaadin-notification-card', [colorDark, notificationCard], { - moduleId: 'material-notification-card', -}); diff --git a/packages/notification/theme/material/vaadin-notification.js b/packages/notification/theme/material/vaadin-notification.js deleted file mode 100644 index 040b2f36c5d..00000000000 --- a/packages/notification/theme/material/vaadin-notification.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-notification-styles.js'; -import '../../src/vaadin-notification.js'; diff --git a/packages/number-field/package.json b/packages/number-field/package.json index 5fab9dab81d..7f390b812fa 100644 --- a/packages/number-field/package.json +++ b/packages/number-field/package.json @@ -43,7 +43,6 @@ "@vaadin/field-base": "25.0.0-alpha0", "@vaadin/input-container": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/number-field/test/visual/material/number-field.test.js b/packages/number-field/test/visual/material/number-field.test.js deleted file mode 100644 index 87b855016a1..00000000000 --- a/packages/number-field/test/visual/material/number-field.test.js +++ /dev/null @@ -1,133 +0,0 @@ -import { sendKeys } from '@vaadin/test-runner-commands'; -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../common.js'; -import '../../../theme/material/vaadin-number-field.js'; - -describe('number-field', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - div.style.padding = '10px'; - element = fixtureSync('', div); - }); - - it('basic', async () => { - await visualDiff(div, 'basic'); - }); - - it('disabled', async () => { - element.disabled = true; - await visualDiff(div, 'disabled'); - }); - - it('readonly', async () => { - element.readonly = true; - await visualDiff(div, 'readonly'); - }); - - it('flex', async () => { - div.style.display = 'inline-flex'; - div.style.height = '200px'; - await visualDiff(div, 'flex'); - }); - - it('invalid', async () => { - element.invalid = true; - await visualDiff(div, 'invalid'); - }); - - it('focus-ring', async () => { - await sendKeys({ press: 'Tab' }); - await visualDiff(div, 'focus-ring'); - }); - - ['ltr', 'rtl'].forEach((dir) => { - describe(dir, () => { - before(() => { - document.documentElement.setAttribute('dir', dir); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - it('label', async () => { - element.label = 'Label'; - await visualDiff(div, `${dir}-label`); - }); - - it('placeholder', async () => { - element.placeholder = 'Number'; - await visualDiff(div, `${dir}-placeholder`); - }); - - it('value', async () => { - element.value = 10; - await visualDiff(div, `${dir}-value`); - }); - - it('required', async () => { - element.label = 'Label'; - element.required = true; - await visualDiff(div, `${dir}-required`); - }); - - it('error message', async () => { - element.label = 'Label'; - element.errorMessage = 'This field is required'; - element.required = true; - element.validate(); - await visualDiff(div, `${dir}-error-message`); - }); - - it('helper text', async () => { - element.helperText = 'Helper text'; - await visualDiff(div, `${dir}-helper-text`); - }); - - it('clear button', async () => { - element.value = 10; - element.clearButtonVisible = true; - await visualDiff(div, `${dir}-clear-button`); - }); - - it('prefix slot', async () => { - const span = document.createElement('span'); - span.setAttribute('slot', 'prefix'); - span.textContent = '$'; - element.appendChild(span); - await visualDiff(div, `${dir}-prefix`); - }); - - it('suffix slot', async () => { - const span = document.createElement('span'); - span.setAttribute('slot', 'suffix'); - span.textContent = '$'; - element.appendChild(span); - await visualDiff(div, `${dir}-suffix`); - }); - - it('step buttons visible', async () => { - element.stepButtonsVisible = true; - element.value = 5; - await visualDiff(div, `${dir}-step-buttons-visible`); - }); - - it('step buttons visible disabled', async () => { - element.stepButtonsVisible = true; - element.disabled = true; - await visualDiff(div, `${dir}-step-buttons-visible-disabled`); - }); - - it('step buttons visible disabled value', async () => { - element.stepButtonsVisible = true; - element.value = 1; - element.disabled = true; - await visualDiff(div, `${dir}-step-buttons-visible-disabled-value`); - }); - }); - }); -}); diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/basic.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/basic.png deleted file mode 100644 index b3cd944a483..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/basic.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/disabled.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/disabled.png deleted file mode 100644 index 0c2fb9d66f3..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/disabled.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/flex.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/flex.png deleted file mode 100644 index 06dff432a04..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/flex.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/focus-ring.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/focus-ring.png deleted file mode 100644 index 64e12a20817..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/focus-ring.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/invalid.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/invalid.png deleted file mode 100644 index c2fc05d0d7b..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/invalid.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-clear-button.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-clear-button.png deleted file mode 100644 index 6dc128625d0..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-clear-button.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-error-message.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-error-message.png deleted file mode 100644 index faf6ea9d739..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-error-message.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-helper-text.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-helper-text.png deleted file mode 100644 index 880e69a39c0..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-helper-text.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-label.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-label.png deleted file mode 100644 index 9d52f89b6ba..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-label.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-placeholder.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-placeholder.png deleted file mode 100644 index 56380e1d2a2..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-placeholder.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-prefix.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-prefix.png deleted file mode 100644 index 4f2246c17a1..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-prefix.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-required.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-required.png deleted file mode 100644 index 0d0a1e6ec49..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-required.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-step-buttons-visible-disabled-value.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-step-buttons-visible-disabled-value.png deleted file mode 100644 index e9439988406..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-step-buttons-visible-disabled-value.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-step-buttons-visible-disabled.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-step-buttons-visible-disabled.png deleted file mode 100644 index 0a9ac083f9c..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-step-buttons-visible-disabled.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-step-buttons-visible.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-step-buttons-visible.png deleted file mode 100644 index 5f376d94f41..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-step-buttons-visible.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-suffix.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-suffix.png deleted file mode 100644 index 57c406d1615..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-suffix.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-value.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-value.png deleted file mode 100644 index fb9e1fbc682..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/ltr-value.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/readonly.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/readonly.png deleted file mode 100644 index b3cd944a483..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/readonly.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-clear-button.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-clear-button.png deleted file mode 100644 index 6dc128625d0..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-clear-button.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-error-message.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-error-message.png deleted file mode 100644 index fc6217945fb..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-error-message.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-helper-text.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-helper-text.png deleted file mode 100644 index 0e964527c4f..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-helper-text.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-label.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-label.png deleted file mode 100644 index b254fca89d6..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-label.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-placeholder.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-placeholder.png deleted file mode 100644 index 56380e1d2a2..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-placeholder.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-prefix.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-prefix.png deleted file mode 100644 index 4f2246c17a1..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-prefix.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-required.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-required.png deleted file mode 100644 index 60a8034e08d..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-required.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-step-buttons-visible-disabled-value.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-step-buttons-visible-disabled-value.png deleted file mode 100644 index e65dd3c7382..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-step-buttons-visible-disabled-value.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-step-buttons-visible-disabled.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-step-buttons-visible-disabled.png deleted file mode 100644 index 46e89ea4038..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-step-buttons-visible-disabled.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-step-buttons-visible.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-step-buttons-visible.png deleted file mode 100644 index 5f376d94f41..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-step-buttons-visible.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-suffix.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-suffix.png deleted file mode 100644 index 57c406d1615..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-suffix.png and /dev/null differ diff --git a/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-value.png b/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-value.png deleted file mode 100644 index fb9e1fbc682..00000000000 Binary files a/packages/number-field/test/visual/material/screenshots/number-field/baseline/rtl-value.png and /dev/null differ diff --git a/packages/number-field/theme/material/vaadin-lit-number-field.js b/packages/number-field/theme/material/vaadin-lit-number-field.js deleted file mode 100644 index 03a7d576aca..00000000000 --- a/packages/number-field/theme/material/vaadin-lit-number-field.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-number-field-styles.js'; -import '../../src/vaadin-lit-number-field.js'; diff --git a/packages/number-field/theme/material/vaadin-number-field-styles.js b/packages/number-field/theme/material/vaadin-number-field-styles.js deleted file mode 100644 index fdc473ac7f5..00000000000 --- a/packages/number-field/theme/material/vaadin-number-field-styles.js +++ /dev/null @@ -1,28 +0,0 @@ -/** - * @license - * Copyright (c) 2021 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import '@vaadin/input-container/theme/material/vaadin-input-container-styles.js'; -import { inputFieldShared } from '@vaadin/vaadin-material-styles/mixins/input-field-shared.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const numberField = css` - :host([step-buttons-visible]) ::slotted(input) { - text-align: center; - } - - :host(:not([disabled])) [part$='button'][disabled] { - opacity: 0.2; - } - - [part$='decrease-button'] { - cursor: pointer; - font-size: var(--material-body-font-size); - padding-bottom: 0.21em; - } -`; - -registerStyles('vaadin-number-field', [inputFieldShared, numberField], { - moduleId: 'material-number-field', -}); diff --git a/packages/number-field/theme/material/vaadin-number-field.js b/packages/number-field/theme/material/vaadin-number-field.js deleted file mode 100644 index 4eea2a3126e..00000000000 --- a/packages/number-field/theme/material/vaadin-number-field.js +++ /dev/null @@ -1,7 +0,0 @@ -/** - * @license - * Copyright (c) 2021 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import './vaadin-number-field-styles.js'; -import '../../src/vaadin-number-field.js'; diff --git a/packages/overlay/package.json b/packages/overlay/package.json index 2f9544b8dd4..a604f8e5e46 100644 --- a/packages/overlay/package.json +++ b/packages/overlay/package.json @@ -41,7 +41,6 @@ "@vaadin/a11y-base": "25.0.0-alpha0", "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/overlay/test/visual/material/overlay.test.js b/packages/overlay/test/visual/material/overlay.test.js deleted file mode 100644 index f303b74b4a2..00000000000 --- a/packages/overlay/test/visual/material/overlay.test.js +++ /dev/null @@ -1,28 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-overlay.js'; - -describe('overlay', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.height = '100%'; - - element = fixtureSync('', div); - element.renderer = (root) => { - root.textContent = 'Simple overlay with text'; - }; - }); - - it('basic', async () => { - element.opened = true; - await visualDiff(div, 'basic'); - }); - - it('with-backdrop', async () => { - element.withBackdrop = true; - element.opened = true; - await visualDiff(div, 'with-backdrop'); - }); -}); diff --git a/packages/overlay/test/visual/material/screenshots/overlay/baseline/basic.png b/packages/overlay/test/visual/material/screenshots/overlay/baseline/basic.png deleted file mode 100644 index 376da3a8f56..00000000000 Binary files a/packages/overlay/test/visual/material/screenshots/overlay/baseline/basic.png and /dev/null differ diff --git a/packages/overlay/test/visual/material/screenshots/overlay/baseline/with-backdrop.png b/packages/overlay/test/visual/material/screenshots/overlay/baseline/with-backdrop.png deleted file mode 100644 index e00949a37d7..00000000000 Binary files a/packages/overlay/test/visual/material/screenshots/overlay/baseline/with-backdrop.png and /dev/null differ diff --git a/packages/overlay/theme/material/vaadin-overlay-styles.js b/packages/overlay/theme/material/vaadin-overlay-styles.js deleted file mode 100644 index 020a06cc65e..00000000000 --- a/packages/overlay/theme/material/vaadin-overlay-styles.js +++ /dev/null @@ -1,4 +0,0 @@ -import { overlay } from '@vaadin/vaadin-material-styles/mixins/overlay.js'; -import { registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles('vaadin-overlay', overlay, { moduleId: 'material-vaadin-overlay' }); diff --git a/packages/overlay/theme/material/vaadin-overlay.js b/packages/overlay/theme/material/vaadin-overlay.js deleted file mode 100644 index 20ae982e058..00000000000 --- a/packages/overlay/theme/material/vaadin-overlay.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-overlay-styles.js'; -import '../../src/vaadin-overlay.js'; diff --git a/packages/password-field/package.json b/packages/password-field/package.json index ee5c334b68d..a7b8db951ba 100644 --- a/packages/password-field/package.json +++ b/packages/password-field/package.json @@ -44,7 +44,6 @@ "@vaadin/field-base": "25.0.0-alpha0", "@vaadin/text-field": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/password-field/test/visual/material/password-field.test.js b/packages/password-field/test/visual/material/password-field.test.js deleted file mode 100644 index f2c33b599dd..00000000000 --- a/packages/password-field/test/visual/material/password-field.test.js +++ /dev/null @@ -1,56 +0,0 @@ -import { sendKeys } from '@vaadin/test-runner-commands'; -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../common.js'; -import '../../../theme/material/vaadin-password-field.js'; - -describe('password-field', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - div.style.padding = '10px'; - element = fixtureSync('', div); - }); - - ['ltr', 'rtl'].forEach((dir) => { - describe(dir, () => { - before(() => { - document.documentElement.setAttribute('dir', dir); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - it('basic', async () => { - await visualDiff(div, `${dir}-basic`); - }); - - it('value', async () => { - element.value = 'value'; - await visualDiff(div, `${dir}-value`); - }); - - it('clear button', async () => { - element.value = 'value'; - element.clearButtonVisible = true; - await visualDiff(div, `${dir}-clear-button`); - }); - - it('reveal button hidden', async () => { - element.value = 'value'; - element.revealButtonHidden = true; - await visualDiff(div, `${dir}-reveal-button-hidden`); - }); - - it('reveal button focus', async () => { - element.label = 'Password'; - element.focus(); - await sendKeys({ press: 'Tab' }); - await visualDiff(div, `${dir}-reveal-button-focus`); - }); - }); - }); -}); diff --git a/packages/password-field/test/visual/material/screenshots/password-field/baseline/ltr-basic.png b/packages/password-field/test/visual/material/screenshots/password-field/baseline/ltr-basic.png deleted file mode 100644 index 16a3e637e36..00000000000 Binary files a/packages/password-field/test/visual/material/screenshots/password-field/baseline/ltr-basic.png and /dev/null differ diff --git a/packages/password-field/test/visual/material/screenshots/password-field/baseline/ltr-clear-button.png b/packages/password-field/test/visual/material/screenshots/password-field/baseline/ltr-clear-button.png deleted file mode 100644 index f3c06040a03..00000000000 Binary files a/packages/password-field/test/visual/material/screenshots/password-field/baseline/ltr-clear-button.png and /dev/null differ diff --git a/packages/password-field/test/visual/material/screenshots/password-field/baseline/ltr-reveal-button-focus.png b/packages/password-field/test/visual/material/screenshots/password-field/baseline/ltr-reveal-button-focus.png deleted file mode 100644 index e64122be61c..00000000000 Binary files a/packages/password-field/test/visual/material/screenshots/password-field/baseline/ltr-reveal-button-focus.png and /dev/null differ diff --git a/packages/password-field/test/visual/material/screenshots/password-field/baseline/ltr-reveal-button-hidden.png b/packages/password-field/test/visual/material/screenshots/password-field/baseline/ltr-reveal-button-hidden.png deleted file mode 100644 index 7e6b366afb0..00000000000 Binary files a/packages/password-field/test/visual/material/screenshots/password-field/baseline/ltr-reveal-button-hidden.png and /dev/null differ diff --git a/packages/password-field/test/visual/material/screenshots/password-field/baseline/ltr-value.png b/packages/password-field/test/visual/material/screenshots/password-field/baseline/ltr-value.png deleted file mode 100644 index e585edc47ee..00000000000 Binary files a/packages/password-field/test/visual/material/screenshots/password-field/baseline/ltr-value.png and /dev/null differ diff --git a/packages/password-field/test/visual/material/screenshots/password-field/baseline/rtl-basic.png b/packages/password-field/test/visual/material/screenshots/password-field/baseline/rtl-basic.png deleted file mode 100644 index df254737b67..00000000000 Binary files a/packages/password-field/test/visual/material/screenshots/password-field/baseline/rtl-basic.png and /dev/null differ diff --git a/packages/password-field/test/visual/material/screenshots/password-field/baseline/rtl-clear-button.png b/packages/password-field/test/visual/material/screenshots/password-field/baseline/rtl-clear-button.png deleted file mode 100644 index 0027fbd206c..00000000000 Binary files a/packages/password-field/test/visual/material/screenshots/password-field/baseline/rtl-clear-button.png and /dev/null differ diff --git a/packages/password-field/test/visual/material/screenshots/password-field/baseline/rtl-reveal-button-focus.png b/packages/password-field/test/visual/material/screenshots/password-field/baseline/rtl-reveal-button-focus.png deleted file mode 100644 index a4d6c2d23e1..00000000000 Binary files a/packages/password-field/test/visual/material/screenshots/password-field/baseline/rtl-reveal-button-focus.png and /dev/null differ diff --git a/packages/password-field/test/visual/material/screenshots/password-field/baseline/rtl-reveal-button-hidden.png b/packages/password-field/test/visual/material/screenshots/password-field/baseline/rtl-reveal-button-hidden.png deleted file mode 100644 index fdeed7acf96..00000000000 Binary files a/packages/password-field/test/visual/material/screenshots/password-field/baseline/rtl-reveal-button-hidden.png and /dev/null differ diff --git a/packages/password-field/test/visual/material/screenshots/password-field/baseline/rtl-value.png b/packages/password-field/test/visual/material/screenshots/password-field/baseline/rtl-value.png deleted file mode 100644 index f9c3b30bf46..00000000000 Binary files a/packages/password-field/test/visual/material/screenshots/password-field/baseline/rtl-value.png and /dev/null differ diff --git a/packages/password-field/theme/material/vaadin-lit-password-field.js b/packages/password-field/theme/material/vaadin-lit-password-field.js deleted file mode 100644 index ed03faf9e72..00000000000 --- a/packages/password-field/theme/material/vaadin-lit-password-field.js +++ /dev/null @@ -1,9 +0,0 @@ -/** - * @license - * Copyright (c) 2021 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import '@vaadin/text-field/theme/material/vaadin-text-field-styles.js'; -import './vaadin-password-field-button-styles.js'; -import './vaadin-password-field-styles.js'; -import '../../src/vaadin-lit-password-field.js'; diff --git a/packages/password-field/theme/material/vaadin-password-field-button-styles.js b/packages/password-field/theme/material/vaadin-password-field-button-styles.js deleted file mode 100644 index 151421eeba0..00000000000 --- a/packages/password-field/theme/material/vaadin-password-field-button-styles.js +++ /dev/null @@ -1,37 +0,0 @@ -/** - * @license - * Copyright (c) 2021 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import { button } from '@vaadin/button/theme/material/vaadin-button-styles.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const passwordFieldButton = css` - :host { - position: absolute; - right: 0; - top: 0; - margin: 0; - padding: 0; - width: 100%; - height: 100%; - min-width: auto; - background: transparent; - outline: none; - border-radius: 50%; - overflow: visible; - } - - :host::before { - transform: scale(1.5); - } - - /* Disable ripple */ - :host::after { - display: none; - } -`; - -registerStyles('vaadin-password-field-button', [button, passwordFieldButton], { - moduleId: 'material-password-field-button', -}); diff --git a/packages/password-field/theme/material/vaadin-password-field-styles.js b/packages/password-field/theme/material/vaadin-password-field-styles.js deleted file mode 100644 index 6a8a240fd68..00000000000 --- a/packages/password-field/theme/material/vaadin-password-field-styles.js +++ /dev/null @@ -1,43 +0,0 @@ -/** - * @license - * Copyright (c) 2021 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/font-icons.js'; -import { inputFieldShared } from '@vaadin/vaadin-material-styles/mixins/input-field-shared.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const passwordField = css` - [part='reveal-button']::before { - content: var(--material-icons-eye); - } - - :host([password-visible]) [part='reveal-button']::before { - content: var(--material-icons-eye-disabled); - } - - /* The reveal button works also in readonly mode */ - :host([readonly]) [part$='button'] { - color: var(--material-secondary-text-color); - } - - [part='reveal-button'] { - position: relative; - cursor: pointer; - } - - [part='reveal-button']:hover { - color: var(--material-text-color); - } - - [part='reveal-button'][hidden] { - display: none !important; - } - - :host([focused]) ::slotted([slot='reveal'])::before { - background-color: var(--material-primary-text-color); - } -`; - -registerStyles('vaadin-password-field', [inputFieldShared, passwordField], { moduleId: 'material-password-field' }); diff --git a/packages/password-field/theme/material/vaadin-password-field.js b/packages/password-field/theme/material/vaadin-password-field.js deleted file mode 100644 index 5db2c978721..00000000000 --- a/packages/password-field/theme/material/vaadin-password-field.js +++ /dev/null @@ -1,9 +0,0 @@ -/** - * @license - * Copyright (c) 2021 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import '@vaadin/text-field/theme/material/vaadin-text-field.js'; -import './vaadin-password-field-button-styles.js'; -import './vaadin-password-field-styles.js'; -import '../../src/vaadin-password-field.js'; diff --git a/packages/popover/package.json b/packages/popover/package.json index 5a1a37d264c..2f265bada6e 100644 --- a/packages/popover/package.json +++ b/packages/popover/package.json @@ -42,7 +42,6 @@ "@vaadin/lit-renderer": "25.0.0-alpha0", "@vaadin/overlay": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/popover/test/visual/material/popover.test.js b/packages/popover/test/visual/material/popover.test.js deleted file mode 100644 index ab9268e820e..00000000000 --- a/packages/popover/test/visual/material/popover.test.js +++ /dev/null @@ -1,63 +0,0 @@ -import { fixtureSync, nextRender, nextUpdate } from '@vaadin/testing-helpers'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '@vaadin/vaadin-lumo-styles/test/autoload.js'; -import '../../not-animated-styles.js'; -import '../../../theme/material/vaadin-popover.js'; - -describe('popover', () => { - let div, target, element; - - beforeEach(async () => { - element = fixtureSync(''); - element.renderer = (root) => { - root.textContent = 'Content'; - }; - div = fixtureSync(` -
-
-
- `); - target = div.firstElementChild; - element.target = target; - await nextRender(); - }); - - [ - 'top-start', - 'top', - 'top-end', - 'bottom-start', - 'bottom', - 'bottom-end', - 'start-top', - 'start', - 'start-bottom', - 'end-top', - 'end', - 'end-bottom', - ].forEach((position) => { - it(position, async () => { - element.position = position; - await nextUpdate(element); - target.click(); - await nextRender(); - await visualDiff(div, position); - }); - - it(`${position} pointer arrow`, async () => { - element.setAttribute('theme', 'arrow'); - element.position = position; - await nextUpdate(element); - target.click(); - await nextRender(); - await visualDiff(div, `${position}-arrow`); - }); - }); - - it('no-padding', async () => { - element.setAttribute('theme', 'no-padding'); - target.click(); - await nextRender(); - await visualDiff(div, 'no-padding'); - }); -}); diff --git a/packages/popover/test/visual/material/screenshots/popover/baseline/bottom-arrow.png b/packages/popover/test/visual/material/screenshots/popover/baseline/bottom-arrow.png deleted file mode 100644 index c601c01cbf3..00000000000 Binary files a/packages/popover/test/visual/material/screenshots/popover/baseline/bottom-arrow.png and /dev/null differ diff --git a/packages/popover/test/visual/material/screenshots/popover/baseline/bottom-end-arrow.png b/packages/popover/test/visual/material/screenshots/popover/baseline/bottom-end-arrow.png deleted file mode 100644 index 4a982cca221..00000000000 Binary files a/packages/popover/test/visual/material/screenshots/popover/baseline/bottom-end-arrow.png and /dev/null differ diff --git a/packages/popover/test/visual/material/screenshots/popover/baseline/bottom-end.png b/packages/popover/test/visual/material/screenshots/popover/baseline/bottom-end.png deleted file mode 100644 index b37c69c3363..00000000000 Binary files a/packages/popover/test/visual/material/screenshots/popover/baseline/bottom-end.png and /dev/null differ diff --git a/packages/popover/test/visual/material/screenshots/popover/baseline/bottom-start-arrow.png b/packages/popover/test/visual/material/screenshots/popover/baseline/bottom-start-arrow.png deleted file mode 100644 index bd430171bca..00000000000 Binary files a/packages/popover/test/visual/material/screenshots/popover/baseline/bottom-start-arrow.png and /dev/null differ diff --git a/packages/popover/test/visual/material/screenshots/popover/baseline/bottom-start.png b/packages/popover/test/visual/material/screenshots/popover/baseline/bottom-start.png deleted file mode 100644 index 54f7aac85a3..00000000000 Binary files a/packages/popover/test/visual/material/screenshots/popover/baseline/bottom-start.png and /dev/null differ diff --git a/packages/popover/test/visual/material/screenshots/popover/baseline/bottom.png b/packages/popover/test/visual/material/screenshots/popover/baseline/bottom.png deleted file mode 100644 index 30aeeab7669..00000000000 Binary files a/packages/popover/test/visual/material/screenshots/popover/baseline/bottom.png and /dev/null differ diff --git a/packages/popover/test/visual/material/screenshots/popover/baseline/end-arrow.png b/packages/popover/test/visual/material/screenshots/popover/baseline/end-arrow.png deleted file mode 100644 index dd5b8c6b431..00000000000 Binary files a/packages/popover/test/visual/material/screenshots/popover/baseline/end-arrow.png and /dev/null differ diff --git a/packages/popover/test/visual/material/screenshots/popover/baseline/end-bottom-arrow.png b/packages/popover/test/visual/material/screenshots/popover/baseline/end-bottom-arrow.png deleted file mode 100644 index e79333af22c..00000000000 Binary files a/packages/popover/test/visual/material/screenshots/popover/baseline/end-bottom-arrow.png and /dev/null differ diff --git a/packages/popover/test/visual/material/screenshots/popover/baseline/end-bottom.png b/packages/popover/test/visual/material/screenshots/popover/baseline/end-bottom.png deleted file mode 100644 index f95fc13357c..00000000000 Binary files a/packages/popover/test/visual/material/screenshots/popover/baseline/end-bottom.png and /dev/null differ diff --git a/packages/popover/test/visual/material/screenshots/popover/baseline/end-top-arrow.png b/packages/popover/test/visual/material/screenshots/popover/baseline/end-top-arrow.png deleted file mode 100644 index b8464d41db1..00000000000 Binary files a/packages/popover/test/visual/material/screenshots/popover/baseline/end-top-arrow.png and /dev/null differ diff --git a/packages/popover/test/visual/material/screenshots/popover/baseline/end-top.png b/packages/popover/test/visual/material/screenshots/popover/baseline/end-top.png deleted file mode 100644 index 2fb335e484e..00000000000 Binary files a/packages/popover/test/visual/material/screenshots/popover/baseline/end-top.png and /dev/null differ diff --git a/packages/popover/test/visual/material/screenshots/popover/baseline/end.png b/packages/popover/test/visual/material/screenshots/popover/baseline/end.png deleted file mode 100644 index 18499675af5..00000000000 Binary files a/packages/popover/test/visual/material/screenshots/popover/baseline/end.png and /dev/null differ diff --git a/packages/popover/test/visual/material/screenshots/popover/baseline/no-padding.png b/packages/popover/test/visual/material/screenshots/popover/baseline/no-padding.png deleted file mode 100644 index 5f6341e496a..00000000000 Binary files a/packages/popover/test/visual/material/screenshots/popover/baseline/no-padding.png and /dev/null differ diff --git a/packages/popover/test/visual/material/screenshots/popover/baseline/start-arrow.png b/packages/popover/test/visual/material/screenshots/popover/baseline/start-arrow.png deleted file mode 100644 index ede60098721..00000000000 Binary files a/packages/popover/test/visual/material/screenshots/popover/baseline/start-arrow.png and /dev/null differ diff --git a/packages/popover/test/visual/material/screenshots/popover/baseline/start-bottom-arrow.png b/packages/popover/test/visual/material/screenshots/popover/baseline/start-bottom-arrow.png deleted file mode 100644 index 485d24b7521..00000000000 Binary files a/packages/popover/test/visual/material/screenshots/popover/baseline/start-bottom-arrow.png and /dev/null differ diff --git a/packages/popover/test/visual/material/screenshots/popover/baseline/start-bottom.png b/packages/popover/test/visual/material/screenshots/popover/baseline/start-bottom.png deleted file mode 100644 index 646f47eb03d..00000000000 Binary files a/packages/popover/test/visual/material/screenshots/popover/baseline/start-bottom.png and /dev/null differ diff --git a/packages/popover/test/visual/material/screenshots/popover/baseline/start-top-arrow.png b/packages/popover/test/visual/material/screenshots/popover/baseline/start-top-arrow.png deleted file mode 100644 index 42d3c4c12f7..00000000000 Binary files a/packages/popover/test/visual/material/screenshots/popover/baseline/start-top-arrow.png and /dev/null differ diff --git a/packages/popover/test/visual/material/screenshots/popover/baseline/start-top.png b/packages/popover/test/visual/material/screenshots/popover/baseline/start-top.png deleted file mode 100644 index 494ba3b6460..00000000000 Binary files a/packages/popover/test/visual/material/screenshots/popover/baseline/start-top.png and /dev/null differ diff --git a/packages/popover/test/visual/material/screenshots/popover/baseline/start.png b/packages/popover/test/visual/material/screenshots/popover/baseline/start.png deleted file mode 100644 index 7af2b69e1a9..00000000000 Binary files a/packages/popover/test/visual/material/screenshots/popover/baseline/start.png and /dev/null differ diff --git a/packages/popover/test/visual/material/screenshots/popover/baseline/top-arrow.png b/packages/popover/test/visual/material/screenshots/popover/baseline/top-arrow.png deleted file mode 100644 index d7fac6ad6f6..00000000000 Binary files a/packages/popover/test/visual/material/screenshots/popover/baseline/top-arrow.png and /dev/null differ diff --git a/packages/popover/test/visual/material/screenshots/popover/baseline/top-end-arrow.png b/packages/popover/test/visual/material/screenshots/popover/baseline/top-end-arrow.png deleted file mode 100644 index d3892ee291f..00000000000 Binary files a/packages/popover/test/visual/material/screenshots/popover/baseline/top-end-arrow.png and /dev/null differ diff --git a/packages/popover/test/visual/material/screenshots/popover/baseline/top-end.png b/packages/popover/test/visual/material/screenshots/popover/baseline/top-end.png deleted file mode 100644 index ccedd428241..00000000000 Binary files a/packages/popover/test/visual/material/screenshots/popover/baseline/top-end.png and /dev/null differ diff --git a/packages/popover/test/visual/material/screenshots/popover/baseline/top-start-arrow.png b/packages/popover/test/visual/material/screenshots/popover/baseline/top-start-arrow.png deleted file mode 100644 index fe3a47002c9..00000000000 Binary files a/packages/popover/test/visual/material/screenshots/popover/baseline/top-start-arrow.png and /dev/null differ diff --git a/packages/popover/test/visual/material/screenshots/popover/baseline/top-start.png b/packages/popover/test/visual/material/screenshots/popover/baseline/top-start.png deleted file mode 100644 index c1db3baa16a..00000000000 Binary files a/packages/popover/test/visual/material/screenshots/popover/baseline/top-start.png and /dev/null differ diff --git a/packages/popover/test/visual/material/screenshots/popover/baseline/top.png b/packages/popover/test/visual/material/screenshots/popover/baseline/top.png deleted file mode 100644 index fe7cfdc7068..00000000000 Binary files a/packages/popover/test/visual/material/screenshots/popover/baseline/top.png and /dev/null differ diff --git a/packages/popover/theme/material/vaadin-popover-styles.js b/packages/popover/theme/material/vaadin-popover-styles.js deleted file mode 100644 index 4bfe97f2e53..00000000000 --- a/packages/popover/theme/material/vaadin-popover-styles.js +++ /dev/null @@ -1,108 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import { overlay } from '@vaadin/vaadin-material-styles/mixins/overlay.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const popoverOverlay = css` - :host { - --vaadin-popover-offset-top: var(--_vaadin-popover-default-offset); - --vaadin-popover-offset-bottom: var(--_vaadin-popover-default-offset); - --vaadin-popover-offset-start: var(--_vaadin-popover-default-offset); - --vaadin-popover-offset-end: var(--_vaadin-popover-default-offset); - --vaadin-popover-arrow-size: 0.5rem; - --_vaadin-popover-default-offset: 0.25rem; - } - - [part='overlay'] { - outline: none; - } - - [part='content'] { - padding: 0.25rem 0.5rem; - } - - :host([theme~='no-padding']) [part='content'] { - padding: 0; - } - - :host([theme~='arrow']) { - --_vaadin-popover-default-offset: calc(0.25rem + var(--vaadin-popover-arrow-size) / 1.25); - } - - /* top / bottom position */ - :host([theme~='arrow'][position^='top']) [part='arrow'], - :host([theme~='arrow'][position^='bottom']) [part='arrow'] { - border-left: var(--vaadin-popover-arrow-size) solid transparent; - border-right: var(--vaadin-popover-arrow-size) solid transparent; - } - - :host([theme~='arrow'][position^='bottom'][bottom-aligned]) [part='arrow'], - :host([theme~='arrow'][position^='top'][bottom-aligned]) [part='arrow'] { - bottom: calc(var(--vaadin-popover-arrow-size) * -1); - border-top: var(--vaadin-popover-arrow-size) solid var(--material-background-color); - filter: drop-shadow(0 2px 1px rgba(0, 0, 0, 0.14)); - } - - :host([theme~='arrow'][position^='bottom'][top-aligned]) [part='arrow'], - :host([theme~='arrow'][position^='top'][top-aligned]) [part='arrow'] { - top: calc(var(--vaadin-popover-arrow-size) * -1); - border-bottom: var(--vaadin-popover-arrow-size) solid var(--material-background-color); - filter: drop-shadow(0 -2px 1px rgba(0, 0, 0, 0.14)); - } - - :host([theme~='arrow'][position^='bottom'][start-aligned]) [part='arrow'], - :host([theme~='arrow'][position^='top'][start-aligned]) [part='arrow'] { - transform: translateX(-50%); - inset-inline-start: 1.5rem; - } - - :host([theme~='arrow'][position^='bottom'][end-aligned]) [part='arrow'], - :host([theme~='arrow'][position^='top'][end-aligned]) [part='arrow'] { - transform: translateX(50%); - inset-inline-end: 1.5rem; - } - - :host([theme~='arrow'][position^='bottom'][arrow-centered]) [part='arrow'], - :host([theme~='arrow'][position^='top'][arrow-centered]) [part='arrow'] { - transform: translateX(-50%); - inset-inline-start: 50%; - } - - /* start / end position */ - :host([theme~='arrow'][position^='start']) [part='arrow'], - :host([theme~='arrow'][position^='end']) [part='arrow'] { - border-top: var(--vaadin-popover-arrow-size) solid transparent; - border-bottom: var(--vaadin-popover-arrow-size) solid transparent; - } - - :host([theme~='arrow'][position^='start'][start-aligned]) [part='arrow'], - :host([theme~='arrow'][position^='end'][start-aligned]) [part='arrow'] { - inset-inline-start: calc(var(--vaadin-popover-arrow-size) * -1); - border-right: var(--vaadin-popover-arrow-size) solid var(--material-background-color); - filter: drop-shadow(-2px 0 1px rgba(0, 0, 0, 0.14)); - } - - :host([theme~='arrow'][position^='start'][end-aligned]) [part='arrow'], - :host([theme~='arrow'][position^='end'][end-aligned]) [part='arrow'] { - inset-inline-end: calc(var(--vaadin-popover-arrow-size) * -1); - border-left: var(--vaadin-popover-arrow-size) solid var(--material-background-color); - filter: drop-shadow(2px 0 1px rgba(0, 0, 0, 0.14)); - } - - :host([theme~='arrow'][position^='start'][top-aligned]) [part='arrow'], - :host([theme~='arrow'][position^='end'][top-aligned]) [part='arrow'] { - top: 0.5rem; - } - - :host([theme~='arrow'][position='start'][top-aligned]) [part='arrow'], - :host([theme~='arrow'][position='end'][top-aligned]) [part='arrow'] { - top: 50%; - transform: translateY(-50%); - } - - :host([theme~='arrow'][position^='start'][bottom-aligned]) [part='arrow'], - :host([theme~='arrow'][position^='end'][bottom-aligned]) [part='arrow'] { - bottom: 0.5rem; - } -`; - -registerStyles('vaadin-popover-overlay', [overlay, popoverOverlay], { moduleId: 'material-popover-overlay' }); diff --git a/packages/popover/theme/material/vaadin-popover.js b/packages/popover/theme/material/vaadin-popover.js deleted file mode 100644 index 2226530cf6e..00000000000 --- a/packages/popover/theme/material/vaadin-popover.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-popover-styles.js'; -import '../../src/vaadin-popover.js'; diff --git a/packages/progress-bar/package.json b/packages/progress-bar/package.json index 3fa4ec50fd4..b53452fa25f 100644 --- a/packages/progress-bar/package.json +++ b/packages/progress-bar/package.json @@ -40,7 +40,6 @@ "@polymer/polymer": "^3.0.0", "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/progress-bar/test/visual/material/progress-bar.test.js b/packages/progress-bar/test/visual/material/progress-bar.test.js deleted file mode 100644 index 792f5a719c7..00000000000 --- a/packages/progress-bar/test/visual/material/progress-bar.test.js +++ /dev/null @@ -1,23 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-progress-bar.js'; - -describe('progress-bar', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - div.style.width = '200px'; - element = fixtureSync('', div); - }); - - it('basic', async () => { - await visualDiff(div, 'basic'); - }); - - it('RTL', async () => { - element.setAttribute('dir', 'rtl'); - await visualDiff(div, 'rtl-basic'); - }); -}); diff --git a/packages/progress-bar/test/visual/material/screenshots/progress-bar/baseline/basic.png b/packages/progress-bar/test/visual/material/screenshots/progress-bar/baseline/basic.png deleted file mode 100644 index 4acc4190327..00000000000 Binary files a/packages/progress-bar/test/visual/material/screenshots/progress-bar/baseline/basic.png and /dev/null differ diff --git a/packages/progress-bar/test/visual/material/screenshots/progress-bar/baseline/rtl-basic.png b/packages/progress-bar/test/visual/material/screenshots/progress-bar/baseline/rtl-basic.png deleted file mode 100644 index 0b83da1b603..00000000000 Binary files a/packages/progress-bar/test/visual/material/screenshots/progress-bar/baseline/rtl-basic.png and /dev/null differ diff --git a/packages/progress-bar/theme/material/vaadin-lit-progress-bar.js b/packages/progress-bar/theme/material/vaadin-lit-progress-bar.js deleted file mode 100644 index 2988daecddf..00000000000 --- a/packages/progress-bar/theme/material/vaadin-lit-progress-bar.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-progress-bar-styles.js'; -import '../../src/vaadin-lit-progress-bar.js'; diff --git a/packages/progress-bar/theme/material/vaadin-progress-bar-styles.js b/packages/progress-bar/theme/material/vaadin-progress-bar-styles.js deleted file mode 100644 index e5544ca1ed1..00000000000 --- a/packages/progress-bar/theme/material/vaadin-progress-bar-styles.js +++ /dev/null @@ -1,118 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-progress-bar', - css` - :host { - height: 4px; - margin: 8px 0; - position: relative; - overflow: hidden; - } - - :host::before { - content: ''; - display: block; - height: 100%; - background-color: var(--material-primary-color); - opacity: 0.16; - } - - [part='bar'] { - position: absolute; - top: 0; - width: 100%; - transform: scaleX(var(--vaadin-progress-value)); - transform-origin: 0 0; - } - - [part='value'] { - transform: none; - background-color: var(--material-primary-color); - } - - /* Indeterminate */ - - :host([indeterminate]) [part='bar'] { - left: -100%; - animation: primary-indeterminate-translate 2s infinite linear; - } - - :host([indeterminate]) [part='value'] { - animation: primary-indeterminate-scale 2s infinite linear; - } - - @keyframes primary-indeterminate-translate { - 0% { - transform: translateX(0); - } - - 20% { - animation-timing-function: cubic-bezier(0.5, 0, 0.701732, 0.495819); - transform: translateX(0); - } - - 59.15% { - animation-timing-function: cubic-bezier(0.302435, 0.381352, 0.55, 0.956352); - transform: translateX(83.67142%); - } - - 100% { - transform: translateX(200.611057%); - } - } - - @keyframes primary-indeterminate-scale { - 0% { - transform: scaleX(0.08); - } - - 36.65% { - animation-timing-function: cubic-bezier(0.334731, 0.12482, 0.785844, 1); - transform: scaleX(0.08); - } - - 69.15% { - animation-timing-function: cubic-bezier(0.06, 0.11, 0.6, 1); - transform: scaleX(0.661479); - } - - 100% { - transform: scaleX(0.08); - } - } - - /* RTL specific styles */ - :host([dir='rtl']) [part='bar'] { - transform-origin: 100% 0; - } - - :host([indeterminate][dir='rtl']) [part='bar'] { - left: auto; - right: -100%; - animation: primary-indeterminate-translate-rtl 2s infinite linear; - } - - @keyframes primary-indeterminate-translate-rtl { - 0% { - transform: translateX(0); - } - - 20% { - animation-timing-function: cubic-bezier(0.5, 0, 0.701732, 0.495819); - transform: translateX(0); - } - - 59.15% { - animation-timing-function: cubic-bezier(0.302435, 0.381352, 0.55, 0.956352); - transform: translateX(-83.67142%); - } - - 100% { - transform: translateX(-200.611057%); - } - } - `, - { moduleId: 'material-progress-bar' }, -); diff --git a/packages/progress-bar/theme/material/vaadin-progress-bar.js b/packages/progress-bar/theme/material/vaadin-progress-bar.js deleted file mode 100644 index f1b82705720..00000000000 --- a/packages/progress-bar/theme/material/vaadin-progress-bar.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-progress-bar-styles.js'; -import '../../src/vaadin-progress-bar.js'; diff --git a/packages/radio-group/package.json b/packages/radio-group/package.json index 119c1de1b1f..c36550abe02 100644 --- a/packages/radio-group/package.json +++ b/packages/radio-group/package.json @@ -43,7 +43,6 @@ "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/field-base": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/radio-group/test/visual/material/radio-button.test.js b/packages/radio-group/test/visual/material/radio-button.test.js deleted file mode 100644 index 22707c707e2..00000000000 --- a/packages/radio-group/test/visual/material/radio-button.test.js +++ /dev/null @@ -1,74 +0,0 @@ -import { sendKeys } from '@vaadin/test-runner-commands'; -import { fixtureSync } from '@vaadin/testing-helpers'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-radio-button.js'; - -describe('radio-button', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - div.style.padding = '10px'; - element = fixtureSync('', div); - }); - - it('basic', async () => { - await visualDiff(div, 'basic'); - }); - - it('empty', async () => { - element.label = ''; - await visualDiff(div, 'empty'); - }); - - it('checked', async () => { - element.checked = true; - await visualDiff(div, 'checked'); - }); - - it('focus-ring', async () => { - await sendKeys({ press: 'Tab' }); - await visualDiff(div, 'focus-ring'); - }); - - it('checked focus-ring', async () => { - element.checked = true; - await sendKeys({ press: 'Tab' }); - await visualDiff(div, 'checked-focus-ring'); - }); - - describe('disabled', () => { - beforeEach(() => { - element.disabled = true; - }); - - it('basic', async () => { - await visualDiff(div, 'disabled'); - }); - - it('checked', async () => { - element.checked = true; - await visualDiff(div, 'disabled-checked'); - }); - }); - - describe('RTL', () => { - before(() => { - document.documentElement.setAttribute('dir', 'rtl'); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - it('basic', async () => { - await visualDiff(div, 'rtl'); - }); - - it('empty', async () => { - element.label = ''; - await visualDiff(div, 'rtl-empty'); - }); - }); -}); diff --git a/packages/radio-group/test/visual/material/radio-group.test.js b/packages/radio-group/test/visual/material/radio-group.test.js deleted file mode 100644 index 175d07435f6..00000000000 --- a/packages/radio-group/test/visual/material/radio-group.test.js +++ /dev/null @@ -1,127 +0,0 @@ -import { sendKeys } from '@vaadin/test-runner-commands'; -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../common.js'; -import '../../../theme/material/vaadin-radio-group.js'; - -describe('radio-group', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - div.style.padding = '10px'; - - element = fixtureSync( - ` - - - - - - `, - div, - ); - }); - - describe('default', () => { - it('basic', async () => { - await visualDiff(div, 'basic'); - }); - - it('disabled', async () => { - element.disabled = true; - await visualDiff(div, 'disabled'); - }); - - it('vertical', async () => { - element.setAttribute('theme', 'vertical'); - await visualDiff(div, 'vertical'); - }); - - it('label', async () => { - element.label = 'Label'; - await visualDiff(div, 'label'); - }); - - it('label focused', async () => { - element.label = 'Label'; - await sendKeys({ press: 'Tab' }); - await visualDiff(div, 'label-focused'); - }); - - it('label disabled', async () => { - element.label = 'Label'; - element.disabled = true; - await visualDiff(div, 'label-disabled'); - }); - - it('value', async () => { - element.value = 'a'; - await visualDiff(div, 'value'); - }); - - it('required', async () => { - element.label = 'Label'; - element.required = true; - await visualDiff(div, 'required'); - }); - - it('error message', async () => { - element.label = 'Label'; - element.errorMessage = 'This field is required'; - element.required = true; - element.validate(); - await visualDiff(div, 'error-message'); - }); - - it('helper text', async () => { - element.helperText = 'Helper text'; - await visualDiff(div, 'helper-text'); - }); - - it('wrapped', async () => { - element.style.width = '150px'; - await visualDiff(div, 'wrapped'); - }); - - it('full width', async () => { - div.style.width = '300px'; - div.style.padding = '0'; - element.style.width = '100%'; - element.querySelectorAll('vaadin-radio-button').forEach((radio) => { - radio.style.width = '33%'; - // Compensate inline-block whitespace - radio.style.marginRight = '-3px'; - }); - await visualDiff(div, 'full-width'); - }); - }); - - describe('RTL', () => { - before(() => { - document.documentElement.setAttribute('dir', 'rtl'); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - it('RTL basic', async () => { - await visualDiff(div, 'rtl-basic'); - }); - - it('RTL error message', async () => { - element.label = 'Label'; - element.errorMessage = 'This field is required'; - element.required = true; - element.validate(); - await visualDiff(div, 'rtl-error-message'); - }); - - it('RTL wrapped', async () => { - element.style.width = '150px'; - await visualDiff(div, 'rtl-wrapped'); - }); - }); -}); diff --git a/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/basic.png b/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/basic.png deleted file mode 100644 index 4805253faa9..00000000000 Binary files a/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/basic.png and /dev/null differ diff --git a/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/checked-focus-ring.png b/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/checked-focus-ring.png deleted file mode 100644 index e4c1f248a4d..00000000000 Binary files a/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/checked-focus-ring.png and /dev/null differ diff --git a/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/checked.png b/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/checked.png deleted file mode 100644 index a36c7a958a9..00000000000 Binary files a/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/checked.png and /dev/null differ diff --git a/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/disabled-checked.png b/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/disabled-checked.png deleted file mode 100644 index 1ec1814349e..00000000000 Binary files a/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/disabled-checked.png and /dev/null differ diff --git a/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/disabled.png b/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/disabled.png deleted file mode 100644 index 4c196109f0b..00000000000 Binary files a/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/disabled.png and /dev/null differ diff --git a/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/empty.png b/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/empty.png deleted file mode 100644 index 4c100b368a2..00000000000 Binary files a/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/empty.png and /dev/null differ diff --git a/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/focus-ring.png b/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/focus-ring.png deleted file mode 100644 index b464937d1d0..00000000000 Binary files a/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/focus-ring.png and /dev/null differ diff --git a/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/rtl-empty.png b/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/rtl-empty.png deleted file mode 100644 index 4c100b368a2..00000000000 Binary files a/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/rtl-empty.png and /dev/null differ diff --git a/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/rtl.png b/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/rtl.png deleted file mode 100644 index 2e71411e880..00000000000 Binary files a/packages/radio-group/test/visual/material/screenshots/radio-button/baseline/rtl.png and /dev/null differ diff --git a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/basic.png b/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/basic.png deleted file mode 100644 index 22de210fa03..00000000000 Binary files a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/basic.png and /dev/null differ diff --git a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/disabled.png b/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/disabled.png deleted file mode 100644 index 8ddd5be2e0f..00000000000 Binary files a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/disabled.png and /dev/null differ diff --git a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/error-message.png b/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/error-message.png deleted file mode 100644 index b0a46866039..00000000000 Binary files a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/error-message.png and /dev/null differ diff --git a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/full-width.png b/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/full-width.png deleted file mode 100644 index d67450b45c5..00000000000 Binary files a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/full-width.png and /dev/null differ diff --git a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/helper-text.png b/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/helper-text.png deleted file mode 100644 index a60c321cb26..00000000000 Binary files a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/helper-text.png and /dev/null differ diff --git a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/label-disabled.png b/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/label-disabled.png deleted file mode 100644 index 0a8607592f6..00000000000 Binary files a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/label-disabled.png and /dev/null differ diff --git a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/label-focused.png b/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/label-focused.png deleted file mode 100644 index 88de4622610..00000000000 Binary files a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/label-focused.png and /dev/null differ diff --git a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/label.png b/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/label.png deleted file mode 100644 index 26a9c260175..00000000000 Binary files a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/label.png and /dev/null differ diff --git a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/required.png b/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/required.png deleted file mode 100644 index bb7d1b09c1f..00000000000 Binary files a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/required.png and /dev/null differ diff --git a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/rtl-basic.png b/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/rtl-basic.png deleted file mode 100644 index dfc4069a9cb..00000000000 Binary files a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/rtl-basic.png and /dev/null differ diff --git a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/rtl-error-message.png b/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/rtl-error-message.png deleted file mode 100644 index 29c804c687b..00000000000 Binary files a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/rtl-error-message.png and /dev/null differ diff --git a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/rtl-wrapped.png b/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/rtl-wrapped.png deleted file mode 100644 index 980de314ef5..00000000000 Binary files a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/rtl-wrapped.png and /dev/null differ diff --git a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/value.png b/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/value.png deleted file mode 100644 index a5c55f820ef..00000000000 Binary files a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/value.png and /dev/null differ diff --git a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/vertical.png b/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/vertical.png deleted file mode 100644 index 7fe65cf1e0b..00000000000 Binary files a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/vertical.png and /dev/null differ diff --git a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/wrapped.png b/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/wrapped.png deleted file mode 100644 index fa6cea37e5c..00000000000 Binary files a/packages/radio-group/test/visual/material/screenshots/radio-group/baseline/wrapped.png and /dev/null differ diff --git a/packages/radio-group/theme/material/vaadin-lit-radio-button.js b/packages/radio-group/theme/material/vaadin-lit-radio-button.js deleted file mode 100644 index 7a4fedf4b14..00000000000 --- a/packages/radio-group/theme/material/vaadin-lit-radio-button.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-radio-button-styles.js'; -import '../../src/vaadin-lit-radio-button.js'; diff --git a/packages/radio-group/theme/material/vaadin-lit-radio-group.js b/packages/radio-group/theme/material/vaadin-lit-radio-group.js deleted file mode 100644 index fe8164ebebf..00000000000 --- a/packages/radio-group/theme/material/vaadin-lit-radio-group.js +++ /dev/null @@ -1,3 +0,0 @@ -import './vaadin-lit-radio-button.js'; -import './vaadin-radio-group-styles.js'; -import '../../src/vaadin-lit-radio-group.js'; diff --git a/packages/radio-group/theme/material/vaadin-radio-button-styles.js b/packages/radio-group/theme/material/vaadin-radio-button-styles.js deleted file mode 100644 index 6543ac26e1b..00000000000 --- a/packages/radio-group/theme/material/vaadin-radio-button-styles.js +++ /dev/null @@ -1,113 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-radio-button', - css` - :host { - display: inline-block; - -webkit-user-select: none; - user-select: none; - outline: none; - -webkit-tap-highlight-color: transparent; - --_radio-button-size: var(--vaadin-radio-button-size, 16px); - } - - :host([has-label]) ::slotted(label) { - padding: 4px 0.875em 4px 0.375em; - } - - [part='radio'] { - width: var(--_radio-button-size); - height: var(--_radio-button-size); - margin: 4px; - position: relative; - border: 2px solid; - border-radius: 50%; - background-color: transparent; - transition: - transform 0.2s cubic-bezier(0.12, 0.32, 0.54, 2), - background-color 0.15s; - will-change: transform; - } - - /* Used for activation "halo" */ - [part='radio']::before { - pointer-events: none; - color: transparent; - width: 100%; - height: 100%; - line-height: var(--_radio-button-size); - border-radius: inherit; - background-color: var(--material-primary-color); - transform: scale(2.5); - opacity: 0; - transition: - transform 0.1s, - opacity 0.8s; - } - - :host([checked]) [part='radio'] { - border-color: var(--material-primary-color); - } - - /* Used for the selection dot */ - [part='radio']::after { - content: ''; - pointer-events: none; - width: 10px; - height: 10px; - border-radius: 50%; - background-color: var(--material-primary-color); - position: absolute; - top: 50%; - left: 50%; - transform: translate(-50%, -50%) scale(0); - transition: transform 0.2s; - } - - :host([checked]) [part='radio']::after { - transform: translate(-50%, -50%) scale(1); - } - - :host(:not([checked]):not([disabled])) [part='radio'] { - border-color: var(--material-secondary-text-color); - } - - :host([active][checked]) [part='radio']::before, - :host([active]:not([checked])) [part='radio']::before { - transition-duration: 0.01s, 0.01s; - transform: scale(0); - opacity: 0.2; - } - - :host([focus-ring]) [part='radio']::before { - transform: scale(2.5); - transition-duration: 0s; - opacity: 0.15; - } - - :host([disabled]) { - pointer-events: none; - color: var(--material-disabled-text-color); - } - - :host([disabled]) ::slotted(label) { - color: inherit; - } - - :host([disabled]) [part='radio'] { - border-color: var(--material-disabled-color); - } - - :host([disabled]) [part='radio']::after { - background-color: var(--material-disabled-color); - } - - /* RTL specific styles */ - :host([dir='rtl'][has-label]) ::slotted(label) { - padding: 4px 0.375em 4px 0.875em; - } - `, - { moduleId: 'material-radio-button' }, -); diff --git a/packages/radio-group/theme/material/vaadin-radio-button.js b/packages/radio-group/theme/material/vaadin-radio-button.js deleted file mode 100644 index 6ab14def1b0..00000000000 --- a/packages/radio-group/theme/material/vaadin-radio-button.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-radio-button-styles.js'; -import '../../src/vaadin-radio-button.js'; diff --git a/packages/radio-group/theme/material/vaadin-radio-group-styles.js b/packages/radio-group/theme/material/vaadin-radio-group-styles.js deleted file mode 100644 index 542c9b580c3..00000000000 --- a/packages/radio-group/theme/material/vaadin-radio-group-styles.js +++ /dev/null @@ -1,43 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import { helper } from '@vaadin/vaadin-material-styles/mixins/helper.js'; -import { requiredField } from '@vaadin/vaadin-material-styles/mixins/required-field.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const radioGroup = css` - :host { - display: inline-flex; - position: relative; - padding-top: 8px; - margin-bottom: 8px; - outline: none; - color: var(--material-body-text-color); - font-size: var(--material-body-font-size); - line-height: 24px; - font-family: var(--material-font-family); - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - } - - :host::before { - line-height: 32px; - } - - :host([has-label]) { - padding-top: 24px; - } - - :host([theme~='vertical']) [part='group-field'] { - flex-direction: column; - } - - :host([disabled]) [part='label'] { - color: var(--material-disabled-text-color); - -webkit-text-fill-color: var(--material-disabled-text-color); - } - - :host([focused]:not([invalid])) [part='label'] { - color: var(--material-primary-text-color); - } -`; - -registerStyles('vaadin-radio-group', [requiredField, helper, radioGroup], { moduleId: 'material-radio-group' }); diff --git a/packages/radio-group/theme/material/vaadin-radio-group.js b/packages/radio-group/theme/material/vaadin-radio-group.js deleted file mode 100644 index 3d53853a026..00000000000 --- a/packages/radio-group/theme/material/vaadin-radio-group.js +++ /dev/null @@ -1,3 +0,0 @@ -import './vaadin-radio-button.js'; -import './vaadin-radio-group-styles.js'; -import '../../src/vaadin-radio-group.js'; diff --git a/packages/rich-text-editor/package.json b/packages/rich-text-editor/package.json index b5ea5d02864..1e97c1148e5 100644 --- a/packages/rich-text-editor/package.json +++ b/packages/rich-text-editor/package.json @@ -48,7 +48,6 @@ "@vaadin/text-field": "25.0.0-alpha0", "@vaadin/tooltip": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/rich-text-editor/test/visual/material/rich-text-editor.test.js b/packages/rich-text-editor/test/visual/material/rich-text-editor.test.js deleted file mode 100644 index 0407a0ca9f3..00000000000 --- a/packages/rich-text-editor/test/visual/material/rich-text-editor.test.js +++ /dev/null @@ -1,87 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-rich-text-editor.js'; -import { colorDark } from '@vaadin/vaadin-material-styles/color.js'; - -describe('rich-text-editor', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.padding = '10px'; - element = fixtureSync('', div); - }); - - it('basic', async () => { - await visualDiff(div, 'basic'); - }); - - it('disabled', async () => { - element.disabled = true; - await visualDiff(div, 'disabled'); - }); - - it('readonly', async () => { - element.readonly = true; - await visualDiff(div, 'readonly'); - }); - - it('min-height', async () => { - element.style.minHeight = '400px'; - await visualDiff(div, 'min-height'); - }); - - it('max-height', async () => { - element.style.maxHeight = '500px'; - element.value = `[ - {"insert":"High quality rich text editor for the web"}, - {"attributes":{"header":2},"insert":"\\n"}, - {"attributes":{"bold":true},"insert":"Bold"}, - {"attributes":{"list":"bullet"},"insert":"\\n"}, - {"attributes":{"italic":true},"insert":"Italic"}, - {"attributes":{"list":"bullet"},"insert":"\\n"}, - {"attributes":{"underline":true},"insert":"Underline"}, - {"attributes":{"list":"bullet"},"insert":"\\n"}, - {"attributes":{"strike":true},"insert":"Strike-through"}, - {"attributes":{"list":"bullet"},"insert":"\\n"}, - {"insert":"Headings (H1, H2, H3)"}, - {"attributes":{"list":"bullet"},"insert":"\\n"}, - {"insert":"Lists (ordered and unordered)"}, - {"attributes":{"list":"bullet"},"insert":"\\n"}, - {"insert":"Text align (left, center, right)"}, - {"attributes":{"list":"bullet"},"insert":"\\n"}, - {"attributes":{"script":"sub"},"insert":"Sub"}, - {"insert":"script and "},{"attributes":{"script":"super"},"insert":"super"}, - {"insert":"script"},{"attributes":{"list":"bullet"},"insert":"\\n"}, - {"insert":"In addition to text formatting, additional content blocks can be added.\\nBlockquotes"}, - {"attributes":{"header":3},"insert":"\\n"}, - {"attributes":{"blockquote":true},"insert":"\\n"}, - {"insert":"Code blocks"}, - {"attributes":{"header":3},"insert":"\\n"},{"insert":""}, - {"attributes":{"code-block":true},"insert":"\\n"}, - {"insert":" "}, - {"attributes":{"code-block":true},"insert":"\\n"}, - {"insert":""}, - {"attributes":{"code-block":true},"insert":"\\n"}, - {"insert":"\\n"} - ]`; - await visualDiff(div, 'max-height'); - }); - - it('dark theme', async () => { - document.documentElement.setAttribute('theme', 'dark'); - - fixtureSync(``); - - element.value = `[ - {"insert":""}, - {"attributes":{"code-block":true},"insert":"\\n"}, - {"insert":" "}, - {"attributes":{"code-block":true},"insert":"\\n"}, - {"insert":""}, - {"attributes":{"code-block":true},"insert":"\\n"}, - {"insert":"\\n"} - ]`; - await visualDiff(div, 'dark-theme'); - }); -}); diff --git a/packages/rich-text-editor/test/visual/material/screenshots/rich-text-editor/baseline/basic.png b/packages/rich-text-editor/test/visual/material/screenshots/rich-text-editor/baseline/basic.png deleted file mode 100644 index 58994e5228a..00000000000 Binary files a/packages/rich-text-editor/test/visual/material/screenshots/rich-text-editor/baseline/basic.png and /dev/null differ diff --git a/packages/rich-text-editor/test/visual/material/screenshots/rich-text-editor/baseline/dark-theme.png b/packages/rich-text-editor/test/visual/material/screenshots/rich-text-editor/baseline/dark-theme.png deleted file mode 100644 index e92d61eb454..00000000000 Binary files a/packages/rich-text-editor/test/visual/material/screenshots/rich-text-editor/baseline/dark-theme.png and /dev/null differ diff --git a/packages/rich-text-editor/test/visual/material/screenshots/rich-text-editor/baseline/disabled.png b/packages/rich-text-editor/test/visual/material/screenshots/rich-text-editor/baseline/disabled.png deleted file mode 100644 index c276f6ed43d..00000000000 Binary files a/packages/rich-text-editor/test/visual/material/screenshots/rich-text-editor/baseline/disabled.png and /dev/null differ diff --git a/packages/rich-text-editor/test/visual/material/screenshots/rich-text-editor/baseline/max-height.png b/packages/rich-text-editor/test/visual/material/screenshots/rich-text-editor/baseline/max-height.png deleted file mode 100644 index c34e83035b4..00000000000 Binary files a/packages/rich-text-editor/test/visual/material/screenshots/rich-text-editor/baseline/max-height.png and /dev/null differ diff --git a/packages/rich-text-editor/test/visual/material/screenshots/rich-text-editor/baseline/min-height.png b/packages/rich-text-editor/test/visual/material/screenshots/rich-text-editor/baseline/min-height.png deleted file mode 100644 index 984188b2d23..00000000000 Binary files a/packages/rich-text-editor/test/visual/material/screenshots/rich-text-editor/baseline/min-height.png and /dev/null differ diff --git a/packages/rich-text-editor/test/visual/material/screenshots/rich-text-editor/baseline/readonly.png b/packages/rich-text-editor/test/visual/material/screenshots/rich-text-editor/baseline/readonly.png deleted file mode 100644 index bf421ee95a9..00000000000 Binary files a/packages/rich-text-editor/test/visual/material/screenshots/rich-text-editor/baseline/readonly.png and /dev/null differ diff --git a/packages/rich-text-editor/theme/material/vaadin-lit-rich-text-editor.js b/packages/rich-text-editor/theme/material/vaadin-lit-rich-text-editor.js deleted file mode 100644 index 67150869ad4..00000000000 --- a/packages/rich-text-editor/theme/material/vaadin-lit-rich-text-editor.js +++ /dev/null @@ -1,6 +0,0 @@ -import '@vaadin/button/theme/material/vaadin-button-styles.js'; -import '@vaadin/confirm-dialog/theme/material/vaadin-confirm-dialog-styles.js'; -import '@vaadin/text-field/theme/material/vaadin-text-field-styles.js'; -import '@vaadin/tooltip/theme/material/vaadin-tooltip-styles.js'; -import './vaadin-rich-text-editor-styles.js'; -import '../../src/vaadin-lit-rich-text-editor.js'; diff --git a/packages/rich-text-editor/theme/material/vaadin-rich-text-editor-styles.js b/packages/rich-text-editor/theme/material/vaadin-rich-text-editor-styles.js deleted file mode 100644 index 447be1228de..00000000000 --- a/packages/rich-text-editor/theme/material/vaadin-rich-text-editor-styles.js +++ /dev/null @@ -1,143 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import { overlay } from '@vaadin/vaadin-material-styles/mixins/overlay.js'; -import { typography } from '@vaadin/vaadin-material-styles/typography.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const popupOverlay = css` - [part='overlay'] { - margin: 0.25rem 0; - } - - [part='content'] { - padding: 0.25rem; - max-width: calc(7 * (var(--_button-size) + var(--_button-margin) * 2)); - display: flex; - flex-wrap: wrap; - justify-content: center; - --_button-size: 1.25rem; - --_button-margin: 3px; - } - - [part='content'] ::slotted(button) { - border: none; - width: var(--_button-size); - height: var(--_button-size); - margin: var(--_button-margin); - } -`; - -registerStyles('vaadin-rich-text-editor-popup-overlay', [overlay, popupOverlay], { - moduleId: 'material-rich-text-editor-popup-overlay', -}); - -const richTextEditor = css` - :host { - background-color: var(--material-background-color); - min-height: 288px; - } - - [part='toolbar'] { - background-color: var(--material-secondary-background-color); - padding: 0; - border: 0; - overflow: hidden; - } - - [part~='toolbar-group'] { - margin: 8px 0; - padding: 0 8px; - } - - [part~='toolbar-group'] + [part~='toolbar-group'] { - box-shadow: -1px 0 0 0 rgba(0, 0, 0, 0.1); - } - - [part~='toolbar-button'] { - border-radius: 3px; - color: var(--material-secondary-text-color); - font-family: 'vaadin-rte-icons', var(--material-font-family); - font-weight: 600; - margin: -4px 2px; - } - - [part~='toolbar-button']:hover { - background-color: transparent; - color: inherit; - } - - [part~='toolbar-button'][aria-expanded='true'] { - outline: -webkit-focus-ring-color auto 1px; - } - - [part~='toolbar-button'][on] { - background-color: rgba(0, 0, 0, 0.1); - color: inherit; - } - - @media (hover: none) { - [part~='toolbar-button']:hover { - color: var(--material-secondary-text-color); - } - } - - /* SVG icons */ - [part~='toolbar-button-undo']::before, - [part~='toolbar-button-redo']::before, - [part~='toolbar-button-list-ordered']::before, - [part~='toolbar-button-list-bullet']::before, - [part~='toolbar-button-align-left']::before, - [part~='toolbar-button-align-center']::before, - [part~='toolbar-button-align-right']::before, - [part~='toolbar-button-image']::before, - [part~='toolbar-button-link']::before, - [part~='toolbar-button-clean']::before { - font-size: 24px; - font-weight: 400; - } - - /* Text icons */ - [part~='toolbar-button-bold']::before, - [part~='toolbar-button-italic']::before, - [part~='toolbar-button-underline']::before, - [part~='toolbar-button-strike']::before { - font-size: 20px; - } - - [part~='toolbar-button-background']::before { - background-color: var(--material-secondary-background-color); - } - - [part~='toolbar-button-background']::after { - inset: 0.25rem; - } - - /* TODO unsupported selector */ - [part='content'] > .ql-editor { - padding: 0 16px; - line-height: inherit; - } - - /* Theme variants */ - :host(:not([theme~='no-border'])) { - border: 1px solid rgba(0, 0, 0, 0.12); - } - - :host(:not([theme~='no-border']):not([readonly])) [part='content'] { - border-top: 1px solid rgba(0, 0, 0, 0.12); - } - - /* Content */ - b, - strong { - font-weight: 600; - } - - code, - pre { - background-color: var(--material-secondary-background-color); - } -`; - -registerStyles('vaadin-rich-text-editor', [typography, richTextEditor], { - moduleId: 'material-rich-text-editor', -}); diff --git a/packages/rich-text-editor/theme/material/vaadin-rich-text-editor.js b/packages/rich-text-editor/theme/material/vaadin-rich-text-editor.js deleted file mode 100644 index 430e336f0d2..00000000000 --- a/packages/rich-text-editor/theme/material/vaadin-rich-text-editor.js +++ /dev/null @@ -1,6 +0,0 @@ -import '@vaadin/button/theme/material/vaadin-button.js'; -import '@vaadin/confirm-dialog/theme/material/vaadin-confirm-dialog.js'; -import '@vaadin/text-field/theme/material/vaadin-text-field.js'; -import '@vaadin/tooltip/theme/material/vaadin-tooltip.js'; -import './vaadin-rich-text-editor-styles.js'; -import '../../src/vaadin-rich-text-editor.js'; diff --git a/packages/scroller/package.json b/packages/scroller/package.json index 0dcc7424530..13a526c2bcc 100644 --- a/packages/scroller/package.json +++ b/packages/scroller/package.json @@ -40,7 +40,6 @@ "@vaadin/a11y-base": "25.0.0-alpha0", "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/scroller/test/visual/material/screenshots/scroller/baseline/default.png b/packages/scroller/test/visual/material/screenshots/scroller/baseline/default.png deleted file mode 100644 index 04e66c866de..00000000000 Binary files a/packages/scroller/test/visual/material/screenshots/scroller/baseline/default.png and /dev/null differ diff --git a/packages/scroller/test/visual/material/screenshots/scroller/baseline/focus-ring.png b/packages/scroller/test/visual/material/screenshots/scroller/baseline/focus-ring.png deleted file mode 100644 index 582f47d7c82..00000000000 Binary files a/packages/scroller/test/visual/material/screenshots/scroller/baseline/focus-ring.png and /dev/null differ diff --git a/packages/scroller/test/visual/material/scroller.test.js b/packages/scroller/test/visual/material/scroller.test.js deleted file mode 100644 index d76668fe7cb..00000000000 --- a/packages/scroller/test/visual/material/scroller.test.js +++ /dev/null @@ -1,31 +0,0 @@ -import { sendKeys } from '@vaadin/test-runner-commands'; -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-scroller.js'; - -describe('scroller', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.padding = '10px'; - - element = fixtureSync( - ` - -
-
`, - div, - ); - element.firstElementChild.textContent = new Array(1000).fill('content').join(' '); - }); - - it('default', async () => { - await visualDiff(div, 'default'); - }); - - it('focus-ring', async () => { - await sendKeys({ press: 'Tab' }); - await visualDiff(div, 'focus-ring'); - }); -}); diff --git a/packages/scroller/theme/material/vaadin-lit-scroller.js b/packages/scroller/theme/material/vaadin-lit-scroller.js deleted file mode 100644 index 9929e4abaad..00000000000 --- a/packages/scroller/theme/material/vaadin-lit-scroller.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-scroller-styles.js'; -import '../../src/vaadin-lit-scroller.js'; diff --git a/packages/scroller/theme/material/vaadin-scroller-styles.js b/packages/scroller/theme/material/vaadin-scroller-styles.js deleted file mode 100644 index 18562990e39..00000000000 --- a/packages/scroller/theme/material/vaadin-scroller-styles.js +++ /dev/null @@ -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 }; diff --git a/packages/scroller/theme/material/vaadin-scroller.js b/packages/scroller/theme/material/vaadin-scroller.js deleted file mode 100644 index a6769d6e470..00000000000 --- a/packages/scroller/theme/material/vaadin-scroller.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-scroller-styles.js'; -import '../../src/vaadin-scroller.js'; diff --git a/packages/select/package.json b/packages/select/package.json index c5326eb6d1c..388507bad06 100644 --- a/packages/select/package.json +++ b/packages/select/package.json @@ -51,7 +51,6 @@ "@vaadin/lit-renderer": "25.0.0-alpha0", "@vaadin/overlay": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/select/test/visual/material/screenshots/select/baseline/basic.png b/packages/select/test/visual/material/screenshots/select/baseline/basic.png deleted file mode 100644 index 7edfa5e273f..00000000000 Binary files a/packages/select/test/visual/material/screenshots/select/baseline/basic.png and /dev/null differ diff --git a/packages/select/test/visual/material/screenshots/select/baseline/disabled.png b/packages/select/test/visual/material/screenshots/select/baseline/disabled.png deleted file mode 100644 index d504a6c1cc1..00000000000 Binary files a/packages/select/test/visual/material/screenshots/select/baseline/disabled.png and /dev/null differ diff --git a/packages/select/test/visual/material/screenshots/select/baseline/empty-value.png b/packages/select/test/visual/material/screenshots/select/baseline/empty-value.png deleted file mode 100644 index 7b73bb0f2da..00000000000 Binary files a/packages/select/test/visual/material/screenshots/select/baseline/empty-value.png and /dev/null differ diff --git a/packages/select/test/visual/material/screenshots/select/baseline/error-message.png b/packages/select/test/visual/material/screenshots/select/baseline/error-message.png deleted file mode 100644 index a578ba5a158..00000000000 Binary files a/packages/select/test/visual/material/screenshots/select/baseline/error-message.png and /dev/null differ diff --git a/packages/select/test/visual/material/screenshots/select/baseline/flex.png b/packages/select/test/visual/material/screenshots/select/baseline/flex.png deleted file mode 100644 index 576de584adb..00000000000 Binary files a/packages/select/test/visual/material/screenshots/select/baseline/flex.png and /dev/null differ diff --git a/packages/select/test/visual/material/screenshots/select/baseline/focus-ring.png b/packages/select/test/visual/material/screenshots/select/baseline/focus-ring.png deleted file mode 100644 index cad4824eb7b..00000000000 Binary files a/packages/select/test/visual/material/screenshots/select/baseline/focus-ring.png and /dev/null differ diff --git a/packages/select/test/visual/material/screenshots/select/baseline/helper-text.png b/packages/select/test/visual/material/screenshots/select/baseline/helper-text.png deleted file mode 100644 index 602041823c7..00000000000 Binary files a/packages/select/test/visual/material/screenshots/select/baseline/helper-text.png and /dev/null differ diff --git a/packages/select/test/visual/material/screenshots/select/baseline/invalid.png b/packages/select/test/visual/material/screenshots/select/baseline/invalid.png deleted file mode 100644 index 4c981000abe..00000000000 Binary files a/packages/select/test/visual/material/screenshots/select/baseline/invalid.png and /dev/null differ diff --git a/packages/select/test/visual/material/screenshots/select/baseline/label-and-placeholder-always-float-label.png b/packages/select/test/visual/material/screenshots/select/baseline/label-and-placeholder-always-float-label.png deleted file mode 100644 index bca31ace9e0..00000000000 Binary files a/packages/select/test/visual/material/screenshots/select/baseline/label-and-placeholder-always-float-label.png and /dev/null differ diff --git a/packages/select/test/visual/material/screenshots/select/baseline/label-and-placeholder.png b/packages/select/test/visual/material/screenshots/select/baseline/label-and-placeholder.png deleted file mode 100644 index ff74f44f9ee..00000000000 Binary files a/packages/select/test/visual/material/screenshots/select/baseline/label-and-placeholder.png and /dev/null differ diff --git a/packages/select/test/visual/material/screenshots/select/baseline/label.png b/packages/select/test/visual/material/screenshots/select/baseline/label.png deleted file mode 100644 index ff74f44f9ee..00000000000 Binary files a/packages/select/test/visual/material/screenshots/select/baseline/label.png and /dev/null differ diff --git a/packages/select/test/visual/material/screenshots/select/baseline/opened.png b/packages/select/test/visual/material/screenshots/select/baseline/opened.png deleted file mode 100644 index 34e46c1a03b..00000000000 Binary files a/packages/select/test/visual/material/screenshots/select/baseline/opened.png and /dev/null differ diff --git a/packages/select/test/visual/material/screenshots/select/baseline/placeholder.png b/packages/select/test/visual/material/screenshots/select/baseline/placeholder.png deleted file mode 100644 index 85feb1c9c9d..00000000000 Binary files a/packages/select/test/visual/material/screenshots/select/baseline/placeholder.png and /dev/null differ diff --git a/packages/select/test/visual/material/screenshots/select/baseline/prefix.png b/packages/select/test/visual/material/screenshots/select/baseline/prefix.png deleted file mode 100644 index 0173e6c20cd..00000000000 Binary files a/packages/select/test/visual/material/screenshots/select/baseline/prefix.png and /dev/null differ diff --git a/packages/select/test/visual/material/screenshots/select/baseline/readonly.png b/packages/select/test/visual/material/screenshots/select/baseline/readonly.png deleted file mode 100644 index 46c2b4cd4d6..00000000000 Binary files a/packages/select/test/visual/material/screenshots/select/baseline/readonly.png and /dev/null differ diff --git a/packages/select/test/visual/material/screenshots/select/baseline/required.png b/packages/select/test/visual/material/screenshots/select/baseline/required.png deleted file mode 100644 index 0902cbc2493..00000000000 Binary files a/packages/select/test/visual/material/screenshots/select/baseline/required.png and /dev/null differ diff --git a/packages/select/test/visual/material/screenshots/select/baseline/value-overflow.png b/packages/select/test/visual/material/screenshots/select/baseline/value-overflow.png deleted file mode 100644 index e9e28b321d2..00000000000 Binary files a/packages/select/test/visual/material/screenshots/select/baseline/value-overflow.png and /dev/null differ diff --git a/packages/select/test/visual/material/screenshots/select/baseline/value.png b/packages/select/test/visual/material/screenshots/select/baseline/value.png deleted file mode 100644 index 7cf3c5cae86..00000000000 Binary files a/packages/select/test/visual/material/screenshots/select/baseline/value.png and /dev/null differ diff --git a/packages/select/test/visual/material/screenshots/select/baseline/width-value.png b/packages/select/test/visual/material/screenshots/select/baseline/width-value.png deleted file mode 100644 index 20647f9f5f4..00000000000 Binary files a/packages/select/test/visual/material/screenshots/select/baseline/width-value.png and /dev/null differ diff --git a/packages/select/test/visual/material/screenshots/select/baseline/width.png b/packages/select/test/visual/material/screenshots/select/baseline/width.png deleted file mode 100644 index 694259f5c1d..00000000000 Binary files a/packages/select/test/visual/material/screenshots/select/baseline/width.png and /dev/null differ diff --git a/packages/select/test/visual/material/select.test.js b/packages/select/test/visual/material/select.test.js deleted file mode 100644 index 16ec344fafe..00000000000 --- a/packages/select/test/visual/material/select.test.js +++ /dev/null @@ -1,156 +0,0 @@ -import { sendKeys } from '@vaadin/test-runner-commands'; -import { fixtureSync, nextFrame } from '@vaadin/testing-helpers'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '@vaadin/item/theme/material/vaadin-item.js'; -import '@vaadin/list-box/theme/material/vaadin-list-box.js'; -import '../../not-animated-styles.js'; -import '../common.js'; -import '../../../theme/material/vaadin-select.js'; - -describe('select', () => { - let div, element; - - beforeEach(async () => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - div.style.padding = '10px'; - element = fixtureSync('', div); - element.items = [ - { label: 'item 1', value: 'value-1' }, - { label: 'item 2', value: 'value-2' }, - { label: 'item 3', value: 'value-3' }, - ]; - await nextFrame(); - }); - - it('basic', async () => { - await visualDiff(div, 'basic'); - }); - - it('focus-ring', async () => { - await sendKeys({ press: 'Tab' }); - - await visualDiff(div, 'focus-ring'); - }); - - it('disabled', async () => { - element.disabled = true; - await visualDiff(div, 'disabled'); - }); - - it('readonly', async () => { - element.readonly = true; - await visualDiff(div, 'readonly'); - }); - - it('flex', async () => { - div.style.display = 'inline-flex'; - div.style.height = '200px'; - await visualDiff(div, 'flex'); - }); - - it('label', async () => { - element.label = 'Label'; - await visualDiff(div, 'label'); - }); - - it('placeholder', async () => { - element.placeholder = 'Placeholder'; - await visualDiff(div, 'placeholder'); - }); - - it('label and placeholder', async () => { - element.label = 'Label'; - element.placeholder = 'Placeholder'; - await visualDiff(div, 'label-and-placeholder'); - }); - - it('label and placeholder - always float label', async () => { - element.setAttribute('theme', 'always-float-label'); - element.label = 'Label'; - element.placeholder = 'Placeholder'; - await visualDiff(div, 'label-and-placeholder-always-float-label'); - }); - - it('value', async () => { - element.value = 'value-1'; - await visualDiff(div, 'value'); - }); - - it('value-overflow', async () => { - element.renderer = (root) => { - root.innerHTML = ` - - Very long item text content - - `; - }; - element.value = 'long'; - await visualDiff(div, 'value-overflow'); - }); - - it('required', async () => { - element.label = 'Label'; - element.required = true; - await visualDiff(div, 'required'); - }); - - it('invalid', async () => { - element.invalid = true; - await visualDiff(div, 'invalid'); - }); - - it('error message', async () => { - element.label = 'Label'; - element.errorMessage = 'This field is required'; - element.required = true; - element.validate(); - await visualDiff(div, 'error-message'); - }); - - it('helper text', async () => { - element.helperText = 'Helper text'; - await visualDiff(div, 'helper-text'); - }); - - it('prefix slot', async () => { - const span = document.createElement('span'); - span.setAttribute('slot', 'prefix'); - span.textContent = '$'; - element.appendChild(span); - await visualDiff(div, 'prefix'); - }); - - it('opened', async () => { - div.style.height = '200px'; - div.style.width = '200px'; - await sendKeys({ press: 'Tab' }); - element.opened = true; - await nextFrame(); - await visualDiff(div, 'opened'); - }); - - it('width', async () => { - element.style.width = '80px'; - await visualDiff(div, 'width'); - }); - - it('width with value', async () => { - element.style.width = '80px'; - element.value = 'value-1'; - await visualDiff(div, 'width-value'); - }); - - it('empty value', async () => { - // To make sure placeholder styles aren't applied to empty value item - element.placeholder = 'Placeholder'; - element.renderer = (root) => { - root.innerHTML = ` - - Empty - - `; - }; - await visualDiff(div, 'empty-value'); - }); -}); diff --git a/packages/select/theme/material/vaadin-lit-select.js b/packages/select/theme/material/vaadin-lit-select.js deleted file mode 100644 index acad33335ad..00000000000 --- a/packages/select/theme/material/vaadin-lit-select.js +++ /dev/null @@ -1,7 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import './vaadin-select-styles.js'; -import '../../src/vaadin-lit-select.js'; diff --git a/packages/select/theme/material/vaadin-select-styles.js b/packages/select/theme/material/vaadin-select-styles.js deleted file mode 100644 index d4dde9c713a..00000000000 --- a/packages/select/theme/material/vaadin-select-styles.js +++ /dev/null @@ -1,77 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import '@vaadin/input-container/theme/material/vaadin-input-container-styles.js'; -import '@vaadin/vaadin-material-styles/font-icons.js'; -import { item } from '@vaadin/item/theme/material/vaadin-item-styles.js'; -import { listBox } from '@vaadin/list-box/theme/material/vaadin-list-box-styles.js'; -import { inputFieldShared } from '@vaadin/vaadin-material-styles/mixins/input-field-shared.js'; -import { menuOverlay } from '@vaadin/vaadin-material-styles/mixins/menu-overlay.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles('vaadin-select-item', item, { moduleId: 'material-select-item' }); - -registerStyles('vaadin-select-list-box', listBox, { moduleId: 'material-select-list-box' }); - -const select = css` - :host { - -webkit-tap-highlight-color: transparent; - } - - /* placeholder styles */ - :host [part='input-field'] ::slotted([slot='value'][placeholder]) { - color: var(--material-disabled-text-color); - transition: opacity 0.175s 0.1s; - opacity: 1; - } - - :host([has-label]:not([focused]):not([invalid]):not([theme='always-float-label'])) - ::slotted([slot='value'][placeholder]) { - opacity: 0; - /* Avoid a flash of the placeholder text on init */ - transition: none; - } - - :host [part='input-field'] ::slotted([slot='value']) { - color: var(--material-body-text-color); - } - - [part='toggle-button']::before { - content: var(--material-icons-dropdown); - } - - :host([opened]) [part='toggle-button'] { - transform: rotate(180deg); - } - - :host([disabled]) { - pointer-events: none; - } -`; - -registerStyles('vaadin-select', [inputFieldShared, select], { moduleId: 'material-select' }); - -registerStyles( - 'vaadin-select-value-button', - css` - :host { - font: inherit; - letter-spacing: normal; - text-transform: none; - } - - ::slotted(*) { - font: inherit; - padding: 4px 0; - } - - ::slotted(*:hover) { - background-color: transparent; - } - `, - { moduleId: 'material-select-value-button' }, -); - -registerStyles('vaadin-select-overlay', [menuOverlay], { moduleId: 'material-select-overlay' }); diff --git a/packages/select/theme/material/vaadin-select.js b/packages/select/theme/material/vaadin-select.js deleted file mode 100644 index 33263e7d608..00000000000 --- a/packages/select/theme/material/vaadin-select.js +++ /dev/null @@ -1,7 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import './vaadin-select-styles.js'; -import '../../src/vaadin-select.js'; diff --git a/packages/side-nav/package.json b/packages/side-nav/package.json index 7f49dea2b8f..56323ee94f3 100644 --- a/packages/side-nav/package.json +++ b/packages/side-nav/package.json @@ -38,7 +38,6 @@ "@vaadin/a11y-base": "25.0.0-alpha0", "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/current-collapsed-item.png b/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/current-collapsed-item.png deleted file mode 100644 index db0684ebe6b..00000000000 Binary files a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/current-collapsed-item.png and /dev/null differ diff --git a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/current-item.png b/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/current-item.png deleted file mode 100644 index ea041d6a432..00000000000 Binary files a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/current-item.png and /dev/null differ diff --git a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/disabled-item.png b/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/disabled-item.png deleted file mode 100644 index 13b7d7a6400..00000000000 Binary files a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/disabled-item.png and /dev/null differ diff --git a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/focused-item.png b/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/focused-item.png deleted file mode 100644 index 1ba8ed8f1be..00000000000 Binary files a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/focused-item.png and /dev/null differ diff --git a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/focused-label.png b/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/focused-label.png deleted file mode 100644 index 5d3cc0aa8aa..00000000000 Binary files a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/focused-label.png and /dev/null differ diff --git a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/ltr-basic.png b/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/ltr-basic.png deleted file mode 100644 index 0a7e10ed040..00000000000 Binary files a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/ltr-basic.png and /dev/null differ diff --git a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/ltr-collapsed.png b/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/ltr-collapsed.png deleted file mode 100644 index bbed87417d7..00000000000 Binary files a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/ltr-collapsed.png and /dev/null differ diff --git a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/ltr-expanded.png b/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/ltr-expanded.png deleted file mode 100644 index 96ae1e62f12..00000000000 Binary files a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/ltr-expanded.png and /dev/null differ diff --git a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/ltr-item-collapsed.png b/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/ltr-item-collapsed.png deleted file mode 100644 index f45b354f0be..00000000000 Binary files a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/ltr-item-collapsed.png and /dev/null differ diff --git a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/ltr-item-expanded.png b/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/ltr-item-expanded.png deleted file mode 100644 index fafa84e018d..00000000000 Binary files a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/ltr-item-expanded.png and /dev/null differ diff --git a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/overflowing-item.png b/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/overflowing-item.png deleted file mode 100644 index 041fdf95b71..00000000000 Binary files a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/overflowing-item.png and /dev/null differ diff --git a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/rtl-basic.png b/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/rtl-basic.png deleted file mode 100644 index ec3c0378ee6..00000000000 Binary files a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/rtl-basic.png and /dev/null differ diff --git a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/rtl-collapsed.png b/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/rtl-collapsed.png deleted file mode 100644 index 990c7dfd8e9..00000000000 Binary files a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/rtl-collapsed.png and /dev/null differ diff --git a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/rtl-expanded.png b/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/rtl-expanded.png deleted file mode 100644 index 9d2c1b12c8d..00000000000 Binary files a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/rtl-expanded.png and /dev/null differ diff --git a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/rtl-item-collapsed.png b/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/rtl-item-collapsed.png deleted file mode 100644 index 8f47d7bbb3f..00000000000 Binary files a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/rtl-item-collapsed.png and /dev/null differ diff --git a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/rtl-item-expanded.png b/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/rtl-item-expanded.png deleted file mode 100644 index a170dc41272..00000000000 Binary files a/packages/side-nav/test/visual/material/screenshots/side-nav/baseline/rtl-item-expanded.png and /dev/null differ diff --git a/packages/side-nav/test/visual/material/side-nav.test.js b/packages/side-nav/test/visual/material/side-nav.test.js deleted file mode 100644 index 852fd65c903..00000000000 --- a/packages/side-nav/test/visual/material/side-nav.test.js +++ /dev/null @@ -1,187 +0,0 @@ -import { sendKeys } from '@vaadin/test-runner-commands'; -import { fixtureSync, nextRender } from '@vaadin/testing-helpers'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../not-animated-styles.js'; -import '../../../theme/material/vaadin-side-nav.js'; -import '@vaadin/icon/theme/material/vaadin-icon.js'; -import '@vaadin/icons'; - -describe('side-nav', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.padding = '10px'; - }); - - describe('states', () => { - beforeEach(async () => { - element = fixtureSync( - ` - - Messages - - - Inbox - - - - Sent - - - - Trash - - - `, - div, - ); - await nextRender(); - }); - - it('focused label', async () => { - await sendKeys({ press: 'Tab' }); - await visualDiff(div, 'focused-label'); - }); - - it('focused item', async () => { - await sendKeys({ press: 'Tab' }); - await sendKeys({ press: 'Tab' }); - await visualDiff(div, 'focused-item'); - }); - - it('current item', async () => { - const item = document.querySelector('vaadin-side-nav-item'); - item.setAttribute('current', ''); - await visualDiff(div, 'current-item'); - }); - - it('current collapsed item', async () => { - const item = document.querySelector('vaadin-side-nav-item'); - item.setAttribute('current', ''); - const child = document.createElement('vaadin-side-nav-item'); - child.setAttribute('slot', 'children'); - item.appendChild(child); - await visualDiff(div, 'current-collapsed-item'); - }); - - it('disabled item', async () => { - const item = document.querySelector('vaadin-side-nav-item'); - item.disabled = true; - await nextRender(); - await visualDiff(div, 'disabled-item'); - }); - - it('overflowing item', async () => { - const span = document.querySelector('vaadin-side-nav-item span'); - span.textContent = 'Very long item that does not fit'; - element.style.maxWidth = '200px'; - await visualDiff(div, 'overflowing-item'); - }); - }); - - ['ltr', 'rtl'].forEach((dir) => { - describe(dir, () => { - before(() => { - document.documentElement.setAttribute('dir', dir); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - describe(`${dir}-basic`, () => { - beforeEach(() => { - element = fixtureSync( - ` - - Main menu - - - Item 1 - 2 - - - - Item 2 - 3 - - - `, - div, - ); - }); - - it('basic', async () => { - await visualDiff(div, `${dir}-basic`); - }); - }); - - describe(`${dir}-collapsible`, () => { - beforeEach(() => { - element = fixtureSync( - ` - - Main menu - Item 1 - Item 2 - - `, - div, - ); - }); - - it('expanded', async () => { - await visualDiff(div, `${dir}-expanded`); - }); - - it('collapsed', async () => { - element.collapsed = true; - await visualDiff(div, `${dir}-collapsed`); - }); - }); - - describe(`${dir}-item-expanded`, () => { - beforeEach(() => { - element = fixtureSync( - ` - - Main menu - - - Item 1 - 2 - - - Child item 1 - 12 - - - - Child item 2 - 13 - - - - - Item 2 - 3 - - - `, - div, - ); - }); - - it('item collapsed', async () => { - await visualDiff(div, `${dir}-item-collapsed`); - }); - - it('item expanded', async () => { - element.querySelector('vaadin-side-nav-item').expanded = true; - await visualDiff(div, `${dir}-item-expanded`); - }); - }); - }); - }); -}); diff --git a/packages/side-nav/theme/material/vaadin-side-nav-item-styles.js b/packages/side-nav/theme/material/vaadin-side-nav-item-styles.js deleted file mode 100644 index 0a82bdaf73c..00000000000 --- a/packages/side-nav/theme/material/vaadin-side-nav-item-styles.js +++ /dev/null @@ -1,149 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/font-icons.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import { fieldButton } from '@vaadin/vaadin-material-styles/mixins/field-button.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -export const sideNavItemStyles = css` - [part='content'] { - position: relative; - } - - [part='link'] { - width: 100%; - min-height: 32px; - margin: 4px 0; - gap: 8px; - padding: 4px 8px; - padding-inline-start: calc(8px + var(--_child-indent, 0px)); - font-family: var(--material-font-family); - font-size: var(--material-small-font-size); - line-height: 1; - font-weight: 500; - color: var(--material-body-text-color); - transition: - background-color 140ms, - color 140ms; - border-radius: 4px; - cursor: default; - } - - [part='link'][href] { - cursor: pointer; - } - - :host([current]) [part='link'] { - color: var(--material-primary-text-color); - } - - :host([disabled]) [part='link'] { - color: var(--material-disabled-text-color); - } - - :host([current]) [part='content']::before { - position: absolute; - content: ''; - inset: 4px 0; - background-color: var(--material-primary-color); - opacity: 0.12; - border-radius: 4px; - } - - [part='toggle-button'] { - width: 32px; - height: 32px; - margin-inline-end: -4px; - transform: rotate(90deg); - } - - [part='toggle-button']::before { - font-family: 'material-icons'; - font-size: 24px; - width: 24px; - display: inline-block; - content: var(--material-icons-chevron-right); - } - - [part='toggle-button']::after { - display: inline-block; - content: ''; - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - border-radius: 50%; - background-color: var(--material-disabled-text-color); - transform: scale(0); - opacity: 0; - transition: - transform 0s 0.8s, - opacity 0.8s; - will-change: transform, opacity; - } - - [part='toggle-button']:focus-visible::after { - transition-duration: 0.08s, 0.01s; - transition-delay: 0s, 0s; - transform: scale(1.25); - opacity: 0.16; - } - - :host([expanded]) [part='toggle-button'] { - transform: rotate(270deg); - } - - :host([has-children]) [part='content'] { - padding-inline-end: 8px; - } - - @media (any-hover: hover) { - :host(:not([current])) [part='link'][href]:hover { - background-color: var(--material-secondary-background-color); - } - - [part='toggle-button']:hover { - color: var(--material-body-text-color); - } - } - - @supports selector(:focus-visible) { - [part='link'], - [part='toggle-button'] { - outline: none; - } - - :host(:not([current])) [part='link']:focus-visible { - background-color: var(--material-divider-color); - } - - :host([current]) [part='link']:focus-visible::before { - opacity: 0.24; - } - } - - slot[name='prefix']::slotted(:is(vaadin-icon, [class*='icon'])) { - padding: 0.1em; - flex-shrink: 0; - margin-inline-end: 24px; - color: var(--material-secondary-text-color); - } - - :host([disabled]) slot[name='prefix']::slotted(:is(vaadin-icon, [class*='icon'])) { - color: var(--material-disabled-text-color); - } - - :host([current]) slot[name='prefix']::slotted(:is(vaadin-icon, [class*='icon'])) { - color: inherit; - } - - slot[name='children'] { - --_child-indent: calc(var(--_child-indent-2, 0px) + var(--vaadin-side-nav-child-indent, 24px)); - } - - slot[name='children']::slotted(*) { - --_child-indent-2: var(--_child-indent); - } -`; - -registerStyles('vaadin-side-nav-item', [fieldButton, sideNavItemStyles], { moduleId: 'material-side-nav-item' }); diff --git a/packages/side-nav/theme/material/vaadin-side-nav-item.js b/packages/side-nav/theme/material/vaadin-side-nav-item.js deleted file mode 100644 index 46f674f7217..00000000000 --- a/packages/side-nav/theme/material/vaadin-side-nav-item.js +++ /dev/null @@ -1,7 +0,0 @@ -/** - * @license - * Copyright (c) 2023 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import './vaadin-side-nav-item-styles.js'; -import '../../src/vaadin-side-nav-item.js'; diff --git a/packages/side-nav/theme/material/vaadin-side-nav-styles.js b/packages/side-nav/theme/material/vaadin-side-nav-styles.js deleted file mode 100644 index 2755748f676..00000000000 --- a/packages/side-nav/theme/material/vaadin-side-nav-styles.js +++ /dev/null @@ -1,68 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/font-icons.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -export const sideNavStyles = css` - :host { - -webkit-tap-highlight-color: transparent; - outline: none; - } - - [part='label'] { - display: flex; - align-items: center; - width: 100%; - min-height: 40px; - margin: 4px 0; - padding: 4px 8px; - outline: none; - box-sizing: border-box; - font-family: var(--material-font-family); - font-size: var(--material-small-font-size); - color: var(--material-secondary-text-color); - line-height: 1; - font-weight: 500; - border-radius: 4px; - } - - :host([focus-ring]) [part='label'] { - background-color: var(--material-divider-color); - } - - [part='toggle-button'] { - display: inline-flex; - align-items: center; - justify-content: center; - width: 24px; - height: 24px; - padding: 4px; - margin-inline: auto -4px; - font-size: var(--material-icon-font-size); - line-height: 1; - color: var(--material-secondary-text-color); - font-family: 'material-icons'; - transform: rotate(90deg); - } - - [part='toggle-button']::before { - content: var(--material-icons-chevron-right); - font-size: 24px; - } - - :host(:not([collapsible])) [part='toggle-button'] { - display: none !important; - } - - :host(:not([collapsed])) [part='toggle-button'] { - transform: rotate(270deg); - } - - @media (any-hover: hover) { - [part='label']:hover [part='toggle-button'] { - color: var(--material-body-text-color); - } - } -`; - -registerStyles('vaadin-side-nav', sideNavStyles, { moduleId: 'material-side-nav' }); diff --git a/packages/side-nav/theme/material/vaadin-side-nav.js b/packages/side-nav/theme/material/vaadin-side-nav.js deleted file mode 100644 index 9ed653cd152..00000000000 --- a/packages/side-nav/theme/material/vaadin-side-nav.js +++ /dev/null @@ -1,8 +0,0 @@ -/** - * @license - * Copyright (c) 2023 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import './vaadin-side-nav-item.js'; -import './vaadin-side-nav-styles.js'; -import '../../src/vaadin-side-nav.js'; diff --git a/packages/split-layout/package.json b/packages/split-layout/package.json index e52339b0653..a7507095568 100644 --- a/packages/split-layout/package.json +++ b/packages/split-layout/package.json @@ -39,7 +39,6 @@ "@polymer/polymer": "^3.0.0", "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/split-layout/test/visual/material/screenshots/split-layout/baseline/horizontal.png b/packages/split-layout/test/visual/material/screenshots/split-layout/baseline/horizontal.png deleted file mode 100644 index 75801baa0b7..00000000000 Binary files a/packages/split-layout/test/visual/material/screenshots/split-layout/baseline/horizontal.png and /dev/null differ diff --git a/packages/split-layout/test/visual/material/screenshots/split-layout/baseline/vertical.png b/packages/split-layout/test/visual/material/screenshots/split-layout/baseline/vertical.png deleted file mode 100644 index c0bffdf5c0e..00000000000 Binary files a/packages/split-layout/test/visual/material/screenshots/split-layout/baseline/vertical.png and /dev/null differ diff --git a/packages/split-layout/test/visual/material/split-layout.test.js b/packages/split-layout/test/visual/material/split-layout.test.js deleted file mode 100644 index a5c4ad67ab0..00000000000 --- a/packages/split-layout/test/visual/material/split-layout.test.js +++ /dev/null @@ -1,25 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-split-layout.js'; - -describe('split-layout', () => { - let element; - - beforeEach(() => { - element = fixtureSync(` - -
-
-
- `); - }); - - it('horizontal', async () => { - await visualDiff(element, 'horizontal'); - }); - - it('vertical', async () => { - element.orientation = 'vertical'; - await visualDiff(element, 'vertical'); - }); -}); diff --git a/packages/split-layout/theme/material/vaadin-lit-split-layout.js b/packages/split-layout/theme/material/vaadin-lit-split-layout.js deleted file mode 100644 index d291ed6d68b..00000000000 --- a/packages/split-layout/theme/material/vaadin-lit-split-layout.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-split-layout-styles.js'; -import '../../src/vaadin-lit-split-layout.js'; diff --git a/packages/split-layout/theme/material/vaadin-split-layout-styles.js b/packages/split-layout/theme/material/vaadin-split-layout-styles.js deleted file mode 100644 index c5cffdb4d11..00000000000 --- a/packages/split-layout/theme/material/vaadin-split-layout-styles.js +++ /dev/null @@ -1,32 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-split-layout', - css` - [part='splitter'] { - min-width: 8px; - min-height: 8px; - background-color: var(--_material-split-layout-splitter-background-color, #000); - } - - [part='handle'] { - display: flex; - align-items: center; - justify-content: center; - } - - [part='handle']::after { - content: ''; - display: block; - width: 2px; - height: 24px; - background-color: var(--material-background-color); - } - - :host([orientation='vertical']) [part='handle']::after { - transform: rotate(90deg); - } - `, - { moduleId: 'material-split-layout' }, -); diff --git a/packages/split-layout/theme/material/vaadin-split-layout.js b/packages/split-layout/theme/material/vaadin-split-layout.js deleted file mode 100644 index 8c41f6f276c..00000000000 --- a/packages/split-layout/theme/material/vaadin-split-layout.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-split-layout-styles.js'; -import '../../src/vaadin-split-layout.js'; diff --git a/packages/tabs/package.json b/packages/tabs/package.json index 71f5d16eecc..aa2f78306f7 100644 --- a/packages/tabs/package.json +++ b/packages/tabs/package.json @@ -41,7 +41,6 @@ "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/item": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/tabs/test/visual/material/screenshots/tabs/baseline/anchors-horizontal.png b/packages/tabs/test/visual/material/screenshots/tabs/baseline/anchors-horizontal.png deleted file mode 100644 index 91e59e4d08f..00000000000 Binary files a/packages/tabs/test/visual/material/screenshots/tabs/baseline/anchors-horizontal.png and /dev/null differ diff --git a/packages/tabs/test/visual/material/screenshots/tabs/baseline/anchors-vertical.png b/packages/tabs/test/visual/material/screenshots/tabs/baseline/anchors-vertical.png deleted file mode 100644 index 5b923d0be92..00000000000 Binary files a/packages/tabs/test/visual/material/screenshots/tabs/baseline/anchors-vertical.png and /dev/null differ diff --git a/packages/tabs/test/visual/material/screenshots/tabs/baseline/ltr-horizontal-end.png b/packages/tabs/test/visual/material/screenshots/tabs/baseline/ltr-horizontal-end.png deleted file mode 100644 index 8605d88320d..00000000000 Binary files a/packages/tabs/test/visual/material/screenshots/tabs/baseline/ltr-horizontal-end.png and /dev/null differ diff --git a/packages/tabs/test/visual/material/screenshots/tabs/baseline/ltr-horizontal-middle.png b/packages/tabs/test/visual/material/screenshots/tabs/baseline/ltr-horizontal-middle.png deleted file mode 100644 index 577a86a07ef..00000000000 Binary files a/packages/tabs/test/visual/material/screenshots/tabs/baseline/ltr-horizontal-middle.png and /dev/null differ diff --git a/packages/tabs/test/visual/material/screenshots/tabs/baseline/ltr-horizontal-scroll.png b/packages/tabs/test/visual/material/screenshots/tabs/baseline/ltr-horizontal-scroll.png deleted file mode 100644 index 72eb985e7a6..00000000000 Binary files a/packages/tabs/test/visual/material/screenshots/tabs/baseline/ltr-horizontal-scroll.png and /dev/null differ diff --git a/packages/tabs/test/visual/material/screenshots/tabs/baseline/ltr-horizontal-start.png b/packages/tabs/test/visual/material/screenshots/tabs/baseline/ltr-horizontal-start.png deleted file mode 100644 index 91e59e4d08f..00000000000 Binary files a/packages/tabs/test/visual/material/screenshots/tabs/baseline/ltr-horizontal-start.png and /dev/null differ diff --git a/packages/tabs/test/visual/material/screenshots/tabs/baseline/ltr-vertical-end.png b/packages/tabs/test/visual/material/screenshots/tabs/baseline/ltr-vertical-end.png deleted file mode 100644 index 57b1f069521..00000000000 Binary files a/packages/tabs/test/visual/material/screenshots/tabs/baseline/ltr-vertical-end.png and /dev/null differ diff --git a/packages/tabs/test/visual/material/screenshots/tabs/baseline/ltr-vertical-middle.png b/packages/tabs/test/visual/material/screenshots/tabs/baseline/ltr-vertical-middle.png deleted file mode 100644 index 7d2325635a5..00000000000 Binary files a/packages/tabs/test/visual/material/screenshots/tabs/baseline/ltr-vertical-middle.png and /dev/null differ diff --git a/packages/tabs/test/visual/material/screenshots/tabs/baseline/ltr-vertical-scroll.png b/packages/tabs/test/visual/material/screenshots/tabs/baseline/ltr-vertical-scroll.png deleted file mode 100644 index 420c636d182..00000000000 Binary files a/packages/tabs/test/visual/material/screenshots/tabs/baseline/ltr-vertical-scroll.png and /dev/null differ diff --git a/packages/tabs/test/visual/material/screenshots/tabs/baseline/ltr-vertical-start.png b/packages/tabs/test/visual/material/screenshots/tabs/baseline/ltr-vertical-start.png deleted file mode 100644 index 969594f523a..00000000000 Binary files a/packages/tabs/test/visual/material/screenshots/tabs/baseline/ltr-vertical-start.png and /dev/null differ diff --git a/packages/tabs/test/visual/material/screenshots/tabs/baseline/rtl-horizontal-end.png b/packages/tabs/test/visual/material/screenshots/tabs/baseline/rtl-horizontal-end.png deleted file mode 100644 index 7534b3fb10f..00000000000 Binary files a/packages/tabs/test/visual/material/screenshots/tabs/baseline/rtl-horizontal-end.png and /dev/null differ diff --git a/packages/tabs/test/visual/material/screenshots/tabs/baseline/rtl-horizontal-middle.png b/packages/tabs/test/visual/material/screenshots/tabs/baseline/rtl-horizontal-middle.png deleted file mode 100644 index d5cc6e9b8e2..00000000000 Binary files a/packages/tabs/test/visual/material/screenshots/tabs/baseline/rtl-horizontal-middle.png and /dev/null differ diff --git a/packages/tabs/test/visual/material/screenshots/tabs/baseline/rtl-horizontal-scroll.png b/packages/tabs/test/visual/material/screenshots/tabs/baseline/rtl-horizontal-scroll.png deleted file mode 100644 index 02626f45459..00000000000 Binary files a/packages/tabs/test/visual/material/screenshots/tabs/baseline/rtl-horizontal-scroll.png and /dev/null differ diff --git a/packages/tabs/test/visual/material/screenshots/tabs/baseline/rtl-horizontal-start.png b/packages/tabs/test/visual/material/screenshots/tabs/baseline/rtl-horizontal-start.png deleted file mode 100644 index fe4685b4046..00000000000 Binary files a/packages/tabs/test/visual/material/screenshots/tabs/baseline/rtl-horizontal-start.png and /dev/null differ diff --git a/packages/tabs/test/visual/material/screenshots/tabs/baseline/rtl-vertical-end.png b/packages/tabs/test/visual/material/screenshots/tabs/baseline/rtl-vertical-end.png deleted file mode 100644 index 15f0ae0522e..00000000000 Binary files a/packages/tabs/test/visual/material/screenshots/tabs/baseline/rtl-vertical-end.png and /dev/null differ diff --git a/packages/tabs/test/visual/material/screenshots/tabs/baseline/rtl-vertical-middle.png b/packages/tabs/test/visual/material/screenshots/tabs/baseline/rtl-vertical-middle.png deleted file mode 100644 index 3bd45a6215e..00000000000 Binary files a/packages/tabs/test/visual/material/screenshots/tabs/baseline/rtl-vertical-middle.png and /dev/null differ diff --git a/packages/tabs/test/visual/material/screenshots/tabs/baseline/rtl-vertical-scroll.png b/packages/tabs/test/visual/material/screenshots/tabs/baseline/rtl-vertical-scroll.png deleted file mode 100644 index d0910896966..00000000000 Binary files a/packages/tabs/test/visual/material/screenshots/tabs/baseline/rtl-vertical-scroll.png and /dev/null differ diff --git a/packages/tabs/test/visual/material/screenshots/tabs/baseline/rtl-vertical-start.png b/packages/tabs/test/visual/material/screenshots/tabs/baseline/rtl-vertical-start.png deleted file mode 100644 index ae7fa365681..00000000000 Binary files a/packages/tabs/test/visual/material/screenshots/tabs/baseline/rtl-vertical-start.png and /dev/null differ diff --git a/packages/tabs/test/visual/material/tabs.test.js b/packages/tabs/test/visual/material/tabs.test.js deleted file mode 100644 index 690c8c3c1bd..00000000000 --- a/packages/tabs/test/visual/material/tabs.test.js +++ /dev/null @@ -1,167 +0,0 @@ -import { nextFrame } from '@vaadin/testing-helpers'; -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../not-animated-styles.js'; -import '../../../theme/material/vaadin-tabs.js'; - -describe('tabs', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.padding = '10px'; - }); - - ['ltr', 'rtl'].forEach((dir) => { - describe(dir, () => { - before(() => { - document.documentElement.setAttribute('dir', dir); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - describe(`${dir}-horizontal`, () => { - beforeEach(() => { - element = fixtureSync( - ` - - Foo - Bar - Baz - - `, - div, - ); - }); - - it('start', async () => { - await visualDiff(div, `${dir}-horizontal-start`); - }); - - it('middle', async () => { - element.selected = 1; - await visualDiff(div, `${dir}-horizontal-middle`); - }); - - it('end', async () => { - element.selected = 2; - await visualDiff(div, `${dir}-horizontal-end`); - }); - }); - - describe(`${dir}-vertical`, () => { - beforeEach(() => { - element = fixtureSync( - ` - - Foo - Bar - Baz - - `, - div, - ); - }); - - it('start', async () => { - await visualDiff(div, `${dir}-vertical-start`); - }); - - it('middle', async () => { - element.selected = 1; - await visualDiff(div, `${dir}-vertical-middle`); - }); - - it('end', async () => { - element.selected = 2; - await visualDiff(div, `${dir}-vertical-end`); - }); - }); - }); - }); - - describe('anchors', () => { - beforeEach(() => { - element = fixtureSync( - ` - - Foo - Bar - Baz - - `, - div, - ); - }); - - it('horizontal', async () => { - await visualDiff(div, 'anchors-horizontal'); - }); - - it('vertical', async () => { - element.orientation = 'vertical'; - await visualDiff(div, 'anchors-vertical'); - }); - }); - - describe('scroll', () => { - ['horizontal', 'vertical'].forEach((orientation) => { - describe(orientation, () => { - beforeEach(async () => { - if (orientation === 'vertical') { - div.style.height = '150px'; - div.style.display = 'inline-flex'; - } else { - div.style.width = '400px'; - } - - element = fixtureSync( - ` - - Tab-00 - Tab-01 - Tab-02 - Tab-03 - Tab-04 - Tab-05 - Tab-06 - Tab-07 - Tab-08 - Tab-09 - Tab-10 - Tab-11 - Tab-12 - Tab-13 - Tab-14 - Tab-15 - - `, - div, - ); - - await nextFrame(); - }); - - ['ltr', 'rtl'].forEach((dir) => { - describe(dir, () => { - before(() => { - document.documentElement.setAttribute('dir', dir); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - it('selected', async () => { - element.orientation = orientation; - element.selected = 8; - await visualDiff(div, `${dir}-${orientation}-scroll`); - }); - }); - }); - }); - }); - }); -}); diff --git a/packages/tabs/theme/material/vaadin-lit-tab.js b/packages/tabs/theme/material/vaadin-lit-tab.js deleted file mode 100644 index 760d1c99bce..00000000000 --- a/packages/tabs/theme/material/vaadin-lit-tab.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-tab-styles.js'; -import '../../src/vaadin-lit-tab.js'; diff --git a/packages/tabs/theme/material/vaadin-lit-tabs.js b/packages/tabs/theme/material/vaadin-lit-tabs.js deleted file mode 100644 index e693388a6f0..00000000000 --- a/packages/tabs/theme/material/vaadin-lit-tabs.js +++ /dev/null @@ -1,3 +0,0 @@ -import './vaadin-lit-tab.js'; -import './vaadin-tabs-styles.js'; -import '../../src/vaadin-lit-tabs.js'; diff --git a/packages/tabs/theme/material/vaadin-tab-styles.js b/packages/tabs/theme/material/vaadin-tab-styles.js deleted file mode 100644 index ee8fb3a9f42..00000000000 --- a/packages/tabs/theme/material/vaadin-tab-styles.js +++ /dev/null @@ -1,141 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-tab', - css` - :host { - display: flex; - flex-direction: column; - flex-shrink: 0; - flex-grow: 1; - align-items: center; - justify-content: center; - text-align: center; - min-width: 90px; - padding: 12px 16px; - box-sizing: border-box; - font-family: var(--material-font-family); - font-size: var(--material-button-font-size); - text-transform: uppercase; - letter-spacing: 0.05em; - white-space: nowrap; - min-height: 48px; - line-height: 1.2; - font-weight: 500; - color: var(--material-secondary-text-color); - overflow: hidden; - position: relative; - cursor: pointer; - outline: none; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - transition: box-shadow 0.3s; - -webkit-user-select: none; - user-select: none; - } - - /* do not prevent click on slotted links */ - :host::before, - :host::after { - pointer-events: none; - } - - :host::before { - content: ''; - position: absolute; - inset: 0; - background-color: var(--material-primary-color); - opacity: 0; - transition: opacity 0.1s linear; - } - - :host(:hover)::before { - opacity: 0.04; - } - - :host([focus-ring])::before { - opacity: 0.1; - } - - :host([selected]) { - color: var(--material-primary-text-color); - box-shadow: inset 0 -2px 0 0 var(--material-primary-color); - } - - :host([orientation='vertical'][selected]) { - box-shadow: inset 2px 0 0 0 var(--material-primary-color); - } - - /* Ripple */ - - :host::after { - content: ''; - position: absolute; - top: 50%; - left: 50%; - width: 100px; - height: 100px; - border-radius: 50%; - transform: translate(-50%, -50%) scale(0); - background-color: var(--material-primary-color); - opacity: 0; - transition: - transform 0s cubic-bezier(0.05, 0.8, 0.5, 1), - opacity 0s linear; - } - - :host([focused]:not([focus-ring]))::after, - :host([focused][active])::after, - :host([focus-ring][selected])::after { - transform: translate(-50%, -50%) scale(3); - opacity: 0; - transition-duration: 2s, 0.6s; - } - - :host([active]:not([selected]))::after { - opacity: 0.2; - transition-duration: 2s, 0s; - } - - /* Disabled */ - :host([disabled]) { - pointer-events: none; - opacity: 1; - color: var(--material-disabled-text-color); - } - - :host ::slotted(a) { - display: flex; - align-items: center; - justify-content: center; - width: 100%; - height: 100%; - margin: -12px -16px; - padding: 12px 16px; - text-decoration: none; - color: inherit; - outline: none; - } - - /* Touch device adjustments */ - @media (pointer: coarse) { - :host(:hover)::before { - display: none; - } - } - - /* Small space between icon and label */ - ::slotted(vaadin-icon:not(:only-child)) { - margin-bottom: 8px; - } - - /* RTL specific styles */ - - :host([dir='rtl'][orientation='vertical'][selected]) { - box-shadow: inset -2px 0 0 0 var(--material-primary-color); - } - `, - { moduleId: 'material-tab' }, -); diff --git a/packages/tabs/theme/material/vaadin-tab.js b/packages/tabs/theme/material/vaadin-tab.js deleted file mode 100644 index 39a0028c526..00000000000 --- a/packages/tabs/theme/material/vaadin-tab.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-tab-styles.js'; -import '../../src/vaadin-tab.js'; diff --git a/packages/tabs/theme/material/vaadin-tabs-styles.js b/packages/tabs/theme/material/vaadin-tabs-styles.js deleted file mode 100644 index 4e3e1d12e95..00000000000 --- a/packages/tabs/theme/material/vaadin-tabs-styles.js +++ /dev/null @@ -1,88 +0,0 @@ -import '@vaadin/vaadin-material-styles/font-icons.js'; -import '@vaadin/vaadin-material-styles/color.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-tabs', - css` - :host { - -webkit-tap-highlight-color: transparent; - display: flex; - flex-shrink: 0; - } - - /* Hide scroll buttons when no needed, and on touch devices */ - - :host(:not([overflow])) [part='forward-button'], - :host(:not([overflow])) [part='back-button'] { - display: none; - } - - @media (pointer: coarse) { - [part='back-button'], - [part='forward-button'] { - display: none !important; - } - } - - [part='forward-button'], - [part='back-button'] { - font-family: material-icons; - color: var(--material-secondary-text-color); - font-size: 24px; - display: flex; - flex-shrink: 0; - flex-grow: 0; - align-items: center; - justify-content: center; - width: 48px; - height: 100%; - transition: 0.2s opacity; - top: 0; - } - - [part='forward-button']:hover, - [part='back-button']:hover { - color: inherit; - } - - :host(:not([dir='rtl'])) [part='forward-button'] { - right: 0; - } - - [part='forward-button']::after { - content: var(--material-icons-chevron-right); - } - - [part='back-button']::after { - content: var(--material-icons-chevron-left); - } - - :host([overflow]) [part='tabs']::after { - content: ''; - display: flex; - flex-shrink: 0; - width: 32px; - } - - /* Fixed width tabs */ - :host([theme~='fixed']) [part='tabs'] ::slotted(vaadin-tab) { - flex-basis: 0.0001px; - } - - /* RTL specific styles */ - - :host([dir='rtl']) [part='forward-button'] { - left: 0; - } - - :host([dir='rtl']) [part='forward-button']::after { - content: var(--material-icons-chevron-left); - } - - :host([dir='rtl']) [part='back-button']::after { - content: var(--material-icons-chevron-right); - } - `, - { moduleId: 'material-tabs' }, -); diff --git a/packages/tabs/theme/material/vaadin-tabs.js b/packages/tabs/theme/material/vaadin-tabs.js deleted file mode 100644 index 4914ad4874c..00000000000 --- a/packages/tabs/theme/material/vaadin-tabs.js +++ /dev/null @@ -1,3 +0,0 @@ -import './vaadin-tab.js'; -import './vaadin-tabs-styles.js'; -import '../../src/vaadin-tabs.js'; diff --git a/packages/tabsheet/package.json b/packages/tabsheet/package.json index 7aa6aa94349..ee0c39b56a0 100644 --- a/packages/tabsheet/package.json +++ b/packages/tabsheet/package.json @@ -41,7 +41,6 @@ "@vaadin/scroller": "25.0.0-alpha0", "@vaadin/tabs": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/tabsheet/test/visual/material/screenshots/tabsheet/baseline/ltr-bordered.png b/packages/tabsheet/test/visual/material/screenshots/tabsheet/baseline/ltr-bordered.png deleted file mode 100644 index 3d75d30143e..00000000000 Binary files a/packages/tabsheet/test/visual/material/screenshots/tabsheet/baseline/ltr-bordered.png and /dev/null differ diff --git a/packages/tabsheet/test/visual/material/screenshots/tabsheet/baseline/ltr-default.png b/packages/tabsheet/test/visual/material/screenshots/tabsheet/baseline/ltr-default.png deleted file mode 100644 index c303d915ad5..00000000000 Binary files a/packages/tabsheet/test/visual/material/screenshots/tabsheet/baseline/ltr-default.png and /dev/null differ diff --git a/packages/tabsheet/test/visual/material/screenshots/tabsheet/baseline/rtl-bordered.png b/packages/tabsheet/test/visual/material/screenshots/tabsheet/baseline/rtl-bordered.png deleted file mode 100644 index 44210767dd0..00000000000 Binary files a/packages/tabsheet/test/visual/material/screenshots/tabsheet/baseline/rtl-bordered.png and /dev/null differ diff --git a/packages/tabsheet/test/visual/material/screenshots/tabsheet/baseline/rtl-default.png b/packages/tabsheet/test/visual/material/screenshots/tabsheet/baseline/rtl-default.png deleted file mode 100644 index 7f1257b33ff..00000000000 Binary files a/packages/tabsheet/test/visual/material/screenshots/tabsheet/baseline/rtl-default.png and /dev/null differ diff --git a/packages/tabsheet/test/visual/material/tabsheet.test.js b/packages/tabsheet/test/visual/material/tabsheet.test.js deleted file mode 100644 index bad1cb2ebba..00000000000 --- a/packages/tabsheet/test/visual/material/tabsheet.test.js +++ /dev/null @@ -1,65 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '@vaadin/tabs/test/visual/not-animated-styles.js'; -import '../../../theme/material/vaadin-tabsheet.js'; - -describe('tabsheet', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.padding = '10px'; - }); - - ['ltr', 'rtl'].forEach((dir) => { - describe(dir, () => { - before(() => { - document.documentElement.setAttribute('dir', dir); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - describe(`${dir}`, () => { - beforeEach(() => { - element = fixtureSync( - ` - -
Prefix
-
Suffix
- - - Tab 1 - Tab 2 - Tab 3 - - -
- Odio quis mi. Aliquam massa pede, pharetra quis, tincidunt quis, fringilla at, mauris. Vestibulum a massa. - Vestibulum luctus odio ut quam. Maecenas congue convallis diam. Cras urna arcu, vestibulum vitae, blandit ut, - laoreet id, risus. Ut condimentum, arcu sit amet placerat blandit, augue nibh pretium nunc, in tempus sem dolor - non leo. Etiam fringilla mauris a odio. Nunc lorem diam, interdum eget, lacinia in, scelerisque sit amet, purus. - Nam ornare. Donec placerat dui ut orci. Phasellus quis lacus at nisl elementum cursus. Cras bibendum egestas - nulla. Phasellus pulvinar ullamcorper odio. Etiam ipsum. Proin tincidunt. Aliquam aliquet. -
-
Panel 2
-
Panel 3
-
- `, - div, - ); - }); - - it('default', async () => { - await visualDiff(div, `${dir}-default`); - }); - - it('bordered', async () => { - element.setAttribute('theme', 'bordered'); - await visualDiff(div, `${dir}-bordered`); - }); - }); - }); - }); -}); diff --git a/packages/tabsheet/theme/material/vaadin-lit-tabsheet.js b/packages/tabsheet/theme/material/vaadin-lit-tabsheet.js deleted file mode 100644 index d32aed38890..00000000000 --- a/packages/tabsheet/theme/material/vaadin-lit-tabsheet.js +++ /dev/null @@ -1,4 +0,0 @@ -import '@vaadin/tabs/theme/material/vaadin-lit-tabs.js'; -import '@vaadin/scroller/theme/material/vaadin-lit-scroller.js'; -import './vaadin-tabsheet-styles.js'; -import '../../src/vaadin-lit-tabsheet.js'; diff --git a/packages/tabsheet/theme/material/vaadin-tabsheet-styles.js b/packages/tabsheet/theme/material/vaadin-tabsheet-styles.js deleted file mode 100644 index 5a7b3baada3..00000000000 --- a/packages/tabsheet/theme/material/vaadin-tabsheet-styles.js +++ /dev/null @@ -1,46 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import { loader } from '@vaadin/vaadin-material-styles/mixins/loader.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const tabsheet = css` - :host { - font-family: var(--material-font-family); - } - - :host([theme~='bordered']) { - border-radius: 4px; - border: 1px solid var(--material-divider-color); - } - - [part='tabs-container'] { - box-shadow: inset 0 -1px 0 0 var(--material-divider-color); - gap: 8px; - padding: 4px 8px; - } - - ::slotted([slot='tabs']) { - margin: -4px -8px; - } - - [part='content'] { - padding: 24px; - border-bottom-left-radius: inherit; - border-bottom-right-radius: inherit; - } - - :host([loading]) [part='content'] { - overflow: visible; - } - - [part='loader'] { - position: absolute; - z-index: 1; - top: 0; - left: 0; - right: 0; - transform: translate(0, -100%); - } -`; - -registerStyles('vaadin-tabsheet', [tabsheet, loader], { moduleId: 'material-tabsheet' }); diff --git a/packages/tabsheet/theme/material/vaadin-tabsheet.js b/packages/tabsheet/theme/material/vaadin-tabsheet.js deleted file mode 100644 index 5a82913dd98..00000000000 --- a/packages/tabsheet/theme/material/vaadin-tabsheet.js +++ /dev/null @@ -1,4 +0,0 @@ -import '@vaadin/tabs/theme/material/vaadin-tabs.js'; -import '@vaadin/scroller/theme/material/vaadin-scroller.js'; -import './vaadin-tabsheet-styles.js'; -import '../../src/vaadin-tabsheet.js'; diff --git a/packages/text-area/package.json b/packages/text-area/package.json index e25ea870280..8632062c565 100644 --- a/packages/text-area/package.json +++ b/packages/text-area/package.json @@ -41,7 +41,6 @@ "@vaadin/field-base": "25.0.0-alpha0", "@vaadin/input-container": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/text-area/test/visual/material/screenshots/text-area/baseline/basic.png b/packages/text-area/test/visual/material/screenshots/text-area/baseline/basic.png deleted file mode 100644 index 3ff525574f2..00000000000 Binary files a/packages/text-area/test/visual/material/screenshots/text-area/baseline/basic.png and /dev/null differ diff --git a/packages/text-area/test/visual/material/screenshots/text-area/baseline/clear-button.png b/packages/text-area/test/visual/material/screenshots/text-area/baseline/clear-button.png deleted file mode 100644 index 447b0b898cb..00000000000 Binary files a/packages/text-area/test/visual/material/screenshots/text-area/baseline/clear-button.png and /dev/null differ diff --git a/packages/text-area/test/visual/material/screenshots/text-area/baseline/disabled.png b/packages/text-area/test/visual/material/screenshots/text-area/baseline/disabled.png deleted file mode 100644 index ec64f12dfd0..00000000000 Binary files a/packages/text-area/test/visual/material/screenshots/text-area/baseline/disabled.png and /dev/null differ diff --git a/packages/text-area/test/visual/material/screenshots/text-area/baseline/error-message.png b/packages/text-area/test/visual/material/screenshots/text-area/baseline/error-message.png deleted file mode 100644 index bb5ed04fdf6..00000000000 Binary files a/packages/text-area/test/visual/material/screenshots/text-area/baseline/error-message.png and /dev/null differ diff --git a/packages/text-area/test/visual/material/screenshots/text-area/baseline/flex.png b/packages/text-area/test/visual/material/screenshots/text-area/baseline/flex.png deleted file mode 100644 index 687f3a14527..00000000000 Binary files a/packages/text-area/test/visual/material/screenshots/text-area/baseline/flex.png and /dev/null differ diff --git a/packages/text-area/test/visual/material/screenshots/text-area/baseline/helper-text.png b/packages/text-area/test/visual/material/screenshots/text-area/baseline/helper-text.png deleted file mode 100644 index ec3faacc9f5..00000000000 Binary files a/packages/text-area/test/visual/material/screenshots/text-area/baseline/helper-text.png and /dev/null differ diff --git a/packages/text-area/test/visual/material/screenshots/text-area/baseline/invalid.png b/packages/text-area/test/visual/material/screenshots/text-area/baseline/invalid.png deleted file mode 100644 index 9d05383e742..00000000000 Binary files a/packages/text-area/test/visual/material/screenshots/text-area/baseline/invalid.png and /dev/null differ diff --git a/packages/text-area/test/visual/material/screenshots/text-area/baseline/label.png b/packages/text-area/test/visual/material/screenshots/text-area/baseline/label.png deleted file mode 100644 index 41644652a86..00000000000 Binary files a/packages/text-area/test/visual/material/screenshots/text-area/baseline/label.png and /dev/null differ diff --git a/packages/text-area/test/visual/material/screenshots/text-area/baseline/max-rows.png b/packages/text-area/test/visual/material/screenshots/text-area/baseline/max-rows.png deleted file mode 100644 index 252f9799825..00000000000 Binary files a/packages/text-area/test/visual/material/screenshots/text-area/baseline/max-rows.png and /dev/null differ diff --git a/packages/text-area/test/visual/material/screenshots/text-area/baseline/min-rows.png b/packages/text-area/test/visual/material/screenshots/text-area/baseline/min-rows.png deleted file mode 100644 index 10a4d7c77d4..00000000000 Binary files a/packages/text-area/test/visual/material/screenshots/text-area/baseline/min-rows.png and /dev/null differ diff --git a/packages/text-area/test/visual/material/screenshots/text-area/baseline/placeholder.png b/packages/text-area/test/visual/material/screenshots/text-area/baseline/placeholder.png deleted file mode 100644 index a937905e416..00000000000 Binary files a/packages/text-area/test/visual/material/screenshots/text-area/baseline/placeholder.png and /dev/null differ diff --git a/packages/text-area/test/visual/material/screenshots/text-area/baseline/prefix.png b/packages/text-area/test/visual/material/screenshots/text-area/baseline/prefix.png deleted file mode 100644 index 4d3801e47bc..00000000000 Binary files a/packages/text-area/test/visual/material/screenshots/text-area/baseline/prefix.png and /dev/null differ diff --git a/packages/text-area/test/visual/material/screenshots/text-area/baseline/readonly.png b/packages/text-area/test/visual/material/screenshots/text-area/baseline/readonly.png deleted file mode 100644 index 3ff525574f2..00000000000 Binary files a/packages/text-area/test/visual/material/screenshots/text-area/baseline/readonly.png and /dev/null differ diff --git a/packages/text-area/test/visual/material/screenshots/text-area/baseline/required.png b/packages/text-area/test/visual/material/screenshots/text-area/baseline/required.png deleted file mode 100644 index 5d6459a7028..00000000000 Binary files a/packages/text-area/test/visual/material/screenshots/text-area/baseline/required.png and /dev/null differ diff --git a/packages/text-area/test/visual/material/screenshots/text-area/baseline/scrolled-with-prefix-suffix-clear-button.png b/packages/text-area/test/visual/material/screenshots/text-area/baseline/scrolled-with-prefix-suffix-clear-button.png deleted file mode 100644 index 6aded42b062..00000000000 Binary files a/packages/text-area/test/visual/material/screenshots/text-area/baseline/scrolled-with-prefix-suffix-clear-button.png and /dev/null differ diff --git a/packages/text-area/test/visual/material/screenshots/text-area/baseline/scrolled.png b/packages/text-area/test/visual/material/screenshots/text-area/baseline/scrolled.png deleted file mode 100644 index 40a51f60ca1..00000000000 Binary files a/packages/text-area/test/visual/material/screenshots/text-area/baseline/scrolled.png and /dev/null differ diff --git a/packages/text-area/test/visual/material/screenshots/text-area/baseline/single-row.png b/packages/text-area/test/visual/material/screenshots/text-area/baseline/single-row.png deleted file mode 100644 index ff964517a86..00000000000 Binary files a/packages/text-area/test/visual/material/screenshots/text-area/baseline/single-row.png and /dev/null differ diff --git a/packages/text-area/test/visual/material/screenshots/text-area/baseline/suffix.png b/packages/text-area/test/visual/material/screenshots/text-area/baseline/suffix.png deleted file mode 100644 index fb91d3932ff..00000000000 Binary files a/packages/text-area/test/visual/material/screenshots/text-area/baseline/suffix.png and /dev/null differ diff --git a/packages/text-area/test/visual/material/screenshots/text-area/baseline/value.png b/packages/text-area/test/visual/material/screenshots/text-area/baseline/value.png deleted file mode 100644 index 12e66b24375..00000000000 Binary files a/packages/text-area/test/visual/material/screenshots/text-area/baseline/value.png and /dev/null differ diff --git a/packages/text-area/test/visual/material/text-area.test.js b/packages/text-area/test/visual/material/text-area.test.js deleted file mode 100644 index 845efb0c3e1..00000000000 --- a/packages/text-area/test/visual/material/text-area.test.js +++ /dev/null @@ -1,143 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../common.js'; -import '../../../theme/material/vaadin-text-area.js'; - -describe('text-area', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - div.style.padding = '10px'; - element = fixtureSync('', div); - }); - - it('basic', async () => { - await visualDiff(div, 'basic'); - }); - - it('disabled', async () => { - element.disabled = true; - await visualDiff(div, 'disabled'); - }); - - it('readonly', async () => { - element.readonly = true; - await visualDiff(div, 'readonly'); - }); - - it('flex', async () => { - div.style.display = 'inline-flex'; - div.style.height = '200px'; - await visualDiff(div, 'flex'); - }); - - it('label', async () => { - element.label = 'Label'; - await visualDiff(div, 'label'); - }); - - it('placeholder', async () => { - element.placeholder = 'Placeholder'; - await visualDiff(div, 'placeholder'); - }); - - it('value', async () => { - element.value = 'value'; - await visualDiff(div, 'value'); - }); - - it('required', async () => { - element.label = 'Label'; - element.required = true; - await visualDiff(div, 'required'); - }); - - it('invalid', async () => { - element.invalid = true; - await visualDiff(div, 'invalid'); - }); - - it('scrolled', async () => { - element.style.height = '70px'; - element.value = 'a\nb\nc\nd\ne'; - element.focus(); - await visualDiff(div, 'scrolled'); - }); - - it('scrolled with prefix, suffix, clear button', async () => { - const prefix = document.createElement('span'); - prefix.setAttribute('slot', 'prefix'); - prefix.textContent = '$'; - element.appendChild(prefix); - - const suffix = document.createElement('span'); - suffix.setAttribute('slot', 'suffix'); - suffix.textContent = '$'; - element.appendChild(suffix); - - element.clearButtonVisible = true; - element.style.height = '70px'; - element.value = 'a\nb\nc\nd\ne'; - element.focus(); - await visualDiff(div, 'scrolled-with-prefix-suffix-clear-button'); - }); - - it('error message', async () => { - element.label = 'Label'; - element.errorMessage = 'This field is required'; - element.required = true; - element.validate(); - await visualDiff(div, 'error-message'); - }); - - it('helper text', async () => { - element.helperText = 'Helper text'; - await visualDiff(div, 'helper-text'); - }); - - it('clear button', async () => { - element.value = 'value'; - element.clearButtonVisible = true; - await visualDiff(div, 'clear-button'); - }); - - it('prefix slot', async () => { - const span = document.createElement('span'); - span.setAttribute('slot', 'prefix'); - span.textContent = '$'; - element.appendChild(span); - element.value = 'value'; - await visualDiff(div, 'prefix'); - }); - - it('suffix slot', async () => { - const span = document.createElement('span'); - span.setAttribute('slot', 'suffix'); - span.textContent = '$'; - element.appendChild(span); - element.value = 'value'; - await visualDiff(div, 'suffix'); - }); - - it('min-rows', async () => { - element.value = 'value'; - element.minRows = 4; - await visualDiff(div, 'min-rows'); - }); - - it('max-rows', async () => { - element.value = Array(10).join('value\n'); - element.maxRows = 4; - await visualDiff(div, 'max-rows'); - }); - - it('single-row', async () => { - element.minRows = 1; - element.value = 'value'; - element.clearButtonVisible = true; - - await visualDiff(div, 'single-row'); - }); -}); diff --git a/packages/text-area/theme/material/vaadin-lit-text-area.js b/packages/text-area/theme/material/vaadin-lit-text-area.js deleted file mode 100644 index 3f66baa289f..00000000000 --- a/packages/text-area/theme/material/vaadin-lit-text-area.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-text-area-styles.js'; -import '../../src/vaadin-lit-text-area.js'; diff --git a/packages/text-area/theme/material/vaadin-text-area-styles.js b/packages/text-area/theme/material/vaadin-text-area-styles.js deleted file mode 100644 index cd8cc37d3ce..00000000000 --- a/packages/text-area/theme/material/vaadin-text-area-styles.js +++ /dev/null @@ -1,42 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import '@vaadin/input-container/theme/material/vaadin-input-container-styles.js'; -import { inputFieldShared } from '@vaadin/vaadin-material-styles/mixins/input-field-shared.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const textArea = css` - [part='input-field'] { - height: auto; - box-sizing: border-box; - } - - [part='input-field'] ::slotted(textarea) { - padding-top: 0; - padding-bottom: 4px; - margin-top: 4px; - } - - [part='input-field']::before, - [part='input-field']::after { - bottom: calc(var(--_text-area-vertical-scroll-position) * -1); - } - - /* Use sticky positioning to keep prefix/suffix/clear button visible when scrolling textarea container */ - [part='input-field'] ::slotted([slot$='fix']), - [part='clear-button'] { - position: sticky; - top: 0; - align-self: flex-start; - } - - /* Align prefix/suffix icon or text with native textarea */ - [part='input-field'] ::slotted([slot$='fix']) { - top: 4px; - margin-top: 4px; - } -`; - -registerStyles('vaadin-text-area', [inputFieldShared, textArea], { moduleId: 'material-text-area' }); diff --git a/packages/text-area/theme/material/vaadin-text-area.js b/packages/text-area/theme/material/vaadin-text-area.js deleted file mode 100644 index e1180fe3c77..00000000000 --- a/packages/text-area/theme/material/vaadin-text-area.js +++ /dev/null @@ -1,7 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import './vaadin-text-area-styles.js'; -import '../../src/vaadin-text-area.js'; diff --git a/packages/text-field/package.json b/packages/text-field/package.json index b73caab00d4..fceeee80a14 100644 --- a/packages/text-field/package.json +++ b/packages/text-field/package.json @@ -41,7 +41,6 @@ "@vaadin/field-base": "25.0.0-alpha0", "@vaadin/input-container": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/text-field/test/visual/material/screenshots/text-field/baseline/basic.png b/packages/text-field/test/visual/material/screenshots/text-field/baseline/basic.png deleted file mode 100644 index b3cd944a483..00000000000 Binary files a/packages/text-field/test/visual/material/screenshots/text-field/baseline/basic.png and /dev/null differ diff --git a/packages/text-field/test/visual/material/screenshots/text-field/baseline/clear-button.png b/packages/text-field/test/visual/material/screenshots/text-field/baseline/clear-button.png deleted file mode 100644 index ff964517a86..00000000000 Binary files a/packages/text-field/test/visual/material/screenshots/text-field/baseline/clear-button.png and /dev/null differ diff --git a/packages/text-field/test/visual/material/screenshots/text-field/baseline/disabled.png b/packages/text-field/test/visual/material/screenshots/text-field/baseline/disabled.png deleted file mode 100644 index 0c2fb9d66f3..00000000000 Binary files a/packages/text-field/test/visual/material/screenshots/text-field/baseline/disabled.png and /dev/null differ diff --git a/packages/text-field/test/visual/material/screenshots/text-field/baseline/error-message.png b/packages/text-field/test/visual/material/screenshots/text-field/baseline/error-message.png deleted file mode 100644 index 7eef5b85574..00000000000 Binary files a/packages/text-field/test/visual/material/screenshots/text-field/baseline/error-message.png and /dev/null differ diff --git a/packages/text-field/test/visual/material/screenshots/text-field/baseline/flex.png b/packages/text-field/test/visual/material/screenshots/text-field/baseline/flex.png deleted file mode 100644 index 06dff432a04..00000000000 Binary files a/packages/text-field/test/visual/material/screenshots/text-field/baseline/flex.png and /dev/null differ diff --git a/packages/text-field/test/visual/material/screenshots/text-field/baseline/focus-ring.png b/packages/text-field/test/visual/material/screenshots/text-field/baseline/focus-ring.png deleted file mode 100644 index 64e12a20817..00000000000 Binary files a/packages/text-field/test/visual/material/screenshots/text-field/baseline/focus-ring.png and /dev/null differ diff --git a/packages/text-field/test/visual/material/screenshots/text-field/baseline/helper-text.png b/packages/text-field/test/visual/material/screenshots/text-field/baseline/helper-text.png deleted file mode 100644 index 880e69a39c0..00000000000 Binary files a/packages/text-field/test/visual/material/screenshots/text-field/baseline/helper-text.png and /dev/null differ diff --git a/packages/text-field/test/visual/material/screenshots/text-field/baseline/invalid.png b/packages/text-field/test/visual/material/screenshots/text-field/baseline/invalid.png deleted file mode 100644 index c2fc05d0d7b..00000000000 Binary files a/packages/text-field/test/visual/material/screenshots/text-field/baseline/invalid.png and /dev/null differ diff --git a/packages/text-field/test/visual/material/screenshots/text-field/baseline/label.png b/packages/text-field/test/visual/material/screenshots/text-field/baseline/label.png deleted file mode 100644 index 9d52f89b6ba..00000000000 Binary files a/packages/text-field/test/visual/material/screenshots/text-field/baseline/label.png and /dev/null differ diff --git a/packages/text-field/test/visual/material/screenshots/text-field/baseline/placeholder.png b/packages/text-field/test/visual/material/screenshots/text-field/baseline/placeholder.png deleted file mode 100644 index b0681b6bf52..00000000000 Binary files a/packages/text-field/test/visual/material/screenshots/text-field/baseline/placeholder.png and /dev/null differ diff --git a/packages/text-field/test/visual/material/screenshots/text-field/baseline/prefix.png b/packages/text-field/test/visual/material/screenshots/text-field/baseline/prefix.png deleted file mode 100644 index 4f2246c17a1..00000000000 Binary files a/packages/text-field/test/visual/material/screenshots/text-field/baseline/prefix.png and /dev/null differ diff --git a/packages/text-field/test/visual/material/screenshots/text-field/baseline/readonly.png b/packages/text-field/test/visual/material/screenshots/text-field/baseline/readonly.png deleted file mode 100644 index b3cd944a483..00000000000 Binary files a/packages/text-field/test/visual/material/screenshots/text-field/baseline/readonly.png and /dev/null differ diff --git a/packages/text-field/test/visual/material/screenshots/text-field/baseline/required.png b/packages/text-field/test/visual/material/screenshots/text-field/baseline/required.png deleted file mode 100644 index 0d0a1e6ec49..00000000000 Binary files a/packages/text-field/test/visual/material/screenshots/text-field/baseline/required.png and /dev/null differ diff --git a/packages/text-field/test/visual/material/screenshots/text-field/baseline/rtl-error-message.png b/packages/text-field/test/visual/material/screenshots/text-field/baseline/rtl-error-message.png deleted file mode 100644 index 7c524699899..00000000000 Binary files a/packages/text-field/test/visual/material/screenshots/text-field/baseline/rtl-error-message.png and /dev/null differ diff --git a/packages/text-field/test/visual/material/screenshots/text-field/baseline/rtl-label.png b/packages/text-field/test/visual/material/screenshots/text-field/baseline/rtl-label.png deleted file mode 100644 index 3837f59b211..00000000000 Binary files a/packages/text-field/test/visual/material/screenshots/text-field/baseline/rtl-label.png and /dev/null differ diff --git a/packages/text-field/test/visual/material/screenshots/text-field/baseline/rtl-prefix.png b/packages/text-field/test/visual/material/screenshots/text-field/baseline/rtl-prefix.png deleted file mode 100644 index df393a264a5..00000000000 Binary files a/packages/text-field/test/visual/material/screenshots/text-field/baseline/rtl-prefix.png and /dev/null differ diff --git a/packages/text-field/test/visual/material/screenshots/text-field/baseline/rtl-suffix.png b/packages/text-field/test/visual/material/screenshots/text-field/baseline/rtl-suffix.png deleted file mode 100644 index 30da8da8d57..00000000000 Binary files a/packages/text-field/test/visual/material/screenshots/text-field/baseline/rtl-suffix.png and /dev/null differ diff --git a/packages/text-field/test/visual/material/screenshots/text-field/baseline/suffix.png b/packages/text-field/test/visual/material/screenshots/text-field/baseline/suffix.png deleted file mode 100644 index 57c406d1615..00000000000 Binary files a/packages/text-field/test/visual/material/screenshots/text-field/baseline/suffix.png and /dev/null differ diff --git a/packages/text-field/test/visual/material/screenshots/text-field/baseline/value.png b/packages/text-field/test/visual/material/screenshots/text-field/baseline/value.png deleted file mode 100644 index 7643bad94e8..00000000000 Binary files a/packages/text-field/test/visual/material/screenshots/text-field/baseline/value.png and /dev/null differ diff --git a/packages/text-field/test/visual/material/text-field.test.js b/packages/text-field/test/visual/material/text-field.test.js deleted file mode 100644 index 94be3af7681..00000000000 --- a/packages/text-field/test/visual/material/text-field.test.js +++ /dev/null @@ -1,141 +0,0 @@ -import { sendKeys } from '@vaadin/test-runner-commands'; -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../common.js'; -import '../../../theme/material/vaadin-text-field.js'; - -describe('text-field', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - div.style.padding = '10px'; - element = fixtureSync('', div); - }); - - it('basic', async () => { - await visualDiff(div, 'basic'); - }); - - it('focus-ring', async () => { - await sendKeys({ press: 'Tab' }); - await visualDiff(div, 'focus-ring'); - }); - - it('disabled', async () => { - element.disabled = true; - await visualDiff(div, 'disabled'); - }); - - it('readonly', async () => { - element.readonly = true; - await visualDiff(div, 'readonly'); - }); - - it('flex', async () => { - div.style.display = 'inline-flex'; - div.style.height = '200px'; - await visualDiff(div, 'flex'); - }); - - it('label', async () => { - element.label = 'Label'; - await visualDiff(div, 'label'); - }); - - it('placeholder', async () => { - element.placeholder = 'Placeholder'; - await visualDiff(div, 'placeholder'); - }); - - it('value', async () => { - element.value = 'value'; - await visualDiff(div, 'value'); - }); - - it('required', async () => { - element.label = 'Label'; - element.required = true; - await visualDiff(div, 'required'); - }); - - it('invalid', async () => { - element.invalid = true; - await visualDiff(div, 'invalid'); - }); - - it('error message', async () => { - element.label = 'Label'; - element.errorMessage = 'This field is required'; - element.required = true; - element.validate(); - await visualDiff(div, 'error-message'); - }); - - it('helper text', async () => { - element.helperText = 'Helper text'; - await visualDiff(div, 'helper-text'); - }); - - it('clear button', async () => { - element.value = 'value'; - element.clearButtonVisible = true; - await visualDiff(div, 'clear-button'); - }); - - it('prefix slot', async () => { - const span = document.createElement('span'); - span.setAttribute('slot', 'prefix'); - span.textContent = '$'; - element.appendChild(span); - await visualDiff(div, 'prefix'); - }); - - it('suffix slot', async () => { - const span = document.createElement('span'); - span.setAttribute('slot', 'suffix'); - span.textContent = '$'; - element.appendChild(span); - await visualDiff(div, 'suffix'); - }); - - describe('RTL', () => { - before(() => { - document.documentElement.setAttribute('dir', 'rtl'); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - it('RTL label', async () => { - element.label = 'نام کالا'; - await visualDiff(div, 'rtl-label'); - }); - - it('RTL prefix', async () => { - const span = document.createElement('span'); - span.setAttribute('slot', 'prefix'); - span.textContent = 'قیمت'; - element.appendChild(span); - await visualDiff(div, 'rtl-prefix'); - }); - - it('RTL suffix', async () => { - const span = document.createElement('span'); - span.setAttribute('slot', 'suffix'); - span.textContent = 'تومان'; - element.appendChild(span); - await visualDiff(div, 'rtl-suffix'); - }); - - it('RTL error message', async () => { - element.label = 'نام کالا'; - element.errorMessage = 'خطا'; - element.required = true; - element.validate(); - await visualDiff(div, 'rtl-error-message'); - }); - }); -}); diff --git a/packages/text-field/theme/material/vaadin-lit-text-field.js b/packages/text-field/theme/material/vaadin-lit-text-field.js deleted file mode 100644 index b43e469f2b9..00000000000 --- a/packages/text-field/theme/material/vaadin-lit-text-field.js +++ /dev/null @@ -1,7 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import './vaadin-text-field-styles.js'; -import '../../src/vaadin-lit-text-field.js'; diff --git a/packages/text-field/theme/material/vaadin-text-field-styles.js b/packages/text-field/theme/material/vaadin-text-field-styles.js deleted file mode 100644 index 46b7d66372a..00000000000 --- a/packages/text-field/theme/material/vaadin-text-field-styles.js +++ /dev/null @@ -1,12 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import '@vaadin/input-container/theme/material/vaadin-input-container-styles.js'; -import { inputFieldShared } from '@vaadin/vaadin-material-styles/mixins/input-field-shared.js'; -import { registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles('vaadin-text-field', inputFieldShared, { - moduleId: 'material-text-field-styles', -}); diff --git a/packages/text-field/theme/material/vaadin-text-field.js b/packages/text-field/theme/material/vaadin-text-field.js deleted file mode 100644 index ff23769f367..00000000000 --- a/packages/text-field/theme/material/vaadin-text-field.js +++ /dev/null @@ -1,7 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import './vaadin-text-field-styles.js'; -import '../../src/vaadin-text-field.js'; diff --git a/packages/time-picker/package.json b/packages/time-picker/package.json index fbc9d1d93cb..d03948e0b08 100644 --- a/packages/time-picker/package.json +++ b/packages/time-picker/package.json @@ -44,7 +44,6 @@ "@vaadin/item": "25.0.0-alpha0", "@vaadin/overlay": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/basic.png b/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/basic.png deleted file mode 100644 index 8f6b9e54896..00000000000 Binary files a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/basic.png and /dev/null differ diff --git a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/disabled.png b/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/disabled.png deleted file mode 100644 index 22fb1b706a4..00000000000 Binary files a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/disabled.png and /dev/null differ diff --git a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/focus-ring.png b/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/focus-ring.png deleted file mode 100644 index 903f1c4acb3..00000000000 Binary files a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/focus-ring.png and /dev/null differ diff --git a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/ltr-clear-button.png b/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/ltr-clear-button.png deleted file mode 100644 index f7cd8579fd0..00000000000 Binary files a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/ltr-clear-button.png and /dev/null differ diff --git a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/ltr-error-message.png b/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/ltr-error-message.png deleted file mode 100644 index 735eebb7b0a..00000000000 Binary files a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/ltr-error-message.png and /dev/null differ diff --git a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/ltr-helper-text.png b/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/ltr-helper-text.png deleted file mode 100644 index d2bd41249f5..00000000000 Binary files a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/ltr-helper-text.png and /dev/null differ diff --git a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/ltr-label.png b/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/ltr-label.png deleted file mode 100644 index dd7f10f3377..00000000000 Binary files a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/ltr-label.png and /dev/null differ diff --git a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/ltr-opened.png b/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/ltr-opened.png deleted file mode 100644 index 4116e65ffa7..00000000000 Binary files a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/ltr-opened.png and /dev/null differ diff --git a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/ltr-placeholder.png b/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/ltr-placeholder.png deleted file mode 100644 index a9ea6c9e33e..00000000000 Binary files a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/ltr-placeholder.png and /dev/null differ diff --git a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/ltr-required.png b/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/ltr-required.png deleted file mode 100644 index aebead68eb6..00000000000 Binary files a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/ltr-required.png and /dev/null differ diff --git a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/ltr-value.png b/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/ltr-value.png deleted file mode 100644 index 44fac40c67d..00000000000 Binary files a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/ltr-value.png and /dev/null differ diff --git a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/readonly.png b/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/readonly.png deleted file mode 100644 index e55aecb1a15..00000000000 Binary files a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/readonly.png and /dev/null differ diff --git a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/rtl-clear-button.png b/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/rtl-clear-button.png deleted file mode 100644 index f7cd8579fd0..00000000000 Binary files a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/rtl-clear-button.png and /dev/null differ diff --git a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/rtl-error-message.png b/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/rtl-error-message.png deleted file mode 100644 index 0af3165686b..00000000000 Binary files a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/rtl-error-message.png and /dev/null differ diff --git a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/rtl-helper-text.png b/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/rtl-helper-text.png deleted file mode 100644 index 586597b1f16..00000000000 Binary files a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/rtl-helper-text.png and /dev/null differ diff --git a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/rtl-label.png b/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/rtl-label.png deleted file mode 100644 index 31c8e68b2f5..00000000000 Binary files a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/rtl-label.png and /dev/null differ diff --git a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/rtl-opened.png b/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/rtl-opened.png deleted file mode 100644 index 69ab7c2c5b2..00000000000 Binary files a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/rtl-opened.png and /dev/null differ diff --git a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/rtl-placeholder.png b/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/rtl-placeholder.png deleted file mode 100644 index a9ea6c9e33e..00000000000 Binary files a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/rtl-placeholder.png and /dev/null differ diff --git a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/rtl-required.png b/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/rtl-required.png deleted file mode 100644 index 660d79e3af3..00000000000 Binary files a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/rtl-required.png and /dev/null differ diff --git a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/rtl-value.png b/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/rtl-value.png deleted file mode 100644 index 44fac40c67d..00000000000 Binary files a/packages/time-picker/test/visual/material/screenshots/time-picker/baseline/rtl-value.png and /dev/null differ diff --git a/packages/time-picker/test/visual/material/time-picker.test.js b/packages/time-picker/test/visual/material/time-picker.test.js deleted file mode 100644 index 32c295d5f9b..00000000000 --- a/packages/time-picker/test/visual/material/time-picker.test.js +++ /dev/null @@ -1,101 +0,0 @@ -import { sendKeys } from '@vaadin/test-runner-commands'; -import { fixtureSync, mousedown } from '@vaadin/testing-helpers'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../common.js'; -import '../../../theme/material/vaadin-time-picker.js'; - -describe('time-picker', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'inline-block'; - div.style.padding = '10px'; - element = fixtureSync('', div); - element.style.setProperty('--vaadin-time-picker-overlay-max-height', '300px'); - }); - - it('basic', async () => { - await visualDiff(div, 'basic'); - }); - - it('focus-ring', async () => { - await sendKeys({ press: 'Tab' }); - - await visualDiff(div, 'focus-ring'); - - // at this moment focus-utils.js -> isKeyboardActive is true. - // Click once here to reset it so other tests are not affected by it. - // A focus-ring would be shown in other tests otherwise. - mousedown(document.body); - }); - - it('disabled', async () => { - element.disabled = true; - await visualDiff(div, 'disabled'); - }); - - it('readonly', async () => { - element.readonly = true; - await visualDiff(div, 'readonly'); - }); - - ['ltr', 'rtl'].forEach((dir) => { - describe(dir, () => { - before(() => { - document.documentElement.setAttribute('dir', dir); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - it('label', async () => { - element.label = 'Label'; - await visualDiff(div, `${dir}-label`); - }); - - it('placeholder', async () => { - element.placeholder = 'Placeholder'; - await visualDiff(div, `${dir}-placeholder`); - }); - - it('value', async () => { - element.value = '12:12:12.122'; - await visualDiff(div, `${dir}-value`); - }); - - it('required', async () => { - element.label = 'Label'; - element.required = true; - await visualDiff(div, `${dir}-required`); - }); - - it('error message', async () => { - element.label = 'Label'; - element.errorMessage = 'This field is required'; - element.required = true; - element.validate(); - await visualDiff(div, `${dir}-error-message`); - }); - - it('helper text', async () => { - element.helperText = 'Helper text'; - await visualDiff(div, `${dir}-helper-text`); - }); - - it('clear button', async () => { - element.value = '12:12:12.122'; - element.clearButtonVisible = true; - await visualDiff(div, `${dir}-clear-button`); - }); - - it('opened', async () => { - div.style.height = '350px'; - div.style.width = '200px'; - element.click(); - await visualDiff(div, `${dir}-opened`); - }); - }); - }); -}); diff --git a/packages/time-picker/theme/material/vaadin-lit-time-picker.js b/packages/time-picker/theme/material/vaadin-lit-time-picker.js deleted file mode 100644 index 1b82d2585fe..00000000000 --- a/packages/time-picker/theme/material/vaadin-lit-time-picker.js +++ /dev/null @@ -1,7 +0,0 @@ -/** - * @license - * Copyright (c) 2018 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import './vaadin-time-picker-styles.js'; -import '../../src/vaadin-lit-time-picker.js'; diff --git a/packages/time-picker/theme/material/vaadin-time-picker-styles.js b/packages/time-picker/theme/material/vaadin-time-picker-styles.js deleted file mode 100644 index b7d20fbd3d9..00000000000 --- a/packages/time-picker/theme/material/vaadin-time-picker-styles.js +++ /dev/null @@ -1,42 +0,0 @@ -/** - * @license - * Copyright (c) 2018 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import '@vaadin/input-container/theme/material/vaadin-input-container-styles.js'; -import '@vaadin/vaadin-material-styles/font-icons.js'; -import { comboBoxItem } from '@vaadin/combo-box/theme/material/vaadin-combo-box-item-styles.js'; -import { comboBoxOverlay } from '@vaadin/combo-box/theme/material/vaadin-combo-box-overlay-styles.js'; -import { item } from '@vaadin/item/theme/material/vaadin-item-styles.js'; -import { inputFieldShared } from '@vaadin/vaadin-material-styles/mixins/input-field-shared.js'; -import { menuOverlay } from '@vaadin/vaadin-material-styles/mixins/menu-overlay.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles('vaadin-time-picker-item', [item, comboBoxItem], { - moduleId: 'material-time-picker-item', -}); - -registerStyles( - 'vaadin-time-picker-overlay', - [ - menuOverlay, - comboBoxOverlay, - css` - :host { - --_vaadin-time-picker-items-container-border-width: 8px 0; - --_vaadin-time-picker-items-container-border-style: solid; - } - `, - ], - { - moduleId: 'material-time-picker-overlay', - }, -); - -const timePicker = css` - [part~='toggle-button']::before { - content: var(--material-icons-clock); - } -`; - -registerStyles('vaadin-time-picker', [inputFieldShared, timePicker], { moduleId: 'material-time-picker' }); diff --git a/packages/time-picker/theme/material/vaadin-time-picker.js b/packages/time-picker/theme/material/vaadin-time-picker.js deleted file mode 100644 index f1e7becabf1..00000000000 --- a/packages/time-picker/theme/material/vaadin-time-picker.js +++ /dev/null @@ -1,7 +0,0 @@ -/** - * @license - * Copyright (c) 2018 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import './vaadin-time-picker-styles.js'; -import '../../src/vaadin-time-picker.js'; diff --git a/packages/tooltip/package.json b/packages/tooltip/package.json index 40ba751e467..31a11a15b6f 100644 --- a/packages/tooltip/package.json +++ b/packages/tooltip/package.json @@ -41,7 +41,6 @@ "@vaadin/overlay": "25.0.0-alpha0", "@vaadin/popover": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/bottom-end.png b/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/bottom-end.png deleted file mode 100644 index 92dc7d44bb1..00000000000 Binary files a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/bottom-end.png and /dev/null differ diff --git a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/bottom-start.png b/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/bottom-start.png deleted file mode 100644 index 33c30af2cfe..00000000000 Binary files a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/bottom-start.png and /dev/null differ diff --git a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/bottom.png b/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/bottom.png deleted file mode 100644 index f713078d89f..00000000000 Binary files a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/bottom.png and /dev/null differ diff --git a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/end-bottom.png b/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/end-bottom.png deleted file mode 100644 index c810cd16fff..00000000000 Binary files a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/end-bottom.png and /dev/null differ diff --git a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/end-top.png b/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/end-top.png deleted file mode 100644 index 0bcfd661a3c..00000000000 Binary files a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/end-top.png and /dev/null differ diff --git a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/end.png b/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/end.png deleted file mode 100644 index 19240d25287..00000000000 Binary files a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/end.png and /dev/null differ diff --git a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/max-width.png b/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/max-width.png deleted file mode 100644 index a09adf4f593..00000000000 Binary files a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/max-width.png and /dev/null differ diff --git a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/start-bottom.png b/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/start-bottom.png deleted file mode 100644 index df56d7bac0a..00000000000 Binary files a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/start-bottom.png and /dev/null differ diff --git a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/start-top.png b/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/start-top.png deleted file mode 100644 index c94ed6b33cf..00000000000 Binary files a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/start-top.png and /dev/null differ diff --git a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/start.png b/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/start.png deleted file mode 100644 index 7218ed4e81e..00000000000 Binary files a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/start.png and /dev/null differ diff --git a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/theme-dark.png b/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/theme-dark.png deleted file mode 100644 index ba941b6e680..00000000000 Binary files a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/theme-dark.png and /dev/null differ diff --git a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/top-end.png b/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/top-end.png deleted file mode 100644 index 1c10219ade7..00000000000 Binary files a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/top-end.png and /dev/null differ diff --git a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/top-start.png b/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/top-start.png deleted file mode 100644 index a7c922d6aad..00000000000 Binary files a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/top-start.png and /dev/null differ diff --git a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/top.png b/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/top.png deleted file mode 100644 index d5a9a174f3a..00000000000 Binary files a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/top.png and /dev/null differ diff --git a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/white-space-pre.png b/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/white-space-pre.png deleted file mode 100644 index fe46bb08d09..00000000000 Binary files a/packages/tooltip/test/visual/material/screenshots/tooltip/baseline/white-space-pre.png and /dev/null differ diff --git a/packages/tooltip/test/visual/material/tooltip.test.js b/packages/tooltip/test/visual/material/tooltip.test.js deleted file mode 100644 index 697a7156713..00000000000 --- a/packages/tooltip/test/visual/material/tooltip.test.js +++ /dev/null @@ -1,78 +0,0 @@ -import { fire, fixtureSync } from '@vaadin/testing-helpers'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../not-animated-styles.js'; -import '../../../theme/material/vaadin-tooltip.js'; -import { colorDark } from '@vaadin/vaadin-material-styles/color.js'; -import { Tooltip } from '../../../src/vaadin-tooltip.js'; - -describe('tooltip', () => { - let div, target, element; - - before(() => { - Tooltip.setDefaultFocusDelay(0); - Tooltip.setDefaultHoverDelay(0); - Tooltip.setDefaultHideDelay(0); - }); - - beforeEach(() => { - element = fixtureSync(''); - div = fixtureSync(` -
-
-
- `); - target = div.firstElementChild; - element.target = target; - }); - - [ - 'top-start', - 'top', - 'top-end', - 'bottom-start', - 'bottom', - 'bottom-end', - 'start-top', - 'start', - 'start-bottom', - 'end-top', - 'end', - 'end-bottom', - ].forEach((position) => { - it(position, async () => { - element.position = position; - fire(target, 'mouseenter'); - await visualDiff(div, position); - }); - }); - - describe('dark', () => { - before(() => { - const style = document.createElement('style'); - style.innerHTML = `${colorDark.toString().replace(':host', 'html')}`; - document.head.appendChild(style); - document.documentElement.setAttribute('theme', 'dark'); - }); - - after(() => { - document.documentElement.removeAttribute('theme'); - }); - - it('theme-dark', async () => { - fire(target, 'mouseenter'); - await visualDiff(div, 'theme-dark'); - }); - }); - - it('max-width', async () => { - element.text = 'This is a tooltip with a long text (more than 40 chars), it should wrap in 2 lines for readability'; - fire(target, 'mouseenter'); - await visualDiff(div, 'max-width'); - }); - - it('white-space-pre', async () => { - element.text = 'Line 1\n\nLine 2'; - fire(target, 'mouseenter'); - await visualDiff(div, 'white-space-pre'); - }); -}); diff --git a/packages/tooltip/theme/material/vaadin-lit-tooltip.js b/packages/tooltip/theme/material/vaadin-lit-tooltip.js deleted file mode 100644 index 99f41fa8e44..00000000000 --- a/packages/tooltip/theme/material/vaadin-lit-tooltip.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-tooltip-styles.js'; -import '../../src/vaadin-lit-tooltip.js'; diff --git a/packages/tooltip/theme/material/vaadin-tooltip-styles.js b/packages/tooltip/theme/material/vaadin-tooltip-styles.js deleted file mode 100644 index bb2c7ef28a4..00000000000 --- a/packages/tooltip/theme/material/vaadin-tooltip-styles.js +++ /dev/null @@ -1,23 +0,0 @@ -import { overlay } from '@vaadin/vaadin-material-styles/mixins/overlay.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const tooltipOverlay = css` - :host { - --vaadin-tooltip-offset-top: 0.25rem; - --vaadin-tooltip-offset-bottom: 0.25rem; - --vaadin-tooltip-offset-start: 0.25rem; - --vaadin-tooltip-offset-end: 0.25rem; - } - - [part='overlay'] { - background-color: rgba(97, 97, 97, 0.92); - color: #fff; - font-size: 0.6875rem; - } - - [part='content'] { - padding: 0.25rem 0.5rem; - } -`; - -registerStyles('vaadin-tooltip-overlay', [overlay, tooltipOverlay], { moduleId: 'material-tooltip-overlay' }); diff --git a/packages/tooltip/theme/material/vaadin-tooltip.js b/packages/tooltip/theme/material/vaadin-tooltip.js deleted file mode 100644 index c72470fc2ca..00000000000 --- a/packages/tooltip/theme/material/vaadin-tooltip.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-tooltip-styles.js'; -import '../../src/vaadin-tooltip.js'; diff --git a/packages/upload/package.json b/packages/upload/package.json index 6316e47845e..5fe01336038 100644 --- a/packages/upload/package.json +++ b/packages/upload/package.json @@ -42,7 +42,6 @@ "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/progress-bar": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/upload/test/visual/material/screenshots/upload/baseline/focus-clear.png b/packages/upload/test/visual/material/screenshots/upload/baseline/focus-clear.png deleted file mode 100644 index 78f0953ea91..00000000000 Binary files a/packages/upload/test/visual/material/screenshots/upload/baseline/focus-clear.png and /dev/null differ diff --git a/packages/upload/test/visual/material/screenshots/upload/baseline/focus-file.png b/packages/upload/test/visual/material/screenshots/upload/baseline/focus-file.png deleted file mode 100644 index 1f51f0363d4..00000000000 Binary files a/packages/upload/test/visual/material/screenshots/upload/baseline/focus-file.png and /dev/null differ diff --git a/packages/upload/test/visual/material/screenshots/upload/baseline/focus-retry.png b/packages/upload/test/visual/material/screenshots/upload/baseline/focus-retry.png deleted file mode 100644 index 3b254e94ad9..00000000000 Binary files a/packages/upload/test/visual/material/screenshots/upload/baseline/focus-retry.png and /dev/null differ diff --git a/packages/upload/test/visual/material/screenshots/upload/baseline/focus-start.png b/packages/upload/test/visual/material/screenshots/upload/baseline/focus-start.png deleted file mode 100644 index f08f4e5f66a..00000000000 Binary files a/packages/upload/test/visual/material/screenshots/upload/baseline/focus-start.png and /dev/null differ diff --git a/packages/upload/test/visual/material/screenshots/upload/baseline/ltr-basic.png b/packages/upload/test/visual/material/screenshots/upload/baseline/ltr-basic.png deleted file mode 100644 index 33828ccd2dc..00000000000 Binary files a/packages/upload/test/visual/material/screenshots/upload/baseline/ltr-basic.png and /dev/null differ diff --git a/packages/upload/test/visual/material/screenshots/upload/baseline/ltr-files.png b/packages/upload/test/visual/material/screenshots/upload/baseline/ltr-files.png deleted file mode 100644 index 5e3345c9f26..00000000000 Binary files a/packages/upload/test/visual/material/screenshots/upload/baseline/ltr-files.png and /dev/null differ diff --git a/packages/upload/test/visual/material/screenshots/upload/baseline/ltr-nodrop.png b/packages/upload/test/visual/material/screenshots/upload/baseline/ltr-nodrop.png deleted file mode 100644 index 0d64d8543c8..00000000000 Binary files a/packages/upload/test/visual/material/screenshots/upload/baseline/ltr-nodrop.png and /dev/null differ diff --git a/packages/upload/test/visual/material/screenshots/upload/baseline/rtl-basic.png b/packages/upload/test/visual/material/screenshots/upload/baseline/rtl-basic.png deleted file mode 100644 index 47354655893..00000000000 Binary files a/packages/upload/test/visual/material/screenshots/upload/baseline/rtl-basic.png and /dev/null differ diff --git a/packages/upload/test/visual/material/screenshots/upload/baseline/rtl-files.png b/packages/upload/test/visual/material/screenshots/upload/baseline/rtl-files.png deleted file mode 100644 index c5dbe4fda3d..00000000000 Binary files a/packages/upload/test/visual/material/screenshots/upload/baseline/rtl-files.png and /dev/null differ diff --git a/packages/upload/test/visual/material/screenshots/upload/baseline/rtl-nodrop.png b/packages/upload/test/visual/material/screenshots/upload/baseline/rtl-nodrop.png deleted file mode 100644 index 8b307afc354..00000000000 Binary files a/packages/upload/test/visual/material/screenshots/upload/baseline/rtl-nodrop.png and /dev/null differ diff --git a/packages/upload/test/visual/material/screenshots/upload/baseline/state-disabled.png b/packages/upload/test/visual/material/screenshots/upload/baseline/state-disabled.png deleted file mode 100644 index 8a3a68be5ce..00000000000 Binary files a/packages/upload/test/visual/material/screenshots/upload/baseline/state-disabled.png and /dev/null differ diff --git a/packages/upload/test/visual/material/screenshots/upload/baseline/state-max-files-reached.png b/packages/upload/test/visual/material/screenshots/upload/baseline/state-max-files-reached.png deleted file mode 100644 index a52d4366206..00000000000 Binary files a/packages/upload/test/visual/material/screenshots/upload/baseline/state-max-files-reached.png and /dev/null differ diff --git a/packages/upload/test/visual/material/screenshots/upload/baseline/width.png b/packages/upload/test/visual/material/screenshots/upload/baseline/width.png deleted file mode 100644 index 6659f78d540..00000000000 Binary files a/packages/upload/test/visual/material/screenshots/upload/baseline/width.png and /dev/null differ diff --git a/packages/upload/test/visual/material/upload.test.js b/packages/upload/test/visual/material/upload.test.js deleted file mode 100644 index 9294a75d4ea..00000000000 --- a/packages/upload/test/visual/material/upload.test.js +++ /dev/null @@ -1,141 +0,0 @@ -import { sendKeys } from '@vaadin/test-runner-commands'; -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-upload.js'; - -describe('upload', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.padding = '10px'; - }); - - ['ltr', 'rtl'].forEach((dir) => { - describe(dir, () => { - before(() => { - document.documentElement.setAttribute('dir', dir); - }); - - beforeEach(() => { - element = fixtureSync('', div); - }); - - after(() => { - document.documentElement.removeAttribute('dir'); - }); - - it('basic', async () => { - await visualDiff(div, `${dir}-basic`); - }); - - it('nodrop', async () => { - element.nodrop = true; - await visualDiff(div, `${dir}-nodrop`); - }); - - it('files', async () => { - element.files = [ - { name: 'Don Quixote.pdf', progress: 100, complete: true }, - { name: 'Hamlet.pdf', progress: 100, complete: true }, - ]; - await visualDiff(div, `${dir}-files`); - }); - }); - }); - - describe('focus', () => { - beforeEach(() => { - element = fixtureSync('', div); - element.files = [ - { - name: 'Don Quixote.pdf', - held: true, // Show the start button - error: 'Could not upload file', // Show the retry button - }, - { name: 'Hamlet.pdf', progress: 100, complete: true }, - ]; - element.querySelector('[slot="add-button"]').focus(); - }); - - it('file', async () => { - // Focus the file - await sendKeys({ press: 'Tab' }); - await visualDiff(div, 'focus-file'); - }); - - it('start', async () => { - // Focus the file - await sendKeys({ press: 'Tab' }); - - // Focus the start button - await sendKeys({ press: 'Tab' }); - await visualDiff(div, 'focus-start'); - }); - - it('retry', async () => { - // Focus the file - await sendKeys({ press: 'Tab' }); - - // Focus the start button - await sendKeys({ press: 'Tab' }); - - // Focus the retry button - await sendKeys({ press: 'Tab' }); - - await visualDiff(div, 'focus-retry'); - }); - - it('clear', async () => { - // Focus the file - await sendKeys({ press: 'Tab' }); - - // Focus the start button - await sendKeys({ press: 'Tab' }); - - // Focus the retry button - await sendKeys({ press: 'Tab' }); - - // Focus the clear button - await sendKeys({ press: 'Tab' }); - - await visualDiff(div, 'focus-clear'); - }); - }); - - describe('states', () => { - beforeEach(() => { - element = fixtureSync('', div); - }); - - it('disabled', async () => { - element.disabled = true; - element.files = [ - { - name: 'Don Quixote.pdf', - held: true, // Show the start button - error: 'Could not upload file', // Show the retry button - }, - ]; - - await visualDiff(div, 'state-disabled'); - }); - - it('max files reached', async () => { - element.maxFiles = 1; - element.files = [{ name: 'Don Quixote.pdf' }]; - - await visualDiff(div, 'state-max-files-reached'); - }); - }); - - describe('width', () => { - beforeEach(() => { - element = fixtureSync('', div); - }); - - it('width', async () => { - await visualDiff(div, 'width'); - }); - }); -}); diff --git a/packages/upload/theme/material/vaadin-lit-upload.js b/packages/upload/theme/material/vaadin-lit-upload.js deleted file mode 100644 index e2a2895ff2e..00000000000 --- a/packages/upload/theme/material/vaadin-lit-upload.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-upload-styles.js'; -import '../../src/vaadin-lit-upload.js'; diff --git a/packages/upload/theme/material/vaadin-upload-styles.js b/packages/upload/theme/material/vaadin-upload-styles.js deleted file mode 100644 index 12822140466..00000000000 --- a/packages/upload/theme/material/vaadin-upload-styles.js +++ /dev/null @@ -1,253 +0,0 @@ -import '@vaadin/vaadin-material-styles/color.js'; -import '@vaadin/vaadin-material-styles/font-icons.js'; -import '@vaadin/vaadin-material-styles/typography.js'; -import '@vaadin/button/theme/material/vaadin-button-styles.js'; -import '@vaadin/progress-bar/theme/material/vaadin-progress-bar-styles.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -registerStyles( - 'vaadin-upload', - css` - :host(:not([nodrop])) { - overflow: hidden; - border: 1px dashed var(--material-divider-color); - border-radius: 4px; - padding: 8px 16px; - transition: border-color 0.6s; - position: relative; - } - - [part='primary-buttons'] { - display: inline-flex; - flex-wrap: wrap; - align-items: baseline; - } - - ::slotted([slot='add-button']) { - margin: 0 -8px; - } - - [part='drop-label'] { - text-align: center; - white-space: normal; - padding: 0 24px; - color: var(--material-secondary-text-color); - font-family: var(--material-font-family); - font-size: var(--material-small-font-size); - } - - :host([dragover-valid]) { - border-color: var(--material-primary-color); - transition: border-color 0.1s; - } - - :host([dragover-valid]) [part='drop-label'] { - color: var(--material-primary-text-color); - } - - :host([disabled]) [part='drop-label'], - :host([max-files-reached]) [part='drop-label'] { - color: var(--material-disabled-text-color); - } - - /* Ripple */ - - :host::before { - content: ''; - position: absolute; - width: 100px; - height: 100px; - border-radius: 50%; - top: 50%; - left: 50%; - pointer-events: none; - background-color: var(--material-primary-color); - opacity: 0; - transform: translate(-50%, -50%) scale(0); - transition: - transform 0s cubic-bezier(0.075, 0.82, 0.165, 1), - opacity 0.4s linear; - transition-delay: 0.4s, 0s; - } - - :host([dragover-valid])::before { - transform: translate(-50%, -50%) scale(10); - opacity: 0.1; - transition-duration: 2s, 0.1s; - transition-delay: 0s, 0s; - } - `, - { moduleId: 'material-upload' }, -); - -registerStyles( - 'vaadin-upload-icon', - css` - :host { - margin-right: 8px; - } - - :host::before { - content: var(--material-icons-upload); - font-family: material-icons; - font-size: var(--material-icon-font-size); - line-height: 1; - } - `, - { moduleId: 'material-upload-icon' }, -); - -registerStyles( - 'vaadin-upload-file', - css` - :host { - outline: none; - } - - [part='row'] { - display: flex; - align-items: flex-start; - justify-content: space-between; - padding: 8px; - } - - :host([focus-ring]) [part='row'] { - background-color: var(--material-divider-color); - } - - [part='status'], - [part='error'] { - color: var(--material-secondary-text-color); - font-size: var(--material-caption-font-size); - } - - [part='info'] { - display: flex; - align-items: baseline; - flex: auto; - } - - [part='meta'] { - width: 0.001px; - flex: 1 1 auto; - } - - [part='name'] { - white-space: nowrap; - overflow: hidden; - text-overflow: ellipsis; - font-size: var(--material-small-font-size); - } - - [part='commands'] { - display: flex; - flex: none; - } - - [part$='icon'] { - padding: 8px; - margin: -8px 0 -8px -8px; - font-family: material-icons; - font-size: var(--material-icon-font-size); - line-height: 1; - } - - /* When both icons are hidden, let us keep space for one */ - [part='done-icon'][hidden] + [part='warning-icon'][hidden] { - display: block !important; - visibility: hidden; - } - - [part$='button'] { - position: relative; - width: 40px; - height: 40px; - flex: none; - font-family: material-icons; - font-size: var(--material-icon-font-size); - color: var(--material-secondary-text-color); - line-height: 1; - padding: 8px; - margin: -8px 0; - outline: none; - } - - [part='remove-button'] { - margin-right: -8px; - } - - [part$='button']:hover { - color: inherit; - } - - [part$='button'][disabled] { - color: var(--material-disabled-text-color); - } - - [part='done-icon']::before { - content: var(--material-icons-check); - color: var(--material-primary-text-color); - } - - [part='warning-icon']::before { - content: var(--material-icons-error); - color: var(--material-error-text-color); - } - - [part='start-button']::before { - content: var(--material-icons-play); - } - - [part='retry-button']::before { - content: var(--material-icons-reload); - } - - [part='remove-button']::before { - content: var(--material-icons-clear); - } - - [part$='button']:not([disabled])::after { - position: absolute; - content: ''; - top: 0; - left: 0; - width: 40px; - height: 40px; - border-radius: 50%; - background-color: var(--material-body-text-color); - transform: scale(0); - opacity: 0; - transition: - transform 0.08s, - opacity 0.01s; - will-change: transform, opacity; - } - - [part$='button']:hover::after { - opacity: 0.08; - } - - [part$='button']:focus::after { - opacity: 0.12; - } - - [part$='button']:active::after { - opacity: 0.16; - } - - [part$='button']:focus::after, - [part$='button']:active::after { - transform: scale(1.2); - } - - [part='error'] { - color: var(--material-error-text-color); - } - - ::slotted([slot='progress']) { - width: auto; - margin-left: 28px; - } - `, - { moduleId: 'material-upload-file' }, -); diff --git a/packages/upload/theme/material/vaadin-upload.js b/packages/upload/theme/material/vaadin-upload.js deleted file mode 100644 index ea1014fc2ae..00000000000 --- a/packages/upload/theme/material/vaadin-upload.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-upload-styles.js'; -import '../../src/vaadin-upload.js'; diff --git a/packages/vaadin-material-styles/LICENSE b/packages/vaadin-material-styles/LICENSE deleted file mode 100644 index 619dbbad5ba..00000000000 --- a/packages/vaadin-material-styles/LICENSE +++ /dev/null @@ -1,190 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - Copyright 2017 Vaadin - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/packages/vaadin-material-styles/README.md b/packages/vaadin-material-styles/README.md deleted file mode 100644 index 77f0a801c39..00000000000 --- a/packages/vaadin-material-styles/README.md +++ /dev/null @@ -1,11 +0,0 @@ -# Material Theme for Vaadin components - -[![npm version](https://badgen.net/npm/v/@vaadin/vaadin-material-styles)](https://www.npmjs.com/package/@vaadin/vaadin-material-styles) - -`vaadin-material-styles` is customizable theme for the [Vaadin components](https://vaadin.com/components). - -[Documentation ↗](https://cdn.vaadin.com/vaadin-material-styles/1.3.2/demo/) - -## License - -Apache License 2.0 diff --git a/packages/vaadin-material-styles/all-imports.d.ts b/packages/vaadin-material-styles/all-imports.d.ts deleted file mode 100644 index b9b2c6d9ea5..00000000000 --- a/packages/vaadin-material-styles/all-imports.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -export * from './mixins/field-button.js'; -export * from './mixins/menu-overlay.js'; -export * from './mixins/overlay.js'; -export * from './mixins/required-field.js'; -export * from './color.js'; -export * from './shadow.js'; -export * from './typography.js'; -export * from './user-colors.js'; diff --git a/packages/vaadin-material-styles/all-imports.js b/packages/vaadin-material-styles/all-imports.js deleted file mode 100644 index 4625e98b3d7..00000000000 --- a/packages/vaadin-material-styles/all-imports.js +++ /dev/null @@ -1,23 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import './mixins/field-button.js'; -export * from './mixins/field-button.js'; -import './mixins/menu-overlay.js'; -export * from './mixins/menu-overlay.js'; -import './mixins/overlay.js'; -export * from './mixins/overlay.js'; -import './mixins/required-field.js'; -export * from './mixins/required-field.js'; -import './color.js'; -export * from './color.js'; -import './font-icons.js'; -export * from './font-icons.js'; -import './shadow.js'; -export * from './shadow.js'; -import './typography.js'; -export * from './typography.js'; -import './user-colors.js'; -export * from './user-colors.js'; diff --git a/packages/vaadin-material-styles/color-global.js b/packages/vaadin-material-styles/color-global.js deleted file mode 100644 index 8bbc69b6787..00000000000 --- a/packages/vaadin-material-styles/color-global.js +++ /dev/null @@ -1,9 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import { colorLight } from './color.js'; -import { addMaterialGlobalStyles } from './global.js'; - -addMaterialGlobalStyles('color', colorLight); diff --git a/packages/vaadin-material-styles/color.d.ts b/packages/vaadin-material-styles/color.d.ts deleted file mode 100644 index 1a2dcdc7c19..00000000000 --- a/packages/vaadin-material-styles/color.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import type { CSSResult } from 'lit'; - -export const colorLight: CSSResult; - -export const colorDark: CSSResult; - -export const colorBase: CSSResult; diff --git a/packages/vaadin-material-styles/color.js b/packages/vaadin-material-styles/color.js deleted file mode 100644 index b7166532dc5..00000000000 --- a/packages/vaadin-material-styles/color.js +++ /dev/null @@ -1,185 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import './version.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; -import { addMaterialGlobalStyles } from './global.js'; - -const colorLight = css` - :host { - /* Text colors */ - --material-body-text-color: var(--light-theme-text-color, rgba(0, 0, 0, 0.87)); - --material-secondary-text-color: var(--light-theme-secondary-color, rgba(0, 0, 0, 0.54)); - --material-disabled-text-color: var(--light-theme-disabled-color, rgba(0, 0, 0, 0.38)); - - /* Primary colors */ - --material-primary-color: var(--primary-color, #6200ee); - --material-primary-contrast-color: var(--dark-theme-base-color, #fff); - --material-primary-text-color: var(--material-primary-color); - - /* Error colors */ - --material-error-color: var(--error-color, #b00020); - --material-error-text-color: var(--material-error-color); - - /* Background colors */ - --material-background-color: var(--light-theme-background-color, #fff); - --material-secondary-background-color: var(--light-theme-secondary-background-color, #f5f5f5); - --material-disabled-color: rgba(0, 0, 0, 0.26); - - /* Divider colors */ - --material-divider-color: rgba(0, 0, 0, 0.12); - - /* Undocumented internal properties (prefixed with three dashes) */ - - /* Text field tweaks */ - --_material-text-field-input-line-background-color: initial; - --_material-text-field-input-line-opacity: initial; - --_material-text-field-input-line-hover-opacity: initial; - --_material-text-field-focused-label-opacity: initial; - - /* Button tweaks */ - --_material-button-raised-background-color: initial; - --_material-button-outline-color: initial; - - /* Grid tweaks */ - --_material-grid-row-hover-background-color: initial; - - /* Split layout tweaks */ - --_material-split-layout-splitter-background-color: initial; - - background-color: var(--material-background-color); - color: var(--material-body-text-color); - } - - [theme~='dark'] { - /* Text colors */ - --material-body-text-color: var(--dark-theme-text-color, rgba(255, 255, 255, 1)); - --material-secondary-text-color: var(--dark-theme-secondary-color, rgba(255, 255, 255, 0.7)); - --material-disabled-text-color: var(--dark-theme-disabled-color, rgba(255, 255, 255, 0.5)); - - /* Primary colors */ - --material-primary-color: var(--light-primary-color, #7e3ff2); - --material-primary-text-color: #b794f6; - - /* Error colors */ - --material-error-color: var(--error-color, #de2839); - --material-error-text-color: var(--material-error-color); - - /* Background colors */ - --material-background-color: var(--dark-theme-background-color, #303030); - --material-secondary-background-color: var(--dark-theme-secondary-background-color, #3b3b3b); - --material-disabled-color: rgba(255, 255, 255, 0.3); - - /* Divider colors */ - --material-divider-color: rgba(255, 255, 255, 0.12); - - /* Undocumented internal properties (prefixed with three dashes) */ - - /* Text field tweaks */ - --_material-text-field-input-line-background-color: #fff; - --_material-text-field-input-line-opacity: 0.7; - --_material-text-field-input-line-hover-opacity: 1; - --_material-text-field-focused-label-opacity: 1; - - /* Button tweaks */ - --_material-button-raised-background-color: rgba(255, 255, 255, 0.08); - --_material-button-outline-color: rgba(255, 255, 255, 0.2); - - /* Grid tweaks */ - --_material-grid-row-hover-background-color: rgba(255, 255, 255, 0.08); - --_material-grid-row-selected-overlay-opacity: 0.16; - - /* Split layout tweaks */ - --_material-split-layout-splitter-background-color: rgba(255, 255, 255, 0.8); - - background-color: var(--material-background-color); - color: var(--material-body-text-color); - } - - a { - color: inherit; - } -`; - -registerStyles('', colorLight, { moduleId: 'material-color-light' }); - -const colorDark = css` - :host { - /* Text colors */ - --material-body-text-color: var(--dark-theme-text-color, rgba(255, 255, 255, 1)); - --material-secondary-text-color: var(--dark-theme-secondary-color, rgba(255, 255, 255, 0.7)); - --material-disabled-text-color: var(--dark-theme-disabled-color, rgba(255, 255, 255, 0.5)); - - /* Primary colors */ - --material-primary-color: var(--light-primary-color, #7e3ff2); - --material-primary-text-color: #b794f6; - - /* Error colors */ - --material-error-color: var(--error-color, #de2839); - --material-error-text-color: var(--material-error-color); - - /* Background colors */ - --material-background-color: var(--dark-theme-background-color, #303030); - --material-secondary-background-color: var(--dark-theme-secondary-background-color, #3b3b3b); - --material-disabled-color: rgba(255, 255, 255, 0.3); - - /* Divider colors */ - --material-divider-color: rgba(255, 255, 255, 0.12); - - /* Undocumented internal properties (prefixed with three dashes) */ - - /* Text field tweaks */ - --_material-text-field-input-line-background-color: #fff; - --_material-text-field-input-line-opacity: 0.7; - --_material-text-field-input-line-hover-opacity: 1; - --_material-text-field-focused-label-opacity: 1; - - /* Button tweaks */ - --_material-button-raised-background-color: rgba(255, 255, 255, 0.08); - --_material-button-outline-color: rgba(255, 255, 255, 0.2); - - /* Grid tweaks */ - --_material-grid-row-hover-background-color: rgba(255, 255, 255, 0.08); - --_material-grid-row-selected-overlay-opacity: 0.16; - - /* Split layout tweaks */ - --_material-split-layout-splitter-background-color: rgba(255, 255, 255, 0.8); - - background-color: var(--material-background-color); - color: var(--material-body-text-color); - } -`; - -registerStyles('', colorDark, { moduleId: 'material-color-dark' }); - -const colorBase = css` - :host { - /* Text colors */ - --material-body-text-color: var(--light-theme-text-color, rgba(0, 0, 0, 0.87)); - --material-secondary-text-color: var(--light-theme-secondary-color, rgba(0, 0, 0, 0.54)); - --material-disabled-text-color: var(--light-theme-disabled-color, rgba(0, 0, 0, 0.38)); - - /* Primary colors */ - --material-primary-color: var(--primary-color, #6200ee); - --material-primary-contrast-color: var(--dark-theme-base-color, #fff); - --material-primary-text-color: var(--material-primary-color); - - /* Error colors */ - --material-error-color: var(--error-color, #b00020); - --material-error-text-color: var(--material-error-color); - - /* Background colors */ - --material-background-color: var(--light-theme-background-color, #fff); - --material-secondary-background-color: var(--light-theme-secondary-background-color, #f5f5f5); - --material-disabled-color: rgba(0, 0, 0, 0.26); - - /* Divider colors */ - --material-divider-color: rgba(0, 0, 0, 0.12); - } -`; - -addMaterialGlobalStyles('color-base', colorBase); - -export { colorBase, colorDark, colorLight }; diff --git a/packages/vaadin-material-styles/font-icons.js b/packages/vaadin-material-styles/font-icons.js deleted file mode 100644 index 2609f697880..00000000000 --- a/packages/vaadin-material-styles/font-icons.js +++ /dev/null @@ -1,38 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import './version.js'; -import { css } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; -import { addMaterialGlobalStyles } from './global.js'; - -const fontIcons = css` - @font-face { - font-family: 'material-icons'; - src: url(data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAAjAAAsAAAAADaAAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABHU1VCAAABCAAAADsAAABUIIslek9TLzIAAAFEAAAARAAAAFZSk1xEY21hcAAAAYgAAACNAAACNOuCXH5nbHlmAAACGAAABDoAAAX4NWGBxmhlYWQAAAZUAAAAMAAAADZhSa2YaGhlYQAABoQAAAAeAAAAJBGxCLtobXR4AAAGpAAAABMAAABAjXoAAGxvY2EAAAa4AAAAIgAAACIKMAjcbWF4cAAABtwAAAAfAAAAIAEeAFRuYW1lAAAG/AAAATQAAAJe3l764XBvc3QAAAgwAAAAkAAAAMondETCeJxjYGRgYOBiMGCwY2BycfMJYeDLSSzJY5BiYGGAAJA8MpsxJzM9kYEDxgPKsYBpDiBmg4gCACY7BUgAeJxjYOS4wTiBgZWBga2WbQIDA2MAhGZpYChlymZgYGJgZWbACgLSXFMYHF4xvuJnv/CvgOEG+wXG6UBhRpAcAA0HDXt4nO2R2Q0DIQxEHwt7HzSSGlJQvlJkqqGJjYdJGbH0PPJgELKBEcjBIyiQ3iQUr3BT9zNb9wvP3lPkt3rfkZNy1KXnIXpLvDgxs7DGvZ2Dk4saxxP/OHr+/KqqCZo+08EgzUa7acVoym002lubDNLZIF0M0tUg3Yz22XaD9DD6XTsN0ssgrYb6BZEQJiUAAAB4nH1UXUgcVxS+Z2ZnZpeq7IT9CbTY2Z24o1m72+zPTB/UFSS2MWssTZRs6doqialmy27bPIghPzQttCxjfEhjfGhoUFLBQoVdKixSkofCEkurwQdBgw1NqeCWFrokVt3b3pnRqm3J/Nw598537v3Od869CBC5uFm2EZkRAgl4kQcOuFm1NJcv3R+kBVpQS/dNdzcilH9w80e0F+8EPsiDAjCkUv485SMIgqd8GxHT3dIc8UYUQnjefINLoGfR88RDDIt2F3lFdwXYeVslBF2BBgjzIR/QLt7FzZ7Kb+7Pn5LfkMnDNhrfP++wjexYnlx6Z9fPtTXGZnAyh5hbiEHIApwFJPpD/OYg5TdNqnAJbpFgiGXgWIbp13AgWQhxllFL49RJFcumVWKVxlWY2cI1buHIdE6gV1S4h2WVOsn0qziMw8Ta0iLBLKFnjPk0qDYrlyArluaIJnpD+UmXaSONbu38IO40Qn+9RPQxo/3oEFLIPG6ORRxrdTqQ0yEoMlJkq+RBkod2Sz6QPFalARRZcFaC02HlKoBjaVFLgemrmVwGr0aPHYuCPZOD4VwG7NG2tihezeRmRq8NPaiPROofDF2D5h373etU+VHcwJkJrJDN4b5cFhc0J7Blc3A9lwVbtG1t7T9+OKfbjK00jr89D1r4umZj9IqWcQtFTUMRivQKLoPinhifQ8LTYhTDwbDIB02TM//HxGB5RiuEp1NeP5DPkwQZ+pLa2GQr0D7kRY3ba/+z8C5lQ7qyAV1Zm6EswXKszelwOgKKrMghySN5TJOPlxfwVEcHHFlYhsLyAhzp6MBTC8uPe+KxtEeSPOlY/Lsds+e15qbqmprqpuaxbYOt6IrjicVFPBHv6opD++IitMe7Nir/7WqYtLDHWTeQieyrXssyN4sqUBWqQy8jVMWKgqaivE/RahBYu02PJRhQJFZ0a9zDIcUCcjikxyu6OUkOCloSWIoMBwNaoHYb+8v8I1wsruKRzro7FzGXNi+l12PV3oPD3aeTZ7uzZeWxaEttLZi68Q+yt0YbvZD69acnUPZHAc50Rr4vfYYvCm4d1Nna1wPv/zYClrdhLf3kQJr5ovts8nT3cI23OgMveFuisfLyUh4OpS5oowe9cuH13h6s/v45LsB7cIWt9ba0xlxo114j9QU80IIpyiytf0xNo11nko90SJiCnj3rdvREEFEbEPfm2eEEF8/+nLxqlHNdJFJHSnt0avTmw9rZmvHUucsDycRtn9/vu51IFpN9x/E31DTTnty7B0jh8V+e+zoQ2oJpHi/6TmhYjRalNZa3CLcqVGuw05XX+Gj3do5cAZ1VWC8x4MlRSI6Tq+6+3pGbmcErl+5FPj0/cPgVfY0BxmZUWqS+N1HqxSk8r2+2RxPpT1pfDQam+q0njl/+6IbB3qjBD1LvNB3GD3EKhqCIy9DfIQrMlQAAeJxjYGRgYABiYWGbw/H8Nl8ZuDkTgCIMNaobGhH0v0zO++wXgFwOBiaQKAAHHgoPeJxjYGRgYL/wr4CBgcuKAQg47zMwMqACAQBc2wOEAAB4nGNgYGDgTCAec1mh8gG9VgYDAAAAAAAAGAAwAGIAdgCKAJ4AwAEkATIBcAHcAlQCYgKwAvwAAHicY2BkYGAQYPBgYGEAASYg5gJCBob/YD4DABFeAXMAeJx9kL1uwjAUhU8gUJVIVaWqnRgsVepSEX5G1BkkRgb2EBwIcuLIMUi8QR+kT9CH6NgH6VP0xHiBAVtyvvvdc50oAB7xgwDNCvDgzma1cMfqzG3Ss+eQ/Oq5gwhjz136D889vGPhOcITDrwhCO9p+vj03GL+y3Ob/ttzSP713MEL/jx30Q/guYdV0Pcc4S0wRWKlyRM1yFNd1ku5PajkSl5WK2nqXJdiHI8uG3NZSkOzEeuTqI/bibWZyIwuxEyXViqlRWX0XqY23llbTYfDzPs41QUKJLCQMMhJCgM+U2iUqLGk3/JfKHbMzeSt3sr5mqapBf9/jNHNiTl96XrnzIZTa5x41jjyiya0FhnrjBnNuwRmbrZJK25NU7nenialj7FzUxWmGHJnV/nYvb34BzHZcLZ4nG2M0Q6CMBRDV2CIOhTf/Ak+am5XIdyw5QoS/l4W4ptN2uYkTVWmdt3VfzXIkKOARokDKhxxwhkGNS64osFNXaxIWFoflnGx4s2Oc0xQOcs0eivadeQGs+VHwtgyPaf6B9K/ukk7pjTj4IbKS4jpT9P2JTmtZDa3vn/bB5MvItu1FOJgfTnHVEp9AbKdMX4=) - format('woff'); - font-weight: normal; - font-style: normal; - } - - html { - --material-icons-arrow-downward: '\\ea01'; - --material-icons-arrow-upward: '\\ea02'; - --material-icons-calendar: '\\ea03'; - --material-icons-check: '\\ea04'; - --material-icons-chevron-left: '\\ea05'; - --material-icons-chevron-right: '\\ea06'; - --material-icons-clear: '\\ea07'; - --material-icons-clock: '\\ea08'; - --material-icons-dropdown: '\\ea09'; - --material-icons-error: '\\ea0a'; - --material-icons-eye: '\\ea0b'; - --material-icons-eye-disabled: '\\ea0c'; - --material-icons-play: '\\ea0d'; - --material-icons-reload: '\\ea0e'; - --material-icons-upload: '\\ea0f'; - } -`; - -addMaterialGlobalStyles('font-icons', fontIcons); diff --git a/packages/vaadin-material-styles/global.js b/packages/vaadin-material-styles/global.js deleted file mode 100644 index 13ec3da5423..00000000000 --- a/packages/vaadin-material-styles/global.js +++ /dev/null @@ -1,5 +0,0 @@ -import { addGlobalThemeStyles } from '@vaadin/vaadin-themable-mixin/register-styles.js'; - -export const addMaterialGlobalStyles = (id, ...styles) => { - addGlobalThemeStyles(`material-${id}`, styles); -}; diff --git a/packages/vaadin-material-styles/gulpfile.cjs b/packages/vaadin-material-styles/gulpfile.cjs deleted file mode 100644 index d65498351d2..00000000000 --- a/packages/vaadin-material-styles/gulpfile.cjs +++ /dev/null @@ -1,138 +0,0 @@ -/* eslint-env node */ -'use strict'; - -const gulp = require('gulp'); -const iconfont = require('gulp-iconfont'); -const fs = require('fs'); -const svgmin = require('gulp-svgmin'); -const sort = require('gulp-sort'); - -/** - * Normalize file sort order across platforms (OS X vs Linux, maybe others). - * - * Before: `[..., 'eye-disabled', 'eye', ...]` - * After: `[..., 'eye', 'eye-disabled', ...]` - * - * Order of appearance impacts assigned Unicode codepoints, and sometimes build diffs. - * - * @see https://github.com/nfroidure/svgicons2svgfont/pull/82 - * @see https://github.com/nfroidure/svgicons2svgfont/blob/master/src/filesorter.js - * @see http://support.ecisolutions.com/doc-ddms/help/reportsmenu/ascii_sort_order_chart.htm - */ -function sortIconFilesNormalized(file1, file2) { - return file1.replace(/-/gu, '~').localeCompare(file2.replace(/-/gu, '~'), 'en-US'); -} - -gulp.task('icons', (done) => { - const folder = 'icons/svg/'; - let glyphs; - - // Optimize the source files - gulp - .src(`${folder}*.svg`) - .pipe( - svgmin({ - plugins: [ - { - removeTitle: true, - }, - { - removeViewBox: false, - }, - { - cleanupNumericValues: { - floatPrecision: 6, - }, - }, - { - convertPathData: { - floatPrecision: 6, - }, - }, - ], - }), - ) - .pipe(gulp.dest(folder)) - .on('finish', () => { - // Icon font - gulp - .src(`${folder}*.svg`) - .pipe( - sort({ - comparator(file1, file2) { - return sortIconFilesNormalized(file1.relative, file2.relative); - }, - }), - ) - .pipe( - iconfont({ - fontName: 'material-icons', - formats: ['woff'], - fontHeight: 2400, - descent: 400, - normalize: true, - timestamp: 1, // Truthy! - }), - ) - .on('glyphs', (glyphData) => { - // Store for later use - glyphs = glyphData; - }) - .pipe(gulp.dest('.', { encoding: false })) - .on('finish', () => { - // Generate base64 version of the font - const materialIconsWoff = fs.readFileSync('material-icons.woff'); - // Write the output to font-icons.js - let output = `/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import './version.js'; -import { css } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; -import { addMaterialGlobalStyles } from './global.js'; - -const fontIcons = css\` - @font-face { - font-family: 'material-icons'; - src: url(data:application/font-woff;charset=utf-8;base64,${materialIconsWoff.toString('base64')}) - format('woff'); - font-weight: normal; - font-style: normal; - } - - html { -`; - glyphs.forEach((g) => { - const name = g.name.replace(/\s/gu, '-').toLowerCase(); - const unicode = `\\\\${g.unicode[0].charCodeAt(0).toString(16)}`; - output += ` --material-icons-${name}: '${unicode}';\n`; - }); - output += ` } -\`; - -addMaterialGlobalStyles('font-icons', fontIcons); -`; - fs.writeFile('font-icons.js', output, (err) => { - if (err) { - return console.error(err); - } - }); - - const list = glyphs.map((g) => g.name); - fs.writeFile('test/glyphs.json', JSON.stringify(list, null, 2), (err) => { - if (err) { - return console.error(err); - } - }); - - // Cleanup - fs.unlink('material-icons.woff', (err) => { - if (err) { - return console.error(err); - } - done(); - }); - }); - }); -}); diff --git a/packages/vaadin-material-styles/icons/svg/arrow-downward.svg b/packages/vaadin-material-styles/icons/svg/arrow-downward.svg deleted file mode 100644 index b6f2de903b3..00000000000 --- a/packages/vaadin-material-styles/icons/svg/arrow-downward.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/vaadin-material-styles/icons/svg/arrow-upward.svg b/packages/vaadin-material-styles/icons/svg/arrow-upward.svg deleted file mode 100644 index b84aab84efa..00000000000 --- a/packages/vaadin-material-styles/icons/svg/arrow-upward.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/vaadin-material-styles/icons/svg/calendar.svg b/packages/vaadin-material-styles/icons/svg/calendar.svg deleted file mode 100644 index 9c40555f8e6..00000000000 --- a/packages/vaadin-material-styles/icons/svg/calendar.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/vaadin-material-styles/icons/svg/check.svg b/packages/vaadin-material-styles/icons/svg/check.svg deleted file mode 100644 index 8676ca39a12..00000000000 --- a/packages/vaadin-material-styles/icons/svg/check.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/vaadin-material-styles/icons/svg/chevron-left.svg b/packages/vaadin-material-styles/icons/svg/chevron-left.svg deleted file mode 100644 index e119372c5cc..00000000000 --- a/packages/vaadin-material-styles/icons/svg/chevron-left.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/vaadin-material-styles/icons/svg/chevron-right.svg b/packages/vaadin-material-styles/icons/svg/chevron-right.svg deleted file mode 100644 index 7d1129b856d..00000000000 --- a/packages/vaadin-material-styles/icons/svg/chevron-right.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/vaadin-material-styles/icons/svg/clear.svg b/packages/vaadin-material-styles/icons/svg/clear.svg deleted file mode 100644 index c3f7c2fd38a..00000000000 --- a/packages/vaadin-material-styles/icons/svg/clear.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/vaadin-material-styles/icons/svg/clock.svg b/packages/vaadin-material-styles/icons/svg/clock.svg deleted file mode 100644 index 7d0fa776f33..00000000000 --- a/packages/vaadin-material-styles/icons/svg/clock.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/vaadin-material-styles/icons/svg/dropdown.svg b/packages/vaadin-material-styles/icons/svg/dropdown.svg deleted file mode 100644 index 1c2f14eee67..00000000000 --- a/packages/vaadin-material-styles/icons/svg/dropdown.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/vaadin-material-styles/icons/svg/error.svg b/packages/vaadin-material-styles/icons/svg/error.svg deleted file mode 100644 index 596f624a83c..00000000000 --- a/packages/vaadin-material-styles/icons/svg/error.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/vaadin-material-styles/icons/svg/eye-disabled.svg b/packages/vaadin-material-styles/icons/svg/eye-disabled.svg deleted file mode 100644 index f10627f47d4..00000000000 --- a/packages/vaadin-material-styles/icons/svg/eye-disabled.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/vaadin-material-styles/icons/svg/eye.svg b/packages/vaadin-material-styles/icons/svg/eye.svg deleted file mode 100644 index 5c700e39ce4..00000000000 --- a/packages/vaadin-material-styles/icons/svg/eye.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/vaadin-material-styles/icons/svg/play.svg b/packages/vaadin-material-styles/icons/svg/play.svg deleted file mode 100644 index c5e1a4c4685..00000000000 --- a/packages/vaadin-material-styles/icons/svg/play.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/vaadin-material-styles/icons/svg/reload.svg b/packages/vaadin-material-styles/icons/svg/reload.svg deleted file mode 100644 index f5d626cf190..00000000000 --- a/packages/vaadin-material-styles/icons/svg/reload.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/vaadin-material-styles/icons/svg/upload.svg b/packages/vaadin-material-styles/icons/svg/upload.svg deleted file mode 100644 index 69a9622935f..00000000000 --- a/packages/vaadin-material-styles/icons/svg/upload.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/packages/vaadin-material-styles/mixins/field-button.d.ts b/packages/vaadin-material-styles/mixins/field-button.d.ts deleted file mode 100644 index 138bf781647..00000000000 --- a/packages/vaadin-material-styles/mixins/field-button.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -import type { CSSResult } from 'lit'; - -export const fieldButton: CSSResult; diff --git a/packages/vaadin-material-styles/mixins/field-button.js b/packages/vaadin-material-styles/mixins/field-button.js deleted file mode 100644 index ee45f07bc5d..00000000000 --- a/packages/vaadin-material-styles/mixins/field-button.js +++ /dev/null @@ -1,45 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import '../font-icons.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const fieldButton = css` - [part$='button'] { - flex: none; - width: 24px; - height: 24px; - padding: 4px; - color: var(--material-secondary-text-color); - font-size: var(--material-icon-font-size); - line-height: 24px; - text-align: center; - } - - :host(:not([readonly])) [part$='button'] { - cursor: pointer; - } - - :host(:not([readonly])) [part$='button']:hover { - color: var(--material-text-color); - } - - :host([disabled]) [part$='button'], - :host([readonly]) [part$='button'] { - color: var(--material-disabled-text-color); - } - - :host([disabled]) [part='clear-button'] { - display: none; - } - - [part$='button']::before { - font-family: 'material-icons'; - } -`; - -registerStyles('', fieldButton, { moduleId: 'material-field-button' }); - -export { fieldButton }; diff --git a/packages/vaadin-material-styles/mixins/helper.d.ts b/packages/vaadin-material-styles/mixins/helper.d.ts deleted file mode 100644 index 2662c6c5f17..00000000000 --- a/packages/vaadin-material-styles/mixins/helper.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 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 helper: CSSResult; diff --git a/packages/vaadin-material-styles/mixins/helper.js b/packages/vaadin-material-styles/mixins/helper.js deleted file mode 100644 index 1883d8e7053..00000000000 --- a/packages/vaadin-material-styles/mixins/helper.js +++ /dev/null @@ -1,26 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import '../color.js'; -import { css } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -export const helper = css` - [part='helper-text'] { - font-size: 0.75rem; - line-height: 1; - color: var(--material-secondary-text-color); - } - - :host([has-helper]) [part='helper-text']::before { - content: ''; - display: block; - height: 6px; - } - - /* According to Material guidelines, helper text should be hidden when error message is set and input is invalid */ - :host([has-helper][invalid][has-error-message]) [part='helper-text'] { - display: none; - } -`; diff --git a/packages/vaadin-material-styles/mixins/input-field-shared.d.ts b/packages/vaadin-material-styles/mixins/input-field-shared.d.ts deleted file mode 100644 index f786b64bf15..00000000000 --- a/packages/vaadin-material-styles/mixins/input-field-shared.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -import type { CSSResult } from 'lit'; - -export const inputField: CSSResult; - -export const inputFieldShared: CSSResult; diff --git a/packages/vaadin-material-styles/mixins/input-field-shared.js b/packages/vaadin-material-styles/mixins/input-field-shared.js deleted file mode 100644 index 42ed94e994f..00000000000 --- a/packages/vaadin-material-styles/mixins/input-field-shared.js +++ /dev/null @@ -1,202 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import '../color.js'; -import '../font-icons.js'; -import '../typography.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; -import { fieldButton } from './field-button.js'; -import { helper } from './helper.js'; -import { requiredField } from './required-field.js'; - -const inputField = css` - :host { - position: relative; - padding-top: 8px; - margin-bottom: 8px; - color: var(--material-body-text-color); - font-size: var(--material-body-font-size); - line-height: 24px; - font-family: var(--material-font-family); - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - } - - :host::before { - line-height: 32px; - } - - /* Strange gymnastics to make fields vertically align nicely in most cases - (no label, with label, without prefix, with prefix, etc.) */ - - :host([has-label]) { - padding-top: 24px; - } - - :host([has-label]) ::slotted([slot='tooltip']) { - --vaadin-tooltip-offset-bottom: -8px; - } - - [part='input-field'] { - position: relative; - top: -0.2px; /* NOTE(platosha): Adjusts for wrong flex baseline in Chrome & Safari */ - height: 32px; - padding-left: 0; - padding-right: 0; - background-color: transparent; - margin: 0; - } - - [part='input-field']::before, - [part='input-field']::after { - content: ''; - position: absolute; - bottom: 0; - left: 0; - right: 0; - height: 1px; - transform-origin: 50% 0%; - background-color: var(--_material-text-field-input-line-background-color, #000); - opacity: var(--_material-text-field-input-line-opacity, 0.42); - } - - [part='input-field']::after { - background-color: var(--material-primary-color); - opacity: 0; - height: 2px; - bottom: 0; - transform: scaleX(0); - transition: opacity 0.175s; - } - - :host([disabled]) [part='label'], - :host([disabled]) [part='input-field'] ::slotted(:is(input, textarea)) { - color: var(--material-disabled-text-color); - -webkit-text-fill-color: var(--material-disabled-text-color); - } - - [part='input-field'] ::slotted(:is(input, textarea)) { - outline: none; - margin: 0; - border: 0; - border-radius: 0; - padding: 8px 0; - width: 100%; - height: 100%; - font-family: inherit; - font-size: 1em; - line-height: inherit; - color: inherit; - background-color: transparent; - /* Disable default invalid style in Firefox */ - box-shadow: none; - } - - /* TODO: the text opacity should be 42%, but the disabled style is 38%. - Would need to introduce another property for it if we want to be 100% accurate. */ - ::slotted(:is(input, textarea):placeholder-shown) { - color: var(--material-disabled-text-color); - transition: opacity 0.175s 0.1s; - } - - /* prettier-ignore */ - :host([has-label]:not([focused]):not([invalid]):not([theme='always-float-label'])) ::slotted(:is(input, textarea):placeholder-shown) { - opacity: 0; - transition-delay: 0; - } - - [part='label'] { - width: 133%; - transition: - transform 0.175s, - color 0.175s, - width 0.175s; - transition-timing-function: ease, ease, step-end; - } - - :host(:hover:not([readonly]):not([invalid])) [part='input-field']::before { - opacity: var(--_material-text-field-input-line-hover-opacity, 0.87); - } - - :host([focused]:not([invalid])) [part='label'] { - color: var(--material-primary-text-color); - } - - :host([focused]) [part='input-field']::after, - :host([invalid]) [part='input-field']::after { - opacity: 1; - transform: none; - transition: - transform 0.175s, - opacity 0.175s; - } - - :host([invalid]) [part='input-field']::after { - background-color: var(--material-error-color); - } - - :host([input-prevented]) [part='input-field'] { - color: var(--material-error-text-color); - } - - :host([disabled]) { - pointer-events: none; - } - - :host([disabled]) [part='input-field'] { - color: var(--material-disabled-text-color); - } - - :host([disabled]) [part='input-field']::before { - background-color: transparent; - background-image: linear-gradient( - 90deg, - var(--_material-text-field-input-line-background-color, #000) 0, - var(--_material-text-field-input-line-background-color, #000) 2px, - transparent 2px - ); - background-size: 4px 1px; - background-repeat: repeat-x; - } - - /* Only target the visible floating label */ - :host([has-label]:not([has-value]):not([focused]):not([invalid]):not([theme~='always-float-label'])) [part='label'] { - width: 100%; - transform: scale(1) translateY(24px); - transition-timing-function: ease, ease, step-start; - pointer-events: none; - left: auto; - right: auto; - transition-delay: 0.1s; - } - - /* Slotted content */ - [part='input-field'] ::slotted(*:not([part$='-button']):not(input):not(textarea)) { - color: var(--material-secondary-text-color); - } - - [part='clear-button']::before { - content: var(--material-icons-clear); - } - - /* RTL specific styles */ - - :host([disabled][dir='rtl']) [part='input-field']::before { - background-image: linear-gradient( - -90deg, - var(--_material-text-field-input-line-background-color, #000) 0, - var(--_material-text-field-input-line-background-color, #000) 2px, - transparent 2px - ); - } -`; - -const inputFieldShared = [requiredField, fieldButton, helper, inputField]; - -registerStyles('', inputFieldShared, { - moduleId: 'material-input-field-shared-styles', -}); - -export { inputField, inputFieldShared }; diff --git a/packages/vaadin-material-styles/mixins/loader.d.ts b/packages/vaadin-material-styles/mixins/loader.d.ts deleted file mode 100644 index 97bb945d571..00000000000 --- a/packages/vaadin-material-styles/mixins/loader.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -import type { CSSResult } from 'lit'; - -export const loader: CSSResult; diff --git a/packages/vaadin-material-styles/mixins/loader.js b/packages/vaadin-material-styles/mixins/loader.js deleted file mode 100644 index fb4cd8d32b7..00000000000 --- a/packages/vaadin-material-styles/mixins/loader.js +++ /dev/null @@ -1,111 +0,0 @@ -/** - * @license - * Copyright (c) 2022 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import '../color.js'; -import { css } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const loader = css` - [part~='loader'] { - height: 2px; - background: var(--material-background-color) - linear-gradient( - 90deg, - transparent 0%, - transparent 20%, - var(--material-primary-color) 20%, - var(--material-primary-color) 40%, - transparent 40%, - transparent 60%, - var(--material-primary-color) 60%, - var(--material-primary-color) 80%, - transparent 80%, - transparent 100% - ) - 0 0 / 400% 100% repeat-x; - opacity: 0; - } - - :host(:not([loading])) [part~='loader'] { - display: none; - } - - :host([loading]) [part='loader'] { - animation: - 3s linear infinite material-loader-progress, - 0.3s 0.1s both material-loader-fade-in; - } - - [part='loader']::before { - content: ''; - display: block; - height: 100%; - opacity: 0.16; - background: var(--material-primary-color); - } - - @keyframes material-loader-fade-in { - 0% { - opacity: 0; - } - - 100% { - opacity: 1; - } - } - - @keyframes material-loader-progress { - 0% { - background-position: 0 0; - background-size: 300% 100%; - } - - 33% { - background-position: -100% 0; - background-size: 400% 100%; - } - - 67% { - background-position: -200% 0; - background-size: 250% 100%; - } - - 100% { - background-position: -300% 0; - background-size: 300% 100%; - } - } - - /* RTL specific styles */ - - @keyframes material-loader-progress-rtl { - 0% { - background-position: 100% 0; - background-size: 300% 100%; - } - - 33% { - background-position: 200% 0; - background-size: 400% 100%; - } - - 67% { - background-position: 300% 0; - background-size: 250% 100%; - } - - 100% { - background-position: 400% 0; - background-size: 300% 100%; - } - } - - :host([loading][dir='rtl']) [part='loader'] { - animation: - 3s linear infinite material-loader-progress-rtl, - 0.3s 0.1s both material-loader-fade-in; - } -`; - -export { loader }; diff --git a/packages/vaadin-material-styles/mixins/menu-overlay.d.ts b/packages/vaadin-material-styles/mixins/menu-overlay.d.ts deleted file mode 100644 index 49c5d3af2dc..00000000000 --- a/packages/vaadin-material-styles/mixins/menu-overlay.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -import type { CSSResult } from 'lit'; - -export const menuOverlay: CSSResult; diff --git a/packages/vaadin-material-styles/mixins/menu-overlay.js b/packages/vaadin-material-styles/mixins/menu-overlay.js deleted file mode 100644 index 0fe1984d1b8..00000000000 --- a/packages/vaadin-material-styles/mixins/menu-overlay.js +++ /dev/null @@ -1,14 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import '../color.js'; -import { registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; -import { overlay } from './overlay.js'; - -const menuOverlay = overlay; - -registerStyles('', menuOverlay, { moduleId: 'material-menu-overlay' }); - -export { menuOverlay }; diff --git a/packages/vaadin-material-styles/mixins/overlay.d.ts b/packages/vaadin-material-styles/mixins/overlay.d.ts deleted file mode 100644 index 894575bc623..00000000000 --- a/packages/vaadin-material-styles/mixins/overlay.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -import type { CSSResult } from 'lit'; - -export const overlay: CSSResult; diff --git a/packages/vaadin-material-styles/mixins/overlay.js b/packages/vaadin-material-styles/mixins/overlay.js deleted file mode 100644 index ad393bf727f..00000000000 --- a/packages/vaadin-material-styles/mixins/overlay.js +++ /dev/null @@ -1,49 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import '../color.js'; -import '../typography.js'; -import '../shadow.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const overlay = css` - :host { - top: 16px; - right: 16px; - /* TODO (@jouni): remove unnecessary multiplication after https://github.com/vaadin/vaadin-overlay/issues/90 is fixed */ - bottom: calc(1px * var(--vaadin-overlay-viewport-bottom) + 16px); - left: 16px; - } - - [part='overlay'] { - background-color: var(--material-background-color); - border-radius: 4px; - box-shadow: var(--material-shadow-elevation-4dp); - color: var(--material-body-text-color); - font-family: var(--material-font-family); - font-size: var(--material-body-font-size); - font-weight: 400; - } - - [part='content'] { - padding: 8px 0; - } - - [part='backdrop'] { - opacity: 0.2; - animation: 0.2s vaadin-overlay-backdrop-enter; - will-change: opacity; - } - - @keyframes vaadin-overlay-backdrop-enter { - 0% { - opacity: 0; - } - } -`; - -registerStyles('', overlay, { moduleId: 'material-overlay' }); - -export { overlay }; diff --git a/packages/vaadin-material-styles/mixins/required-field.d.ts b/packages/vaadin-material-styles/mixins/required-field.d.ts deleted file mode 100644 index 77978bcb348..00000000000 --- a/packages/vaadin-material-styles/mixins/required-field.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -import type { CSSResult } from 'lit'; - -export const requiredField: CSSResult; diff --git a/packages/vaadin-material-styles/mixins/required-field.js b/packages/vaadin-material-styles/mixins/required-field.js deleted file mode 100644 index 7583dae1c4b..00000000000 --- a/packages/vaadin-material-styles/mixins/required-field.js +++ /dev/null @@ -1,71 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import '../color.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const requiredField = css` - [part='label'] { - display: block; - position: absolute; - top: 8px; - font-size: 1em; - line-height: 1; - height: 20px; - margin-bottom: -4px; - white-space: nowrap; - overflow-x: hidden; - text-overflow: ellipsis; - color: var(--material-secondary-text-color); - transform-origin: 0 75%; - transform: scale(0.75); - } - - :host([required]) [part='required-indicator']::after { - content: ' *'; - color: inherit; - } - - :host([invalid]) [part='label'] { - color: var(--material-error-text-color); - } - - [part='error-message'] { - font-size: 0.75em; - line-height: 1; - color: var(--material-error-text-color); - } - - :host([has-error-message]) [part='error-message']::before { - content: ''; - display: block; - height: 6px; - } - - :host(:not([invalid])) [part='error-message'] { - margin-top: 0; - max-height: 0; - overflow: hidden; - } - - :host([invalid]) [part='error-message'] { - animation: reveal 0.2s; - } - - @keyframes reveal { - 0% { - opacity: 0; - } - } - - /* RTL specific styles */ - :host([dir='rtl']) [part='label'] { - transform-origin: 100% 75%; - } -`; - -registerStyles('', requiredField, { moduleId: 'material-required-field' }); - -export { requiredField }; diff --git a/packages/vaadin-material-styles/package.json b/packages/vaadin-material-styles/package.json deleted file mode 100644 index 5913e4642a7..00000000000 --- a/packages/vaadin-material-styles/package.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "name": "@vaadin/vaadin-material-styles", - "version": "25.0.0-alpha0", - "publishConfig": { - "access": "public" - }, - "description": "Vaadin Material is a complete theme for Vaadin components, inspired by Google’s Material Design guidelines.", - "license": "Apache-2.0", - "repository": { - "type": "git", - "url": "https://github.com/vaadin/web-components.git", - "directory": "packages/vaadin-material-styles" - }, - "author": "Vaadin Ltd", - "homepage": "https://vaadin.com/themes", - "bugs": { - "url": "https://github.com/vaadin/web-components/issues" - }, - "main": "all-imports.js", - "module": "all-imports.js", - "type": "module", - "scripts": { - "icons": "gulp icons --gulpfile gulpfile.cjs" - }, - "files": [ - "*.d.ts", - "*.js", - "mixins/*.d.ts", - "mixins/*.js" - ], - "keywords": [ - "vaadin", - "material", - "theme", - "design-system", - "web-components", - "web-component", - "polymer" - ], - "dependencies": { - "@polymer/polymer": "^3.0.0", - "@vaadin/component-base": "25.0.0-alpha0", - "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0" - }, - "devDependencies": { - "gulp": "^5.0.0", - "gulp-cli": "^3.0.0", - "gulp-iconfont": "^11.0.0", - "gulp-sort": "^2.0.0", - "gulp-svgmin": "^4.1.0" - } -} diff --git a/packages/vaadin-material-styles/shadow.d.ts b/packages/vaadin-material-styles/shadow.d.ts deleted file mode 100644 index c4b0d20e86f..00000000000 --- a/packages/vaadin-material-styles/shadow.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -import type { CSSResult } from 'lit'; - -export const shadow: CSSResult; diff --git a/packages/vaadin-material-styles/shadow.js b/packages/vaadin-material-styles/shadow.js deleted file mode 100644 index b2a6824ee9b..00000000000 --- a/packages/vaadin-material-styles/shadow.js +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import './version.js'; -import { css } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; -import { addMaterialGlobalStyles } from './global.js'; - -const shadow = css` - /* prettier-ignore */ - :host { - /* from http://codepen.io/shyndman/pen/c5394ddf2e8b2a5c9185904b57421cdb */ - --material-shadow-elevation-2dp: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2); - --material-shadow-elevation-3dp: 0 3px 4px 0 rgba(0, 0, 0, 0.14), 0 1px 8px 0 rgba(0, 0, 0, 0.12), 0 3px 3px -2px rgba(0, 0, 0, 0.4); - --material-shadow-elevation-4dp: 0 4px 5px 0 rgba(0, 0, 0, 0.14), 0 1px 10px 0 rgba(0, 0, 0, 0.12), 0 2px 4px -1px rgba(0, 0, 0, 0.4); - --material-shadow-elevation-6dp: 0 6px 10px 0 rgba(0, 0, 0, 0.14), 0 1px 18px 0 rgba(0, 0, 0, 0.12), 0 3px 5px -1px rgba(0, 0, 0, 0.4); - --material-shadow-elevation-8dp: 0 8px 10px 1px rgba(0, 0, 0, 0.14), 0 3px 14px 2px rgba(0, 0, 0, 0.12), 0 5px 5px -3px rgba(0, 0, 0, 0.4); - --material-shadow-elevation-12dp: 0 12px 16px 1px rgba(0, 0, 0, 0.14), 0 4px 22px 3px rgba(0, 0, 0, 0.12), 0 6px 7px -4px rgba(0, 0, 0, 0.4); - --material-shadow-elevation-16dp: 0 16px 24px 2px rgba(0, 0, 0, 0.14), 0 6px 30px 5px rgba(0, 0, 0, 0.12), 0 8px 10px -5px rgba(0, 0, 0, 0.4); - --material-shadow-elevation-24dp: 0 24px 38px 3px rgba(0, 0, 0, 0.14), 0 9px 46px 8px rgba(0, 0, 0, 0.12), 0 11px 15px -7px rgba(0, 0, 0, 0.4); - } -`; - -addMaterialGlobalStyles('shadow', shadow); - -export { shadow }; diff --git a/packages/vaadin-material-styles/style.d.ts b/packages/vaadin-material-styles/style.d.ts deleted file mode 100644 index fa9f1192fe3..00000000000 --- a/packages/vaadin-material-styles/style.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -import type { CSSResult } from 'lit'; - -export const globals: CSSResult; diff --git a/packages/vaadin-material-styles/style.js b/packages/vaadin-material-styles/style.js deleted file mode 100644 index 976b9545860..00000000000 --- a/packages/vaadin-material-styles/style.js +++ /dev/null @@ -1,19 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import './version.js'; -import { css } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -/** - * Default values for component-specific custom properties. - */ -const globals = css` - html { - --vaadin-checkbox-size: 16px; - --vaadin-radio-button-size: 16px; - } -`; - -export { globals }; diff --git a/packages/vaadin-material-styles/test/autoload.js b/packages/vaadin-material-styles/test/autoload.js deleted file mode 100644 index 04d5e64003e..00000000000 --- a/packages/vaadin-material-styles/test/autoload.js +++ /dev/null @@ -1,14 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import { colorDark, colorLight, typography } from '../all-imports.js'; - -const color = document.documentElement.getAttribute('theme') === 'dark' ? colorDark : colorLight; - -const style = document.createElement('style'); -style.innerHTML = `${color.toString().replace(':host', 'html')} ${typography.toString()}`; -document.head.appendChild(style); - -export * from '../all-imports.js'; diff --git a/packages/vaadin-material-styles/test/glyphs.json b/packages/vaadin-material-styles/test/glyphs.json deleted file mode 100644 index ad44d12f96a..00000000000 --- a/packages/vaadin-material-styles/test/glyphs.json +++ /dev/null @@ -1,17 +0,0 @@ -[ - "arrow-downward", - "arrow-upward", - "calendar", - "check", - "chevron-left", - "chevron-right", - "clear", - "clock", - "dropdown", - "error", - "eye", - "eye-disabled", - "play", - "reload", - "upload" -] \ No newline at end of file diff --git a/packages/vaadin-material-styles/test/visual/font-icons.test.js b/packages/vaadin-material-styles/test/visual/font-icons.test.js deleted file mode 100644 index 748507db84e..00000000000 --- a/packages/vaadin-material-styles/test/visual/font-icons.test.js +++ /dev/null @@ -1,41 +0,0 @@ -import { fixtureSync, nextFrame } from '@vaadin/testing-helpers'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../font-icons.js'; - -describe('font-icons', () => { - let wrapper; - - before(async () => { - const { origin, pathname } = new URL(import.meta.url); - const file = pathname.replace(/visual\/.+/u, 'glyphs.json'); - const data = await fetch(`${origin}${file}`); - const icons = await data.json(); - wrapper = fixtureSync(` -
- - ${icons.map((icon) => ``).join('\n')} -
- `); - await nextFrame(); - }); - - it('basic', async () => { - await visualDiff(wrapper, 'font-icons'); - }); -}); diff --git a/packages/vaadin-material-styles/test/visual/screenshots/baseline/font-icons.png b/packages/vaadin-material-styles/test/visual/screenshots/baseline/font-icons.png deleted file mode 100644 index 7265567564f..00000000000 Binary files a/packages/vaadin-material-styles/test/visual/screenshots/baseline/font-icons.png and /dev/null differ diff --git a/packages/vaadin-material-styles/typography-global.js b/packages/vaadin-material-styles/typography-global.js deleted file mode 100644 index c81a39be2db..00000000000 --- a/packages/vaadin-material-styles/typography-global.js +++ /dev/null @@ -1,9 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import { addMaterialGlobalStyles } from './global.js'; -import { typography } from './typography.js'; - -addMaterialGlobalStyles('typography', typography); diff --git a/packages/vaadin-material-styles/typography.d.ts b/packages/vaadin-material-styles/typography.d.ts deleted file mode 100644 index e75f735d762..00000000000 --- a/packages/vaadin-material-styles/typography.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import type { CSSResult } from 'lit'; - -export const font: CSSResult; - -export const inputs: CSSResult; - -export const typography: CSSResult; diff --git a/packages/vaadin-material-styles/typography.js b/packages/vaadin-material-styles/typography.js deleted file mode 100644 index fafd3ccb3cd..00000000000 --- a/packages/vaadin-material-styles/typography.js +++ /dev/null @@ -1,123 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import './version.js'; -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; -import { addMaterialGlobalStyles } from './global.js'; - -const font = css` - :host { - /* Font family */ - --material-font-family: 'Roboto', sans-serif; - - /* Font sizes */ - --material-h1-font-size: 6rem; - --material-h2-font-size: 3.75rem; - --material-h3-font-size: 3rem; - --material-h4-font-size: 2.125rem; - --material-h5-font-size: 1.5rem; - --material-h6-font-size: 1.25rem; - --material-body-font-size: 1rem; - --material-small-font-size: 0.875rem; - --material-button-font-size: 0.875rem; - --material-caption-font-size: 0.75rem; - - /* Icon size */ - --material-icon-font-size: 20px; - } -`; - -const typography = css` - body, - :host { - font-family: var(--material-font-family); - font-size: var(--material-body-font-size); - line-height: 1.4; - -webkit-text-size-adjust: 100%; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; - } - - h1, - h2, - h3, - h4, - h5, - h6 { - color: inherit; - line-height: 1.1; - margin-top: 1.5em; - } - - h1 { - font-size: var(--material-h3-font-size); - font-weight: 300; - letter-spacing: -0.015em; - margin-bottom: 1em; - text-indent: -0.07em; - } - - h2 { - font-size: var(--material-h4-font-size); - font-weight: 300; - letter-spacing: -0.01em; - margin-bottom: 0.75em; - text-indent: -0.07em; - } - - h3 { - font-size: var(--material-h5-font-size); - font-weight: 400; - margin-bottom: 0.75em; - text-indent: -0.05em; - } - - h4 { - font-size: var(--material-h6-font-size); - font-weight: 400; - letter-spacing: 0.01em; - margin-bottom: 0.75em; - text-indent: -0.05em; - } - - h5 { - font-size: var(--material-body-font-size); - font-weight: 500; - margin-bottom: 0.5em; - text-indent: -0.025em; - } - - h6 { - font-size: var(--material-small-font-size); - font-weight: 500; - letter-spacing: 0.01em; - margin-bottom: 0.25em; - text-indent: -0.025em; - } - - a, - b, - strong { - font-weight: 500; - } -`; - -registerStyles('', typography, { moduleId: 'material-typography' }); - -addMaterialGlobalStyles('font', font); - -export { font, typography }; - -/* Import Roboto from Google Fonts */ -if (!window.polymerSkipLoadingFontRoboto) { - /* prettier-ignore */ - const font = 'https://fonts.googleapis.com/css?family=Roboto+Mono:400,700|Roboto:400,300,300italic,400italic,500,500italic,700,700italic'; - const link = document.createElement('link'); - link.rel = 'stylesheet'; - link.type = 'text/css'; - link.crossOrigin = 'anonymous'; - link.href = font; - document.head.appendChild(link); -} diff --git a/packages/vaadin-material-styles/user-colors.d.ts b/packages/vaadin-material-styles/user-colors.d.ts deleted file mode 100644 index e4eaaa39222..00000000000 --- a/packages/vaadin-material-styles/user-colors.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 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 userColors: CSSResult; diff --git a/packages/vaadin-material-styles/user-colors.js b/packages/vaadin-material-styles/user-colors.js deleted file mode 100644 index 2a38634dc3f..00000000000 --- a/packages/vaadin-material-styles/user-colors.js +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import './version.js'; -import { css } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; -import { addMaterialGlobalStyles } from './global.js'; - -const userColors = css` - :host { - --vaadin-user-color-0: #ab47bc; - --vaadin-user-color-1: #546e7a; - --vaadin-user-color-2: #2e7d32; - --vaadin-user-color-3: #6d4c41; - --vaadin-user-color-4: #1976d2; - --vaadin-user-color-5: #00838f; - --vaadin-user-color-6: #827717; - } - - [theme~='dark'] { - --vaadin-user-color-0: #9fa8da; - --vaadin-user-color-1: #00bcd4; - --vaadin-user-color-2: #ffeb3b; - --vaadin-user-color-3: #a1887f; - --vaadin-user-color-4: #2196f3; - --vaadin-user-color-5: #4caf50; - --vaadin-user-color-6: #ff9800; - } -`; - -addMaterialGlobalStyles('user-colors', userColors); - -export { userColors }; diff --git a/packages/vaadin-material-styles/version.js b/packages/vaadin-material-styles/version.js deleted file mode 100644 index e182abc0bcd..00000000000 --- a/packages/vaadin-material-styles/version.js +++ /dev/null @@ -1,24 +0,0 @@ -/** - * @license - * Copyright (c) 2017 - 2025 Vaadin Ltd. - * This program is available under Apache License Version 2.0, available at https://vaadin.com/license/ - */ -import { defineCustomElement } from '@vaadin/component-base/src/define.js'; - -/** - * Dummy custom element used for collecting - * development time usage statistics. - * - * @private - */ -class Material extends HTMLElement { - static get is() { - return 'vaadin-material-styles'; - } -} - -defineCustomElement(Material); - -console.warn('The Material theme is deprecated and will be removed in Vaadin 25.'); - -export { Material }; diff --git a/packages/vertical-layout/package.json b/packages/vertical-layout/package.json index a2cfe00d715..67491d2b13c 100644 --- a/packages/vertical-layout/package.json +++ b/packages/vertical-layout/package.json @@ -38,7 +38,6 @@ "@polymer/polymer": "^3.0.0", "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/vertical-layout/test/visual/material/screenshots/vertical-layout/baseline/basic.png b/packages/vertical-layout/test/visual/material/screenshots/vertical-layout/baseline/basic.png deleted file mode 100644 index 2c3c551a936..00000000000 Binary files a/packages/vertical-layout/test/visual/material/screenshots/vertical-layout/baseline/basic.png and /dev/null differ diff --git a/packages/vertical-layout/test/visual/material/screenshots/vertical-layout/baseline/theme-margin-padding-spacing.png b/packages/vertical-layout/test/visual/material/screenshots/vertical-layout/baseline/theme-margin-padding-spacing.png deleted file mode 100644 index e7c3e87078a..00000000000 Binary files a/packages/vertical-layout/test/visual/material/screenshots/vertical-layout/baseline/theme-margin-padding-spacing.png and /dev/null differ diff --git a/packages/vertical-layout/test/visual/material/screenshots/vertical-layout/baseline/theme-margin-padding.png b/packages/vertical-layout/test/visual/material/screenshots/vertical-layout/baseline/theme-margin-padding.png deleted file mode 100644 index 3e3f9353f0a..00000000000 Binary files a/packages/vertical-layout/test/visual/material/screenshots/vertical-layout/baseline/theme-margin-padding.png and /dev/null differ diff --git a/packages/vertical-layout/test/visual/material/screenshots/vertical-layout/baseline/theme-margin-spacing.png b/packages/vertical-layout/test/visual/material/screenshots/vertical-layout/baseline/theme-margin-spacing.png deleted file mode 100644 index 059774884ec..00000000000 Binary files a/packages/vertical-layout/test/visual/material/screenshots/vertical-layout/baseline/theme-margin-spacing.png and /dev/null differ diff --git a/packages/vertical-layout/test/visual/material/screenshots/vertical-layout/baseline/theme-margin.png b/packages/vertical-layout/test/visual/material/screenshots/vertical-layout/baseline/theme-margin.png deleted file mode 100644 index 81dcdff6888..00000000000 Binary files a/packages/vertical-layout/test/visual/material/screenshots/vertical-layout/baseline/theme-margin.png and /dev/null differ diff --git a/packages/vertical-layout/test/visual/material/screenshots/vertical-layout/baseline/theme-padding.png b/packages/vertical-layout/test/visual/material/screenshots/vertical-layout/baseline/theme-padding.png deleted file mode 100644 index c1818529856..00000000000 Binary files a/packages/vertical-layout/test/visual/material/screenshots/vertical-layout/baseline/theme-padding.png and /dev/null differ diff --git a/packages/vertical-layout/test/visual/material/screenshots/vertical-layout/baseline/theme-spacing.png b/packages/vertical-layout/test/visual/material/screenshots/vertical-layout/baseline/theme-spacing.png deleted file mode 100644 index 3250633457a..00000000000 Binary files a/packages/vertical-layout/test/visual/material/screenshots/vertical-layout/baseline/theme-spacing.png and /dev/null differ diff --git a/packages/vertical-layout/test/visual/material/screenshots/vertical-layout/baseline/theme-wrap.png b/packages/vertical-layout/test/visual/material/screenshots/vertical-layout/baseline/theme-wrap.png deleted file mode 100644 index e5eea998748..00000000000 Binary files a/packages/vertical-layout/test/visual/material/screenshots/vertical-layout/baseline/theme-wrap.png and /dev/null differ diff --git a/packages/vertical-layout/test/visual/material/vertical-layout.test.js b/packages/vertical-layout/test/visual/material/vertical-layout.test.js deleted file mode 100644 index cc26f193e92..00000000000 --- a/packages/vertical-layout/test/visual/material/vertical-layout.test.js +++ /dev/null @@ -1,62 +0,0 @@ -import { fixtureSync } from '@vaadin/testing-helpers/dist/fixture.js'; -import { visualDiff } from '@web/test-runner-visual-regression'; -import '../../../theme/material/vaadin-vertical-layout.js'; - -describe('vertical-layout', () => { - let div, element; - - beforeEach(() => { - div = document.createElement('div'); - div.style.display = 'flex'; - element = fixtureSync( - ` - -
Item 1
-
Item 2
-
- `, - div, - ); - }); - - it('basic', async () => { - await visualDiff(div, 'basic'); - }); - - it('theme-margin', async () => { - element.setAttribute('theme', 'margin'); - await visualDiff(div, 'theme-margin'); - }); - - it('theme-padding', async () => { - element.setAttribute('theme', 'padding'); - await visualDiff(div, 'theme-padding'); - }); - - it('theme-spacing', async () => { - element.setAttribute('theme', 'spacing'); - await visualDiff(div, 'theme-spacing'); - }); - - it('theme-margin-padding', async () => { - element.setAttribute('theme', 'margin padding'); - await visualDiff(div, 'theme-margin-padding'); - }); - - it('theme-margin-spacing', async () => { - element.setAttribute('theme', 'margin spacing'); - await visualDiff(div, 'theme-margin-spacing'); - }); - - it('theme-margin-padding-spacing', async () => { - element.setAttribute('theme', 'margin padding spacing'); - await visualDiff(div, 'theme-margin-padding-spacing'); - }); - - it('theme-wrap', async () => { - element.setAttribute('theme', 'wrap'); - element.style.height = '100px'; - - await visualDiff(div, 'theme-wrap'); - }); -}); diff --git a/packages/vertical-layout/theme/material/vaadin-lit-vertical-layout.js b/packages/vertical-layout/theme/material/vaadin-lit-vertical-layout.js deleted file mode 100644 index b328b3a49d1..00000000000 --- a/packages/vertical-layout/theme/material/vaadin-lit-vertical-layout.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-vertical-layout-styles.js'; -import '../../src/vaadin-lit-vertical-layout.js'; diff --git a/packages/vertical-layout/theme/material/vaadin-vertical-layout-styles.js b/packages/vertical-layout/theme/material/vaadin-vertical-layout-styles.js deleted file mode 100644 index ee135f0a543..00000000000 --- a/packages/vertical-layout/theme/material/vaadin-vertical-layout-styles.js +++ /dev/null @@ -1,37 +0,0 @@ -import { css, registerStyles } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js'; - -const verticalLayout = css` - [theme~='margin'] { - margin: 16px; - } - - [theme~='padding'] { - padding: 16px; - } - - :host([theme~='spacing-xs']) { - gap: 4px; - } - - :host([theme~='spacing-s']) { - gap: 8px; - } - - :host([theme~='spacing']) { - gap: 16px; - } - - :host([theme~='spacing-l']) { - gap: 24px; - } - - :host([theme~='spacing-xl']) { - gap: 40px; - } - - :host([theme~='wrap']) { - flex-wrap: wrap; - } -`; - -registerStyles('vaadin-vertical-layout', verticalLayout, { moduleId: 'material-vertical-layout' }); diff --git a/packages/vertical-layout/theme/material/vaadin-vertical-layout.js b/packages/vertical-layout/theme/material/vaadin-vertical-layout.js deleted file mode 100644 index 3972fecf3aa..00000000000 --- a/packages/vertical-layout/theme/material/vaadin-vertical-layout.js +++ /dev/null @@ -1,2 +0,0 @@ -import './vaadin-vertical-layout-styles.js'; -import '../../src/vaadin-vertical-layout.js'; diff --git a/packages/virtual-list/package.json b/packages/virtual-list/package.json index accc66a17b4..be219b3d47b 100644 --- a/packages/virtual-list/package.json +++ b/packages/virtual-list/package.json @@ -42,7 +42,6 @@ "@vaadin/component-base": "25.0.0-alpha0", "@vaadin/lit-renderer": "25.0.0-alpha0", "@vaadin/vaadin-lumo-styles": "25.0.0-alpha0", - "@vaadin/vaadin-material-styles": "25.0.0-alpha0", "@vaadin/vaadin-themable-mixin": "25.0.0-alpha0", "lit": "^3.0.0" }, diff --git a/packages/virtual-list/theme/material/vaadin-lit-virtual-list.js b/packages/virtual-list/theme/material/vaadin-lit-virtual-list.js deleted file mode 100644 index 6ef6374f04f..00000000000 --- a/packages/virtual-list/theme/material/vaadin-lit-virtual-list.js +++ /dev/null @@ -1 +0,0 @@ -import '../../src/vaadin-lit-virtual-list.js'; diff --git a/packages/virtual-list/theme/material/vaadin-virtual-list.js b/packages/virtual-list/theme/material/vaadin-virtual-list.js deleted file mode 100644 index 1e22fffeb8c..00000000000 --- a/packages/virtual-list/theme/material/vaadin-virtual-list.js +++ /dev/null @@ -1 +0,0 @@ -import '../../src/vaadin-virtual-list.js'; diff --git a/web-test-runner-material.config.js b/web-test-runner-material.config.js deleted file mode 100644 index 495701c1723..00000000000 --- a/web-test-runner-material.config.js +++ /dev/null @@ -1,4 +0,0 @@ -/* eslint-env node */ -import { createVisualTestsConfig } from './wtr-utils.js'; - -export default createVisualTestsConfig('material', '130'); diff --git a/wtr-utils.js b/wtr-utils.js index 86c32c30ad9..fe3fffc16fe 100644 --- a/wtr-utils.js +++ b/wtr-utils.js @@ -170,23 +170,19 @@ const getUnitTestGroups = (packages) => { * Get visual test groups based on packages. */ const getVisualTestGroups = (packages, theme) => { - return packages - .filter((pkg) => { - return theme === 'base' - ? !pkg.includes('lumo') && !pkg.includes('material') - : !pkg.includes(theme === 'lumo' ? 'material' : 'lumo'); - }) - .map((pkg) => { - return { - name: pkg, - files: [`packages/${pkg}/test/visual/*.test.{js,ts}`, `packages/${pkg}/test/visual/${theme}/*.test.{js,ts}`], - }; - }); -}; + if (theme === 'base') { + packages = packages.filter((pkg) => !pkg.includes('lumo')); + } -const fontRoboto = ''; + return packages.map((pkg) => { + return { + name: pkg, + files: [`packages/${pkg}/test/visual/*.test.{js,ts}`, `packages/${pkg}/test/visual/${theme}/*.test.{js,ts}`], + }; + }); +}; -const getTestRunnerHtml = (theme) => (testFramework) => +const getTestRunnerHtml = () => (testFramework) => ` @@ -202,11 +198,7 @@ const getTestRunnerHtml = (theme) => (testFramework) => padding: 0; } - ${theme === 'material' ? fontRoboto : ''} @@ -223,13 +215,13 @@ const getTestRunnerHtml = (theme) => (testFramework) => const getScreenshotFileName = ({ name, testFile }, type, diff) => { let folder; if (testFile.includes('-styles')) { - const match = testFile.match(/\/packages\/(vaadin-(lumo|material)-styles\/test\/visual\/)(.+)/u); + const match = testFile.match(/\/packages\/(vaadin-lumo-styles\/test\/visual\/)(.+)/u); folder = `${match[1]}screenshots`; } else if (testFile.includes('icons')) { folder = 'icons/test/visual/screenshots'; } else { const match = testFile.match(/\/packages\/(.+)\.test\.(js|ts)/u); - folder = match[1].replace(/(base|lumo|material)/u, '$1/screenshots'); + folder = match[1].replace(/(base|lumo)/u, '$1/screenshots'); } return path.join(folder, type, diff ? `${name}-diff` : name); }; @@ -335,7 +327,7 @@ const createVisualTestsConfig = (theme, browserVersion) => { theme === 'base' && enforceBaseStylesPlugin(), ].filter(Boolean), groups, - testRunnerHtml: getTestRunnerHtml(theme), + testRunnerHtml: getTestRunnerHtml(), filterBrowserLogs, }; }; diff --git a/yarn.lock b/yarn.lock index 61bc3dd28c7..cbbeb975c30 100644 --- a/yarn.lock +++ b/yarn.lock @@ -427,11 +427,6 @@ resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f" integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g== -"@fontsource/roboto@^4.5.8": - version "4.5.8" - resolved "https://registry.yarnpkg.com/@fontsource/roboto/-/roboto-4.5.8.tgz#56347764786079838faf43f0eeda22dd7328437f" - integrity sha512-CnD7zLItIzt86q4Sj3kZUiLcBk1dSk81qcqgMGaZe7SQ1P8hFNxhMl5AZthK1zrDM5m74VVhaOpuMGIL4gagaA== - "@gar/promisify@^1.1.3": version "1.1.3" resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"