@wcardinal/wcardinal-ui 0.291.0 → 0.292.0

package/dist/types/wcardinal/ui/d-chart-axis-base-options-parser.d.ts

@@ -1,4 +1,4 @@
-import { DChartAxisBaseOptions, DChartAxisBaseTickContainerOptions, DChartAxisBaseTickMajorGridlineOptions, DChartAxisBaseTickMajorOptions, DChartAxisBaseTickMinorOptions, DChartAxisBaseTickTextOptions, DThemeChartAxisBase } from "./d-chart-axis-base-options";
+import { DChartAxisBaseOptions, DChartAxisBaseTickOptions, DChartAxisBaseTickMajorGridlineOptions, DChartAxisBaseTickMajorOptions, DChartAxisBaseTickMinorOptions, DChartAxisBaseTextDirectionOption, DChartAxisBaseTickTextOptions, DThemeChartAxisBase, DChartAxisBaseStrokeOptions } from "./d-chart-axis-base-options";
 import { DChartAxisPosition } from "./d-chart-axis-position";
 import { DChartAxisTickPosition } from "./d-chart-axis-tick-position";
 import { DChartCoordinateTickMajorStepFunction } from "./d-chart-coordinate-tick-major-step-function";
@@ -8,7 +8,7 @@ import { EShapePointsStyleOption } from "./shape/e-shape-points-styles";
 import { EShapeStrokeLike } from "./shape/e-shape-stroke";
 import { EShapeStrokeSide } from "./shape/e-shape-stroke-side";
 import { EShapeStrokeStyle } from "./shape/e-shape-stroke-style";
-import { EShapeTextLike } from "./shape/e-shape-text";
+import { EShapeTextLike, EShapeTextStyle, EShapeTextWeight } from "./shape/e-shape-text";
 import { EShapeTextAlignLike } from "./shape/e-shape-text-align";
 import { EShapeTextDirection } from "./shape/e-shape-text-direction";
 import { EShapeTextOffsetLike } from "./shape/e-shape-text-offset";
@@ -16,6 +16,26 @@ import { EShapeTextOutlineLike } from "./shape/e-shape-text-outline";
 import { EShapeBarPosition } from "./shape/variant/e-shape-bar-position";
 import { DeepPartial } from "./util/deep-partial";
 import { NumberFormatter } from "./util/number-formatter";
+import { NumberFormatterFunction } from "./util/number-formatter-function";
+export interface DChartAxisBaseOptionParserText {
+    /** A format. Please refer to {@link NumberFormatter} for format details. */
+    format?: string | null;
+    /** A formatter function. */
+    formatter?: NumberFormatterFunction;
+    color?: number;
+    alpha?: number;
+    family?: string;
+    size?: number;
+    weight?: EShapeTextWeight;
+    align?: Partial<EShapeTextAlignLike>;
+    offset?: Partial<EShapeTextOffsetLike>;
+    style?: EShapeTextStyle;
+    outline?: Partial<EShapeTextOutlineLike>;
+    spacing?: Partial<EShapeTextOffsetLike>;
+    direction?: EShapeTextDirection;
+    padding?: Partial<EShapeTextOffsetLike>;
+    clipping?: boolean;
+}
 export interface DChartAxisBaseOptionParserGridline {
     enable: boolean;
     style?: EShapePointsStyle;
@@ -29,7 +49,7 @@ export interface DChartAxisBaseOptionParserTickMajor {
     position: EShapeBarPosition;
     style?: EShapePointsStyle;
     stroke?: Partial<EShapeStrokeLike>;
-    text?: DChartAxisBaseTickTextOptions;
+    text?: DChartAxisBaseOptionParserText;
     formatter?: NumberFormatter;
     gridline: DChartAxisBaseOptionParserGridline;
 }
@@ -40,10 +60,10 @@ export interface DChartAxisBaseOptionParserTickMinor {
     position: EShapeBarPosition;
     style?: EShapePointsStyle;
     stroke?: Partial<EShapeStrokeLike>;
-    text?: DChartAxisBaseTickTextOptions;
+    text?: DChartAxisBaseOptionParserText;
     formatter?: NumberFormatter;
 }
-export interface DChartAxisBaseOptionParserTickContainer {
+export interface DChartAxisBaseOptionParserTick {
     enable: boolean;
     major: DChartAxisBaseOptionParserTickMajor;
     minor: DChartAxisBaseOptionParserTickMinor;
@@ -52,56 +72,57 @@ export interface DChartAxisBaseOptionParserBar {
     style?: EShapePointsStyle;
     stroke?: Partial<EShapeStrokeLike>;
 }
-export declare class DChartAxisBaseOptionParser {
+export declare class DChartAxisBaseOptionParser<THEME extends DThemeChartAxisBase = DThemeChartAxisBase, OPTIONS extends DChartAxisBaseOptions<THEME> = DChartAxisBaseOptions<THEME>> {
     protected _coordinateIndex: number;
     protected _position: DChartAxisPosition;
-    protected _tick: DChartAxisBaseOptionParserTickContainer;
+    protected _tick: DChartAxisBaseOptionParserTick;
     protected _label: DeepPartial<EShapeTextLike> | undefined;
     protected _padding: number;
     protected _bar: DChartAxisBaseOptionParserBar;
-    constructor(theme: DThemeChartAxisBase, options?: DChartAxisBaseOptions);
+    constructor(theme: THEME, options?: OPTIONS);
     get coordinateIndex(): number;
     get padding(): number;
     get position(): DChartAxisPosition;
     get bar(): DChartAxisBaseOptionParserBar;
-    get tick(): DChartAxisBaseOptionParserTickContainer;
+    get tick(): DChartAxisBaseOptionParserTick;
     get label(): DeepPartial<EShapeTextLike> | undefined;
-    protected toPosition(theme: DThemeChartAxisBase, options?: DChartAxisBaseOptions): DChartAxisPosition;
-    protected toBar(theme: DThemeChartAxisBase, options?: DChartAxisBaseOptions): DChartAxisBaseOptionParserBar;
-    protected toTickContainer(theme: DThemeChartAxisBase, options?: DChartAxisBaseOptions): DChartAxisBaseOptionParserTickContainer;
-    protected toTickMajor(theme: DThemeChartAxisBase, options?: DChartAxisBaseTickContainerOptions): DChartAxisBaseOptionParserTickMajor;
-    protected toTickMajorGridline(theme: DThemeChartAxisBase, options: DChartAxisBaseTickMajorGridlineOptions | undefined, optionsStyle: EShapePointsStyleOption | undefined, optionsStroke: Partial<EShapeStrokeLike> | undefined): DChartAxisBaseOptionParserGridline;
+    protected toPosition(theme: THEME, options?: OPTIONS): DChartAxisPosition;
+    protected toBar(theme: THEME, options?: OPTIONS): DChartAxisBaseOptionParserBar;
+    protected toTick(theme: THEME, options?: OPTIONS): DChartAxisBaseOptionParserTick;
+    protected toTickMajor(theme: THEME, options?: DChartAxisBaseTickOptions): DChartAxisBaseOptionParserTickMajor;
+    protected toTickMajorGridline(theme: THEME, options: DChartAxisBaseTickMajorGridlineOptions | undefined, optionsStyle: EShapePointsStyleOption | undefined, optionsStroke: DChartAxisBaseStrokeOptions | undefined): DChartAxisBaseOptionParserGridline;
     protected toTickPosition(tickPosition: DChartAxisTickPosition | keyof typeof DChartAxisTickPosition): EShapeBarPosition;
-    protected toTickMinor(theme: DThemeChartAxisBase, options?: DChartAxisBaseTickContainerOptions): DChartAxisBaseOptionParserTickMinor;
-    protected toBarStroke(theme: DThemeChartAxisBase, options?: Partial<EShapeStrokeLike>): Partial<EShapeStrokeLike>;
-    protected toTickMajorStroke(theme: DThemeChartAxisBase, optionsA?: Partial<EShapeStrokeLike>, optionsB?: Partial<EShapeStrokeLike>): Partial<EShapeStrokeLike>;
-    protected toTickMajorGridlineStroke(theme: DThemeChartAxisBase, optionsA?: Partial<EShapeStrokeLike>, optionsB?: Partial<EShapeStrokeLike>): Partial<EShapeStrokeLike>;
-    protected toTickMinorStroke(theme: DThemeChartAxisBase, optionsA?: Partial<EShapeStrokeLike>, optionsB?: Partial<EShapeStrokeLike>): Partial<EShapeStrokeLike>;
-    protected toStroke(optionsA: Partial<EShapeStrokeLike> | undefined, optionsB: Partial<EShapeStrokeLike> | undefined, enable: boolean | undefined, color: number | undefined, alpha: number | undefined, width: number | undefined, align: number | undefined, side: EShapeStrokeSide | undefined, style: EShapeStrokeStyle | undefined): Partial<EShapeStrokeLike>;
-    protected toTickMajorFormatter(theme: DThemeChartAxisBase, options?: DChartAxisBaseTickMajorOptions): NumberFormatter | undefined;
-    protected toTickMajorText(theme: DThemeChartAxisBase, options?: DChartAxisBaseTickTextOptions): DChartAxisBaseTickTextOptions | undefined;
-    protected toTickMajorTextOutline(theme: DThemeChartAxisBase, options?: Partial<EShapeTextOutlineLike>): Partial<EShapeTextOutlineLike> | undefined;
-    protected toTickMajorTextAlign(theme: DThemeChartAxisBase, options?: Partial<EShapeTextAlignLike>): Partial<EShapeTextAlignLike> | undefined;
-    protected toTickMajorTextOffset(theme: DThemeChartAxisBase, options?: Partial<EShapeTextOffsetLike>): Partial<EShapeTextOffsetLike> | undefined;
-    protected toTickMajorTextSpacing(theme: DThemeChartAxisBase, options?: Partial<EShapeTextOffsetLike>): Partial<EShapeTextOffsetLike> | undefined;
-    protected toTickMajorTextPadding(theme: DThemeChartAxisBase, options?: Partial<EShapeTextOffsetLike>): Partial<EShapeTextOffsetLike>;
-    protected toTickMajorTextDirection(theme: DThemeChartAxisBase, options?: EShapeTextDirection): EShapeTextDirection;
-    protected toTickMajorTextColor(theme: DThemeChartAxisBase, options?: number): number | undefined;
-    protected toTickMinorFormatter(theme: DThemeChartAxisBase, options?: DChartAxisBaseTickMinorOptions): NumberFormatter | undefined;
-    protected toTickMinorText(theme: DThemeChartAxisBase, options?: DChartAxisBaseTickTextOptions): DChartAxisBaseTickTextOptions | undefined;
-    protected toTickMinorTextOutline(theme: DThemeChartAxisBase, options?: Partial<EShapeTextOutlineLike>): Partial<EShapeTextOutlineLike> | undefined;
-    protected toTickMinorTextAlign(theme: DThemeChartAxisBase, options?: Partial<EShapeTextAlignLike>): Partial<EShapeTextAlignLike> | undefined;
-    protected toTickMinorTextOffset(theme: DThemeChartAxisBase, options?: Partial<EShapeTextOffsetLike>): Partial<EShapeTextOffsetLike> | undefined;
-    protected toTickMinorTextSpacing(theme: DThemeChartAxisBase, options?: Partial<EShapeTextOffsetLike>): Partial<EShapeTextOffsetLike> | undefined;
-    protected toTickMinorTextPadding(theme: DThemeChartAxisBase, options?: Partial<EShapeTextOffsetLike>): Partial<EShapeTextOffsetLike>;
-    protected toTickMinorTextDirection(theme: DThemeChartAxisBase, options?: EShapeTextDirection): EShapeTextDirection;
-    protected toTickMinorTextColor(theme: DThemeChartAxisBase, options?: number): number | undefined;
-    protected toLabel(theme: DThemeChartAxisBase, options?: DChartAxisBaseOptions): DeepPartial<EShapeTextLike> | undefined;
-    protected toLabelOutline(theme: DThemeChartAxisBase, options?: Partial<EShapeTextOutlineLike>): Partial<EShapeTextOutlineLike> | undefined;
-    protected toLabelAlign(theme: DThemeChartAxisBase, options?: Partial<EShapeTextAlignLike>): Partial<EShapeTextAlignLike> | undefined;
-    protected toLabelOffset(theme: DThemeChartAxisBase, options?: Partial<EShapeTextOffsetLike>): Partial<EShapeTextOffsetLike> | undefined;
-    protected toLabelSpacing(theme: DThemeChartAxisBase, options?: Partial<EShapeTextOffsetLike>): Partial<EShapeTextOffsetLike> | undefined;
-    protected toLabelPadding(theme: DThemeChartAxisBase, options?: Partial<EShapeTextOffsetLike>): Partial<EShapeTextOffsetLike>;
-    protected toLabelDirection(theme: DThemeChartAxisBase, options?: EShapeTextDirection): EShapeTextDirection;
-    protected toLabelColor(theme: DThemeChartAxisBase, options?: number): number | undefined;
+    protected toTickMinor(theme: THEME, options?: DChartAxisBaseTickOptions): DChartAxisBaseOptionParserTickMinor;
+    protected toBarStroke(theme: THEME, options?: DChartAxisBaseStrokeOptions): Partial<EShapeStrokeLike>;
+    protected toTickMajorStroke(theme: THEME, optionsA?: DChartAxisBaseStrokeOptions, optionsB?: DChartAxisBaseStrokeOptions): Partial<EShapeStrokeLike>;
+    protected toTickMajorGridlineStroke(theme: THEME, optionsA?: DChartAxisBaseStrokeOptions, optionsB?: DChartAxisBaseStrokeOptions): Partial<EShapeStrokeLike>;
+    protected toTickMinorStroke(theme: THEME, optionsA?: DChartAxisBaseStrokeOptions, optionsB?: DChartAxisBaseStrokeOptions): Partial<EShapeStrokeLike>;
+    protected toStroke(optionsA: DChartAxisBaseStrokeOptions | undefined, optionsB: DChartAxisBaseStrokeOptions | undefined, enable: boolean | undefined, color: number | undefined, alpha: number | undefined, width: number | undefined, align: number | undefined, side: EShapeStrokeSide | undefined, style: EShapeStrokeStyle | undefined): Partial<EShapeStrokeLike>;
+    protected toStrokeStyle(target?: EShapeStrokeStyle | keyof typeof EShapeStrokeStyle | Array<keyof typeof EShapeStrokeStyle>): EShapeStrokeStyle | undefined;
+    protected toTickMajorFormatter(theme: THEME, options?: DChartAxisBaseTickMajorOptions): NumberFormatter | undefined;
+    protected toTickMajorText(theme: THEME, options?: DChartAxisBaseTickTextOptions): DChartAxisBaseOptionParserText | undefined;
+    protected toTickMajorTextOutline(theme: THEME, options?: Partial<EShapeTextOutlineLike>): Partial<EShapeTextOutlineLike> | undefined;
+    protected toTickMajorTextAlign(theme: THEME, options?: Partial<EShapeTextAlignLike>): Partial<EShapeTextAlignLike> | undefined;
+    protected toTickMajorTextOffset(theme: THEME, options?: Partial<EShapeTextOffsetLike>): Partial<EShapeTextOffsetLike> | undefined;
+    protected toTickMajorTextSpacing(theme: THEME, options?: Partial<EShapeTextOffsetLike>): Partial<EShapeTextOffsetLike> | undefined;
+    protected toTickMajorTextPadding(theme: THEME, options?: Partial<EShapeTextOffsetLike>): Partial<EShapeTextOffsetLike>;
+    protected toTickMajorTextDirection(theme: THEME, options?: DChartAxisBaseTextDirectionOption): EShapeTextDirection;
+    protected toTickMajorTextColor(theme: THEME, options?: number): number | undefined;
+    protected toTickMinorFormatter(theme: THEME, options?: DChartAxisBaseTickMinorOptions): NumberFormatter | undefined;
+    protected toTickMinorText(theme: THEME, options?: DChartAxisBaseTickTextOptions): DChartAxisBaseOptionParserText | undefined;
+    protected toTickMinorTextOutline(theme: THEME, options?: Partial<EShapeTextOutlineLike>): Partial<EShapeTextOutlineLike> | undefined;
+    protected toTickMinorTextAlign(theme: THEME, options?: Partial<EShapeTextAlignLike>): Partial<EShapeTextAlignLike> | undefined;
+    protected toTickMinorTextOffset(theme: THEME, options?: Partial<EShapeTextOffsetLike>): Partial<EShapeTextOffsetLike> | undefined;
+    protected toTickMinorTextSpacing(theme: THEME, options?: Partial<EShapeTextOffsetLike>): Partial<EShapeTextOffsetLike> | undefined;
+    protected toTickMinorTextPadding(theme: THEME, options?: Partial<EShapeTextOffsetLike>): Partial<EShapeTextOffsetLike>;
+    protected toTickMinorTextDirection(theme: THEME, options?: DChartAxisBaseTextDirectionOption): EShapeTextDirection;
+    protected toTickMinorTextColor(theme: THEME, options?: number): number | undefined;
+    protected toLabel(theme: THEME, options?: OPTIONS): DeepPartial<EShapeTextLike> | undefined;
+    protected toLabelOutline(theme: THEME, options?: Partial<EShapeTextOutlineLike>): Partial<EShapeTextOutlineLike> | undefined;
+    protected toLabelAlign(theme: THEME, options?: Partial<EShapeTextAlignLike>): Partial<EShapeTextAlignLike> | undefined;
+    protected toLabelOffset(theme: THEME, options?: Partial<EShapeTextOffsetLike>): Partial<EShapeTextOffsetLike> | undefined;
+    protected toLabelSpacing(theme: THEME, options?: Partial<EShapeTextOffsetLike>): Partial<EShapeTextOffsetLike> | undefined;
+    protected toLabelPadding(theme: THEME, options?: Partial<EShapeTextOffsetLike>): Partial<EShapeTextOffsetLike>;
+    protected toLabelDirection(theme: THEME, options?: DChartAxisBaseTextDirectionOption): EShapeTextDirection;
+    protected toLabelColor(theme: THEME, options?: number): number | undefined;
 }

package/dist/types/wcardinal/ui/d-chart-axis-base-options.d.ts

@@ -5,18 +5,19 @@ import { DChartCoordinateTickMajorStepFunction } from "./d-chart-coordinate-tick
 import { DChartCoordinateTickMinorStepFunction } from "./d-chart-coordinate-tick-minor-step-function";
 import { EShapePointsStyle } from "./shape/e-shape-points-style";
 import { EShapePointsStyleOption } from "./shape/e-shape-points-styles";
-import { EShapeStrokeLike } from "./shape/e-shape-stroke";
 import { EShapeStrokeSide } from "./shape/e-shape-stroke-side";
 import { EShapeStrokeStyle } from "./shape/e-shape-stroke-style";
-import { EShapeTextLike, EShapeTextStyle, EShapeTextWeight } from "./shape/e-shape-text";
+import { EShapeTextStyle, EShapeTextWeight } from "./shape/e-shape-text";
 import { EShapeTextAlignLike } from "./shape/e-shape-text-align";
 import { EShapeTextAlignHorizontal } from "./shape/e-shape-text-align-horizontal";
 import { EShapeTextAlignVertical } from "./shape/e-shape-text-align-vertical";
 import { EShapeTextDirection } from "./shape/e-shape-text-direction";
 import { EShapeTextOffsetLike } from "./shape/e-shape-text-offset";
 import { EShapeTextOutlineLike } from "./shape/e-shape-text-outline";
-import { DeepPartial } from "./util/deep-partial";
 import { NumberFormatterFunction } from "./util/number-formatter-function";
+export declare type DChartAxisBaseTextWeightOption = EShapeTextWeight | keyof typeof EShapeTextWeight;
+export declare type DChartAxisBaseTextStyleOption = EShapeTextStyle | keyof typeof EShapeTextStyle;
+export declare type DChartAxisBaseTextDirectionOption = EShapeTextDirection | keyof typeof EShapeTextDirection;
 export interface DChartAxisBaseTickTextOptions {
     /** A format. Please refer to {@link NumberFormatter} for format details. */
     format?: string | null;
@@ -26,20 +27,29 @@ export interface DChartAxisBaseTickTextOptions {
     alpha?: number;
     family?: string;
     size?: number;
-    weight?: EShapeTextWeight;
+    weight?: DChartAxisBaseTextWeightOption;
     align?: Partial<EShapeTextAlignLike>;
     offset?: Partial<EShapeTextOffsetLike>;
-    style?: EShapeTextStyle;
+    style?: DChartAxisBaseTextStyleOption;
     outline?: Partial<EShapeTextOutlineLike>;
     spacing?: Partial<EShapeTextOffsetLike>;
-    direction?: EShapeTextDirection;
+    direction?: DChartAxisBaseTextDirectionOption;
     padding?: Partial<EShapeTextOffsetLike>;
     clipping?: boolean;
 }
+export interface DChartAxisBaseStrokeOptions {
+    enable?: boolean;
+    color?: number;
+    alpha?: number;
+    width?: number;
+    align?: number;
+    side?: EShapeStrokeSide;
+    style?: EShapeStrokeStyle | keyof typeof EShapeStrokeStyle | Array<keyof typeof EShapeStrokeStyle>;
+}
 export interface DChartAxisBaseTickMajorGridlineOptions {
     enable?: boolean;
     style?: EShapePointsStyleOption;
-    stroke?: Partial<EShapeStrokeLike>;
+    stroke?: DChartAxisBaseStrokeOptions;
 }
 export declare type DChartAxisTickPositionOption = DChartAxisTickPosition | keyof typeof DChartAxisTickPosition;
 export interface DChartAxisBaseTickMajorOptions {
@@ -49,7 +59,7 @@ export interface DChartAxisBaseTickMajorOptions {
     size?: number;
     position?: DChartAxisTickPositionOption;
     style?: EShapePointsStyleOption;
-    stroke?: Partial<EShapeStrokeLike>;
+    stroke?: DChartAxisBaseStrokeOptions;
     text?: DChartAxisBaseTickTextOptions;
     gridline?: DChartAxisBaseTickMajorGridlineOptions;
 }
@@ -59,25 +69,41 @@ export interface DChartAxisBaseTickMinorOptions {
     size?: number;
     position?: DChartAxisTickPositionOption;
     style?: EShapePointsStyleOption;
-    stroke?: Partial<EShapeStrokeLike>;
+    stroke?: DChartAxisBaseStrokeOptions;
     text?: DChartAxisBaseTickTextOptions;
 }
-export interface DChartAxisBaseTickContainerOptions {
+export interface DChartAxisBaseTickOptions {
     enable?: boolean;
     position?: DChartAxisTickPositionOption;
     style?: EShapePointsStyleOption;
-    stroke?: Partial<EShapeStrokeLike>;
+    stroke?: DChartAxisBaseStrokeOptions;
     major?: DChartAxisBaseTickMajorOptions;
     minor?: DChartAxisBaseTickMinorOptions;
 }
-export interface DChartAxisBaseOptions extends DChartAxisOptions {
-    tick?: DChartAxisBaseTickContainerOptions;
-    label?: DeepPartial<EShapeTextLike>;
+export interface DChartAxisBaseLabelOptions {
+    value?: string;
+    color?: number;
+    alpha?: number;
+    family?: string;
+    size?: number;
+    weight?: DChartAxisBaseTextWeightOption;
+    align?: Partial<EShapeTextAlignLike>;
+    offset?: Partial<EShapeTextOffsetLike>;
+    style?: DChartAxisBaseTextStyleOption;
+    outline?: Partial<EShapeTextOutlineLike>;
+    spacing?: Partial<EShapeTextOffsetLike>;
+    direction?: DChartAxisBaseTextDirectionOption;
+    padding?: Partial<EShapeTextOffsetLike>;
+    clipping?: boolean;
+}
+export interface DChartAxisBaseOptions<THEME extends DThemeChartAxisBase> extends DChartAxisOptions {
+    tick?: DChartAxisBaseTickOptions;
+    label?: DChartAxisBaseLabelOptions;
     style?: EShapePointsStyle;
-    stroke?: Partial<EShapeStrokeLike>;
+    stroke?: DChartAxisBaseStrokeOptions;
     coordinate?: number;
     padding?: number;
-    theme?: DThemeChartAxisBase;
+    theme?: THEME;
 }
 export interface DThemeChartAxisBase {
     getPosition(): DChartAxisPosition;

package/dist/types/wcardinal/ui/d-chart-axis-base-tick-container.d.ts

@@ -9,7 +9,9 @@ import { DChartCoordinate } from "./d-chart-coordinate";
 import { DChartCoordinateTickMajorStepFunction } from "./d-chart-coordinate-tick-major-step-function";
 import { DChartCoordinateTickMinorStepFunction } from "./d-chart-coordinate-tick-minor-step-function";
 import { EShape } from "./shape/e-shape";
-export declare class DChartAxisBaseTickContainer<CHART extends DBase> implements DChartAxisTickContainer<CHART> {
+export interface DChartAxisBaseTickContainerOptions {
+}
+export declare class DChartAxisBaseTickContainer<CHART extends DBase, OPTIONS extends DChartAxisBaseTickContainerOptions> implements DChartAxisTickContainer<CHART> {
     protected _parser: DChartAxisBaseOptionParser;
     protected _container?: DChartAxisContainer<CHART>;
     protected _index: number;
@@ -17,11 +19,11 @@ export declare class DChartAxisBaseTickContainer<CHART extends DBase> implements
     protected _minor: DChartAxisTickMinor<CHART>;
     protected _majorTicks: number[];
     protected _minorTicks: number[];
-    constructor(parser: DChartAxisBaseOptionParser);
+    constructor(parser: DChartAxisBaseOptionParser, options?: OPTIONS);
     get major(): DChartAxisTickMajor<CHART>;
-    protected newMajor(parser: DChartAxisBaseOptionParser): DChartAxisTickMajor<CHART>;
+    protected newMajor(parser: DChartAxisBaseOptionParser, options?: OPTIONS): DChartAxisTickMajor<CHART>;
     get minor(): DChartAxisTickMinor<CHART>;
-    protected newMinor(parser: DChartAxisBaseOptionParser): DChartAxisTickMinor<CHART>;
+    protected newMinor(parser: DChartAxisBaseOptionParser, options?: OPTIONS): DChartAxisTickMinor<CHART>;
     bind(container: DChartAxisContainer<CHART>, index: number): void;
     unbind(): void;
     update(): boolean;

package/dist/types/wcardinal/ui/d-chart-axis-base.d.ts

@@ -6,26 +6,27 @@ import { DChartAxisBaseOptionParser } from "./d-chart-axis-base-options-parser";
 import { DChartAxisContainer } from "./d-chart-axis-container";
 import { DChartAxisPosition } from "./d-chart-axis-position";
 import { DChartAxisTickContainer } from "./d-chart-axis-tick-container";
-export declare class DChartAxisBase<CHART extends DBase = DBase, OPTIONS extends DChartAxisBaseOptions = DChartAxisBaseOptions> implements DChartAxis<CHART> {
+export declare class DChartAxisBase<CHART extends DBase = DBase, THEME extends DThemeChartAxisBase = DThemeChartAxisBase, OPTIONS extends DChartAxisBaseOptions<THEME> = DChartAxisBaseOptions<THEME>> implements DChartAxis<CHART> {
     protected _theme: DThemeChartAxisBase;
-    protected _parser: DChartAxisBaseOptionParser;
+    protected _parser: DChartAxisBaseOptionParser<THEME>;
     protected _container?: DChartAxisContainer<CHART>;
     protected _index: number;
     protected _bar: DChartAxisBar<CHART>;
     protected _tick: DChartAxisTickContainer<CHART>;
     constructor(options?: OPTIONS);
-    get parser(): DChartAxisBaseOptionParser;
+    get parser(): DChartAxisBaseOptionParser<THEME>;
+    protected newParser(theme: THEME, options?: OPTIONS): DChartAxisBaseOptionParser<THEME>;
     get position(): DChartAxisPosition;
     get bar(): DChartAxisBar<CHART>;
-    protected newBar(parser: DChartAxisBaseOptionParser): DChartAxisBar<CHART>;
+    protected newBar(parser: DChartAxisBaseOptionParser<THEME>, theme: THEME, options?: OPTIONS): DChartAxisBar<CHART>;
     get tick(): DChartAxisTickContainer<CHART>;
-    protected newTick(parser: DChartAxisBaseOptionParser): DChartAxisTickContainer<CHART>;
+    protected newTick(parser: DChartAxisBaseOptionParser<THEME>, theme: THEME, options?: OPTIONS): DChartAxisTickContainer<CHART>;
     bind(container: DChartAxisContainer<CHART>, index: number): void;
     unbind(): void;
     update(): void;
     onRender(): void;
     destroy(): void;
-    protected toTheme(options?: DChartAxisBaseOptions): DThemeChartAxisBase;
-    protected getThemeDefault(): DThemeChartAxisBase;
+    protected toTheme(options?: DChartAxisBaseOptions<THEME>): THEME;
+    protected getThemeDefault(): THEME;
     protected getType(): string;
 }

package/dist/types/wcardinal/ui/d-chart-axis-x-datetime.d.ts

@@ -1,10 +1,11 @@
 import { DBase } from "./d-base";
+import { DThemeChartAxisBase } from "./d-chart-axis-base-options";
 import { DChartAxisX, DChartAxisXOptions } from "./d-chart-axis-x";
-export interface DChartAxisXDatetimeOptions extends DChartAxisXOptions {
+export interface DChartAxisXDatetimeOptions<THEME extends DThemeChartAxisBase> extends DChartAxisXOptions<THEME> {
 }
 /**
  * An X axis for datetimes.
  */
-export declare class DChartAxisXDatetime<CHART extends DBase = DBase, OPTIONS extends DChartAxisXDatetimeOptions = DChartAxisXDatetimeOptions> extends DChartAxisX<CHART, OPTIONS> {
+export declare class DChartAxisXDatetime<CHART extends DBase = DBase, THEME extends DThemeChartAxisBase = DThemeChartAxisBase, OPTIONS extends DChartAxisXDatetimeOptions<THEME> = DChartAxisXDatetimeOptions<THEME>> extends DChartAxisX<CHART, THEME, OPTIONS> {
     protected getType(): string;
 }

package/dist/types/wcardinal/ui/d-chart-axis-x.d.ts

@@ -1,11 +1,11 @@
 import { DBase } from "./d-base";
 import { DChartAxisBase } from "./d-chart-axis-base";
-import { DChartAxisBaseOptions } from "./d-chart-axis-base-options";
-export interface DChartAxisXOptions extends DChartAxisBaseOptions {
+import { DChartAxisBaseOptions, DThemeChartAxisBase } from "./d-chart-axis-base-options";
+export interface DChartAxisXOptions<THEME extends DThemeChartAxisBase> extends DChartAxisBaseOptions<THEME> {
 }
 /**
  * An X axis.
  */
-export declare class DChartAxisX<CHART extends DBase = DBase, OPTIONS extends DChartAxisXOptions = DChartAxisXOptions> extends DChartAxisBase<CHART, OPTIONS> {
+export declare class DChartAxisX<CHART extends DBase = DBase, THEME extends DThemeChartAxisBase = DThemeChartAxisBase, OPTIONS extends DChartAxisXOptions<THEME> = DChartAxisXOptions<THEME>> extends DChartAxisBase<CHART, THEME, OPTIONS> {
     protected getType(): string;
 }

package/dist/types/wcardinal/ui/d-chart-axis-y.d.ts

@@ -1,11 +1,11 @@
 import { DBase } from "./d-base";
 import { DChartAxisBase } from "./d-chart-axis-base";
-import { DChartAxisBaseOptions } from "./d-chart-axis-base-options";
-export interface DChartAxisYOptions extends DChartAxisBaseOptions {
+import { DChartAxisBaseOptions, DThemeChartAxisBase } from "./d-chart-axis-base-options";
+export interface DChartAxisYOptions<THEME extends DThemeChartAxisBase> extends DChartAxisBaseOptions<THEME> {
 }
 /**
  * An Y axis.
  */
-export declare class DChartAxisY<CHART extends DBase = DBase, OPTIONS extends DChartAxisYOptions = DChartAxisYOptions> extends DChartAxisBase<CHART, OPTIONS> {
+export declare class DChartAxisY<CHART extends DBase = DBase, THEME extends DThemeChartAxisBase = DThemeChartAxisBase, OPTIONS extends DChartAxisYOptions<THEME> = DChartAxisYOptions<THEME>> extends DChartAxisBase<CHART, THEME, OPTIONS> {
     protected getType(): string;
 }

package/dist/wcardinal/ui/d-chart-axis-base-options-parser.js

@@ -5,15 +5,20 @@
 import { DChartAxisPosition } from "./d-chart-axis-position";
 import { DChartAxisTickPosition } from "./d-chart-axis-tick-position";
 import { EShapePointsStyles } from "./shape/e-shape-points-styles";
+import { EShapeStrokeStyle } from "./shape/e-shape-stroke-style";
+import { EShapeTextStyle, EShapeTextWeight } from "./shape/e-shape-text";
+import { EShapeTextDirection } from "./shape/e-shape-text-direction";
 import { EShapeBarPosition } from "./shape/variant/e-shape-bar-position";
+import { isArray } from "./util/is-array";
 import { isString } from "./util/is-string";
 import { NumberFormatters } from "./util/number-formatters";
+import { toEnum } from "./util/to-enum";
 var DChartAxisBaseOptionParser = /** @class */ (function () {
     function DChartAxisBaseOptionParser(theme, options) {
         var _a, _b;
         this._coordinateIndex = (_a = options === null || options === void 0 ? void 0 : options.coordinate) !== null && _a !== void 0 ? _a : 0;
         this._position = this.toPosition(theme, options);
-        this._tick = this.toTickContainer(theme, options);
+        this._tick = this.toTick(theme, options);
         this._label = this.toLabel(theme, options);
         this._padding = (_b = options === null || options === void 0 ? void 0 : options.padding) !== null && _b !== void 0 ? _b : theme.getPadding();
         this._bar = this.toBar(theme, options);
@@ -77,7 +82,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
             stroke: this.toBarStroke(theme, options === null || options === void 0 ? void 0 : options.stroke)
         };
     };
-    DChartAxisBaseOptionParser.prototype.toTickContainer = function (theme, options) {
+    DChartAxisBaseOptionParser.prototype.toTick = function (theme, options) {
         var _a;
         var tick = options === null || options === void 0 ? void 0 : options.tick;
         return {
@@ -188,7 +193,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
                     width: (_h = (_g = optionsA.width) !== null && _g !== void 0 ? _g : optionsB.width) !== null && _h !== void 0 ? _h : width,
                     align: (_k = (_j = optionsA.align) !== null && _j !== void 0 ? _j : optionsB.align) !== null && _k !== void 0 ? _k : align,
                     side: (_m = (_l = optionsA.side) !== null && _l !== void 0 ? _l : optionsB.side) !== null && _m !== void 0 ? _m : side,
-                    style: (_p = (_o = optionsA.style) !== null && _o !== void 0 ? _o : optionsB.style) !== null && _p !== void 0 ? _p : style
+                    style: this.toStrokeStyle((_p = (_o = optionsA.style) !== null && _o !== void 0 ? _o : optionsB.style) !== null && _p !== void 0 ? _p : style)
                 };
             }
             else {
@@ -199,7 +204,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
                     width: (_t = optionsA.width) !== null && _t !== void 0 ? _t : width,
                     align: (_u = optionsA.align) !== null && _u !== void 0 ? _u : align,
                     side: (_v = optionsA.side) !== null && _v !== void 0 ? _v : side,
-                    style: (_w = optionsA.style) !== null && _w !== void 0 ? _w : style
+                    style: this.toStrokeStyle((_w = optionsA.style) !== null && _w !== void 0 ? _w : style)
                 };
             }
         }
@@ -211,7 +216,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
                 width: (_0 = optionsB.width) !== null && _0 !== void 0 ? _0 : width,
                 align: (_1 = optionsB.align) !== null && _1 !== void 0 ? _1 : align,
                 side: (_2 = optionsB.side) !== null && _2 !== void 0 ? _2 : side,
-                style: (_3 = optionsB.style) !== null && _3 !== void 0 ? _3 : style
+                style: this.toStrokeStyle((_3 = optionsB.style) !== null && _3 !== void 0 ? _3 : style)
             };
         }
         else {
@@ -226,6 +231,19 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
             };
         }
     };
+    DChartAxisBaseOptionParser.prototype.toStrokeStyle = function (target) {
+        if (isString(target)) {
+            return EShapeStrokeStyle[target];
+        }
+        else if (isArray(target)) {
+            var result = EShapeStrokeStyle.NONE;
+            for (var i = 0, imax = target.length; i < imax; ++i) {
+                result |= EShapeStrokeStyle[target[i]];
+            }
+            return result;
+        }
+        return target;
+    };
     DChartAxisBaseOptionParser.prototype.toTickMajorFormatter = function (theme, options) {
         var text = options === null || options === void 0 ? void 0 : options.text;
         if (text) {
@@ -259,10 +277,10 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
             alpha: options.alpha,
             family: options.family,
             size: options.size,
-            weight: options.weight,
+            weight: toEnum(options.weight, EShapeTextWeight),
             align: this.toTickMajorTextAlign(theme, options.align),
             offset: this.toTickMajorTextOffset(theme, options.offset),
-            style: options.style,
+            style: toEnum(options.style, EShapeTextStyle),
             outline: this.toTickMajorTextOutline(theme, options.outline),
             spacing: this.toTickMajorTextSpacing(theme, options.spacing),
             direction: this.toTickMajorTextDirection(theme, options.direction),
@@ -312,7 +330,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
         };
     };
     DChartAxisBaseOptionParser.prototype.toTickMajorTextDirection = function (theme, options) {
-        return options !== null && options !== void 0 ? options : theme.getMajorTickTextDirection();
+        return toEnum(options !== null && options !== void 0 ? options : theme.getMajorTickTextDirection(), EShapeTextDirection);
     };
     DChartAxisBaseOptionParser.prototype.toTickMajorTextColor = function (theme, options) {
         return options !== null && options !== void 0 ? options : theme.getMajorTickTextColor();
@@ -350,10 +368,10 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
             alpha: options.alpha,
             family: options.family,
             size: options.size,
-            weight: options.weight,
+            weight: toEnum(options.weight, EShapeTextWeight),
             align: this.toTickMinorTextAlign(theme, options.align),
             offset: this.toTickMinorTextOffset(theme, options.offset),
-            style: options.style,
+            style: toEnum(options.style, EShapeTextStyle),
             outline: this.toTickMinorTextOutline(theme, options.outline),
             spacing: this.toTickMinorTextSpacing(theme, options.spacing),
             direction: this.toTickMinorTextDirection(theme, options.direction),
@@ -403,7 +421,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
         };
     };
     DChartAxisBaseOptionParser.prototype.toTickMinorTextDirection = function (theme, options) {
-        return options !== null && options !== void 0 ? options : theme.getMinorTickTextDirection();
+        return toEnum(options !== null && options !== void 0 ? options : theme.getMinorTickTextDirection(), EShapeTextDirection);
     };
     DChartAxisBaseOptionParser.prototype.toTickMinorTextColor = function (theme, options) {
         return options !== null && options !== void 0 ? options : theme.getMinorTickTextColor();
@@ -417,10 +435,10 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
                 alpha: label.alpha,
                 family: label.family,
                 size: label.size,
-                weight: label.weight,
+                weight: toEnum(label.weight, EShapeTextWeight),
                 align: this.toLabelAlign(theme, label.align),
                 offset: this.toLabelOffset(theme, label.offset),
-                style: label.style,
+                style: toEnum(label.style, EShapeTextStyle),
                 outline: this.toLabelOutline(theme, label.outline),
                 spacing: this.toLabelSpacing(theme, label.spacing),
                 direction: this.toLabelDirection(theme, label.direction),
@@ -471,7 +489,7 @@ var DChartAxisBaseOptionParser = /** @class */ (function () {
         };
     };
     DChartAxisBaseOptionParser.prototype.toLabelDirection = function (theme, options) {
-        return options !== null && options !== void 0 ? options : theme.getLabelDirection();
+        return toEnum(options !== null && options !== void 0 ? options : theme.getLabelDirection(), EShapeTextDirection);
     };
     DChartAxisBaseOptionParser.prototype.toLabelColor = function (theme, options) {
         return options !== null && options !== void 0 ? options : theme.getLabelColor();