cx 25.4.1 → 25.5.1

package/src/ui/Culture.js

@@ -1,139 +1,139 @@
-import { NumberCulture, DateTimeCulture } from "intl-io";
-import { Localization } from "./Localization";
-import { GlobalCacheIdentifier } from "../util/GlobalCacheIdentifier";
-import { invalidateExpressionCache } from "../data/Expression";
-import { invalidateStringTemplateCache } from "../data/StringTemplate";
-import { defaultCompare } from "../data/defaultCompare";
-import { Console } from "../util/Console";
-
-let stack = [
-   {
-      culture: "en",
-      numberCulture: null,
-      dateTimeCulture: null,
-      cache: {},
-      defaultCurrency: "USD",
-      dateEncoding: (date) => date.toISOString(),
-      timezone: null,
-   },
-];
-
-export function getDefaultCulture() {
-   return stack[0];
-}
-
-export function getCurrentCulture() {
-   return stack[stack.length - 1];
-}
-
-export function getCurrentCultureCache() {
-   return getCurrentCulture().cache;
-}
-
-export function pushCulture(cultureInfo) {
-   stack.push(cultureInfo);
-}
-
-export function createCulture(cultureSpecs) {
-   let current = getCurrentCulture();
-   let info = {
-      culture: current.culture,
-      dateEncoding: current.dateEncoding,
-      defaultCurrency: current.defaultCurrency,
-      cache: {},
-   };
-   for (let key in cultureSpecs) {
-      if (!cultureSpecs[key]) continue;
-      info[key] = cultureSpecs[key];
-   }
-   return info;
-}
-
-export function popCulture(cultureSpecs) {
-   if (stack.length == 1) throw new Error("Cannot pop the last culture object.");
-   if (cultureSpecs && stack[stack.length - 1] !== cultureSpecs) {
-      Console.warn("Popped culture object does not match the current one.");
-   }
-   return stack.pop();
-}
-
-export class Culture {
-   static setCulture(cultureCode) {
-      let cultureSpecs = getDefaultCulture();
-      cultureSpecs.culture = cultureCode;
-      cultureSpecs.cache = {};
-      Localization.setCulture(cultureCode);
-      this.invalidateCache();
-   }
-
-   static setNumberCulture(cultureCode) {
-      let cultureSpecs = getDefaultCulture();
-      cultureSpecs.numberCulture = cultureCode;
-      delete cultureSpecs.cache.numberCulture;
-      this.invalidateCache();
-   }
-
-   static setDateTimeCulture(cultureCode) {
-      let cultureSpecs = getDefaultCulture();
-      cultureSpecs.dateTimeCulture = cultureCode;
-      delete cultureSpecs.cache.dateTimeCulture;
-      this.invalidateCache();
-   }
-
-   static setDefaultCurrency(currencyCode) {
-      let cultureSpecs = getDefaultCulture();
-      cultureSpecs.defaultCurrency = currencyCode;
-      this.invalidateCache();
-   }
-
-   static setDefaultTimezone(timezone) {
-      let cultureSpecs = getDefaultCulture();
-      cultureSpecs.timezone = timezone;
-      this.invalidateCache();
-   }
-
-   static setDefaultDateEncoding(encoding) {
-      let cultureSpecs = getDefaultCulture();
-      cultureSpecs.dateEncoding = encoding;
-      this.invalidateCache();
-   }
-
-   static invalidateCache() {
-      GlobalCacheIdentifier.change();
-      invalidateExpressionCache();
-      invalidateStringTemplateCache();
-   }
-
-   static get defaultCurrency() {
-      return getCurrentCulture().defaultCurrency;
-   }
-
-   static get culture() {
-      return getCurrentCulture().culture;
-   }
-
-   static getNumberCulture() {
-      let { cache, numberCulture, culture } = getCurrentCulture();
-      if (!cache.numberCulture) cache.numberCulture = new NumberCulture(numberCulture ?? culture);
-      return cache.numberCulture;
-   }
-
-   static getDateTimeCulture() {
-      let { cache, dateTimeCulture, culture, timezone } = getCurrentCulture();
-      if (!cache.dateTimeCulture)
-         cache.dateTimeCulture = new DateTimeCulture(dateTimeCulture ?? culture, {
-            defaultTimezone: timezone,
-         });
-      return cache.dateTimeCulture;
-   }
-
-   static getDefaultDateEncoding() {
-      return getCurrentCulture().dateEncoding;
-   }
-
-   static getComparer(options) {
-      let { culture } = getCurrentCulture();
-      if (typeof Intl.Collator != "undefined") return new Intl.Collator(culture, options).compare;
-      return defaultCompare;
-   }
-}
+import { NumberCulture, DateTimeCulture } from "intl-io";
+import { Localization } from "./Localization";
+import { GlobalCacheIdentifier } from "../util/GlobalCacheIdentifier";
+import { invalidateExpressionCache } from "../data/Expression";
+import { invalidateStringTemplateCache } from "../data/StringTemplate";
+import { defaultCompare } from "../data/defaultCompare";
+import { Console } from "../util/Console";
+
+let stack = [
+   {
+      culture: "en",
+      numberCulture: null,
+      dateTimeCulture: null,
+      cache: {},
+      defaultCurrency: "USD",
+      dateEncoding: (date) => date.toISOString(),
+      timezone: null,
+   },
+];
+
+export function getDefaultCulture() {
+   return stack[0];
+}
+
+export function getCurrentCulture() {
+   return stack[stack.length - 1];
+}
+
+export function getCurrentCultureCache() {
+   return getCurrentCulture().cache;
+}
+
+export function pushCulture(cultureInfo) {
+   stack.push(cultureInfo);
+}
+
+export function createCulture(cultureSpecs) {
+   let current = getCurrentCulture();
+   let info = {
+      culture: current.culture,
+      dateEncoding: current.dateEncoding,
+      defaultCurrency: current.defaultCurrency,
+      cache: {},
+   };
+   for (let key in cultureSpecs) {
+      if (!cultureSpecs[key]) continue;
+      info[key] = cultureSpecs[key];
+   }
+   return info;
+}
+
+export function popCulture(cultureSpecs) {
+   if (stack.length == 1) throw new Error("Cannot pop the last culture object.");
+   if (cultureSpecs && stack[stack.length - 1] !== cultureSpecs) {
+      Console.warn("Popped culture object does not match the current one.");
+   }
+   return stack.pop();
+}
+
+export class Culture {
+   static setCulture(cultureCode) {
+      let cultureSpecs = getDefaultCulture();
+      cultureSpecs.culture = cultureCode;
+      cultureSpecs.cache = {};
+      Localization.setCulture(cultureCode);
+      this.invalidateCache();
+   }
+
+   static setNumberCulture(cultureCode) {
+      let cultureSpecs = getDefaultCulture();
+      cultureSpecs.numberCulture = cultureCode;
+      delete cultureSpecs.cache.numberCulture;
+      this.invalidateCache();
+   }
+
+   static setDateTimeCulture(cultureCode) {
+      let cultureSpecs = getDefaultCulture();
+      cultureSpecs.dateTimeCulture = cultureCode;
+      delete cultureSpecs.cache.dateTimeCulture;
+      this.invalidateCache();
+   }
+
+   static setDefaultCurrency(currencyCode) {
+      let cultureSpecs = getDefaultCulture();
+      cultureSpecs.defaultCurrency = currencyCode;
+      this.invalidateCache();
+   }
+
+   static setDefaultTimezone(timezone) {
+      let cultureSpecs = getDefaultCulture();
+      cultureSpecs.timezone = timezone;
+      this.invalidateCache();
+   }
+
+   static setDefaultDateEncoding(encoding) {
+      let cultureSpecs = getDefaultCulture();
+      cultureSpecs.dateEncoding = encoding;
+      this.invalidateCache();
+   }
+
+   static invalidateCache() {
+      GlobalCacheIdentifier.change();
+      invalidateExpressionCache();
+      invalidateStringTemplateCache();
+   }
+
+   static get defaultCurrency() {
+      return getCurrentCulture().defaultCurrency;
+   }
+
+   static get culture() {
+      return getCurrentCulture().culture;
+   }
+
+   static getNumberCulture() {
+      let { cache, numberCulture, culture } = getCurrentCulture();
+      if (!cache.numberCulture) cache.numberCulture = new NumberCulture(numberCulture ?? culture);
+      return cache.numberCulture;
+   }
+
+   static getDateTimeCulture() {
+      let { cache, dateTimeCulture, culture, timezone } = getCurrentCulture();
+      if (!cache.dateTimeCulture)
+         cache.dateTimeCulture = new DateTimeCulture(dateTimeCulture ?? culture, {
+            defaultTimezone: timezone,
+         });
+      return cache.dateTimeCulture;
+   }
+
+   static getDefaultDateEncoding() {
+      return getCurrentCulture().dateEncoding;
+   }
+
+   static getComparer(options) {
+      let { culture } = getCurrentCulture();
+      if (typeof Intl.Collator != "undefined") return new Intl.Collator(culture, options).compare;
+      return defaultCompare;
+   }
+}

package/src/ui/Cx.js

@@ -23,11 +23,11 @@ export class Cx extends VDOM.Component {
             this.parentInstance = props.parentInstance;
             this.store = props.store || this.parentInstance.store;
          } else {
-            this.parentInstance = new Instance(this.widget, 0);
+            this.parentInstance = new Instance(this.widget, 0, null, props.store);
             this.store = props.store;
          }
 
-         if (!this.store) throw new Error("Cx component requires store.");
+         if (!this.store) throw new Error("Cx component requires a store.");
       }
 
       this.state = {
@@ -72,7 +72,7 @@ export class Cx extends VDOM.Component {
       if (this.props.instance) return this.props.instance;
 
       if (this.instance && this.instance.widget === this.widget) {
-         if (this.instance.store != this.store) this.instance.setStore(this.store);
+         if (this.instance.parentStore != this.store) this.instance.setParentStore(this.store);
          return this.instance;
       }
 

package/src/ui/DataProxy.js

@@ -1,44 +1,45 @@
-import { NestedDataView } from "../data/NestedDataView";
-import { UseParentLayout } from "../ui/layout/UseParentLayout";
-import { PureContainer } from "./PureContainer";
-import { StructuredInstanceDataAccessor } from "./StructuredInstanceDataAccessor";
-
-export class DataProxy extends PureContainer {
-   init() {
-      if (!this.data) this.data = {};
-
-      if (this.alias) this.data[this.alias] = this.value;
-
-      //not sure why nesting is needed, commenting for now
-      // this.container = PureContainer.create({
-      //    type: PureContainer,
-      //    items: this.children || this.items,
-      //    layout: this.layout,
-      //    controller: this.controller,
-      //    outerLayout: this.outerLayout,
-      //    ws: this.ws,
-      // });
-      // this.children = [this.container];
-      // delete this.items;
-      // delete this.controller;
-      // delete this.outerLayout;
-      // this.layout = UseParentLayout;
-      super.init();
-   }
-
-   initInstance(context, instance) {
-      instance.store = new NestedDataView({
-         store: instance.store,
-         nestedData: new StructuredInstanceDataAccessor({ instance, data: this.data, useParentStore: true }),
-         immutable: this.immutable,
-         sealed: this.sealed,
-      });
-
-      instance.setStore = (store) => {
-         instance.store.setStore(store);
-      };
-   }
-}
-
-DataProxy.prototype.immutable = false;
-DataProxy.prototype.sealed = false;
+import { NestedDataView } from "../data/NestedDataView";
+import { UseParentLayout } from "../ui/layout/UseParentLayout";
+import { PureContainer } from "./PureContainer";
+import { StructuredInstanceDataAccessor } from "./StructuredInstanceDataAccessor";
+
+export class DataProxy extends PureContainer {
+   init() {
+      if (!this.data) this.data = {};
+
+      if (this.alias) this.data[this.alias] = this.value;
+
+      // nesting is required to avoid resetting the store on every render and recalculating the data
+      this.container = PureContainer.create({
+         type: PureContainer,
+         items: this.children || this.items,
+         layout: this.layout,
+         controller: this.controller,
+         outerLayout: this.outerLayout,
+         ws: this.ws,
+      });
+      this.children = [this.container];
+      delete this.items;
+      delete this.controller;
+      delete this.outerLayout;
+      this.layout = UseParentLayout;
+      super.init();
+   }
+
+   initInstance(context, instance) {
+      instance.store = new NestedDataView({
+         store: instance.parentStore,
+         nestedData: new StructuredInstanceDataAccessor({ instance, data: this.data, useParentStore: true }),
+         immutable: this.immutable,
+         sealed: this.sealed,
+      });
+      super.initInstance(context, instance);
+   }
+
+   applyParentStore(instance) {
+      instance.store.setStore(instance.parentStore);
+   }
+}
+
+DataProxy.prototype.immutable = false;
+DataProxy.prototype.sealed = false;

package/src/ui/DetachedScope.js

@@ -1,94 +1,98 @@
-import {PureContainer} from "./PureContainer";
-import {SubscribableView} from '../data/SubscribableView';
-import {getSelector} from '../data/getSelector';
-import {Cx} from './Cx';
-import {VDOM} from './Widget';
-import {IsolatedScope} from './IsolatedScope';
-
-export class DetachedScope extends IsolatedScope {
-
-   declareData() {
-      return super.declareData(...arguments, {
-         exclusiveData: {structured: true}
-      })
-   }
-
-   init() {
-      if (typeof this.exclusive === 'string')
-         this.exclusiveData = {bind: this.exclusive};
-      if (Array.isArray(this.exclusive)) {
-         this.exclusiveData = {};
-         this.exclusive.forEach((x, i) => {
-            this.exclusiveData[String(i)] = {bind: x}
-         });
-      }
-
-      this.container = PureContainer.create({
-         type: PureContainer,
-         items: this.children || this.items
-      });
-      delete this.items;
-      delete this.children;
-
-      if (this.name)
-         this.options = {
-            ...this.options,
-            name: this.name
-         };
-
-      super.init();
-   }
-
-   initInstance(context, instance) {
-      instance.subStore = new ContainmentStore({
-         store: instance.store,
-         selector: getSelector(this.exclusiveData || this.data)
-      });
-   }
-
-   render(context, instance, key) {
-      return <Cx
-         key={key}
-         widget={this.container}
-         store={instance.subStore}
-         parentInstance={instance}
-         subscribe
-         options={this.options}
-         onError={this.onError}
-      />
-   }
-}
-
-class ContainmentStore extends SubscribableView {
-
-   getData() {
-      return this.store.getData();
-   }
-
-   setItem(...args) {
-      return this.wrapper(()=>{
-         this.store.setItem(...args);
-      })
-   }
-
-   deleteItem(...args) {
-      return this.wrapper(()=>{
-         this.store.deleteItem(...args);
-      })
-   }
-
-   wrapper(callback) {
-      if (this.store.silently(callback)) {
-         let data = this.getData();
-         let containedData = this.selector(data);
-         if (containedData === this.cache.containedData) {
-            this.store.notify();
-         } else {
-            this.cache.containedData = containedData;
-            this.notify();
-         }
-         return true;
-      }
-      return false;
-   }
-}
+import { PureContainer } from "./PureContainer";
+import { SubscribableView } from "../data/SubscribableView";
+import { getSelector } from "../data/getSelector";
+import { Cx } from "./Cx";
+import { VDOM } from "./Widget";
+import { IsolatedScope } from "./IsolatedScope";
+
+export class DetachedScope extends IsolatedScope {
+   declareData() {
+      return super.declareData(...arguments, {
+         exclusiveData: { structured: true },
+      });
+   }
+
+   init() {
+      if (typeof this.exclusive === "string") this.exclusiveData = { bind: this.exclusive };
+      if (Array.isArray(this.exclusive)) {
+         this.exclusiveData = {};
+         this.exclusive.forEach((x, i) => {
+            this.exclusiveData[String(i)] = { bind: x };
+         });
+      }
+
+      this.container = PureContainer.create({
+         type: PureContainer,
+         items: this.children || this.items,
+      });
+      delete this.items;
+      delete this.children;
+
+      if (this.name)
+         this.options = {
+            ...this.options,
+            name: this.name,
+         };
+
+      super.init();
+   }
+
+   initInstance(context, instance) {
+      instance.subStore = new ContainmentStore({
+         store: instance.store,
+         selector: getSelector(this.exclusiveData || this.data),
+      });
+   }
+
+   applyParentStore(instance) {
+      instance.store = instance.parentStore;
+      instance.subStore.setStore(instance.parentStore);
+   }
+
+   render(context, instance, key) {
+      return (
+         <Cx
+            key={key}
+            widget={this.container}
+            store={instance.subStore}
+            parentInstance={instance}
+            subscribe
+            options={this.options}
+            onError={this.onError}
+         />
+      );
+   }
+}
+
+class ContainmentStore extends SubscribableView {
+   getData() {
+      return this.store.getData();
+   }
+
+   setItem(...args) {
+      return this.wrapper(() => {
+         this.store.setItem(...args);
+      });
+   }
+
+   deleteItem(...args) {
+      return this.wrapper(() => {
+         this.store.deleteItem(...args);
+      });
+   }
+
+   wrapper(callback) {
+      if (this.store.silently(callback)) {
+         let data = this.getData();
+         let containedData = this.selector(data);
+         if (containedData === this.cache.containedData) {
+            this.store.notify();
+         } else {
+            this.cache.containedData = containedData;
+            this.notify();
+         }
+         return true;
+      }
+      return false;
+   }
+}