Merge branch 'main' into disable-dotnet-cache

ni · Mar 27, 2024 · bd870e1 · bd870e1
2 parents cce303a + d252bc2
commit bd870e1
Show file tree

Hide file tree

Showing 12 changed files with 76 additions and 14 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -16,6 +16,7 @@ env:
   LC_ALL: "en_US.UTF-8"
   LANG: "en_US.UTF-8"
   LANGUAGE: "en_US.UTF-8"
+  TZ: "America/Chicago"
   HAS_GITHUBPAGESDEPLOYTOKEN: ${{secrets.GITHUBPAGESDEPLOYTOKEN != ''}}
   HAS_CHROMATIC_PROJECT_TOKEN: ${{secrets.CHROMATIC_PROJECT_TOKEN != ''}}
   HAS_LHCI_GITHUB_APP_TOKEN: ${{secrets.LHCI_GITHUB_APP_TOKEN != ''}}

diff --git a/angular-workspace/projects/ni/nimble-angular/CHANGELOG.json b/angular-workspace/projects/ni/nimble-angular/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@ni/nimble-angular",
   "entries": [
+    {
+      "date": "Wed, 27 Mar 2024 21:22:02 GMT",
+      "version": "20.5.7",
+      "tag": "@ni/nimble-angular_v20.5.7",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v24.1.1",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Wed, 27 Mar 2024 18:54:51 GMT",
       "version": "20.5.6",

diff --git a/angular-workspace/projects/ni/nimble-angular/CHANGELOG.md b/angular-workspace/projects/ni/nimble-angular/CHANGELOG.md
@@ -1,9 +1,17 @@
 # Change Log - @ni/nimble-angular
 
-This log was last generated on Wed, 27 Mar 2024 18:54:51 GMT and should not be manually modified.
+This log was last generated on Wed, 27 Mar 2024 21:22:02 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 20.5.7
+
+Wed, 27 Mar 2024 21:22:02 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v24.1.1
+
 ## 20.5.6
 
 Wed, 27 Mar 2024 18:54:51 GMT

diff --git a/angular-workspace/projects/ni/nimble-angular/package.json b/angular-workspace/projects/ni/nimble-angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ni/nimble-angular",
-  "version": "20.5.6",
+  "version": "20.5.7",
   "description": "Angular components for the NI Nimble Design System",
   "scripts": {
     "invoke-publish": "cd ../../../ && npm run build:library && cd dist/ni/nimble-angular && npm publish"
@@ -31,7 +31,7 @@
     "@angular/forms": "^15.2.10",
     "@angular/localize": "^15.2.10",
     "@angular/router": "^15.2.10",
-    "@ni/nimble-components": "^24.1.0"
+    "@ni/nimble-components": "^24.1.1"
   },
   "dependencies": {
     "tslib": "^2.2.0"

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/nimble-blazor/package.json b/packages/nimble-blazor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ni/nimble-blazor",
-  "version": "14.5.7",
+  "version": "14.5.8",
   "description": "Blazor components for the NI Nimble Design System",
   "scripts": {
     "postinstall": "node build/generate-playwright-version-properties/source/index.js",

diff --git a/packages/nimble-components/CHANGELOG.json b/packages/nimble-components/CHANGELOG.json
@@ -1,6 +1,36 @@
 {
   "name": "@ni/nimble-components",
   "entries": [
+    {
+      "date": "Wed, 27 Mar 2024 22:06:38 GMT",
+      "version": "24.1.1",
+      "tag": "@ni/nimble-components_v24.1.1",
+      "comments": {
+        "none": [
+          {
+            "author": "[email protected]",
+            "package": "@ni/nimble-components",
+            "commit": "9c19dac60baed62fc12ab8b0908e59e92fd8ea29",
+            "comment": "Set build time zone to America/Chicago"
+          }
+        ]
+      }
+    },
+    {
+      "date": "Wed, 27 Mar 2024 21:22:02 GMT",
+      "version": "24.1.1",
+      "tag": "@ni/nimble-components_v24.1.1",
+      "comments": {
+        "patch": [
+          {
+            "author": "[email protected]",
+            "package": "@ni/nimble-components",
+            "commit": "cc82598544694002715db3383b75ed0c0f4793ae",
+            "comment": "Fix table scrolling test on WebKit"
+          }
+        ]
+      }
+    },
     {
       "date": "Wed, 27 Mar 2024 18:54:51 GMT",
       "version": "24.1.0",

diff --git a/packages/nimble-components/CHANGELOG.md b/packages/nimble-components/CHANGELOG.md
@@ -1,9 +1,17 @@
 # Change Log - @ni/nimble-components
 
-This log was last generated on Wed, 27 Mar 2024 18:54:51 GMT and should not be manually modified.
+This log was last generated on Wed, 27 Mar 2024 21:22:02 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 24.1.1
+
+Wed, 27 Mar 2024 21:22:02 GMT
+
+### Patches
+
+- Fix table scrolling test on WebKit ([ni/nimble@cc82598](https://github.com/ni/nimble/commit/cc82598544694002715db3383b75ed0c0f4793ae))
+
 ## 24.1.0
 
 Wed, 27 Mar 2024 18:54:51 GMT

diff --git a/packages/nimble-components/karma.conf.js b/packages/nimble-components/karma.conf.js
@@ -29,7 +29,8 @@ const commonChromeFlags = [
     '--disable-infobars',
     '--disable-translate',
     '--force-prefers-reduced-motion',
-    '--lang=en-US'
+    '--lang=en-US',
+    '--time-zone-for-testing=America/Chicago'
 ];
 
 // Create a webpack environment plugin to use while running tests so that

diff --git a/packages/nimble-components/package.json b/packages/nimble-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ni/nimble-components",
-  "version": "24.1.0",
+  "version": "24.1.1",
   "description": "Styled web components for the NI Nimble Design System",
   "scripts": {
     "build": "npm run generate-icons && npm run generate-workers && npm run build-components && npm run bundle-components && npm run generate-scss && npm run build-storybook",

diff --git a/packages/nimble-components/src/table/testing/table.pageobject.ts b/packages/nimble-components/src/table/testing/table.pageobject.ts
@@ -357,7 +357,7 @@ export class TablePageObject<T extends TableRecord> {
 
     public async scrollToLastRowAsync(): Promise<void> {
         const scrollElement = this.tableElement.viewport;
-        scrollElement.scrollTop = scrollElement.scrollHeight;
+        scrollElement.scroll({ top: scrollElement.scrollHeight });
         await waitForUpdatesAsync();
     }
 

diff --git a/packages/nimble-components/src/table/tests/table.spec.ts b/packages/nimble-components/src/table/tests/table.spec.ts
@@ -677,8 +677,7 @@ describe('Table', () => {
                 verifyRenderedData(dataSubsetAtEnd);
             });
 
-            // WebKit skipped, see https://github.com/ni/nimble/issues/1942
-            it('and calls focusedRecycleCallback on focused cell views when a scroll happens #SkipWebkit', async () => {
+            it('and calls focusedRecycleCallback on focused cell views when a scroll happens', async () => {
                 const focusableColumn = document.createElement(
                     focusableColumnName
                 ) as TestFocusableTableColumn;