cx 24.7.2 → 24.7.4

package/src/charts/Chart.js

@@ -1,75 +1,75 @@
-import { Widget, VDOM, getContent } from "../ui/Widget";
-import { BoundedObject } from "../svg/BoundedObject";
-import { Axis } from "./axis/Axis";
-
-export class Chart extends BoundedObject {
-   init() {
-      super.init();
-
-      if (!this.axes) this.axes = {};
-
-      for (let axis in this.axes) {
-         this.axes[axis] = Axis.create(this.axes[axis]);
-      }
-   }
-
-   explore(context, instance) {
-      instance.calculators = { ...context.axes };
-
-      context.push("axes", instance.calculators);
-      instance.axes = {};
-
-      //axes need to be registered before children to be processed first
-      for (let axis in this.axes) {
-         let axisInstance = instance.getChild(context, this.axes[axis]);
-         if (axisInstance.scheduleExploreIfVisible(context)) {
-            instance.axes[axis] = axisInstance;
-            instance.calculators[axis] = this.axes[axis].report(context, axisInstance);
-         }
-      }
-
-      super.explore(context, instance);
-   }
-
-   exploreCleanup(context, instance) {
-      context.pop("axes");
-
-      for (let axis in instance.axes) {
-         instance.axes[axis].widget.reportData(context, instance.axes[axis]);
-      }
-   }
-
-   prepare(context, instance) {
-      context.push("axes", instance.calculators);
-      super.prepare(context, instance);
-   }
-
-   prepareCleanup(context, instance) {
-      context.pop("axes");
-      super.prepareCleanup(context, instance);
-   }
-
-   render(context, instance, key) {
-      let axes = [];
-      for (let k in instance.axes) {
-         axes.push(getContent(instance.axes[k].render(context, key + "-axis-" + k)));
-      }
-
-      let result = [];
-
-      if (!this.axesOnTop) result.push(axes);
-
-      result.push(this.renderChildren(context, instance));
-
-      if (this.axesOnTop) result.push(axes);
-
-      return result;
-   }
-}
-
-Chart.prototype.anchors = "0 1 1 0";
-Chart.prototype.styled = true;
-Chart.prototype.isPureContainer = true;
-Chart.prototype.axesOnTop = false;
-
-Widget.alias("chart", Chart);
+import { Widget, VDOM, getContent } from "../ui/Widget";
+import { BoundedObject } from "../svg/BoundedObject";
+import { Axis } from "./axis/Axis";
+
+export class Chart extends BoundedObject {
+   init() {
+      super.init();
+
+      if (!this.axes) this.axes = {};
+
+      for (let axis in this.axes) {
+         this.axes[axis] = Axis.create(this.axes[axis]);
+      }
+   }
+
+   explore(context, instance) {
+      instance.calculators = { ...context.axes };
+
+      context.push("axes", instance.calculators);
+      instance.axes = {};
+
+      //axes need to be registered before children to be processed first
+      for (let axis in this.axes) {
+         let axisInstance = instance.getChild(context, this.axes[axis]);
+         if (axisInstance.scheduleExploreIfVisible(context)) {
+            instance.axes[axis] = axisInstance;
+            instance.calculators[axis] = this.axes[axis].report(context, axisInstance);
+         }
+      }
+
+      super.explore(context, instance);
+   }
+
+   exploreCleanup(context, instance) {
+      context.pop("axes");
+
+      for (let axis in instance.axes) {
+         instance.axes[axis].widget.reportData(context, instance.axes[axis]);
+      }
+   }
+
+   prepare(context, instance) {
+      context.push("axes", instance.calculators);
+      super.prepare(context, instance);
+   }
+
+   prepareCleanup(context, instance) {
+      context.pop("axes");
+      super.prepareCleanup(context, instance);
+   }
+
+   render(context, instance, key) {
+      let axes = [];
+      for (let k in instance.axes) {
+         axes.push(getContent(instance.axes[k].render(context, key + "-axis-" + k)));
+      }
+
+      let result = [];
+
+      if (!this.axesOnTop) result.push(axes);
+
+      result.push(this.renderChildren(context, instance));
+
+      if (this.axesOnTop) result.push(axes);
+
+      return result;
+   }
+}
+
+Chart.prototype.anchors = "0 1 1 0";
+Chart.prototype.styled = true;
+Chart.prototype.isPureContainer = true;
+Chart.prototype.axesOnTop = false;
+
+Widget.alias("chart", Chart);

package/src/charts/ColorMap.d.ts

@@ -1,21 +1,21 @@
-import * as Cx from "../core";
-import { PureContainer } from "../ui/PureContainer";
-
-interface ColorMapProps extends Cx.WidgetProps {
-   onGetCache?: string | (() => Cx.Record);
-   names?: Cx.Prop<string[]>;
-   step?: Cx.NumberProp;
-   offset?: Cx.NumberProp;
-   size?: Cx.NumberProp;
-}
-
-export class ColorMap extends Cx.Widget<ColorMapProps> {
-   static Scope: ColorMapScope;
-}
-
-export class ColorMapScope extends PureContainer {}
-
-export class ColorIndex {
-   acknowledge(name: string);
-   map(name: string): number;
-}
+import * as Cx from "../core";
+import { PureContainer } from "../ui/PureContainer";
+
+interface ColorMapProps extends Cx.WidgetProps {
+   onGetCache?: string | (() => Cx.Record);
+   names?: Cx.Prop<string[]>;
+   step?: Cx.NumberProp;
+   offset?: Cx.NumberProp;
+   size?: Cx.NumberProp;
+}
+
+export class ColorMap extends Cx.Widget<ColorMapProps> {
+   static Scope: ColorMapScope;
+}
+
+export class ColorMapScope extends PureContainer {}
+
+export class ColorIndex {
+   acknowledge(name: string);
+   map(name: string): number;
+}

package/src/charts/ColorMap.js

@@ -1,97 +1,97 @@
-import { Widget } from '../ui/Widget';
-import { PureContainer } from '../ui/PureContainer';
-
-export class ColorMap extends Widget {
-   declareData() {
-      super.declareData(...arguments, {
-         names: undefined,
-         offset: undefined,
-         step: undefined,
-         size: undefined,
-      })
-   }
-
-   explore(context, instance) {
-      if (!context.colorMaps)
-         context.colorMaps = {};
-
-      context.getColorMap = (colorMap) => {
-         let map = context.colorMaps[colorMap];
-         if (!map) {
-            let cache = this.onGetCache ? instance.invoke("onGetCache") : {};
-            map = cache[colorMap];
-            if (!map) {
-               let { data } = instance;
-               map = context.colorMaps[colorMap] = cache[colorMap] = new ColorIndex({
-                  offset: data.offset,
-                  step: data.step,
-                  size: data.size
-               });
-            }
-            if (Array.isArray(instance.data.names))
-               instance.data.names.forEach(name => map.acknowledge(name));
-         }
-         return map;
-      }
-   }
-
-   render() {
-      return null;
-   }
-}
-
-ColorMap.prototype.offset = 0;
-ColorMap.prototype.step = null;
-ColorMap.prototype.size = 16;
-
-export class ColorMapScope extends PureContainer {
-   explore(context, instance) {
-      context.push('colorMaps', instance.colorMaps = {});
-      super.explore(context, instance);
-   }
-
-   exploreCleanup(context, instance) {
-      context.pop('colorMaps');
-   }
-
-   prepare(context, instance) {
-      context.push('colorMaps', instance.colorMaps);
-   }
-
-   prepareCleanup(context, instance) {
-      context.pop('colorMaps');
-   }
-}
-
-ColorMap.Scope = ColorMapScope;
-Widget.alias('color-map', ColorMap);
-
-export class ColorIndex {
-   constructor({ offset, step, size }) {
-      this.colorMap = {};
-      this.dirty = true;
-      this.offset = offset;
-      this.step = step;
-      this.size = size;
-   }
-
-   acknowledge(name) {
-      if (!(name in this.colorMap)) {
-         this.colorMap[name] = Object.keys(this.colorMap).length;
-         this.dirty = true;
-      }
-   }
-
-   map(name) {
-      if (this.dirty) {
-         this.dirty = false;
-         if (!this.step) {
-            let n = Object.keys(this.colorMap).length;
-            this.step = n > 0 ? this.size / n : 1;
-         }
-      }
-
-      let index = this.colorMap[name] || 0;
-      return Math.round(this.offset + this.step * index + this.size) % this.size;
-   }
+import { Widget } from '../ui/Widget';
+import { PureContainer } from '../ui/PureContainer';
+
+export class ColorMap extends Widget {
+   declareData() {
+      super.declareData(...arguments, {
+         names: undefined,
+         offset: undefined,
+         step: undefined,
+         size: undefined,
+      })
+   }
+
+   explore(context, instance) {
+      if (!context.colorMaps)
+         context.colorMaps = {};
+
+      context.getColorMap = (colorMap) => {
+         let map = context.colorMaps[colorMap];
+         if (!map) {
+            let cache = this.onGetCache ? instance.invoke("onGetCache") : {};
+            map = cache[colorMap];
+            if (!map) {
+               let { data } = instance;
+               map = context.colorMaps[colorMap] = cache[colorMap] = new ColorIndex({
+                  offset: data.offset,
+                  step: data.step,
+                  size: data.size
+               });
+            }
+            if (Array.isArray(instance.data.names))
+               instance.data.names.forEach(name => map.acknowledge(name));
+         }
+         return map;
+      }
+   }
+
+   render() {
+      return null;
+   }
+}
+
+ColorMap.prototype.offset = 0;
+ColorMap.prototype.step = null;
+ColorMap.prototype.size = 16;
+
+export class ColorMapScope extends PureContainer {
+   explore(context, instance) {
+      context.push('colorMaps', instance.colorMaps = {});
+      super.explore(context, instance);
+   }
+
+   exploreCleanup(context, instance) {
+      context.pop('colorMaps');
+   }
+
+   prepare(context, instance) {
+      context.push('colorMaps', instance.colorMaps);
+   }
+
+   prepareCleanup(context, instance) {
+      context.pop('colorMaps');
+   }
+}
+
+ColorMap.Scope = ColorMapScope;
+Widget.alias('color-map', ColorMap);
+
+export class ColorIndex {
+   constructor({ offset, step, size }) {
+      this.colorMap = {};
+      this.dirty = true;
+      this.offset = offset;
+      this.step = step;
+      this.size = size;
+   }
+
+   acknowledge(name) {
+      if (!(name in this.colorMap)) {
+         this.colorMap[name] = Object.keys(this.colorMap).length;
+         this.dirty = true;
+      }
+   }
+
+   map(name) {
+      if (this.dirty) {
+         this.dirty = false;
+         if (!this.step) {
+            let n = Object.keys(this.colorMap).length;
+            this.step = n > 0 ? this.size / n : 1;
+         }
+      }
+
+      let index = this.colorMap[name] || 0;
+      return Math.round(this.offset + this.step * index + this.size) % this.size;
+   }
 }

package/src/charts/Column.d.ts

@@ -1,27 +1,27 @@
-import * as Cx from "../core";
-import { ColumnBarBaseProps } from "./ColumnBarBase";
-import { Selection } from "../ui/selection";
-
-interface ColumnProps extends ColumnBarBaseProps {
-   /** Column base value. Default value is `0`. */
-   y0?: Cx.NumberProp;
-
-   /** Size (width) of the column in axis units. */
-   size?: Cx.NumberProp;
-
-   /** Set to true to auto calculate size and offset. Available only if the x axis is a category axis. */
-   autoSize?: Cx.BooleanProp;
-
-   /** Base CSS class to be applied to the element. Defaults to `column`. */
-   baseClass?: boolean;
-
-   width?: number;
-
-   selection?: Selection;
-   tooltip?: Cx.StringProp;
-
-   /** Minimum column size in pixels. Useful for indicating very small values. Default value is 0.5. */
-   minPixelHeight?: number;
-}
-
-export class Column extends Cx.Widget<ColumnProps> {}
+import * as Cx from "../core";
+import { ColumnBarBaseProps } from "./ColumnBarBase";
+import { Selection } from "../ui/selection";
+
+interface ColumnProps extends ColumnBarBaseProps {
+   /** Column base value. Default value is `0`. */
+   y0?: Cx.NumberProp;
+
+   /** Size (width) of the column in axis units. */
+   size?: Cx.NumberProp;
+
+   /** Set to true to auto calculate size and offset. Available only if the x axis is a category axis. */
+   autoSize?: Cx.BooleanProp;
+
+   /** Base CSS class to be applied to the element. Defaults to `column`. */
+   baseClass?: boolean;
+
+   width?: number;
+
+   selection?: Selection;
+   tooltip?: Cx.StringProp;
+
+   /** Minimum column size in pixels. Useful for indicating very small values. Default value is 0.5. */
+   minPixelHeight?: number;
+}
+
+export class Column extends Cx.Widget<ColumnProps> {}

package/src/charts/Column.js

@@ -62,7 +62,7 @@ export class Column extends ColumnBarBase {
       var y2 = data.stacked ? instance.yAxis.stack(data.stack, data.x, data.y) : instance.yAxis.map(data.y);
 
       if (Math.abs(y2 - y1) < this.minPixelHeight) {
-         if (y1 <= y2) y2 = y1 + this.minPixelHeight;
+         if (y1 < y2) y2 = y1 + this.minPixelHeight;
          else y2 = y1 - this.minPixelHeight;
       }
 

package/src/charts/Column.scss

@@ -1,27 +1,27 @@
-
-@mixin cx-column(
-   $name: 'column',
-   $besm: $cx-besm
-) {
-   $block: map-get($besm, block);
-   $element: map-get($besm, element);
-   $state: map-get($besm, state);
-
-   .#{$element}#{$name}-rect {
-      stroke-width: 1px;
-      fill: #eee;
-      stroke: #ccc;
-
-      &.#{$state}selectable {
-         cursor: pointer;
-      }
-
-      &.#{$state}selected {
-         stroke-width: 2px;
-      }
-   }
-}
-
-@if (cx-should-include('cx/charts/Column')) {
-   @include cx-column();
+
+@mixin cx-column(
+   $name: 'column',
+   $besm: $cx-besm
+) {
+   $block: map-get($besm, block);
+   $element: map-get($besm, element);
+   $state: map-get($besm, state);
+
+   .#{$element}#{$name}-rect {
+      stroke-width: 1px;
+      fill: #eee;
+      stroke: #ccc;
+
+      &.#{$state}selectable {
+         cursor: pointer;
+      }
+
+      &.#{$state}selected {
+         stroke-width: 2px;
+      }
+   }
+}
+
+@if (cx-should-include('cx/charts/Column')) {
+   @include cx-column();
 }

package/src/charts/ColumnBarBase.d.ts

@@ -1,64 +1,64 @@
-import * as Cx from "../core";
-
-interface ColumnBarBaseProps extends Cx.StyledContainerProps {
-   /** The `x` value binding or expression. */
-   x?: Cx.Prop<string | number>;
-
-   /** The `y` value binding or expression. */
-   y?: Cx.Prop<string | number>;
-
-   disabled?: Cx.BooleanProp;
-
-   /** 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;
-
-   /** Name of the item as it will appear in the legend. */
-   name?: Cx.StringProp;
-
-   /** Used to indicate if an item is active or not. Inactive items are shown only in the legend. */
-   active?: Cx.BooleanProp;
-
-   /** Indicate that columns should be stacked on top of the other columns. Default value is `false`. */
-   stacked?: Cx.BooleanProp;
-
-   /** Name of the stack. If multiple stacks are used, each should have a unique name. Default value is `stack`. */
-   stack?: Cx.StringProp;
-
-   /** Of center offset of the column. Use this in combination with `size` to align multiple series on the same chart. */
-   offset?: Cx.NumberProp;
-
-   /** Border radius of the column/bar. */
-   borderRadius?: 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`.
-    */
-   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`.
-    */
-   yAxis?: string;
-
-   /** Name of the legend to be used. Default is `legend`. Set to `false` to hide the legend entry. */
-   legend?: string | false;
-
-   legendAction?: string;
-   legendShape?: string;
-
-   /** 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;
-}
-
-export class ColumnBarBase extends Cx.Widget<ColumnBarBaseProps> {}
+import * as Cx from "../core";
+
+interface ColumnBarBaseProps extends Cx.StyledContainerProps {
+   /** The `x` value binding or expression. */
+   x?: Cx.Prop<string | number>;
+
+   /** The `y` value binding or expression. */
+   y?: Cx.Prop<string | number>;
+
+   disabled?: Cx.BooleanProp;
+
+   /** 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;
+
+   /** Name of the item as it will appear in the legend. */
+   name?: Cx.StringProp;
+
+   /** Used to indicate if an item is active or not. Inactive items are shown only in the legend. */
+   active?: Cx.BooleanProp;
+
+   /** Indicate that columns should be stacked on top of the other columns. Default value is `false`. */
+   stacked?: Cx.BooleanProp;
+
+   /** Name of the stack. If multiple stacks are used, each should have a unique name. Default value is `stack`. */
+   stack?: Cx.StringProp;
+
+   /** Of center offset of the column. Use this in combination with `size` to align multiple series on the same chart. */
+   offset?: Cx.NumberProp;
+
+   /** Border radius of the column/bar. */
+   borderRadius?: 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`.
+    */
+   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`.
+    */
+   yAxis?: string;
+
+   /** Name of the legend to be used. Default is `legend`. Set to `false` to hide the legend entry. */
+   legend?: string | false;
+
+   legendAction?: string;
+   legendShape?: string;
+
+   /** 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;
+}
+
+export class ColumnBarBase extends Cx.Widget<ColumnBarBaseProps> {}