2023-12-07 MoD #2

Material-Blazor · Dec 7, 2023 · 09a5ae9 · 09a5ae9
1 parent 6ca4d2b
commit 09a5ae9
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 51 deletions.
diff --git a/.github/workflows/GithubActionsWIP.yml b/.github/workflows/GithubActionsWIP.yml
@@ -463,6 +463,12 @@ jobs:
       with:
         dotnet-version: '8.x'
 
+    - name: Display wwwroot M.B.MD3
+      run: dir ${{github.workspace}}/Material.Blazor.MD3/wwwroot
+
+    - name: Display wwwroot M.B.W.MD3
+      run: dir ${{github.workspace}}/Material.Blazor.Website.MD3/wwwroot
+
     - name: Build  & Publish Website 🔧
       run: >
         dotnet publish ${{env.projectWebMD3}}
@@ -480,9 +486,12 @@ jobs:
     # - name: Display workspace Ꙫ
     #   run: dir ${{github.workspace}}
 
-    - name: Display wwwroot Ꙫ
+    - name: Display wwwroot M.B.MD3
       run: dir ${{github.workspace}}/Material.Blazor.MD3/wwwroot
 
+    - name: Display wwwroot M.B.W.MD3
+      run: dir ${{github.workspace}}/Material.Blazor.Website.MD3/wwwroot
+
     # - name: Display MaterialBlazorMD3 package output Ꙫ
     #   run: dir ${{env.outputWebMD3}}
 

diff --git a/Material.Blazor.MD3/Components/Menu/MBMenu.ts b/Material.Blazor.MD3/Components/Menu/MBMenu.ts
@@ -9,6 +9,7 @@ export function setMenuCloseEvent(menuID: string) {
         menuElement.addEventListener('menu-close', event => {
             console.log("Menu close event");
             console.log("Event: " + event.currentTarget);
+            console.log("Event: " + event.currentTarget);
         //    event.preventDefault(); // Stop cancellation gestures from closing dialog
         //    if (dialogElement._gestureCancellation) {
         //        dialogElement.close('cancel'); // Update `returnValue` to handle cancellation logic

diff --git a/Material.Blazor.MD3/Material.Blazor.MD3.csproj b/Material.Blazor.MD3/Material.Blazor.MD3.csproj
@@ -32,7 +32,6 @@
 
 	<ItemGroup>
 		<None Include="..\README.md" Pack="true" PackagePath="\" />
-		<None Include="Components\Menu\MBMenuEvents.cs" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -76,30 +75,6 @@
 		</None>
 	</ItemGroup>
 
-	<ItemGroup>
-		<InputStaticAssetsScripts Include="components\**\*.ts;scripts\material.blazor.ts" />
-		<OutputStaticAssetsScripts Include="wwwroot\material.blazor.js;wwwroot\material.blazor.min.js" />
-		<!--Keep this Remove/Include pair-->
-		<Content Remove="@(OutputStaticAssetsScripts)" />
-		<Content Include="@(OutputStaticAssetsScripts)" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<InputStaticAssetsEventScripts Include="scripts\material.blazor.custom.events.ts" />
-		<OutputStaticAssetsEventScripts Include="wwwroot\material.blazor.md3.lib.module.js" />
-		<!--Keep this Remove/Include pair-->
-		<Content Remove="@(OutputStaticAssetsEventScripts)" />
-		<Content Include="@(OutputStaticAssetsEventScripts)" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<InputStaticAssetsStyles Include="components\**\*.scss;styles\*.scss;" />
-		<OutputStaticAssetsStyles Include="wwwroot\material.blazor.css;wwwroot\material.blazor.min.css" />
-		<!--Keep this Remove/Include pair-->
-		<Content Remove="@(OutputStaticAssetsStyles)" />
-		<Content Include="@(OutputStaticAssetsStyles)" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<Folder Include="wwwroot\" />
 	</ItemGroup>
@@ -185,6 +160,30 @@
 		</Task>
 	</UsingTask>
 
+	<ItemGroup>
+		<InputStaticAssetsScripts Include="components\**\*.ts;scripts\material.blazor.ts" />
+		<OutputStaticAssetsScripts Include="wwwroot\material.blazor.js;wwwroot\material.blazor.min.js" />
+		<!--Keep this Remove/Include pair-->
+		<Content Remove="@(OutputStaticAssetsScripts)" />
+		<Content Include="@(OutputStaticAssetsScripts)" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<InputStaticAssetsEventScripts Include="scripts\material.blazor.custom.events.ts" />
+		<OutputStaticAssetsEventScripts Include="wwwroot\material.blazor.md3.lib.module.js" />
+		<!--Keep this Remove/Include pair-->
+		<Content Remove="@(OutputStaticAssetsEventScripts)" />
+		<Content Include="@(OutputStaticAssetsEventScripts)" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<InputStaticAssetsStyles Include="components\**\*.scss;styles\*.scss;" />
+		<OutputStaticAssetsStyles Include="wwwroot\material.blazor.css;wwwroot\material.blazor.min.css" />
+		<!--Keep this Remove/Include pair-->
+		<Content Remove="@(OutputStaticAssetsStyles)" />
+		<Content Include="@(OutputStaticAssetsStyles)" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<UpToDateCheckInput Include="@(InputStaticAssetsScripts)" Set="Scripts" />
 		<UpToDateCheckOutput Include="@(OutputStaticAssetsScripts)" Set="Scripts" />

diff --git a/Material.Blazor.MD3/wwwroot/material.blazor.js b/Material.Blazor.MD3/wwwroot/material.blazor.js
@@ -14442,6 +14442,7 @@ function setMenuCloseEvent(menuID) {
     menuElement.addEventListener('menu-close', function (event) {
       console.log("Menu close event");
       console.log("Event: " + event.currentTarget);
+      console.log("Event: " + event.currentTarget);
       //    event.preventDefault(); // Stop cancellation gestures from closing dialog
       //    if (dialogElement._gestureCancellation) {
       //        dialogElement.close('cancel'); // Update `returnValue` to handle cancellation logic