Update SpreadsheetView code to JavaFX 17

controlsfx/src/main/java/impl/org/controlsfx/spreadsheet/CellView.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013, 2019 ControlsFX
+ * Copyright (c) 2013, 2021 ControlsFX
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -300,6 +300,8 @@ protected void layoutChildren() {
         if (dirtyStyle && getItem().isCellGraphic()) {
             CellGraphicFactory browserImpl = handle.getView().getCellGraphicFactory();
             if (browserImpl != null) {
+                // When cell is re-used, the style does not seemed to be updated so we force it.
+                super.applyCss();
                 //Send the graphic only if it's the right type, otherwise send null.
                 Node node = getGraphic() != null && browserImpl.getType().isAssignableFrom(getGraphic().getClass()) ? getGraphic() : null;
                 browserImpl.loadStyle(node, getItem(), getFont(), getTextFill(), getAlignment(), getBackground());

controlsfx/src/main/java/impl/org/controlsfx/spreadsheet/GridCellEditor.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013, 2015 ControlsFX
+ * Copyright (c) 2013, 2021 ControlsFX
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -190,6 +190,10 @@ void startEdit() {
 
         if (editor != null) {
             viewCell.setGraphic(editor);
+            // If the Control has not its skin, we force it. Otherwise the pressed key that triggers edition is not considered
+            if (editor.getSkin() == null) {
+                editor.applyCss();
+            }
             editor.setMaxHeight(maxHeight);
             editor.setPrefWidth(viewCell.getWidth());
         }

controlsfx/src/main/java/impl/org/controlsfx/spreadsheet/GridRow.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2013, 2016 ControlsFX
+ * Copyright (c) 2013, 2022 ControlsFX
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -33,6 +33,7 @@
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.collections.MapChangeListener;
 import javafx.collections.ObservableList;
+import javafx.collections.WeakMapChangeListener;
 import javafx.event.Event;
 import javafx.event.EventHandler;
 import javafx.event.WeakEventHandler;
@@ -82,17 +83,7 @@ public GridRow(SpreadsheetHandle handle) {
         /**
          * When the height is changing elsewhere, we need to update ourself if necessary.
          */
-        handle.getCellsViewSkin().rowHeightMap.addListener(new MapChangeListener<Integer, Double>() {
-
-            @Override
-            public void onChanged(MapChangeListener.Change<? extends Integer, ? extends Double> change) {
-                if (change.wasAdded() && change.getKey() == handle.getView().getModelRow(getIndex())) {
-                    setRowHeight(change.getValueAdded());
-                } else if (change.wasRemoved() && change.getKey() == handle.getView().getModelRow(getIndex())) {
-                    setRowHeight(computePrefHeight(-1));
-                }
-            }
-        });
+        handle.getCellsViewSkin().rowHeightMap.addListener(weakRowHeightListener);
         /**
          * When we are adding deported cells (fixed in columns) into a row via
          * addCell. The cell is not receiving the DRAG_DETECTED eventHandler
@@ -131,7 +122,20 @@ protected double computeMinHeight(double width) {
     protected Skin<?> createDefaultSkin() {
         return new GridRowSkin(handle, this);
     }
-
+
+    private final MapChangeListener<Integer, Double> rowHeightListener = new MapChangeListener<Integer, Double>() {
+
+        @Override
+        public void onChanged(MapChangeListener.Change<? extends Integer, ? extends Double> change) {
+            if (change.wasAdded() && change.getKey() == handle.getView().getModelRow(getIndex())) {
+                setRowHeight(change.getValueAdded());
+            } else if (change.wasRemoved() && change.getKey() == handle.getView().getModelRow(getIndex())) {
+                setRowHeight(computePrefHeight(-1));
+            }
+        }
+    };
+    private final WeakMapChangeListener weakRowHeightListener = new WeakMapChangeListener<>(rowHeightListener);
+
     private final InvalidationListener setPrefHeightListener = new InvalidationListener() {
 
         @Override

controlsfx/src/main/java/impl/org/controlsfx/spreadsheet/GridViewBehavior.java

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2015 ControlsFX All rights reserved.
+ * Copyright (c) 2015, 2022 ControlsFX All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met: *
@@ -33,6 +33,8 @@
 import javafx.scene.control.TablePositionBase;
 import javafx.scene.control.TableSelectionModel;
 import javafx.scene.control.TableView;
+import javafx.scene.input.KeyCode;
+import javafx.scene.input.KeyEvent;
 import javafx.util.Pair;
 import org.controlsfx.control.spreadsheet.SpreadsheetCell;
 
@@ -494,6 +496,14 @@ private int findPreviousColumn(TablePositionBase focusedCell, SpreadsheetCell ce
         return 0;
     }
 
+    @Override
+    protected void activate(KeyEvent e) {
+        // If we are currently editing, do not trigger another edition (for enter, cell below will start edition otherwise)
+        if (!KeyCode.ENTER.equals(e.getCode()) && skin.getSkinnable().getEditingCell() == null) {
+            super.activate(e);
+        }
+    }
+
     /**
      * Cell is empty if there's nothing in it or if we have a NaN instead of a
      * proper Double.