cx 24.4.1 → 24.4.2

package/src/ui/adapter/TreeAdapter.js

@@ -1,100 +1,100 @@
-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;
+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;

package/src/ui/adapter/TreeAdapter.spec.js

@@ -1,67 +1,67 @@
-import { RenderingContext } from '../RenderingContext';
-import { Instance } from '../Instance';
-import { TreeAdapter } from './TreeAdapter';
-import assert from "assert";
-import { Store } from '../../data';
-
-describe('TreeAdapter', () => {
-
-   it('properly expands records', () => {
-
-      let tree = new TreeAdapter({
-         childrenField: 'children',
-         expandedField: 'expanded'
-      });
-
-      let data = [{
-         id: 1,
-         text: '1',
-         expanded: false,
-         children: [{
-            id: 4,
-            text: '4'
-         }]
-      }, {
-         id: 2,
-         text: '2',
-         expanded: true,
-         children: [{
-            id: 3,
-            text: '3',
-            expanded: true,
-            children: [{
-               id: 5,
-               text: '5',
-               expanded: true,
-               children: [{
-                  id: 6,
-                  text: '6',
-               }]
-            }]
-         }]
-      }, {
-         id: 7,
-         text: '7',
-         expanded: false
-      }]
-
-      let store = new Store();
-
-      let records = tree.mapRecords(new RenderingContext(), new Instance(null, 1, null, store), data, store, null);
-
-      assert.equal(records.length, 6);
-      assert.equal(records[0].data.id, 1);
-      assert.equal(records[1].data.id, 2);
-      assert.equal(records[2].data.id, 3);
-      assert.equal(records[3].data.id, 5);
-      assert.equal(records[4].data.id, 6);
-      assert.equal(records[5].data.id, 7);
-      assert.equal(records[5].store.get('$record.id'), 7);
-      assert.equal(records[2].store.get('$record.id'), 3);
-      assert.equal(records[3].store.get('$record.id'), 5);
-      assert.equal(records[2].store.get('$record.id'), 3);
-      assert.equal(records[0].store.get('$record.id'), 1);
-      assert.equal(records[1].store.get('$record.id'), 2);
-   });
-});
-
+import { RenderingContext } from '../RenderingContext';
+import { Instance } from '../Instance';
+import { TreeAdapter } from './TreeAdapter';
+import assert from "assert";
+import { Store } from '../../data';
+
+describe('TreeAdapter', () => {
+
+   it('properly expands records', () => {
+
+      let tree = new TreeAdapter({
+         childrenField: 'children',
+         expandedField: 'expanded'
+      });
+
+      let data = [{
+         id: 1,
+         text: '1',
+         expanded: false,
+         children: [{
+            id: 4,
+            text: '4'
+         }]
+      }, {
+         id: 2,
+         text: '2',
+         expanded: true,
+         children: [{
+            id: 3,
+            text: '3',
+            expanded: true,
+            children: [{
+               id: 5,
+               text: '5',
+               expanded: true,
+               children: [{
+                  id: 6,
+                  text: '6',
+               }]
+            }]
+         }]
+      }, {
+         id: 7,
+         text: '7',
+         expanded: false
+      }]
+
+      let store = new Store();
+
+      let records = tree.mapRecords(new RenderingContext(), new Instance(null, 1, null, store), data, store, null);
+
+      assert.equal(records.length, 6);
+      assert.equal(records[0].data.id, 1);
+      assert.equal(records[1].data.id, 2);
+      assert.equal(records[2].data.id, 3);
+      assert.equal(records[3].data.id, 5);
+      assert.equal(records[4].data.id, 6);
+      assert.equal(records[5].data.id, 7);
+      assert.equal(records[5].store.get('$record.id'), 7);
+      assert.equal(records[2].store.get('$record.id'), 3);
+      assert.equal(records[3].store.get('$record.id'), 5);
+      assert.equal(records[2].store.get('$record.id'), 3);
+      assert.equal(records[0].store.get('$record.id'), 1);
+      assert.equal(records[1].store.get('$record.id'), 2);
+   });
+});
+

package/src/ui/adapter/index.d.ts

@@ -1,4 +1,4 @@
-export * from './DataAdapter';
-export * from './ArrayAdapter';
-export * from './GroupAdapter';
-export * from './TreeAdapter';
+export * from './DataAdapter';
+export * from './ArrayAdapter';
+export * from './GroupAdapter';
+export * from './TreeAdapter';

package/src/ui/adapter/index.js

@@ -1,4 +1,4 @@
-export * from './DataAdapter';
-export * from './ArrayAdapter';
-export * from './GroupAdapter';
-export * from './TreeAdapter';
+export * from './DataAdapter';
+export * from './ArrayAdapter';
+export * from './GroupAdapter';
+export * from './TreeAdapter';

package/src/ui/app/History.d.ts

@@ -1,17 +1,17 @@
-import { View } from "./../../data/View";
-
-export class History {
-   static connect(store: View, urlBinding: string, hashBinding?: string);
-
-   static pushState(state, title, url: string);
-
-   static replaceState(state, title, url: string);
-
-   static subscribe(callback: (url?: string, op?: "pushState" | "replaceState") => void): () => void;
-
-   static reloadOnNextChange();
-
-   static addNavigateConfirmation(callback: (url?: string) => boolean | Promise<boolean>, executeOnlyOnce?: boolean);
-
-   static confirm(continueCallback: () => void, state: any);
-}
+import { View } from "./../../data/View";
+
+export class History {
+   static connect(store: View, urlBinding: string, hashBinding?: string);
+
+   static pushState(state, title, url: string);
+
+   static replaceState(state, title, url: string);
+
+   static subscribe(callback: (url?: string, op?: "pushState" | "replaceState") => void): () => void;
+
+   static reloadOnNextChange();
+
+   static addNavigateConfirmation(callback: (url?: string) => boolean | Promise<boolean>, executeOnlyOnce?: boolean);
+
+   static confirm(continueCallback: () => void, state: any);
+}

package/src/ui/app/History.js

@@ -1,114 +1,114 @@
-import { Url } from "./Url";
-import { batchUpdatesAndNotify } from "../batchUpdates";
-import { SubscriberList } from "../../util/SubscriberList";
-
-let last = 0,
-   next = 1,
-   transitions = {},
-   subscribers = null,
-   reload = false,
-   navigateConfirmationCallback = null,
-   permanentNavigateConfirmation = false;
-
-export class History {
-   static connect(store, urlBinding, hashBinding) {
-      this.store = store;
-      this.urlBinding = urlBinding;
-      this.hashBinding = hashBinding;
-      this.updateStore();
-      window.onpopstate = () => {
-         this.updateStore();
-      };
-   }
-
-   static pushState(state, title, url) {
-      return this.confirmAndNavigate(state, title, url);
-   }
-
-   static replaceState(state, title, url) {
-      return this.navigate(state, title, url, true);
-   }
-
-   static reloadOnNextChange() {
-      reload = true;
-   }
-
-   static addNavigateConfirmation(callback, permanent = false) {
-      navigateConfirmationCallback = callback;
-      permanentNavigateConfirmation = permanent;
-   }
-
-   static confirm(continueCallback, state) {
-      if (!navigateConfirmationCallback) return continueCallback();
-
-      let result = navigateConfirmationCallback(state);
-      Promise.resolve(result).then((value) => {
-         if (value) {
-            if (!permanentNavigateConfirmation) navigateConfirmationCallback = null;
-            continueCallback();
-         }
-      });
-
-      return false;
-   }
-
-   static confirmAndNavigate(state, title, url, replace) {
-      return this.confirm(() => this.navigate(state, title, url, replace), url);
-   }
-
-   static navigate(state, title, url, replace = false) {
-      url = Url.resolve(url);
-
-      if (!window.history.pushState || reload) {
-         window.location[replace ? "replace" : "assign"](url);
-         return true;
-      }
-
-      let transition,
-         changed = false;
-      batchUpdatesAndNotify(
-         () => {
-            changed = this.updateStore(url);
-            if (changed)
-               transitions[++last] = transition = {
-                  url,
-                  state,
-                  title,
-                  replace,
-               };
-         },
-         () => {
-            if (transition) transition.completed = true;
-
-            //update history once the page is rendered and the title is set
-            while (transitions[next] && transitions[next].completed) {
-               let tr = transitions[next];
-               delete transitions[next];
-               next++;
-               let op = tr.replace ? "replaceState" : "pushState";
-               window.history[op](tr.state, tr.title, tr.url);
-               if (subscribers) subscribers.notify(tr.url, op);
-            }
-         }
-      );
-
-      return changed;
-   }
-
-   static updateStore(href) {
-      let url = Url.unresolve(href || document.location.href),
-         hash = null;
-      let hashIndex = url.indexOf("#");
-      if (hashIndex !== -1) {
-         hash = url.substring(hashIndex);
-         url = url.substring(0, hashIndex);
-      }
-      if (this.hashBinding) this.store.set(this.hashBinding, hash);
-      return this.store.set(this.urlBinding, url);
-   }
-
-   static subscribe(callback) {
-      if (!subscribers) subscribers = new SubscriberList();
-      return subscribers.subscribe(callback);
-   }
-}
+import { Url } from "./Url";
+import { batchUpdatesAndNotify } from "../batchUpdates";
+import { SubscriberList } from "../../util/SubscriberList";
+
+let last = 0,
+   next = 1,
+   transitions = {},
+   subscribers = null,
+   reload = false,
+   navigateConfirmationCallback = null,
+   permanentNavigateConfirmation = false;
+
+export class History {
+   static connect(store, urlBinding, hashBinding) {
+      this.store = store;
+      this.urlBinding = urlBinding;
+      this.hashBinding = hashBinding;
+      this.updateStore();
+      window.onpopstate = () => {
+         this.updateStore();
+      };
+   }
+
+   static pushState(state, title, url) {
+      return this.confirmAndNavigate(state, title, url);
+   }
+
+   static replaceState(state, title, url) {
+      return this.navigate(state, title, url, true);
+   }
+
+   static reloadOnNextChange() {
+      reload = true;
+   }
+
+   static addNavigateConfirmation(callback, permanent = false) {
+      navigateConfirmationCallback = callback;
+      permanentNavigateConfirmation = permanent;
+   }
+
+   static confirm(continueCallback, state) {
+      if (!navigateConfirmationCallback) return continueCallback();
+
+      let result = navigateConfirmationCallback(state);
+      Promise.resolve(result).then((value) => {
+         if (value) {
+            if (!permanentNavigateConfirmation) navigateConfirmationCallback = null;
+            continueCallback();
+         }
+      });
+
+      return false;
+   }
+
+   static confirmAndNavigate(state, title, url, replace) {
+      return this.confirm(() => this.navigate(state, title, url, replace), url);
+   }
+
+   static navigate(state, title, url, replace = false) {
+      url = Url.resolve(url);
+
+      if (!window.history.pushState || reload) {
+         window.location[replace ? "replace" : "assign"](url);
+         return true;
+      }
+
+      let transition,
+         changed = false;
+      batchUpdatesAndNotify(
+         () => {
+            changed = this.updateStore(url);
+            if (changed)
+               transitions[++last] = transition = {
+                  url,
+                  state,
+                  title,
+                  replace,
+               };
+         },
+         () => {
+            if (transition) transition.completed = true;
+
+            //update history once the page is rendered and the title is set
+            while (transitions[next] && transitions[next].completed) {
+               let tr = transitions[next];
+               delete transitions[next];
+               next++;
+               let op = tr.replace ? "replaceState" : "pushState";
+               window.history[op](tr.state, tr.title, tr.url);
+               if (subscribers) subscribers.notify(tr.url, op);
+            }
+         }
+      );
+
+      return changed;
+   }
+
+   static updateStore(href) {
+      let url = Url.unresolve(href || document.location.href),
+         hash = null;
+      let hashIndex = url.indexOf("#");
+      if (hashIndex !== -1) {
+         hash = url.substring(hashIndex);
+         url = url.substring(0, hashIndex);
+      }
+      if (this.hashBinding) this.store.set(this.hashBinding, hash);
+      return this.store.set(this.urlBinding, url);
+   }
+
+   static subscribe(callback) {
+      if (!subscribers) subscribers = new SubscriberList();
+      return subscribers.subscribe(callback);
+   }
+}

package/src/ui/app/Url.d.ts

@@ -1,21 +1,21 @@
-import * as Cx from "../../core";
-
-export class Url {
-   static resolve(path: string): string;
-
-   static absolute(path: string): string;
-
-   static unresolve(path: string): string;
-
-   static getAbsoluteBase(): string;
-
-   static isLocal(url: string): boolean;
-
-   static setBase(base: string): void;
-
-   static getOrigin(): string;
-
-   static getBaseFromScriptSrc(src: string, scriptPath: string): string;
-
-   static setBaseFromScript(scriptPath: string | RegeExp);
-}
+import * as Cx from "../../core";
+
+export class Url {
+   static resolve(path: string): string;
+
+   static absolute(path: string): string;
+
+   static unresolve(path: string): string;
+
+   static getAbsoluteBase(): string;
+
+   static isLocal(url: string): boolean;
+
+   static setBase(base: string): void;
+
+   static getOrigin(): string;
+
+   static getBaseFromScriptSrc(src: string, scriptPath: string): string;
+
+   static setBaseFromScript(scriptPath: string | RegeExp);
+}