Skip to content

A Swiss Army knife for developers.

Refactoring

Etienne Baudoux180b2967dfd9
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index 404809c17..192e8f292 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -20,7 +20,7 @@
<PackageVersion Include="Microsoft.Extensions.Logging.Debug" Version="$(DotNetVersion)" Condition="'$(UseMaui)' != 'true'" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
<PackageVersion Include="Microsoft.TypeScript.MSBuild" Version="4.9.4" />
- <PackageVersion Include="Moq" Version="4.18.2" />
+ <PackageVersion Include="Moq" Version="4.18.4" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.1" />
<PackageVersion Include="Nuke.Common" Version="6.2.1" />
<PackageVersion Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
diff --git a/src/app/dev/DevToys.Blazor/Components/GridView/GridView.razor.cs b/src/app/dev/DevToys.Blazor/Components/GridView/GridView.razor.cs
index 55cdcda0e..4a6d86b85 100644
--- a/src/app/dev/DevToys.Blazor/Components/GridView/GridView.razor.cs
+++ b/src/app/dev/DevToys.Blazor/Components/GridView/GridView.razor.cs
@@ -34,6 +34,8 @@ public partial class GridView<TKey, TElement> : JSStyledComponentBase
protected override async Task OnAfterRenderAsync(bool firstRender)
{
+ await base.OnAfterRenderAsync(firstRender);
+
if (firstRender)
{
Guard.IsNotNull(_scrollViewer);
diff --git a/src/app/dev/DevToys.Blazor/Components/JSStyledComponentBase.cs b/src/app/dev/DevToys.Blazor/Components/JSStyledComponentBase.cs
index 9fe10b218..9ac7848ae 100644
--- a/src/app/dev/DevToys.Blazor/Components/JSStyledComponentBase.cs
+++ b/src/app/dev/DevToys.Blazor/Components/JSStyledComponentBase.cs
@@ -1,8 +1,11 @@
+using Microsoft.AspNetCore.Components.Web;
+
namespace DevToys.Blazor.Components;
public abstract class JSStyledComponentBase : StyledComponentBase, IAsyncDisposable
{
private Task<IJSObjectReference>? _jsModule;
+ private DotNetObjectReference<JSStyledComponentBase>? _reference;
/// <summary>
/// Gets the JavaScript file to use in this component.
@@ -29,9 +32,24 @@ public abstract class JSStyledComponentBase : StyledComponentBase, IAsyncDisposa
}
}
+ /// <summary>
+ /// Gets the reference for the current component.
+ /// </summary>
+ /// <value>The reference.</value>
+ protected DotNetObjectReference<JSStyledComponentBase> Reference
+ {
+ get
+ {
+ _reference ??= DotNetObjectReference.Create(this);
+ return _reference;
+ }
+ }
/// <summary />
public virtual async ValueTask DisposeAsync()
{
+ _reference?.Dispose();
+ _reference = null;
+
if (_jsModule is not null)
{
await (await _jsModule).DisposeAsync();
diff --git a/src/app/dev/DevToys.Blazor/Components/MonacoEditor.razor.cs b/src/app/dev/DevToys.Blazor/Components/MonacoEditor.razor.cs
index b1eef0546..a59a6821f 100644
--- a/src/app/dev/DevToys.Blazor/Components/MonacoEditor.razor.cs
+++ b/src/app/dev/DevToys.Blazor/Components/MonacoEditor.razor.cs
@@ -1,11 +1,10 @@
namespace DevToys.Blazor.Components;
-public partial class MonacoEditor : JSStyledComponentBase, IAsyncDisposable
+public partial class MonacoEditor : JSStyledComponentBase
{
private const string JAVASCRIPT_FILE = "./_content/DevToys.Blazor/Components/MonacoEditor.razor.js";
private const string MONACO_VS_PATH = "./_content/DevToys.Blazor/lib/monaco-editor/min/vs";
- private DotNetObjectReference<MonacoEditor>? _objRef = null;
private string _value = """
using System;
void Main()
@@ -90,10 +89,11 @@ public partial class MonacoEditor : JSStyledComponentBase, IAsyncDisposable
/// <summary />
protected override async Task OnAfterRenderAsync(bool firstRender)
{
+ await base.OnAfterRenderAsync(firstRender);
+
if (firstRender)
{
JSModule = await JSRuntime.InvokeAsync<IJSObjectReference>("import", JAVASCRIPT_FILE);
- _objRef = DotNetObjectReference.Create(this);
var options = new
{
@@ -104,7 +104,7 @@ public partial class MonacoEditor : JSStyledComponentBase, IAsyncDisposable
LineNumbers = true,
ReadOnly = false,
};
- await JSModule.InvokeVoidAsync("monacoInitialize", Id, _objRef, options);
+ await JSModule.InvokeVoidAsync("monacoInitialize", Id, Reference, options);
}
await base.OnAfterRenderAsync(firstRender);
@@ -128,16 +128,13 @@ public partial class MonacoEditor : JSStyledComponentBase, IAsyncDisposable
}
/// <summary />
- async ValueTask IAsyncDisposable.DisposeAsync()
+ public override async ValueTask DisposeAsync()
{
if (JSModule is not null)
{
await JSModule.DisposeAsync();
}
- if (_objRef is not null)
- {
- _objRef.Dispose();
- }
+ await base.DisposeAsync();
}
}
diff --git a/src/app/dev/DevToys.Blazor/Components/NavBar/NavBar.razor.cs b/src/app/dev/DevToys.Blazor/Components/NavBar/NavBar.razor.cs
index 6b4772597..547020192 100644
--- a/src/app/dev/DevToys.Blazor/Components/NavBar/NavBar.razor.cs
+++ b/src/app/dev/DevToys.Blazor/Components/NavBar/NavBar.razor.cs
@@ -5,7 +5,6 @@ namespace DevToys.Blazor.Components;
public partial class NavBar<TElement> : JSStyledComponentBase where TElement : class
{
private readonly NavBarState _sidebarState = new();
- private DotNetObjectReference<NavBar<TElement>>? _objRef;
private AutoSuggestBox _autoSuggestBox = default!;
public string NavId { get; } = NewId();
@@ -73,19 +72,17 @@ public partial class NavBar<TElement> : JSStyledComponentBase where TElement : c
protected override async Task OnAfterRenderAsync(bool firstRender)
{
+ await base.OnAfterRenderAsync(firstRender);
+
if (firstRender)
{
- _objRef = DotNetObjectReference.Create(this);
- await (await JSModule).InvokeVoidAsync("registerResizeHandler", Id, NavId, _objRef);
+ await (await JSModule).InvokeVoidAsync("registerResizeHandler", Id, NavId, Reference);
}
-
- await base.OnAfterRenderAsync(firstRender);
}
public override ValueTask DisposeAsync()
{
_sidebarState.IsHiddenChanged -= SidebarState_IsHiddenChanged;
- _objRef?.Dispose();
return base.DisposeAsync();
}
diff --git a/src/app/dev/DevToys.Blazor/Components/NavBar/NavBar.razor.ts b/src/app/dev/DevToys.Blazor/Components/NavBar/NavBar.razor.ts
index 4c6944baa..d19d050fe 100644
--- a/src/app/dev/DevToys.Blazor/Components/NavBar/NavBar.razor.ts
+++ b/src/app/dev/DevToys.Blazor/Components/NavBar/NavBar.razor.ts
@@ -1,4 +1,4 @@
-export function registerResizeHandler(id: string, navId: string, dotNetObjRef: any): void {
+export function registerResizeHandler(id: string, navId: string, dotNetObjRef: DotNet.DotNetObject): void {
const navBar = document.getElementById(id);
const navTag = document.getElementById(navId);
diff --git a/src/app/dev/DevToys.Blazor/Components/ScrollViewer/ScrollViewer.razor.cs b/src/app/dev/DevToys.Blazor/Components/ScrollViewer/ScrollViewer.razor.cs
index b6b705dc4..31f97514e 100644
--- a/src/app/dev/DevToys.Blazor/Components/ScrollViewer/ScrollViewer.razor.cs
+++ b/src/app/dev/DevToys.Blazor/Components/ScrollViewer/ScrollViewer.razor.cs
@@ -18,6 +18,8 @@ public partial class ScrollViewer : JSStyledComponentBase
protected override async Task OnAfterRenderAsync(bool firstRender)
{
+ await base.OnAfterRenderAsync(firstRender);
+
if (firstRender)
{
await (await JSModule).InvokeVoidAsync("initializeScrollViewer", Id);
diff --git a/src/app/dev/DevToys.Blazor/Components/StyledComponentBase.cs b/src/app/dev/DevToys.Blazor/Components/StyledComponentBase.cs
index 0220e132c..f74cd786d 100644
--- a/src/app/dev/DevToys.Blazor/Components/StyledComponentBase.cs
+++ b/src/app/dev/DevToys.Blazor/Components/StyledComponentBase.cs
@@ -57,6 +57,12 @@ public abstract class StyledComponentBase : ComponentBase
});
}
+ /// <inheritdoc />
+ public new void StateHasChanged()
+ {
+ base.StateHasChanged();
+ }
+
private void CSS_CollectionChanged(object? sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
{
BuildClassAttribute();
diff --git a/src/app/dev/DevToys.Blazor/Helpers/CssBuilder.cs b/src/app/dev/DevToys.Blazor/Core/Helpers/CssBuilder.cs
similarity index 100%
rename from src/app/dev/DevToys.Blazor/Helpers/CssBuilder.cs
rename to src/app/dev/DevToys.Blazor/Core/Helpers/CssBuilder.cs
diff --git a/src/app/dev/DevToys.Blazor/Helpers/StyleBuilder.cs b/src/app/dev/DevToys.Blazor/Core/Helpers/StyleBuilder.cs
similarity index 100%
rename from src/app/dev/DevToys.Blazor/Helpers/StyleBuilder.cs
rename to src/app/dev/DevToys.Blazor/Core/Helpers/StyleBuilder.cs
diff --git a/src/app/dev/DevToys.Blazor/Helpers/ValueBuilder.cs b/src/app/dev/DevToys.Blazor/Core/Helpers/ValueBuilder.cs
similarity index 100%
rename from src/app/dev/DevToys.Blazor/Helpers/ValueBuilder.cs
rename to src/app/dev/DevToys.Blazor/Core/Helpers/ValueBuilder.cs
diff --git a/src/app/dev/DevToys.Blazor/DevToys.Blazor.csproj b/src/app/dev/DevToys.Blazor/DevToys.Blazor.csproj
index e6f63c0b2..6fb9c2ea5 100644
--- a/src/app/dev/DevToys.Blazor/DevToys.Blazor.csproj
+++ b/src/app/dev/DevToys.Blazor/DevToys.Blazor.csproj
@@ -55,7 +55,7 @@
</Target>
<!-- Target ran on `dotnet build` -->
- <Target Name="GulpPrecompileTarget" AfterTargets="PrepareForBuild">
+ <Target Name="GulpPrecompileTarget" AfterTargets="CompileTypeScriptWithTSConfig">
<!-- Run the Gulp tasks. -->
<Message Importance="high" Text="Generating CSS and JavaScript..." />
<Exec WorkingDirectory="$(ProjectDir)" Command="node_modules\.bin\gulp devtoysJavaScript" />
diff --git a/src/app/dev/DevToys.Blazor/gulpfile.js b/src/app/dev/DevToys.Blazor/gulpfile.js
index aca318e1c..074f94ef5 100644
--- a/src/app/dev/DevToys.Blazor/gulpfile.js
+++ b/src/app/dev/DevToys.Blazor/gulpfile.js
@@ -1,30 +1,32 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+/* eslint-disable no-undef */
/// <binding ProjectOpened='watchDevtoysSass, watchDevtoysJavaScript' />
-const gulp = require('gulp'); // or import * as gulp = require('gulp'
-const cleanCSS = require('gulp-clean-css');
-const rename = require('gulp-rename');
-const dartSass = require('sass');
-const gulpSass = require('gulp-sass');
+const gulp = require("gulp"); // or import * as gulp = require('gulp'
+const cleanCSS = require("gulp-clean-css");
+const rename = require("gulp-rename");
+const dartSass = require("sass");
+const gulpSass = require("gulp-sass");
const sass = gulpSass(dartSass);
-const del = require('del');
+const del = require("del");
var concat = require("gulp-concat");
-var sourcemaps = require('gulp-sourcemaps');
-var source = require('vinyl-source-stream');
-var buffer = require('vinyl-buffer');
-var rollup = require('@rollup/stream');
+var sourcemaps = require("gulp-sourcemaps");
+var source = require("vinyl-source-stream");
+var buffer = require("vinyl-buffer");
+var rollup = require("@rollup/stream");
// Add support for require() syntax
-var commonjs = require('@rollup/plugin-commonjs');
+var commonjs = require("@rollup/plugin-commonjs");
// Add support for importing = require(node_modules folder like import x = require('module-name'
-var nodeResolve = require('@rollup/plugin-node-resolve');
+var nodeResolve = require("@rollup/plugin-node-resolve");
// Cache needs to be initialized outside of the Gulp task
var devtoysCache;
const paths = {
- devtoysScss: ['./Assets/sass/**/*.scss', './Components/**/*.scss', './Pages/**/*.scss'],
- devtoysScssOut: './wwwroot/css',
- devtoysJavascript: './Assets/javascript',
- devtoysJavascriptOut: './wwwroot/js'
+ devtoysScss: ["./Assets/sass/**/*.scss", "./Components/**/*.scss", "./Pages/**/*.scss"],
+ devtoysScssOut: "./wwwroot/css",
+ devtoysJavascript: "./Assets/javascript",
+ devtoysJavascriptOut: "./wwwroot/js"
};
function devtoysSass() {
@@ -32,7 +34,7 @@ function devtoysSass() {
.pipe(sass())
.pipe(concat("devtoys.g.css"))
.pipe(gulp.dest(paths.devtoysScssOut))
- .pipe(cleanCSS({ compatibility: 'ie8' }))
+ .pipe(cleanCSS({ compatibility: "ie8" }))
.pipe(gulp.dest(paths.devtoysScssOut));
}
@@ -49,20 +51,20 @@ function devtoysJavascript(cb) {
nodeResolve
],
output: {
- format: 'iife',
+ format: "iife",
sourcemap: true,
- name: 'devtoys'
+ name: "devtoys"
}
- }).on('bundle', function (bundle) {
+ }).on("bundle", function (bundle) {
devtoysCache = bundle;
}).pipe(source(`${paths.devtoysJavascript}/index.esm.js`))
.pipe(buffer())
.pipe(sourcemaps.init({ loadMaps: true }))
- .pipe(sourcemaps.write('.'))
+ .pipe(sourcemaps.write("."))
.pipe(gulp.dest(paths.devtoysJavascriptOut))
- .pipe(rename("devtoys.g.js", { extname: '.js' }))
+ .pipe(rename("devtoys.g.js", { extname: ".js" }))
.pipe(gulp.dest(paths.devtoysJavascriptOut))
- .on('end', function () {
+ .on("end", function () {
console.log("end");
del([`${paths.devtoysJavascriptOut}/Assets/**`]);
});
@@ -73,7 +75,7 @@ function watchDevtoysJavaScript() {
}
function cleanJavaScript(cb) {
- return del(`${paths.devtoysJavascriptOut}\Assets\**`);
+ return del(`${paths.devtoysJavascriptOut}/Assets/**`);
}
exports.devtoysSass = devtoysSass;
diff --git a/src/app/dev/DevToys.Blazor/package.json b/src/app/dev/DevToys.Blazor/package.json
index 12f51df9c..cd38d3cdb 100644
--- a/src/app/dev/DevToys.Blazor/package.json
+++ b/src/app/dev/DevToys.Blazor/package.json
@@ -35,6 +35,7 @@
},
"dependencies": {
"@popperjs/core": "^2.11.6",
+ "@types/blazor__javascript-interop": "^3.1.3",
"@types/jquery": "3.5.5",
"del": "6.1.1",
"fs": "0.0.1-security",
diff --git a/src/app/tests/DevToys.UnitTests/Blazor/Helpers/CssBuilderTests.cs b/src/app/tests/DevToys.UnitTests/Blazor/Core/Helpers/CssBuilderTests.cs
similarity index 99%
rename from src/app/tests/DevToys.UnitTests/Blazor/Helpers/CssBuilderTests.cs
rename to src/app/tests/DevToys.UnitTests/Blazor/Core/Helpers/CssBuilderTests.cs
index 6becdb0cb..c086d8c6d 100644
--- a/src/app/tests/DevToys.UnitTests/Blazor/Helpers/CssBuilderTests.cs
+++ b/src/app/tests/DevToys.UnitTests/Blazor/Core/Helpers/CssBuilderTests.cs
@@ -1,6 +1,6 @@
using DevToys.Blazor.Core.Helpers;
-namespace DevToys.UnitTests.Blazor.Helpers;
+namespace DevToys.UnitTests.Blazor.Core.Helpers;
public class CssBuilderTests
{
diff --git a/src/app/tests/DevToys.UnitTests/Blazor/Helpers/StyleBuilderTests.cs b/src/app/tests/DevToys.UnitTests/Blazor/Core/Helpers/StyleBuilderTests.cs
similarity index 99%
rename from src/app/tests/DevToys.UnitTests/Blazor/Helpers/StyleBuilderTests.cs
rename to src/app/tests/DevToys.UnitTests/Blazor/Core/Helpers/StyleBuilderTests.cs
index c8bbded7a..5d5b79b6b 100644
--- a/src/app/tests/DevToys.UnitTests/Blazor/Helpers/StyleBuilderTests.cs
+++ b/src/app/tests/DevToys.UnitTests/Blazor/Core/Helpers/StyleBuilderTests.cs
@@ -1,6 +1,6 @@
using DevToys.Blazor.Core.Helpers;
-namespace DevToys.UnitTests.Blazor.Helpers;
+namespace DevToys.UnitTests.Blazor.Core.Helpers;
public class StyleBuilderTests
{
diff --git a/src/app/tests/DevToys.UnitTests/DevToys.UnitTests.csproj b/src/app/tests/DevToys.UnitTests/DevToys.UnitTests.csproj
index 7406c8e10..fb788e5ec 100644
--- a/src/app/tests/DevToys.UnitTests/DevToys.UnitTests.csproj
+++ b/src/app/tests/DevToys.UnitTests/DevToys.UnitTests.csproj
@@ -8,6 +8,7 @@
<ItemGroup>
<PackageReference Include="FluentAssertions" />
<PackageReference Include="Microsoft.NET.Test.Sdk" />
+ <PackageReference Include="Moq" />
<PackageReference Include="xunit" />
<PackageReference Include="xunit.runner.visualstudio">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/src/app/tests/DevToys.UnitTests/Usings.cs b/src/app/tests/DevToys.UnitTests/Usings.cs
index 14a6519b1..bf490a314 100644
--- a/src/app/tests/DevToys.UnitTests/Usings.cs
+++ b/src/app/tests/DevToys.UnitTests/Usings.cs
@@ -3,4 +3,5 @@ global using System.Collections.Generic;
global using System.Linq;
global using DevToys.Api;
global using FluentAssertions;
+global using Moq;
global using Xunit;