diff --git a/Sources/BlazorApp/.vs/BlazorApp/v17/.suo b/Sources/BlazorApp/.vs/BlazorApp/v17/.suo index 16fd897..5d7ba03 100644 Binary files a/Sources/BlazorApp/.vs/BlazorApp/v17/.suo and b/Sources/BlazorApp/.vs/BlazorApp/v17/.suo differ diff --git a/Sources/BlazorApp/BlazorApp/Components/InventoryItem.razor b/Sources/BlazorApp/BlazorApp/Components/InventoryItem.razor index 68d9e36..15a064c 100644 --- a/Sources/BlazorApp/BlazorApp/Components/InventoryItem.razor +++ b/Sources/BlazorApp/BlazorApp/Components/InventoryItem.razor @@ -5,7 +5,8 @@ @ondragstart="@OnDragStart" @ondrop="@OnDrop" @ondragenter="@OnDragEnter" - @ondragleave="@OnDragLeave"> + @ondragleave="@OnDragLeave" +@ondragend="@OnDragEnd"> @if (Item != null) { diff --git a/Sources/BlazorApp/BlazorApp/Components/InventoryItem.razor.cs b/Sources/BlazorApp/BlazorApp/Components/InventoryItem.razor.cs index 44c9832..2eac849 100644 --- a/Sources/BlazorApp/BlazorApp/Components/InventoryItem.razor.cs +++ b/Sources/BlazorApp/BlazorApp/Components/InventoryItem.razor.cs @@ -16,6 +16,7 @@ namespace BlazorApp.Components + [Parameter] public bool NoDrop { get; set; } @@ -44,6 +45,7 @@ namespace BlazorApp.Components internal void OnDrop() { + if (NoDrop == true || Parent.CurrentDragItem == null) { return; @@ -58,12 +60,6 @@ namespace BlazorApp.Components } } - else if (this.Item.Id != Parent.CurrentDragItem.Id) - { - Item temp = ItemFactory.Create(this.Item); - this.Item = ItemFactory.Create(Parent.CurrentDragItem); - Parent.CurrentDragItem = ItemFactory.Create(temp); - } Parent.Actions.Add(new InventoryAction { Action = "Drop", Item = this.Item, Index = this.Index }); @@ -78,5 +74,14 @@ namespace BlazorApp.Components Parent.Actions.Add(new InventoryAction { Action = "Drag Start", Item = this.Item, Index = this.Index }); } + + private void OnDragEnd() + { + if (Parent.Actions.Last().Action == "Drag Leave") + { + this.Item = null; + } + Parent.Actions.Add(new InventoryAction { Action = "Delete", Item = this.Item, Index = this.Index }); + } } } diff --git a/Sources/BlazorApp/BlazorApp/bin/Debug/net6.0/BlazorApp.dll b/Sources/BlazorApp/BlazorApp/bin/Debug/net6.0/BlazorApp.dll index 36b7bc6..be91ccf 100644 Binary files a/Sources/BlazorApp/BlazorApp/bin/Debug/net6.0/BlazorApp.dll and b/Sources/BlazorApp/BlazorApp/bin/Debug/net6.0/BlazorApp.dll differ diff --git a/Sources/BlazorApp/BlazorApp/bin/Debug/net6.0/BlazorApp.pdb b/Sources/BlazorApp/BlazorApp/bin/Debug/net6.0/BlazorApp.pdb index a457d2e..453c02f 100644 Binary files a/Sources/BlazorApp/BlazorApp/bin/Debug/net6.0/BlazorApp.pdb and b/Sources/BlazorApp/BlazorApp/bin/Debug/net6.0/BlazorApp.pdb differ diff --git a/Sources/BlazorApp/BlazorApp/obj/Debug/net6.0/BlazorApp.dll b/Sources/BlazorApp/BlazorApp/obj/Debug/net6.0/BlazorApp.dll index 36b7bc6..be91ccf 100644 Binary files a/Sources/BlazorApp/BlazorApp/obj/Debug/net6.0/BlazorApp.dll and b/Sources/BlazorApp/BlazorApp/obj/Debug/net6.0/BlazorApp.dll differ diff --git a/Sources/BlazorApp/BlazorApp/obj/Debug/net6.0/BlazorApp.pdb b/Sources/BlazorApp/BlazorApp/obj/Debug/net6.0/BlazorApp.pdb index a457d2e..453c02f 100644 Binary files a/Sources/BlazorApp/BlazorApp/obj/Debug/net6.0/BlazorApp.pdb and b/Sources/BlazorApp/BlazorApp/obj/Debug/net6.0/BlazorApp.pdb differ diff --git a/Sources/BlazorApp/BlazorApp/obj/staticwebassets.pack.sentinel b/Sources/BlazorApp/BlazorApp/obj/staticwebassets.pack.sentinel index aee07c4..a1e5bb2 100644 --- a/Sources/BlazorApp/BlazorApp/obj/staticwebassets.pack.sentinel +++ b/Sources/BlazorApp/BlazorApp/obj/staticwebassets.pack.sentinel @@ -154,3 +154,12 @@ 2.0 2.0 2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0 +2.0