Blazor: Reorganize files and prepend NationalInstruments namespace

change/@ni-nimble-blazor-5d43c97c-a899-4d8d-93d2-b818794e368a.json

@@ -0,0 +1,7 @@
+{
+  "type": "major",
+  "comment": "Prepend NationalInstruments to Blazor namespaces",
+  "packageName": "@ni/nimble-blazor",
+  "email": "7282195+m-akinc@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}

change/@ni-ok-blazor-06700d2b-bb6d-4678-8b13-4afa529b4bae.json

@@ -0,0 +1,7 @@
+{
+  "type": "major",
+  "comment": "Prepend NationalInstruments to Blazor namespaces",
+  "packageName": "@ni/ok-blazor",
+  "email": "7282195+m-akinc@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}

change/@ni-spright-blazor-eedd4bd0-f4c2-4d2a-b58a-18e3563cfb34.json

@@ -0,0 +1,7 @@
+{
+  "type": "major",
+  "comment": "Prepend NationalInstruments to Blazor namespaces",
+  "packageName": "@ni/spright-blazor",
+  "email": "7282195+m-akinc@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}

packages/blazor-workspace/.gitignore

@@ -2,7 +2,7 @@
 NimbleBlazor/wwwroot/nimble-tokens/
 NimbleBlazor/wwwroot/nimble-components/
 NimbleBlazor/wwwroot/NimbleBlazor.HybridWorkaround.js
-NimbleBlazor/Components/Icons/
+NimbleBlazor/Source/Icons/
 NimbleBlazor/NuGetFiles/files/
 SprightBlazor/wwwroot/nimble-tokens/
 SprightBlazor/wwwroot/spright-components/

packages/blazor-workspace/Examples/Demo.Client/packages.lock.json

@@ -353,25 +353,25 @@
           "AspNetCore.SassCompiler": "[1.97.1, )",
           "Microsoft.AspNetCore.Components.Web": "[8.0.24, )",
           "NI.CSharp.Analyzers": "[2.0.35, )",
-          "NimbleBlazor": "[1.0.0, )",
-          "OkBlazor": "[1.0.0, )",
-          "SprightBlazor": "[1.0.0, )"
+          "NationalInstruments.NimbleBlazor": "[1.0.0, )",
+          "NationalInstruments.OkBlazor": "[1.0.0, )",
+          "NationalInstruments.SprightBlazor": "[1.0.0, )"
         }
       },
-      "nimbleblazor": {
+      "NationalInstruments.NimbleBlazor": {
         "type": "Project",
         "dependencies": {
           "Apache.Arrow": "[22.1.0, 22.1.0]",
           "Microsoft.AspNetCore.Components.Web": "[8.0.24, )"
         }
       },
-      "okblazor": {
+      "NationalInstruments.OkBlazor": {
         "type": "Project",
         "dependencies": {
           "Microsoft.AspNetCore.Components.Web": "[8.0.24, )"
         }
       },
-      "sprightblazor": {
+      "NationalInstruments.SprightBlazor": {
         "type": "Project",
         "dependencies": {
           "Microsoft.AspNetCore.Components.Web": "[8.0.24, )"

packages/blazor-workspace/Examples/Demo.Client/wwwroot/index.html

@@ -9,7 +9,7 @@
     <base href="./" />
     <link href="css/site.css" rel="stylesheet" />
     <link href="Demo.Client.styles.css" rel="stylesheet" />
-    <link href="_content/NimbleBlazor/nimble-tokens/css/fonts.css" rel="stylesheet" />
+    <link href="_content/NationalInstruments.NimbleBlazor/nimble-tokens/css/fonts.css" rel="stylesheet" />
     <link rel="icon" href="favicon.ico" sizes="any">
 </head>
 
@@ -21,7 +21,7 @@
         <a href="" class="reload">Reload</a>
         <a class="dismiss">🗙</a>
     </div>
-    <script src="_content/OkBlazor/ok-components/all-components-bundle.min.js"></script>
+    <script src="_content/NationalInstruments.OkBlazor/ok-components/all-components-bundle.min.js"></script>
     <script src="_framework/blazor.webassembly.js"></script>
 </body>
 

packages/blazor-workspace/Examples/Demo.Hybrid/_Imports.razor

@@ -1,2 +1,2 @@
 @using Microsoft.AspNetCore.Components.Web
-@using NimbleBlazor
+@using NationalInstruments.NimbleBlazor

packages/blazor-workspace/Examples/Demo.Hybrid/packages.lock.json

@@ -360,25 +360,25 @@
           "AspNetCore.SassCompiler": "[1.97.1, )",
           "Microsoft.AspNetCore.Components.Web": "[8.0.24, )",
           "NI.CSharp.Analyzers": "[2.0.35, )",
-          "NimbleBlazor": "[1.0.0, )",
-          "OkBlazor": "[1.0.0, )",
-          "SprightBlazor": "[1.0.0, )"
+          "NationalInstruments.NimbleBlazor": "[1.0.0, )",
+          "NationalInstruments.OkBlazor": "[1.0.0, )",
+          "NationalInstruments.SprightBlazor": "[1.0.0, )"
         }
       },
-      "nimbleblazor": {
+      "NationalInstruments.NimbleBlazor": {
         "type": "Project",
         "dependencies": {
           "Apache.Arrow": "[22.1.0, 22.1.0]",
           "Microsoft.AspNetCore.Components.Web": "[8.0.24, )"
         }
       },
-      "okblazor": {
+      "NationalInstruments.OkBlazor": {
         "type": "Project",
         "dependencies": {
           "Microsoft.AspNetCore.Components.Web": "[8.0.24, )"
         }
       },
-      "sprightblazor": {
+      "NationalInstruments.SprightBlazor": {
         "type": "Project",
         "dependencies": {
           "Microsoft.AspNetCore.Components.Web": "[8.0.24, )"

packages/blazor-workspace/Examples/Demo.Hybrid/wwwroot/index.html

@@ -9,7 +9,7 @@
     <!-- This is the style that should always match the name of your project -->
     <link href="css/app.css" rel="stylesheet" />
     <link href="Demo.Hybrid.styles.css" rel="stylesheet" />
-    <link href="_content/NimbleBlazor/nimble-tokens/css/fonts.css" rel="stylesheet" />
+    <link href="_content/NationalInstruments.NimbleBlazor/nimble-tokens/css/fonts.css" rel="stylesheet" />
 </head>
 
 <body>
@@ -21,7 +21,7 @@
         <a class="dismiss">🗙</a>
     </div>
     <script src="_framework/blazor.webview.js"></script>
-    <script src="_content/OkBlazor/ok-components/all-components-bundle.min.js"></script>
+    <script src="_content/NationalInstruments.OkBlazor/ok-components/all-components-bundle.min.js"></script>
 </body>
 
 </html>

packages/blazor-workspace/Examples/Demo.Server/Components/App.razor

@@ -7,15 +7,15 @@
     <base href="/" />
     <link href="css/site.css" rel="stylesheet" />
     <link href="Demo.Server.styles.css" rel="stylesheet" />
-    <link href="_content/NimbleBlazor/nimble-tokens/css/fonts.css" rel="stylesheet" />
+    <link href="_content/NationalInstruments.NimbleBlazor/nimble-tokens/css/fonts.css" rel="stylesheet" />
     <link rel="icon" href="favicon.ico" sizes="any">
     <HeadOutlet @rendermode="InteractiveServer" />
 </head>
 
 <body>
     <Demo.Shared.Routes @rendermode="InteractiveServer" />
     <script src="_framework/blazor.web.js"></script>
-    <script src="_content/OkBlazor/ok-components/all-components-bundle.min.js"></script>
+    <script src="_content/NationalInstruments.OkBlazor/ok-components/all-components-bundle.min.js"></script>
 </body>
 
 </html>

packages/blazor-workspace/Examples/Demo.Server/packages.lock.json

@@ -265,25 +265,25 @@
           "AspNetCore.SassCompiler": "[1.97.1, )",
           "Microsoft.AspNetCore.Components.Web": "[8.0.24, )",
           "NI.CSharp.Analyzers": "[2.0.35, )",
-          "NimbleBlazor": "[1.0.0, )",
-          "OkBlazor": "[1.0.0, )",
-          "SprightBlazor": "[1.0.0, )"
+          "NationalInstruments.NimbleBlazor": "[1.0.0, )",
+          "NationalInstruments.OkBlazor": "[1.0.0, )",
+          "NationalInstruments.SprightBlazor": "[1.0.0, )"
         }
       },
-      "nimbleblazor": {
+      "NationalInstruments.NimbleBlazor": {
         "type": "Project",
         "dependencies": {
           "Apache.Arrow": "[22.1.0, 22.1.0]",
           "Microsoft.AspNetCore.Components.Web": "[8.0.24, )"
         }
       },
-      "okblazor": {
+      "NationalInstruments.OkBlazor": {
         "type": "Project",
         "dependencies": {
           "Microsoft.AspNetCore.Components.Web": "[8.0.24, )"
         }
       },
-      "sprightblazor": {
+      "NationalInstruments.SprightBlazor": {
         "type": "Project",
         "dependencies": {
           "Microsoft.AspNetCore.Components.Web": "[8.0.24, )"

packages/blazor-workspace/Examples/Demo.Shared/Demo.Shared.csproj

@@ -42,5 +42,5 @@
     Since examples are in the same solution as NimbleBlazor, manually import .targets to copy Nimble
     token SCSS. See NimbleBlazor README for correct workflow for external clients to use SCSS.
   -->
-  <Import Project="../../NimbleBlazor/NuGetFiles/build/NimbleBlazor.targets" />
+  <Import Project="../../NimbleBlazor/NuGetFiles/build/NationalInstruments.NimbleBlazor.targets" />
 </Project>

packages/blazor-workspace/Examples/Demo.Shared/Pages/ComponentsDemo.razor.cs

@@ -2,8 +2,8 @@
 using System.Globalization;
 using Apache.Arrow;
 using Apache.Arrow.Types;
-using NimbleBlazor;
-using SprightBlazor;
+using NationalInstruments.NimbleBlazor;
+using NationalInstruments.SprightBlazor;
 
 namespace Demo.Shared.Pages;
 

packages/blazor-workspace/Examples/Demo.Shared/Shared/MainLayout.razor

@@ -1,5 +1,5 @@
 @using Microsoft.AspNetCore.Components
-@using NimbleBlazor
+@using NationalInstruments.NimbleBlazor
 @namespace Demo.Shared
 @inherits LayoutComponentBase
 

packages/blazor-workspace/Examples/Demo.Shared/Shared/MainLayout.razor.cs

@@ -2,7 +2,7 @@
 using Microsoft.AspNetCore.Components;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.JSInterop;
-using NimbleBlazor;
+using NationalInstruments.NimbleBlazor;
 using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace Demo.Shared;

packages/blazor-workspace/Examples/Demo.Shared/_Imports.razor

@@ -3,7 +3,7 @@
 @using Microsoft.AspNetCore.Components.Web
 @using Microsoft.AspNetCore.Components.Web.Virtualization
 @using Microsoft.JSInterop
-@using NimbleBlazor
-@using SprightBlazor
-@using OkBlazor
+@using NationalInstruments.NimbleBlazor
+@using NationalInstruments.SprightBlazor
+@using NationalInstruments.OkBlazor
 @using Demo.Shared.Pages

packages/blazor-workspace/Examples/Demo.Shared/packages.lock.json

@@ -260,20 +260,20 @@
         "resolved": "4.5.4",
         "contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg=="
       },
-      "nimbleblazor": {
+      "NationalInstruments.NimbleBlazor": {
         "type": "Project",
         "dependencies": {
           "Apache.Arrow": "[22.1.0, 22.1.0]",
           "Microsoft.AspNetCore.Components.Web": "[8.0.24, )"
         }
       },
-      "okblazor": {
+      "NationalInstruments.OkBlazor": {
         "type": "Project",
         "dependencies": {
           "Microsoft.AspNetCore.Components.Web": "[8.0.24, )"
         }
       },
-      "sprightblazor": {
+      "NationalInstruments.SprightBlazor": {
         "type": "Project",
         "dependencies": {
           "Microsoft.AspNetCore.Components.Web": "[8.0.24, )"

packages/blazor-workspace/NimbleBlazor/CONTRIBUTING.md

@@ -73,7 +73,7 @@ The C# code for a property supporting 2-way binding will look like this:
 ```
 
 - For a form/ input control (textbox, etc.,), the component should derive from `NimbleInputBase<TValue>`, the `.razor` file needs to bind a DOM element attribute to `CurrentValue` or `CurrentValueAsString`, and set one of those 2 properties in the DOM event listener (generally `@onchange`). `NimbleInputBase` will then handle invoking the `EventCallback`. See `NimbleTextField` for an example. Note that [Nimble has gaps in its `EditForm` support](https://github.com/ni/nimble/issues/766).
-- The `@onchange` event callback built-in to Blazor supports DOM elements that fire a `change` event, and provides only `element.value` (which must be `string`, `string[]`, or `boolean`) in the event args. Most other cases (custom events with different names, the need to pass additional info from the DOM element to C# in the event args, etc.) will require using Blazor's [custom event arguments/ custom event type](https://learn.microsoft.com/en-us/aspnet/core/blazor/components/event-handling?view=aspnetcore-8.0#custom-event-arguments) support. See `NimbleDrawer` for an example. The event and its event arg type are declared in `EventHandlers.cs`, and `NimbleBlazor.lib.module.js` should be updated to register the custom event type, and create the event args in JavaScript. The event listener (C#) in this case needs to invoke the `[PropertyName]Changed` `EventCallback` itself.
+- The `@onchange` event callback built-in to Blazor supports DOM elements that fire a `change` event, and provides only `element.value` (which must be `string`, `string[]`, or `boolean`) in the event args. Most other cases (custom events with different names, the need to pass additional info from the DOM element to C# in the event args, etc.) will require using Blazor's [custom event arguments/ custom event type](https://learn.microsoft.com/en-us/aspnet/core/blazor/components/event-handling?view=aspnetcore-8.0#custom-event-arguments) support. See `NimbleDrawer` for an example. The event and its event arg type are declared in `EventHandlers.cs`, and `NationalInstruments.NimbleBlazor.lib.module.js` should be updated to register the custom event type, and create the event args in JavaScript. The event listener (C#) in this case needs to invoke the `[PropertyName]Changed` `EventCallback` itself.
 
 ## Testing
 
@@ -87,7 +87,7 @@ Testing the Nimble Blazor components is possible through the use of xUnit and bU
 
 Test Project: `NimbleBlazor.Tests.Acceptance`
 
-In order to fully test the Nimble Blazor components, consider writing new automated acceptance tests for new/modified components. Any component which requires custom JS code in `NimbleBlazor.lib.module.js` should generally have corresponding acceptance tests, because the bUnit tests in `NimbleBlazor.Tests` are unable to exercise/test that JavaScript code.
+In order to fully test the Nimble Blazor components, consider writing new automated acceptance tests for new/modified components. Any component which requires custom JS code in `NationalInstruments.NimbleBlazor.lib.module.js` should generally have corresponding acceptance tests, because the bUnit tests in `NimbleBlazor.Tests` are unable to exercise/test that JavaScript code.
 
 The `NimbleBlazor.Tests.Acceptance` project starts a local Blazor Web App which serves Razor pages that host the Nimble components. Then, xUnit-based acceptance tests start a Chromium instance using [Playwright](https://playwright.dev/), load those Razor pages, and interact with them. The majority of the tests use the `InteractiveServer` render mode, but the project also supports the Interactive Web Assembly render mode (and static server-side rendering mode) for tests. Tests should disable prerendering (as shown in the steps below) to ensure the components are ready for interaction when the Playwright test starts.
 

packages/blazor-workspace/NimbleBlazor/NimbleBlazor.csproj

@@ -1,6 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
   <PropertyGroup>
+    <AssemblyName>NationalInstruments.NimbleBlazor</AssemblyName>
+    <RootNamespace>NationalInstruments.NimbleBlazor</RootNamespace>
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>

packages/blazor-workspace/NimbleBlazor/Properties/AssemblyInfo.cs

@@ -1,3 +1,3 @@
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("NimbleBlazor.Tests")]
+[assembly: InternalsVisibleTo("NationalInstruments.NimbleBlazor.Tests")]

packages/blazor-workspace/NimbleBlazor/README.md

@@ -33,16 +33,16 @@ Additional Resources: [Microsoft tutorial: Build a web app with Blazor](https://
         - Visual Studio: "Project" >> "Manage NuGet Packages". Click the gear/Settings button. Add a new Package Source ("NimbleBlazor") as `[NimbleRepoDirectory]\packages\blazor-workspace\dist` and commit/ close Settings. Pick "NimbleBlazor" in the "Package Source" dropdown, and ensure "Include prerelease" is checked. Search for "NimbleBlazor", select it and click the "Install" button.
         - VS Code: Run the command `dotnet add package NimbleBlazor --source [NimbleRepoDirectory]\packages\blazor-workspace\dist` in the Terminal window.
 2. Add required references to Blazor code
-    - Open `_Imports.razor`, and add a new line at the bottom: `@using NimbleBlazor`
+    - Open `_Imports.razor`, and add a new line at the bottom: `@using NationalInstruments.NimbleBlazor`
     - Open the HTML page (generally `App.razor` for Blazor Web Apps, or `wwwroot/index.html` for Blazor WebAssembly / Hybrid)
 
       At the bottom of the `<head>` section (right before `</head>`), add  
       ```html
-      <link href="_content/NimbleBlazor/nimble-tokens/css/fonts.css" rel="stylesheet" />
+      <link href="_content/NationalInstruments.NimbleBlazor/nimble-tokens/css/fonts.css" rel="stylesheet" />
       ```
       At the bottom of the `<body>` section (right before `</body>`), add  
       ```html
-      <script src="_content/NimbleBlazor/nimble-components/all-components-bundle.min.js"></script>
+      <script src="_content/NationalInstruments.NimbleBlazor/nimble-components/all-components-bundle.min.js"></script>
       ```
 
 Additional Resources: [`dotnet add package` documentation](https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-add-package)

packages/blazor-workspace/NimbleBlazor/Components/NimbleAnchor.razor → packages/blazor-workspace/NimbleBlazor/Source/Anchor/NimbleAnchor.razor

@@ -1,4 +1,4 @@
-@namespace NimbleBlazor
+@namespace NationalInstruments.NimbleBlazor
 @inherits NimbleAnchorBase
 <nimble-anchor
     href="@Href"

packages/blazor-workspace/NimbleBlazor/Components/NimbleAnchor.razor.cs → packages/blazor-workspace/NimbleBlazor/Source/Anchor/NimbleAnchor.razor.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace NimbleBlazor;
+namespace NationalInstruments.NimbleBlazor;
 
 public partial class NimbleAnchor : NimbleAnchorBase
 {

packages/blazor-workspace/NimbleBlazor/Components/NimbleAnchorButton.razor → packages/blazor-workspace/NimbleBlazor/Source/AnchorButton/NimbleAnchorButton.razor

@@ -1,4 +1,4 @@
-@namespace NimbleBlazor
+@namespace NationalInstruments.NimbleBlazor
 @inherits NimbleAnchorBase
 <nimble-anchor-button
     href="@Href"

packages/blazor-workspace/NimbleBlazor/Components/NimbleAnchorButton.razor.cs → packages/blazor-workspace/NimbleBlazor/Source/AnchorButton/NimbleAnchorButton.razor.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace NimbleBlazor;
+namespace NationalInstruments.NimbleBlazor;
 
 public partial class NimbleAnchorButton : NimbleAnchorBase
 {

packages/blazor-workspace/NimbleBlazor/Components/NimbleAnchorMenuItem.razor → packages/blazor-workspace/NimbleBlazor/Source/AnchorMenuItem/NimbleAnchorMenuItem.razor

@@ -1,4 +1,4 @@
-@namespace NimbleBlazor
+@namespace NationalInstruments.NimbleBlazor
 @inherits NimbleAnchorBase
 <nimble-anchor-menu-item
     href="@Href"

packages/blazor-workspace/NimbleBlazor/Components/NimbleAnchorMenuItem.razor.cs → packages/blazor-workspace/NimbleBlazor/Source/AnchorMenuItem/NimbleAnchorMenuItem.razor.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace NimbleBlazor;
+namespace NationalInstruments.NimbleBlazor;
 
 public partial class NimbleAnchorMenuItem : NimbleAnchorBase
 {

packages/blazor-workspace/NimbleBlazor/Components/NimbleAnchorTab.razor → packages/blazor-workspace/NimbleBlazor/Source/AnchorTab/NimbleAnchorTab.razor

@@ -1,4 +1,4 @@
-@namespace NimbleBlazor
+@namespace NationalInstruments.NimbleBlazor
 @inherits NimbleAnchorBase
 <nimble-anchor-tab
     href="@Href"

packages/blazor-workspace/NimbleBlazor/Components/NimbleAnchorTab.razor.cs → packages/blazor-workspace/NimbleBlazor/Source/AnchorTab/NimbleAnchorTab.razor.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace NimbleBlazor;
+namespace NationalInstruments.NimbleBlazor;
 
 /// <summary>
 /// A link styled as a tab

packages/blazor-workspace/NimbleBlazor/Components/NimbleAnchorTabs.razor → packages/blazor-workspace/NimbleBlazor/Source/AnchorTabs/NimbleAnchorTabs.razor

@@ -1,4 +1,4 @@
-@namespace NimbleBlazor
+@namespace NationalInstruments.NimbleBlazor
 <nimble-anchor-tabs
     activeid="@BindConverter.FormatValue(ActiveId)"
     @attributes="AdditionalAttributes">

packages/blazor-workspace/NimbleBlazor/Components/NimbleAnchorTabs.razor.cs → packages/blazor-workspace/NimbleBlazor/Source/AnchorTabs/NimbleAnchorTabs.razor.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace NimbleBlazor;
+namespace NationalInstruments.NimbleBlazor;
 
 /// <summary>
 /// A sequence of links styled as tabs.

packages/blazor-workspace/NimbleBlazor/Components/NimbleAnchorTreeItem.razor → packages/blazor-workspace/NimbleBlazor/Source/AnchorTreeItem/NimbleAnchorTreeItem.razor

@@ -1,4 +1,4 @@
-@namespace NimbleBlazor
+@namespace NationalInstruments.NimbleBlazor
 @inherits NimbleAnchorBase
 <nimble-anchor-tree-item
     href="@Href"

packages/blazor-workspace/NimbleBlazor/Components/NimbleAnchorTreeItem.razor.cs → packages/blazor-workspace/NimbleBlazor/Source/AnchorTreeItem/NimbleAnchorTreeItem.razor.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Components;
 
-namespace NimbleBlazor;
+namespace NationalInstruments.NimbleBlazor;
 
 public partial class NimbleAnchorTreeItem : NimbleAnchorBase
 {

packages/blazor-workspace/NimbleBlazor/BannerSeverity.cs → packages/blazor-workspace/NimbleBlazor/Source/Banner/BannerSeverity.cs

@@ -1,4 +1,4 @@
-namespace NimbleBlazor;
+namespace NationalInstruments.NimbleBlazor;
 
 public enum BannerSeverity
 {