Merge branch 'main' into scrollable-tabs

ni · Oct 22, 2024 · df51461 · df51461
2 parents d10f9a8 + 1f2a90a
commit df51461
Show file tree

Hide file tree

Showing 25 changed files with 582 additions and 334 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/angular-workspace/nimble-angular/CHANGELOG.json b/packages/angular-workspace/nimble-angular/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@ni/nimble-angular",
   "entries": [
+    {
+      "date": "Fri, 18 Oct 2024 20:38:35 GMT",
+      "version": "28.3.2",
+      "tag": "@ni/nimble-angular_v28.3.2",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v32.4.0",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Wed, 16 Oct 2024 23:46:19 GMT",
       "version": "28.3.1",

diff --git a/packages/angular-workspace/nimble-angular/CHANGELOG.md b/packages/angular-workspace/nimble-angular/CHANGELOG.md
@@ -1,9 +1,17 @@
 # Change Log - @ni/nimble-angular
 
-<!-- This log was last generated on Wed, 16 Oct 2024 23:46:19 GMT and should not be manually modified. -->
+<!-- This log was last generated on Fri, 18 Oct 2024 20:38:35 GMT and should not be manually modified. -->
 
 <!-- Start content -->
 
+## 28.3.2
+
+Fri, 18 Oct 2024 20:38:35 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v32.4.0
+
 ## 28.3.1
 
 Wed, 16 Oct 2024 23:46:19 GMT

diff --git a/packages/angular-workspace/nimble-angular/package.json b/packages/angular-workspace/nimble-angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ni/nimble-angular",
-  "version": "28.3.1",
+  "version": "28.3.2",
   "description": "Angular components for the NI Nimble Design System",
   "scripts": {
     "invoke-publish": "npm run invoke-publish:setup && cd ../dist/nimble-angular && npm publish",
@@ -32,7 +32,7 @@
     "@angular/forms": "^17.3.12",
     "@angular/localize": "^17.3.12",
     "@angular/router": "^17.3.12",
-    "@ni/nimble-components": "^32.3.2"
+    "@ni/nimble-components": "^32.4.0"
   },
   "dependencies": {
     "tslib": "^2.2.0"

diff --git a/packages/angular-workspace/spright-angular/CHANGELOG.json b/packages/angular-workspace/spright-angular/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@ni/spright-angular",
   "entries": [
+    {
+      "date": "Fri, 18 Oct 2024 20:38:35 GMT",
+      "version": "5.1.14",
+      "tag": "@ni/spright-angular_v5.1.14",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/spright-angular",
+            "comment": "Bump @ni/spright-components to v4.1.14",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Wed, 16 Oct 2024 23:46:19 GMT",
       "version": "5.1.13",

diff --git a/packages/angular-workspace/spright-angular/CHANGELOG.md b/packages/angular-workspace/spright-angular/CHANGELOG.md
@@ -1,9 +1,17 @@
 # Change Log - @ni/spright-angular
 
-<!-- This log was last generated on Wed, 16 Oct 2024 23:46:19 GMT and should not be manually modified. -->
+<!-- This log was last generated on Fri, 18 Oct 2024 20:38:35 GMT and should not be manually modified. -->
 
 <!-- Start content -->
 
+## 5.1.14
+
+Fri, 18 Oct 2024 20:38:35 GMT
+
+### Patches
+
+- Bump @ni/spright-components to v4.1.14
+
 ## 5.1.13
 
 Wed, 16 Oct 2024 23:46:19 GMT

diff --git a/packages/angular-workspace/spright-angular/package.json b/packages/angular-workspace/spright-angular/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ni/spright-angular",
-  "version": "5.1.13",
+  "version": "5.1.14",
   "description": "Angular components for NI Spright",
   "scripts": {
     "invoke-publish": "npm run invoke-publish:setup && cd ../dist/spright-angular && npm publish",
@@ -24,7 +24,7 @@
   "peerDependencies": {
     "@angular/common": "^17.3.12",
     "@angular/core": "^17.3.12",
-    "@ni/spright-components": "^4.1.13"
+    "@ni/spright-components": "^4.1.14"
   },
   "dependencies": {
     "tslib": "^2.2.0"

diff --git a/packages/blazor-workspace/NimbleBlazor/CHANGELOG.json b/packages/blazor-workspace/NimbleBlazor/CHANGELOG.json
@@ -1,6 +1,27 @@
 {
   "name": "@ni/nimble-blazor",
   "entries": [
+    {
+      "date": "Fri, 18 Oct 2024 20:38:35 GMT",
+      "version": "18.3.2",
+      "tag": "@ni/nimble-blazor_v18.3.2",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-blazor",
+            "comment": "Bump @ni/nimble-components to v32.4.0",
+            "commit": "not available"
+          },
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-blazor",
+            "comment": "Bump @ni/nimble-tokens to v8.4.0",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Wed, 16 Oct 2024 23:46:19 GMT",
       "version": "18.3.1",

diff --git a/packages/blazor-workspace/NimbleBlazor/CHANGELOG.md b/packages/blazor-workspace/NimbleBlazor/CHANGELOG.md
@@ -1,9 +1,18 @@
 # Change Log - @ni/nimble-blazor
 
-<!-- This log was last generated on Wed, 16 Oct 2024 23:46:19 GMT and should not be manually modified. -->
+<!-- This log was last generated on Fri, 18 Oct 2024 20:38:35 GMT and should not be manually modified. -->
 
 <!-- Start content -->
 
+## 18.3.2
+
+Fri, 18 Oct 2024 20:38:35 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v32.4.0
+- Bump @ni/nimble-tokens to v8.4.0
+
 ## 18.3.1
 
 Wed, 16 Oct 2024 23:46:19 GMT

diff --git a/packages/blazor-workspace/NimbleBlazor/package.json b/packages/blazor-workspace/NimbleBlazor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ni/nimble-blazor",
-  "version": "18.3.1",
+  "version": "18.3.2",
   "description": "Blazor components for the NI Nimble Design System",
   "scripts": {
     "pack": "cross-env-shell dotnet pack -c Release -p:PackageVersion=$npm_package_version --output ../dist",
@@ -25,8 +25,8 @@
     "!*"
   ],
   "peerDependencies": {
-    "@ni/nimble-components": "^32.3.2",
-    "@ni/nimble-tokens": "^8.3.0",
+    "@ni/nimble-components": "^32.4.0",
+    "@ni/nimble-tokens": "^8.4.0",
     "cross-env": "^7.0.3",
     "rimraf": "^6.0.0"
   }

diff --git a/packages/blazor-workspace/SprightBlazor/CHANGELOG.json b/packages/blazor-workspace/SprightBlazor/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@ni/spright-blazor",
   "entries": [
+    {
+      "date": "Fri, 18 Oct 2024 20:38:35 GMT",
+      "version": "2.1.14",
+      "tag": "@ni/spright-blazor_v2.1.14",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/spright-blazor",
+            "comment": "Bump @ni/spright-components to v4.1.14",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Wed, 16 Oct 2024 23:46:19 GMT",
       "version": "2.1.13",

diff --git a/packages/blazor-workspace/SprightBlazor/CHANGELOG.md b/packages/blazor-workspace/SprightBlazor/CHANGELOG.md
@@ -1,9 +1,17 @@
 # Change Log - @ni/spright-blazor
 
-<!-- This log was last generated on Wed, 16 Oct 2024 23:46:19 GMT and should not be manually modified. -->
+<!-- This log was last generated on Fri, 18 Oct 2024 20:38:35 GMT and should not be manually modified. -->
 
 <!-- Start content -->
 
+## 2.1.14
+
+Fri, 18 Oct 2024 20:38:35 GMT
+
+### Patches
+
+- Bump @ni/spright-components to v4.1.14
+
 ## 2.1.13
 
 Wed, 16 Oct 2024 23:46:19 GMT

diff --git a/packages/blazor-workspace/SprightBlazor/package.json b/packages/blazor-workspace/SprightBlazor/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ni/spright-blazor",
-  "version": "2.1.13",
+  "version": "2.1.14",
   "description": "Blazor components for Spright",
   "scripts": {
     "pack": "cross-env-shell dotnet pack -c Release -p:PackageVersion=$npm_package_version --output ../dist",
@@ -25,7 +25,7 @@
     "!*"
   ],
   "peerDependencies": {
-    "@ni/spright-components": "^4.1.13",
+    "@ni/spright-components": "^4.1.14",
     "cross-env": "^7.0.3",
     "rimraf": "^6.0.0"
   }

diff --git a/packages/nimble-components/CHANGELOG.json b/packages/nimble-components/CHANGELOG.json
@@ -1,6 +1,27 @@
 {
   "name": "@ni/nimble-components",
   "entries": [
+    {
+      "date": "Fri, 18 Oct 2024 20:38:35 GMT",
+      "version": "32.4.0",
+      "tag": "@ni/nimble-components_v32.4.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "sandeep.appachiappan@ni.com",
+            "package": "@ni/nimble-components",
+            "commit": "4323196b82407671a6305d74691a2a84a621a2b3",
+            "comment": "Update theme aware token for calendar component"
+          },
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-components",
+            "comment": "Bump @ni/nimble-tokens to v8.4.0",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Wed, 16 Oct 2024 23:46:19 GMT",
       "version": "32.3.2",

diff --git a/packages/nimble-components/CHANGELOG.md b/packages/nimble-components/CHANGELOG.md
@@ -1,9 +1,18 @@
 # Change Log - @ni/nimble-components
 
-<!-- This log was last generated on Wed, 16 Oct 2024 23:46:19 GMT and should not be manually modified. -->
+<!-- This log was last generated on Fri, 18 Oct 2024 20:38:35 GMT and should not be manually modified. -->
 
 <!-- Start content -->
 
+## 32.4.0
+
+Fri, 18 Oct 2024 20:38:35 GMT
+
+### Minor changes
+
+- Update theme aware token for calendar component ([ni/nimble@4323196](https://github.com/ni/nimble/commit/4323196b82407671a6305d74691a2a84a621a2b3))
+- Bump @ni/nimble-tokens to v8.4.0
+
 ## 32.3.2
 
 Wed, 16 Oct 2024 23:46:19 GMT

diff --git a/packages/nimble-components/package.json b/packages/nimble-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ni/nimble-components",
-  "version": "32.3.2",
+  "version": "32.4.0",
   "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",
@@ -63,7 +63,7 @@
     "@microsoft/fast-element": "^1.12.0",
     "@microsoft/fast-foundation": "^2.49.6",
     "@microsoft/fast-web-utilities": "^6.0.0",
-    "@ni/nimble-tokens": "^8.3.0",
+    "@ni/nimble-tokens": "^8.4.0",
     "@tanstack/table-core": "^8.19.3",
     "@tanstack/virtual-core": "^3.10.6",
     "@tiptap/core": "^2.2.2",

diff --git a/packages/nimble-components/src/theme-provider/design-tokens.ts b/packages/nimble-components/src/theme-provider/design-tokens.ts
@@ -119,7 +119,8 @@ import {
     Black82,
     Black22,
     PowerGreen30,
-    DigitalGreenLight30
+    DigitalGreenLight30,
+    PowerGreenDark50
 } from '@ni/nimble-tokens/dist/styledictionary/js/tokens';
 import { Theme } from './types';
 import { tokenNames, styleNameFromTokenName } from './design-token-names';
@@ -370,7 +371,12 @@ export const calendarEventBorderTransientColor = DesignToken.create<string>(
 
 export const calendarEventStaticFontColor = DesignToken.create<string>(
     styleNameFromTokenName(tokenNames.calendarEventStaticFontColor)
-).withDefault((element: HTMLElement) => getColorForTheme(element, DigitalGreenDark110, White, White));
+).withDefault((element: HTMLElement) => getColorForTheme(
+    element,
+    DigitalGreenDark110,
+    PowerGreenDark50,
+    PowerGreenDark50
+));
 
 export const calendarEventDynamicFontColor = DesignToken.create<string>(
     styleNameFromTokenName(tokenNames.calendarEventDynamicFontColor)

diff --git a/packages/nimble-tokens/CHANGELOG.json b/packages/nimble-tokens/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@ni/nimble-tokens",
   "entries": [
+    {
+      "date": "Fri, 18 Oct 2024 20:38:35 GMT",
+      "version": "8.4.0",
+      "tag": "@ni/nimble-tokens_v8.4.0",
+      "comments": {
+        "minor": [
+          {
+            "author": "sandeep.appachiappan@ni.com",
+            "package": "@ni/nimble-tokens",
+            "commit": "4323196b82407671a6305d74691a2a84a621a2b3",
+            "comment": "Add color token for calendar component"
+          }
+        ]
+      }
+    },
     {
       "date": "Thu, 05 Sep 2024 16:43:39 GMT",
       "version": "8.3.0",

diff --git a/packages/nimble-tokens/CHANGELOG.md b/packages/nimble-tokens/CHANGELOG.md
@@ -1,9 +1,17 @@
 # Change Log - @ni/nimble-tokens
 
-This log was last generated on Thu, 05 Sep 2024 16:43:39 GMT and should not be manually modified.
+<!-- This log was last generated on Fri, 18 Oct 2024 20:38:35 GMT and should not be manually modified. -->
 
 <!-- Start content -->
 
+## 8.4.0
+
+Fri, 18 Oct 2024 20:38:35 GMT
+
+### Minor changes
+
+- Add color token for calendar component ([ni/nimble@4323196](https://github.com/ni/nimble/commit/4323196b82407671a6305d74691a2a84a621a2b3))
+
 ## 8.3.0
 
 Thu, 05 Sep 2024 16:43:39 GMT

diff --git a/packages/nimble-tokens/package.json b/packages/nimble-tokens/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ni/nimble-tokens",
-  "version": "8.3.0",
+  "version": "8.4.0",
   "description": "Design tokens for the NI Nimble Design System",
   "scripts": {
     "build": "npm run build:svg-to-ts && npm run build:ts && npm run build:generate-font-scss && npm run build:style-dictionary",

diff --git a/packages/nimble-tokens/source/styledictionary/properties/colors.json b/packages/nimble-tokens/source/styledictionary/properties/colors.json
@@ -152,6 +152,10 @@
       "value": "#356D54ff",
       "type": "color"
     },
+    "PowerGreenDark50": {
+      "value": "#98F5CAff",
+      "type": "color"
+    },
     "Black22": {
       "value": "#E6E6E6ff",
       "type": "color"