Skip to content

Commit 034cf28

Browse files
authored
Tree: Minimalistic styles for load more (#20376)
* make tree load more minimalistic * set type and expand inherited styles * also set title
1 parent 1498f3b commit 034cf28

File tree

4 files changed

+41
-49
lines changed

4 files changed

+41
-49
lines changed

src/Umbraco.Web.UI.Client/src/assets/lang/da.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ export default {
7474
readOnly: 'Skrivebeskyttet',
7575
trash: 'Papirkurv',
7676
loadMore: 'Indlæs flere',
77+
showMore: 'Vis flere',
7778
},
7879
actionCategories: {
7980
content: 'Indhold',

src/Umbraco.Web.UI.Client/src/assets/lang/en.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ export default {
7474
wasMovedTo: 'was moved to',
7575
viewActionsFor: (name) => (name ? `View actions for '${name}'` : 'View actions'),
7676
loadMore: 'Load more',
77+
showMore: 'Show more',
7778
},
7879
actionCategories: {
7980
content: 'Content',

src/Umbraco.Web.UI.Client/src/packages/core/tree/components/tree-load-more-button.element.ts

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,32 +7,41 @@ export class UmbTreeLoadMoreButtonElement extends UmbLitElement {
77
@property({ type: Boolean })
88
loading: boolean = false;
99

10+
protected _dataMark: string = 'tree:load-more';
11+
1012
override render() {
1113
const state: UUIButtonState = this.loading ? 'waiting' : undefined;
14+
const label = this.localize.term('actions_showMore');
1215

1316
return html`<uui-button
1417
state=${ifDefined(state)}
15-
data-mark="tree:load-more"
18+
data-mark=${this._dataMark}
1619
id="load-more"
17-
look="secondary"
18-
.label=${this.localize.term('actions_loadMore')}></uui-button>`;
20+
.label=${label}
21+
.title=${label}
22+
>…</uui-button
23+
>`;
1924
}
2025

21-
static override readonly styles = css`
22-
:host {
23-
position: relative;
24-
display: block;
25-
padding-left: var(--uui-size-space-3);
26-
margin-right: var(--uui-size-space-2);
27-
margin-bottom: var(--uui-size-layout-2);
28-
margin-left: calc(var(--uui-menu-item-indent, 0) * var(--uui-size-4));
29-
}
30-
uui-button {
31-
width: 100%;
32-
height: var(--uui-size---uui-size-layout-3);
33-
--uui-box-border-radius: calc(var(--uui-border-radius) * 2);
34-
}
35-
`;
26+
static override readonly styles = [
27+
css`
28+
:host {
29+
position: relative;
30+
display: block;
31+
padding-left: var(--uui-size-space-3);
32+
margin-right: var(--uui-size-space-2);
33+
margin-left: calc(var(--uui-menu-item-indent, 0) * var(--uui-size-4));
34+
margin-bottom: var(--uui-size-layout-2);
35+
}
36+
37+
uui-button {
38+
width: 100%;
39+
height: var(--uui-size---uui-size-layout-3);
40+
--uui-box-border-radius: calc(var(--uui-border-radius) * 2);
41+
--uui-button-content-align: start;
42+
}
43+
`,
44+
];
3645
}
3746

3847
declare global {

src/Umbraco.Web.UI.Client/src/packages/core/tree/components/tree-load-prev-button.element.ts

Lines changed: 12 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,18 @@
1-
import { css, customElement, html, ifDefined, property } from '@umbraco-cms/backoffice/external/lit';
2-
import { UmbLitElement } from '@umbraco-cms/backoffice/lit-element';
3-
import type { UUIButtonState } from '@umbraco-cms/backoffice/external/uui';
1+
import { css, customElement } from '@umbraco-cms/backoffice/external/lit';
2+
import { UmbTreeLoadMoreButtonElement } from './tree-load-more-button.element.js';
43

54
@customElement('umb-tree-load-prev-button')
6-
export class UmbTreeLoadPrevButtonElement extends UmbLitElement {
7-
@property({ type: Boolean })
8-
loading: boolean = false;
5+
export class UmbTreeLoadPrevButtonElement extends UmbTreeLoadMoreButtonElement {
6+
protected override _dataMark = 'tree:load-prev';
97

10-
override render() {
11-
const state: UUIButtonState = this.loading ? 'waiting' : undefined;
12-
return html`<uui-button
13-
state=${ifDefined(state)}
14-
data-mark="tree:load-prev"
15-
id="load-prev"
16-
look="secondary"
17-
label=${this.localize.term('actions_loadMore')}></uui-button>`;
18-
}
19-
20-
static override readonly styles = css`
21-
:host {
22-
position: relative;
23-
display: block;
24-
padding-left: var(--uui-size-space-3);
25-
margin-right: var(--uui-size-space-2);
26-
margin-left: calc(var(--uui-menu-item-indent, 0) * var(--uui-size-4));
27-
}
28-
29-
uui-button {
30-
width: 100%;
31-
height: var(--uui-size---uui-size-layout-3);
32-
--uui-box-border-radius: calc(var(--uui-border-radius) * 2);
33-
}
34-
`;
8+
static override readonly styles = [
9+
...UmbTreeLoadMoreButtonElement.styles,
10+
css`
11+
:host {
12+
margin-bottom: 0;
13+
}
14+
`,
15+
];
3516
}
3617

3718
declare global {

0 commit comments

Comments
 (0)