cx 25.2.1 → 25.4.0

package/dist/widgets.js

@@ -5193,7 +5193,7 @@ var LinkButton = /*#__PURE__*/ (function (_Button) {
 	var _proto = LinkButton.prototype;
 	_proto.init = function init() {
 		this.activeStyle = parseStyle(this.activeStyle);
-		this.inacativeStyle = parseStyle(this.inactiveStyle);
+		this.inactiveStyle = parseStyle(this.inactiveStyle);
 		_Button.prototype.init.call(this);
 	};
 	_proto.declareData = function declareData() {
@@ -11568,7 +11568,12 @@ var ColorPickerComponent = /*#__PURE__*/ (function (_VDOM$Component) {
 	var _proto2 = ColorPickerComponent.prototype;
 	_proto2.UNSAFE_componentWillReceiveProps = function UNSAFE_componentWillReceiveProps(props) {
 		var data = props.instance.data;
-		var color = this.parse(data.value);
+		var color;
+		try {
+			color = this.parse(data.value);
+		} catch (_unused) {
+			color = this.parse(null);
+		}
 		if (color.r != this.state.r || color.g != this.state.g || color.b != this.state.b || color.a != this.state.a)
 			this.setState(color);
 	};

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "cx",
-   "version": "25.2.1",
+   "version": "25.4.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

@@ -18,6 +18,24 @@ interface LegendProps extends Cx.HtmlElementProps {
 
    /** 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> {

package/src/charts/Legend.js

@@ -6,6 +6,7 @@ import { isUndefined } from "../util/isUndefined";
 import { isNonEmptyArray } from "../util/isNonEmptyArray";
 import { parseStyle } from "../util/parseStyle";
 import { withHoverSync } from "../ui/HoverSync";
+import { Format } from "../util/Format";
 
 export class Legend extends HtmlElement {
    declareData() {
@@ -13,11 +14,15 @@ export class Legend extends HtmlElement {
          shape: undefined,
          entryStyle: { structured: true },
          entryClass: { structured: true },
+         valueStyle: { structured: true },
+         valueClass: { structured: true },
+         showValues: undefined,
       });
    }
 
    init() {
       this.entryStyle = parseStyle(this.entryStyle);
+      this.valueStyle = parseStyle(this.valueStyle);
       super.init();
    }
 
@@ -36,6 +41,10 @@ export class Legend extends HtmlElement {
          case "shape":
          case "entryStyle":
          case "entryClass":
+         case "valueStyle":
+         case "valueClass":
+         case "showValues":
+         case "valueFormat":
             return false;
 
          default:
@@ -76,7 +85,11 @@ export class Legend extends HtmlElement {
       let entries = instance.legends[this.name] && instance.legends[this.name].entries,
          list;
 
-      let { entryClass, entryStyle, shape } = instance.data;
+      let { entryClass, entryStyle, shape, valueClass, valueStyle } = instance.data;
+      let valueFormatter = Format.parse(this.valueFormat);
+
+      let valueClasses = this.showValues ? CSS.expand(CSS.element(this.baseClass, "value"), valueClass) : null;
+      let entryTextClass = CSS.element(this.baseClass, "entry-text");
 
       if (isNonEmptyArray(entries)) {
          list = entries.map((e, i) =>
@@ -98,7 +111,12 @@ export class Legend extends HtmlElement {
                   onMouseLeave={onMouseLeave}
                >
                   {this.renderShape(e, shape)}
-                  <div>{e.displayText || e.name}</div>
+                  <div className={entryTextClass}>{e.displayText || e.name}</div>
+                  {this.showValues && (
+                     <div className={valueClasses} style={valueStyle}>
+                        {valueFormatter(e.value)}
+                     </div>
+                  )}
                </div>
             )),
          );
@@ -142,6 +160,8 @@ Legend.prototype.memoize = false;
 Legend.prototype.shapeSize = 18;
 Legend.prototype.shape = null;
 Legend.prototype.svgSize = 20;
+Legend.prototype.showValues = false;
+Legend.prototype.valueFormat = "s";
 
 Widget.alias("legend", Legend);
 

package/src/charts/Legend.scss

@@ -33,6 +33,14 @@
    .#{$element}#{$name}-shape {
       fill: rgba(128, 128, 128, 0.1);
    }
+
+   .#{$element}#{$name}-value {
+      order: 3;
+   }
+
+   .#{$element}#{$name}-entry-text {
+      order: 2;
+   }
 }
 
 @if (cx-should-include("cx/charts/Legend")) {

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/PieChart.d.ts

@@ -1,92 +1,92 @@
-import * as Cx from "../core";
-import { BoundedObject, BoundedObjectProps } from "../svg/BoundedObject";
-import { PropertySelection, KeySelection } from "../ui/selection";
-
-interface PieChartProps extends BoundedObjectProps {
-   /** Angle in degrees. Default is `360` which represents the full circle. */
-   angle?: Cx.NumberProp;
-
-   /** Start angle in degrees. Indicates the starting point of the first stack. Default is `0`. */
-   startAngle?: Cx.NumberProp;
-
-   /** When set to `true`, stacks are rendered in clock wise direction. */
-   clockwise?: Cx.BooleanProp;
-
-   /** Gap between slices in pixels. Default is `0` which means there is no gap. */
-   gap?: Cx.NumberProp;
-}
-
-export class PieChart extends Cx.Widget<PieChartProps> {}
-
-interface PieSliceProps extends Cx.StyledContainerProps {
-   /** Used to indicate whether an item is active or not. Inactive items are shown only in the legend. */
-   active?: Cx.BooleanProp;
-
-   /**
-    * Inner pie radius in percents of the maximum available radius.
-    *  If `percentageRadius` flag is set to false, then the value represents the radius in pixels. Default is 0.
-    */
-   r0?: Cx.NumberProp;
-
-   /**
-    * Outer pie radius in percents of the maximum available radius.
-    * If `percentageRadius` flag is set to false, then the value represents the radius in pixels. Default is 50.
-    */
-   r?: Cx.NumberProp;
-
-   /** Index of a color from the standard palette of colors. 0-15. */
-   colorIndex?: Cx.NumberProp;
-
-   /** Used to automatically assign a color based on the `name` and the contextual `ColorMap` widget. */
-   colorMap?: Cx.StringProp;
-
-   /** Name used to resolve the color. If not provided, `name` is used instead. */
-   colorName?: Cx.StringProp;
-
-   /** Value in pixels to be used to explode the pie. */
-   offset?: Cx.NumberProp;
-
-   value?: Cx.NumberProp;
-   disabled?: Cx.BooleanProp;
-   innerPointRadius?: Cx.NumberProp;
-   outerPointRadius?: Cx.NumberProp;
-
-   /** Name of the item as it will appear in the legend. */
-   name?: Cx.StringProp;
-
-   /** Multi-level pie charts consist of multiple stacks. Assign a unique name to each level. Default is `stack`. */
-   stack?: Cx.StringProp;
-
-   /** Name of the legend to be used. Default is `legend`. */
-   legend?: Cx.StringProp;
-
-   percentageRaidus?: boolean;
-
-   /** Base CSS class to be applied to the element. Defaults to `pieslice`. */
-   baseClass?: string;
-
-   legendAction?: string;
-
-   /** Text to be displayed in the legend. The default is copying the `name` value.  */
-   legendDisplayText?: Cx.StringProp;
-
-   /** Tooltip configuration. For more info see Tooltips. */
-   tooltip?: Cx.StringProp | Cx.StructuredProp;
-
-   /** Selection configuration. */
-   selection?: { type: typeof PropertySelection | typeof KeySelection; [prop: string]: any };
-
-   /** A value used to identify the group of components participating in hover effect synchronization. */
-   hoverChannel?: string;
-
-   /** A value used to uniquely identify the record within the hover sync group. */
-   hoverId?: Cx.StringProp;
-
-   /** Border radius of the slice. Default is 0. */
-   borderRadius?: Cx.NumberProp;
-
-   /** Border radius of the slice. Default is 0. */
-   br?: Cx.NumberProp;
-}
-
-export class PieSlice extends Cx.Widget<PieSliceProps> {}
+import * as Cx from "../core";
+import { BoundedObject, BoundedObjectProps } from "../svg/BoundedObject";
+import { PropertySelection, KeySelection } from "../ui/selection";
+
+interface PieChartProps extends BoundedObjectProps {
+   /** Angle in degrees. Default is `360` which represents the full circle. */
+   angle?: Cx.NumberProp;
+
+   /** Start angle in degrees. Indicates the starting point of the first stack. Default is `0`. */
+   startAngle?: Cx.NumberProp;
+
+   /** When set to `true`, stacks are rendered in clock wise direction. */
+   clockwise?: Cx.BooleanProp;
+
+   /** Gap between slices in pixels. Default is `0` which means there is no gap. */
+   gap?: Cx.NumberProp;
+}
+
+export class PieChart extends Cx.Widget<PieChartProps> {}
+
+interface PieSliceProps extends Cx.StyledContainerProps {
+   /** Used to indicate whether an item is active or not. Inactive items are shown only in the legend. */
+   active?: Cx.BooleanProp;
+
+   /**
+    * Inner pie radius in percents of the maximum available radius.
+    *  If `percentageRadius` flag is set to false, then the value represents the radius in pixels. Default is 0.
+    */
+   r0?: Cx.NumberProp;
+
+   /**
+    * Outer pie radius in percents of the maximum available radius.
+    * If `percentageRadius` flag is set to false, then the value represents the radius in pixels. Default is 50.
+    */
+   r?: Cx.NumberProp;
+
+   /** Index of a color from the standard palette of colors. 0-15. */
+   colorIndex?: Cx.NumberProp;
+
+   /** Used to automatically assign a color based on the `name` and the contextual `ColorMap` widget. */
+   colorMap?: Cx.StringProp;
+
+   /** Name used to resolve the color. If not provided, `name` is used instead. */
+   colorName?: Cx.StringProp;
+
+   /** Value in pixels to be used to explode the pie. */
+   offset?: Cx.NumberProp;
+
+   value?: Cx.NumberProp;
+   disabled?: Cx.BooleanProp;
+   innerPointRadius?: Cx.NumberProp;
+   outerPointRadius?: Cx.NumberProp;
+
+   /** Name of the item as it will appear in the legend. */
+   name?: Cx.StringProp;
+
+   /** Multi-level pie charts consist of multiple stacks. Assign a unique name to each level. Default is `stack`. */
+   stack?: Cx.StringProp;
+
+   /** Name of the legend to be used. Default is `legend`. */
+   legend?: Cx.StringProp;
+
+   percentageRaidus?: boolean;
+
+   /** Base CSS class to be applied to the element. Defaults to `pieslice`. */
+   baseClass?: string;
+
+   legendAction?: string;
+
+   /** Text to be displayed in the legend. The default is copying the `name` value.  */
+   legendDisplayText?: Cx.StringProp;
+
+   /** Tooltip configuration. For more info see Tooltips. */
+   tooltip?: Cx.StringProp | Cx.StructuredProp;
+
+   /** Selection configuration. */
+   selection?: { type: typeof PropertySelection | typeof KeySelection; [prop: string]: any };
+
+   /** A value used to identify the group of components participating in hover effect synchronization. */
+   hoverChannel?: string;
+
+   /** A value used to uniquely identify the record within the hover sync group. */
+   hoverId?: Cx.StringProp;
+
+   /** Border radius of the slice. Default is 0. */
+   borderRadius?: Cx.NumberProp;
+
+   /** Border radius of the slice. Default is 0. */
+   br?: Cx.NumberProp;
+}
+
+export class PieSlice extends Cx.Widget<PieSliceProps> {}

package/src/charts/PieChart.js

@@ -407,6 +407,7 @@ export class PieSlice extends Container {
             hoverChannel: this.hoverChannel,
             hoverSync: instance.hoverSync,
             displayText: data.legendDisplayText,
+            value: data.value,
             onClick: (e) => {
                this.onLegendClick(e, instance);
             },