Revert "feat:DraggableTree"

This reverts commit 8ae8825.

# Conflicts:
#	src/BootstrapBlazor.Server/Components/Samples/TreeViews.razor.cs
#	src/BootstrapBlazor/Components/TreeView/TreeView.razor
#	src/BootstrapBlazor/Components/TreeView/TreeView.razor.cs

Author: ArgoZhang

src/BootstrapBlazor.Server/Components/Samples/TreeViews.razor

@@ -27,8 +27,7 @@
            Introduction="@Localizer["TreeViewNormalIntro"]"
            Name="Normal">
     <section ignore>@((MarkupString)Localizer["TreeViewNormalDescription"].Value)</section>
-    <TreeView Items="@NormalItems" ItemDraggable="true" OnTreeItemClick="@OnTreeItemClick" ShowToolbar="true"
-              OnDrop="OnDrop"></TreeView>
+    <TreeView Items="@NormalItems" OnTreeItemClick="@OnTreeItemClick" ShowToolbar="true"></TreeView>
     <ConsoleLogger @ref="Logger1" />
 </DemoBlock>
 

src/BootstrapBlazor.Server/Components/Samples/TreeViews.razor.cs

@@ -83,12 +83,6 @@ private Task OnTreeItemClick(TreeViewItem<TreeFoo> item)
         return Task.CompletedTask;
     }
 
-    private static Task<bool> OnDrop(TreeDropEventArgs<TreeFoo> arg)
-    {
-        Logger1.Log("Move node from " + arg.Source?.Text + " to " + arg.Target.Text + " " + arg.DropType);
-        return Task.FromResult(true);
-    }
-
     private Task OnTreeItemKeyboardClick(TreeViewItem<TreeFoo> item)
     {
         _selectedValue = item.Value.Text;

src/BootstrapBlazor/Components/TreeView/TreeView.razor

@@ -68,14 +68,13 @@ else
     RenderFragment RenderRow(TreeViewItem<TItem> item) =>
     @<TreeViewRow @key="item" IsActive="GetActive(item)" Index="GetIndex(item)" Item="item"
                   NodeIcon="@NodeIcon" ExpandNodeIcon="@ExpandNodeIcon" LoadingIcon="@LoadingIcon"
-                  MaxSelectedCount="MaxSelectedCount" Draggable="ItemDraggable" PreviewDrop="_previewDrop"
+                  MaxSelectedCount="MaxSelectedCount"
                   ToolbarEditTitle="@ToolbarEditTitle" ToolbarEditLabelText="@ToolbarEditLabelText"
                   IsDisabled="IsDisabled" CanExpandWhenDisabled="CanExpandWhenDisabled"
                   ShowCheckbox="ShowCheckbox" ShowIcon="ShowIcon"
                   ShowToolbar="ShowToolbar" ShowToolbarCallback="ShowToolbarCallback"
                   OnToggleNodeAsync="OnToggleNodeAsync" OnClick="OnClick"
                   OnBeforeStateChangedCallback="OnBeforeStateChangedCallback"
                   OnCheckStateChanged="OnCheckStateChanged"
-                  OnItemDragStart="OnItemDragStart" OnItemDragEnd="OnItemDragEnd" OnItemDrop="OnItemDrop"
                   OnUpdateCallbackAsync="OnUpdateCallbackAsync" ToolbarTemplate="ToolbarTemplate"></TreeViewRow>;
 }

src/BootstrapBlazor/Components/TreeView/TreeView.razor.cs

@@ -727,114 +727,6 @@ public void ClearCheckedItems()
         StateHasChanged();
     }
 
-    /// <summary>
-    /// Gets or sets whether to enable item dragging. Default is false.
-    /// </summary>
-    [Parameter]
-    public bool ItemDraggable { get; set; }
-
-    /// <summary>
-    /// Gets or sets the callback method to be invoked when an item is dropped.
-    /// Drop action can be cancelled by returning false.
-    /// </summary>
-    [Parameter]
-    public Func<TreeDropEventArgs<TItem>, Task<bool>> OnDrop { get; set; } = _ => Task.FromResult(true);
-
-    private bool _previewDrop;
-    private TreeViewItem<TItem>? _draggingItem;
-
-    private void OnItemDragStart(TreeViewItem<TItem> treeViewItem)
-    {
-        _previewDrop = true;
-        _draggingItem = treeViewItem;
-        StateHasChanged();
-    }
-
-    private void OnItemDragEnd()
-    {
-        _previewDrop = false;
-        _draggingItem = null;
-        StateHasChanged();
-    }
-
-    private async Task OnItemDrop(TreeDropEventArgs<TItem> e)
-    {
-        if (_draggingItem is not null)
-        {
-            e.Source = _draggingItem;
-            var allowChangeSource = await OnDrop.Invoke(e);
-            if (!allowChangeSource)
-            {
-                return;
-            }
-
-            // 如果允许改变源节点则更新拖拽项的父对象以及排序
-            _draggingItem.Parent?.Items.Remove(_draggingItem);
-            _draggingItem.IsExpand = e.ExpandAfterDrop;
-
-            switch (e.DropType)
-            {
-                case TreeDropType.AsFirstChild:
-                    // 插入到目标的第一个子节点
-                    e.Target.Items.Insert(0, _draggingItem);
-                    _draggingItem.Parent = e.Target;
-                    break;
-                case TreeDropType.AsLastChild:
-                    // 插入到目标的最后一个子节点
-                    e.Target.Items.Add(_draggingItem);
-                    _draggingItem.Parent = e.Target;
-                    break;
-                case TreeDropType.AsSiblingBelow:
-                    // 作为目标的下一个兄弟节点
-                    if (e.Target.Parent is not null)
-                    {
-                        var index = e.Target.Parent.Items.IndexOf(e.Target);
-                        if (index >= 0 && index < e.Target.Parent.Items.Count - 1)
-                        {
-                            e.Target.Parent.Items.Insert(index + 1, _draggingItem);
-                        }
-                        else
-                        {
-                            e.Target.Parent.Items.Add(_draggingItem);
-                        }
-
-                        _draggingItem.Parent = e.Target.Parent;
-                    }
-                    // 如果目标没有父节点，则作为顶层节点处理
-                    else
-                    {
-                        // 目标节点的Index
-                        var index = Items.IndexOf(e.Target);
-                        if (index >= 0 && index < Items.Count - 1)
-                        {
-                            Items.Insert(index + 1, _draggingItem);
-                        }
-                        else
-                        {
-                            Items.Add(_draggingItem);
-                        }
-
-                        _draggingItem.Parent = null;
-                    }
-
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException();
-            }
-
-
-            _draggingItem = null;
-            _previewDrop = false;
-            _rows = GetTreeItems().ToFlat();
-
-            StateHasChanged();
-        }
-        else
-        {
-            throw new InvalidOperationException("拖拽的项为空");
-        }
-    }
-
     /// <summary>
     /// Gets all selected node collections
     /// </summary>
@@ -871,30 +763,3 @@ private List<TreeViewItem<TItem>> Rows
 
     private int GetIndex(TreeViewItem<TItem> item) => Rows.IndexOf(item);
 }
-
-/// <summary>
-/// Represents the event arguments for the TreeView drop event.
-/// </summary>
-public class TreeDropEventArgs<TItem>
-{
-    /// <summary>
-    /// Gets or sets the source item that is being dropped.
-    /// </summary>
-    public TreeViewItem<TItem>? Source { get; set; }
-
-    /// <summary>
-    /// Gets or sets the target item.
-    /// </summary>
-    public TreeViewItem<TItem> Target { get; set; } = null!;
-
-    /// <summary>
-    /// Gets or sets the drop type.
-    /// </summary>
-    public TreeDropType DropType { get; set; }
-
-    /// <summary>
-    /// Gets or sets whether to expand the source item's children when dropping.
-    /// </summary>
-    public bool ExpandAfterDrop { get; set; }
-
-}

src/BootstrapBlazor/Components/TreeView/TreeView.razor.scss

@@ -14,7 +14,6 @@
     --bb-tree-disabled-opacity: #{$bb-tree-disabled-opacity};
     --bb-tree-search-height: #{$bb-tree-search-height};
     --bb-tree-item-bg-radius: var(--bs-border-radius);
-    --bb-tree-drop-preview-color: #{$bb-primary-color};
     position: relative;
     height: 100%;
     display: flex;
@@ -39,7 +38,6 @@
         flex-wrap: nowrap;
         align-items: center;
         cursor: pointer;
-        user-select: none;
 
         .tree-content-toolbar {
             display: none;
@@ -57,30 +55,6 @@
             flex-shrink: 0;
             align-items: center;
             border-radius: var(--bs-border-radius);
-            position: relative;
-
-            .tree-drop-zone {
-                position: absolute;
-                top: 4px;
-                left: 20px;
-                right: 0;
-                bottom: -12px;
-                pointer-events: all;
-                background-color: transparent;
-                display: grid;
-                grid-template-rows: 1fr 16px;
-
-                .tree-drop-child-inside {
-                    grid-row: 1 / 2;
-                    //background-color: rgba(236, 209, 62, 0.5);
-                }
-
-                .tree-drop-child-below {
-                    grid-row: 2 / 3;
-                    //background-color: rgba(94, 236, 62, 0.5);
-                }
-
-            }
         }
 
         .node-icon {
@@ -147,7 +121,6 @@
         display: inline-flex;
         align-items: center;
         padding: var(--bb-tree-node-padding);
-        position: relative;
         flex: 1;
 
         .tree-icon {
@@ -160,69 +133,6 @@
             white-space: nowrap;
         }
 
-        .tree-preview-child-last {
-            position: absolute;
-            top: -2px;
-            left: -2px;
-            right: -2px;
-            bottom: -2px;
-            border: 2px solid var(--bb-tree-drop-preview-color);
-            border-radius: 6px;
-            pointer-events: none;
-            z-index: 1;
-            background: transparent;
-        }
-
-        .tree-preview-child-first {
-            position: absolute;
-            bottom: -4px;
-            height: 8px;
-            left: 20px;
-            right: 0;
-            display: flex;
-            flex-direction: row;
-            align-items: center;
-            pointer-events: none;
-
-            .tree-preview-circle {
-                width: 8px;
-                height: 8px;
-                border-radius: 50%;
-                background-color: var(--bb-tree-drop-preview-color);
-            }
-
-            .tree-preview-line {
-                flex: 1;
-                height: 2px;
-                background-color: var(--bb-tree-drop-preview-color);
-            }
-        }
-
-        .tree-preview-below {
-            position: absolute;
-            bottom: -4px;
-            height: 8px;
-            left: 0;
-            right: 0;
-            display: flex;
-            flex-direction: row;
-            align-items: center;
-            pointer-events: none;
-
-            .tree-preview-circle {
-                width: 8px;
-                height: 8px;
-                border-radius: 50%;
-                background-color: var(--bb-tree-drop-preview-color);
-            }
-
-            .tree-preview-line {
-                flex: 1;
-                height: 2px;
-                background-color: var(--bb-tree-drop-preview-color);
-            }
-        }
-
         &.disabled {
             opacity: var(--bb-tree-disabled-opacity);
         }
@@ -239,10 +149,6 @@
             display: none;
         }
     }
-
-    .tree-drop-pass {
-        pointer-events: none;
-    }
 }
 
 .tree-view-edit-form {

src/BootstrapBlazor/Components/TreeView/TreeViewRow.razor

@@ -9,23 +9,6 @@
     <div class="tree-content-body">
         <DynamicElement TagName="i" class="@CaretClassString" TriggerClick="CanTriggerClickNode" OnClick="ToggleNodeAsync"></DynamicElement>
         <i class="@NodeLoadingClassString"></i>
-
-        @if (Draggable && !_draggingItem)
-        {
-            <div class="tree-drop-zone">
-                <div class="tree-drop-child-inside"
-                     ondragover="event.preventDefault();"
-                     @ondragenter="DragEnterChildInside"
-                     @ondragleave="DragLeaveChildInside"
-                     @ondrop="DropChildInside"></div>
-                <div class="tree-drop-child-below"
-                     ondragover="event.preventDefault();"
-                     @ondragenter="DragEnterChildBelow"
-                     @ondragleave="DragLeaveChildBelow"
-                     @ondrop="DropChildBelow"></div>
-            </div>
-        }
-
         @if (ShowCheckbox)
         {
             <Checkbox Value="@Item" IsDisabled="ItemDisabledState"
@@ -34,9 +17,7 @@
                       OnBeforeStateChanged="@(MaxSelectedCount > 0 ? state => TriggerBeforeStateChangedCallback(state) : null)">
             </Checkbox>
         }
-        <DynamicElement class="@NodeClassString" TriggerClick="!ItemDisabledState" OnClick="ClickRow"
-                        draggable="@(Draggable ? "true" : "false")"
-                        @ondragstart="DragStart" @ondragend="DragEnd">
+        <DynamicElement class="@NodeClassString" TriggerClick="!ItemDisabledState" OnClick="ClickRow">
             @if (ShowIcon)
             {
                 <i class="@IconClassString"></i>
@@ -61,25 +42,6 @@
                                                OnUpdateCallbackAsync="OnUpdateCallbackAsync"></TreeViewToolbarEditButton>
                 }
             }
-
-            @if (_previewChildLast)
-            {
-                <div class="tree-preview-child-last"></div>
-            }
-            @if (_previewChildFirst)
-            {
-                <div class="tree-preview-child-first">
-                    <div class="tree-preview-circle"></div>
-                    <div class="tree-preview-line"></div>
-                </div>
-            }
-            @if (_previewBelow)
-            {
-                <div class="tree-preview-below">
-                    <div class="tree-preview-circle"></div>
-                    <div class="tree-preview-line"></div>
-                </div>
-            }
         </DynamicElement>
     </div>
 </div>