cx 25.5.2 → 25.6.1

package/dist/widgets.js

@@ -10884,6 +10884,7 @@ MonthPicker.prototype.range = false;
 MonthPicker.prototype.startYear = 1980;
 MonthPicker.prototype.endYear = 2030;
 MonthPicker.prototype.bufferSize = 15;
+MonthPicker.prototype.hideQuarters = false;
 
 // Localization
 MonthPicker.prototype.maxValueErrorText = "Select {0:d} or before.";
@@ -10916,7 +10917,7 @@ var MonthPickerComponent = /*#__PURE__*/ (function (_VDOM$Component) {
 			cursorQuarter: cursor.getMonth() / 3,
 			column: "M",
 			start: widget.startYear,
-			end: widget.startYear + widget.bufferSize,
+			end: Math.min(widget.startYear + widget.bufferSize, widget.endYear),
 		};
 		_this.handleMouseDown = _this.handleMouseDown.bind(_this);
 		_this.handleMouseUp = _this.handleMouseUp.bind(_this);
@@ -11237,13 +11238,14 @@ var MonthPickerComponent = /*#__PURE__*/ (function (_VDOM$Component) {
 	};
 	_proto2.render = function render() {
 		var _this3 = this;
-		var _this$props$instance = this.props.instance,
-			data = _this$props$instance.data,
-			widget = _this$props$instance.widget;
+		var instance = this.props.instance;
+		var data = instance.data,
+			widget = instance.widget;
 		var CSS = widget.CSS,
 			baseClass = widget.baseClass,
 			startYear = widget.startYear,
-			endYear = widget.endYear;
+			endYear = widget.endYear,
+			hideQuarters = widget.hideQuarters;
 		var years = [];
 		var _this$state2 = this.state,
 			start = _this$state2.start,
@@ -11327,23 +11329,27 @@ var MonthPickerComponent = /*#__PURE__*/ (function (_VDOM$Component) {
 						),
 					);
 				}
-				row.push(
-					/*#__PURE__*/ jsx(
-						"th",
-						{
-							className: CSS.state({
-								cursor:
-									showCursor && this.state.column == "Q" && y == this.state.cursorYear && q == this.state.cursorQuarter,
-							}),
-							"data-point": "Y-" + y + "-Q-" + q,
-							onMouseEnter: this.handleMouseEnter,
-							onMouseDown: this.handleMouseDown,
-							onMouseUp: this.handleMouseUp,
-							children: "Q" + (q + 1),
-						},
-						"q" + q,
-					),
-				);
+				if (!hideQuarters)
+					row.push(
+						/*#__PURE__*/ jsx(
+							"th",
+							{
+								className: CSS.state({
+									cursor:
+										showCursor &&
+										this.state.column == "Q" &&
+										y == this.state.cursorYear &&
+										q == this.state.cursorQuarter,
+								}),
+								"data-point": "Y-" + y + "-Q-" + q,
+								onMouseEnter: this.handleMouseEnter,
+								onMouseDown: this.handleMouseDown,
+								onMouseUp: this.handleMouseUp,
+								children: "Q" + (q + 1),
+							},
+							"q" + q,
+						),
+					);
 				rows.push(row);
 			}
 			years.push(rows);
@@ -12159,7 +12165,7 @@ var MonthField = /*#__PURE__*/ (function (_Field) {
 			{
 				data: instance.data,
 				instance: instance,
-				monthPicker: {
+				monthPicker: _extends({}, this.monthPickerOptions, {
 					value: this.value,
 					from: this.from,
 					to: this.to,
@@ -12172,7 +12178,7 @@ var MonthField = /*#__PURE__*/ (function (_Field) {
 					maxExclusiveErrorText: this.maxExclusiveErrorText,
 					minValueErrorText: this.minValueErrorText,
 					minExclusiveErrorText: this.minExclusiveErrorText,
-				},
+				}),
 				label: this.labelPlacement && getContent(this.renderLabel(context, instance, "label")),
 				help: this.helpPlacement && getContent(this.renderHelp(context, instance, "help")),
 				icon: this.renderIcon(context, instance, "icon"),

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "cx",
-   "version": "25.5.2",
+   "version": "25.6.1",
    "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",
@@ -14,7 +14,7 @@
    },
    "homepage": "https://cxjs.io",
    "dependencies": {
-      "intl-io": "^0.4.3",
+      "intl-io": "^0.4.4",
       "route-parser": "^0.0.5"
    },
    "peerDependencies": {

package/src/charts/Legend.d.ts

@@ -1,45 +1,45 @@
-import * as Cx from "../core";
-
-interface LegendProps extends Cx.HtmlElementProps {
-   /** Name of the legend. Default is `legend`. */
-   name?: string;
-
-   /** Base CSS class to be applied to the element. Defaults to `legend`. */
-   baseClass?: string;
-
-   /** Switch to vertical mode. */
-   vertical?: boolean;
-
-   /** Size of the svg shape container in pixels. Default value is 20. */
-   svgSize?: number;
-
-   /** Shape size in pixels. Default value is 18. */
-   shapeSize?: number;
-
-   /** Default shape that will be applied to the all legend items. */
-   shape?: Cx.StringProp;
-
-   /** CSS style that will be applied to the legend entry. */
-   entryStyle?: Cx.StyleProp;
-
-   /** CSS class that will be applied to the legend entry. */
-   entryClass?: Cx.ClassProp;
-
-   /** CSS style that will be applied to the legend entry value segment. */
-   valueStyle?: Cx.StyleProp;
-
-   /** CSS class that will be applied to the legend entry value segment. */
-   valueClass?: Cx.ClassProp;
-
-   /** Set to true to show values. Mostly used for PieChart legends. */
-   showValues?: Cx.BooleanProp;
-
-   /** Format used for values, i.e. n;2 or currency. The default value is s.*/
-   valueFormat?: string;
-}
-
-export class Legend extends Cx.Widget<LegendProps> {
-   static Scope(): any;
-}
-
-export class LegendScope extends Cx.Widget<Cx.PureContainerProps> {}
+import * as Cx from "../core";
+
+interface LegendProps extends Cx.HtmlElementProps {
+   /** Name of the legend. Default is `legend`. */
+   name?: string;
+
+   /** Base CSS class to be applied to the element. Defaults to `legend`. */
+   baseClass?: string;
+
+   /** Switch to vertical mode. */
+   vertical?: boolean;
+
+   /** Size of the svg shape container in pixels. Default value is 20. */
+   svgSize?: number;
+
+   /** Shape size in pixels. Default value is 18. */
+   shapeSize?: number;
+
+   /** Default shape that will be applied to the all legend items. */
+   shape?: Cx.StringProp;
+
+   /** CSS style that will be applied to the legend entry. */
+   entryStyle?: Cx.StyleProp;
+
+   /** CSS class that will be applied to the legend entry. */
+   entryClass?: Cx.ClassProp;
+
+   /** CSS style that will be applied to the legend entry value segment. */
+   valueStyle?: Cx.StyleProp;
+
+   /** CSS class that will be applied to the legend entry value segment. */
+   valueClass?: Cx.ClassProp;
+
+   /** Set to true to show values. Mostly used for PieChart legends. */
+   showValues?: Cx.BooleanProp;
+
+   /** Format used for values, i.e. n;2 or currency. The default value is s.*/
+   valueFormat?: string;
+}
+
+export class Legend extends Cx.Widget<LegendProps> {
+   static Scope(): any;
+}
+
+export class LegendScope extends Cx.Widget<Cx.PureContainerProps> {}

package/src/charts/LegendEntry.js

@@ -1,128 +1,128 @@
-import { Widget, VDOM } from "../ui/Widget";
-import { getShape } from "./shapes";
-import { Selection } from "../ui/selection/Selection";
-import { stopPropagation } from "../util/eventCallbacks";
-import { isUndefined } from "../util/isUndefined";
-import { Container } from "../ui/Container";
-
-export class LegendEntry extends Container {
-   init() {
-      this.selection = Selection.create(this.selection);
-      super.init();
-   }
-
-   declareData() {
-      var selection = this.selection.configureWidget(this);
-
-      super.declareData(...arguments, selection, {
-         selected: undefined,
-         shape: undefined,
-         colorIndex: undefined,
-         colorMap: undefined,
-         colorName: undefined,
-         name: undefined,
-         active: true,
-         size: undefined,
-         rx: undefined,
-         ry: undefined,
-         text: undefined,
-      });
-   }
-
-   prepareData(context, instance) {
-      let { data } = instance;
-
-      if (data.name && !data.colorName) data.colorName = data.name;
-
-      super.prepareData(context, instance);
-   }
-
-   explore(context, instance) {
-      var { data } = instance;
-      instance.colorMap = data.colorMap && context.getColorMap && context.getColorMap(data.colorMap);
-      if (instance.colorMap && data.colorName) instance.colorMap.acknowledge(data.colorName);
-      super.explore(context, instance);
-   }
-
-   prepare(context, instance) {
-      var { data, colorMap } = instance;
-
-      if (colorMap && data.colorName) {
-         data.colorIndex = colorMap.map(data.colorName);
-         if (instance.cache("colorIndex", data.colorIndex)) instance.markShouldUpdate(context);
-      }
-   }
-
-   handleClick(e, instance) {
-      if (this.onClick && instance.invoke("onClick", e, instance) === false) return;
-
-      e.stopPropagation();
-
-      var any = this.legendAction == "auto";
-
-      if (any || this.legendAction == "toggle") if (instance.set("active", !instance.data.active)) return;
-
-      if ((any || this.legendAction == "select") && !this.selection.isDummy) this.selection.selectInstance(instance);
-   }
-
-   render(context, instance, key) {
-      let { data } = instance;
-      let content = !isUndefined(this.text) ? data.text : this.renderChildren(context, instance);
-      return (
-         <div
-            key={key}
-            className={data.classNames}
-            style={data.style}
-            onMouseDown={stopPropagation}
-            onClick={(e) => {
-               this.handleClick(e, instance);
-            }}
-         >
-            {this.renderShape(instance)}
-            {content != null && <div>{content}</div>}
-         </div>
-      );
-   }
-
-   renderShape(instance) {
-      var entry = instance.data;
-      var className = this.CSS.element(this.baseClass, "shape", {
-         disabled: entry.disabled,
-         selected: entry.selected || this.selection.isInstanceSelected(instance),
-         [`color-${entry.colorIndex}`]: entry.colorIndex != null && (isUndefined(entry.active) || entry.active),
-      });
-      var shape = getShape(entry.shape || "square");
-
-      // if the entry has a custom fill or stroke set, use it for both values
-      let style = { ...entry.style };
-      style.fill = style.fill ?? style.stroke;
-      style.stroke = style.stroke ?? style.fill;
-
-      return (
-         <svg
-            key="svg"
-            className={this.CSS.element(this.baseClass, "svg")}
-            style={{
-               width: `${this.svgSize}px`,
-               height: `${this.svgSize}px`,
-            }}
-         >
-            {shape(this.svgSize / 2, this.svgSize / 2, entry.size, {
-               style,
-               className,
-               rx: entry.rx,
-               ry: entry.ry,
-            })}
-         </svg>
-      );
-   }
-}
-
-LegendEntry.prototype.baseClass = "legendentry";
-LegendEntry.prototype.shape = "square";
-LegendEntry.prototype.legendAction = "auto";
-LegendEntry.prototype.size = 18;
-LegendEntry.prototype.svgSize = 20;
-LegendEntry.prototype.styled = true;
-
-Widget.alias("legend-entry", LegendEntry);
+import { Widget, VDOM } from "../ui/Widget";
+import { getShape } from "./shapes";
+import { Selection } from "../ui/selection/Selection";
+import { stopPropagation } from "../util/eventCallbacks";
+import { isUndefined } from "../util/isUndefined";
+import { Container } from "../ui/Container";
+
+export class LegendEntry extends Container {
+   init() {
+      this.selection = Selection.create(this.selection);
+      super.init();
+   }
+
+   declareData() {
+      var selection = this.selection.configureWidget(this);
+
+      super.declareData(...arguments, selection, {
+         selected: undefined,
+         shape: undefined,
+         colorIndex: undefined,
+         colorMap: undefined,
+         colorName: undefined,
+         name: undefined,
+         active: true,
+         size: undefined,
+         rx: undefined,
+         ry: undefined,
+         text: undefined,
+      });
+   }
+
+   prepareData(context, instance) {
+      let { data } = instance;
+
+      if (data.name && !data.colorName) data.colorName = data.name;
+
+      super.prepareData(context, instance);
+   }
+
+   explore(context, instance) {
+      var { data } = instance;
+      instance.colorMap = data.colorMap && context.getColorMap && context.getColorMap(data.colorMap);
+      if (instance.colorMap && data.colorName) instance.colorMap.acknowledge(data.colorName);
+      super.explore(context, instance);
+   }
+
+   prepare(context, instance) {
+      var { data, colorMap } = instance;
+
+      if (colorMap && data.colorName) {
+         data.colorIndex = colorMap.map(data.colorName);
+         if (instance.cache("colorIndex", data.colorIndex)) instance.markShouldUpdate(context);
+      }
+   }
+
+   handleClick(e, instance) {
+      if (this.onClick && instance.invoke("onClick", e, instance) === false) return;
+
+      e.stopPropagation();
+
+      var any = this.legendAction == "auto";
+
+      if (any || this.legendAction == "toggle") if (instance.set("active", !instance.data.active)) return;
+
+      if ((any || this.legendAction == "select") && !this.selection.isDummy) this.selection.selectInstance(instance);
+   }
+
+   render(context, instance, key) {
+      let { data } = instance;
+      let content = !isUndefined(this.text) ? data.text : this.renderChildren(context, instance);
+      return (
+         <div
+            key={key}
+            className={data.classNames}
+            style={data.style}
+            onMouseDown={stopPropagation}
+            onClick={(e) => {
+               this.handleClick(e, instance);
+            }}
+         >
+            {this.renderShape(instance)}
+            {content != null && <div>{content}</div>}
+         </div>
+      );
+   }
+
+   renderShape(instance) {
+      var entry = instance.data;
+      var className = this.CSS.element(this.baseClass, "shape", {
+         disabled: entry.disabled,
+         selected: entry.selected || this.selection.isInstanceSelected(instance),
+         [`color-${entry.colorIndex}`]: entry.colorIndex != null && (isUndefined(entry.active) || entry.active),
+      });
+      var shape = getShape(entry.shape || "square");
+
+      // if the entry has a custom fill or stroke set, use it for both values
+      let style = { ...entry.style };
+      style.fill = style.fill ?? style.stroke;
+      style.stroke = style.stroke ?? style.fill;
+
+      return (
+         <svg
+            key="svg"
+            className={this.CSS.element(this.baseClass, "svg")}
+            style={{
+               width: `${this.svgSize}px`,
+               height: `${this.svgSize}px`,
+            }}
+         >
+            {shape(this.svgSize / 2, this.svgSize / 2, entry.size, {
+               style,
+               className,
+               rx: entry.rx,
+               ry: entry.ry,
+            })}
+         </svg>
+      );
+   }
+}
+
+LegendEntry.prototype.baseClass = "legendentry";
+LegendEntry.prototype.shape = "square";
+LegendEntry.prototype.legendAction = "auto";
+LegendEntry.prototype.size = 18;
+LegendEntry.prototype.svgSize = 20;
+LegendEntry.prototype.styled = true;
+
+Widget.alias("legend-entry", LegendEntry);

package/src/charts/LegendEntry.scss

@@ -1,27 +1,27 @@
-@mixin cx-legendentry($name: "legendentry", $besm: $cx-besm) {
-   $block: map-get($besm, block);
-   $element: map-get($besm, element);
-   $state: map-get($besm, state);
-
-   .#{$block}#{$name} {
-      display: inline-flex;
-      align-items: center;
-      padding: 5px;
-      gap: 5px;
-      position: relative;
-      box-sizing: border-box;
-      cursor: pointer;
-   }
-
-   .#{$element}#{$name}-svg {
-      flex-shrink: 0;
-   }
-
-   .#{$element}#{$name}-shape {
-      fill: #eee;
-   }
-}
-
-@if (cx-should-include("cx/charts/LegendEntry")) {
-   @include cx-legendentry();
-}
+@mixin cx-legendentry($name: "legendentry", $besm: $cx-besm) {
+   $block: map-get($besm, block);
+   $element: map-get($besm, element);
+   $state: map-get($besm, state);
+
+   .#{$block}#{$name} {
+      display: inline-flex;
+      align-items: center;
+      padding: 5px;
+      gap: 5px;
+      position: relative;
+      box-sizing: border-box;
+      cursor: pointer;
+   }
+
+   .#{$element}#{$name}-svg {
+      flex-shrink: 0;
+   }
+
+   .#{$element}#{$name}-shape {
+      fill: #eee;
+   }
+}
+
+@if (cx-should-include("cx/charts/LegendEntry")) {
+   @include cx-legendentry();
+}

package/src/charts/LineGraph.js

@@ -103,7 +103,7 @@ export class LineGraph extends Widget {
          if (context.pointReducer && isArray(data.data)) {
             data.data.forEach((p, index) => {
                if (data.area && this.y0Field)
-                  context.pointReducer(p[this.xField], p[this.y0Field], data.name, p, data, index);
+                  context.pointReducer(p[this.xField], p[this.y0Field], data.name, p, data.data, index);
                context.pointReducer(p[this.xField], p[this.yField], data.name, p, data.data, index);
             });
          }