Fix drag/drop bugs

Signed-off-by: Andrew Stein <steinlink@gmail.com>

Author: texodus

rust/perspective-viewer/src/rust/components/column_dropdown.rs

@@ -246,7 +246,7 @@ fn ColumnDropDownView(props: &ColumnDropDownViewProps) -> Html {
                                 <span>{ col }</span>
                             },
                             InPlaceColumn::Expression(col) => html! {
-                                <span id="add-expression">{ col.name.clone() }</span>
+                                <span id="add-expression"><span class="icon" />{ col.name.clone() }</span>
                             },
                         };
 

rust/perspective-viewer/src/rust/components/column_selector.rs

@@ -62,7 +62,7 @@ pub struct ColumnSelectorProps {
     pub selected_column: Option<ColumnLocator>,
 
     /// Value props threaded from root's `SessionProps` / `RendererProps`.
-    pub has_table: bool,
+    pub has_table: Option<TableLoadState>,
     pub named_column_count: usize,
     pub view_config: PtrEqRc<ViewConfig>,
     pub drag_column: Option<String>,
@@ -285,7 +285,7 @@ impl Component for ColumnSelector {
             move |_| dragdrop.notify_drag_end()
         });
 
-        let mut active_classes = classes!();
+        let mut active_classes = classes!("scrollable");
         if ctx.props().drag_column.is_some() {
             active_classes.push("dragdrop-highlight");
         };
@@ -491,6 +491,7 @@ impl Component for ColumnSelector {
                 <ScrollPanel
                     id="sub-columns"
                     key="__sub_columns__"
+                    class={classes!("scrollable")}
                     on_resize={&ctx.props().on_resize}
                     on_dimensions_reset={&self.on_reset}
                     children={inactive_children}

rust/perspective-viewer/src/rust/components/column_selector/active_column.rs

@@ -330,7 +330,7 @@ impl Component for ActiveColumn {
                     }))
                 };
 
-                let ondragend = &ctx.props().ondragend.reform(|_| tracing::error!("dragend"));
+                let ondragend = &ctx.props().ondragend.reform(|_| ());
                 let ondragstart = ctx.link().callback({
                     let event_name = name.to_owned();
                     let dragdrop = ctx.props().dragdrop.clone();
@@ -375,6 +375,7 @@ impl Component for ActiveColumn {
                             {ondragend}
                         >
                             <div class="column-selector-column-border">
+                                <span class="drag-handle icon" />
                                 <TypeIcon ty={col_type} />
                                 if ctx.props().is_aggregated {
                                     <AggregateSelector

rust/perspective-viewer/src/rust/components/column_selector/add_expression_button.rs

@@ -58,6 +58,7 @@ pub fn AddExpressionButton(p: &AddExpressionButtonProps) -> Html {
 
     html! {
         <div id="add-expression" data-index="-1" {class} {onmouseover} {onmouseout} {onmousedown}>
+            <span class="icon" />
             <span id="add-expression-button" />
         </div>
     }

rust/perspective-viewer/src/rust/components/column_selector/config_selector.rs

@@ -615,6 +615,7 @@ impl Component for ConfigSelector {
                             <Select<GroupRollupMode>
                                 id="group_rollup_mode_selector"
                                 wrapper_class="group_rollup_wrapper"
+                                is_autosize=true
                                 values={Rc::new(
                                 group_rollups
                                     .iter()

rust/perspective-viewer/src/rust/components/column_selector/expr_edit_button.rs

@@ -54,5 +54,5 @@ pub fn ExprEditButton(p: &ExprEditButtonProps) -> Html {
         "expression-edit-button"
     };
 
-    html! { <span {onmousedown} {class} /> }
+    html! { <span {onmousedown} {class}><span class="icon" /></span> }
 }

rust/perspective-viewer/src/rust/components/column_selector/filter_column.rs

@@ -350,6 +350,7 @@ impl Component for FilterColumn {
             >
                 <LocalStyle href={css!("filter-item")} />
                 <div class="pivot-column-border">
+                    <span class="drag-handle icon" />
                     // <TypeIcon ty={ColumnType::String} />
                     <TypeIcon ty={final_col_type} />
                     <span class="column_name">{ filter.column().to_owned() }</span>

rust/perspective-viewer/src/rust/components/column_selector/inactive_column.rs

@@ -171,6 +171,7 @@ impl Component for InactiveColumn {
                     {ondragend}
                 >
                     <div class="column-selector-column-border">
+                        <span class="drag-handle icon" />
                         <TypeIcon ty={col_type} />
                         <span class="column_name">{ ctx.props().name.clone() }</span>
                         <span class="column-selector--spacer" />

rust/perspective-viewer/src/rust/components/column_selector/pivot_column.rs

@@ -99,6 +99,7 @@ impl Component for PivotColumn {
                 ondragend={dragend}
             >
                 <div class="pivot-column-border">
+                    <span class="drag-handle icon" />
                     <TypeIcon ty={col_type} />
                     <span class="column_name">{ ctx.props().column.clone() }</span>
                 </div>

rust/perspective-viewer/src/rust/components/column_selector/sort_column.rs

@@ -132,6 +132,7 @@ impl Component for SortColumn {
                 ondragend={dragend}
             >
                 <div class="pivot-column-border">
+                    <span class="drag-handle icon" />
                     <TypeIcon ty={col_type} />
                     // <TypeIcon ty={ColumnType::String} />
                     <span class="column_name">{ ctx.props().sort.0.to_owned() }</span>