Merge pull request dotnet#44183 from dotnet-maestro-bot/merge/release/7.0-to-main

msftbot[bot] · web-flow · commit 41bed3fc073a · 2022-09-26T19:40:04.000Z
[automated] Merge branch 'release/7.0' =&gt; 'main'
diff --git a/src/Components/Web.JS/dist/Release/blazor.server.js b/src/Components/Web.JS/dist/Release/blazor.server.js
diff --git a/src/Components/Web.JS/dist/Release/blazor.webview.js b/src/Components/Web.JS/dist/Release/blazor.webview.js
diff --git a/src/Components/Web.JS/src/Rendering/BrowserRenderer.ts b/src/Components/Web.JS/src/Rendering/BrowserRenderer.ts
@@ -136,7 +136,7 @@ export class BrowserRenderer {
           // disposed event handler IDs are delivered separately (in the 'disposedEventHandlerIds' array)
           const siblingIndex = editReader.siblingIndex(edit);
           const element = getLogicalChild(parent, childIndexAtCurrentDepth + siblingIndex);
-          if (element instanceof HTMLElement) {
+          if (element instanceof Element) {
             const attributeName = editReader.removedAttributeName(edit)!;
             // First try to remove any special property we use for this attribute
             if (!this.tryApplySpecialProperty(batch, element, attributeName, null)) {
diff --git a/src/Components/test/E2ETest/Tests/SvgTest.cs b/src/Components/test/E2ETest/Tests/SvgTest.cs
@@ -42,6 +42,22 @@ public void CanRenderSvgWithCorrectNamespace()
         Browser.Equal("20", () => svgCircleElement.GetAttribute("r"));
     }
 
+    [Fact]
+    public void CanRenderSvgWithAttributeRemoval()
+    {
+        var appElement = Browser.MountTestComponent<SvgComponent>();
+
+        var svgElement = appElement.FindElement(By.Id("svg-with-callback"));
+        Assert.NotNull(svgElement);
+
+        var svgCircleElement = svgElement.FindElement(By.XPath("//*[local-name()='circle' and namespace-uri()='http://www.w3.org/2000/svg']"));
+        Assert.NotNull(svgCircleElement);
+        Assert.Equal("stroke: red;", svgCircleElement.GetAttribute("style"));
+
+        appElement.FindElement(By.TagName("button")).Click();
+        Browser.Equal("", () => svgCircleElement.GetAttribute("style"));
+    }
+
     [Fact]
     public void CanRenderSvgChildComponentWithCorrectNamespace()
     {
diff --git a/src/Components/test/testassets/BasicTestApp/SvgComponent.razor b/src/Components/test/testassets/BasicTestApp/SvgComponent.razor
@@ -4,10 +4,10 @@
 
 <h3>SVG with Callback</h3>
 <svg height="250" width="250" id="svg-with-callback">
-    <circle cx="125" cy="125" r=@radius fill="red" stroke="black" stroke-width="3" />
+    <circle cx="125" cy="125" r=@radius fill="red" stroke="black" stroke-width="3" style="@styleValue" />
 </svg>
 
-<button @onclick=@(() => { radius *= 2; })>Click me</button>
+<button @onclick=@(() => { radius *= 2; styleValue = null; })>Click me</button>
 
 <h3>SVG with Child Component</h3>
 <svg height="250" width="250" id="svg-with-child-component">
@@ -81,6 +81,7 @@
 
 @code {
     int radius = 10;
+    string styleValue = "stroke: red;";
     string bar = "thestringbar";
 
     int value = 10;
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyComponentsWebAssembly-CSharp/Client/wwwroot/index.html b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyComponentsWebAssembly-CSharp/Client/wwwroot/index.html
@@ -8,6 +8,14 @@
     <!--#if PWA -->
     <link href="manifest.json" rel="manifest" />
     <!--#endif -->
+    
+    <!--#if Hosted -->
+    <!-- If you add any scoped CSS files, uncomment the following to load them
+    <link href="EmptyComponentsWebAssembly_CSharp.Client.styles.css" rel="stylesheet" /> -->
+    <!--#else -->
+    <!-- If you add any scoped CSS files, uncomment the following to load them
+    <link href="EmptyComponentsWebAssembly_CSharp.styles.css" rel="stylesheet" /> -->
+    <!--#endif -->
 </head>
 
 <body>
