Skip to content

Commit 244e577

Browse files
committed
Add some more testing to ui, hotfix: Replace not working, GoBack not working as expected
1 parent 5643fb1 commit 244e577

4 files changed

Lines changed: 27 additions & 19 deletions

File tree

Blazor.Cropper/Blazor.Cropper.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<Nullable>enable</Nullable>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<PackageId>Json_exe.Blazor.Cropper</PackageId>
7-
<Version>0.2.0</Version>
7+
<Version>0.2.1</Version>
88
<Title>CropperJS Wrapper for Blazor</Title>
99
<Authors>Json-exe</Authors>
1010
<Description>This is a wrapper around the CropperJS library.</Description>

Blazor.Cropper/CropperJsInterop.cs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public async ValueTask Clear()
8989
public async ValueTask Replace(string data)
9090
{
9191
var module = await _moduleTask.Value;
92-
await module.InvokeVoidAsync("replace", _cropModule, data);
92+
await module.InvokeVoidAsync("replace", data, _cropModule);
9393
}
9494

9595
public async ValueTask Enable()
@@ -116,12 +116,6 @@ public async ValueTask RotateTo(double degrees)
116116
await module.InvokeVoidAsync("rotateTo", degrees, _cropModule);
117117
}
118118

119-
public async ValueTask GoBack(string data)
120-
{
121-
var module = await _moduleTask.Value;
122-
await module.InvokeVoidAsync("replace", _cropModule, data);
123-
}
124-
125119
public async ValueTask DisposeAsync()
126120
{
127121
if (_moduleTask.IsValueCreated)

Blazor.Cropper/CropperWrapper.razor.cs

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,15 @@ public partial class CropperWrapper
1010
/// The image src to crop.
1111
/// </summary>
1212
[Parameter, EditorRequired]
13-
public string ImageSrc { get; set; } = string.Empty;
13+
public string ImageSrc
14+
{
15+
get => _imageSrc;
16+
set
17+
{
18+
if (string.IsNullOrEmpty(_imageSrc)) _imageSrc = value;
19+
}
20+
}
21+
private string _imageSrc = string.Empty;
1422

1523
/// <summary>
1624
/// The alt text for the image.
@@ -52,7 +60,7 @@ public async Task GetCroppedArea()
5260
{
5361
_changeList.Add(ImageSrc);
5462
var imageData = await CropperJsInterop.GetCroppedCanvas();
55-
ImageSrc = imageData;
63+
_imageSrc = imageData;
5664
}
5765

5866
/// <summary>
@@ -192,8 +200,8 @@ public async Task RotateTo(double degree)
192200
public async Task GoBack()
193201
{
194202
if (_changeList.Count <= 0) return;
195-
ImageSrc = _changeList[^1];
196-
await CropperJsInterop.GoBack(ImageSrc);
203+
_imageSrc = _changeList[^1];
204+
await CropperJsInterop.Replace(ImageSrc);
197205
_changeList.RemoveAt(_changeList.Count - 1);
198206
}
199207
}

Json_exe.Blazor.Cropper.UITest/Pages/FetchData.razor

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,19 @@
88

99
<CropperWrapper @ref="CropperWrapperRef" OnReady="OnReady" ImageSrc="sample-data/testImage.jpeg" Alt="Test-Image"/>
1010

11-
<div class="vstack mt-5 gap-3">
12-
<button class="btn-primary w-auto mt-3" @onclick="@(() => CropperWrapperRef.Reset())">Reset</button>
13-
<button class="btn-primary w-auto mt-3" @onclick="@(() => CropperWrapperRef.Clear())">Clear</button>
14-
<button class="btn-primary w-auto mt-3" @onclick="@(() => CropperWrapperRef.Enable())">Enable</button>
15-
<button class="btn-primary w-auto mt-3" @onclick="@(() => CropperWrapperRef.Disable())">Disable</button>
16-
<button class="btn-primary w-auto mt-3" @onclick="@(() => CropperWrapperRef.Zoom(0.1))">Zoom</button>
17-
<button class="btn-primary w-auto mt-3" @onclick="@(() => CropperWrapperRef.RotateTo(90))">RotateTo</button>
11+
<div class="hstack mt-5 gap-3">
12+
<button class="btn-primary w-25 mt-3" @onclick="@(() => CropperWrapperRef.RotateLeft())">Rotate Left</button>
13+
<button class="btn-primary w-25 mt-3" @onclick="@(() => CropperWrapperRef.RotateRight())">Rotate Right</button>
14+
<button class="btn-primary w-25 mt-3" @onclick="@(() => CropperWrapperRef.ScaleHorizontal())">Flip Horizontal</button>
15+
<button class="btn-primary w-25 mt-3" @onclick="@(() => CropperWrapperRef.ScaleVertical())">Flip Vertical</button>
16+
<button class="btn-primary w-25 mt-3" @onclick="@(() => CropperWrapperRef.GetCroppedArea())">Crop</button>
17+
<button class="btn-primary w-25 mt-3" @onclick="@(() => CropperWrapperRef.GoBack())">Go back</button>
18+
<button class="btn-primary w-25 mt-3" @onclick="@(() => CropperWrapperRef.Reset())">Reset</button>
19+
<button class="btn-primary w-25 mt-3" @onclick="@(() => CropperWrapperRef.Clear())">Clear</button>
20+
<button class="btn-primary w-25 mt-3" @onclick="@(() => CropperWrapperRef.Enable())">Enable</button>
21+
<button class="btn-primary w-25 mt-3" @onclick="@(() => CropperWrapperRef.Disable())">Disable</button>
22+
<button class="btn-primary w-25 mt-3" @onclick="@(() => CropperWrapperRef.Zoom(0.1))">Zoom</button>
23+
<button class="btn-primary w-25 mt-3" @onclick="@(() => CropperWrapperRef.RotateTo(90))">RotateTo</button>
1824
</div>
1925

2026
@code

0 commit comments

Comments
 (0)