@flexem/fc-gui 3.0.0-alpha.188 → 3.0.0-alpha.189

package/bundles/@flexem/fc-gui.umd.js

@@ -42488,7 +42488,7 @@ C140,111.8,99.2,158.4,78,178.6z M78,40.4c-17.8,0-32.4,14.4-32.4,32.2s14.5,32.2,3
 }
 
 // CONCATENATED MODULE: ./.tmp/elements/alarm/alarm-table-scrollbar.ts
-/** SVG scrollbar kept outside foreignObject so WKWebView applies the canvas scale. */
+/** SVG scrollbar overlays the table bounds but stays outside foreignObject for WKWebView scaling. */
 class AlarmTableScrollbar {
     constructor(parent, x, y, width, height, visibleRows, onChange, onPause, onResume) {
         this.y = y;
@@ -42503,7 +42503,6 @@ class AlarmTableScrollbar {
         this.thumbTop = 0;
         this.dragging = false;
         this.hovered = false;
-        this.focused = false;
         this.dragStartY = 0;
         this.dragStartRow = 0;
         this.handleStart = (event) => {
@@ -42556,17 +42555,11 @@ class AlarmTableScrollbar {
             this.onResume();
         };
         this.handleEnter = () => {
+            if (!this.supportsMouseHover())
+                return;
             this.hovered = true;
             this.onPause();
         };
-        this.handleFocus = () => {
-            this.focused = true;
-            this.onPause();
-        };
-        this.handleBlur = () => {
-            this.focused = false;
-            this.onResume();
-        };
         this.handleKeyDown = (event) => {
             const targets = {
                 ArrowUp: this.start - 1,
@@ -42592,7 +42585,7 @@ class AlarmTableScrollbar {
         this.track = this.createElement('rect');
         this.setRect(this.track, x, y, width, height);
         this.track.setAttribute('fill', '#eef0f4');
-        this.track.setAttribute('rx', String(width / 2));
+        this.track.setAttribute('rx', '0');
         this.thumb = this.createElement('rect');
         this.setRect(this.thumb, x + width / 4, y, width / 2, height);
         this.thumb.setAttribute('fill', '#b6bdc9');
@@ -42606,11 +42599,9 @@ class AlarmTableScrollbar {
         this.group.addEventListener('keydown', this.handleKeyDown);
         this.group.addEventListener('mouseenter', this.handleEnter);
         this.group.addEventListener('mouseleave', this.handleLeave);
-        this.group.addEventListener('focus', this.handleFocus);
-        this.group.addEventListener('blur', this.handleBlur);
     }
     get isInteracting() {
-        return this.dragging || this.hovered || this.focused;
+        return this.dragging || this.hovered;
     }
     update(start, totalRows) {
         this.maxStart = Math.max(0, totalRows - this.visibleRows);
@@ -42631,8 +42622,6 @@ class AlarmTableScrollbar {
         this.group.removeEventListener('keydown', this.handleKeyDown);
         this.group.removeEventListener('mouseenter', this.handleEnter);
         this.group.removeEventListener('mouseleave', this.handleLeave);
-        this.group.removeEventListener('focus', this.handleFocus);
-        this.group.removeEventListener('blur', this.handleBlur);
         this.group.remove();
     }
     createElement(name) {
@@ -42660,6 +42649,10 @@ class AlarmTableScrollbar {
         this.ownerDocument.removeEventListener('touchcancel', this.handleEnd);
         this.ownerDocument.defaultView.removeEventListener('blur', this.handleEnd);
     }
+    supportsMouseHover() {
+        const view = this.ownerDocument.defaultView;
+        return !!view && (!view.matchMedia || view.matchMedia('(hover: hover) and (pointer: fine)').matches);
+    }
 }
 
 // CONCATENATED MODULE: ./.tmp/elements/alarm/alarm-element.ts
@@ -42752,6 +42745,8 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
             }
         };
         this.handleScrollMouseEnter = () => {
+            if (!this.supportsMouseHover())
+                return;
             this.scrollHovered = true;
             clearInterval(this.scrollIntervalId);
         };
@@ -43081,10 +43076,10 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
     }
     updateScrollThumb() {
         if (this.scrollbar)
-            this.scrollbar.update(this.scrollWindowStart, this.alarmList.length);
+            this.scrollbar.update(this.scrollWindowStart, this.pageSize);
     }
     getMaxWindowStart() {
-        return Math.max(0, this.alarmList.length - this.maxVisibleRows);
+        return Math.max(0, this.pageSize - this.maxVisibleRows);
     }
     getIconScale() {
         const initSize = this.model.initSize;
@@ -43227,8 +43222,8 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
         this.rowHeight = dataRowHeight;
         this.scrollWindowStart = 0;
         // WKWebView can paint positioned HTML descendants outside the SVG scale.
-        // Keep a single unpositioned table directly in foreignObject; the scrollbar
-        // is a sibling SVG group, never an HTML overlay or native scrolling layer.
+        // Keep a single unpositioned table directly in foreignObject. The sibling
+        // SVG scrollbar overlays the table's right edge without an HTML scrolling layer.
         const scrollbarWidth = Math.min(12, this.model.size.width * 0.04);
         const tableHeight = elementHeight - operationAreaReservedHeight;
         const table = document.createElement('table');
@@ -43236,12 +43231,14 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
             height: ${tableHeight}px; width: 100%; table-layout: fixed;
             overflow-wrap: break-word; -webkit-text-size-adjust: none; text-size-adjust: none;`;
         table.appendChild(this.buildHeaderRow());
-        this.element.setAttribute('width', String(this.model.size.width - scrollbarWidth));
         this.element.appendChild(table);
         this.scrollContent = table;
         this.renderScrollWindow(0);
-        const headerHeight = Math.min(tableHeight, table.rows[0].getBoundingClientRect().height / this.getCanvasScaleY());
-        this.scrollbar = new AlarmTableScrollbar(this.element.parentNode, this.model.size.width - scrollbarWidth, headerHeight, scrollbarWidth, Math.max(0, tableHeight - headerHeight), this.maxVisibleRows, start => this.moveScrollWindowBy(start - this.scrollWindowStart), () => clearInterval(this.scrollIntervalId), () => this.startAutoScroll());
+        const canvasScaleY = this.getCanvasScaleY();
+        const renderedTableHeight = table.getBoundingClientRect().height / canvasScaleY || tableHeight;
+        const renderedHeaderHeight = table.rows[0].getBoundingClientRect().height / canvasScaleY || this.model.heights[0];
+        const scrollbarInset = 2;
+        this.scrollbar = new AlarmTableScrollbar(this.element.parentNode, this.model.size.width - scrollbarWidth, renderedHeaderHeight + scrollbarInset, scrollbarWidth, Math.max(0, renderedTableHeight - renderedHeaderHeight - scrollbarInset * 2), this.maxVisibleRows, start => this.moveScrollWindowBy(start - this.scrollWindowStart), () => clearInterval(this.scrollIntervalId), () => this.startAutoScroll());
         this.updateScrollThumb();
         this.hoverTarget = table;
         this.bindScrollHoverEvents();
@@ -43298,6 +43295,11 @@ class alarm_element_AlarmElement extends conditional_display_element_Conditional
         const row = (_a = this.scrollContent) === null || _a === void 0 ? void 0 : _a.querySelectorAll('tr')[1];
         return (row === null || row === void 0 ? void 0 : row.getBoundingClientRect().height) || this.rowHeight * this.getCanvasScaleY();
     }
+    supportsMouseHover() {
+        var _a, _b;
+        const view = (_b = (_a = this.element) === null || _a === void 0 ? void 0 : _a.ownerDocument) === null || _b === void 0 ? void 0 : _b.defaultView;
+        return !!view && (!view.matchMedia || view.matchMedia('(hover: hover) and (pointer: fine)').matches);
+    }
     startAutoScroll() {
         var _a;
         clearInterval(this.scrollIntervalId);