cx 24.3.10 → 24.3.11

package/dist/ui.js

@@ -833,20 +833,20 @@ var stack = [
 		},
 	},
 ];
-function getRootCultureSpecs() {
+function getDefaultCulture() {
 	return stack[0];
 }
-function getCurrentCultureSpecs() {
+function getCurrentCulture() {
 	return stack[stack.length - 1];
 }
 function getCurrentCultureCache() {
-	return getCurrentCultureSpecs().cache;
+	return getCurrentCulture().cache;
 }
 function pushCulture(cultureInfo) {
 	stack.push(cultureInfo);
 }
 function createCulture(cultureSpecs) {
-	var current = getCurrentCultureSpecs();
+	var current = getCurrentCulture();
 	var info = {
 		culture: current.culture,
 		dateEncoding: current.dateEncoding,
@@ -859,38 +859,45 @@ function createCulture(cultureSpecs) {
 	}
 	return info;
 }
-function popCulture() {
+function popCulture(cultureSpecs) {
 	if (stack.length == 1) throw new Error("Cannot pop the last culture object.");
-	return stack.pop();
+	if (cultureSpecs && stack[stack.length - 1] !== cultureSpecs) {
+		console.warn("Popped culture object does not match the current one.");
+	}
+	try {
+		return stack.pop();
+	} finally {
+		console.log(stack);
+	}
 }
 var Culture = /*#__PURE__*/ (function () {
 	function Culture() {}
 	Culture.setCulture = function setCulture(cultureCode) {
-		var cultureSpecs = getRootCultureSpecs();
+		var cultureSpecs = getDefaultCulture();
 		cultureSpecs.culture = cultureCode;
 		cultureSpecs.cache = {};
 		Localization.setCulture(cultureCode);
 		this.invalidateCache();
 	};
 	Culture.setNumberCulture = function setNumberCulture(cultureCode) {
-		var cultureSpecs = getRootCultureSpecs();
+		var cultureSpecs = getDefaultCulture();
 		cultureSpecs.numberCulture = cultureCode;
 		delete cultureSpecs.cache.numberCulture;
 		this.invalidateCache();
 	};
 	Culture.setDateTimeCulture = function setDateTimeCulture(cultureCode) {
-		var cultureSpecs = getRootCultureSpecs();
+		var cultureSpecs = getDefaultCulture();
 		cultureSpecs.dateTimeCulture = cultureCode;
 		delete cultureSpecs.cache.dateTimeCulture;
 		this.invalidateCache();
 	};
 	Culture.setDefaultCurrency = function setDefaultCurrency(currencyCode) {
-		var cultureSpecs = getRootCultureSpecs();
+		var cultureSpecs = getDefaultCulture();
 		cultureSpecs.defaultCurrency = currencyCode;
 		this.invalidateCache();
 	};
 	Culture.setDefaultDateEncoding = function setDefaultDateEncoding(encoding) {
-		var cultureSpecs = getRootCultureSpecs();
+		var cultureSpecs = getDefaultCulture();
 		cultureSpecs.dateEncoding = encoding;
 		this.invalidateCache();
 	};
@@ -900,28 +907,28 @@ var Culture = /*#__PURE__*/ (function () {
 		invalidateStringTemplateCache();
 	};
 	Culture.getNumberCulture = function getNumberCulture() {
-		var _getCurrentCultureSpe = getCurrentCultureSpecs(),
-			cache = _getCurrentCultureSpe.cache,
-			numberCulture = _getCurrentCultureSpe.numberCulture,
-			culture = _getCurrentCultureSpe.culture;
+		var _getCurrentCulture = getCurrentCulture(),
+			cache = _getCurrentCulture.cache,
+			numberCulture = _getCurrentCulture.numberCulture,
+			culture = _getCurrentCulture.culture;
 		if (!cache.numberCulture) cache.numberCulture = new NumberCulture(numberCulture != null ? numberCulture : culture);
 		return cache.numberCulture;
 	};
 	Culture.getDateTimeCulture = function getDateTimeCulture() {
-		var _getCurrentCultureSpe2 = getCurrentCultureSpecs(),
-			cache = _getCurrentCultureSpe2.cache,
-			dateTimeCulture = _getCurrentCultureSpe2.dateTimeCulture,
-			culture = _getCurrentCultureSpe2.culture;
+		var _getCurrentCulture2 = getCurrentCulture(),
+			cache = _getCurrentCulture2.cache,
+			dateTimeCulture = _getCurrentCulture2.dateTimeCulture,
+			culture = _getCurrentCulture2.culture;
 		if (!cache.dateTimeCulture)
 			cache.dateTimeCulture = new DateTimeCulture(dateTimeCulture != null ? dateTimeCulture : culture);
 		return cache.dateTimeCulture;
 	};
 	Culture.getDefaultDateEncoding = function getDefaultDateEncoding() {
-		return getCurrentCultureSpecs().dateEncoding;
+		return getCurrentCulture().dateEncoding;
 	};
 	Culture.getComparer = function getComparer(options) {
-		var _getCurrentCultureSpe3 = getCurrentCultureSpecs(),
-			culture = _getCurrentCultureSpe3.culture;
+		var _getCurrentCulture3 = getCurrentCulture(),
+			culture = _getCurrentCulture3.culture;
 		if (typeof Intl.Collator != "undefined") return new Intl.Collator(culture, options).compare;
 		return defaultCompare;
 	};
@@ -929,13 +936,13 @@ var Culture = /*#__PURE__*/ (function () {
 		{
 			key: "defaultCurrency",
 			get: function get() {
-				return getCurrentCultureSpecs().defaultCurrency;
+				return getCurrentCulture().defaultCurrency;
 			},
 		},
 		{
 			key: "culture",
 			get: function get() {
-				return getCurrentCultureSpecs().culture;
+				return getCurrentCulture().culture;
 			},
 		},
 	]);
@@ -2296,7 +2303,10 @@ var Cx = /*#__PURE__*/ (function (_VDOM$Component) {
 		throw new Error("Could not resolve a widget instance in the Cx component.");
 	};
 	_proto.render = function render() {
+		var _this$props$cultureIn;
 		if (this.props.deferredUntilIdle && this.state.deferToken < this.deferCounter) return null;
+		var cultureInfo =
+			(_this$props$cultureIn = this.props.cultureInfo) != null ? _this$props$cultureIn : getCurrentCulture();
 		return /*#__PURE__*/ jsx(CxContext, {
 			instance: this.getInstance(),
 			flags: this.flags,
@@ -2304,7 +2314,7 @@ var Cx = /*#__PURE__*/ (function (_VDOM$Component) {
 			buster: ++this.renderCount,
 			contentFactory: this.props.contentFactory,
 			forceUpdate: this.forceUpdateCallback,
-			cultureInfo: this.props.cultureInfo,
+			cultureInfo: cultureInfo,
 		});
 	};
 	_proto.componentDidMount = function componentDidMount() {
@@ -2431,32 +2441,32 @@ var CxContext = /*#__PURE__*/ (function (_VDOM$Component2) {
 					break;
 				}
 			} while (this.props.flags.dirty && ++count <= 3 && Widget.optimizePrepare && now() - this.timings.start < 8);
-		} finally {
-			if (this.props.cultureInfo) popCulture();
-		}
-		if (visible) {
-			this.timings.afterExplore = now();
-			for (var i = 0; i < context.prepareList.length; i++) context.prepareList[i].prepare(context);
-			this.timings.afterPrepare = now();
+			if (visible) {
+				this.timings.afterExplore = now();
+				for (var i = 0; i < context.prepareList.length; i++) context.prepareList[i].prepare(context);
+				this.timings.afterPrepare = now();
 
-			//walk in reverse order so children get rendered first
-			var renderList = context.getRootRenderList();
-			while (renderList) {
-				for (var _i = renderList.data.length - 1; _i >= 0; _i--) {
-					renderList.data[_i].render(context);
+				//walk in reverse order so children get rendered first
+				var renderList = context.getRootRenderList();
+				while (renderList) {
+					for (var _i = renderList.data.length - 1; _i >= 0; _i--) {
+						renderList.data[_i].render(context);
+					}
+					renderList = renderList.right;
 				}
-				renderList = renderList.right;
+				this.content = getContent(instance.vdom);
+				if (contentFactory)
+					this.content = contentFactory({
+						children: this.content,
+					});
+				this.timings.afterRender = now();
+				for (var _i2 = 0; _i2 < context.cleanupList.length; _i2++) context.cleanupList[_i2].cleanup(context);
+			} else {
+				this.content = null;
+				this.timings.afterExplore = this.timings.afterPrepare = this.timings.afterRender = now();
 			}
-			this.content = getContent(instance.vdom);
-			if (contentFactory)
-				this.content = contentFactory({
-					children: this.content,
-				});
-			this.timings.afterRender = now();
-			for (var _i2 = 0; _i2 < context.cleanupList.length; _i2++) context.cleanupList[_i2].cleanup(context);
-		} else {
-			this.content = null;
-			this.timings.afterExplore = this.timings.afterPrepare = this.timings.afterRender = now();
+		} finally {
+			if (this.props.cultureInfo) popCulture(this.props.cultureInfo);
 		}
 		this.timings.beforeVDOMRender = now();
 		this.props.flags.preparing = false;
@@ -2822,9 +2832,10 @@ var Restate = /*#__PURE__*/ (function (_PureContainer) {
 		}
 	};
 	_proto.explore = function explore(context, instance) {
+		var _this$culture;
 		if (!instance.subStore) this.initSubStore(context, instance);
 		if (instance.subStore.parentDataCheck()) instance.markShouldUpdate();
-		instance.cultureInfo = context.cultureInfo;
+		instance.cultureInfo = (_this$culture = this.culture) != null ? _this$culture : getCurrentCulture();
 		if (instance.cache("cultureInfo", instance.culture)) instance.markShouldUpdate();
 		_PureContainer.prototype.explore.call(this, context, instance);
 	};
@@ -2859,6 +2870,7 @@ var Restate = /*#__PURE__*/ (function (_PureContainer) {
 Restate.prototype.detached = false;
 Restate.prototype.waitForIdle = false;
 Restate.prototype.immediate = false;
+Restate.prototype.culture = null;
 var PrivateStore = Restate;
 var RestateStore = /*#__PURE__*/ (function (_Store) {
 	function RestateStore(config) {
@@ -3209,12 +3221,10 @@ var CultureScope = /*#__PURE__*/ (function (_PureContainer) {
 		var culture = instance.culture;
 		pushCulture(culture);
 		if (this.items.length == 0 && this.initialItems) this.add(this.initialItems);
-		context.push("cultureInfo", culture);
 		_PureContainer.prototype.explore.call(this, context, instance);
 	};
 	_proto.exploreCleanup = function exploreCleanup(context, instance) {
-		context.pop("cultureInfo");
-		popCulture();
+		popCulture(instance.culture);
 	};
 	return CultureScope;
 })(PureContainer);
@@ -4576,8 +4586,10 @@ export {
 	flattenProps,
 	getContent,
 	getContentArray,
+	getCurrentCulture,
 	getCurrentCultureCache,
 	getCurrentInstance,
+	getDefaultCulture,
 	isBatchingUpdates,
 	notifyBatchedUpdateCompleted,
 	notifyBatchedUpdateStarting,

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "cx",
-   "version": "24.3.10",
+   "version": "24.3.11",
    "description": "Advanced JavaScript UI framework for admin and dashboard applications with ready to use grid, form and chart components.",
    "main": "index.js",
    "jsnext:main": "src/index.js",

package/src/ui/Culture.d.ts

@@ -42,6 +42,10 @@ export function createCulture(cultureSpecs: CultureSpecs): CultureInfo;
 
 export function pushCulture(cultureSpecs: CultureInfo): void;
 
-export function popCulture(): CultureInfo;
+export function popCulture(cultureSpecs?: CultureInfo): CultureInfo;
 
 export function getCurrentCultureCache(): any;
+
+export function getCurrentCulture(): CultureInfo;
+
+export function getDefaultCulture(): CultureInfo;

package/src/ui/Culture.js

@@ -23,16 +23,16 @@ let stack = [
    },
 ];
 
-function getRootCultureSpecs() {
+export function getDefaultCulture() {
    return stack[0];
 }
 
-function getCurrentCultureSpecs() {
+export function getCurrentCulture() {
    return stack[stack.length - 1];
 }
 
 export function getCurrentCultureCache() {
-   return getCurrentCultureSpecs().cache;
+   return getCurrentCulture().cache;
 }
 
 export function pushCulture(cultureInfo) {
@@ -40,7 +40,7 @@ export function pushCulture(cultureInfo) {
 }
 
 export function createCulture(cultureSpecs) {
-   let current = getCurrentCultureSpecs();
+   let current = getCurrentCulture();
    let info = {
       culture: current.culture,
       dateEncoding: current.dateEncoding,
@@ -54,14 +54,21 @@ export function createCulture(cultureSpecs) {
    return info;
 }
 
-export function popCulture() {
+export function popCulture(cultureSpecs) {
    if (stack.length == 1) throw new Error("Cannot pop the last culture object.");
-   return stack.pop();
+   if (cultureSpecs && stack[stack.length - 1] !== cultureSpecs) {
+      console.warn("Popped culture object does not match the current one.");
+   }
+   try {
+      return stack.pop();
+   } finally {
+      console.log(stack);
+   }
 }
 
 export class Culture {
    static setCulture(cultureCode) {
-      let cultureSpecs = getRootCultureSpecs();
+      let cultureSpecs = getDefaultCulture();
       cultureSpecs.culture = cultureCode;
       cultureSpecs.cache = {};
       Localization.setCulture(cultureCode);
@@ -69,27 +76,27 @@ export class Culture {
    }
 
    static setNumberCulture(cultureCode) {
-      let cultureSpecs = getRootCultureSpecs();
+      let cultureSpecs = getDefaultCulture();
       cultureSpecs.numberCulture = cultureCode;
       delete cultureSpecs.cache.numberCulture;
       this.invalidateCache();
    }
 
    static setDateTimeCulture(cultureCode) {
-      let cultureSpecs = getRootCultureSpecs();
+      let cultureSpecs = getDefaultCulture();
       cultureSpecs.dateTimeCulture = cultureCode;
       delete cultureSpecs.cache.dateTimeCulture;
       this.invalidateCache();
    }
 
    static setDefaultCurrency(currencyCode) {
-      let cultureSpecs = getRootCultureSpecs();
+      let cultureSpecs = getDefaultCulture();
       cultureSpecs.defaultCurrency = currencyCode;
       this.invalidateCache();
    }
 
    static setDefaultDateEncoding(encoding) {
-      let cultureSpecs = getRootCultureSpecs();
+      let cultureSpecs = getDefaultCulture();
       cultureSpecs.dateEncoding = encoding;
       this.invalidateCache();
    }
@@ -101,31 +108,31 @@ export class Culture {
    }
 
    static get defaultCurrency() {
-      return getCurrentCultureSpecs().defaultCurrency;
+      return getCurrentCulture().defaultCurrency;
    }
 
    static get culture() {
-      return getCurrentCultureSpecs().culture;
+      return getCurrentCulture().culture;
    }
 
    static getNumberCulture() {
-      let { cache, numberCulture, culture } = getCurrentCultureSpecs();
+      let { cache, numberCulture, culture } = getCurrentCulture();
       if (!cache.numberCulture) cache.numberCulture = new NumberCulture(numberCulture ?? culture);
       return cache.numberCulture;
    }
 
    static getDateTimeCulture() {
-      let { cache, dateTimeCulture, culture } = getCurrentCultureSpecs();
+      let { cache, dateTimeCulture, culture } = getCurrentCulture();
       if (!cache.dateTimeCulture) cache.dateTimeCulture = new DateTimeCulture(dateTimeCulture ?? culture);
       return cache.dateTimeCulture;
    }
 
    static getDefaultDateEncoding() {
-      return getCurrentCultureSpecs().dateEncoding;
+      return getCurrentCulture().dateEncoding;
    }
 
    static getComparer(options) {
-      let { culture } = getCurrentCultureSpecs();
+      let { culture } = getCurrentCulture();
       if (typeof Intl.Collator != "undefined") return new Intl.Collator(culture, options).compare;
       return defaultCompare;
    }

package/src/ui/CultureScope.js

@@ -38,13 +38,11 @@ export class CultureScope extends PureContainer {
       let { culture } = instance;
       pushCulture(culture);
       if (this.items.length == 0 && this.initialItems) this.add(this.initialItems);
-      context.push("cultureInfo", culture);
       super.explore(context, instance);
    }
 
    exploreCleanup(context, instance) {
-      context.pop("cultureInfo");
-      popCulture();
+      popCulture(instance.culture);
    }
 }
 

package/src/ui/Cx.js

@@ -7,7 +7,7 @@ import { isBatchingUpdates, notifyBatchedUpdateStarting, notifyBatchedUpdateComp
 import { shallowEquals } from "../util/shallowEquals";
 import { PureContainer } from "./PureContainer";
 import { onIdleCallback } from "../util/onIdleCallback";
-import { popCulture, pushCulture } from "./Culture";
+import { getCurrentCulture, pushCulture, popCulture } from "./Culture";
 
 export class Cx extends VDOM.Component {
    constructor(props) {
@@ -85,6 +85,8 @@ export class Cx extends VDOM.Component {
    render() {
       if (this.props.deferredUntilIdle && this.state.deferToken < this.deferCounter) return null;
 
+      let cultureInfo = this.props.cultureInfo ?? getCurrentCulture();
+
       return (
          <CxContext
             instance={this.getInstance()}
@@ -93,7 +95,7 @@ export class Cx extends VDOM.Component {
             buster={++this.renderCount}
             contentFactory={this.props.contentFactory}
             forceUpdate={this.forceUpdateCallback}
-            cultureInfo={this.props.cultureInfo}
+            cultureInfo={cultureInfo}
          />
       );
    }
@@ -219,32 +221,32 @@ class CxContext extends VDOM.Component {
                break;
             }
          } while (this.props.flags.dirty && ++count <= 3 && Widget.optimizePrepare && now() - this.timings.start < 8);
-      } finally {
-         if (this.props.cultureInfo) popCulture();
-      }
 
-      if (visible) {
-         this.timings.afterExplore = now();
+         if (visible) {
+            this.timings.afterExplore = now();
 
-         for (let i = 0; i < context.prepareList.length; i++) context.prepareList[i].prepare(context);
-         this.timings.afterPrepare = now();
+            for (let i = 0; i < context.prepareList.length; i++) context.prepareList[i].prepare(context);
+            this.timings.afterPrepare = now();
 
-         //walk in reverse order so children get rendered first
-         let renderList = context.getRootRenderList();
-         while (renderList) {
-            for (let i = renderList.data.length - 1; i >= 0; i--) {
-               renderList.data[i].render(context);
+            //walk in reverse order so children get rendered first
+            let renderList = context.getRootRenderList();
+            while (renderList) {
+               for (let i = renderList.data.length - 1; i >= 0; i--) {
+                  renderList.data[i].render(context);
+               }
+               renderList = renderList.right;
             }
-            renderList = renderList.right;
-         }
 
-         this.content = getContent(instance.vdom);
-         if (contentFactory) this.content = contentFactory({ children: this.content });
-         this.timings.afterRender = now();
-         for (let i = 0; i < context.cleanupList.length; i++) context.cleanupList[i].cleanup(context);
-      } else {
-         this.content = null;
-         this.timings.afterExplore = this.timings.afterPrepare = this.timings.afterRender = now();
+            this.content = getContent(instance.vdom);
+            if (contentFactory) this.content = contentFactory({ children: this.content });
+            this.timings.afterRender = now();
+            for (let i = 0; i < context.cleanupList.length; i++) context.cleanupList[i].cleanup(context);
+         } else {
+            this.content = null;
+            this.timings.afterExplore = this.timings.afterPrepare = this.timings.afterRender = now();
+         }
+      } finally {
+         if (this.props.cultureInfo) popCulture(this.props.cultureInfo);
       }
 
       this.timings.beforeVDOMRender = now();

package/src/ui/Restate.d.ts

@@ -1,18 +1,21 @@
-import { Instance } from "./Instance";
-import * as Cx from "../core";
-
-interface RestateProps extends Cx.PureContainerProps {
-   data?: Cx.StructuredProp;
-   detached?: boolean;
-   deferredUntilIdle?: Cx.BooleanProp;
-   idleTimeout?: Cx.NumberProp;
-   cacheKey?: Cx.StringProp;
-
-   /* Set to true to disable batching of updates. */
-   immediate?: boolean;
-
-   onError?: (err: Error, instance: Instance) => void;
-}
-
-export class Restate extends Cx.Widget<RestateProps> {}
-export class PrivateStore extends Cx.Widget<RestateProps> {}
+import { Instance } from "./Instance";
+import * as Cx from "../core";
+import { CultureInfo } from "./Culture";
+
+interface RestateProps extends Cx.PureContainerProps {
+   data?: Cx.StructuredProp;
+   detached?: boolean;
+   deferredUntilIdle?: Cx.BooleanProp;
+   idleTimeout?: Cx.NumberProp;
+   cacheKey?: Cx.StringProp;
+
+   /* Set to true to disable batching of updates. */
+   immediate?: boolean;
+
+   onError?: (err: Error, instance: Instance) => void;
+
+   culture?: CultureInfo;
+}
+
+export class Restate extends Cx.Widget<RestateProps> {}
+export class PrivateStore extends Cx.Widget<RestateProps> {}

package/src/ui/Restate.js

@@ -1,13 +1,12 @@
 import { PureContainer } from "./PureContainer";
 import { Store } from "../data/Store";
 import { Cx } from "./Cx";
-import { isString } from "../util/isString";
 import { VDOM } from "./VDOM";
-import { isFunction } from "../util/isFunction";
 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 = {};
 
@@ -70,7 +69,7 @@ export class Restate extends PureContainer {
    explore(context, instance) {
       if (!instance.subStore) this.initSubStore(context, instance);
       if (instance.subStore.parentDataCheck()) instance.markShouldUpdate();
-      instance.cultureInfo = context.cultureInfo;
+      instance.cultureInfo = this.culture ?? getCurrentCulture();
       if (instance.cache("cultureInfo", instance.culture)) instance.markShouldUpdate();
       super.explore(context, instance);
    }
@@ -107,6 +106,7 @@ export class Restate extends PureContainer {
 Restate.prototype.detached = false;
 Restate.prototype.waitForIdle = false;
 Restate.prototype.immediate = false;
+Restate.prototype.culture = null;
 
 export const PrivateStore = Restate;