@qooxdoo/framework 7.0.0 → 7.2.0

package/source/class/qx/ui/progressive/renderer/table/cell/Image.js

@@ -34,31 +34,34 @@ qx.Class.define("qx.ui.progressive.renderer.table.cell.Image", {
   construct(width, height) {
     super();
 
-    if (width === undefined) {
-      this.__imageWidth = width;
+    if (width !== undefined) {
+      this._imageWidth = width;
     } else {
-      this.__imageWidth = 16;
+      this._imageWidth = 16;
     }
 
-    if (height === undefined) {
-      this.__imageHeight = height;
+    if (height !== undefined) {
+      this._imageHeight = height;
     } else {
-      this.__imageHeight = 16;
+      this._imageHeight = 16;
     }
   },
 
   members: {
-    __imageWidth: null,
-    __imageHeight: null,
+    _imageWidth: null,
+    _imageHeight: null,
 
-    // overridden
-    _identifyImage(cellInfo) {
-      var imageData = {
-        imageWidth: this.__imageWidth,
-        imageHeight: this.__imageHeight
+    _getDefaultImageData(cellInfo) {
+      return {
+        imageWidth: this._imageWidth,
+        imageHeight: this._imageHeight
       };
+    },
 
+    // overridden
+    _identifyImage(cellInfo) {
       var height;
+      var imageData = this._getDefaultImageData(cellInfo);
 
       // String data is the unresolved url for the image.
       // Object data is a map containing the url, tooltip, and a height

package/source/class/qx/ui/splitpane/Pane.js

@@ -156,32 +156,24 @@ qx.Class.define("qx.ui.splitpane.Pane", {
       var splitter = this.getChildControl("splitter");
       var splitterWidth = splitter.getWidth();
       if (!splitterWidth) {
-        splitter.addListenerOnce(
-          "appear",
-          function () {
-            this.__setBlockerPosition();
-          },
-          this
-        );
+        splitter.addListenerOnce("appear", () => {
+          this.__setBlockerPosition();
+        });
       }
 
       // resize listener to remove the blocker in case the splitter
       // is removed.
-      splitter.addListener(
-        "resize",
-        function (e) {
-          var bounds = e.getData();
-          if (
-            this.getChildControl("splitter").isKnobVisible() &&
-            (bounds.height == 0 || bounds.width == 0)
-          ) {
-            this.__blocker.hide();
-          } else {
-            this.__blocker.show();
-          }
-        },
-        this
-      );
+      splitter.addListener("resize", e => {
+        var bounds = e.getData();
+        if (
+          this.getChildControl("splitter").isKnobVisible() &&
+          (bounds.height == 0 || bounds.width == 0)
+        ) {
+          this.__blocker.hide();
+        } else {
+          this.__blocker.show();
+        }
+      });
     },
 
     /**

package/source/class/qx/ui/table/MTableContextMenu.js

@@ -24,77 +24,69 @@ qx.Mixin.define("qx.ui.table.MTableContextMenu", {
     // Add an event listener to handle context menu events.  The actual menu
     // is built by a function registered with a call to
     // setContextMenuHandler(col, handler).
-    this.addListener(
-      "cellContextmenu",
-      function (e) {
-        var contextMenu = this.getContextMenu();
-
-        // Dispose of any previously existing context menu
-        if (contextMenu && !contextMenu.isDisposed()) {
-          // Dispose of the context menu.
-          contextMenu.hide();
-          this.setContextMenu(null);
-          this.getApplicationRoot().remove(contextMenu);
-          contextMenu.dispose();
-          contextMenu = null;
-        }
-
-        // Get the context menu handler for the column on which the context
-        // menu request was issued.
-        var col = e.getColumn();
-        var contextMenuHandler = this.getContextMenuHandler(col);
-
-        // If there's no context menu handler for this column, we have nothing
-        // to do.
-        if (typeof contextMenuHandler !== "function") {
-          return;
-        }
-
-        // Get the context object for the handler function
-        var handlerContext = this.__contextMenuHandlerContext[col];
-
-        // Get the data model
-        var tableModel = this.getTableModel();
-
-        // Create a context menu for this tree.
-        contextMenu = new qx.ui.menu.Menu();
-
-        // Don't display context menus from the context menu
-        contextMenu.addListener("contextmenu", function (e) {
-          e.preventDefault();
-        });
-
-        // This prevents the display of context menu on table header cells
-        contextMenu.addListenerOnce(
-          "disappear",
-          function () {
-            this.setContextMenu(null);
-          },
-          this
-        );
-
-        // Call the context menu handler for this column.
-        var bShowContextMenu = contextMenuHandler.call(
-          handlerContext,
-          col,
-          e.getRow(),
-          this,
-          tableModel,
-          contextMenu
-        );
-
-        // If we were told not to display the context menu...
-        if (!bShowContextMenu) {
-          // ... then we're all done here.
-          contextMenu.dispose();
-          return;
-        }
-
-        // Set the context menu
-        this.setContextMenu(contextMenu);
-      },
-      this
-    );
+    this.addListener("cellContextmenu", e => {
+      var contextMenu = this.getContextMenu();
+
+      // Dispose of any previously existing context menu
+      if (contextMenu && !contextMenu.isDisposed()) {
+        // Dispose of the context menu.
+        contextMenu.hide();
+        this.setContextMenu(null);
+        this.getApplicationRoot().remove(contextMenu);
+        contextMenu.dispose();
+        contextMenu = null;
+      }
+
+      // Get the context menu handler for the column on which the context
+      // menu request was issued.
+      var col = e.getColumn();
+      var contextMenuHandler = this.getContextMenuHandler(col);
+
+      // If there's no context menu handler for this column, we have nothing
+      // to do.
+      if (typeof contextMenuHandler !== "function") {
+        return;
+      }
+
+      // Get the context object for the handler function
+      var handlerContext = this.__contextMenuHandlerContext[col];
+
+      // Get the data model
+      var tableModel = this.getTableModel();
+
+      // Create a context menu for this tree.
+      contextMenu = new qx.ui.menu.Menu();
+
+      // Don't display context menus from the context menu
+      contextMenu.addListener("contextmenu", function (e) {
+        e.preventDefault();
+      });
+
+      // This prevents the display of context menu on table header cells
+      contextMenu.addListenerOnce("disappear", () => {
+        this.setContextMenu(null);
+      });
+
+      // Call the context menu handler for this column.
+      var bShowContextMenu = contextMenuHandler.call(
+        handlerContext,
+        col,
+        e.getRow(),
+        this,
+        tableModel,
+        contextMenu
+      );
+
+      // If we were told not to display the context menu...
+      if (!bShowContextMenu) {
+        // ... then we're all done here.
+        contextMenu.dispose();
+        return;
+      }
+
+      // Set the context menu
+      this.setContextMenu(contextMenu);
+    });
 
     // Provide an array in which context menu handlers will be stored.  The
     // array is indexed by column number.

package/source/class/qx/ui/table/Table.js

@@ -1720,13 +1720,9 @@ qx.Class.define("qx.ui.table.Table", {
       // if the dom element is not available, the table hasn't been rendered
       if (!elem) {
         // postpone the scroll until the table has appeared
-        this.addListenerOnce(
-          "appear",
-          function () {
-            this.scrollCellVisible(col, row);
-          },
-          this
-        );
+        this.addListenerOnce("appear", () => {
+          this.scrollCellVisible(col, row);
+        });
       }
 
       var columnModel = this.getTableColumnModel();
@@ -2193,7 +2189,6 @@ qx.Class.define("qx.ui.table.Table", {
       );
     }
 
-    this._cleanUpMetaColumns(0);
     this.getTableColumnModel().dispose();
     this._disposeObjects(
       "__selectionManager",

package/source/class/qx/ui/table/model/Abstract.js

@@ -66,11 +66,23 @@ qx.Class.define("qx.ui.table.model.Abstract", {
     this.__columnIndexMap = {};
   },
 
+  statics: {
+    /**
+     * Member to control if a table should throw an error when you try to change the
+     * data model data whilst there is an incomplete edit. It could possibly break
+     * current implementations so only introduce the change from QX v8.
+     * Ref: https://github.com/qooxdoo/qooxdoo/pull/10377#discussion_r818697343
+     */
+    THROW_ON_MODEL_CHANGE_DURING_EDIT:
+      parseInt(qx.core.Environment.get("qx.version"), 10) >= 8
+  },
+
   members: {
     __columnIdArr: null,
     __columnNameArr: null,
     __columnIndexMap: null,
     __internalChange: null,
+    __table: null,
 
     /**
      * Initialize the table model <--> table interaction. The table model is
@@ -84,7 +96,17 @@ qx.Class.define("qx.ui.table.model.Abstract", {
      *   The table to which this model is attached
      */
     init(table) {
-      // default implementation has nothing to do
+      // store a reference back to the table
+      this.__table = table;
+    },
+
+    /**
+     *
+     *
+     * @returns table {qx.ui.table.Table}
+     */
+    getTable() {
+      return this.__table;
     },
 
     /**
@@ -292,6 +314,17 @@ qx.Class.define("qx.ui.table.model.Abstract", {
       }
 
       this.setColumnNamesByIndex(columnNameArr);
+    },
+
+    _checkEditing() {
+      if (!qx.ui.table.model.Abstract.THROW_ON_MODEL_CHANGE_DURING_EDIT) {
+        return;
+      }
+      if (this.getTable() && this.getTable().isEditing()) {
+        throw new Error(
+          "A cell is currently being edited. Commit or cancel the edit before setting the table data"
+        );
+      }
     }
   },
 

package/source/class/qx/ui/table/model/Remote.js

@@ -548,6 +548,7 @@ qx.Class.define("qx.ui.table.model.Remote", {
      * @param rowIndex {Integer} the index of the row to remove.
      */
     removeRow(rowIndex) {
+      this._checkEditing();
       if (this.getClearCacheOnRemove()) {
         this.clearCache();
 

package/source/class/qx/ui/table/model/Simple.js

@@ -531,6 +531,7 @@ qx.Class.define("qx.ui.table.model.Simple", {
      * @param clearSorting {Boolean ? true} Whether to clear the sort state.
      */
     setData(rowArr, clearSorting) {
+      this._checkEditing();
       this._rowArr = rowArr;
 
       // Inform the listeners
@@ -650,6 +651,7 @@ qx.Class.define("qx.ui.table.model.Simple", {
      * @param clearSorting {Boolean ? true} Whether to clear the sort state.
      */
     setRows(rowArr, startIndex, clearSorting) {
+      this._checkEditing();
       if (startIndex == null) {
         startIndex = 0;
       }
@@ -708,6 +710,7 @@ qx.Class.define("qx.ui.table.model.Simple", {
      * @param clearSorting {Boolean ? true} Whether to clear the sort state.
      */
     removeRows(startIndex, howMany, clearSorting) {
+      this._checkEditing();
       // In the case of `removeRows`, specifically, we must create the
       // listeners' event data before actually removing the rows from
       // the row data, so that the `lastRow` calculation is correct.

package/source/class/qx/ui/table/pane/Scroller.js

@@ -1852,18 +1852,14 @@ qx.Class.define("qx.ui.table.pane.Scroller", {
         } else {
           // prevent tap event from bubbling up to the table
           this.__focusIndicatorPointerDownListener =
-            this.__focusIndicator.addListener(
-              "pointerdown",
-              function (e) {
-                this.__lastPointerDownCell = {
-                  row: this.__focusedRow,
-                  col: this.__focusedCol
-                };
-
-                e.stopPropagation();
-              },
-              this
-            );
+            this.__focusIndicator.addListener("pointerdown", e => {
+              this.__lastPointerDownCell = {
+                row: this.__focusedRow,
+                col: this.__focusedCol
+              };
+
+              e.stopPropagation();
+            });
 
           this._updateFocusIndicator(true);
           this.__focusIndicator.add(this._cellEditor);

package/source/class/qx/ui/toolbar/FileSelectorButton.js

@@ -0,0 +1,57 @@
+/* ************************************************************************
+
+   qooxdoo
+
+   https://qooxdoo.org
+
+   Copyright:
+     2022 OETIKER+PARTNER AG
+
+   License:
+     MIT: https://opensource.org/licenses/MIT
+     See the LICENSE file in the project's top-level directory for details.
+
+   Authors:
+     * Tobias Oetiker (oetiker)
+
+************************************************************************ */
+
+/**
+ * A toolbar-aware version of the {@link qx.ui.form.FileSelectorButton}.
+ */
+
+qx.Class.define("qx.ui.toolbar.FileSelectorButton", {
+  extend: qx.ui.form.FileSelectorButton,
+  construct: function (label, icon, command) {
+    this.base(arguments, label, icon, command);
+    // Toolbar buttons should not support the keyboard events
+    this.removeListener("keydown", this._onKeyDown);
+    this.removeListener("keyup", this._onKeyUp);
+  },
+  properties: {
+    appearance: {
+      refine: true,
+      init: "toolbar-button"
+    },
+    show: {
+      refine: true,
+      init: "inherit"
+    },
+    focusable: {
+      refine: true,
+      init: false
+    }
+  },
+
+  members: {
+    // overridden
+    _applyVisibility: function (value, old) {
+      this.base(arguments, value, old);
+      // trigger a appearance recalculation of the parent
+      let parent = this.getLayoutParent();
+      if (parent && parent instanceof qx.ui.toolbar.PartContainer) {
+        qx.ui.core.queue.Appearance.add(parent);
+      }
+    }
+  }
+});

package/source/class/qx/ui/toolbar/Part.js

@@ -105,13 +105,9 @@ qx.Class.define("qx.ui.toolbar.Part", {
           control = new qx.ui.toolbar.PartContainer();
           control.addListener("syncAppearance", this.__onSyncAppearance, this);
           this._add(control);
-          control.addListener(
-            "changeChildren",
-            function () {
-              this.__onSyncAppearance();
-            },
-            this
-          );
+          control.addListener("changeChildren", () => {
+            this.__onSyncAppearance();
+          });
 
           break;
       }

package/source/class/qx/ui/tree/VirtualTree.js

@@ -526,15 +526,11 @@ qx.Class.define("qx.ui.tree.VirtualTree", {
       this._layer = this._provider.createLayer();
       this._layer.addListener("updated", this._onUpdated, this);
       this.getPane().addLayer(this._layer);
-      this.getPane().addListenerOnce(
-        "resize",
-        function (e) {
-          // apply width to pane on first rendering pass
-          // to avoid visible flickering
-          this.getPane().getColumnConfig().setItemSize(0, e.getData().width);
-        },
-        this
-      );
+      this.getPane().addListenerOnce("resize", e => {
+        // apply width to pane on first rendering pass
+        // to avoid visible flickering
+        this.getPane().getColumnConfig().setItemSize(0, e.getData().width);
+      });
     },
 
     // Interface implementation

package/source/class/qx/ui/treevirtual/MNode.js

@@ -165,7 +165,33 @@ qx.Mixin.define("qx.ui.treevirtual.MNode", {
     },
 
     /**
-     * Set the opened state for a node.  (Note that this method has no effect
+     * Opens all nodes in the tree with minimal redraw
+     */
+    nodeOpenAll() {
+      var model = this.getTableModel();
+      model.getData().forEach(node => {
+        if (node) {
+          model.setState(node.nodeId, { bOpened: true }, true);
+        }
+      });
+      model.setData();
+    },
+
+    /**
+     * Closes all nodes in the tree with minimal redraw
+     */
+    nodeCloseAll() {
+      var model = this.getTableModel();
+      model.getData().forEach(node => {
+        if (node) {
+          model.setState(node.nodeId, { bOpened: false }, true);
+        }
+      });
+      model.setData();
+    },
+
+    /**
+     * Internal call to set the opened state for a node. (Note that this method has no effect
      * if the requested state is the same as the current state.)
      *
      * @param nodeReference {Object | Integer}
@@ -173,11 +199,16 @@ qx.Mixin.define("qx.ui.treevirtual.MNode", {
      *   represented either by the node object, or the node id (as would have
      *   been returned by addBranch(), addLeaf(), etc.)
      *
-     * @param b {Boolean}
+     * @param opened {Boolean}
      *   The new opened state for the specified node.
      *
+     * @param cascade {Boolean}
+     *   Whether to descend the tree changing opened state of all children
+     *
+     * @param isRecursed {Boolean?}
+     *   For internal use when cascading to determine outer level and call setData
      */
-    nodeSetOpened(nodeReference, b) {
+    _nodeSetOpenedInternal(nodeReference, opened, cascade, isRecursed) {
       var node;
 
       if (typeof nodeReference == "object") {
@@ -190,10 +221,36 @@ qx.Mixin.define("qx.ui.treevirtual.MNode", {
 
       // Only set new state if not already in the requested state, since
       // setting new state involves dispatching events.
-      if (b != node.bOpened) {
-        this.nodeToggleOpened(node);
+      if (opened != node.bOpened) {
+        this.getTableModel().setState(node.nodeId, { bOpened: opened }, true);
+      }
+      if (cascade) {
+        node.children.forEach(child =>
+          this.nodeSetOpened(child, opened, cascade, true)
+        );
+      }
+      if (!cascade || !isRecursed) {
+        this.getTableModel().setData();
       }
     },
+    /**
+     * Set the opened state for a node.  (Note that this method has no effect
+     * if the requested state is the same as the current state.)
+     *
+     * @param nodeReference {Object | Integer}
+     *   The node for which the opened state is being set.  The node can be
+     *   represented either by the node object, or the node id (as would have
+     *   been returned by addBranch(), addLeaf(), etc.)
+     *
+     * @param opened {Boolean}
+     *   The new opened state for the specified node.
+     *
+     * @param cascade {Boolean}
+     *   Whether to descend the tree changing opened state of all children
+     */
+    nodeSetOpened(nodeReference, opened, cascade) {
+      this._nodeSetOpenedInternal(nodeReference, opened, cascade, false);
+    },
 
     /**
      * Get the opened state for a node.

package/source/class/qx/ui/treevirtual/SimpleTreeDataModel.js

@@ -795,7 +795,7 @@ qx.Class.define("qx.ui.treevirtual.SimpleTreeDataModel", {
      * Sets the whole data en bulk, or notifies the data model that node
      * modifications are complete.
      *
-     * @param nodeArr {Array | null}
+     * @param nodeArr {Array?null}
      *   Pass either an Array of node objects, or null.
      *
      *   If non-null, nodeArr is an array of node objects containing the
@@ -813,6 +813,7 @@ qx.Class.define("qx.ui.treevirtual.SimpleTreeDataModel", {
      * @throws {Error} If the parameter has the wrong type.
      */
     setData(nodeArr) {
+      this._checkEditing();
       if (nodeArr instanceof Array) {
         // Save the user-supplied data.
         this._nodeArr = nodeArr;
@@ -853,6 +854,7 @@ qx.Class.define("qx.ui.treevirtual.SimpleTreeDataModel", {
      *
      */
     clearData() {
+      this._checkEditing();
       this._clearSelections();
       this.setData([qx.ui.treevirtual.MTreePrimitive._getEmptyTree()]);
     },
@@ -907,9 +909,13 @@ qx.Class.define("qx.ui.treevirtual.SimpleTreeDataModel", {
      *   {@link SimpleTreeDataModel}.  Each property value will be assigned
      *   to the corresponding property of the node specified by nodeId.
      *
+     * @param suppressRedraw {Boolean}
+     *    If true then prevents redraw; it becomes the caller's responsibility to
+     *    call setData() subsequently, to cause a redraw.
+     *
      * @throws {Error} If the node object or id is not valid.
      */
-    setState(nodeReference, attributes) {
+    setState(nodeReference, attributes, suppressRedraw) {
       var node;
       var nodeId;
 
@@ -1003,7 +1009,9 @@ qx.Class.define("qx.ui.treevirtual.SimpleTreeDataModel", {
 
             // Re-render the row data since formerly visible rows may now be
             // invisible, or vice versa.
-            this.setData();
+            if (!suppressRedraw) {
+              this.setData();
+            }
             break;
 
           default:

package/source/class/qx/ui/treevirtual/TreeVirtual.js

@@ -170,13 +170,9 @@ qx.Class.define("qx.ui.treevirtual.TreeVirtual", {
     super(custom.dataModel, custom);
 
     // Arrange to redisplay edited data following editing
-    this.addListener(
-      "dataEdited",
-      function (e) {
-        this.getDataModel().setData();
-      },
-      this
-    );
+    this.addListener("dataEdited", e => {
+      this.getDataModel().setData();
+    });
 
     // By default, present the column visibility button only if there are
     // multiple columns.