cx 24.3.9 → 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,6 +2314,7 @@ var Cx = /*#__PURE__*/ (function (_VDOM$Component) {
 			buster: ++this.renderCount,
 			contentFactory: this.props.contentFactory,
 			forceUpdate: this.forceUpdateCallback,
+			cultureInfo: cultureInfo,
 		});
 	};
 	_proto.componentDidMount = function componentDidMount() {
@@ -2375,7 +2386,8 @@ var Cx = /*#__PURE__*/ (function (_VDOM$Component) {
 			props.instance !== this.props.instance ||
 			props.widget !== this.props.widget ||
 			props.store !== this.props.store ||
-			props.parentInstance !== this.props.parentInstance
+			props.parentInstance !== this.props.parentInstance ||
+			props.cultureInfo !== this.props.cultureInfo
 		);
 	};
 	_proto.componentDidCatchHandler = function componentDidCatchHandler(error, info) {
@@ -2410,46 +2422,51 @@ var CxContext = /*#__PURE__*/ (function (_VDOM$Component2) {
 			throw new Error("The instance passed to a Cx component should be detached from its parent.");
 		if (this.props.instance !== instance && this.props.instance.destroyTracked) this.props.instance.destroy();
 		this.props.flags.preparing = true;
-		do {
-			context = new RenderingContext(options);
-			context.forceUpdate = this.props.forceUpdate;
-			this.props.flags.dirty = false;
-			instance.assignedRenderList = context.getRootRenderList();
-			visible = instance.scheduleExploreIfVisible(context);
-			if (visible) {
-				while (!context.exploreStack.empty()) {
-					var inst = context.exploreStack.pop();
-					//console.log("EXPLORE", inst.widget.constructor.name, inst.widget.tag, inst.widget.widgetId);
-					inst.explore(context);
+		if (this.props.cultureInfo) pushCulture(this.props.cultureInfo);
+		try {
+			do {
+				context = new RenderingContext(options);
+				context.forceUpdate = this.props.forceUpdate;
+				this.props.flags.dirty = false;
+				instance.assignedRenderList = context.getRootRenderList();
+				visible = instance.scheduleExploreIfVisible(context);
+				if (visible) {
+					while (!context.exploreStack.empty()) {
+						var inst = context.exploreStack.pop();
+						//console.log("EXPLORE", inst.widget.constructor.name, inst.widget.tag, inst.widget.widgetId);
+						inst.explore(context);
+					}
+				} else if (instance.destroyTracked) {
+					instance.destroy();
+					break;
 				}
-			} else if (instance.destroyTracked) {
-				instance.destroy();
-				break;
-			}
-		} while (this.props.flags.dirty && ++count <= 3 && Widget.optimizePrepare && now() - this.timings.start < 8);
-		if (visible) {
-			this.timings.afterExplore = now();
-			for (var i = 0; i < context.prepareList.length; i++) context.prepareList[i].prepare(context);
-			this.timings.afterPrepare = now();
+			} while (this.props.flags.dirty && ++count <= 3 && Widget.optimizePrepare && now() - this.timings.start < 8);
+			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;
@@ -2815,8 +2832,11 @@ 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 = (_this$culture = this.culture) != null ? _this$culture : getCurrentCulture();
+		if (instance.cache("cultureInfo", instance.culture)) instance.markShouldUpdate();
 		_PureContainer.prototype.explore.call(this, context, instance);
 	};
 	_proto.exploreItems = function exploreItems(context, instance, items) {
@@ -2840,6 +2860,7 @@ var Restate = /*#__PURE__*/ (function (_PureContainer) {
 				deferredUntilIdle: instance.data.deferredUntilIdle,
 				idleTimeout: instance.data.idleTimeout,
 				immediate: this.immediate,
+				cultureInfo: instance.cultureInfo,
 			},
 			key,
 		);
@@ -2849,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) {
@@ -3202,7 +3224,7 @@ var CultureScope = /*#__PURE__*/ (function (_PureContainer) {
 		_PureContainer.prototype.explore.call(this, context, instance);
 	};
 	_proto.exploreCleanup = function exploreCleanup(context, instance) {
-		popCulture();
+		popCulture(instance.culture);
 	};
 	return CultureScope;
 })(PureContainer);
@@ -4564,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.9",
+   "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

@@ -42,7 +42,7 @@ export class CultureScope extends PureContainer {
    }
 
    exploreCleanup(context, instance) {
-      popCulture();
+      popCulture(instance.culture);
    }
 }