cx 26.1.1 → 26.1.3

package/src/charts/ColorMap.ts

@@ -1,150 +1,150 @@
-import { Widget, WidgetConfig } from "../ui/Widget";
-import { PureContainer, PureContainerBase, PureContainerConfig } from "../ui/PureContainer";
-import { Instance } from "../ui/Instance";
-import { RenderingContext } from "../ui/RenderingContext";
-import { Prop, NumberProp, DataRecord } from "../ui/Prop";
-
-export interface ColorMapConfig extends WidgetConfig {
-   /** A callback function used to get a cache object for storing color maps across renders. */
-   onGetCache?: string | (() => DataRecord);
-
-   /** An array of names to pre-register in the color map. */
-   names?: Prop<string[]>;
-
-   /** The step value for color indexing. If not specified, it's calculated based on the number of entries. */
-   step?: NumberProp;
-
-   /** The starting offset for color indexing. Default is 0. */
-   offset?: NumberProp;
-
-   /** The size of the color palette. Default is 16. */
-   size?: NumberProp;
-}
-
-export interface ColorMapInstance extends Instance {
-   colorMaps?: { [key: string]: ColorIndex };
-}
-
-export class ColorMap extends Widget<ColorMapConfig> {
-   declare offset: number;
-   declare step: number | null;
-   declare size: number;
-   declare onGetCache?: ColorMapConfig["onGetCache"];
-
-   static Scope: typeof ColorMapScope;
-
-   constructor(config?: ColorMapConfig) {
-      super(config);
-   }
-
-   declareData(...args: any[]) {
-      super.declareData(...args, {
-         names: undefined,
-         offset: undefined,
-         step: undefined,
-         size: undefined,
-      });
-   }
-
-   explore(context: RenderingContext, instance: Instance) {
-      if (!context.colorMaps) context.colorMaps = {};
-
-      context.getColorMap = (colorMap: string) => {
-         let map = (context.colorMaps as any)[colorMap] as ColorIndex | undefined;
-         if (!map) {
-            let cache: { [key: string]: ColorIndex } = this.onGetCache ? instance.invoke("onGetCache") : {};
-            map = cache[colorMap];
-            if (!map) {
-               let { data } = instance;
-               const d = data as any;
-               map = (context.colorMaps as any)[colorMap] = cache[colorMap] = new ColorIndex({
-                  offset: d.offset,
-                  step: d.step,
-                  size: d.size,
-               });
-            }
-            const names = (instance.data as any).names;
-            if (Array.isArray(names)) names.forEach((name: string) => map!.acknowledge(name));
-         }
-         return map;
-      };
-   }
-
-   render() {
-      return null;
-   }
-}
-
-ColorMap.prototype.offset = 0;
-ColorMap.prototype.step = null;
-ColorMap.prototype.size = 16;
-
-export interface ColorMapScopeConfig extends PureContainerConfig {}
-
-export class ColorMapScope extends PureContainerBase<ColorMapScopeConfig, ColorMapInstance> {
-   constructor(config?: ColorMapScopeConfig) {
-      super(config);
-   }
-
-   explore(context: RenderingContext, instance: ColorMapInstance) {
-      context.push("colorMaps", (instance.colorMaps = {}));
-      super.explore(context, instance);
-   }
-
-   exploreCleanup(context: RenderingContext, instance: ColorMapInstance) {
-      context.pop("colorMaps");
-   }
-
-   prepare(context: RenderingContext, instance: ColorMapInstance) {
-      context.push("colorMaps", instance.colorMaps);
-   }
-
-   prepareCleanup(context: RenderingContext, instance: ColorMapInstance) {
-      context.pop("colorMaps");
-   }
-}
-
-ColorMap.Scope = ColorMapScope;
-Widget.alias("color-map", ColorMap);
-
-export interface ColorIndexConfig {
-   offset: number;
-   step: number | null;
-   size: number;
-}
-
-export class ColorIndex {
-   colorMap: { [key: string]: number };
-   dirty: boolean;
-   offset: number;
-   step: number | null;
-   size: number;
-
-   constructor({ offset, step, size }: ColorIndexConfig) {
-      this.colorMap = {};
-      this.dirty = true;
-      this.offset = offset;
-      this.step = step;
-      this.size = size;
-   }
-
-   acknowledge(name: string) {
-      if (!(name in this.colorMap)) {
-         this.colorMap[name] = Object.keys(this.colorMap).length;
-         this.dirty = true;
-      }
-   }
-
-   map(name: string): number {
-      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, WidgetConfig } from "../ui/Widget";
+import { PureContainer, PureContainerBase, PureContainerConfig } from "../ui/PureContainer";
+import { Instance } from "../ui/Instance";
+import { RenderingContext } from "../ui/RenderingContext";
+import { Prop, NumberProp, DataRecord } from "../ui/Prop";
+
+export interface ColorMapConfig extends WidgetConfig {
+   /** A callback function used to get a cache object for storing color maps across renders. */
+   onGetCache?: string | (() => DataRecord);
+
+   /** An array of names to pre-register in the color map. */
+   names?: Prop<string[]>;
+
+   /** The step value for color indexing. If not specified, it's calculated based on the number of entries. */
+   step?: NumberProp;
+
+   /** The starting offset for color indexing. Default is 0. */
+   offset?: NumberProp;
+
+   /** The size of the color palette. Default is 16. */
+   size?: NumberProp;
+}
+
+export interface ColorMapInstance extends Instance {
+   colorMaps?: { [key: string]: ColorIndex };
+}
+
+export class ColorMap extends Widget<ColorMapConfig> {
+   declare offset: number;
+   declare step: number | null;
+   declare size: number;
+   declare onGetCache?: ColorMapConfig["onGetCache"];
+
+   static Scope: typeof ColorMapScope;
+
+   constructor(config?: ColorMapConfig) {
+      super(config);
+   }
+
+   declareData(...args: any[]) {
+      super.declareData(...args, {
+         names: undefined,
+         offset: undefined,
+         step: undefined,
+         size: undefined,
+      });
+   }
+
+   explore(context: RenderingContext, instance: Instance) {
+      if (!context.colorMaps) context.colorMaps = {};
+
+      context.getColorMap = (colorMap: string) => {
+         let map = (context.colorMaps as any)[colorMap] as ColorIndex | undefined;
+         if (!map) {
+            let cache: { [key: string]: ColorIndex } = this.onGetCache ? instance.invoke("onGetCache") : {};
+            map = cache[colorMap];
+            if (!map) {
+               let { data } = instance;
+               const d = data as any;
+               map = (context.colorMaps as any)[colorMap] = cache[colorMap] = new ColorIndex({
+                  offset: d.offset,
+                  step: d.step,
+                  size: d.size,
+               });
+            }
+            const names = (instance.data as any).names;
+            if (Array.isArray(names)) names.forEach((name: string) => map!.acknowledge(name));
+         }
+         return map;
+      };
+   }
+
+   render() {
+      return null;
+   }
+}
+
+ColorMap.prototype.offset = 0;
+ColorMap.prototype.step = null;
+ColorMap.prototype.size = 16;
+
+export interface ColorMapScopeConfig extends PureContainerConfig {}
+
+export class ColorMapScope extends PureContainerBase<ColorMapScopeConfig, ColorMapInstance> {
+   constructor(config?: ColorMapScopeConfig) {
+      super(config);
+   }
+
+   explore(context: RenderingContext, instance: ColorMapInstance) {
+      context.push("colorMaps", (instance.colorMaps = {}));
+      super.explore(context, instance);
+   }
+
+   exploreCleanup(context: RenderingContext, instance: ColorMapInstance) {
+      context.pop("colorMaps");
+   }
+
+   prepare(context: RenderingContext, instance: ColorMapInstance) {
+      context.push("colorMaps", instance.colorMaps);
+   }
+
+   prepareCleanup(context: RenderingContext, instance: ColorMapInstance) {
+      context.pop("colorMaps");
+   }
+}
+
+ColorMap.Scope = ColorMapScope;
+Widget.alias("color-map", ColorMap);
+
+export interface ColorIndexConfig {
+   offset: number;
+   step: number | null;
+   size: number;
+}
+
+export class ColorIndex {
+   colorMap: { [key: string]: number };
+   dirty: boolean;
+   offset: number;
+   step: number | null;
+   size: number;
+
+   constructor({ offset, step, size }: ColorIndexConfig) {
+      this.colorMap = {};
+      this.dirty = true;
+      this.offset = offset;
+      this.step = step;
+      this.size = size;
+   }
+
+   acknowledge(name: string) {
+      if (!(name in this.colorMap)) {
+         this.colorMap[name] = Object.keys(this.colorMap).length;
+         this.dirty = true;
+      }
+   }
+
+   map(name: string): number {
+      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.scss

@@ -1,29 +1,29 @@
-
-@use "sass:map";
-
-@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();
+
+@use "sass:map";
+
+@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/Column.ts

@@ -1,124 +1,124 @@
-import { Widget, VDOM } from "../ui/Widget";
-import { ColumnBarBase, ColumnBarBaseConfig, ColumnBarBaseInstance } from "./ColumnBarBase";
-import { Rect } from "../svg/util/Rect";
-import { isDefined } from "../util/isDefined";
-import { RenderingContext } from "../ui/RenderingContext";
-import { NumberProp, BooleanProp } from "../ui/Prop";
-
-export interface ColumnConfig extends ColumnBarBaseConfig {
-   /** Column base value. Default value is `0`. */
-   y0?: NumberProp;
-
-   /** Size (width) of the column in axis units. */
-   size?: NumberProp;
-
-   /** Set to true to auto calculate size and offset. Available only if the x axis is a category axis. */
-   autoSize?: BooleanProp;
-
-   /** Alias for size. */
-   width?: number;
-
-   /** Minimum column size in pixels. Useful for indicating very small values. Default value is 0.5. */
-   minPixelHeight?: number;
-
-   /** Hide the base of the column (y0). */
-   hiddenBase?: boolean;
-}
-
-export class Column extends ColumnBarBase {
-   declare y0: number;
-   declare size: number;
-   declare autoSize: boolean;
-   declare width: number;
-   declare minPixelHeight: number;
-   declare hiddenBase: boolean;
-
-   constructor(config: ColumnConfig) {
-      super(config);
-   }
-
-   init(): void {
-      if (isDefined(this.width)) this.size = this.width;
-
-      super.init();
-   }
-
-   declareData(...args: any[]): any {
-      return super.declareData(
-         {
-            y0: undefined,
-            size: undefined,
-            autoSize: undefined,
-         },
-         ...args,
-      );
-   }
-
-   checkValid(data: any): boolean {
-      return data.x != null && data.y != null && data.y0 != null;
-   }
-
-   explore(context: RenderingContext, instance: ColumnBarBaseInstance): void {
-      let { data, xAxis, yAxis } = instance;
-
-      instance.colorMap = data.colorMap && context.getColorMap && context.getColorMap(data.colorMap);
-      if (instance.colorMap && data.colorName) instance.colorMap.acknowledge(data.colorName);
-
-      if (!data.valid) return;
-
-      if (data.active) {
-         xAxis.acknowledge(data.x, data.size, data.offset);
-
-         if (data.autoSize) xAxis.book(data.x, data.stacked ? data.stack : data.name);
-
-         if (data.stacked) {
-            yAxis.stacknowledge(data.stack, data.x, data.y0);
-            yAxis.stacknowledge(data.stack, data.x, data.y);
-         } else {
-            if (!this.hiddenBase) yAxis.acknowledge(data.y0);
-            yAxis.acknowledge(data.y);
-         }
-         super.explore(context, instance);
-      }
-   }
-
-   calculateRect(instance: ColumnBarBaseInstance): Rect {
-      var { data } = instance;
-      var { offset, size } = data;
-
-      if (data.autoSize) {
-         var [index, count] = instance.xAxis.locate(data.x, data.stacked ? data.stack : data.name);
-         offset = (size / count) * (index - count / 2 + 0.5);
-         size = size / count;
-      }
-
-      var x1 = instance.xAxis.map(data.x, offset - size / 2);
-      var x2 = instance.xAxis.map(data.x, offset + size / 2);
-      var y1 = data.stacked ? instance.yAxis.stack(data.stack, data.x, data.y0) : instance.yAxis.map(data.y0);
-      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;
-         else y2 = y1 - this.minPixelHeight;
-      }
-
-      var bounds = new Rect({
-         l: Math.min(x1, x2),
-         r: Math.max(x1, x2),
-         t: Math.min(y1, y2),
-         b: Math.max(y1, y2),
-      });
-
-      return bounds;
-   }
-}
-
-Column.prototype.baseClass = "column";
-Column.prototype.y0 = 0;
-Column.prototype.size = 1;
-Column.prototype.autoSize = false;
-Column.prototype.legendShape = "column";
-Column.prototype.hiddenBase = false;
-Column.prototype.minPixelHeight = 0.5;
-
-Widget.alias("column", Column);
+import { Widget, VDOM } from "../ui/Widget";
+import { ColumnBarBase, ColumnBarBaseConfig, ColumnBarBaseInstance } from "./ColumnBarBase";
+import { Rect } from "../svg/util/Rect";
+import { isDefined } from "../util/isDefined";
+import { RenderingContext } from "../ui/RenderingContext";
+import { NumberProp, BooleanProp } from "../ui/Prop";
+
+export interface ColumnConfig extends ColumnBarBaseConfig {
+   /** Column base value. Default value is `0`. */
+   y0?: NumberProp;
+
+   /** Size (width) of the column in axis units. */
+   size?: NumberProp;
+
+   /** Set to true to auto calculate size and offset. Available only if the x axis is a category axis. */
+   autoSize?: BooleanProp;
+
+   /** Alias for size. */
+   width?: number;
+
+   /** Minimum column size in pixels. Useful for indicating very small values. Default value is 0.5. */
+   minPixelHeight?: number;
+
+   /** Hide the base of the column (y0). */
+   hiddenBase?: boolean;
+}
+
+export class Column extends ColumnBarBase {
+   declare y0: number;
+   declare size: number;
+   declare autoSize: boolean;
+   declare width: number;
+   declare minPixelHeight: number;
+   declare hiddenBase: boolean;
+
+   constructor(config: ColumnConfig) {
+      super(config);
+   }
+
+   init(): void {
+      if (isDefined(this.width)) this.size = this.width;
+
+      super.init();
+   }
+
+   declareData(...args: any[]): any {
+      return super.declareData(
+         {
+            y0: undefined,
+            size: undefined,
+            autoSize: undefined,
+         },
+         ...args,
+      );
+   }
+
+   checkValid(data: any): boolean {
+      return data.x != null && data.y != null && data.y0 != null;
+   }
+
+   explore(context: RenderingContext, instance: ColumnBarBaseInstance): void {
+      let { data, xAxis, yAxis } = instance;
+
+      instance.colorMap = data.colorMap && context.getColorMap && context.getColorMap(data.colorMap);
+      if (instance.colorMap && data.colorName) instance.colorMap.acknowledge(data.colorName);
+
+      if (!data.valid) return;
+
+      if (data.active) {
+         xAxis.acknowledge(data.x, data.size, data.offset);
+
+         if (data.autoSize) xAxis.book(data.x, data.stacked ? data.stack : data.name);
+
+         if (data.stacked) {
+            yAxis.stacknowledge(data.stack, data.x, data.y0);
+            yAxis.stacknowledge(data.stack, data.x, data.y);
+         } else {
+            if (!this.hiddenBase) yAxis.acknowledge(data.y0);
+            yAxis.acknowledge(data.y);
+         }
+         super.explore(context, instance);
+      }
+   }
+
+   calculateRect(instance: ColumnBarBaseInstance): Rect {
+      var { data } = instance;
+      var { offset, size } = data;
+
+      if (data.autoSize) {
+         var [index, count] = instance.xAxis.locate(data.x, data.stacked ? data.stack : data.name);
+         offset = (size / count) * (index - count / 2 + 0.5);
+         size = size / count;
+      }
+
+      var x1 = instance.xAxis.map(data.x, offset - size / 2);
+      var x2 = instance.xAxis.map(data.x, offset + size / 2);
+      var y1 = data.stacked ? instance.yAxis.stack(data.stack, data.x, data.y0) : instance.yAxis.map(data.y0);
+      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;
+         else y2 = y1 - this.minPixelHeight;
+      }
+
+      var bounds = new Rect({
+         l: Math.min(x1, x2),
+         r: Math.max(x1, x2),
+         t: Math.min(y1, y2),
+         b: Math.max(y1, y2),
+      });
+
+      return bounds;
+   }
+}
+
+Column.prototype.baseClass = "column";
+Column.prototype.y0 = 0;
+Column.prototype.size = 1;
+Column.prototype.autoSize = false;
+Column.prototype.legendShape = "column";
+Column.prototype.hiddenBase = false;
+Column.prototype.minPixelHeight = 0.5;
+
+Widget.alias("column", Column);