Support Preview 9 (#38)

johannesegger · galvesribeiro · commit 96e3ae7b2419 · 2019-09-08T20:17:11.000-03:00
* Support Preview 9 * Remove `BECanvasComponent.OnClick` because @OnClick doesn't seem to be supported for a canvas.
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
@@ -7,7 +7,7 @@ steps:
   - task: DotNetCoreInstaller@0
     inputs:
       packageType: 'sdk'
-      version: 3.0.100-preview8-013656
+      version: 3.0.100-preview9-014004
   - task: Npm@1
     inputs:
       command: 'install'
diff --git a/.vsts-release.yml b/.vsts-release.yml
@@ -7,7 +7,7 @@ steps:
   - task: DotNetCoreInstaller@0
     inputs:
       packageType: 'sdk'
-      version: 3.0.100-preview8-013656
+      version: 3.0.100-preview9-014004
 
   - task: Npm@1
     inputs:
diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ private Canvas2DContext _context;
 
 protected BECanvasComponent _canvasReference;
 
-protected override async Task OnAfterRenderAsync()
+protected override async Task OnAfterRenderAsync(bool firstRender)
 {
     this._context = await this._canvasReference.CreateCanvas2DAsync();
     await this._context.SetFillStyleAsync("green");
@@ -75,7 +75,7 @@ private WebGLContext _context;
 
 protected BECanvasComponent _canvasReference;
 
-protected override async Task OnAfterRenderAsync()
+protected override async Task OnAfterRenderAsync(bool firstRender)
 {
     this._context = await this._canvasReference.CreateWebGLAsync();
     
diff --git a/src/Blazor.Extensions.Canvas/BECanvas.razor b/src/Blazor.Extensions.Canvas/BECanvas.razor
@@ -1,3 +1,3 @@
 @inherits BECanvasComponent
 
-<canvas id="@Id" width="@Width" height="@Height" @ref="_canvasRef" @ref:suppressField @onclick="OnClick"></canvas>
+<canvas id="@Id" width="@Width" height="@Height" @ref="_canvasRef"></canvas>
diff --git a/src/Blazor.Extensions.Canvas/BECanvasComponent.cs b/src/Blazor.Extensions.Canvas/BECanvasComponent.cs
@@ -19,8 +19,5 @@ public class BECanvasComponent : ComponentBase
 
         [Inject]
         internal IJSRuntime JSRuntime { get; set; }
-
-        [Parameter]
-        public Action<UIMouseEventArgs> OnClick { get; set; }
     }
 }
diff --git a/src/Blazor.Extensions.Canvas/Blazor.Extensions.Canvas.csproj b/src/Blazor.Extensions.Canvas/Blazor.Extensions.Canvas.csproj
@@ -18,7 +18,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.0.0-preview8.19405.7" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="3.0.0-preview9.19424.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Blazor.Extensions.Canvas.Test.ClientSide/Blazor.Extensions.Canvas.Test.ClientSide.csproj b/test/Blazor.Extensions.Canvas.Test.ClientSide/Blazor.Extensions.Canvas.Test.ClientSide.csproj
@@ -8,9 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview8.19405.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview8.19405.7" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview8.19405.7" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor" Version="3.0.0-preview9.19424.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.Build" Version="3.0.0-preview9.19424.4" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.AspNetCore.Blazor.DevServer" Version="3.0.0-preview9.19424.4" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/test/Blazor.Extensions.Canvas.Test.ClientSide/Pages/IndexComponent.cs b/test/Blazor.Extensions.Canvas.Test.ClientSide/Pages/IndexComponent.cs
@@ -10,7 +10,7 @@ public class IndexComponent : ComponentBase
 
         protected BECanvasComponent _canvasReference;
 
-        protected override async Task OnAfterRenderAsync()
+        protected override async Task OnAfterRenderAsync(bool firstRender)
         {
             this._context = await this._canvasReference.CreateCanvas2DAsync();
             await this._context.SetFillStyleAsync("green");
diff --git a/test/Blazor.Extensions.Canvas.Test.ClientSide/Pages/WebGLComponent.cs b/test/Blazor.Extensions.Canvas.Test.ClientSide/Pages/WebGLComponent.cs
@@ -27,7 +27,7 @@ public class WebGLComponent : ComponentBase
                                             "gl_FragColor = vec4(vColor, 1.0);" +
                                          "}";
 
-        protected override async Task OnAfterRenderAsync()
+        protected override async Task OnAfterRenderAsync(bool firstRender)
         {
             this._context = await this._canvasReference.CreateWebGLAsync(new WebGLContextAttributes
             {
diff --git a/test/Blazor.Extensions.Canvas.Test.ServerSide/Pages/IndexComponent.cs b/test/Blazor.Extensions.Canvas.Test.ServerSide/Pages/IndexComponent.cs
@@ -10,7 +10,7 @@ public class IndexComponent : ComponentBase
 
         protected BECanvasComponent _canvasReference;
 
-        protected override async Task OnAfterRenderAsync()
+        protected override async Task OnAfterRenderAsync(bool firstRender)
         {
             this._context = await this._canvasReference.CreateCanvas2DAsync();
             await this._context.SetFillStyleAsync("green");
diff --git a/test/Blazor.Extensions.Canvas.Test.ServerSide/Pages/WebGLComponent.cs b/test/Blazor.Extensions.Canvas.Test.ServerSide/Pages/WebGLComponent.cs
@@ -27,7 +27,7 @@ public class WebGLComponent : ComponentBase
                                             "gl_FragColor = vec4(vColor, 1.0);" +
                                          "}";
 
-        protected override async Task OnAfterRenderAsync()
+        protected override async Task OnAfterRenderAsync(bool firstRender)
         {
             this._context = await this._canvasReference.CreateWebGLAsync(new WebGLContextAttributes
             {
diff --git a/test/Blazor.Extensions.Canvas.Test.ServerSide/Pages/_Host.cshtml b/test/Blazor.Extensions.Canvas.Test.ServerSide/Pages/_Host.cshtml
@@ -12,7 +12,7 @@
     <script src="~/dist/blazor.extensions.canvas.js"></script>
 </head>
 <body>
-    <app>@(await Html.RenderComponentAsync<App>())</app>
+    <app>@(await Html.RenderComponentAsync<App>(RenderMode.Server))</app>
 
     <script src="_framework/blazor.server.js"></script>
 </body>

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ private Canvas2DContext _context;`
`52`	`52`
`53`	`53`	`protected BECanvasComponent _canvasReference;`
`54`	`54`
`55`		`-protected override async Task OnAfterRenderAsync()`
	`55`	`+protected override async Task OnAfterRenderAsync(bool firstRender)`
`56`	`56`	`{`
`57`	`57`	`this._context = await this._canvasReference.CreateCanvas2DAsync();`
`58`	`58`	`await this._context.SetFillStyleAsync("green");`
`@@ -75,7 +75,7 @@ private WebGLContext _context;`
`75`	`75`
`76`	`76`	`protected BECanvasComponent _canvasReference;`
`77`	`77`
`78`		`-protected override async Task OnAfterRenderAsync()`
	`78`	`+protected override async Task OnAfterRenderAsync(bool firstRender)`
`79`	`79`	`{`
`80`	`80`	`this._context = await this._canvasReference.CreateWebGLAsync();`
`81`	`81`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`@inherits BECanvasComponent`
`2`	`2`
`3`		`-<canvas id="@Id" width="@Width" height="@Height" @ref="_canvasRef" @ref:suppressField @onclick="OnClick"></canvas>`
	`3`	`+<canvas id="@Id" width="@Width" height="@Height" @ref="_canvasRef"></canvas>`
Original file line number	Diff line number	Diff line change
`@@ -19,8 +19,5 @@ public class BECanvasComponent : ComponentBase`
`19`	`19`
`20`	`20`	`[Inject]`
`21`	`21`	`internal IJSRuntime JSRuntime { get; set; }`
`22`		`-`
`23`		`- [Parameter]`
`24`		`- public Action<UIMouseEventArgs> OnClick { get; set; }`
`25`	`22`	`}`
`26`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public class IndexComponent : ComponentBase`
`10`	`10`
`11`	`11`	`protected BECanvasComponent _canvasReference;`
`12`	`12`
`13`		`- protected override async Task OnAfterRenderAsync()`
	`13`	`+ protected override async Task OnAfterRenderAsync(bool firstRender)`
`14`	`14`	`{`
`15`	`15`	`this._context = await this._canvasReference.CreateCanvas2DAsync();`
`16`	`16`	`await this._context.SetFillStyleAsync("green");`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public class WebGLComponent : ComponentBase`
`27`	`27`	`"gl_FragColor = vec4(vColor, 1.0);" +`
`28`	`28`	`"}";`
`29`	`29`
`30`		`- protected override async Task OnAfterRenderAsync()`
	`30`	`+ protected override async Task OnAfterRenderAsync(bool firstRender)`
`31`	`31`	`{`
`32`	`32`	`this._context = await this._canvasReference.CreateWebGLAsync(new WebGLContextAttributes`
`33`	`33`	`{`