Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/upload/src/styles/vaadin-upload-base-styles.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ export const uploadStyles = css`
gap: var(--vaadin-gap-s);
}

::slotted([slot='drop-label-content']) {
flex: 100;
}

[part='drop-label'] {
align-items: center;
color: var(--vaadin-upload-drop-label-color, var(--vaadin-text-color));
Expand Down
10 changes: 6 additions & 4 deletions packages/upload/src/vaadin-upload.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,12 @@ class Upload extends UploadMixin(ElementMixin(ThemableMixin(PolylitMixin(LumoInj
return html`
<div part="primary-buttons">
<slot name="add-button"></slot>
<div part="drop-label" ?hidden="${this.nodrop}" id="dropLabelContainer" aria-hidden="true">
<slot name="drop-label-icon"></slot>
<slot name="drop-label"></slot>
</div>
<slot name="drop-label-content">
<div part="drop-label" ?hidden="${this.nodrop}" id="dropLabelContainer" aria-hidden="true">
<slot name="drop-label-icon"></slot>
<slot name="drop-label"></slot>
</div>
</slot>
</div>
<slot name="file-list"></slot>
<slot></slot>
Expand Down
22 changes: 12 additions & 10 deletions packages/upload/test/dom/__snapshots__/vaadin-upload.test.snap.js
Original file line number Diff line number Diff line change
Expand Up @@ -198,16 +198,18 @@ snapshots["vaadin-upload shadow default"] =
`<div part="primary-buttons">
<slot name="add-button">
</slot>
<div
aria-hidden="true"
id="dropLabelContainer"
part="drop-label"
>
<slot name="drop-label-icon">
</slot>
<slot name="drop-label">
</slot>
</div>
<slot name="drop-label-content">
<div
aria-hidden="true"
id="dropLabelContainer"
part="drop-label"
>
<slot name="drop-label-icon">
</slot>
<slot name="drop-label">
</slot>
</div>
</slot>
</div>
<slot name="file-list">
</slot>
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions packages/upload/test/visual/base/upload.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,4 +145,31 @@ describe('upload', () => {
await visualDiff(div, 'state-max-files-reached');
});
});

describe('drop-label-content slot', () => {
it('custom content', async () => {
element = fixtureSync(
`<vaadin-upload>
<div slot="drop-label-content" style="display: flex; align-items: center; justify-content: center; padding: 8px; border: 1px dashed gray; border-radius: 4px; background: #f5f5f5;">
<span>Custom drop area content</span>
</div>
</vaadin-upload>`,
div,
);
await visualDiff(div, 'drop-label-content-custom');
});

it('custom content with files', async () => {
element = fixtureSync(
`<vaadin-upload>
<div slot="drop-label-content" style="display: flex; align-items: center; justify-content: center; padding: 8px; border: 1px dashed gray; border-radius: 4px; background: #f5f5f5;">
<span>Custom drop area content</span>
</div>
</vaadin-upload>`,
div,
);
element.files = [{ name: 'Don Quixote.pdf', progress: 100, complete: true }];
await visualDiff(div, 'drop-label-content-custom-with-files');
});
});
});
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions packages/upload/test/visual/lumo/upload.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,31 @@ describe('upload', () => {
await visualDiff(div, 'width');
});
});

describe('drop-label-content slot', () => {
it('custom content', async () => {
element = fixtureSync(
`<vaadin-upload>
<div slot="drop-label-content" style="display: flex; align-items: center; justify-content: center; padding: 8px; border: 1px dashed gray; border-radius: 4px; background: #f5f5f5;">
<span>Custom drop area content</span>
</div>
</vaadin-upload>`,
div,
);
await visualDiff(div, 'drop-label-content-custom');
});

it('custom content with files', async () => {
element = fixtureSync(
`<vaadin-upload>
<div slot="drop-label-content" style="display: flex; align-items: center; justify-content: center; padding: 8px; border: 1px dashed gray; border-radius: 4px; background: #f5f5f5;">
<span>Custom drop area content</span>
</div>
</vaadin-upload>`,
div,
);
element.files = [{ name: 'Don Quixote.pdf', progress: 100, complete: true }];
await visualDiff(div, 'drop-label-content-custom-with-files');
});
});
});