cx 24.10.6 → 24.10.7

package/dist/ui.js

@@ -3906,21 +3906,41 @@ var ContentPlaceholder = /*#__PURE__*/ (function (_PureContainer) {
 	};
 	_proto.prepare = function prepare(context, instance) {
 		var content = instance.content;
-		if (instance.cache("content", content) || (content && content.shouldUpdate)) instance.markShouldUpdate(context);
+		if (this.allowMultiple) {
+			var contentId = "";
+			var shouldUpdate = false;
+			if (content) {
+				for (var i = 0; i < content.length; i++) {
+					var c = content[i];
+					contentId += c.id + "+";
+					shouldUpdate = shouldUpdate || c.shouldUpdate;
+				}
+			}
+			if (instance.cache("content", contentId) || shouldUpdate) instance.markShouldUpdate(context);
+		} else if (instance.cache("content", content) || (content && content.shouldUpdate))
+			instance.markShouldUpdate(context);
 	};
 	_proto.setContent = function setContent(context, instance, content) {
-		instance.content = content;
+		if (this.allowMultiple) {
+			if (instance.content == null) instance.content = [];
+			instance.content.push(content);
+		} else instance.content = content;
 		content.contentPlaceholder = instance;
 	};
 	_proto.render = function render(context, instance, key) {
 		var content = instance.content;
-		if (content) return content.contentVDOM;
-		return _PureContainer.prototype.render.call(this, context, instance, key);
+		if (!content) return _PureContainer.prototype.render.call(this, context, instance, key);
+		if (this.allowMultiple)
+			return content.map(function (x) {
+				return x.contentVDOM;
+			});
+		return content.contentVDOM;
 	};
 	return ContentPlaceholder;
 })(PureContainer);
 ContentPlaceholder.prototype.name = "body";
 ContentPlaceholder.prototype.scoped = false;
+ContentPlaceholder.prototype.allowMultiple = false;
 Widget.alias("content-placeholder", ContentPlaceholder);
 var ContentPlaceholderScope = /*#__PURE__*/ (function (_PureContainer2) {
 	function ContentPlaceholderScope() {

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "cx",
-   "version": "24.10.6",
+   "version": "24.10.7",
    "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/charts/axis/TimeAxis.js

@@ -320,7 +320,7 @@ class TimeScale {
       return date.getTimezoneOffset() * 60 * 1000;
    }
 
-   getScale(tickSize, measure) {
+   getScale(tickSize, measure, minRange = 1000) {
       let { min, max, upperDeadZone, lowerDeadZone } = this;
 
       let smin = min;
@@ -368,6 +368,12 @@ class TimeScale {
          if (this.maxValue == max) smax = this.maxValuePadded;
       }
 
+      if (smax - smin < minRange) {
+         let delta = (minRange - (smax - smin)) / 2;
+         smin -= delta;
+         smax += delta;
+      }
+
       //padding should be activated only if using min/max obtained from the data
       let minPadding = this.minValue === min ? Math.max(0, smin - this.minValuePadded) : 0;
       let maxPadding = this.maxValue === max ? Math.max(0, this.maxValuePadded - smax) : 0;
@@ -420,7 +426,7 @@ class TimeScale {
    }
 
    findTickSize(minPxDist) {
-      return this.tickSizes.find(({ size }) => size * Math.abs(this.scale.factor) >= minPxDist);
+      return this.tickSizes.find(({ size, noLabels }) => !noLabels && size * Math.abs(this.scale.factor) >= minPxDist);
    }
 
    getTickSizes() {
@@ -430,6 +436,8 @@ class TimeScale {
    calculateTicks() {
       let minReached = false;
 
+      let minRange = 1000;
+
       for (let unit in miliSeconds) {
          if (!minReached) {
             if (unit == this.minTickUnit) minReached = true;
@@ -458,7 +466,7 @@ class TimeScale {
             for (let d = 0; d < divs.length; d++) {
                //if (useSnapToTicks && d < Math.min(divs.length - 1, this.snapToTicks)) continue;
                let tickSize = divs[d] * unitSize;
-               let scale = this.getScale(null, unit);
+               let scale = this.getScale(null, unit, tickSize);
                let format = this.format ?? this.getFormat(unit, scale);
                let minLabelDistance = this.minLabelDistanceFormatOverride[format] ?? this.minLabelDistance;
                let labelDistance = tickSize * Math.abs(scale.factor);
@@ -468,6 +476,7 @@ class TimeScale {
                   bestLabelDistance = labelDistance;
                   bestFormat = format;
                   bestMinLabelDistance = minLabelDistance;
+                  minRange = tickSize;
                }
             }
          }
@@ -516,10 +525,10 @@ class TimeScale {
             }
          }
          if (bestMinorTickSize != Infinity) {
-            this.tickSizes.unshift({ size: bestMinorTickSize, measure: lowerTickUnit });
+            this.tickSizes.unshift({ size: bestMinorTickSize, measure: lowerTickUnit, noLabels: true });
             if (this.tickSizes.length > 1) {
                let labelStep = this.tickSizes[1].size;
-               let lowerScale = this.getScale(null, lowerTickUnit);
+               let lowerScale = this.getScale(null, lowerTickUnit, minRange);
                if (lowerScale.max - lowerScale.min >= labelStep) this.scale = lowerScale;
             }
          }
@@ -527,7 +536,7 @@ class TimeScale {
 
       if (isNumber(this.snapToTicks) && this.snapToTicks >= 0) {
          let tickSize = this.tickSizes[Math.min(this.tickSizes.length - 1, this.snapToTicks)];
-         this.scale = this.getScale(tickSize.size, tickSize.measure);
+         this.scale = this.getScale(tickSize.size, tickSize.measure, minRange);
       }
    }
 

package/src/charts/helpers/PointReducer.js

@@ -13,8 +13,12 @@ export class PointReducer extends PureContainer {
             if (this.onInitAccumulator) instance.invoke("onInitAccumulator", accumulator, instance);
          };
 
+         let pointFilter = null;
+         if (this.onCreatePointFilter) pointFilter = instance.invoke("onCreatePointFilter", instance);
+
          instance.pointReducer = (x, y, name, data, array, index) => {
-            onMap(accumulator, x, y, name, data, array, index);
+            if (!pointFilter || pointFilter(x, y, name, data, array, index))
+               onMap(accumulator, x, y, name, data, array, index);
             if (parentPointReducer) parentPointReducer(x, y, name, data, array, index);
          };
          instance.write = () => {

package/src/ui/layout/ContentPlaceholder.d.ts

@@ -1,18 +1,19 @@
-import * as Cx from '../../core';
-import {RenderingContext} from '../RenderingContext';
-
-interface ContentPlaceholderProps extends Cx.PureContainerProps {
-
-   name?: Cx.StringProp,
-
-   scoped?: boolean
-}
-
-export class ContentPlaceholder extends Cx.Widget<ContentPlaceholderProps> {}
-
-
-interface ContentPlaceholderScopeProps extends Cx.PureContainerProps {
-   name?: string | string[]
-}
-
-export class ContentPlaceholderScope extends Cx.Widget<ContentPlaceholderScopeProps> {}
+import * as Cx from "../../core";
+import { RenderingContext } from "../RenderingContext";
+
+interface ContentPlaceholderProps extends Cx.PureContainerProps {
+   name?: Cx.StringProp;
+
+   scoped?: boolean;
+
+   /* Set to true to allow all registered content elements to render inside the placeholder. Otherwise only one element is rendered. */
+   allowMultiple?: boolean;
+}
+
+export class ContentPlaceholder extends Cx.Widget<ContentPlaceholderProps> {}
+
+interface ContentPlaceholderScopeProps extends Cx.PureContainerProps {
+   name?: string | string[];
+}
+
+export class ContentPlaceholderScope extends Cx.Widget<ContentPlaceholderScopeProps> {}

package/src/ui/layout/ContentPlaceholder.js

@@ -1,80 +1,91 @@
-import {Widget} from '../Widget';
-import {PureContainer} from '../PureContainer';
-import {isString} from "../../util/isString";
-
-export class ContentPlaceholder extends PureContainer {
-
-   declareData() {
-      super.declareData(...arguments, {
-         name: undefined
-      });
-   }
-
-   explore(context, instance) {
-      instance.content = null;
-      let {data} = instance;
-
-      const content = context.content && context.content[data.name];
-      if (content && !this.scoped)
-         this.setContent(context, instance, content);
-      else
-         context.pushNamedValue('contentPlaceholder', data.name, (content) => {
-            this.setContent(context, instance, content);
-         });
-
-      if (this.scoped)
-         instance.unregisterContentPlaceholder = () => {
-            context.popNamedValue("contentPlaceholder", data.name);
-         };
-
-      super.explore(context, instance);
-   }
-
-   prepare(context, instance) {
-      let {content} = instance;
-      if (instance.cache('content', content) || (content && content.shouldUpdate))
-         instance.markShouldUpdate(context);
-   }
-
-   setContent(context, instance, content) {
-      instance.content = content;
-      content.contentPlaceholder = instance;
-   }
-
-   render(context, instance, key) {
-      const {content} = instance;
-      if (content)
-         return content.contentVDOM;
-
-      return super.render(context, instance, key);
-   }
-}
-
-ContentPlaceholder.prototype.name = 'body';
-ContentPlaceholder.prototype.scoped = false;
-
-Widget.alias('content-placeholder', ContentPlaceholder);
-
-export class ContentPlaceholderScope extends PureContainer {
-   init() {
-      super.init();
-
-      if (isString(this.name))
-         this.name = [this.name];
-   }
-
-   explore(context, instance) {
-      this.name.forEach(name => {
-         context.pushNamedValue('contentPlaceholder', name, null);
-         context.pushNamedValue('content', name, null);
-      });
-      super.explore(context, instance);
-   }
-
-   exploreCleanup(context, instance) {
-      this.name.forEach(name => {
-         context.popNamedValue('contentPlaceholder', name);
-         context.popNamedValue('content', name);
-      });
-   }
-}
+import { Widget } from "../Widget";
+import { PureContainer } from "../PureContainer";
+import { isString } from "../../util/isString";
+
+export class ContentPlaceholder extends PureContainer {
+   declareData() {
+      super.declareData(...arguments, {
+         name: undefined,
+      });
+   }
+
+   explore(context, instance) {
+      instance.content = null;
+      let { data } = instance;
+
+      const content = context.content && context.content[data.name];
+      if (content && !this.scoped) this.setContent(context, instance, content);
+      else
+         context.pushNamedValue("contentPlaceholder", data.name, (content) => {
+            this.setContent(context, instance, content);
+         });
+
+      if (this.scoped)
+         instance.unregisterContentPlaceholder = () => {
+            context.popNamedValue("contentPlaceholder", data.name);
+         };
+
+      super.explore(context, instance);
+   }
+
+   prepare(context, instance) {
+      let { content } = instance;
+      if (this.allowMultiple) {
+         let contentId = "";
+         let shouldUpdate = false;
+         if (content) {
+            for (let i = 0; i < content.length; i++) {
+               let c = content[i];
+               contentId += c.id + "+";
+               shouldUpdate = shouldUpdate || c.shouldUpdate;
+            }
+         }
+         if (instance.cache("content", contentId) || shouldUpdate) instance.markShouldUpdate(context);
+      } else if (instance.cache("content", content) || (content && content.shouldUpdate))
+         instance.markShouldUpdate(context);
+   }
+
+   setContent(context, instance, content) {
+      if (this.allowMultiple) {
+         if (instance.content == null) instance.content = [];
+         instance.content.push(content);
+      } else instance.content = content;
+      content.contentPlaceholder = instance;
+   }
+
+   render(context, instance, key) {
+      const { content } = instance;
+      if (!content) return super.render(context, instance, key);
+      if (this.allowMultiple) return content.map((x) => x.contentVDOM);
+      return content.contentVDOM;
+   }
+}
+
+ContentPlaceholder.prototype.name = "body";
+ContentPlaceholder.prototype.scoped = false;
+ContentPlaceholder.prototype.allowMultiple = false;
+
+Widget.alias("content-placeholder", ContentPlaceholder);
+
+export class ContentPlaceholderScope extends PureContainer {
+   init() {
+      super.init();
+
+      if (isString(this.name)) this.name = [this.name];
+   }
+
+   explore(context, instance) {
+      this.name.forEach((name) => {
+         context.pushNamedValue("contentPlaceholder", name, null);
+         context.pushNamedValue("content", name, null);
+      });
+      super.explore(context, instance);
+   }
+
+   exploreCleanup(context, instance) {
+      this.name.forEach((name) => {
+         context.popNamedValue("contentPlaceholder", name);
+         context.popNamedValue("content", name);
+      });
+   }
+}