Skip to content

Commit a6dd376

Browse files
zvonimirfraszvonimirfras
authored
Merge branch 'master' into table-strings
2 parents bd7f977 + 8515022 commit a6dd376

File tree

8 files changed

+173
-30
lines changed

8 files changed

+173
-30
lines changed

‎.storybook/manager-head.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<meta name="twitter:card" content="summary_large_image">
1010

1111
<style id="iframestyle">
12-
.sb-show-main {
12+
.sb-show-main:not(.welcome) {
1313
padding: 3em;
1414
display: flex;
1515
flex-direction: column;

‎.storybook/preview.scss‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
11
@import "~carbon-components/src/globals/scss/styles";
2-
3-
body {
4-
margin: 20px;
5-
}

‎src/combobox/combobox.component.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,7 @@ import { NG_VALUE_ACCESSOR } from "@angular/forms";
5353
viewBox="0 0 10 10"
5454
width="10"
5555
focusable="false"
56-
aria-label="Clear all selected items"
57-
alt="Clear all selected items">
56+
aria-label="Clear all selected items">
5857
<title>Clear all selected items</title>
5958
<path d="M6.32 5L10 8.68 8.68 10 5 6.32 1.32 10 0 8.68 3.68 5 0 1.32 1.32 0 5 3.68 8.68 0 10 1.32 6.32 5z"></path>
6059
</svg>
@@ -77,7 +76,6 @@ import { NG_VALUE_ACCESSOR } from "@angular/forms";
7776
role="img"
7877
viewBox="0 0 10 5"
7978
width="10"
80-
alt="Close menu"
8179
aria-label="Close menu">
8280
<title>Close menu</title>
8381
<path d="M0 0l5 4.998L10 0z"></path>

‎src/dropdown/dropdown.component.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ import { I18n } from "./../i18n/i18n.module";
4747
[disabled]="disabled">
4848
<span class="bx--list-box__label">{{getDisplayValue() | async}}</span>
4949
<div *ngIf="!skeleton" class="bx--list-box__menu-icon" [ngClass]="{'bx--list-box__menu-icon--open': !menuIsClosed }">
50-
<svg fill-rule="evenodd" height="5" role="img" viewBox="0 0 10 5" width="10" alt="Open menu" [attr.aria-label]="menuButtonLabel">
50+
<svg fill-rule="evenodd" height="5" role="img" viewBox="0 0 10 5" width="10" [attr.aria-label]="menuButtonLabel">
5151
<title>{{menuButtonLabel}}</title>
5252
<path d="M0 0l5 4.998L10 0z"></path>
5353
</svg>

‎src/file-uploader/file.component.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { FileItem } from "./file-item.interface";
1919
<p class="bx--file-filename">{{fileItem.file.name}}</p>
2020
<span *ngIf="fileItem.state === 'edit'" class="bx--file__state-container" (click)="remove.emit()">
2121
<svg class="bx--file-close" fill-rule="evenodd" role="img" width="16" height="16" viewBox="0 0 16 16" tabindex="0"
22-
[attr.aria-label]="translations.REMOVE_BUTTON" [attr.alt]="translations.REMOVE_BUTTON">
22+
[attr.aria-label]="translations.REMOVE_BUTTON">
2323
<title>{{translations.REMOVE_TITLE}}</title>
2424
<path d="M8 6.586L5.879 4.464 4.464 5.88 6.586 8l-2.122 2.121 1.415 1.415L8 9.414l2.121 2.122 1.415-1.415L9.414
2525
8l2.122-2.121-1.415-1.415L8 6.586zM8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16z"></path>
@@ -30,7 +30,7 @@ import { FileItem } from "./file-item.interface";
3030
</span>
3131
<span *ngIf="fileItem.state === 'complete'" class="bx--file__state-container">
3232
<svg class="bx--file-complete" fill-rule="evenodd" role="img" width="16" height="16" viewBox="0 0 16 16" tabindex="0"
33-
[attr.aria-label]="translations.CHECKMARK" [attr.alt]="translations.CHECKMARK">
33+
[attr.aria-label]="translations.CHECKMARK">
3434
<title>{{translations.CHECKMARK_TITLE}}</title>
3535
<path d="M8 16A8 8 0 1 1 8 0a8 8 0 0 1 0 16zm3.293-11.332L6.75 9.21 4.707 7.168 3.293 8.582 6.75
3636
12.04l5.957-5.957-1.414-1.414z"></path>

‎src/index.stories.ts‎

Lines changed: 160 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,165 @@
1-
import { storiesOf } from "@storybook/angular";
1+
import { storiesOf, moduleMetadata } from "@storybook/angular";
2+
import { Component, OnInit, OnDestroy } from "@angular/core";
23

3-
// import "carbon-components/scss/globals/scss/styles.scss";
4+
import { ButtonModule } from "./";
45

5-
storiesOf("Welcome", module).add("to Carbon Angular", () => ({
6+
@Component({
7+
selector: "app-welcome",
8+
// tslint:disable:max-line-length
69
template: `
7-
<h1>Carbon Components Angular</h1>
8-
<h2>An Angular implementation of the Carbon Design System</h2>
9-
<a href="https://angular.carbondesignsystem.com/documentation">Documentation</a>
10+
<section class="overview-page__banner" aria-label="overview page banner">
11+
<svg xmlns="http://www.w3.org/2000/svg" class="banner__background" viewBox="0 0 1530 823">
12+
<g fill="none" stroke-width="2">
13+
<path d="M97.3 306.07c27.19 14.46 52 10.25 75.64-7.49l-17.81-30c-11.21 10.32-25.91 15.93-41.84 7.46-18.91-10.05-24.33-30.08-11.31-54.57l13.26-24.94c13-24.5 32.66-31.2 51.57-21.14 15.93 8.47 19.17 21.33 16.13 36.28l35.88-.38c2.43-30.7-8.83-51.54-36-66-39.93-21.23-81-5.95-109 46.61S57.37 284.84 97.3 306.07z" stroke="#0B21A8" opacity=".3"></path>
14+
<path data-name="Path" d="M70.82 291.99c27.19 14.46 52 10.25 75.64-7.49l-17.81-30c-11.21 10.32-25.91 15.93-41.84 7.46-18.91-10.05-24.33-30.08-11.31-54.57l13.26-24.94c13-24.5 32.66-31.2 51.57-21.14 15.93 8.47 19.17 21.33 16.13 36.28l35.88-.35c2.43-30.7-8.83-51.54-36-66-39.93-21.23-81-5.95-109 46.61s-16.46 92.91 23.48 114.14z" stroke="#0B21A8" opacity=".1"></path>
15+
<path data-name="Path" d="M117.99 317.08c27.19 14.46 52 10.25 75.64-7.49l-17.81-30c-11.21 10.32-25.91 15.93-41.84 7.46-18.91-10.05-24.33-30.08-11.31-54.57l13.26-24.94c13-24.5 32.66-31.2 51.57-21.14 15.93 8.47 19.17 21.33 16.13 36.28l35.88-.35c2.43-30.7-8.83-51.54-36-66-39.93-21.23-81-5.95-109 46.61s-16.45 92.9 23.48 114.14z" stroke="#0B21A8"></path>
16+
</g>
17+
<g fill="none" stroke="#0B21A8" stroke-width="2">
18+
<path d="M53.84351034 664.3264129l135.35957093-54.68881657 54.68881657 135.35957093-135.35957092 54.68881658z"></path>
19+
<path data-name="Rectangle-2" opacity=".3" d="M28.5999305 655.32682863l135.35957094-54.68881657L218.648318 735.997583 83.2887471 790.68639955z"></path>
20+
<path data-name="Rectangle-2" opacity=".1" d="M1.30727542 647.15849654l135.35957092-54.68881657 54.68881658 135.35957093L55.996092 782.51806747z"></path>
21+
</g>
22+
<g fill="none" stroke="#0B21A8" stroke-width="2">
23+
<path data-name="Rectangle-2" d="M1036.59884943 252.91132245l134.84475598-57.238203 57.23820302 134.84475597-134.84475598 57.238203z"></path>
24+
<path data-name="Rectangle-2" opacity=".3" d="M1045.19015696 227.4304784l134.844756-57.23820302 57.238203 134.84475598-134.84475598 57.238203z"></path>
25+
<path data-name="Rectangle-2" opacity=".1" d="M1052.2449 200.6052l134.7708-57.1311 57.1311 134.7708-134.7708 57.1311z" stroke-width="1.9985"></path>
26+
</g>
27+
<g fill="none" stroke="#0B21A8" stroke-width="2">
28+
<path data-name="Rectangle-2" d="M1220.759993 667.64245583l129.00175408-57.43528137 57.43528137 129.00175407-129.00175408 57.43528137z"></path>
29+
<path data-name="Rectangle-2" opacity=".3" d="M1253.4022198 678.64557183l129.0017541-57.43528137 57.43528136 129.00175408-129.00175408 57.43528137z"></path>
30+
<path data-name="Rectangle-2" opacity=".1" d="M1293.25129392 693.23574483l129.00175408-57.43528137 57.43528137 129.00175408-129.00175408 57.43528137z"></path>
31+
</g>
32+
<g fill="none" stroke="#0B21A8" stroke-width="2">
33+
<path data-name="Rectangle-2" d="M326.96903197 217.8200386l89.4721883-127.7795274 127.7795274 89.47218832-89.4721883 127.7795274z"></path>
34+
<path data-name="Rectangle-2" opacity=".3" d="M324.28116742 170.27180653l89.4721883-127.7795274 127.7795274 89.47218832-89.4721883 127.7795274z"></path>
35+
<path data-name="Rectangle-2" opacity=".1" d="M309.8023 128.7689L398.7166.8571l127.9118 88.9143-88.9143 127.9118z" stroke-width="1.9973"></path>
36+
</g>
37+
<g fill="none" stroke="#0B21A8" stroke-width="2">
38+
<circle cx="330.25" cy="343.51" r="65.56" transform="translate(-94.02 125.42) rotate(-19)"></circle>
39+
<circle data-name="Oval" cx="304.83" cy="331.11" r="65.56" transform="translate(-91.37 116.47) rotate(-19)" opacity=".3"></circle>
40+
<circle data-name="Oval" cx="279.41" cy="318.71" r="65.56" transform="translate(-88.72 107.52) rotate(-19)" opacity=".1"></circle>
41+
</g>
42+
<g fill="none" stroke="#0B21A8" stroke-width="2">
43+
<path d="M664.58 377.77l-163.43-31.24L610.9 220.28l53.68 157.49z"></path>
44+
<path data-name="Triangle" opacity=".3" d="M692.39 366.28l-163.42-31.23L638.72 208.8l53.67 157.48z"></path>
45+
<path data-name="Triangle" opacity=".1" d="M725.64 350.6l-163.42-31.23 109.75-126.25 53.67 157.48z"></path>
46+
</g>
47+
<g fill="none" stroke="#0B21A8" stroke-width="2">
48+
<path data-name="Triangle" d="M74.92 510.53l11.09-166.01 138.68 93.54-149.77 72.47z"></path>
49+
<path data-name="Triangle" opacity=".3" d="M89.71 536.74l11.09-166.01 138.68 93.54-149.77 72.47z"></path>
50+
<path data-name="Triangle" opacity=".1" d="M109.33 567.83l11.08-166.01 138.69 93.54-149.77 72.47z"></path>
51+
</g>
52+
<g fill="none" stroke="#0B21A8" stroke-width="2">
53+
<path data-name="Triangle" d="M1140.96 534.62l77.65-147.15 88.64 141.86-166.29 5.29z"></path>
54+
<path data-name="Triangle" opacity=".3" d="M1143.81 564.58l77.65-147.15 88.65 141.86-166.3 5.29z"></path>
55+
<path data-name="Triangle" opacity=".1" d="M1149.08 600.96l77.65-147.15 88.65 141.86-166.3 5.29z"></path>
56+
</g>
57+
<g fill="none" stroke="#0B21A8" stroke-width="2">
58+
<path d="M246.65 550.67l60.69-50.93 74.44 27.1 13.76 78.02-60.69 50.93-74.45-27.1-13.75-78.02z"></path>
59+
<path data-name="Polygon" opacity=".3" d="M286.13 542.09l60.69-50.93 74.45 27.1 13.76 78.02-60.69 50.92-74.45-27.09-13.76-78.02z"></path>
60+
<path data-name="Polygon" opacity=".1" d="M324 527.85l60.69-50.92 74.45 27.09 13.75 78.02-60.69 50.93-74.45-27.1L324 527.85z"></path>
61+
</g>
62+
<g fill="none" stroke="#0B21A8" stroke-width="2">
63+
<path data-name="Polygon" d="M1062.61 673.33h-82.18l-41.09-71.17 41.09-71.17h82.18l41.09 71.17-41.09 71.17z"></path>
64+
<path data-name="Polygon" opacity=".3" d="M1025.51 653.82h-82.18l-41.09-71.17 41.09-71.17h82.18l41.09 71.17-41.09 71.17z"></path>
65+
<path data-name="Polygon" opacity=".1" d="M985.93 639.88h-82.18l-41.09-71.17 41.09-71.17h82.18l41.1 71.17-41.1 71.17z"></path>
66+
</g>
67+
<g fill="none" stroke="#0B21A8" stroke-width="2">
68+
<path data-name="Polygon" d="M753.93 90.33h99.99l49.99 86.59-49.99 86.59h-99.99l-50-86.59 50-86.59z"></path>
69+
<path data-name="Polygon" opacity=".3" d="M799.07 114.06h99.98l50 86.6-50 86.59h-99.98l-50-86.59 50-86.6z"></path>
70+
<path data-name="Polygon" opacity=".1" d="M843.05 121.65h99.98l50 86.59-50 86.59h-99.98l-50-86.59 50-86.59z"></path>
71+
</g>
72+
<g data-name="c1" fill="none" stroke-width="2">
73+
<path data-name="Path" d="M563.82 784.63c27.68-13.5 38.88-36.08 38.4-65.59l-34.77-3.24c1.76 15.14-2.34 30.33-18.56 38.24-19.24 9.39-38.64 2-50.8-22.93l-12.38-25.39c-12.16-24.94-6-44.76 13.21-54.15 16.22-7.91 28.53-3 38.83 8.28l20.81-29.23c-23.41-20-46.89-23.15-74.57-9.65-40.65 19.83-52.44 62.06-26.35 115.56s65.55 67.92 106.18 48.1z" stroke="#0B21A8" opacity=".3"></path>
74+
<path data-name="Path" d="M536.88 797.78c27.68-13.5 38.88-36.08 38.4-65.59l-34.77-3.24c1.76 15.14-2.34 30.33-18.56 38.24-19.24 9.39-38.64 2-50.8-22.93l-12.33-25.41c-12.16-24.94-6-44.76 13.21-54.15 16.22-7.91 28.53-3 38.83 8.28l20.81-29.23c-23.41-20-46.89-23.15-74.57-9.65-40.65 19.83-52.44 62.06-26.35 115.56s65.48 67.94 106.13 48.12z" stroke="#0B21A8" opacity=".05"></path>
75+
<path data-name="Path" d="M584.9 774.35c27.68-13.5 38.88-36.08 38.4-65.59l-34.77-3.24c1.76 15.14-2.34 30.33-18.56 38.24-19.24 9.39-38.64 2-50.8-22.93l-12.35-25.4c-12.16-24.94-6-44.76 13.21-54.15 16.22-7.91 28.53-3 38.83 8.28l20.81-29.23c-23.41-20-46.89-23.15-74.57-9.65-40.68 19.83-52.47 62.06-26.38 115.51s65.53 68 106.18 48.16z" stroke="#0B21A8"></path>
76+
</g>
77+
<g fill="none" stroke-width="2">
78+
<path data-name="Path" d="M1374.96 528.33c25.53 17.22 50.69 15.63 76 .46l-14.58-31.74c-12.23 9.09-27.43 13.14-42.39 3-17.75-12-21.06-32.46-5.54-55.46l15.8-23.42c15.51-23 35.74-27.61 53.49-15.64 15 10.09 16.84 23.22 12.25 37.77l35.72 3.4c5.62-30.28-3.4-52.18-28.92-69.4-37.5-25.29-80-14.39-113.25 35s-26.08 90.74 11.42 116.03z" stroke="#0B21A8" opacity=".3"></path>
79+
<path data-name="Path" d="M1350.09 511.56c25.53 17.22 50.69 15.63 76 .46l-14.58-31.74c-12.23 9.09-27.43 13.14-42.39 3-17.75-12-21.06-32.46-5.54-55.46l15.8-23.42c15.51-23 35.74-27.61 53.49-15.64 15 10.09 16.84 23.22 12.25 37.77l35.72 3.4c5.62-30.28-3.4-52.18-28.92-69.4-37.5-25.29-80-14.39-113.25 35s-26.07 90.73 11.42 116.03z" stroke="#0B21A8" opacity=".05"></path>
80+
<path data-name="Path" d="M1394.39 541.43c25.53 17.22 50.69 15.63 76 .46l-14.57-31.7c-12.23 9.09-27.43 13.14-42.39 3-17.75-12-21.06-32.46-5.54-55.46l15.8-23.42c15.51-23 35.74-27.61 53.49-15.64 15 10.09 16.84 23.22 12.25 37.77l35.72 3.4c5.62-30.28-3.4-52.18-28.92-69.4-37.5-25.29-80-14.39-113.25 35s-26.09 90.75 11.41 115.99z" stroke="#0B21A8"></path>
81+
</g>
82+
<g fill="none" stroke="#0B21A8" stroke-width="2">
83+
<circle data-name="Oval" cx="1400.43" cy="210.27" r="79.61" transform="translate(1116.98 1596.97) rotate(-87)"></circle>
84+
<circle data-name="Oval" cx="1374.91" cy="233.25" r="79.61" transform="translate(1069.84 1593.26) rotate(-87)" opacity=".3"></circle>
85+
<circle data-name="Oval" cx="1349.38" cy="256.23" r="79.61" transform="translate(1022.7 1589.55) rotate(-87)" opacity=".1"></circle>
86+
</g>
87+
<g fill="none" stroke="#0B21A8" stroke-width="2">
88+
<circle data-name="Oval" cx="788.73" cy="678.37" r="79.61" transform="matrix(0.97, -0.26, 0.26, 0.97, -148.88, 226.44)"></circle>
89+
<circle data-name="Oval" cx="758.98" cy="661.2" r="79.61" transform="matrix(0.97, -0.26, 0.26, 0.97, -145.45, 218.16)" opacity=".3"></circle>
90+
<circle data-name="Oval" cx="729.24" cy="644.03" r="79.61" transform="matrix(0.97, -0.26, 0.26, 0.97, -142.01, 209.88)" opacity=".1"></circle>
91+
</g>
92+
</svg>
93+
94+
<h1 class="banner__title"><span class="banner__logo--bold">Carbon</span> Components Angular</h1>
95+
<h2 class="banner__subtitle">An Angular implementation of the Carbon Design System</h2>
96+
<a style="z-index: 2" href="https://angular.carbondesignsystem.com/documentation/">
97+
<button class="banner__btn" ibmButton="secondary">Documentation</button>
98+
</a>
99+
</section>
10100
`,
11-
props: {}
101+
// tslint:enable:max-line-length
102+
styles: [`
103+
.overview-page__banner {
104+
height: 100vh;
105+
background: #5596e6;
106+
display: flex;
107+
flex-direction: column;
108+
align-items: center;
109+
justify-content: center;
110+
}
111+
.banner__background {
112+
position: fixed;
113+
}
114+
.banner__title {
115+
font-size: 3.3vw;
116+
margin-top: 8vw;
117+
color: #fff;
118+
text-transform: uppercase;
119+
letter-spacing: 1px;
120+
position: relative;
121+
}
122+
.banner__subtitle {
123+
font-size: 1.8vw;
124+
color: #fff;
125+
z-index: 2
126+
}
127+
.banner__btn {
128+
margin-top: 20px;
129+
border-color: #fff;
130+
color: #fff;
131+
}
132+
.banner__logo--bold, .banner__logo span {
133+
font-weight: 600;
134+
}
135+
@media screen and (min-width: 1515px) {
136+
.banner__title {
137+
font-size: 50px;
138+
}
139+
.banner__subtitle {
140+
font-size: 28px;
141+
}
142+
}
143+
`]
144+
})
145+
class WelcomeStory implements OnInit, OnDestroy {
146+
ngOnInit() {
147+
document.querySelector(".sb-show-main").classList.add("welcome");
148+
}
149+
ngOnDestroy() {
150+
document.querySelector(".sb-show-main").classList.remove("welcome");
151+
}
152+
}
153+
154+
155+
storiesOf("Welcome", module)
156+
.addDecorator(
157+
moduleMetadata({
158+
imports: [ButtonModule],
159+
declarations: [WelcomeStory]
160+
})
161+
)
162+
163+
.add("to Carbon Angular", () => ({
164+
template: `<app-welcome></app-welcome>`
12165
}));

‎src/modal/modal-header.component.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ import { I18n } from "./../i18n/i18n.module";
3838
role="img"
3939
viewBox="0 0 10 10"
4040
width="10"
41-
[attr.aria-label]="closeLabel"
42-
[attr.alt]="closeLabel">
41+
[attr.aria-label]="closeLabel">
4342
<title>{{closeLabel}}</title>
4443
<path d="M6.32 5L10 8.68 8.68 10 5 6.32 1.32 10 0 8.68 3.68 5 0 1.32 1.32 0 5 3.68 8.68 0 10 1.32 6.32 5z"></path>
4544
</svg>

‎src/pagination/pagination.component.ts‎

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,7 @@ import { BehaviorSubject } from "rxjs";
7575
role="img"
7676
viewBox="0 0 10 5"
7777
width="10"
78-
[attr.aria-label]="optionsListText | async"
79-
[attr.alt]="optionsListText | async">
78+
[attr.aria-label]="optionsListText | async">
8079
<title>{{optionsListText | async}}</title>
8180
<path d="M0 0l5 4.998L10 0z"></path>
8281
</svg>
@@ -105,8 +104,7 @@ import { BehaviorSubject } from "rxjs";
105104
role="img"
106105
viewBox="0 0 7 12"
107106
width="7"
108-
[attr.aria-label]="backwardText | async"
109-
[attr.alt]="backwardText | async">
107+
[attr.aria-label]="backwardText | async">
110108
<title>{{backwardText |async }}</title>
111109
<path d="M1.45 6.002L7 11.27l-.685.726L0 6.003 6.315 0 7 .726z"></path>
112110
</svg>
@@ -124,8 +122,7 @@ import { BehaviorSubject } from "rxjs";
124122
role="img"
125123
viewBox="0 0 10 5"
126124
width="10"
127-
[attr.aria-label]="optionsListText | async"
128-
[attr.alt]="optionsListText | async">
125+
[attr.aria-label]="optionsListText | async">
129126
<title>{{optionsListText | async}}</title>
130127
<path d="M0 0l5 4.998L10 0z"></path>
131128
</svg>
@@ -142,8 +139,7 @@ import { BehaviorSubject } from "rxjs";
142139
role="img"
143140
viewBox="0 0 7 12"
144141
width="7"
145-
[attr.aria-label]="forwardText | async"
146-
[attr.alt]="forwardText | async">
142+
[attr.aria-label]="forwardText | async">
147143
<title>{{forwardText | async}}</title>
148144
<path d="M5.569 5.994L0 .726.687 0l6.336 5.994-6.335 6.002L0 11.27z"></path>
149145
</svg>
@@ -235,11 +231,12 @@ export class Pagination {
235231
* @memberof Pagination
236232
*/
237233
get lastPage(): number {
238-
return Math.ceil(this.model.totalDataLength / this.model.pageLength);
234+
const last = Math.ceil(this.model.totalDataLength / this.model.pageLength);
235+
return last > 0 ? last : 1;
239236
}
240237

241238
get startItemIndex() {
242-
return (this.currentPage - 1) * this.model.pageLength + 1;
239+
return this.endItemIndex > 0 ? (this.currentPage - 1) * this.model.pageLength + 1 : 0;
243240
}
244241

245242
get endItemIndex() {

0 commit comments

Comments
 (0)