@syncfusion/ej2-pdf 24.2.7 → 24.2.9

package/dist/global/index.d.ts

@@ -1,6 +1,6 @@
 /*!
 *  filename: index.d.ts
-*  version : 24.2.7
+*  version : 24.2.9
 *  Copyright Syncfusion Inc. 2001 - 2023. All rights reserved.
 *  Use of this code is subject to the terms of our license.
 *  A copy of the current license can be obtained at any time by e-mailing

package/package.json

@@ -1,8 +1,8 @@
 {
   "_from": "@syncfusion/ej2-pdf@*",
-  "_id": "@syncfusion/ej2-pdf@24.2.5",
+  "_id": "@syncfusion/ej2-pdf@24.2.8",
   "_inBundle": false,
-  "_integrity": "sha512-2i1KxEMaZLvQ/J3GgXzQUyJSSfDSm/av4zXUpDztp5fie0IB05ilwNo5nlnzzLyJi0/oWGeu9AcDIEYDAPUQbA==",
+  "_integrity": "sha512-sldIPEmlR0Cod7QoBhd2U/a2NviS+rMh1/tIbW3GddUkHm9+kfyVFYNbCpGdiq/FAn90MJldMsDfFf+TdkziYQ==",
   "_location": "/@syncfusion/ej2-pdf",
   "_phantomChildren": {},
   "_requested": {
@@ -21,8 +21,8 @@
     "/@syncfusion/ej2",
     "/@syncfusion/ej2-pdfviewer"
   ],
-  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-pdf/-/ej2-pdf-24.2.5.tgz",
-  "_shasum": "b4957dcc6ed53e4300cf0568c397df7d7e9e1d8d",
+  "_resolved": "https://nexus.syncfusioninternal.com/repository/ej2-hotfix-new/@syncfusion/ej2-pdf/-/ej2-pdf-24.2.8.tgz",
+  "_shasum": "d9cc1f127ba22c3435f75b4988880810ffe74970",
   "_spec": "@syncfusion/ej2-pdf@*",
   "_where": "/jenkins/workspace/elease-automation_release_24.1.1/packages/included",
   "author": {
@@ -55,7 +55,7 @@
     "url": "https://github.com/syncfusion/ej2-javascript-ui-controls/tree/master/controls/pdf"
   },
   "typings": "index.d.ts",
-  "version": "24.2.7",
+  "version": "24.2.9",
   "sideEffects": false,
   "homepage": "https://www.syncfusion.com/javascript-ui-controls"
 }

package/src/pdf/core/form/field.d.ts

@@ -855,6 +855,7 @@ export declare abstract class PdfField {
     _getAppearanceStateValue(): string;
     _getTextAlignment(): PdfTextAlignment;
     _setTextAlignment(value: PdfTextAlignment): void;
+    _parseItems(): PdfWidgetAnnotation[];
 }
 /**
  * `PdfTextBoxField` class represents the text box field objects.

package/src/pdf/core/form/field.js

@@ -2133,6 +2133,13 @@ var PdfField = /** @class */ (function () {
         this._textAlignment = value;
         this._stringFormat = new PdfStringFormat(value, PdfVerticalAlignment.middle);
     };
+    PdfField.prototype._parseItems = function () {
+        var collection = [];
+        for (var i = 0; i < this.itemsCount; i++) {
+            collection.push(this.itemAt(i));
+        }
+        return collection;
+    };
     return PdfField;
 }());
 export { PdfField };

package/src/pdf/core/form/form.d.ts

@@ -2,6 +2,7 @@ import { _PdfDictionary, _PdfName, _PdfReference } from './../pdf-primitives';
 import { _PdfCrossReference } from './../pdf-cross-reference';
 import { PdfField } from './field';
 import { PdfFormFieldsTabOrder, _SignatureFlag } from './../enumerator';
+import { PdfPage } from './../pdf-page';
 /**
  * Represents a PDF form.
  * ```typescript
@@ -273,7 +274,11 @@ export declare class PdfForm {
     _getOrder(tabOrder: PdfFormFieldsTabOrder): _PdfName;
     _compareFields(field1: any, field2: any): number;
     _getRectangle(dictionary: _PdfDictionary): number[];
+    _getItemRectangle(field: PdfField): number[];
     _compare(x: number, y: number): number;
     _compareKidsElement(x: _PdfReference, y: _PdfReference): number;
+    _sortItemByPageIndex(field: PdfField, hasPageTabOrder: boolean): PdfPage;
+    _sortFieldItems(field: PdfField): void;
+    _compareFieldItem(item1: any, item2: any): number;
     _clear(): void;
 }

package/src/pdf/core/form/form.js

@@ -377,7 +377,7 @@ var PdfForm = /** @class */ (function () {
                         for (var i = 0; i < this._fieldCollection.length; i++) {
                             var field = this._fieldCollection[Number.parseInt(i.toString(), 10)];
                             if (field.page) {
-                                var index = _getPageIndex(document_1, field.page._pageDictionary);
+                                var index = _getPageIndex(document_1, this._sortItemByPageIndex(field, true)._pageDictionary);
                                 if (index >= 0) {
                                     if (fieldCollection.has(index)) {
                                         value = fieldCollection.get(index);
@@ -401,16 +401,18 @@ var PdfForm = /** @class */ (function () {
                         var fieldsCount_1 = 0;
                         fieldCollection.forEach(function (value, key) {
                             _this._tabOrder = _this._tabCollection.get(key);
-                            var fields = value;
-                            fields.sort(function (pdfField1, pdfField2) {
-                                return _this._compareFields(pdfField1, pdfField2);
-                            });
-                            for (var j = 0; j < fields.length; j++) {
-                                var fieldIndex = _this._fieldCollection.indexOf(fields[Number.parseInt(j.toString(), 10)]);
-                                if (fieldIndex !== -1 && fieldIndex !== fieldsCount_1 + j) {
-                                    var field = _this._fieldCollection[Number.parseInt(fieldIndex.toString(), 10)];
-                                    _this._fieldCollection.splice(fieldIndex, 1);
-                                    _this._fieldCollection.splice(fieldsCount_1 + j, 0, field);
+                            if (_this._tabOrder !== PdfFormFieldsTabOrder.structure) {
+                                var fields = value;
+                                fields.sort(function (pdfField1, pdfField2) {
+                                    return _this._compareFields(pdfField1, pdfField2);
+                                });
+                                for (var j = 0; j < fields.length; j++) {
+                                    var fieldIndex = _this._fieldCollection.indexOf(fields[Number.parseInt(j.toString(), 10)]);
+                                    if (fieldIndex !== -1 && fieldIndex !== fieldsCount_1 + j) {
+                                        var field = _this._fieldCollection[Number.parseInt(fieldIndex.toString(), 10)];
+                                        _this._fieldCollection.splice(fieldIndex, 1);
+                                        _this._fieldCollection.splice(fieldsCount_1 + j, 0, field);
+                                    }
                                 }
                             }
                             fieldsCount_1 += value.length;
@@ -650,10 +652,24 @@ var PdfForm = /** @class */ (function () {
         var page1 = field1.page;
         var page2 = field2.page;
         if (page1 && page1 instanceof PdfPage && page2 && page2 instanceof PdfPage) {
-            var page1Index = page1._pageIndex;
-            var page2Index = page2._pageIndex;
-            var rectangle1 = this._getRectangle(field1._dictionary);
-            var rectangle2 = this._getRectangle(field2._dictionary);
+            var page1Index = this._sortItemByPageIndex(field1, false)._pageIndex;
+            var page2Index = this._sortItemByPageIndex(field2, false)._pageIndex;
+            var rectangle1 = void 0;
+            if (field1._dictionary.has('Kids')) {
+                rectangle1 = this._getItemRectangle(field1);
+            }
+            else {
+                rectangle1 = this._getRectangle(field1._dictionary);
+            }
+            var rectangle2 = void 0;
+            if (field2._dictionary.has('Kids')) {
+                rectangle2 = this._getItemRectangle(field2);
+            }
+            else {
+                rectangle2 = this._getRectangle(field2._dictionary);
+            }
+            var firstHeight = rectangle1[3] - rectangle1[1];
+            var secondHeight = rectangle2[3] - rectangle2[1];
             if (rectangle1 && rectangle1.length >= 2 && rectangle2 && rectangle2.length >= 2) {
                 var x1 = rectangle1[0];
                 var y1 = rectangle1[1];
@@ -664,6 +680,13 @@ var PdfForm = /** @class */ (function () {
                     index = page1Index - page2Index;
                     if (this._tabOrder === PdfFormFieldsTabOrder.row) {
                         xdiff = this._compare(y2, y1);
+                        if (xdiff !== 0) {
+                            var isValid = xdiff === -1 && y1 > y2 && (y1 - firstHeight / 2) < y2;
+                            isValid = isValid || (xdiff === 1 && y2 > y1 && (y2 - secondHeight / 2) < y1);
+                            if (isValid) {
+                                xdiff = 0;
+                            }
+                        }
                         if (index !== 0) {
                             result = index;
                         }
@@ -706,28 +729,32 @@ var PdfForm = /** @class */ (function () {
         return result;
     };
     PdfForm.prototype._getRectangle = function (dictionary) {
-        var _this = this;
+        var rect;
         if (dictionary.has('Rect')) {
-            var rect = dictionary.get('Rect');
-            if (rect) {
-                return rect;
-            }
+            rect = dictionary.getArray('Rect');
         }
-        else {
-            if (dictionary.has('Kids')) {
-                var kidsArray = dictionary.get('Kids');
-                if (kidsArray) {
-                    if (kidsArray.length > 1) {
-                        kidsArray.sort(function (x, y) {
-                            return _this._compareKidsElement(x, y);
-                        });
+        return rect;
+    };
+    PdfForm.prototype._getItemRectangle = function (field) {
+        var result;
+        var dictionary = field._dictionary;
+        if (dictionary.has('Kids')) {
+            var kids = dictionary.getArray('Kids');
+            if (kids && kids.length >= 1) {
+                if (kids.length === 1) {
+                    result = this._getRectangle(kids[0]);
+                }
+                else {
+                    if (field && field.itemsCount > 1) {
+                        result = this._getRectangle(field.itemAt(0)._dictionary);
+                    }
+                    else {
+                        result = this._getRectangle(kids[0]);
                     }
-                    var dictionary_1 = this._crossReference._fetch(kidsArray[0]);
-                    return this._getRectangle(dictionary_1);
                 }
             }
         }
-        return null;
+        return result;
     };
     PdfForm.prototype._compare = function (x, y) {
         if (x > y) {
@@ -745,6 +772,7 @@ var PdfForm = /** @class */ (function () {
         var yDictionary = this._crossReference._fetch(y);
         var xRect = this._getRectangle(xDictionary);
         var yRect = this._getRectangle(yDictionary);
+        var result;
         if (xRect && xRect.length >= 2 && yRect && yRect.length >= 2) {
             var x1 = xRect[0];
             var y1 = xRect[1];
@@ -752,7 +780,6 @@ var PdfForm = /** @class */ (function () {
             var y2 = yRect[1];
             if (typeof x1 === 'number' && typeof x2 === 'number' &&
                 typeof y1 === 'number' && typeof y2 === 'number') {
-                var result = 0;
                 var xdiff = void 0;
                 if (this._tabOrder === PdfFormFieldsTabOrder.row) {
                     xdiff = this._compare(y2, y1);
@@ -772,10 +799,90 @@ var PdfForm = /** @class */ (function () {
                         result = this._compare(y2, y1);
                     }
                 }
+                else {
+                    result = 0;
+                }
                 return result;
             }
         }
-        return null;
+        return result;
+    };
+    PdfForm.prototype._sortItemByPageIndex = function (field, hasPageTabOrder) {
+        var page = field.page;
+        var tabOrder = this._tabOrder;
+        this._tabOrder = hasPageTabOrder ? field.page.tabOrder : tabOrder;
+        this._sortFieldItems(field);
+        if (field._isLoaded && field._kidsCount > 1) {
+            page = field.itemAt(0).page;
+        }
+        this._tabOrder = tabOrder;
+        if (typeof page === 'undefined') {
+            page = field.page;
+        }
+        return page;
+    };
+    PdfForm.prototype._sortFieldItems = function (field) {
+        var _this = this;
+        if (field._isLoaded && (field instanceof PdfTextBoxField ||
+            field instanceof PdfListBoxField ||
+            field instanceof PdfCheckBoxField ||
+            field instanceof PdfRadioButtonListField)) {
+            var collection = field._parseItems(); // eslint-disable-line
+            collection.sort(function (item1, item2) {
+                return _this._compareFieldItem(item1, item2);
+            });
+            field._parsedItems.clear();
+            for (var i = 0; i < collection.length; i++) {
+                field._parsedItems.set(i, collection[Number.parseInt(i.toString(), 10)]);
+            }
+        }
+    };
+    PdfForm.prototype._compareFieldItem = function (item1, item2) {
+        var result = 0;
+        if (typeof item1 !== 'undefined' && typeof item2 !== 'undefined') {
+            var page1 = item1.page;
+            var page2 = item2.page;
+            var array1 = this._getRectangle(item1._dictionary);
+            var array2 = this._getRectangle(item2._dictionary);
+            if (array1 && array2) {
+                var x1 = array1[0];
+                var y1 = array1[1];
+                var x2 = array2[0];
+                var y2 = array2[1];
+                var xdiff = void 0;
+                if (this._tabOrder === PdfFormFieldsTabOrder.row) {
+                    xdiff = this._compare(page1._pageIndex, page2._pageIndex);
+                    if (xdiff !== 0) {
+                        result = xdiff;
+                    }
+                    else {
+                        xdiff = this._compare(y2, y1);
+                        if (xdiff !== 0) {
+                            result = xdiff;
+                        }
+                        else {
+                            result = this._compare(x1, x2);
+                        }
+                    }
+                }
+                else if (this._tabOrder === PdfFormFieldsTabOrder.column) {
+                    xdiff = this._compare(page1._pageIndex, page2._pageIndex);
+                    if (xdiff !== 0) {
+                        result = xdiff;
+                    }
+                    else {
+                        xdiff = this._compare(x1, x2);
+                        if (xdiff !== 0) {
+                            result = xdiff;
+                        }
+                        else {
+                            result = this._compare(y2, y1);
+                        }
+                    }
+                }
+            }
+        }
+        return result;
     };
     PdfForm.prototype._clear = function () {
         this._fields = [];

package/src/pdf/core/pdf-cross-reference.js

@@ -54,18 +54,24 @@ var _PdfCrossReference = /** @class */ (function () {
             }
         }
         var hasRoot = false;
+        var root;
         try {
-            var root = trailerDictionary.get('Root');
-            if (root) {
+            root = trailerDictionary.get('Root');
+        }
+        catch (e) {
+            throw new BaseException('Invalid cross reference', 'XRefParseException');
+        }
+        if (root) {
+            try {
                 var pagesEntry = root.get('Pages');
                 if (pagesEntry) {
                     this._root = root;
                     hasRoot = true;
                 }
             }
-        }
-        catch (ex) {
-            throw new BaseException('Invalid cross reference', 'InvalidXRef');
+            catch (ex) {
+                throw new BaseException('Invalid cross reference', 'InvalidXRef');
+            }
         }
         if (!hasRoot) {
             if (!recoveryMode) {