Merge branch 'main' into users/fvisser/16px-tree-margin

ni · Aug 9, 2024 · 1f8e120 · 1f8e120
2 parents f79d82d + 0b0ab7d
commit 1f8e120
Show file tree

Hide file tree

Showing 17 changed files with 129 additions and 124 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, 09 Aug 2024 15:08:21 GMT",
+      "version": "27.0.4",
+      "tag": "@ni/nimble-angular_v27.0.4",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v31.1.3",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Wed, 07 Aug 2024 16:58:22 GMT",
       "version": "27.0.3",

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, 07 Aug 2024 16:58:22 GMT and should not be manually modified.
+This log was last generated on Fri, 09 Aug 2024 15:08:21 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 27.0.4
+
+Fri, 09 Aug 2024 15:08:21 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v31.1.3
+
 ## 27.0.3
 
 Wed, 07 Aug 2024 16:58:22 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": "27.0.3",
+  "version": "27.0.4",
   "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": "^31.1.2"
+    "@ni/nimble-components": "^31.1.3"
   },
   "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, 09 Aug 2024 15:08:21 GMT",
+      "version": "4.0.4",
+      "tag": "@ni/spright-angular_v4.0.4",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/spright-angular",
+            "comment": "Bump @ni/spright-components to v3.0.4",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Wed, 07 Aug 2024 16:58:22 GMT",
       "version": "4.0.3",

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, 07 Aug 2024 16:58:22 GMT and should not be manually modified.
+This log was last generated on Fri, 09 Aug 2024 15:08:21 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 4.0.4
+
+Fri, 09 Aug 2024 15:08:21 GMT
+
+### Patches
+
+- Bump @ni/spright-components to v3.0.4
+
 ## 4.0.3
 
 Wed, 07 Aug 2024 16:58:22 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": "4.0.3",
+  "version": "4.0.4",
   "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": "^3.0.3"
+    "@ni/spright-components": "^3.0.4"
   },
   "dependencies": {
     "tslib": "^2.2.0"

diff --git a/packages/nimble-components/CHANGELOG.json b/packages/nimble-components/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@ni/nimble-components",
   "entries": [
+    {
+      "date": "Fri, 09 Aug 2024 15:08:21 GMT",
+      "version": "31.1.3",
+      "tag": "@ni/nimble-components_v31.1.3",
+      "comments": {
+        "patch": [
+          {
+            "author": "[email protected]",
+            "package": "@ni/nimble-components",
+            "commit": "29961fd8275ca703dbdb44a62a6c6957728c0978",
+            "comment": "Switch to tokens for backdrop"
+          }
+        ]
+      }
+    },
     {
       "date": "Wed, 07 Aug 2024 16:58:22 GMT",
       "version": "31.1.2",

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, 07 Aug 2024 16:58:22 GMT and should not be manually modified.
+This log was last generated on Fri, 09 Aug 2024 15:08:21 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 31.1.3
+
+Fri, 09 Aug 2024 15:08:21 GMT
+
+### Patches
+
+- Switch to tokens for backdrop ([ni/nimble@29961fd](https://github.com/ni/nimble/commit/29961fd8275ca703dbdb44a62a6c6957728c0978))
+
 ## 31.1.2
 
 Wed, 07 Aug 2024 16:58:22 GMT

diff --git a/packages/nimble-components/package.json b/packages/nimble-components/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ni/nimble-components",
-  "version": "31.1.2",
+  "version": "31.1.3",
   "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",

diff --git a/packages/nimble-components/src/dialog/styles.ts b/packages/nimble-components/src/dialog/styles.ts
@@ -16,15 +16,9 @@ import {
     dialogSmallWidth,
     dialogSmallHeight,
     dialogSmallMaxHeight,
-    borderHoverColor
+    borderHoverColor,
+    modalBackdropColor
 } from '../theme-provider/design-tokens';
-import {
-    modalBackdropColorThemeColorStatic,
-    modalBackdropColorThemeDarkStatic,
-    modalBackdropColorThemeLightStatic
-} from '../theme-provider/design-tokens-static';
-import { Theme } from '../theme-provider/types';
-import { themeBehavior } from '../utilities/style/theme';
 import { accessiblyHidden } from '../utilities/style/accessibly-hidden';
 import { focusVisible } from '../utilities/style/focus';
 
@@ -50,6 +44,10 @@ export const styles = css`
         outline: 2px solid ${borderHoverColor};
     }
 
+    dialog::backdrop {
+        background: ${modalBackdropColor};
+    }
+
     header {
         min-height: 48px;
         padding: 24px 24px 0px 24px;
@@ -116,33 +114,4 @@ export const styles = css`
     :host([footer-hidden]) footer {
         display: none;
     }
-`.withBehaviors(
-    /*
-     * We cannot use the modalBackdropColor token directly because the backdrop
-     * element is not a descendant of the nimble-theme-provider element.
-     */
-    themeBehavior(
-        Theme.light,
-        css`
-            dialog::backdrop {
-                background: ${modalBackdropColorThemeLightStatic};
-            }
-        `
-    ),
-    themeBehavior(
-        Theme.dark,
-        css`
-            dialog::backdrop {
-                background: ${modalBackdropColorThemeDarkStatic};
-            }
-        `
-    ),
-    themeBehavior(
-        Theme.color,
-        css`
-            dialog::backdrop {
-                background: ${modalBackdropColorThemeColorStatic};
-            }
-        `
-    )
-);
+`;
diff --git a/packages/nimble-components/src/drawer/styles.ts b/packages/nimble-components/src/drawer/styles.ts
@@ -8,16 +8,9 @@ import {
     titlePlus1Font,
     drawerWidth,
     largeDelay,
-    actionRgbPartialColor
+    actionRgbPartialColor,
+    modalBackdropColor
 } from '../theme-provider/design-tokens';
-import {
-    modalBackdropColorThemeColorStatic,
-    modalBackdropColorThemeDarkStatic,
-    modalBackdropColorThemeLightStatic,
-    largeDelayStatic
-} from '../theme-provider/design-tokens-static';
-import { Theme } from '../theme-provider/types';
-import { themeBehavior } from '../utilities/style/theme';
 
 export const styles = css`
     ${display('block')}
@@ -57,9 +50,12 @@ export const styles = css`
         }
     }
 
+    dialog::backdrop {
+        background: ${modalBackdropColor};
+    }
+
     dialog.animating::backdrop {
-        animation: ni-private-drawer-fade-in-keyframes ${largeDelayStatic}
-            ease-in;
+        animation: ni-private-drawer-fade-in-keyframes ${largeDelay} ease-in;
     }
 
     dialog.closing::backdrop {
@@ -153,33 +149,4 @@ export const styles = css`
         justify-content: flex-end;
         border-top: 2px solid rgba(${actionRgbPartialColor}, 0.1);
     }
-`.withBehaviors(
-    /*
-     * We cannot use the modalBackdropColor token directly because the backdrop
-     * element is not a descendant of the nimble-theme-provider element.
-     */
-    themeBehavior(
-        Theme.light,
-        css`
-            dialog::backdrop {
-                background: ${modalBackdropColorThemeLightStatic};
-            }
-        `
-    ),
-    themeBehavior(
-        Theme.dark,
-        css`
-            dialog::backdrop {
-                background: ${modalBackdropColorThemeDarkStatic};
-            }
-        `
-    ),
-    themeBehavior(
-        Theme.color,
-        css`
-            dialog::backdrop {
-                background: ${modalBackdropColorThemeColorStatic};
-            }
-        `
-    )
-);
+`;
diff --git a/packages/nimble-components/src/theme-provider/design-tokens-static.ts b/packages/nimble-components/src/theme-provider/design-tokens-static.ts