persistent sort option added, still need UI indication; some header bugs/weirdness fixed

1 files changed, 17 insertions, 3 deletions

diff --git a/src/client/views/collections/collectionSchema/SchemaColumnHeader.tsx b/src/client/views/collections/collectionSchema/SchemaColumnHeader.tsx
index f0debaec2..d16cde1f8 100644
--- a/src/client/views/collections/collectionSchema/SchemaColumnHeader.tsx
+++ b/src/client/views/collections/collectionSchema/SchemaColumnHeader.tsx
@@ -54,6 +54,7 @@ export interface SchemaColumnHeaderProps {
 @observer
 export class SchemaColumnHeader extends ObservableReactComponent<SchemaColumnHeaderProps> {
 
+    private _inputRef: EditableView | null = null;
     @observable _altTitle: string | undefined = undefined;
     @observable _showMenuIcon: boolean = false;
 
@@ -118,14 +119,17 @@ export class SchemaColumnHeader extends ObservableReactComponent<SchemaColumnHea
     @computed get editableView() {
         const { color, fieldProps, pointerEvents } = this.renderProps(this._props); 
 
-        return <div className='schema-column-edit-wrapper' onPointerUp={() => {SchemaColumnHeader.isDefaultField(this.fieldKey) && this.openKeyDropdown()}}
+        return <div className='schema-column-edit-wrapper' onPointerUp={() => {
+            SchemaColumnHeader.isDefaultField(this.fieldKey) && this.openKeyDropdown();
+            this._props.schemaView.deselectAllCells();
+        }}
         style={{
             color,
             width: '100%',
             pointerEvents,
         }}>
             <EditableView
-                ref={r => this._props.autoFocus && r?.setIsFocused(true)}
+                ref={r => {this._inputRef = r; this._props.autoFocus && r?.setIsFocused(true)}}
                 oneLine={true}
                 allowCRs={false}
                 contents={undefined}
@@ -215,7 +219,17 @@ export class SchemaColumnHeader extends ObservableReactComponent<SchemaColumnHea
                     }}
                     onPointerEnter={() => {this.handlePointerEnter()}}
                     onPointerLeave={() => {this.handlePointerLeave()}}
-                    onPointerDown={this.setupDrag}
+                    onPointerDown={e => {
+                        this.setupDrag(e);
+                        setupMoveUpEvents(
+                            this,
+                            e,
+                            e => {return this._inputRef?.setIsEditing(false) ?? false},
+                            emptyFunction,
+                            emptyFunction,
+                            );
+                        }
+                    }
                     ref={col => {
                         if (col) {
                             this._props.setColRef(this._props.columnIndex, col);