fix some grid issues

deeleeramone · deeleeramone · commit 8dfc48eed776 · 2026-03-26T22:14:00.000-07:00
diff --git a/pywry/pywry/app.py b/pywry/pywry/app.py
@@ -944,6 +944,10 @@ def show_dataframe(  # pylint: disable=too-many-branches
         on_cell_click: Any = None,
         on_row_selected: Any = None,
         server_side: bool = False,
+        row_selection: Any = False,
+        pagination: bool | None = None,
+        pagination_page_size: int = 100,
+        enable_cell_span: bool | None = None,
     ) -> NativeWindowHandle | BaseWidget:
         """Show a DataFrame in an AG Grid table.
 
@@ -1014,7 +1018,13 @@ def show_dataframe(  # pylint: disable=too-many-branches
                 toolbars=toolbars,
                 modals=modals,
                 callbacks=inline_callbacks,
-                open_browser=is_browser_mode,  # Open in browser for BROWSER mode
+                open_browser=is_browser_mode,
+                column_defs=column_defs,
+                grid_options=grid_options,
+                row_selection=row_selection,
+                pagination=pagination,
+                pagination_page_size=pagination_page_size,
+                enable_cell_span=enable_cell_span,
             )
             self._register_inline_widget(widget)
             return widget
diff --git a/pywry/pywry/frontend/src/aggrid-defaults.js b/pywry/pywry/frontend/src/aggrid-defaults.js
@@ -72,7 +72,7 @@ window.PYWRY_AGGRID_DEFAULT_COL_DEF = {
     sortable: true,
     resizable: true,
     wrapText: true,
-    wrapHeaderText: true,
+    wrapHeaderText: false,
     autoHeight: true,
     filterParams: {
         buttons: ['apply', 'clear', 'reset'],
@@ -82,60 +82,53 @@ window.PYWRY_AGGRID_DEFAULT_COL_DEF = {
 };
 
 /**
- * Format numbers intelligently:
- * - Large integers with trailing zeros → K/M/B (75000 → "75K")
- * - Large integers without trailing zeros → commas (75123 → "75,123")
- * - Small decimals (< 1) → preserve full precision, no truncation
- * - Very small numbers (many leading zeros) → scientific notation
- * - Regular decimals → preserve full precision
+ * Format numbers with predictable compact notation.
  *
- * @param {number} value - The number to format
- * @returns {string} Formatted number string
+ * Rules:
+ * - Always promote large magnitudes to the highest sensible unit (K/M/B/T).
+ * - Avoid giant K values (e.g. 19,225,200K) by promoting to M/B/T.
+ * - Keep small/medium numbers comma-formatted unless K is clean (divisible by 1,000).
+ * - Preserve decimal precision for normal decimals; scientific for very tiny values.
  */
 window.PYWRY_FORMAT_NUMBER = function(value) {
     if (value == null || isNaN(value)) return '';
 
     var absValue = Math.abs(value);
-    var sign = value < 0 ? '-' : '';
 
-    // Very small numbers (with many leading zeros after decimal) → scientific notation
-    // e.g., 0.00000123 → "1.23e-6"
+    // Very small non-zero values: keep scientific notation readable
     if (absValue > 0 && absValue < 0.0001) {
-        return value.toExponential();
+        return value.toExponential(2);
     }
 
-    // Handle non-integers (decimals) - add thousand separators
+    // Non-integers: preserve precision while adding comma separators to integer part
     if (!Number.isInteger(value)) {
-        var parts = value.toString().split('.');
-        var integerPart = parseInt(parts[0]);
+        var parts = String(value).split('.');
+        var integerPart = Number(parts[0] || 0);
         var decimalPart = parts[1] || '';
-
-        // Format integer part with commas
         var formattedInteger = integerPart.toLocaleString('en-US');
-
-        // Return with decimal part preserved
         return decimalPart ? formattedInteger + '.' + decimalPart : formattedInteger;
     }
 
-    // From here, we're dealing with integers only
-    // Abbreviate integers with trailing zeros consistently
-
-    // Billions (1,000,000,000+) - must be divisible by 1B
-    if (absValue >= 1e9 && absValue % 1e9 === 0) {
-        return sign + (absValue / 1e9).toFixed(0) + 'B';
+    function formatCompact(n, divisor, suffix) {
+        var compact = n / divisor;
+        var decimals = compact >= 100 ? 0 : (compact >= 10 ? 1 : 2);
+        var rounded = compact.toFixed(decimals);
+        if (rounded.indexOf('.') !== -1) {
+            rounded = rounded.replace(/0+$/, '').replace(/\.$/, '');
+        }
+        return rounded + suffix;
     }
 
-    // Millions (1,000,000+) - must be divisible by 1M
-    if (absValue >= 1e6 && absValue % 1e6 === 0) {
-        return sign + (absValue / 1e6).toFixed(0) + 'M';
-    }
+    // Always use the highest magnitude for million+ values
+    if (absValue >= 1e12) return formatCompact(value, 1e12, 'T');
+    if (absValue >= 1e9) return formatCompact(value, 1e9, 'B');
+    if (absValue >= 1e6) return formatCompact(value, 1e6, 'M');
 
-    // Thousands (1,000+) - must be divisible by 1K
+    // For thousands, keep comma format unless it's a clean thousand (e.g., 75,000 -> 75K)
     if (absValue >= 1e3 && absValue % 1e3 === 0) {
-        return sign + (absValue / 1e3).toFixed(0) + 'K';
+        return formatCompact(value, 1e3, 'K');
     }
 
-    // Otherwise use thousand separators for non-abbreviatable integers
     return value.toLocaleString('en-US');
 };
 
@@ -157,6 +150,13 @@ window.PYWRY_AGGRID_PROCESS_COLUMN_DEFS = function(columnDefs) {
             delete processed.cellDataType;
         }
 
+        if (processed.headerTooltip === undefined || processed.headerTooltip === null || processed.headerTooltip === '') {
+            var headerLabel = processed.headerName || processed.field || processed.colId;
+            if (headerLabel !== undefined && headerLabel !== null && String(headerLabel).length > 8) {
+                processed.headerTooltip = String(headerLabel);
+            }
+        }
+
         // Convert valueGetter string to function
         // Expression can use: params, data, node, colDef, column, api, columnApi, context
         if (typeof processed.valueGetter === 'string') {
@@ -288,6 +288,7 @@ window.PYWRY_AGGRID_BUILD_OPTIONS = function(config, gridId) {
  */
 window.PYWRY_AGGRID_BUILD_CLIENT_OPTIONS = function(config, id, rowData, rowCount, truncatedRows) {
     var LARGE_DATASET_THRESHOLD = 10000;
+    var isNativeWebKit = document.documentElement.classList.contains('pywry-native');
 
     // Pagination logic:
     // - If config.pagination === true: always enable
@@ -337,6 +338,9 @@ window.PYWRY_AGGRID_BUILD_CLIENT_OPTIONS = function(config, id, rowData, rowCoun
         suppressMenuHide: true,
         enableCellTextSelection: true,
         ensureDomOrder: true,
+        suppressAnimationFrame: isNativeWebKit,
+        tooltipShowDelay: 1200,
+        tooltipHideDelay: 5000,
         // Row spanning support (AG Grid v32+)
         enableCellSpan: config.enableCellSpan || false,
 
@@ -390,6 +394,16 @@ window.PYWRY_AGGRID_BUILD_CLIENT_OPTIONS = function(config, id, rowData, rowCoun
                              ' of ' + (rowCount + truncatedRows).toLocaleString() + ' rows'
                 });
             }
+        },
+
+        onBodyScroll: function(event) {
+            if (!isNativeWebKit) return;
+            if (!event || !event.api) return;
+            window.requestAnimationFrame(function() {
+                try {
+                    event.api.redrawRows();
+                } catch (e) {}
+            });
         }
     };
 
@@ -415,6 +429,7 @@ window.PYWRY_AGGRID_BUILD_SERVER_SIDE_OPTIONS = function(config, id, serverConfi
     var totalRows = serverConfig.totalRows || 0;
     var blockSize = serverConfig.blockSize || 500;  // Rows per block for infinite scroll
     var currentFilteredTotal = totalRows;
+    var isNativeWebKit = document.documentElement.classList.contains('pywry-native');
 
     // Pending requests
     var pendingRequests = {};
@@ -517,6 +532,9 @@ window.PYWRY_AGGRID_BUILD_SERVER_SIDE_OPTIONS = function(config, id, serverConfi
         suppressMenuHide: true,
         enableCellTextSelection: true,
         ensureDomOrder: true,
+        suppressAnimationFrame: isNativeWebKit,
+        tooltipShowDelay: 1200,
+        tooltipHideDelay: 5000,
 
         // Row ID for selection persistence
         getRowId: function(params) {
@@ -616,6 +634,16 @@ window.PYWRY_AGGRID_BUILD_SERVER_SIDE_OPTIONS = function(config, id, serverConfi
                         ' rows). Use filters to narrow down results.'
                 });
             }
+        },
+
+        onBodyScroll: function(event) {
+            if (!isNativeWebKit) return;
+            if (!event || !event.api) return;
+            window.requestAnimationFrame(function() {
+                try {
+                    event.api.redrawRows();
+                } catch (e) {}
+            });
         }
     };
 
diff --git a/pywry/pywry/frontend/src/main.js b/pywry/pywry/frontend/src/main.js
@@ -305,13 +305,21 @@ function setupCustomScrollbar(scrollContainer) {
   // Skip if already set up
   if (scrollContainer.dataset.customScrollbar) return;
 
-  // Skip Plotly containers only - they have their own responsive layout
+  // Skip Plotly containers - they have their own responsive layout
   if (scrollContainer.querySelector('.pywry-plotly') ||
       scrollContainer.querySelector('.js-plotly-plot')) {
     scrollContainer.dataset.customScrollbar = 'skipped';
     return;
   }
 
+  // Skip AG Grid containers - AG Grid manages its own scrolling/virtualization
+  if (scrollContainer.querySelector('.pywry-grid') ||
+      scrollContainer.querySelector('.ag-root-wrapper') ||
+      scrollContainer.closest('.ag-root-wrapper')) {
+    scrollContainer.dataset.customScrollbar = 'skipped';
+    return;
+  }
+
   scrollContainer.dataset.customScrollbar = 'true';
 
   // Standard pywry-scroll-container handling
@@ -354,6 +362,22 @@ function setupCustomScrollbar(scrollContainer) {
   var scrollTimeout = null;
   var trackPadding = 6; // Padding inside the track for the thumb
 
+  function disableCustomScrollbarForAgGrid() {
+    if (!(scrollContainer.querySelector('.pywry-grid') ||
+          scrollContainer.querySelector('.ag-root-wrapper') ||
+          scrollContainer.closest('.ag-root-wrapper'))) {
+      return false;
+    }
+    if (trackV.parentNode) trackV.parentNode.removeChild(trackV);
+    if (trackH.parentNode) trackH.parentNode.removeChild(trackH);
+    wrapper.classList.remove('has-both-scrollbars', 'is-scrolling');
+    scrollContainer.classList.remove('has-scrollbar-v', 'has-scrollbar-h');
+    scrollContainer.dataset.customScrollbar = 'skipped';
+    return true;
+  }
+
+  if (disableCustomScrollbarForAgGrid()) return;
+
   function updateScrollbars() {
     var scrollHeight = scrollContainer.scrollHeight;
     var clientHeight = scrollContainer.clientHeight;
@@ -519,6 +543,12 @@ function setupCustomScrollbar(scrollContainer) {
   window.addEventListener('resize', updateScrollbars);
 
   // Re-observe for content changes
-  var contentObserver = new MutationObserver(updateScrollbars);
+  var contentObserver = new MutationObserver(function() {
+    if (disableCustomScrollbarForAgGrid()) {
+      contentObserver.disconnect();
+      return;
+    }
+    updateScrollbars();
+  });
   contentObserver.observe(scrollContainer, { childList: true, subtree: true, characterData: true });
 }
diff --git a/pywry/pywry/frontend/src/scrollbar.js b/pywry/pywry/frontend/src/scrollbar.js
@@ -119,6 +119,22 @@ window.PYWRY_SCROLLBARS = (function() {
     var scrollTimeout = null;
     var trackPadding = 6; // Padding inside the track for the thumb
 
+    function disableCustomScrollbarForAgGrid() {
+      if (!(scrollContainer.querySelector('.pywry-grid') ||
+            scrollContainer.querySelector('.ag-root-wrapper') ||
+            scrollContainer.closest('.ag-root-wrapper'))) {
+        return false;
+      }
+      if (trackV.parentNode) trackV.parentNode.removeChild(trackV);
+      if (trackH.parentNode) trackH.parentNode.removeChild(trackH);
+      wrapper.classList.remove('has-both-scrollbars', 'is-scrolling');
+      scrollContainer.classList.remove('has-scrollbar-v', 'has-scrollbar-h');
+      scrollContainer.dataset.customScrollbar = 'skipped';
+      return true;
+    }
+
+    if (disableCustomScrollbarForAgGrid()) return;
+
     function updateScrollbars() {
       var scrollHeight = scrollContainer.scrollHeight;
       var clientHeight = scrollContainer.clientHeight;
@@ -296,6 +312,10 @@ window.PYWRY_SCROLLBARS = (function() {
     // Use ResizeObserver to track size changes - observe ALL descendants AND toolbars
     if (typeof ResizeObserver !== 'undefined') {
       var resizeObserver = new ResizeObserver(function() {
+        if (disableCustomScrollbarForAgGrid()) {
+          resizeObserver.disconnect();
+          return;
+        }
         updateScrollbars();
       });
 
@@ -326,6 +346,11 @@ window.PYWRY_SCROLLBARS = (function() {
 
       // Watch for new elements and observe them too (including new toolbars)
       var elementObserver = new MutationObserver(function(mutations) {
+        if (disableCustomScrollbarForAgGrid()) {
+          resizeObserver.disconnect();
+          elementObserver.disconnect();
+          return;
+        }
         mutations.forEach(function(mutation) {
           mutation.addedNodes.forEach(function(node) {
             if (node.nodeType === 1) {
diff --git a/pywry/pywry/frontend/style/pywry.css b/pywry/pywry/frontend/style/pywry.css
@@ -21,12 +21,12 @@ html.pywry-native .pywry-scroll-container::-webkit-scrollbar {
     display: none;
 }
 /* Only reserve space for scrollbar when content overflows (but not for Plotly) */
-html.pywry-native .pywry-scroll-container.has-scrollbar-v:not(:has(.pywry-plotly)):not(:has(.js-plotly-plot)),
-.pywry-custom-scrollbar .pywry-scroll-container.has-scrollbar-v:not(:has(.pywry-plotly)):not(:has(.js-plotly-plot)) {
+html.pywry-native .pywry-scroll-container.has-scrollbar-v:not(:has(.pywry-plotly)):not(:has(.js-plotly-plot)):not(:has(.pywry-grid)):not(:has(.ag-root-wrapper)),
+.pywry-custom-scrollbar .pywry-scroll-container.has-scrollbar-v:not(:has(.pywry-plotly)):not(:has(.js-plotly-plot)):not(:has(.pywry-grid)):not(:has(.ag-root-wrapper)) {
     padding-right: 18px; /* 4px margin + 10px track + 4px inner margin */
 }
-html.pywry-native .pywry-scroll-container.has-scrollbar-h:not(:has(.pywry-plotly)):not(:has(.js-plotly-plot)),
-.pywry-custom-scrollbar .pywry-scroll-container.has-scrollbar-h:not(:has(.pywry-plotly)):not(:has(.js-plotly-plot)) {
+html.pywry-native .pywry-scroll-container.has-scrollbar-h:not(:has(.pywry-plotly)):not(:has(.js-plotly-plot)):not(:has(.pywry-grid)):not(:has(.ag-root-wrapper)),
+.pywry-custom-scrollbar .pywry-scroll-container.has-scrollbar-h:not(:has(.pywry-plotly)):not(:has(.js-plotly-plot)):not(:has(.pywry-grid)):not(:has(.ag-root-wrapper)) {
     padding-bottom: 18px; /* 4px margin + 10px track + 4px inner margin */
 }
 html.pywry-native .pywry-scroll-container::-webkit-scrollbar,
@@ -97,6 +97,20 @@ html.pywry-native .ag-root-wrapper.is-scrolling .pywry-scrollbar-track-h,
     opacity: 1;
 }
 
+/* AG Grid uses its own scrollbars/virtualization; disable custom overlay tracks */
+html.pywry-native .pywry-scroll-wrapper:has(.pywry-grid) > .pywry-scrollbar-track-v,
+html.pywry-native .pywry-scroll-wrapper:has(.pywry-grid) > .pywry-scrollbar-track-h,
+html.pywry-native .pywry-scroll-wrapper:has(.ag-root-wrapper) > .pywry-scrollbar-track-v,
+html.pywry-native .pywry-scroll-wrapper:has(.ag-root-wrapper) > .pywry-scrollbar-track-h,
+.pywry-custom-scrollbar .pywry-scroll-wrapper:has(.pywry-grid) > .pywry-scrollbar-track-v,
+.pywry-custom-scrollbar .pywry-scroll-wrapper:has(.pywry-grid) > .pywry-scrollbar-track-h,
+.pywry-custom-scrollbar .pywry-scroll-wrapper:has(.ag-root-wrapper) > .pywry-scrollbar-track-v,
+.pywry-custom-scrollbar .pywry-scroll-wrapper:has(.ag-root-wrapper) > .pywry-scrollbar-track-h {
+    pointer-events: none !important;
+    opacity: 0 !important;
+    display: none !important;
+}
+
 /* Custom scrollbar thumb - vertical */
 html.pywry-native .pywry-scrollbar-thumb-v,
 .pywry-custom-scrollbar .pywry-scrollbar-thumb-v {
@@ -2698,6 +2712,16 @@ html.light .pywry-input-date {
     outline: none !important;
 }
 
+.ag-header-cell-label {
+    min-width: 0;
+}
+
+.ag-header-cell-text {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+}
+
 /* AG Grid scrollbar styling - NATIVE WINDOW ONLY */
 /* Use AG Grid's browser-color-scheme parameter for appropriate scrollbar colors on macOS */
 /* Dark themes get dark scrollbars */
diff --git a/pywry/pywry/grid.py b/pywry/pywry/grid.py
@@ -481,6 +481,13 @@ class GridOptions(AGGridModel):
     row_selection: dict[str, Any] | bool | None = Field(default=None, alias="rowSelection")
     cell_selection: bool | None = Field(default=True, alias="cellSelection")
 
+    @field_validator("row_selection", mode="before")
+    @classmethod
+    def _coerce_row_selection(cls, v: Any) -> dict[str, Any] | bool | None:
+        if isinstance(v, RowSelection):
+            return v.to_dict()
+        return v
+
     # === Layout ===
     dom_layout: DomLayoutType = Field(default="normal", alias="domLayout")
 
diff --git a/pywry/pywry/mcp/handlers.py b/pywry/pywry/mcp/handlers.py
@@ -857,7 +857,6 @@ def _handle_chat_stop_generation(ctx: HandlerContext) -> HandlerResult:
 
 
 def _handle_chat_manage_thread(ctx: HandlerContext) -> HandlerResult:
-
     widget_id = ctx.args["widget_id"]
     action = ctx.args["action"]
     thread_id = ctx.args.get("thread_id")
diff --git a/pywry/pywry/toolbar.py b/pywry/pywry/toolbar.py
