From 548149735b0c371fec8881de02efe3e95de20a40 Mon Sep 17 00:00:00 2001
From: "4111978+Fred-Wu@users.noreply.github.com"
 <4111978+Fred-Wu@users.noreply.github.com>
Date: Mon, 6 Jul 2026 23:22:55 +1000
Subject: [PATCH] Improve NA rendering and bump v3.2.1

---
 CHANGELOG.md      | 16 ++++++++++++++++
 package-lock.json |  4 ++--
 package.json      |  2 +-
 src/session.ts    | 29 ++++++++++++++++++++++-------
 4 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f5bef815..7e219cee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## 3.2.1 - 2026-07-06
+
+### Bug Fixes
+
+* Improved the R language server lifecycle for Quarto R chunks with delayed shutdown, cancellation of pending shutdowns, serialised restart handling, correct virtual-document routing and selectors, and cleanup of stopped clients and listeners.
+
+### Minor
+
+* Added formatted current-row and total-row feedback while dragging the data viewer's vertical scrollbar.
+* Kept unloaded data viewer rows visually empty and displayed loaded R `NA` values across column types using lighter italic text.
+
+### Maintenance
+
+* Upgraded AG Grid Community to 35.2.1 and refactored the existing data viewer to use the AG Grid 35 grid and theme APIs.
+* Removed `data.table` as a dependency.
+
 ## 3.2.0 - 2026-07-06
 
 ### Bug Fixes
diff --git a/package-lock.json b/package-lock.json
index 2153b962..9a504e33 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "r",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "r",
-      "version": "3.2.0",
+      "version": "3.2.1",
       "license": "SEE LICENSE IN LICENSE",
       "dependencies": {
         "ag-grid-community": "^35.2.1",
diff --git a/package.json b/package.json
index c75f7ed3..f95cef81 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "r",
   "displayName": "R",
   "description": "R Extension for Visual Studio Code",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "author": "REditorSupport",
   "license": "SEE LICENSE IN LICENSE",
   "publisher": "REditorSupport",
diff --git a/src/session.ts b/src/session.ts
index 201f7013..27885640 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -859,6 +859,12 @@ export async function getTableHtml(webview: Webview, file: string): Promise<stri
     #scrollPosition.visible {
         display: block;
     }
+
+    .dataview-na {
+        color: var(--vscode-descriptionForeground);
+        font-style: italic;
+        opacity: 0.75;
+    }
     </style>
     <script src="${String(webview.asWebviewUri(Uri.file(path.join(resDir, 'ag-grid-community.min.noStyle.js'))))}"></script>
     <script>
@@ -891,6 +897,12 @@ export async function getTableHtml(webview: Webview, file: string): Promise<stri
     // Inject raw JSON data from R
     const data = ${content};
     const emptyCellRenderer = () => '';
+    const naCellRenderer = () => {
+        const element = document.createElement('span');
+        element.className = 'dataview-na';
+        element.textContent = 'NA';
+        return element;
+    };
 
     function clearLongFetchTimer() {
         if (longFetchTimer) {
@@ -1100,6 +1112,14 @@ export async function getTableHtml(webview: Webview, file: string): Promise<stri
 
     const columnDefs = data.columns.map(sourceColumn => {
         const column = { ...sourceColumn };
+        column.cellRendererSelector = params => {
+            if (params.data == null) {
+                return { component: emptyCellRenderer };
+            }
+            return params.value == null
+                ? { component: naCellRenderer }
+                : undefined;
+        };
         if (column.field === 'x1') {
             column.lockPosition = 'left';
             column.width = 150;
@@ -1112,13 +1132,8 @@ export async function getTableHtml(webview: Webview, file: string): Promise<stri
             column.hide = true;
         }
 
-        if (column.type === 'booleanColumn') {
-            column.cellRendererSelector = params =>
-                params.data == null
-                    ? { component: emptyCellRenderer }
-                    : undefined;
-        } else if (column.type === 'dateColumn' ||
-                   column.type === 'datetimeColumn') {
+        if (column.type === 'dateColumn' ||
+            column.type === 'datetimeColumn') {
             column.cellDataType =
                 column.type === 'dateColumn' ? 'dateString' : 'dateTimeString';
             column.filter = 'agDateColumnFilter';