dbeaver/dbeaver#22103 replace autosave focus listener with dispose & tabbing support for datetime

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/panel/valueviewer/ValueViewCommandHandler.java

@@ -23,8 +23,10 @@
 import org.eclipse.ui.texteditor.ITextEditorActionDefinitionIds;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.ui.controls.resultset.IResultSetPanel;
+import org.jkiss.dbeaver.ui.controls.resultset.IResultSetPresentation;
 import org.jkiss.dbeaver.ui.controls.resultset.ResultSetViewer;
 import org.jkiss.dbeaver.ui.controls.resultset.handler.ResultSetHandlerMain;
+import org.jkiss.dbeaver.ui.controls.resultset.spreadsheet.SpreadsheetPresentation;
 
 /**
  * ValueViewCommandHandler
@@ -41,13 +43,21 @@ public Object execute(ExecutionEvent event) throws ExecutionException {
             return null;
         }
         String actionId = event.getCommand().getId();
-        IResultSetPanel visiblePanel = rsv.getVisiblePanel();
-        if (visiblePanel instanceof ValueViewerPanel) {
+        IResultSetPanel resultPanel = rsv.getVisiblePanel();
+        if (resultPanel instanceof ValueViewerPanel valuePanel) {
             switch (actionId) {
                 case ITextEditorActionDefinitionIds.SMART_ENTER:
                 //case CoreCommands.CMD_EXECUTE_STATEMENT:
                 case CMD_SAVE_VALUE:
-                    ((ValueViewerPanel) visiblePanel).saveValue();
+                    // 1 close active inline editor
+                    IResultSetPresentation activePresentation = rsv.getActivePresentation();
+                    if (activePresentation instanceof SpreadsheetPresentation spsPresentation) {
+                        spsPresentation.closeInlineEditor();
+                    }
+                    // 2 save value from panel
+                    valuePanel.saveValue();
+                    // 3 refresh panel to show actual
+                    valuePanel.refresh(true);
                     break;
             }
         }

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/spreadsheet/Spreadsheet.java

@@ -16,6 +16,7 @@
  */
 package org.jkiss.dbeaver.ui.controls.resultset.spreadsheet;
 
+import org.eclipse.core.runtime.Platform.OS;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.StyledText;
@@ -350,8 +351,11 @@ public void handleEvent(final Event event) {
                 }
                 break;
             case SWT.MouseDown:
-                if (event.button == 2) {
-//                    presentation.openValueEditor(true);
+                if (presentation == null) {
+                    return;
+                }
+                if (event.button == 1 && event.count == 1) {
+                    presentation.closeInlineEditor();
                 }
                 break;
             case LightGrid.Event_ChangeSort:
@@ -370,6 +374,9 @@ public void handleEvent(final Event event) {
                 // we don't want to mess current grid state
                 UIUtils.asyncExec(() -> presentation.navigateLink((GridCell) event.data, event.stateMask));
                 break;
+            case SWT.MouseExit:
+                System.out.println("Spreadsheet.handleEvent()");
+                break;
         }
     }
 

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/spreadsheet/SpreadsheetPresentation.java

@@ -2963,4 +2963,17 @@
         }
 
     }
+
+    /**
+     * Close editor control (In line) during close data will be automatically
+     * applied for cell
+     */
+    public void closeInlineEditor() {
+        if (activeInlineEditor instanceof BaseValueEditor<?> baseInlineEditor) {
+            IValueController vController = baseInlineEditor.getValueController();
+            if (vController instanceof IMultiController mController) {
+                mController.closeInlineEditor();
+            }
+        }
+    }
 }

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/data/editors/BaseValueEditor.java

@@ -20,12 +20,8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.custom.CCombo;
 import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.FocusEvent;
-import org.eclipse.swt.events.FocusListener;
-import org.eclipse.swt.events.TraverseEvent;
+import org.eclipse.swt.events.*;
 import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.widgets.*;
 import org.eclipse.ui.themes.ITheme;
 import org.jkiss.code.NotNull;
@@ -128,7 +124,9 @@ protected void initInlineControl(final Control inlineControl)
             //inlineControl.setFont(valueController.getEditPlaceholder().getFont());
             //inlineControl.setFocus();
 
-            if (valueController instanceof IMultiController) { // In dialog it also should handle all standard stuff because we have params dialog
+            // In dialog it also should handle all standard stuff because we have params
+            // dialog
+            if (valueController instanceof IMultiController) {
                 inlineControl.addTraverseListener(e -> {
                     if (e.detail == SWT.TRAVERSE_RETURN) {
                         if (!valueController.isReadOnly()) {
@@ -140,38 +138,38 @@ protected void initInlineControl(final Control inlineControl)
                         }
                         e.doit = false;
                         e.detail = SWT.TRAVERSE_NONE;
-                     } else if (e.detail == SWT.TRAVERSE_ESCAPE) {
+                    } else if (e.detail == SWT.TRAVERSE_ESCAPE) {
                         ((IMultiController) valueController).closeInlineEditor();
                         if (additionalTraverseActions != null) {
                             additionalTraverseActions.accept(e);
                         }
                         e.doit = false;
                         e.detail = SWT.TRAVERSE_NONE;
-                     } else if (e.detail == SWT.TRAVERSE_TAB_NEXT || e.detail == SWT.TRAVERSE_TAB_PREVIOUS) {
+                    } else if (e.detail == SWT.TRAVERSE_TAB_NEXT || e.detail == SWT.TRAVERSE_TAB_PREVIOUS) {
                         saveValue();
                         ((IMultiController) valueController).nextInlineEditor(e.detail == SWT.TRAVERSE_TAB_NEXT);
                         if (additionalTraverseActions != null) {
                             additionalTraverseActions.accept(e);
                         }
                         e.doit = false;
                         e.detail = SWT.TRAVERSE_NONE;
-                     }
-
+                    }
                 });
-                 if (!UIUtils.isInDialog(inlineControl)) {
-                     if (inlineControl instanceof Composite) {
-                         for (Control childControl : ((Composite) inlineControl).getChildren()) {
-                             if (!childControl.isDisposed()) {
-                                 addAutoSaveSupport(childControl);
-                                 EditorUtils.trackControlContext(valueController.getValueSite(), childControl, RESULTS_EDIT_CONTEXT_ID);
-                             }
-                         }
-                     } else {
-                         addAutoSaveSupport(inlineControl);
-                     }
-                 } else {
-                     ((IMultiController) valueController).closeInlineEditor();
-                 }
+                if (!UIUtils.isInDialog(inlineControl)) {
+                    if (inlineControl instanceof Composite) {
+                        for (Control childControl : ((Composite) inlineControl).getChildren()) {
+                            if (!childControl.isDisposed()) {
+                                EditorUtils.trackControlContext(
+                                    valueController.getValueSite(),
+                                    childControl,
+                                    RESULTS_EDIT_CONTEXT_ID);
+                            }
+                        }
+                    }
+                    addAutoSaveSupport(inlineControl);
+                } else {
+                    ((IMultiController) valueController).closeInlineEditor();
+                }
             }
 
             if (!UIUtils.isInDialog(inlineControl)) {
@@ -195,37 +193,22 @@ protected void addInlineListeners(@NotNull Control inlineControl, @NotNull Liste
     }
 
     private void addAutoSaveSupport(final Control inlineControl) {
-        BaseValueEditor<?> editor = this;
-        // Do not use focus listener in dialogs (because dialog has controls like Ok/Cancel buttons)
-        inlineControl.addFocusListener(new FocusListener() {
-            @Override
-            public void focusGained(FocusEvent e) {
-            }
-
-            @Override
-            public void focusLost(FocusEvent e) {
-                // It feels like on Linux editor's control is 'invisible' for GTK and mouse clicks
-                // 'go through' the control and reach underlying spreadsheet. Workaround:
-                // check that in reality we clicked on editor by checking that cursor is in control's
-                // bounds. See [dbeaver#10561].
-                Rectangle controlBounds = editor.control.getBounds();
-                Point relativeCursorLocation = editor.control.toControl(e.display.getCursorLocation());
-                if (controlBounds.contains(relativeCursorLocation)) {
-                    return;
-                }
+        // add focus listener on control but not on the composite
+        // require to handle data save in case of focus lost
+        inlineControl.addDisposeListener(getAutoSaveListener());
+        this.setAutoSaveEnabled(true);
+    }
 
-                onFocusLost(valueController::updateSelectionValue);
+    @NotNull
+    protected DisposeListener getAutoSaveListener() {
+        return e -> {
+            if (!valueController.isReadOnly()) {
+                saveBeforeClose(value -> valueController.updateValue(value, true));
             }
-        });
-
-        // Unfortunately, focusLost events on macOS never reach the listener above.
-        // However, we rely on them to save the value when the user clicks somewhere on the grid and LightGrid forces focus on itself.
-        // The solution is to add dispose listener. But here is a catch: when inline control is about to be disposed of, the selection is already
-        // on some other cell on the grid. Hence, we need to use updateValue() on valueController, not updateSelectionValue().
-        UIUtils.installMacOSFocusLostSubstitution(inlineControl, () -> onFocusLost(value -> valueController.updateValue(value, true)));
+        };
     }
 
-    private void onFocusLost(@NotNull Consumer<Object> valueSaver) {
+    private void saveBeforeClose(@NotNull Consumer<Object> valueSaver) {
         if (!valueController.isReadOnly()) {
             saveValue(false, valueSaver);
         }
@@ -244,6 +227,9 @@ protected void saveValue(boolean showError) {
 
     private void saveValue(boolean showError, @NotNull Consumer<Object> valueUpdater) {
         try {
+            if (control.isDisposed()) {
+                return;
+            }
             Object newValue = extractEditorValue();
             if (dirty || control instanceof Combo || control instanceof CCombo || control instanceof List) {
                 // Combos are always dirty (because drop-down menu sets a selection)

plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/data/editors/DateTimeInlineEditor.java

@@ -22,10 +22,8 @@
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Listener;
+import org.eclipse.swt.events.TraverseEvent;
+import org.eclipse.swt.widgets.*;
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
 import org.jkiss.dbeaver.DBException;
@@ -54,7 +52,6 @@ public class DateTimeInlineEditor extends BaseValueEditor<Control> {
     private DateEditorMode dateEditorMode;
     private CustomTimeEditor timeEditor;
 
-
     /**
      * Action which sets edit mode to string edit
      */
@@ -147,6 +144,22 @@ public DateTimeInlineEditor(IValueController controller) {
     @Override
     protected void addInlineListeners(@NotNull Control inlineControl, @NotNull Listener listener) {
         super.addInlineListeners(inlineControl, listener);
+        timeEditor.addTextModeTraverseListener(e -> {
+            if (!inlineControl.isDisposed()) {
+                sendTraverseEvent(inlineControl, e);
+            }
+        });
+        timeEditor.addTraverseForwardListener(e -> {
+            if (!inlineControl.isDisposed() && e.detail == SWT.TRAVERSE_TAB_NEXT) {
+                sendTraverseEvent(inlineControl, e);
+            }
+        });
+        timeEditor.addTraverseBackwardsListener(e -> {
+            if (!inlineControl.isDisposed() && e.detail == SWT.TRAVERSE_TAB_PREVIOUS) {
+                sendTraverseEvent(inlineControl, e);
+            }
+        });
+
         timeEditor.addSelectionAdapter(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent e) {
@@ -162,6 +175,13 @@ public void widgetSelected(SelectionEvent e) {
         });
     }
 
+    private static void sendTraverseEvent(@NotNull Control inlineControl, TraverseEvent e) {
+        e.doit = false;
+        Event event = new Event();
+        event.detail = e.detail;
+        inlineControl.notifyListeners(SWT.Traverse, event);
+    }
+
     @Override
     protected Control createControl(Composite editPlaceholder) {
         Object value = valueController.getValue();
@@ -175,8 +195,9 @@ protected Control createControl(Composite editPlaceholder) {
         if (!isCalendarMode()) {
             textMode.run();
             textMode.setChecked(true);
-        } else dateEditorMode.setChecked(true);
-
+        } else {
+            dateEditorMode.setChecked(true);
+        }
         primeEditorValue(value);
         timeEditor.createDateFormat(valueController.getValueType());
         timeEditor.setEditable(!valueController.isReadOnly());
@@ -192,12 +213,14 @@ private boolean isCalendarMode() {
     @Override
     public Object extractEditorValue() throws DBCException {
         try (DBCSession session = valueController.getExecutionContext().openSession(new VoidProgressMonitor(), DBCExecutionPurpose.UTIL, "Make datetime value from editor")) {
-            if (!isCalendarMode()) {
+            if (timeEditor.isTextMode()) {
                 final String strValue = timeEditor.getValueAsString();
-                return valueController.getValueHandler().getValueFromObject(session, valueController.getValueType(), strValue, false, true);
+                return valueController.getValueHandler()
+                    .getValueFromObject(session, valueController.getValueType(), strValue, false, true);
             } else {
                 final Date dateValue = timeEditor.getValueAsDate();
-                return valueController.getValueHandler().getValueFromObject(session, valueController.getValueType(), dateValue, false, true);
+                return valueController.getValueHandler()
+                    .getValueFromObject(session, valueController.getValueType(), dateValue, false, true);
             }
         }
     }