Skip to content

Commit cfbc2f3

Browse files
authored
refactor: update Lumo upload file list to use base styles (#10063)
1 parent 963fe58 commit cfbc2f3

File tree

8 files changed

+11
-32
lines changed

8 files changed

+11
-32
lines changed

packages/upload/src/vaadin-upload-file-list.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import './vaadin-upload-file.js';
77
import { html, LitElement } from 'lit';
88
import { defineCustomElement } from '@vaadin/component-base/src/define.js';
99
import { PolylitMixin } from '@vaadin/component-base/src/polylit-mixin.js';
10-
import { LumoInjectionMixin } from '@vaadin/vaadin-themable-mixin/lumo-injection-mixin.js';
1110
import { ThemableMixin } from '@vaadin/vaadin-themable-mixin/vaadin-themable-mixin.js';
1211
import { uploadFileListStyles } from './styles/vaadin-upload-file-list-base-styles.js';
1312
import { UploadFileListMixin } from './vaadin-upload-file-list-mixin.js';
@@ -21,7 +20,7 @@ import { UploadFileListMixin } from './vaadin-upload-file-list-mixin.js';
2120
* @mixes UploadFileListMixin
2221
* @private
2322
*/
24-
class UploadFileList extends UploadFileListMixin(ThemableMixin(PolylitMixin(LumoInjectionMixin(LitElement)))) {
23+
class UploadFileList extends UploadFileListMixin(ThemableMixin(PolylitMixin(LitElement))) {
2524
static get is() {
2625
return 'vaadin-upload-file-list';
2726
}
-110 Bytes
Loading
-115 Bytes
Loading
-109 Bytes
Loading
-105 Bytes
Loading

packages/vaadin-lumo-styles/components/upload.css

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
* This program is available under Apache License Version 2.0, available at https://vaadin.com/license/
55
*/
66
@import '../src/mixins/field-button.css';
7-
@import '../src/components/upload-file-list.css';
87
@import '../src/components/upload-file.css';
98
@import '../src/components/upload-icon.css';
109
@import '../src/components/upload.css';
@@ -22,7 +21,11 @@
2221
--vaadin-upload-file-lumo-inject-modules:
2322
lumo_mixins_field-button,
2423
lumo_components_upload-file;
24+
}
2525

26-
--vaadin-upload-file-list-lumo-inject: 1;
27-
--vaadin-upload-file-list-lumo-inject-modules: lumo_components_upload-file-list;
26+
:where(:root, :host) {
27+
--vaadin-upload-gap: 0;
28+
--vaadin-upload-file-list-border-color: var(
29+
--lumo-contrast-10pct
30+
);
2831
}

packages/vaadin-lumo-styles/src/components/upload-file-list.css

Lines changed: 0 additions & 24 deletions
This file was deleted.

packages/vaadin-lumo-styles/src/components/upload-file.css

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
}
1313

1414
:host(:focus-visible) {
15-
outline: none;
1615
border-radius: var(--lumo-border-radius-s);
17-
box-shadow: 0 0 0 var(--_focus-ring-width) var(--_focus-ring-color);
16+
outline: var(--_focus-ring-width) solid var(--_focus-ring-color);
17+
outline-offset: calc(var(--_focus-ring-width) * -1);
1818
}
1919

2020
[part='status'],
@@ -49,7 +49,8 @@
4949
}
5050

5151
[part$='button']:focus {
52-
box-shadow: 0 0 0 var(--_focus-ring-width) var(--_focus-ring-color);
52+
outline: var(--_focus-ring-width) solid var(--_focus-ring-color);
53+
outline-offset: calc(var(--_focus-ring-width) * -1);
5354
}
5455

5556
/* Vertically align icons / buttons with the first line of text */

0 commit comments

Comments
 (0)