Merge branch 'main' into dropdown-option-groups

ni · May 8, 2024 · fcbd0f6 · fcbd0f6
2 parents 2b16674 + 0195da9
commit fcbd0f6
Show file tree

Hide file tree

Showing 88 changed files with 1,753 additions and 492 deletions.
diff --git a/angular-workspace/projects/example-client-app/src/app/app.module.ts b/angular-workspace/projects/example-client-app/src/app/app.module.ts
@@ -28,6 +28,7 @@ import { NimbleTableColumnDurationTextModule } from '@ni/nimble-angular/table-co
 import { NimbleRichTextViewerModule } from '@ni/nimble-angular/rich-text/viewer';
 import { NimbleRichTextEditorModule } from '@ni/nimble-angular/rich-text/editor';
 import { NimbleRichTextMentionUsersModule } from '@ni/nimble-angular/rich-text-mention/users';
+import { SprightRectangleModule } from '@ni/spright-angular/rectangle';
 import { AppComponent } from './app.component';
 import { CustomAppComponent } from './customapp/customapp.component';
 import { HeaderComponent } from './header/header.component';
@@ -100,6 +101,7 @@ import { HeaderComponent } from './header/header.component';
         NimbleMappingUserModule,
         NimbleRichTextMentionUsersModule,
         NimbleMappingSpinnerModule,
+        SprightRectangleModule,
         RouterModule.forRoot(
             [
                 { path: '', redirectTo: '/customapp', pathMatch: 'full' },

diff --git a/angular-workspace/projects/example-client-app/src/app/customapp/customapp.component.html b/angular-workspace/projects/example-client-app/src/app/customapp/customapp.component.html
@@ -412,5 +412,9 @@
                 </nimble-tree-item>
             </nimble-tree-view>
         </div>
+        <div class="sub-container">
+            <div class="container-label">Rectangle (Spright)</div>
+            <spright-rectangle>Spright!</spright-rectangle>
+        </div>
     </div>
 </div>
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, 08 May 2024 17:29:00 GMT",
+      "version": "24.0.4",
+      "tag": "@ni/nimble-angular_v24.0.4",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/nimble-angular",
+            "comment": "Bump @ni/nimble-components to v28.0.4",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Tue, 07 May 2024 20:15:55 GMT",
       "version": "24.0.3",

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 Tue, 07 May 2024 20:15:55 GMT and should not be manually modified.
+This log was last generated on Wed, 08 May 2024 17:29:00 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 24.0.4
+
+Wed, 08 May 2024 17:29:00 GMT
+
+### Patches
+
+- Bump @ni/nimble-components to v28.0.4
+
 ## 24.0.3
 
 Tue, 07 May 2024 20:15:55 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": "24.0.3",
+  "version": "24.0.4",
   "description": "Angular components for the NI Nimble Design System",
   "scripts": {
     "invoke-publish": "npm run invoke-publish:setup && cd ../../../dist/ni/nimble-angular && npm publish",
@@ -32,7 +32,7 @@
     "@angular/forms": "^16.2.12",
     "@angular/localize": "^16.2.12",
     "@angular/router": "^16.2.12",
-    "@ni/nimble-components": "^28.0.3"
+    "@ni/nimble-components": "^28.0.4"
   },
   "dependencies": {
     "tslib": "^2.2.0"

diff --git a/angular-workspace/projects/ni/spright-angular/CHANGELOG.json b/angular-workspace/projects/ni/spright-angular/CHANGELOG.json
@@ -1,6 +1,21 @@
 {
   "name": "@ni/spright-angular",
   "entries": [
+    {
+      "date": "Wed, 08 May 2024 17:29:00 GMT",
+      "version": "0.1.15",
+      "tag": "@ni/spright-angular_v0.1.15",
+      "comments": {
+        "patch": [
+          {
+            "author": "beachball",
+            "package": "@ni/spright-angular",
+            "comment": "Bump @ni/spright-components to v0.0.18",
+            "commit": "not available"
+          }
+        ]
+      }
+    },
     {
       "date": "Tue, 07 May 2024 20:15:55 GMT",
       "version": "0.1.14",

diff --git a/angular-workspace/projects/ni/spright-angular/CHANGELOG.md b/angular-workspace/projects/ni/spright-angular/CHANGELOG.md
@@ -1,9 +1,17 @@
 # Change Log - @ni/spright-angular
 
-This log was last generated on Tue, 07 May 2024 20:15:55 GMT and should not be manually modified.
+This log was last generated on Wed, 08 May 2024 17:29:00 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.1.15
+
+Wed, 08 May 2024 17:29:00 GMT
+
+### Patches
+
+- Bump @ni/spright-components to v0.0.18
+
 ## 0.1.14
 
 Tue, 07 May 2024 20:15:55 GMT

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

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/blazor-workspace/BlazorWorkspace.sln b/packages/blazor-workspace/BlazorWorkspace.sln
@@ -27,6 +27,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SprightBlazor.Tests", "Test
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SprightBlazor.Tests.Acceptance", "Tests\SprightBlazor.Tests.Acceptance\SprightBlazor.Tests.Acceptance.csproj", "{8E335572-CD8B-4879-8760-73416CF103B1}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorWorkspace.Testing.Acceptance", "Tests\BlazorWorkspace.Testing.Acceptance\BlazorWorkspace.Testing.Acceptance.csproj", "{D94A4535-51B3-4E70-9582-3F3A44C7A798}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -73,6 +75,10 @@ Global
 		{8E335572-CD8B-4879-8760-73416CF103B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8E335572-CD8B-4879-8760-73416CF103B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8E335572-CD8B-4879-8760-73416CF103B1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D94A4535-51B3-4E70-9582-3F3A44C7A798}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D94A4535-51B3-4E70-9582-3F3A44C7A798}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D94A4535-51B3-4E70-9582-3F3A44C7A798}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D94A4535-51B3-4E70-9582-3F3A44C7A798}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -86,6 +92,7 @@ Global
 		{7C65AEA1-8CA2-48DC-81FE-CE39295BDD4B} = {E5C31FAF-7DEF-494F-A0D2-C9A4875F2132}
 		{CEA7A89F-CF8E-4128-927E-24CBBF2C8C63} = {E5C31FAF-7DEF-494F-A0D2-C9A4875F2132}
 		{8E335572-CD8B-4879-8760-73416CF103B1} = {E5C31FAF-7DEF-494F-A0D2-C9A4875F2132}
+		{D94A4535-51B3-4E70-9582-3F3A44C7A798} = {E5C31FAF-7DEF-494F-A0D2-C9A4875F2132}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {38E2A588-0714-41E7-9BA3-D89622560FF9}

diff --git a/packages/blazor-workspace/CONTRIBUTING.md b/packages/blazor-workspace/CONTRIBUTING.md
@@ -107,6 +107,15 @@ Visual Studio Code commands are included to build and run the example projects.
 - `blazor-wasm-example:build`: Build the `Demo.Client` project
 - `blazor-wasm-example:watch`: Run the `Demo.Client` project in watch mode (to automatically pick up code changes)
 
+## Creating a New Project
+
+When creating a new project in the Blazor workspace, ensure it includes the following configuration:
+
+- .NET version matches other projects in the workspace
+- `<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>`
+- `<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>`
+- Package reference to `NI.CSharp.Analyzers` with same version spec as other projects
+
 ## Additional Tips
 
 ### Enabling IIS

diff --git a/packages/blazor-workspace/Examples/Demo.Client/packages.lock.json b/packages/blazor-workspace/Examples/Demo.Client/packages.lock.json
@@ -340,14 +340,21 @@
         "dependencies": {
           "Microsoft.AspNetCore.Components.Web": "[6.*, )",
           "NI.CSharp.Analyzers": "[2.0.21, 2.0.21]",
-          "NimbleBlazor": "[1.0.0, )"
+          "NimbleBlazor": "[1.0.0, )",
+          "SprightBlazor": "[1.0.0, )"
         }
       },
       "nimbleblazor": {
         "type": "Project",
         "dependencies": {
           "Microsoft.AspNetCore.Components.Web": "[6.0.29, )"
         }
+      },
+      "sprightblazor": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.AspNetCore.Components.Web": "[6.0.29, )"
+        }
       }
     },
     "net6.0/browser-wasm": {

diff --git a/packages/blazor-workspace/Examples/Demo.Client/wwwroot/index.html b/packages/blazor-workspace/Examples/Demo.Client/wwwroot/index.html
@@ -20,7 +20,7 @@
         <a href="" class="reload">Reload</a>
         <a class="dismiss">🗙</a>
     </div>
-    <script src="_content/NimbleBlazor/nimble-components/all-components-bundle.min.js"></script>
+    <script src="_content/SprightBlazor/spright-components/all-components-bundle.min.js"></script>
     <script src="_framework/blazor.webassembly.js"></script>
 </body>
 

diff --git a/packages/blazor-workspace/Examples/Demo.Hybrid/packages.lock.json b/packages/blazor-workspace/Examples/Demo.Hybrid/packages.lock.json
@@ -358,14 +358,21 @@
         "dependencies": {
           "Microsoft.AspNetCore.Components.Web": "[6.*, )",
           "NI.CSharp.Analyzers": "[2.0.21, 2.0.21]",
-          "NimbleBlazor": "[1.0.0, )"
+          "NimbleBlazor": "[1.0.0, )",
+          "SprightBlazor": "[1.0.0, )"
         }
       },
       "nimbleblazor": {
         "type": "Project",
         "dependencies": {
           "Microsoft.AspNetCore.Components.Web": "[6.0.29, )"
         }
+      },
+      "sprightblazor": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.AspNetCore.Components.Web": "[6.0.29, )"
+        }
       }
     }
   }

diff --git a/packages/blazor-workspace/Examples/Demo.Hybrid/wwwroot/index.html b/packages/blazor-workspace/Examples/Demo.Hybrid/wwwroot/index.html
@@ -21,10 +21,11 @@
         <a class="dismiss">🗙</a>
     </div>
     <script src="_framework/blazor.webview.js"></script>
-    <script src="_content/NimbleBlazor/nimble-components/all-components-bundle.min.js"></script>
+    <script src="_content/SprightBlazor/spright-components/all-components-bundle.min.js"></script>
     <!-- This script is a workaround needed for Nimble Blazor to work in Blazor Hybrid.
          See https://github.com/dotnet/aspnetcore/issues/42349 -->
     <script src="_content/NimbleBlazor/NimbleBlazor.HybridWorkaround.js"></script>
+    <script src="_content/SprightBlazor/SprightBlazor.HybridWorkaround.js"></script>
 </body>
 
 </html>
diff --git a/packages/blazor-workspace/Examples/Demo.Server/Pages/_Layout.cshtml b/packages/blazor-workspace/Examples/Demo.Server/Pages/_Layout.cshtml
@@ -28,6 +28,6 @@
     </div>
 
     <script src="_framework/blazor.server.js"></script>
-    <script src="_content/NimbleBlazor/nimble-components/all-components-bundle.min.js"></script>
+    <script src="_content/SprightBlazor/spright-components/all-components-bundle.min.js"></script>
 </body>
 </html>
diff --git a/packages/blazor-workspace/Examples/Demo.Server/packages.lock.json b/packages/blazor-workspace/Examples/Demo.Server/packages.lock.json
@@ -204,14 +204,21 @@
         "dependencies": {
           "Microsoft.AspNetCore.Components.Web": "[6.*, )",
           "NI.CSharp.Analyzers": "[2.0.21, 2.0.21]",
-          "NimbleBlazor": "[1.0.0, )"
+          "NimbleBlazor": "[1.0.0, )",
+          "SprightBlazor": "[1.0.0, )"
         }
       },
       "nimbleblazor": {
         "type": "Project",
         "dependencies": {
           "Microsoft.AspNetCore.Components.Web": "[6.0.29, )"
         }
+      },
+      "sprightblazor": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.AspNetCore.Components.Web": "[6.0.29, )"
+        }
       }
     }
   }

diff --git a/packages/blazor-workspace/Examples/Demo.Shared/Demo.Shared.csproj b/packages/blazor-workspace/Examples/Demo.Shared/Demo.Shared.csproj
@@ -42,6 +42,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\NimbleBlazor\NimbleBlazor.csproj" />
+    <ProjectReference Include="..\..\SprightBlazor\SprightBlazor.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/packages/blazor-workspace/Examples/Demo.Shared/Pages/ComponentsDemo.razor b/packages/blazor-workspace/Examples/Demo.Shared/Pages/ComponentsDemo.razor
@@ -384,5 +384,9 @@
             <NimbleButton @onclick=@(_ => AddDiesToRadius(10))>Increase Die Count</NimbleButton>
             <NimbleButton @onclick=@(_ => RemoveDiesFromRadius(10))>Decrease Die Count</NimbleButton>
         </div>
+        <div class="sub-container">
+            <div class="container-label">Rectangle (Spright)</div>
+            <SprightRectangle>Spright!</SprightRectangle>
+        </div>
     </div>
 </div>
diff --git a/packages/blazor-workspace/Examples/Demo.Shared/_Imports.razor b/packages/blazor-workspace/Examples/Demo.Shared/_Imports.razor
@@ -4,4 +4,5 @@
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @using Microsoft.JSInterop
 @using NimbleBlazor
+@using SprightBlazor
 @using Demo.Shared.Pages
diff --git a/packages/blazor-workspace/Examples/Demo.Shared/packages.lock.json b/packages/blazor-workspace/Examples/Demo.Shared/packages.lock.json
@@ -205,6 +205,12 @@
         "dependencies": {
           "Microsoft.AspNetCore.Components.Web": "[6.0.29, )"
         }
+      },
+      "sprightblazor": {
+        "type": "Project",
+        "dependencies": {
+          "Microsoft.AspNetCore.Components.Web": "[6.0.29, )"
+        }
       }
     }
   }