no message

qooxdoo · May 23, 2024 · 70e0968 · 70e0968
1 parent 8d7393b
commit 70e0968
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 1 deletion.
diff --git a/source/class/qxl/datagrid/source/ArrayDataSource.js b/source/class/qxl/datagrid/source/ArrayDataSource.js
@@ -113,6 +113,13 @@ qx.Class.define("qxl.datagrid.source.ArrayDataSource", {
       return pos;
     },
 
+    /**
+     * @Override
+     */
+    isModelValid(value) {
+      return this.getModel().indexOf(value) >= 0;
+    },
+
     /**
      * @Override
      */

diff --git a/source/class/qxl/datagrid/source/IDataSource.js b/source/class/qxl/datagrid/source/IDataSource.js
@@ -64,6 +64,14 @@ qx.Interface.define("qxl.datagrid.source.IDataSource", {
      */
     getPositionOfModel(value) {},
 
+    /**
+     * Called to find out if the model is valid within this data source
+     *
+     * @param {*} value
+     * @return {Boolean}
+     */
+    isModelValid(value) {},
+
     /**
      * Returns the size of the datasource
      *

diff --git a/source/class/qxl/datagrid/source/tree/TreeDataSource.js b/source/class/qxl/datagrid/source/tree/TreeDataSource.js
@@ -408,6 +408,13 @@ qx.Class.define("qxl.datagrid.source.tree.TreeDataSource", {
       return null;
     },
 
+    /**
+     * @Override
+     */
+    isModelValid(value) {
+      return !!this.getPositionOfModel(value);
+    },
+
     /**
      * @override
      */

diff --git a/source/class/qxl/datagrid/ui/SelectionManager.js b/source/class/qxl/datagrid/ui/SelectionManager.js
@@ -42,7 +42,8 @@ qx.Class.define("qxl.datagrid.ui.SelectionManager", {
     dataSource: {
       init: null,
       check: "qxl.datagrid.source.IDataSource",
-      event: "changeDataSource"
+      event: "changeDataSource",
+      apply: "_applyDataSource"
     },
 
     /** Whether the user has to select entire rows, or just individual cells */
@@ -85,6 +86,36 @@ qx.Class.define("qxl.datagrid.ui.SelectionManager", {
     /** @type{Array} the oldData for batched notification of selection change */
     __selectionChangeOldData: null,
 
+    /**
+     * Apply for `dataSource` property
+     */
+    _applyDataSource(value, oldValue) {
+      if (oldValue) {
+        oldValue.removeListener("changeSize", this.__onDataSourceChange, this);
+      }
+      if (value) {
+        value.addListener("changeSize", this.__onDataSourceChange, this);
+      }
+    },
+
+    /**
+     * Event handler for changes to the data source's model
+     *
+     * @param {qx.event.type.Data} evt
+     */
+    __onDataSourceChange(evt) {
+      let newSelection = [];
+      let dataSource = this.getDataSource();
+      if (dataSource) {
+        this.__selection.forEach(model => {
+          if (dataSource.isModelValid(model)) {
+            newSelection.push(model);
+          }
+        });
+      }
+      this.__selection.replace(newSelection);
+    },
+
     /**
      * Apply for `selectionStyle`
      */