Merge branch 'main' into users/makinc/use-verbatimmodulesyntax

ni · Jan 16, 2025 · 009af3e · 009af3e
2 parents 2475c8e + 7e46f34
commit 009af3e
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/packages/nimble-components/CHANGELOG.json b/packages/nimble-components/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@ni/nimble-components",
   "entries": [
+    {
+      "date": "Thu, 16 Jan 2025 18:48:36 GMT",
+      "version": "32.11.1",
+      "tag": "@ni/nimble-components_v32.11.1",
+      "comments": {
+        "none": [
+          {
+            "author": "[email protected]",
+            "package": "@ni/nimble-components",
+            "commit": "a4011ec7130d2aa601d2058660caed6f3d705f02",
+            "comment": "Disable a couple Table tests intermittent on Firefox"
+          }
+        ]
+      }
+    },
     {
       "date": "Fri, 10 Jan 2025 16:45:51 GMT",
       "version": "32.11.1",

diff --git a/packages/nimble-components/src/table/tests/table-column-sizing.spec.ts b/packages/nimble-components/src/table/tests/table-column-sizing.spec.ts
@@ -139,7 +139,8 @@ describe('Table Column Sizing', () => {
                 column2ExpectedRenderedWidth: 400
             },
             {
-                name: 'second column set to use pixelWidth',
+                // Firefox skipped, see https://github.com/ni/nimble/issues/2491
+                name: 'second column set to use pixelWidth #SkipFirefox',
                 rowWidth: 600,
                 column1FractionalWidth: 1,
                 column1PixelWidth: undefined,
@@ -291,7 +292,8 @@ describe('Table Column Sizing', () => {
                 column2MinPixelWidth: 150
             },
             {
-                name: 'when columns have fractional widths',
+                // Firefox skipped, see https://github.com/ni/nimble/issues/2491
+                name: 'when columns have fractional widths #SkipFirefox',
                 column1FractionalWidth: 2,
                 column1PixelWidth: null,
                 column1MinPixelWidth: null,

diff --git a/packages/nimble-components/src/table/tests/table.spec.ts b/packages/nimble-components/src/table/tests/table.spec.ts
@@ -2654,7 +2654,8 @@ describe('Table', () => {
             );
         });
 
-        it('maintains scroll position if data length is increased while not attached', async () => {
+        // Firefox skipped, see https://github.com/ni/nimble/issues/2491
+        it('maintains scroll position if data length is increased while not attached #SkipFirefox', async () => {
             await setDataAndScrollToBottom(largeData200);
             const scrollTopBeforeDisconnect = element.viewport.scrollTop;
             const firstRenderedRowBeforeDisconnect = getFirstRenderedRowDataIndex(largeData200);