cx 26.0.14 → 26.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
    "name": "cx",
-   "version": "26.0.14",
+   "version": "26.1.1",
    "description": "Advanced JavaScript UI framework for admin and dashboard applications with ready to use grid, form and chart components.",
    "exports": {
       "./data": {
@@ -73,9 +73,11 @@
       "route-parser": "^0.0.5"
    },
    "peerDependencies": {
-      "@types/react": "*",
-      "react": "*",
-      "react-dom": "*"
+      "@types/react": ">=18",
+      "@types/react-dom": ">=18",
+      "cx-react": ">=26",
+      "react": ">=18",
+      "react-dom": ">=18"
    },
    "repository": {
       "type": "git",
@@ -84,10 +86,11 @@
    "devDependencies": {
       "@types/jest": "^30.0.0",
       "@types/mocha": "^10.0.10",
-      "@types/node": "^22.10.2",
-      "@types/react-dom": "^18.3.1",
-      "@types/react-test-renderer": "^18.3.1",
-      "react-test-renderer": "^18.3.1",
+      "@types/node": "^25.0.3",
+      "@types/react-dom": "^19.2.3",
+      "@types/react-test-renderer": "^19.1.0",
+      "mocha": "^11.7.5",
+      "react-test-renderer": "^19.2.3",
       "ts-mocha": "^11.1.0",
       "ts-node": "^10.9.2",
       "tsconfig-paths": "^4.2.0",

package/src/charts/Chart.ts

@@ -1,108 +1,108 @@
-import { Widget, VDOM, getContent } from "../ui/Widget";
-import { BoundedObject, BoundedObjectConfig, BoundedObjectInstance, SvgRenderingContext } from "../svg/BoundedObject";
-import { Axis } from "./axis/Axis";
-import type { NumericAxis } from "./axis/NumericAxis";
-import type { CategoryAxis } from "./axis/CategoryAxis";
-import type { TimeAxis } from "./axis/TimeAxis";
-import { RenderingContext } from "../ui/RenderingContext";
-import { Create } from "../util/Component";
-
-/** Typed context interface for chart-related context properties */
-export interface ChartRenderingContext extends SvgRenderingContext {
-   axes?: Record<string, any>;
-}
-
-export interface ChartConfig extends BoundedObjectConfig {
-   /** Axis definition. Each key represent an axis, and each value hold axis configuration. */
-   axes?: Record<
-      string,
-      Create<typeof Axis> | Create<typeof NumericAxis> | Create<typeof CategoryAxis> | Create<typeof TimeAxis>
-   >;
-
-   /** Put axes over data series. */
-   axesOnTop?: boolean;
-}
-
-export interface ChartInstance extends BoundedObjectInstance {
-   calculators: Record<string, any>;
-   axes: Record<string, any>;
-}
-
-export class Chart extends BoundedObject<ChartConfig, ChartInstance> {
-   declare axes: Record<string, any>;
-   declare axesOnTop: boolean;
-
-   constructor(config?: ChartConfig) {
-      super(config);
-   }
-
-   init(): void {
-      super.init();
-
-      if (!this.axes) this.axes = {};
-
-      for (let axis in this.axes) {
-         this.axes[axis] = Axis.create(this.axes[axis]);
-      }
-   }
-
-   explore(context: ChartRenderingContext, instance: ChartInstance): void {
-      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: ChartRenderingContext, instance: ChartInstance): void {
-      context.pop("axes");
-
-      for (let axis in instance.axes) {
-         instance.axes[axis].widget.reportData(context, instance.axes[axis]);
-      }
-   }
-
-   prepare(context: ChartRenderingContext, instance: ChartInstance): void {
-      context.push("axes", instance.calculators);
-      super.prepare(context, instance);
-   }
-
-   prepareCleanup(context: ChartRenderingContext, instance: ChartInstance): void {
-      context.pop("axes");
-      super.prepareCleanup(context, instance);
-   }
-
-   render(context: ChartRenderingContext, instance: ChartInstance, key: string): any[] {
-      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, BoundedObjectConfig, BoundedObjectInstance, SvgRenderingContext } from "../svg/BoundedObject";
+import { Axis } from "./axis/Axis";
+import type { NumericAxis } from "./axis/NumericAxis";
+import type { CategoryAxis } from "./axis/CategoryAxis";
+import type { TimeAxis } from "./axis/TimeAxis";
+import { RenderingContext } from "../ui/RenderingContext";
+import { Create } from "../util/Component";
+
+/** Typed context interface for chart-related context properties */
+export interface ChartRenderingContext extends SvgRenderingContext {
+   axes?: Record<string, any>;
+}
+
+export interface ChartConfig extends BoundedObjectConfig {
+   /** Axis definition. Each key represent an axis, and each value hold axis configuration. */
+   axes?: Record<
+      string,
+      Create<typeof Axis> | Create<typeof NumericAxis> | Create<typeof CategoryAxis> | Create<typeof TimeAxis>
+   >;
+
+   /** Put axes over data series. */
+   axesOnTop?: boolean;
+}
+
+export interface ChartInstance extends BoundedObjectInstance {
+   calculators: Record<string, any>;
+   axes: Record<string, any>;
+}
+
+export class Chart extends BoundedObject<ChartConfig, ChartInstance> {
+   declare axes: Record<string, any>;
+   declare axesOnTop: boolean;
+
+   constructor(config?: ChartConfig) {
+      super(config);
+   }
+
+   init(): void {
+      super.init();
+
+      if (!this.axes) this.axes = {};
+
+      for (let axis in this.axes) {
+         this.axes[axis] = Axis.create(this.axes[axis]);
+      }
+   }
+
+   explore(context: ChartRenderingContext, instance: ChartInstance): void {
+      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: ChartRenderingContext, instance: ChartInstance): void {
+      context.pop("axes");
+
+      for (let axis in instance.axes) {
+         instance.axes[axis].widget.reportData(context, instance.axes[axis]);
+      }
+   }
+
+   prepare(context: ChartRenderingContext, instance: ChartInstance): void {
+      context.push("axes", instance.calculators);
+      super.prepare(context, instance);
+   }
+
+   prepareCleanup(context: ChartRenderingContext, instance: ChartInstance): void {
+      context.pop("axes");
+      super.prepareCleanup(context, instance);
+   }
+
+   render(context: ChartRenderingContext, instance: ChartInstance, key: string): any[] {
+      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/core.d.ts

@@ -1,182 +1,182 @@
-export = Cx;
-export as namespace Cx;
-
-import * as React from "react";
-import { Instance } from "./ui/Instance";
-import { RenderingContext } from "./ui/RenderingContext";
-import { AccessorChain as AccessorChainType } from "./data/createAccessorModelProxy";
-import { Selector as SelectorType } from "./data/Selector";
-import type {
-   Bind as BindType,
-   Tpl as TplType,
-   Expr as ExprType,
-   Binding as BindingType,
-   GetSet as GetSetType,
-   Prop as PropType,
-   StructuredSelector as StructuredSelectorType,
-   DataRecord,
-   Config as ConfigType,
-   StructuredProp as StructuredPropType,
-   StringProp as StringPropType,
-   StyleProp as StylePropType,
-   NumberProp as NumberPropType,
-   BooleanProp as BooleanPropType,
-   ClassProp as ClassPropType,
-   RecordsProp as RecordsPropType,
-   SortersProp as SortersPropType,
-   UnknownProp as UnknownPropType,
-   RecordAlias as RecordAliasType,
-   SortDirection as SortDirectionType,
-   Sorter as SorterType,
-   CollatorOptions as CollatorOptionsType,
-} from "./ui/Prop";
-
-/** @deprecated */
-declare namespace Cx {
-   // Re-export AccessorChain type from createAccessorModelProxy
-   type AccessorChain<M> = AccessorChainType<M>;
-
-   // Re-export Selector type from data/Selector
-   type Selector<T> = SelectorType<T>;
-
-   // Re-export binding types from Prop.ts
-   type Bind = BindType;
-   type Tpl = TplType;
-   type Expr = ExprType;
-   type Binding = BindingType;
-   type GetSet<T> = GetSetType<T>;
-
-   // Re-export types from Prop.ts
-   type Prop<T> = PropType<T>;
-
-   interface StructuredSelector extends StructuredSelectorType {}
-
-   interface Record extends DataRecord {}
-
-   interface Config extends ConfigType {}
-
-   interface StructuredProp extends StructuredPropType {}
-
-   type StringProp = StringPropType;
-   type StyleProp = StylePropType;
-   type NumberProp = NumberPropType;
-   type BooleanProp = BooleanPropType;
-   type ClassProp = ClassPropType;
-   type RecordsProp = RecordsPropType;
-   type SortersProp = SortersPropType;
-   type UnknownProp = UnknownPropType;
-
-   type RecordAlias = RecordAliasType;
-
-   /** @deprecated */
-   interface WidgetProps {
-      /** Inner layout used to display children inside the widget. */
-      layout?: any;
-
-      /** Outer (wrapper) layout used to display the widget in. */
-      outerLayout?: any;
-
-      /** Name of the ContentPlaceholder that should be used to display the widget. */
-      putInto?: string;
-
-      /** Name of the ContentPlaceholder that should be used to display the widget. */
-      contentFor?: string;
-
-      /** Controller. */
-      controller?: any;
-
-      /** Visibility of the widget. Defaults to `true`. */
-      visible?: BooleanProp;
-
-      /** Visibility of the widget. Defaults to `true`. */
-      if?: BooleanProp;
-
-      /** Appearance modifier. For example, mod="big" will add the CSS class `.cxm-big` to the block element. */
-      mod?: StringProp | Prop<string[]> | StructuredProp;
-
-      /** Cache render output. Default is `true`. */
-      memoize?: BooleanProp;
-
-      /** Widget supports class, className and style attributes. */
-      styled?: boolean;
-
-      /** Key that will be used as the key when rendering the React component.  */
-      vdomKey?: string;
-
-      onExplore?(context?: any, instance?: any): void;
-
-      onPrepare?(context?: any, instance?: any): void;
-
-      onCleanup?(context?: any, instance?: any): void;
-
-      onDestroy?(): void;
-   }
-
-   /** @deprecated */
-   interface PureContainerProps extends WidgetProps {
-      /** Keep whitespace in text based children. Default is `false`. See also `trimWhitespace`. */
-      ws?: boolean;
-
-      /** Remove all whitespace in text based children. Default is `true`. See also `preserveWhitespace`. */
-      trimWhitespace?: boolean;
-
-      /** Keep whitespace in text based children. Default is `false`. See also `trimWhitespace`. */
-      preserveWhitespace?: boolean;
-
-      /** List of child elements. */
-      items?: any;
-
-      /** List of child elements. */
-      children?: React.ReactNode;
-
-      plainText?: boolean;
-   }
-
-   /** @deprecated */
-   interface StyledContainerProps extends PureContainerProps {
-      /**
-       * Additional CSS classes to be applied to the element.
-       * If an object is provided, all keys with a "truthy" value will be added to the CSS class list.
-       */
-      class?: ClassProp;
-
-      /**
-       * Additional CSS classes to be applied to the element.
-       * If an object is provided, all keys with a "truthy" value will be added to the CSS class list.
-       */
-      className?: ClassProp;
-
-      /** Style object applied to the element */
-      style?: StyleProp;
-
-      /** Style object applied to the element */
-      styles?: StyleProp;
-   }
-
-   /** @deprecated */
-   interface HtmlElementProps extends StyledContainerProps {
-      /** Id of the element */
-      id?: Cx.StringProp | Cx.NumberProp;
-
-      /** Inner text contents. */
-      text?: Cx.StringProp | Cx.NumberProp;
-
-      /** Tooltip configuration. */
-      tooltip?: StringProp | StructuredProp;
-
-      // onMouseDown?: string | ((event: MouseEvent, instance: any) => void);
-      // onMouseMove?: string | ((event: MouseEvent, instance: any) => void);
-      // onMouseUp?: string | ((event: MouseEvent, instance: any) => void);
-      // onTouchStart?: string | ((event: TouchEvent, instance: any) => void);
-      // onTouchMove?: string | ((event: TouchEvent, instance: any) => void);
-      // onTouchEnd?: string | ((event: TouchEvent, instance: any) => void);
-      // onClick?: string | ((event: MouseEvent, instance: any) => void);
-      // onContextMenu?: string | ((event: MouseEvent, instance: any) => void);
-   }
-
-   type SortDirection = SortDirectionType;
-
-   interface Sorter extends SorterType {}
-
-   interface CollatorOptions extends CollatorOptionsType {}
-}
+export = Cx;
+export as namespace Cx;
+
+import * as React from "react";
+import { Instance } from "./ui/Instance";
+import { RenderingContext } from "./ui/RenderingContext";
+import { AccessorChain as AccessorChainType } from "./data/createAccessorModelProxy";
+import { Selector as SelectorType } from "./data/Selector";
+import type {
+   Bind as BindType,
+   Tpl as TplType,
+   Expr as ExprType,
+   Binding as BindingType,
+   GetSet as GetSetType,
+   Prop as PropType,
+   StructuredSelector as StructuredSelectorType,
+   DataRecord,
+   Config as ConfigType,
+   StructuredProp as StructuredPropType,
+   StringProp as StringPropType,
+   StyleProp as StylePropType,
+   NumberProp as NumberPropType,
+   BooleanProp as BooleanPropType,
+   ClassProp as ClassPropType,
+   RecordsProp as RecordsPropType,
+   SortersProp as SortersPropType,
+   UnknownProp as UnknownPropType,
+   RecordAlias as RecordAliasType,
+   SortDirection as SortDirectionType,
+   Sorter as SorterType,
+   CollatorOptions as CollatorOptionsType,
+} from "./ui/Prop";
+
+/** @deprecated */
+declare namespace Cx {
+   // Re-export AccessorChain type from createAccessorModelProxy
+   type AccessorChain<M> = AccessorChainType<M>;
+
+   // Re-export Selector type from data/Selector
+   type Selector<T> = SelectorType<T>;
+
+   // Re-export binding types from Prop.ts
+   type Bind = BindType;
+   type Tpl = TplType;
+   type Expr = ExprType;
+   type Binding = BindingType;
+   type GetSet<T> = GetSetType<T>;
+
+   // Re-export types from Prop.ts
+   type Prop<T> = PropType<T>;
+
+   interface StructuredSelector extends StructuredSelectorType {}
+
+   interface Record extends DataRecord {}
+
+   interface Config extends ConfigType {}
+
+   interface StructuredProp extends StructuredPropType {}
+
+   type StringProp = StringPropType;
+   type StyleProp = StylePropType;
+   type NumberProp = NumberPropType;
+   type BooleanProp = BooleanPropType;
+   type ClassProp = ClassPropType;
+   type RecordsProp = RecordsPropType;
+   type SortersProp = SortersPropType;
+   type UnknownProp = UnknownPropType;
+
+   type RecordAlias = RecordAliasType;
+
+   /** @deprecated */
+   interface WidgetProps {
+      /** Inner layout used to display children inside the widget. */
+      layout?: any;
+
+      /** Outer (wrapper) layout used to display the widget in. */
+      outerLayout?: any;
+
+      /** Name of the ContentPlaceholder that should be used to display the widget. */
+      putInto?: string;
+
+      /** Name of the ContentPlaceholder that should be used to display the widget. */
+      contentFor?: string;
+
+      /** Controller. */
+      controller?: any;
+
+      /** Visibility of the widget. Defaults to `true`. */
+      visible?: BooleanProp;
+
+      /** Visibility of the widget. Defaults to `true`. */
+      if?: BooleanProp;
+
+      /** Appearance modifier. For example, mod="big" will add the CSS class `.cxm-big` to the block element. */
+      mod?: StringProp | Prop<string[]> | StructuredProp;
+
+      /** Cache render output. Default is `true`. */
+      memoize?: BooleanProp;
+
+      /** Widget supports class, className and style attributes. */
+      styled?: boolean;
+
+      /** Key that will be used as the key when rendering the React component.  */
+      vdomKey?: string;
+
+      onExplore?(context?: any, instance?: any): void;
+
+      onPrepare?(context?: any, instance?: any): void;
+
+      onCleanup?(context?: any, instance?: any): void;
+
+      onDestroy?(): void;
+   }
+
+   /** @deprecated */
+   interface PureContainerProps extends WidgetProps {
+      /** Keep whitespace in text based children. Default is `false`. See also `trimWhitespace`. */
+      ws?: boolean;
+
+      /** Remove all whitespace in text based children. Default is `true`. See also `preserveWhitespace`. */
+      trimWhitespace?: boolean;
+
+      /** Keep whitespace in text based children. Default is `false`. See also `trimWhitespace`. */
+      preserveWhitespace?: boolean;
+
+      /** List of child elements. */
+      items?: any;
+
+      /** List of child elements. */
+      children?: React.ReactNode;
+
+      plainText?: boolean;
+   }
+
+   /** @deprecated */
+   interface StyledContainerProps extends PureContainerProps {
+      /**
+       * Additional CSS classes to be applied to the element.
+       * If an object is provided, all keys with a "truthy" value will be added to the CSS class list.
+       */
+      class?: ClassProp;
+
+      /**
+       * Additional CSS classes to be applied to the element.
+       * If an object is provided, all keys with a "truthy" value will be added to the CSS class list.
+       */
+      className?: ClassProp;
+
+      /** Style object applied to the element */
+      style?: StyleProp;
+
+      /** Style object applied to the element */
+      styles?: StyleProp;
+   }
+
+   /** @deprecated */
+   interface HtmlElementProps extends StyledContainerProps {
+      /** Id of the element */
+      id?: Cx.StringProp | Cx.NumberProp;
+
+      /** Inner text contents. */
+      text?: Cx.StringProp | Cx.NumberProp;
+
+      /** Tooltip configuration. */
+      tooltip?: StringProp | StructuredProp;
+
+      // onMouseDown?: string | ((event: MouseEvent, instance: any) => void);
+      // onMouseMove?: string | ((event: MouseEvent, instance: any) => void);
+      // onMouseUp?: string | ((event: MouseEvent, instance: any) => void);
+      // onTouchStart?: string | ((event: TouchEvent, instance: any) => void);
+      // onTouchMove?: string | ((event: TouchEvent, instance: any) => void);
+      // onTouchEnd?: string | ((event: TouchEvent, instance: any) => void);
+      // onClick?: string | ((event: MouseEvent, instance: any) => void);
+      // onContextMenu?: string | ((event: MouseEvent, instance: any) => void);
+   }
+
+   type SortDirection = SortDirectionType;
+
+   interface Sorter extends SorterType {}
+
+   interface CollatorOptions extends CollatorOptionsType {}
+}