@syncfusion/ej2-pdf 24.2.8 → 24.2.9

package/dist/es6/ej2-pdf.es5.js

@@ -9325,6 +9325,13 @@ var PdfField = /** @__PURE__ @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;
 }());
 /**
@@ -42302,7 +42309,7 @@ var PdfForm = /** @__PURE__ @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);
@@ -42326,16 +42333,18 @@ var PdfForm = /** @__PURE__ @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;
@@ -42575,10 +42584,24 @@ var PdfForm = /** @__PURE__ @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];
@@ -42589,6 +42612,13 @@ var PdfForm = /** @__PURE__ @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;
                         }
@@ -42631,28 +42661,32 @@ var PdfForm = /** @__PURE__ @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) {
@@ -42670,6 +42704,7 @@ var PdfForm = /** @__PURE__ @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];
@@ -42677,7 +42712,6 @@ var PdfForm = /** @__PURE__ @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);
@@ -42697,10 +42731,90 @@ var PdfForm = /** @__PURE__ @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 = [];