cx 25.6.3 → 25.9.0

package/dist/widgets.js

@@ -10542,7 +10542,7 @@ var Input = /*#__PURE__*/ (function (_VDOM$Component) {
 								return _this2.onChange(e.target.value, "change");
 							},
 							onBlur: function onBlur(e) {
-								_this2.onChange(e.target.value, "blur");
+								return _this2.onBlur(e);
 							},
 							onFocus: function onFocus(e) {
 								return _this2.onFocus();
@@ -10629,7 +10629,15 @@ var Input = /*#__PURE__*/ (function (_VDOM$Component) {
 			this.setState({
 				focus: true,
 			});
+			instance.set("focused", true);
+		}
+	};
+	_proto2.onBlur = function onBlur(e) {
+		var instance = this.props.instance;
+		if (instance.widget.trackFocus) {
+			instance.set("focused", false);
 		}
+		this.onChange(e.target.value, "blur");
 	};
 	return Input;
 })(VDOM.Component);
@@ -15693,6 +15701,7 @@ var Grid = /*#__PURE__*/ (function (_Container) {
 			colWidth: {},
 			lockedColWidth: {},
 			dimensionsVersion: 0,
+			disableDefaultSort: false,
 		};
 		instance.v = 0;
 		if (this.infinite)
@@ -15873,7 +15882,8 @@ var Grid = /*#__PURE__*/ (function (_Container) {
 			sortField = data.sortField;
 			data.sorters = [sorter];
 		}
-		if (!isNonEmptyArray(data.sorters) && this.defaultSortField) {
+		var skipDefaultSorting = this.clearableSort && instance.state.disableDefaultSort;
+		if (!skipDefaultSorting && !isNonEmptyArray(data.sorters) && this.defaultSortField) {
 			var _sorter = {
 				field: this.defaultSortField,
 				direction: this.defaultSortDirection || "ASC",
@@ -16432,7 +16442,10 @@ var Grid = /*#__PURE__*/ (function (_Container) {
 			) {
 				if (data.sorters[0].direction == "ASC" && (!this.clearableSort || direction == "ASC")) direction = "DESC";
 				else if (data.sorters[0].direction == "DESC" && (!this.clearableSort || direction == "DESC")) direction = "ASC";
-				else direction = null;
+				else {
+					direction = null;
+					instance.state.disableDefaultSort = true;
+				}
 			}
 			var sorters = direction
 				? [
@@ -18084,6 +18097,7 @@ var GridComponent = /*#__PURE__*/ (function (_VDOM$Component) {
 				headerHeight = this.dom.fixedHeader.offsetHeight;
 				this.dom.scroller.style.marginTop = headerHeight + "px";
 				if (this.dom.fixedScroller) this.dom.fixedScroller.style.marginTop = headerHeight + "px";
+				else if (this.dom.fixedHeader.style.left != null) this.dom.fixedHeader.style.left = null;
 			} else {
 				this.dom.scroller.style.marginTop = 0;
 				if (this.dom.fixedScroller) this.dom.fixedScroller.style.marginTop = 0;
@@ -18124,6 +18138,7 @@ var GridComponent = /*#__PURE__*/ (function (_VDOM$Component) {
 						footerHeight = this.dom.fixedFooter.offsetHeight;
 					}
 					if (this.dom.fixedScroller) this.dom.fixedFooter.style.left = this.dom.fixedScroller.offsetWidth + "px";
+					else if (this.dom.fixedFooter.style.left != null) this.dom.fixedFooter.style.left = null;
 				}
 				this.dom.scroller.style.marginBottom = footerHeight + "px";
 				if (this.dom.fixedScroller) this.dom.fixedScroller.style.marginBottom = footerHeight + "px";
@@ -18207,6 +18222,7 @@ var GridComponent = /*#__PURE__*/ (function (_VDOM$Component) {
 					instance.buffer.totalRecordCount = 0;
 					instance.buffer.page = 1;
 					this.prevFetchRecordsState = null;
+					this.loading = false;
 				}
 			}
 			if (widget.scrollSelectionIntoView && !widget.buffered) {

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "cx",
-   "version": "25.6.3",
+   "version": "25.9.0",
    "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/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/Marker.d.ts

@@ -3,7 +3,7 @@ import { BoundedObject, BoundedObjectProps } from "../svg/BoundedObject";
 
 interface MarkerProps extends BoundedObjectProps {
    /** The `x` value binding or expression. */
-   x?: Cx.Prop<string | number>;
+   x?: Cx.Prop<string | number | Date>;
 
    /** The `y` value binding or expression. */
    y?: Cx.Prop<string | number>;

package/src/charts/MarkerLine.d.ts

@@ -1,58 +1,56 @@
-import * as Cx from '../core';
-import { BoundedObject, BoundedObjectProps } from '../svg/BoundedObject';
+import * as Cx from "../core";
+import { BoundedObject, BoundedObjectProps } from "../svg/BoundedObject";
 
 interface MarkerLineProps extends BoundedObjectProps {
-   
    /** The `x1` value binding or expression. */
-   x1?: Cx.NumberProp,
+   x1?: Cx.Prop<number | string | Date>;
 
    /** The `y1` value binding or expression. */
-   y1?: Cx.NumberProp,
+   y1?: Cx.NumberProp;
 
    /** The `x2` value binding or expression. */
-   x2?: Cx.NumberProp,
+   x2?: Cx.Prop<number | string | Date>;
 
    /** The `y2` value binding or expression. */
-   y2?: Cx.NumberProp,
+   y2?: Cx.NumberProp;
 
    /** Used to indicate if the data should affect axis span. */
-   affectsAxes?: Cx.BooleanProp,
+   affectsAxes?: Cx.BooleanProp;
 
    /** Index of a color from the standard palette of colors. 0-15. */
-   colorIndex?: Cx.NumberProp,
+   colorIndex?: Cx.NumberProp;
 
    /** Used to indicate if an item is active or not. Inactive items are shown only in the legend. */
-   active?: Cx.BooleanProp,
+   active?: Cx.BooleanProp;
 
    /** Name of the item as it will appear in the legend. */
-   name?: Cx.StringProp,
+   name?: Cx.StringProp;
 
    /** Name of the legend to be used. Default is `legend`. */
-   legend?: Cx.StringProp,
+   legend?: Cx.StringProp;
 
    /** Shared `x1` and `x2` value binding or expression. */
-   x?: Cx.NumberProp,
+   x?: Cx.Prop<number | string | Date>;
 
    /** Shared `y1` and `y2` value binding or expression. */
-   y?: Cx.NumberProp,
+   y?: Cx.NumberProp;
 
-   /** 
-    * Name of the horizontal axis. The value should match one of the horizontal axes set 
-    * in the `axes` configuration of the parent `Chart` component. Default value is `x`. 
+   /**
+    * Name of the horizontal axis. The value should match one of the horizontal axes set
+    * in the `axes` configuration of the parent `Chart` component. Default value is `x`.
     */
-   xAxis?: string,
-   
-   /** 
+   xAxis?: string;
+
+   /**
     * Name of the vertical axis. The value should match one of the vertical axes set
-    *  in the axes configuration if the parent Chart component. Default value is y. 
+    *  in the axes configuration if the parent Chart component. Default value is y.
     */
-   yAxis?: string,
-   
-   /** Base CSS class to be applied to the element. Defaults to `markerline`. */
-   baseClass?: string,
+   yAxis?: string;
 
-   legendAction?: string
+   /** Base CSS class to be applied to the element. Defaults to `markerline`. */
+   baseClass?: string;
 
+   legendAction?: string;
 }
 
-export class MarkerLine extends Cx.Widget<MarkerLineProps> {}
+export class MarkerLine extends Cx.Widget<MarkerLineProps> {}