tnx-shared 5.3.409 → 5.3.410

package/bundles/tnx-shared.umd.js

@@ -50567,6 +50567,7 @@
                             }
                             this.hideWaitBox();
                             this.show = false;
+                            this.onClose.next();
                             return [2 /*return*/];
                     }
                 });
@@ -50579,11 +50580,33 @@
                 var _a;
                 var pdfViewer = (_a = window.PDFViewerApplication) === null || _a === void 0 ? void 0 : _a.pdfViewer;
                 if (pdfViewer) {
-                    // Add click listener to each page canvas
-                    var container = document.querySelector('#viewerContainer');
-                    container === null || container === void 0 ? void 0 : container.addEventListener('click', function (e) {
-                        _this.handlePageClick(e, pdfViewer);
+                    // Lấy tất cả canvas elements
+                    var canvases = document.querySelectorAll('#viewerContainer canvas');
+                    canvases.forEach(function (canvas) {
+                        canvas.addEventListener('click', function (e) {
+                            _this.handlePageClick(e, pdfViewer);
+                        });
                     });
+                    // Optional: Theo dõi khi có canvas mới được render (khi scroll PDF)
+                    var observer = new MutationObserver(function () {
+                        var newCanvases = document.querySelectorAll('#viewerContainer canvas');
+                        newCanvases.forEach(function (canvas) {
+                            // Kiểm tra nếu chưa có listener (tránh thêm duplicate)
+                            if (!canvas._hasClickListener) {
+                                canvas.addEventListener('click', function (e) {
+                                    _this.handlePageClick(e, pdfViewer);
+                                });
+                                canvas._hasClickListener = true;
+                            }
+                        });
+                    });
+                    var container = document.querySelector('#viewerContainer');
+                    if (container) {
+                        observer.observe(container, {
+                            childList: true,
+                            subtree: true
+                        });
+                    }
                 }
             }, 1000);
         };
@@ -50593,29 +50616,37 @@
             if (marker) {
                 marker.remove();
             }
-            if (target.classList.contains('canvasWrapper') ||
-                target.tagName === 'CANVAS') {
-                // Get page number and coordinates
+            if (target.tagName === 'CANVAS') {
                 var pageDiv = target.closest('.page');
                 var pageNumber = parseInt((pageDiv === null || pageDiv === void 0 ? void 0 : pageDiv.getAttribute('data-page-number')) || '1');
-                var rect = target.getBoundingClientRect();
-                var x = event.clientX - rect.left;
-                var y = event.clientY - rect.top;
+                // Dùng offsetX/Y với scale adjustment
+                var x = event.offsetX;
+                var y = event.offsetY;
+                // Điều chỉnh theo scale của canvas
+                var scaleX = target.width / target.clientWidth;
+                var scaleY = target.height / target.clientHeight;
+                x = x * scaleX;
+                y = y * scaleY;
                 var WIDTH = this.model.data.width || 100;
                 var HEIGHT = this.model.data.height || 100;
-                // Convert pixel sang point TRƯỚC
+                // Convert pixel sang point
                 var clickXPoint = this.pixelToPoint(x);
                 var clickYPoint = this.pixelToPoint(y);
                 var widthPoint = this.pixelToPoint(WIDTH);
                 var heightPoint = this.pixelToPoint(HEIGHT);
-                // SAU ĐÓ mới tính toán như C#
+                var canvasHeightPoint = this.pixelToPoint(target.height);
+                // Chuyển đổi Y coordinate (PDF origin ở dưới)
+                var pdfY = canvasHeightPoint - clickYPoint;
                 var x1 = clickXPoint;
-                var y1 = clickYPoint - heightPoint;
+                var y1 = pdfY - heightPoint;
                 var x2 = clickXPoint + widthPoint;
-                var y2 = clickYPoint;
-                var rectangle = x1 + "," + y1 + "," + x2 + "," + y2;
+                var y2 = pdfY;
+                var rectangle = Math.floor(x1) + "," + Math.floor(y1) + "," + Math.floor(x2) + "," + Math.floor(y2);
+                console.log('PDF Rectangle:', rectangle);
+                console.log('==================');
                 this.model.data.signatureLocation = rectangle;
-                this.createMarker(target, x, y, pageNumber);
+                // Tạo marker với tọa độ đã điều chỉnh (nhưng hiển thị theo display size)
+                this.createMarker(target, event.offsetX, event.offsetY, pageNumber);
             }
         };
         FileViewerComponent.prototype.createMarker = function (parent, x, y, page) {
@@ -50628,7 +50659,7 @@
         };
         FileViewerComponent.prototype.pixelToPoint = function (pixel, dpi) {
             if (dpi === void 0) { dpi = 96; }
-            return Math.round(pixel * 72 / dpi * 100); // Làm tròn 2 chữ số thập phân
+            return pixel * 72 / dpi;
         };
         return FileViewerComponent;
     }(ComponentBase));