cx 25.5.0 → 25.5.2

package/src/ui/adapter/TreeAdapter.js

@@ -1,101 +1,101 @@
-import { getAccessor } from "../../data/getAccessor";
-import { isArray } from "../../util/isArray";
-import { ArrayAdapter } from "./ArrayAdapter";
-
-export class TreeAdapter extends ArrayAdapter {
-   init() {
-      super.init();
-      this.childrenAccessor = getAccessor({ bind: `${this.recordName}.${this.childrenField}` });
-
-      if (this.restoreExpandedNodesOnLoad) {
-         if (!this.keyField)
-            throw new Error(
-               "Stateful tree adapter requires keyField property to be specified on either Grid or data adapter.",
-            );
-
-         this.expandedState = {
-            next: new Set(),
-         };
-      }
-   }
-
-   mapRecords(context, instance, data, parentStore, recordsAccessor) {
-      let nodes = super.mapRecords(context, instance, data, parentStore, recordsAccessor);
-      let result = [];
-
-      if (this.restoreExpandedNodesOnLoad) {
-         this.expandedState = {
-            current: this.expandedState.next,
-            next: new Set(),
-         };
-      }
-
-      this.processList(context, instance, 0, "", nodes, result);
-
-      return result;
-   }
-
-   processList(context, instance, level, parentKey, nodes, result) {
-      nodes.forEach((record) => {
-         record.key = parentKey + record.key;
-         this.processNode(context, instance, level, result, record);
-      });
-   }
-
-   processNode(context, instance, level, result, record) {
-      let isHiddenRootNode = level == 0 && this.hideRootNodes;
-      if (!isHiddenRootNode) result.push(record);
-      let { data, store } = record;
-      data.$level = this.hideRootNodes ? level - 1 : level;
-      if (!data[this.leafField]) {
-         if (this.restoreExpandedNodesOnLoad && data[this.expandedField] == null)
-            data[this.expandedField] = this.expandedState.current.has(data[this.keyField]);
-
-         if (data[this.expandedField] || isHiddenRootNode) {
-            if (this.restoreExpandedNodesOnLoad) this.expandedState.next.add(data[this.keyField]);
-
-            if (data[this.childrenField]) {
-               let childNodes = super.mapRecords(
-                  context,
-                  instance,
-                  data[this.childrenField],
-                  store,
-                  this.childrenAccessor,
-               );
-               this.processList(context, instance, level + 1, record.key + ":", childNodes, result);
-            } else if (this.load && !data[this.loadedField] && !data[this.loadingField]) {
-               store.set(`${this.recordName}.${this.loadingField}`, true);
-               let response = this.load(context, instance, data);
-               Promise.resolve(response)
-                  .then((children) => {
-                     store.set(`${this.recordName}.${this.childrenField}`, children);
-                     store.set(`${this.recordName}.${this.loadedField}`, true);
-                     store.set(`${this.recordName}.${this.loadingField}`, false);
-                  })
-                  .catch((response) => {
-                     store.set(`${this.recordName}.${this.loadingField}`, false);
-                     if (this.onLoadError) this.onLoadError(response);
-                  });
-            }
-         } else data[this.expandedField] = false;
-      }
-   }
-
-   sort(sorters) {
-      if (this.foldersFirst) {
-         if (!sorters || !isArray(sorters)) sorters = [];
-         sorters = [{ field: this.leafField, direction: "ASC" }, ...sorters];
-      }
-      super.sort(sorters);
-   }
-}
-
-TreeAdapter.prototype.childrenField = "$children";
-TreeAdapter.prototype.expandedField = "$expanded";
-TreeAdapter.prototype.leafField = "$leaf";
-TreeAdapter.prototype.loadingField = "$loading";
-TreeAdapter.prototype.loadedField = "$loaded";
-TreeAdapter.prototype.foldersFirst = true;
-TreeAdapter.prototype.isTreeAdapter = true;
-TreeAdapter.prototype.hideRootNodes = false;
-TreeAdapter.prototype.cacheByKeyField = false;
+import { getAccessor } from "../../data/getAccessor";
+import { isArray } from "../../util/isArray";
+import { ArrayAdapter } from "./ArrayAdapter";
+
+export class TreeAdapter extends ArrayAdapter {
+   init() {
+      super.init();
+      this.childrenAccessor = getAccessor({ bind: `${this.recordName}.${this.childrenField}` });
+
+      if (this.restoreExpandedNodesOnLoad) {
+         if (!this.keyField)
+            throw new Error(
+               "Stateful tree adapter requires keyField property to be specified on either Grid or data adapter.",
+            );
+
+         this.expandedState = {
+            next: new Set(),
+         };
+      }
+   }
+
+   mapRecords(context, instance, data, parentStore, recordsAccessor) {
+      let nodes = super.mapRecords(context, instance, data, parentStore, recordsAccessor);
+      let result = [];
+
+      if (this.restoreExpandedNodesOnLoad) {
+         this.expandedState = {
+            current: this.expandedState.next,
+            next: new Set(),
+         };
+      }
+
+      this.processList(context, instance, 0, "", nodes, result);
+
+      return result;
+   }
+
+   processList(context, instance, level, parentKey, nodes, result) {
+      nodes.forEach((record) => {
+         record.key = parentKey + record.key;
+         this.processNode(context, instance, level, result, record);
+      });
+   }
+
+   processNode(context, instance, level, result, record) {
+      let isHiddenRootNode = level == 0 && this.hideRootNodes;
+      if (!isHiddenRootNode) result.push(record);
+      let { data, store } = record;
+      data.$level = this.hideRootNodes ? level - 1 : level;
+      if (!data[this.leafField]) {
+         if (this.restoreExpandedNodesOnLoad && data[this.expandedField] == null)
+            data[this.expandedField] = this.expandedState.current.has(data[this.keyField]);
+
+         if (data[this.expandedField] || isHiddenRootNode) {
+            if (this.restoreExpandedNodesOnLoad) this.expandedState.next.add(data[this.keyField]);
+
+            if (data[this.childrenField]) {
+               let childNodes = super.mapRecords(
+                  context,
+                  instance,
+                  data[this.childrenField],
+                  store,
+                  this.childrenAccessor,
+               );
+               this.processList(context, instance, level + 1, record.key + ":", childNodes, result);
+            } else if (this.load && !data[this.loadedField] && !data[this.loadingField]) {
+               store.set(`${this.recordName}.${this.loadingField}`, true);
+               let response = this.load(context, instance, data);
+               Promise.resolve(response)
+                  .then((children) => {
+                     store.set(`${this.recordName}.${this.childrenField}`, children);
+                     store.set(`${this.recordName}.${this.loadedField}`, true);
+                     store.set(`${this.recordName}.${this.loadingField}`, false);
+                  })
+                  .catch((response) => {
+                     store.set(`${this.recordName}.${this.loadingField}`, false);
+                     if (this.onLoadError) this.onLoadError(response);
+                  });
+            }
+         } else data[this.expandedField] = false;
+      }
+   }
+
+   sort(sorters) {
+      if (this.foldersFirst) {
+         if (!sorters || !isArray(sorters)) sorters = [];
+         sorters = [{ field: this.leafField, direction: "ASC" }, ...sorters];
+      }
+      super.sort(sorters);
+   }
+}
+
+TreeAdapter.prototype.childrenField = "$children";
+TreeAdapter.prototype.expandedField = "$expanded";
+TreeAdapter.prototype.leafField = "$leaf";
+TreeAdapter.prototype.loadingField = "$loading";
+TreeAdapter.prototype.loadedField = "$loaded";
+TreeAdapter.prototype.foldersFirst = true;
+TreeAdapter.prototype.isTreeAdapter = true;
+TreeAdapter.prototype.hideRootNodes = false;
+TreeAdapter.prototype.cacheByKeyField = false;

package/src/ui/layout/exploreChildren.d.ts

@@ -1,12 +1,12 @@
-import { View } from "../../data/View";
-import { Instance } from "../Instance";
-import { RenderingContext } from "../RenderingContext";
-
-export function exploreChildren(
-   context: RenderingContext,
-   instance: Instance,
-   children: Instance[],
-   previousResult: Instance[],
-   key?: string,
-   store?: View,
-): Instance[];
+import { View } from "../../data/View";
+import { Instance } from "../Instance";
+import { RenderingContext } from "../RenderingContext";
+
+export function exploreChildren(
+   context: RenderingContext,
+   instance: Instance,
+   children: Instance[],
+   previousResult: Instance[],
+   key?: string,
+   store?: View,
+): Instance[];

package/src/ui/layout/exploreChildren.js

@@ -1,27 +1,27 @@
-export function exploreChildren(context, instance, children, previousResult, key, store) {
-   let newChildren = previousResult || [];
-   let oldChildren = previousResult || newChildren;
-   let identical = previousResult ? 0 : -1;
-
-   for (let c = 0; c < children.length; c++) {
-      let cell = instance.getChild(context, children[c], key, store);
-
-      if (cell.checkVisible(context)) {
-         if (identical >= 0) {
-            if (cell == oldChildren[identical]) identical++;
-            else {
-               newChildren = newChildren.slice(0, identical);
-               identical = -1;
-               newChildren.push(cell);
-            }
-         } else newChildren.push(cell);
-
-         context.exploreStack.push(cell);
-         if (cell.needsExploreCleanup) context.exploreStack.push(cell);
-      }
-   }
-
-   if (identical >= 0 && identical != newChildren.length) newChildren = newChildren.slice(0, identical);
-
-   return newChildren;
-}
+export function exploreChildren(context, instance, children, previousResult, key, store) {
+   let newChildren = previousResult || [];
+   let oldChildren = previousResult || newChildren;
+   let identical = previousResult ? 0 : -1;
+
+   for (let c = 0; c < children.length; c++) {
+      let cell = instance.getChild(context, children[c], key, store);
+
+      if (cell.checkVisible(context)) {
+         if (identical >= 0) {
+            if (cell == oldChildren[identical]) identical++;
+            else {
+               newChildren = newChildren.slice(0, identical);
+               identical = -1;
+               newChildren.push(cell);
+            }
+         } else newChildren.push(cell);
+
+         context.exploreStack.push(cell);
+         if (cell.needsExploreCleanup) context.exploreStack.push(cell);
+      }
+   }
+
+   if (identical >= 0 && identical != newChildren.length) newChildren = newChildren.slice(0, identical);
+
+   return newChildren;
+}

package/src/widgets/List.js

@@ -82,7 +82,7 @@ export class List extends Widget {
             emptyText: undefined,
             tabIndex: undefined,
          },
-         ...arguments
+         ...arguments,
       );
    }
 
@@ -112,6 +112,13 @@ export class List extends Widget {
       super.prepareData(context, instance);
    }
 
+   applyParentStore(instance) {
+      super.applyParentStore(instance);
+
+      // force prepareData to execute again and propagate the store change to the records
+      if (instance.cached) delete instance.cached.rawData;
+   }
+
    explore(context, instance, data) {
       let instances = [];
       let isSelected = this.selection.getIsSelectedDelegate(instance.store);
@@ -239,7 +246,7 @@ class ListComponent extends VDOM.Component {
             (event) => {
                instance.invoke("onScroll", event, instance);
             },
-            { passive: true }
+            { passive: true },
          );
       }