cx 26.1.1 → 26.1.2

package/src/charts/PieLabel.tsx

@@ -1,106 +1,106 @@
-/** @jsxImportSource react */
-
-import { VDOM } from "../ui/Widget";
-import { BoundedObject, BoundedObjectConfig, BoundedObjectInstance } from "../svg/BoundedObject";
-import { Rect } from "../svg/util/Rect";
-import { parseStyle } from "../util/parseStyle";
-import { RenderingContext } from "../ui/RenderingContext";
-import { NumberProp, StringProp, StyleProp } from "../ui/Prop";
-
-export interface PieLabelConfig extends BoundedObjectConfig {
-   /** Distance from the pie center. Default is `100`. */
-   distance?: NumberProp;
-
-   /** Style for the connecting line. */
-   lineStyle?: StyleProp;
-
-   /** Stroke color for the connecting line. */
-   lineStroke?: StringProp;
-
-   /** CSS class for the connecting line. */
-   lineClass?: StringProp;
-
-   /** Color index for the connecting line. */
-   lineColorIndex?: NumberProp;
-}
-
-export interface PieLabelInstance extends BoundedObjectInstance {
-   originalBounds: Rect;
-   actualBounds: Rect;
-   parentRect: Rect;
-}
-
-export class PieLabel extends BoundedObject {
-   declare baseClass: string;
-   declare distance: number;
-   declare lineStyle: any;
-
-   constructor(config: PieLabelConfig) {
-      super(config);
-   }
-
-   init(): void {
-      this.lineStyle = parseStyle(this.lineStyle);
-      super.init();
-   }
-
-   declareData(...args: any[]): void {
-      super.declareData(...args, {
-         distance: undefined,
-         lineStyle: { structured: true },
-         lineStroke: undefined,
-         lineClass: { structured: true },
-         lineColorIndex: undefined,
-      });
-   }
-
-   calculateBounds(context: RenderingContext, instance: PieLabelInstance): Rect {
-      var { data } = instance;
-      var bounds = Rect.add(Rect.add(Rect.multiply(instance.parentRect, data.anchors), data.offset), data.margin);
-      instance.originalBounds = bounds;
-      instance.actualBounds = context.placePieLabel(bounds, data.distance);
-      return new Rect({ t: 0, r: bounds.width(), b: bounds.height(), l: 0 });
-   }
-
-   prepare(context: RenderingContext, instance: PieLabelInstance): void {
-      super.prepare(context, instance);
-      if (!context.registerPieLabel)
-         throw new Error("PieLabel components are allowed only within PieLabelsContainer components.");
-      let right = instance.parentRect.r > instance.parentRect.l;
-      context.push("textDirection", right ? "right" : "left");
-      context.registerPieLabel(instance);
-   }
-
-   prepareCleanup(context: RenderingContext, instance: PieLabelInstance): void {
-      context.pop("textDirection");
-   }
-
-   render(context: RenderingContext, instance: PieLabelInstance, key: string): React.ReactNode {
-      let { originalBounds, actualBounds, data } = instance;
-
-      return (
-         <g key={key} className={data.classNames}>
-            <line
-               className={this.CSS.element(
-                  this.baseClass,
-                  "line",
-                  data.lineColorIndex != null && "color-" + data.lineColorIndex,
-               )}
-               x1={actualBounds.l < originalBounds.l ? actualBounds.r : actualBounds.l}
-               y1={(actualBounds.t + actualBounds.b) / 2}
-               x2={(originalBounds.l + originalBounds.r) / 2}
-               y2={(originalBounds.t + originalBounds.b) / 2}
-               stroke={data.lineStroke}
-               style={data.lineStyle}
-            />
-            <g transform={`translate(${instance.actualBounds.l} ${instance.actualBounds.t})`}>
-               {this.renderChildren(context, instance)}
-            </g>
-         </g>
-      );
-   }
-}
-
-PieLabel.prototype.distance = 100;
-PieLabel.prototype.baseClass = "pielabel";
-PieLabel.prototype.styled = true;
+/** @jsxImportSource react */
+
+import { VDOM } from "../ui/Widget";
+import { BoundedObject, BoundedObjectConfig, BoundedObjectInstance } from "../svg/BoundedObject";
+import { Rect } from "../svg/util/Rect";
+import { parseStyle } from "../util/parseStyle";
+import { RenderingContext } from "../ui/RenderingContext";
+import { NumberProp, StringProp, StyleProp } from "../ui/Prop";
+
+export interface PieLabelConfig extends BoundedObjectConfig {
+   /** Distance from the pie center. Default is `100`. */
+   distance?: NumberProp;
+
+   /** Style for the connecting line. */
+   lineStyle?: StyleProp;
+
+   /** Stroke color for the connecting line. */
+   lineStroke?: StringProp;
+
+   /** CSS class for the connecting line. */
+   lineClass?: StringProp;
+
+   /** Color index for the connecting line. */
+   lineColorIndex?: NumberProp;
+}
+
+export interface PieLabelInstance extends BoundedObjectInstance {
+   originalBounds: Rect;
+   actualBounds: Rect;
+   parentRect: Rect;
+}
+
+export class PieLabel extends BoundedObject {
+   declare baseClass: string;
+   declare distance: number;
+   declare lineStyle: any;
+
+   constructor(config: PieLabelConfig) {
+      super(config);
+   }
+
+   init(): void {
+      this.lineStyle = parseStyle(this.lineStyle);
+      super.init();
+   }
+
+   declareData(...args: any[]): void {
+      super.declareData(...args, {
+         distance: undefined,
+         lineStyle: { structured: true },
+         lineStroke: undefined,
+         lineClass: { structured: true },
+         lineColorIndex: undefined,
+      });
+   }
+
+   calculateBounds(context: RenderingContext, instance: PieLabelInstance): Rect {
+      var { data } = instance;
+      var bounds = Rect.add(Rect.add(Rect.multiply(instance.parentRect, data.anchors), data.offset), data.margin);
+      instance.originalBounds = bounds;
+      instance.actualBounds = context.placePieLabel(bounds, data.distance);
+      return new Rect({ t: 0, r: bounds.width(), b: bounds.height(), l: 0 });
+   }
+
+   prepare(context: RenderingContext, instance: PieLabelInstance): void {
+      super.prepare(context, instance);
+      if (!context.registerPieLabel)
+         throw new Error("PieLabel components are allowed only within PieLabelsContainer components.");
+      let right = instance.parentRect.r > instance.parentRect.l;
+      context.push("textDirection", right ? "right" : "left");
+      context.registerPieLabel(instance);
+   }
+
+   prepareCleanup(context: RenderingContext, instance: PieLabelInstance): void {
+      context.pop("textDirection");
+   }
+
+   render(context: RenderingContext, instance: PieLabelInstance, key: string): React.ReactNode {
+      let { originalBounds, actualBounds, data } = instance;
+
+      return (
+         <g key={key} className={data.classNames}>
+            <line
+               className={this.CSS.element(
+                  this.baseClass,
+                  "line",
+                  data.lineColorIndex != null && "color-" + data.lineColorIndex,
+               )}
+               x1={actualBounds.l < originalBounds.l ? actualBounds.r : actualBounds.l}
+               y1={(actualBounds.t + actualBounds.b) / 2}
+               x2={(originalBounds.l + originalBounds.r) / 2}
+               y2={(originalBounds.t + originalBounds.b) / 2}
+               stroke={data.lineStroke}
+               style={data.lineStyle}
+            />
+            <g transform={`translate(${instance.actualBounds.l} ${instance.actualBounds.t})`}>
+               {this.renderChildren(context, instance)}
+            </g>
+         </g>
+      );
+   }
+}
+
+PieLabel.prototype.distance = 100;
+PieLabel.prototype.baseClass = "pielabel";
+PieLabel.prototype.styled = true;

package/src/charts/PieLabelsContainer.ts

@@ -1,68 +1,68 @@
-import { BoundedObject, BoundedObjectConfig, BoundedObjectInstance } from "../svg/BoundedObject";
-import { Rect } from "../svg/util/Rect";
-import { RenderingContext } from "../ui/RenderingContext";
-import { PieLabelInstance } from "./PieLabel";
-
-export interface PieLabelsContainerConfig extends BoundedObjectConfig {}
-
-export interface PieLabelsContainerInstance extends BoundedObjectInstance {
-   leftLabels: PieLabelInstance[];
-   rightLabels: PieLabelInstance[];
-}
-
-export class PieLabelsContainer extends BoundedObject {
-   constructor(config: PieLabelsContainerConfig) {
-      super(config);
-   }
-
-   prepare(context: RenderingContext, instance: PieLabelsContainerInstance): void {
-      super.prepare(context, instance);
-      let { bounds } = instance.data;
-      let cx2 = bounds.l + bounds.r;
-
-      context.push("placePieLabel", (labelBounds: Rect, distance: number): Rect => {
-         let clone = new Rect(labelBounds);
-         let w = clone.r - clone.l;
-         if (clone.l + clone.r > cx2) {
-            clone.r = Math.min(clone.r + distance, bounds.r);
-            clone.l = clone.r - w;
-         } else {
-            clone.l = Math.max(bounds.l, clone.l - distance);
-            clone.r = clone.l + w;
-         }
-         return clone;
-      });
-
-      instance.leftLabels = [];
-      instance.rightLabels = [];
-
-      context.push("registerPieLabel", (label: PieLabelInstance): void => {
-         if (label.actualBounds.l + label.actualBounds.r < cx2) instance.leftLabels.push(label);
-         else instance.rightLabels.push(label);
-      });
-   }
-
-   prepareCleanup(context: RenderingContext, instance: PieLabelsContainerInstance): void {
-      context.pop("placePieLabel");
-      context.pop("registerPieLabel");
-      super.prepareCleanup(context, instance);
-      this.distributeLabels(instance.leftLabels, instance);
-      this.distributeLabels(instance.rightLabels, instance);
-   }
-
-   distributeLabels(labels: PieLabelInstance[], instance: PieLabelsContainerInstance): void {
-      labels.sort((a, b) => a.actualBounds.t + a.actualBounds.b - (b.actualBounds.t + b.actualBounds.b));
-      let totalHeight = labels.reduce((h, l) => h + l.actualBounds.height(), 0);
-      let { bounds } = instance.data;
-      let avgHeight = Math.min(totalHeight, bounds.height()) / labels.length;
-      let at = bounds.t;
-      for (let i = 0; i < labels.length; i++) {
-         let ab = labels[i].actualBounds;
-         ab.t = Math.max(at, Math.min(ab.t, bounds.b - (labels.length - i) * avgHeight));
-         ab.b = ab.t + avgHeight;
-         at = ab.b;
-      }
-   }
-}
-
-PieLabelsContainer.prototype.anchors = "0 1 1 0";
+import { BoundedObject, BoundedObjectConfig, BoundedObjectInstance } from "../svg/BoundedObject";
+import { Rect } from "../svg/util/Rect";
+import { RenderingContext } from "../ui/RenderingContext";
+import { PieLabelInstance } from "./PieLabel";
+
+export interface PieLabelsContainerConfig extends BoundedObjectConfig {}
+
+export interface PieLabelsContainerInstance extends BoundedObjectInstance {
+   leftLabels: PieLabelInstance[];
+   rightLabels: PieLabelInstance[];
+}
+
+export class PieLabelsContainer extends BoundedObject {
+   constructor(config: PieLabelsContainerConfig) {
+      super(config);
+   }
+
+   prepare(context: RenderingContext, instance: PieLabelsContainerInstance): void {
+      super.prepare(context, instance);
+      let { bounds } = instance.data;
+      let cx2 = bounds.l + bounds.r;
+
+      context.push("placePieLabel", (labelBounds: Rect, distance: number): Rect => {
+         let clone = new Rect(labelBounds);
+         let w = clone.r - clone.l;
+         if (clone.l + clone.r > cx2) {
+            clone.r = Math.min(clone.r + distance, bounds.r);
+            clone.l = clone.r - w;
+         } else {
+            clone.l = Math.max(bounds.l, clone.l - distance);
+            clone.r = clone.l + w;
+         }
+         return clone;
+      });
+
+      instance.leftLabels = [];
+      instance.rightLabels = [];
+
+      context.push("registerPieLabel", (label: PieLabelInstance): void => {
+         if (label.actualBounds.l + label.actualBounds.r < cx2) instance.leftLabels.push(label);
+         else instance.rightLabels.push(label);
+      });
+   }
+
+   prepareCleanup(context: RenderingContext, instance: PieLabelsContainerInstance): void {
+      context.pop("placePieLabel");
+      context.pop("registerPieLabel");
+      super.prepareCleanup(context, instance);
+      this.distributeLabels(instance.leftLabels, instance);
+      this.distributeLabels(instance.rightLabels, instance);
+   }
+
+   distributeLabels(labels: PieLabelInstance[], instance: PieLabelsContainerInstance): void {
+      labels.sort((a, b) => a.actualBounds.t + a.actualBounds.b - (b.actualBounds.t + b.actualBounds.b));
+      let totalHeight = labels.reduce((h, l) => h + l.actualBounds.height(), 0);
+      let { bounds } = instance.data;
+      let avgHeight = Math.min(totalHeight, bounds.height()) / labels.length;
+      let at = bounds.t;
+      for (let i = 0; i < labels.length; i++) {
+         let ab = labels[i].actualBounds;
+         ab.t = Math.max(at, Math.min(ab.t, bounds.b - (labels.length - i) * avgHeight));
+         ab.b = ab.t + avgHeight;
+         at = ab.b;
+      }
+   }
+}
+
+PieLabelsContainer.prototype.anchors = "0 1 1 0";

package/src/charts/Range.scss

@@ -1,20 +1,20 @@
-@use "sass:map";
-
-@mixin cx-range(
-   $name: 'range',
-   $besm: $cx-besm
-) {
-   $block: map.get($besm, block);
-   $element: map.get($besm, element);
-   $state: map.get($besm, state);
-
-   .#{$element}#{$name}-rect {
-      stroke-width: 0;
-      fill-opacity: 0.3;
-      fill: lightgray;
-   }
-}
-
-@if (cx-should-include('cx/charts/Range')) {
-   @include cx-range();
+@use "sass:map";
+
+@mixin cx-range(
+   $name: 'range',
+   $besm: $cx-besm
+) {
+   $block: map.get($besm, block);
+   $element: map.get($besm, element);
+   $state: map.get($besm, state);
+
+   .#{$element}#{$name}-rect {
+      stroke-width: 0;
+      fill-opacity: 0.3;
+      fill: lightgray;
+   }
+}
+
+@if (cx-should-include('cx/charts/Range')) {
+   @include cx-range();
 }