cx 25.4.1 → 25.5.1

package/src/ui/Repeater.js

@@ -1,102 +1,109 @@
-import { Widget } from "./Widget";
-import { PureContainer } from "./PureContainer";
-import { Container } from "./Container";
-import { ArrayAdapter } from "./adapter/ArrayAdapter";
-import { UseParentLayout } from "./layout/UseParentLayout";
-import { getAccessor } from "../data/getAccessor";
-
-export class Repeater extends Container {
-   declareData() {
-      super.declareData(
-         {
-            records: undefined,
-            sorters: undefined,
-            sortField: undefined,
-            sortDirection: undefined,
-            filterParams: {
-               structured: true,
-            },
-         },
-         ...arguments
-      );
-   }
-
-   init() {
-      this.recordsAccessor = getAccessor(this.records);
-
-      if (this.recordAlias) this.recordName = this.recordAlias;
-
-      if (this.indexAlias) this.indexName = this.indexAlias;
-
-      this.dataAdapter = ArrayAdapter.create({
-         ...this.dataAdapter,
-         recordName: this.recordName,
-         indexName: this.indexName,
-         keyField: this.keyField,
-         immutable: this.immutable,
-         sealed: this.sealed,
-         recordsAccessor: this.recordsAccessor,
-         sortOptions: this.sortOptions,
-      });
-
-      this.item = PureContainer.create({
-         children: this.items || this.children,
-         layout: UseParentLayout,
-      });
-
-      delete this.children;
-      delete this.items;
-
-      super.init();
-   }
-
-   initInstance(context, instance) {
-      this.dataAdapter.initInstance(context, instance);
-   }
-
-   prepareData(context, instance) {
-      let { data } = instance;
-      if (data.sortField)
-         data.sorters = [
-            {
-               field: data.sortField,
-               direction: data.sortDirection || "ASC",
-            },
-         ];
-      this.dataAdapter.sort(data.sorters);
-      let filter = null;
-      if (this.onCreateFilter) filter = instance.invoke("onCreateFilter", data.filterParams, instance);
-      else if (this.filter) filter = (item) => this.filter(item, data.filterParams);
-      this.dataAdapter.setFilter(filter);
-      instance.mappedRecords = this.dataAdapter.getRecords(context, instance, data.records, instance.store);
-
-      if (this.onTrackMappedRecords) {
-         instance.invoke("onTrackMappedRecords", instance.mappedRecords, instance);
-      }
-
-      super.prepareData(context, instance);
-   }
-
-   explore(context, instance, data) {
-      let instances = [];
-      instance.mappedRecords.forEach((record) => {
-         let subInstance = instance.getChild(context, this.item, record.key, record.store);
-         let changed = subInstance.cache("recordData", record.data) || subInstance.cache("key", record.key);
-         subInstance.record = record;
-         if (this.cached && !changed && subInstance.visible && !subInstance.childStateDirty) {
-            instances.push(subInstance);
-            subInstance.shouldUpdate = false;
-         } else if (subInstance.scheduleExploreIfVisible(context)) instances.push(subInstance);
-      });
-      instance.children = instances;
-   }
-}
-
-Repeater.prototype.recordName = "$record";
-Repeater.prototype.indexName = "$index";
-Repeater.prototype.cached = false;
-Repeater.prototype.immutable = false;
-Repeater.prototype.sealed = false;
-Repeater.prototype.isPureContainer = true;
-
-Widget.alias("repeater", Repeater);
+import { Widget } from "./Widget";
+import { PureContainer } from "./PureContainer";
+import { Container } from "./Container";
+import { ArrayAdapter } from "./adapter/ArrayAdapter";
+import { UseParentLayout } from "./layout/UseParentLayout";
+import { getAccessor } from "../data/getAccessor";
+
+export class Repeater extends Container {
+   declareData() {
+      super.declareData(
+         {
+            records: undefined,
+            sorters: undefined,
+            sortField: undefined,
+            sortDirection: undefined,
+            filterParams: {
+               structured: true,
+            },
+         },
+         ...arguments,
+      );
+   }
+
+   init() {
+      this.recordsAccessor = getAccessor(this.records);
+
+      if (this.recordAlias) this.recordName = this.recordAlias;
+
+      if (this.indexAlias) this.indexName = this.indexAlias;
+
+      this.dataAdapter = ArrayAdapter.create({
+         ...this.dataAdapter,
+         recordName: this.recordName,
+         indexName: this.indexName,
+         keyField: this.keyField,
+         immutable: this.immutable,
+         sealed: this.sealed,
+         recordsAccessor: this.recordsAccessor,
+         sortOptions: this.sortOptions,
+      });
+
+      this.item = PureContainer.create({
+         children: this.items || this.children,
+         layout: UseParentLayout,
+      });
+
+      delete this.children;
+      delete this.items;
+
+      super.init();
+   }
+
+   initInstance(context, instance) {
+      this.dataAdapter.initInstance(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;
+   }
+
+   prepareData(context, instance) {
+      let { data } = instance;
+      if (data.sortField)
+         data.sorters = [
+            {
+               field: data.sortField,
+               direction: data.sortDirection || "ASC",
+            },
+         ];
+      this.dataAdapter.sort(data.sorters);
+      let filter = null;
+      if (this.onCreateFilter) filter = instance.invoke("onCreateFilter", data.filterParams, instance);
+      else if (this.filter) filter = (item) => this.filter(item, data.filterParams);
+      this.dataAdapter.setFilter(filter);
+      instance.mappedRecords = this.dataAdapter.getRecords(context, instance, data.records, instance.store);
+
+      if (this.onTrackMappedRecords) {
+         instance.invoke("onTrackMappedRecords", instance.mappedRecords, instance);
+      }
+
+      super.prepareData(context, instance);
+   }
+
+   explore(context, instance, data) {
+      let instances = [];
+      instance.mappedRecords.forEach((record) => {
+         let subInstance = instance.getChild(context, this.item, record.key, record.store);
+         let changed = subInstance.cache("recordData", record.data) || subInstance.cache("key", record.key);
+         subInstance.record = record;
+         if (this.cached && !changed && subInstance.visible && !subInstance.childStateDirty) {
+            instances.push(subInstance);
+            subInstance.shouldUpdate = false;
+         } else if (subInstance.scheduleExploreIfVisible(context)) instances.push(subInstance);
+      });
+      instance.children = instances;
+   }
+}
+
+Repeater.prototype.recordName = "$record";
+Repeater.prototype.indexName = "$index";
+Repeater.prototype.cached = false;
+Repeater.prototype.immutable = false;
+Repeater.prototype.sealed = false;
+Repeater.prototype.isPureContainer = true;
+
+Widget.alias("repeater", Repeater);

package/src/ui/Rescope.js

@@ -1,31 +1,35 @@
-import { Widget } from "./Widget";
-import { PureContainer } from "./PureContainer";
-import { Binding } from "../data/Binding";
-import { ZoomIntoPropertyView } from "../data/ZoomIntoPropertyView";
-import { StructuredInstanceDataAccessor } from "./StructuredInstanceDataAccessor";
-import { isObject } from "../util/isObject";
-
-export class Rescope extends PureContainer {
-   init() {
-      this.binding = Binding.get(this.bind);
-      if (this.rootAlias) this.rootName = this.rootAlias;
-      super.init();
-   }
-
-   initInstance(context, instance) {
-      instance.store = new ZoomIntoPropertyView({
-         store: instance.store,
-         binding: this.binding,
-         rootName: this.rootName,
-         nestedData: isObject(this.data) ? new StructuredInstanceDataAccessor({ instance, data: this.data, useParentStore: true }) : null,
-      });
-      instance.setStore = (store) => {
-         instance.store.setStore(store);
-      };
-   }
-}
-
-Rescope.prototype.bind = "$page";
-Rescope.prototype.rootName = "$root";
-
-Widget.alias("rescope", Rescope);
+import { Widget } from "./Widget";
+import { PureContainer } from "./PureContainer";
+import { Binding } from "../data/Binding";
+import { ZoomIntoPropertyView } from "../data/ZoomIntoPropertyView";
+import { StructuredInstanceDataAccessor } from "./StructuredInstanceDataAccessor";
+import { isObject } from "../util/isObject";
+
+export class Rescope extends PureContainer {
+   init() {
+      this.binding = Binding.get(this.bind);
+      if (this.rootAlias) this.rootName = this.rootAlias;
+      super.init();
+   }
+
+   initInstance(context, instance) {
+      instance.store = new ZoomIntoPropertyView({
+         store: instance.parentStore,
+         binding: this.binding,
+         rootName: this.rootName,
+         nestedData: isObject(this.data)
+            ? new StructuredInstanceDataAccessor({ instance, data: this.data, useParentStore: true })
+            : null,
+      });
+      super.initInstance(context, instance);
+   }
+
+   applyParentStore(instance) {
+      instance.store.setStore(instance.parentStore);
+   }
+}
+
+Rescope.prototype.bind = "$page";
+Rescope.prototype.rootName = "$root";
+
+Widget.alias("rescope", Rescope);

package/src/ui/Restate.js

@@ -1,163 +1,167 @@
-import { PureContainer } from "./PureContainer";
-import { Store } from "../data/Store";
-import { Cx } from "./Cx";
-import { VDOM } from "./VDOM";
-import { isObject } from "../util/isObject";
-import { isUndefined } from "../util/isUndefined";
-import { Binding } from "../data/Binding";
-import { StructuredSelector } from "../data/StructuredSelector";
-import { getCurrentCulture } from "./Culture";
-
-let persistenceCache = {};
-
-export class Restate extends PureContainer {
-   declareData() {
-      return super.declareData(...arguments, {
-         deferredUntilIdle: undefined,
-         idleTimeout: undefined,
-         cacheKey: undefined,
-      });
-   }
-
-   init() {
-      this.container = PureContainer.create({
-         type: PureContainer,
-         items: this.children || this.items,
-         layout: this.layout,
-         controller: this.controller,
-         outerLayout: this.outerLayout,
-         useParentLayout: !this.detached,
-         ws: this.ws,
-      });
-      this.privateDataSelector = new StructuredSelector({
-         props: this.data || {},
-         values: this.data,
-      });
-      delete this.items;
-      delete this.children;
-      delete this.controller;
-      delete this.outerLayout;
-      delete this.layout;
-      if (this.useParentLayout == null) this.useParentLayout = !this.detached;
-      super.init();
-   }
-
-   initSubStore(context, instance) {
-      let { cacheKey } = instance.data;
-      this.privateDataSelector.init(instance.store);
-      instance.subStore = new RestateStore({
-         store: instance.store,
-         detached: this.detached,
-         privateData: this.data || {},
-         data: cacheKey ? persistenceCache[cacheKey] || {} : {},
-         dataSelector: this.privateDataSelector.create(),
-         onSet: (path, value) => instance.nestedDataSet(path, value, this.data),
-      });
-
-      instance.setStore = (store) => {
-         instance.store = store;
-         instance.subStore.setStore(store);
-      };
-
-      if (cacheKey) {
-         instance.subscribeOnDestroy(() => {
-            persistenceCache[cacheKey] = instance.subStore.getData();
-         });
-      }
-   }
-
-   explore(context, instance) {
-      if (!instance.subStore) this.initSubStore(context, instance);
-      if (instance.subStore.parentDataCheck()) instance.markShouldUpdate();
-      instance.cultureInfo = this.culture ?? getCurrentCulture();
-      if (instance.cache("cultureInfo", instance.culture)) instance.markShouldUpdate();
-      super.explore(context, instance);
-   }
-
-   exploreItems(context, instance, items) {
-      if (!this.detached) {
-         instance.container = instance.getChild(context, this.container, "container", instance.subStore);
-         instance.container.scheduleExploreIfVisible(context);
-         instance.children = [instance.container];
-      }
-   }
-
-   render(context, instance, key) {
-      if (!this.detached) return instance.container.render(context);
-
-      return (
-         <Cx
-            key={key}
-            widget={this.container}
-            parentInstance={instance}
-            store={instance.subStore}
-            subscribe
-            options={this.options}
-            onError={this.onError}
-            deferredUntilIdle={instance.data.deferredUntilIdle}
-            idleTimeout={instance.data.idleTimeout}
-            immediate={this.immediate}
-            cultureInfo={instance.cultureInfo}
-         />
-      );
-   }
-}
-
-Restate.prototype.detached = false;
-Restate.prototype.waitForIdle = false;
-Restate.prototype.immediate = false;
-Restate.prototype.culture = null;
-
-export const PrivateStore = Restate;
-
-class RestateStore extends Store {
-   constructor(config) {
-      super(config);
-      this.parentDataVersion = -1;
-   }
-
-   getData() {
-      this.silently(() => {
-         this.parentDataCheck();
-      });
-      return super.getData();
-   }
-
-   parentDataCheck() {
-      if (this.parentDataVersion == this.store.meta.version) return false;
-      this.parentDataVersion = this.store.meta.version;
-      this.parentData = this.dataSelector(this.store.getData());
-      return this.batch(() => {
-         for (let key in this.parentData) {
-            super.setItem(key, this.parentData[key]);
-         }
-      });
-   }
-
-   setItem(path, value) {
-      let binding = Binding.get(path);
-      let bindingRoot = binding.parts[0];
-      if (!isObject(this.privateData) || !this.privateData.hasOwnProperty(bindingRoot)) {
-         let changed = isUndefined(value) ? super.deleteItem(path) : super.setItem(path, value);
-         return changed;
-      }
-
-      let newValue = value;
-      if (binding.parts.length > 1) newValue = binding.set(this.getData(), value)[bindingRoot];
-      this.onSet(bindingRoot, newValue);
-      this.batch(() => {
-         super.setItem(bindingRoot, newValue);
-         this.parentDataCheck();
-      });
-      return true;
-   }
-
-   deleteItem(path) {
-      return this.setItem(path, undefined);
-   }
-
-   doNotify() {
-      if (!this.detached) this.store.notify();
-      super.doNotify();
-   }
-}
+import { PureContainer } from "./PureContainer";
+import { Store } from "../data/Store";
+import { Cx } from "./Cx";
+import { VDOM } from "./VDOM";
+import { isObject } from "../util/isObject";
+import { isUndefined } from "../util/isUndefined";
+import { Binding } from "../data/Binding";
+import { StructuredSelector } from "../data/StructuredSelector";
+import { getCurrentCulture } from "./Culture";
+
+let persistenceCache = {};
+
+export class Restate extends PureContainer {
+   declareData() {
+      return super.declareData(...arguments, {
+         deferredUntilIdle: undefined,
+         idleTimeout: undefined,
+         cacheKey: undefined,
+      });
+   }
+
+   init() {
+      this.container = PureContainer.create({
+         type: PureContainer,
+         items: this.children || this.items,
+         layout: this.layout,
+         controller: this.controller,
+         outerLayout: this.outerLayout,
+         useParentLayout: !this.detached,
+         ws: this.ws,
+      });
+      this.privateDataSelector = new StructuredSelector({
+         props: this.data || {},
+         values: this.data,
+      });
+      delete this.items;
+      delete this.children;
+      delete this.controller;
+      delete this.outerLayout;
+      delete this.layout;
+      if (this.useParentLayout == null) this.useParentLayout = !this.detached;
+      super.init();
+   }
+
+   initSubStore(context, instance) {
+      let { cacheKey } = instance.data;
+      this.privateDataSelector.init(instance.store);
+      instance.subStore = new RestateStore({
+         store: instance.store,
+         detached: this.detached,
+         privateData: this.data || {},
+         data: cacheKey ? persistenceCache[cacheKey] || {} : {},
+         dataSelector: this.privateDataSelector.create(),
+         onSet: (path, value) => instance.nestedDataSet(path, value, this.data),
+      });
+
+      if (cacheKey) {
+         instance.subscribeOnDestroy(() => {
+            persistenceCache[cacheKey] = instance.subStore.getData();
+         });
+      }
+   }
+
+   applyParentStore(instance) {
+      if (instance.subStore) instance.subStore.setStore(instance.parentStore);
+   }
+
+   explore(context, instance) {
+      if (!instance.subStore) this.initSubStore(context, instance);
+      if (instance.subStore.parentDataCheck()) instance.markShouldUpdate();
+      instance.cultureInfo = this.culture ?? getCurrentCulture();
+      if (instance.cache("cultureInfo", instance.culture)) instance.markShouldUpdate();
+      super.explore(context, instance);
+   }
+
+   exploreItems(context, instance, items) {
+      if (!this.detached) {
+         instance.container = instance.getChild(context, this.container, "container", instance.subStore);
+         instance.container.scheduleExploreIfVisible(context);
+         instance.children = [instance.container];
+      }
+   }
+
+   render(context, instance, key) {
+      if (!this.detached) return instance.container.render(context);
+
+      return (
+         <Cx
+            key={key}
+            widget={this.container}
+            parentInstance={instance}
+            store={instance.subStore}
+            subscribe
+            options={this.options}
+            onError={this.onError}
+            deferredUntilIdle={instance.data.deferredUntilIdle}
+            idleTimeout={instance.data.idleTimeout}
+            immediate={this.immediate}
+            cultureInfo={instance.cultureInfo}
+         />
+      );
+   }
+}
+
+Restate.prototype.detached = false;
+Restate.prototype.waitForIdle = false;
+Restate.prototype.immediate = false;
+Restate.prototype.culture = null;
+
+export const PrivateStore = Restate;
+
+class RestateStore extends Store {
+   constructor(config) {
+      super(config);
+      this.parentDataVersion = -1;
+   }
+
+   getData() {
+      this.silently(() => {
+         this.parentDataCheck();
+      });
+      return super.getData();
+   }
+
+   parentDataCheck() {
+      if (this.parentDataVersion == this.store.meta.version) return false;
+      this.parentDataVersion = this.store.meta.version;
+      this.parentData = this.dataSelector(this.store.getData());
+      return this.batch(() => {
+         for (let key in this.parentData) {
+            super.setItem(key, this.parentData[key]);
+         }
+      });
+   }
+
+   setItem(path, value) {
+      let binding = Binding.get(path);
+      let bindingRoot = binding.parts[0];
+      if (!isObject(this.privateData) || !this.privateData.hasOwnProperty(bindingRoot)) {
+         let changed = isUndefined(value) ? super.deleteItem(path) : super.setItem(path, value);
+         return changed;
+      }
+
+      let newValue = value;
+      if (binding.parts.length > 1) newValue = binding.set(this.getData(), value)[bindingRoot];
+      this.onSet(bindingRoot, newValue);
+      this.batch(() => {
+         super.setItem(bindingRoot, newValue);
+         this.parentDataCheck();
+      });
+      return true;
+   }
+
+   deleteItem(path) {
+      return this.setItem(path, undefined);
+   }
+
+   doNotify() {
+      if (!this.detached) this.store.notify();
+      super.doNotify();
+   }
+
+   // override the default implementation to avoid meta overwrites
+   setStore(store) {
+      this.store = store;
+   }
+}