Skip to content

Commit 878cdef

Browse files
author
pipeline
committed
v24.2.9 is released
1 parent b5b81f1 commit 878cdef

File tree

26 files changed

+83
-41
lines changed

26 files changed

+83
-41
lines changed

‎controls/barcodegenerator/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 24.2.9 (2024-03-05)
5+
## 24.2.9 (2024-03-06)
66

77
### Barcode
88

‎controls/buttons/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 24.2.9 (2024-03-05)
5+
## 24.2.9 (2024-03-06)
66

77
### Button
88

‎controls/calendars/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 24.2.9 (2024-03-05)
5+
## 24.2.9 (2024-03-06)
66

77
### DateTimePicker
88

‎controls/charts/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 24.2.9 (2024-03-05)
5+
## 24.2.9 (2024-03-06)
66

77
### Chart
88

‎controls/diagrams/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 24.2.9 (2024-03-05)
5+
## 24.2.9 (2024-03-06)
66

77
### Diagram
88

‎controls/documenteditor/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 24.2.9 (2024-03-05)
5+
## 24.2.9 (2024-03-06)
66

77
### DocumentEditor
88

‎controls/drawings/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 24.2.9 (2024-03-05)
5+
## 24.2.9 (2024-03-06)
66

77
### Drawings
88

‎controls/gantt/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 24.2.9 (2024-03-05)
5+
## 24.2.9 (2024-03-06)
66

77
### GanttChart
88

‎controls/grids/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 24.2.9 (2024-03-05)
5+
## 24.2.9 (2024-03-06)
66

77
### Grid
88

‎controls/kanban/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 24.2.9 (2024-03-05)
5+
## 24.2.9 (2024-03-06)
66

77
### Kanban
88

‎controls/lists/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 24.2.9 (2024-03-05)
5+
## 24.2.9 (2024-03-06)
66

77
### ListView
88

‎controls/maps/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
## [Unreleased]
1010

11-
## 24.2.9 (2024-03-05)
11+
## 24.2.9 (2024-03-06)
1212

1313
### Maps
1414

‎controls/navigations/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 24.2.9 (2024-03-05)
5+
## 24.2.9 (2024-03-06)
66

77
### TreeView
88

‎controls/notifications/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 24.2.9 (2024-03-05)
5+
## 24.2.9 (2024-03-06)
66

77
### Toast
88

‎controls/pdf/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 24.2.9 (2024-03-05)
5+
## 24.2.9 (2024-03-06)
66

77
### PDF Parser
88

‎controls/pdfviewer/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 24.2.9 (2024-03-05)
5+
## 24.2.9 (2024-03-06)
66

77
### PDF Viewer
88

‎controls/pdfviewer/src/pdfviewer/base/navigation-pane.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1128,7 +1128,13 @@ export class NavigationPane {
11281128
let proxy: NavigationPane = null;
11291129
proxy = this;
11301130
if (proxy.sideBarContentContainer) {
1131-
proxy.sideBarContentContainer.style.display = 'block';
1131+
// eslint-disable-next-line max-len
1132+
if(!isNullOrUndefined(this.pdfViewer.thumbnailViewModule) && !this.pdfViewer.thumbnailViewModule.isThubmnailOpen) {
1133+
proxy.sideBarContentContainer.style.display = 'block';
1134+
}
1135+
if (proxy.pdfViewer.isBookmarkPanelOpen || this.isBookmarkOpen) {
1136+
proxy.sideBarContentContainer.style.display = 'block';
1137+
}
11321138
if (this.pdfViewer.enableRtl) {
11331139
// eslint-disable-next-line max-len
11341140
proxy.pdfViewerBase.viewerContainer.style.right = proxy.getViewerContainerLeft() + 'px';

‎controls/pdfviewer/src/pdfviewer/base/pdfviewer-base.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7114,10 +7114,10 @@ export class PdfViewerBase {
71147114
let thumbnailImageElement: HTMLImageElement;
71157115
let imageSource: string;
71167116
let object = new Object();
7117-
if ((this.isMinimumZoom && document.getElementById(this.pdfViewer.element.id + '_thumbnail_Selection_Ring_' + pageIndex))) {
7117+
thumbnailImageElement = document.getElementById(this.pdfViewer.element.id + '_thumbnail_Selection_Ring_' + pageIndex) as HTMLImageElement;
7118+
if (this.isMinimumZoom && thumbnailImageElement.children[0] as HTMLImageElement && !isNullOrUndefined((thumbnailImageElement.children[0] as HTMLImageElement).src) && (thumbnailImageElement.children[0] as HTMLImageElement).src !== "") {
71187119
this.renderThumbnailImages = true;
7119-
thumbnailImageElement = document.getElementById(this.pdfViewer.element.id + '_thumbnail_Selection_Ring_' + pageIndex).children[0] as HTMLImageElement;
7120-
imageSource = thumbnailImageElement.src;
7120+
imageSource = (thumbnailImageElement.children[0] as HTMLImageElement).src;
71217121
} else {
71227122
this.renderThumbnailImages = false;
71237123
}

‎controls/pdfviewer/src/pdfviewer/thumbnail-view/thumbnail-view.ts

Lines changed: 50 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,17 @@ export class ThumbnailView {
1717
private thumbnailThreshold: number = 50;
1818
private thumbnailTopMargin: number = 10;
1919
private thumbnailTop = 8;
20+
private isRendered: boolean = false;
2021
private list: any[] = [];
2122
/**
2223
* @private
2324
*/
2425
public thumbnailPageSize: any[] = [];
2526
private thumbnailRequestHandler: AjaxHandler;
27+
/**
28+
* @private
29+
*/
30+
public isThubmnailOpen: boolean = false;
2631
/**
2732
* @private
2833
*/
@@ -100,17 +105,37 @@ export class ThumbnailView {
100105
proxy.renderThumbnailEmptyPage(i);
101106
}
102107
if (proxy.pdfViewer.isThumbnailViewOpen) {
103-
proxy.pdfViewerBase.navigationPane.isThumbnailOpen = true; // eslint-disable-next-line max-len
108+
this.isThubmnailOpen = true;
109+
// eslint-disable-next-line max-len
104110
proxy.pdfViewerBase.navigationPane.sideBarTitle.textContent = proxy.pdfViewer.localeObj.getConstant('Page Thumbnails');
105111
document.getElementById(proxy.pdfViewer.element.id + '_thumbnail_view').style.display = 'flex';
106112
let bookmarkContent: any = proxy.pdfViewer.element.querySelector('.e-pv-bookmark-view');
107113
if (bookmarkContent) {
108114
bookmarkContent.style.display = 'none';
109115
}
110-
proxy.pdfViewerBase.navigationPane.setThumbnailSelectionIconTheme();
111116
proxy.pdfViewerBase.navigationPane.updateViewerContainerOnExpand();
117+
this.isThubmnailOpen = false;
112118
proxy.pdfViewerBase.navigationPane.isBookmarkOpen = false;
113119
}
120+
this.createRequestForThumbnailImages();
121+
}
122+
123+
private isThumbnailViewOpen(): void {
124+
const proxy: ThumbnailView = this;
125+
if (proxy.pdfViewer.isThumbnailViewOpen) {
126+
proxy.pdfViewerBase.navigationPane.setThumbnailSelectionIconTheme();
127+
proxy.pdfViewerBase.navigationPane.isThumbnailOpen = true; // eslint-disable-next-line max-len
128+
this.pdfViewerBase.navigationPane.sideBarContentContainer.style.display = 'block';
129+
if (this.pdfViewer.enableRtl) {
130+
proxy.pdfViewerBase.viewerContainer.style.right = this.pdfViewerBase.navigationPane.getViewerContainerLeft() + 'px';
131+
}
132+
else {
133+
proxy.pdfViewerBase.viewerContainer.style.left = this.pdfViewerBase.navigationPane.getViewerContainerLeft() + 'px';
134+
}
135+
proxy.pdfViewerBase.viewerContainer.style.width = (proxy.pdfViewer.element.clientWidth - this.pdfViewerBase.navigationPane.getViewerContainerLeft() - this.pdfViewerBase.navigationPane.getViewerContainerRight()) + 'px';
136+
proxy.pdfViewerBase.pageContainer.style.width = proxy.pdfViewerBase.viewerContainer.clientWidth + 'px';
137+
proxy.pdfViewerBase.updateZoomValue();
138+
}
114139
}
115140

116141
/**
@@ -209,8 +234,9 @@ export class ThumbnailView {
209234
// eslint-disable-next-line max-len
210235
this.list.push(proxy.startIndex);
211236
// eslint-disable-next-line max-len
212-
if(proxy.startIndex >= 100)
237+
if (this.pdfViewerBase.pageSize.length === this.pdfViewerBase.pageCount && !this.isRendered) {
213238
this.renderDiv();
239+
}
214240
proxy.thumbnailLimit = proxy.startIndex + proxy.thumbnailThreshold < proxy.pdfViewer.pageCount ? proxy.startIndex + proxy.thumbnailThreshold : proxy.pdfViewer.pageCount;
215241
if (!this.pdfViewerBase.clientSideRendering) {
216242
let digitalSignaturePresent: boolean = false;
@@ -264,6 +290,7 @@ export class ThumbnailView {
264290
});
265291
}
266292
}
293+
this.isThumbnailViewOpen();
267294
}
268295
}
269296

@@ -310,15 +337,17 @@ export class ThumbnailView {
310337
}
311338
}
312339

313-
private renderDiv(): void {
314-
if (this.pdfViewerBase.pageSize.length === this.pdfViewerBase.pageCount) {
340+
private renderDiv(data?: any): void {
341+
// eslint-disable-next-line
342+
if ((this.pdfViewerBase.pageSize.length === this.pdfViewerBase.pageCount || !isNullOrUndefined(data)) && !this.isRendered) {
315343
for (let i: number = 100; i < this.pdfViewer.pageCount; i++) {
316344
let thumbnail: HTMLElement = document.getElementById(this.pdfViewer.element.id + '_thumbnail_' + i);
317345
let pageLink: HTMLAnchorElement = document.getElementById('page_' + i) as HTMLAnchorElement;
318346
let thumbnailPageNumber: HTMLElement = document.getElementById(this.pdfViewer.element.id + '_thumbnail_pagenumber_' + i);
319347
let currentPageImage: any = this.getThumbnailImageElement(i);
320348
let height: number = 180;
321-
if (this.pdfViewerBase.pageSize[i] && (this.pdfViewerBase.pageSize[i].height < this.pdfViewerBase.pageSize[i].width)) {
349+
// eslint-disable-next-line
350+
if ((this.pdfViewerBase.pageSize[i] && (this.pdfViewerBase.pageSize[i].height < this.pdfViewerBase.pageSize[i].width)) || (data && (data.pageRotation[i] === 1 || data.pageRotation[i] === 3))) {
322351
currentPageImage.style.height = '86px';
323352
currentPageImage.style.width = '126px';
324353
thumbnail.style.height = '100px';
@@ -333,6 +362,7 @@ export class ThumbnailView {
333362
let thumbnailSize: any = {height: height, top: this.thumbnailTop};
334363
this.thumbnailPageSize[i] = thumbnailSize;
335364
}
365+
this.isRendered = true;
336366
}
337367
}
338368

@@ -348,7 +378,8 @@ export class ThumbnailView {
348378
const thumbnailDiv: HTMLElement = thumbnailChild.children[0] as HTMLElement;
349379
let offsetTop: number;
350380
if (shouldScroll) {
351-
if (this.pdfViewerBase.pageSize) {
381+
// eslint-disable-next-line
382+
if (this.pdfViewerBase.pageSize.length === this.pdfViewerBase.pageCount && !this.isRendered) {
352383
this.renderDiv();
353384
}
354385
if (thumbnailDiv.offsetTop <= 0) {
@@ -441,20 +472,19 @@ export class ThumbnailView {
441472
if (this.thumbnailView && data) {
442473
this.pdfViewerBase.clientSideRendering ? this.renderClientThumbnailImage(data) : this.renderServerThumbnailImage(data);
443474
}
444-
this.pdfViewerBase.navigationPane.enableThumbnailButton();
445475
this.thumbnailLimit = this.determineThumbnailsRequest(!isNullOrUndefined(pageNumber) ? pageNumber : this.thumbnailLimit);
446476
if (this.thumbnailLimit !== this.pdfViewerBase.pageCount && this.thumbnailView) {
447477
// eslint-disable-next-line
448478
let isIE: boolean = !!(document as any).documentMode;
449479
if (!isIE) {
450-
Promise.all([this.createRequestForThumbnail()]);
480+
Promise.all([this.createRequestForThumbnailImages()]);
451481
} else {
452-
this.createRequestForThumbnail();
482+
this.createRequestForThumbnailImages();
453483
}
454484
}
455485
}
456486

457-
private createRequestForThumbnail(): Promise<any> {
487+
private createRequestForThumbnailImages(): Promise<any> {
458488
const proxy: ThumbnailView = this;
459489
// eslint-disable-next-line
460490
let isIE: boolean = !!(document as any).documentMode;
@@ -479,6 +509,7 @@ export class ThumbnailView {
479509
for (let i: number = startPage; i < endPage; i++) {
480510
this.thumbnailImageRender(i, data);
481511
}
512+
this.isThumbnailViewOpen();
482513
}
483514

484515
// eslint-disable-next-line
@@ -489,9 +520,9 @@ export class ThumbnailView {
489520

490521
// eslint-disable-next-line
491522
private thumbnailImageRender(pageIndex: number, data: any) {
492-
if (this.pdfViewer.isThumbnailViewOpen) {
493-
// eslint-disable-next-line max-len
494-
this.pdfViewerBase.navigationPane.sideBarContentContainer.style.display = 'block';
523+
// eslint-disable-next-line max-len
524+
if (!isNullOrUndefined(data.pageRotation) && Object.keys(data.pageRotation).length > 0 && !this.isRendered) {
525+
this.renderDiv(data);
495526
}
496527
// eslint-disable-next-line max-len
497528
let thumbnail: HTMLElement = document.getElementById(this.pdfViewer.element.id + '_thumbnail_' + pageIndex);
@@ -511,6 +542,10 @@ export class ThumbnailView {
511542
thumbnail.style.marginLeft = '-5px';
512543
thumbnail.style.marginRight = '0px';
513544
}
545+
if(pageIndex === 0) {
546+
this.pdfViewerBase.navigationPane.enableThumbnailButton();
547+
this.isThumbnailViewOpen();
548+
}
514549
}
515550

516551
private wireUpEvents(): void {
@@ -663,6 +698,7 @@ export class ThumbnailView {
663698
this.list = [];
664699
this.thumbnailPageSize = [];
665700
this.thumbnailTop = 0;
701+
this.isRendered = false;
666702
if (this.pdfViewerBase.navigationPane) {
667703
if (this.pdfViewerBase.navigationPane.sideBarContentContainer) {
668704
this.pdfViewerBase.navigationPane.sideBarContentContainer.style.display = 'block';

‎controls/pivotview/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 24.2.9 (2024-03-05)
5+
## 24.2.9 (2024-03-06)
66

77
### PivotTable
88

‎controls/popups/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 24.2.9 (2024-03-05)
5+
## 24.2.9 (2024-03-06)
66

77
### Dialog
88

‎controls/querybuilder/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 24.2.9 (2024-03-05)
5+
## 24.2.9 (2024-03-06)
66

77
### QueryBuilder
88

‎controls/richtexteditor/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 24.2.9 (2024-03-05)
5+
## 24.2.9 (2024-03-06)
66

77
### RichTextEditor
88

‎controls/splitbuttons/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## [Unreleased]
44

5-
## 24.2.9 (2024-03-05)
5+
## 24.2.9 (2024-03-06)
66

77
### ProgressButton
88

0 commit comments

Comments
 (0)