Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Type fixes #1943

Merged
merged 1 commit into from
Jun 28, 2024
Merged

Type fixes #1943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/ag-charts-community/src/chart/series/cartesian/bubbleSeriesProperties.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import type {
AgBubbleSeriesLabelFormatterParams,
AgBubbleSeriesOptions,
AgBubbleSeriesOptionsKeys,
AgBubbleSeriesStyles,
AgBubbleSeriesStyle,
AgBubbleSeriesTooltipRendererParams,
BubbleSeriesItemStylerParams,
LabelPlacement,
Expand Down Expand Up @@ -126,7 +126,7 @@ export class BubbleSeriesProperties extends CartesianSeriesProperties<AgBubbleSe
strokeOpacity!: number;

@ProxyProperty('marker.itemStyler', { optional: true })
itemStyler?: Styler<BubbleSeriesItemStylerParams<unknown>, AgBubbleSeriesStyles>;
itemStyler?: Styler<BubbleSeriesItemStylerParams<unknown>, AgBubbleSeriesStyle>;

@Validate(OBJECT)
readonly label = new BubbleSeriesLabel();
Expand Down
6 changes: 3 additions & 3 deletions packages/ag-charts-enterprise/src/series/range-bar/rangeBarProperties.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type {
AgRangeBarSeriesLabelFormatterParams,
AgRangeBarSeriesLabelPlacement,
AgRangeBarSeriesOptions,
AgRangeBarSeriesStyles,
AgRangeBarSeriesStyle,
AgRangeBarSeriesTooltipRendererParams,
Styler,
} from 'ag-charts-community';
Expand Down Expand Up @@ -79,7 +79,7 @@ export class RangeBarProperties extends AbstractBarSeriesProperties<AgRangeBarSe
cornerRadius: number = 0;

@Validate(FUNCTION, { optional: true })
itemStyler?: Styler<AgRangeBarSeriesItemStylerParams<unknown>, AgRangeBarSeriesStyles>;
itemStyler?: Styler<AgRangeBarSeriesItemStylerParams<unknown>, AgRangeBarSeriesStyle>;

@Validate(OBJECT)
readonly shadow = new DropShadow().set({ enabled: false });
Expand All @@ -88,5 +88,5 @@ export class RangeBarProperties extends AbstractBarSeriesProperties<AgRangeBarSe
readonly label = new RangeBarSeriesLabel();

@Validate(OBJECT)
readonly tooltip = new SeriesTooltip<AgRangeBarSeriesTooltipRendererParams>();
readonly tooltip = new SeriesTooltip<AgRangeBarSeriesTooltipRendererParams<unknown>>();
}
8 changes: 4 additions & 4 deletions packages/ag-charts-types/src/series/cartesian/bubbleOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ export interface AgBubbleSeriesLabel<TDatum> extends AgChartLabelOptions<TDatum,
placement?: LabelPlacement;
}

export type AgBubbleSeriesStyles = AgSeriesMarkerStyle;
export type AgBubbleSeriesStyle = AgSeriesMarkerStyle;

export type BubbleSeriesItemStylerParams<TDatum> = DatumCallbackParams<TDatum> &
AgBubbleSeriesOptionsKeys &
Required<AgBubbleSeriesStyles>;
Required<AgBubbleSeriesStyle>;

export interface AgBubbleSeriesThemeableOptions<TDatum = any>
extends AgBubbleSeriesStyles,
extends AgBubbleSeriesStyle,
AgBaseCartesianThemeableOptions<TDatum> {
/** Explicitly specifies the extent of the domain for series `sizeKey`. */
domain?: [number, number];
Expand All @@ -42,7 +42,7 @@ export interface AgBubbleSeriesThemeableOptions<TDatum = any>
/** Series-specific tooltip configuration. */
tooltip?: AgSeriesTooltip<AgBubbleSeriesTooltipRendererParams<TDatum>>;
/** Function used to return formatting for individual markers, based on the supplied information. If the current marker is highlighted, the `highlighted` property will be set to `true`; make sure to check this if you want to differentiate between the highlighted and un-highlighted states. */
itemStyler?: Styler<BubbleSeriesItemStylerParams<TDatum>, AgBubbleSeriesStyles>;
itemStyler?: Styler<BubbleSeriesItemStylerParams<TDatum>, AgBubbleSeriesStyle>;
}

export interface AgBubbleSeriesOptionsKeys {
Expand Down
2 changes: 1 addition & 1 deletion packages/ag-charts-types/src/series/cartesian/heatmapOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export type AgHeatmapSeriesTooltipRendererParams<TDatum> = AgSeriesTooltipRender
AgHeatmapSeriesOptionsNames;

export interface AgHeatmapSeriesThemeableOptions<TDatum = any>
extends AgHeatmapSeriesStyle,
extends StrokeOptions,
AgBaseCartesianThemeableOptions<TDatum> {
/** Options for the label in each cell. */
label?: AgChartAutoSizedSecondaryLabelOptions<TDatum, AgHeatmapSeriesLabelFormatterParams>;
Expand Down
10 changes: 5 additions & 5 deletions packages/ag-charts-types/src/series/cartesian/rangeBarOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ import type { FillOptions, LineDashOptions, StrokeOptions } from './commonOption

export type AgRangeBarSeriesItemStylerParams<TDatum> = DatumCallbackParams<TDatum> &
AgRangeBarSeriesOptionsKeys &
Required<AgRangeBarSeriesStyles>;
Required<AgRangeBarSeriesStyle>;

export interface AgRangeBarSeriesStyles extends FillOptions, StrokeOptions, LineDashOptions {
export interface AgRangeBarSeriesStyle extends FillOptions, StrokeOptions, LineDashOptions {
/** Apply rounded corners to each bar. */
cornerRadius?: PixelSize;
}

export type AgRangeBarSeriesTooltipRendererParams<TDatum = any> = AgSeriesTooltipRendererParams<TDatum> &
export type AgRangeBarSeriesTooltipRendererParams<TDatum> = AgSeriesTooltipRendererParams<TDatum> &
AgRangeBarSeriesOptionsKeys &
AgRangeBarSeriesOptionsNames;

Expand All @@ -31,7 +31,7 @@ export type AgRangeBarSeriesLabelPlacement = 'inside' | 'outside';

export interface AgRangeBarSeriesThemeableOptions<TDatum = any>
extends AgBaseCartesianThemeableOptions<TDatum>,
AgRangeBarSeriesStyles {
AgRangeBarSeriesStyle {
/**
* Bar rendering direction.
*
Expand All @@ -47,7 +47,7 @@ export interface AgRangeBarSeriesThemeableOptions<TDatum = any>
/** Configuration for the shadow used behind the series items. */
shadow?: AgDropShadowOptions;
/** Function used to return formatting for individual RangeBar series item cells, based on the given parameters. If the current cell is highlighted, the `highlighted` property will be set to `true`; make sure to check this if you want to differentiate between the highlighted and un-highlighted states. */
itemStyler?: Styler<AgRangeBarSeriesItemStylerParams<TDatum>, AgRangeBarSeriesStyles>;
itemStyler?: Styler<AgRangeBarSeriesItemStylerParams<TDatum>, AgRangeBarSeriesStyle>;
}

export type AgRangeBarSeriesLabelFormatterParams = AgRangeBarSeriesOptionsKeys & AgRangeBarSeriesOptionsNames;
Expand Down
2 changes: 1 addition & 1 deletion .../ag-charts-website/src/content/gallery/_examples/horizontal-range-bar-with-labels/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const numberFormatOptions: Intl.NumberFormatOptions = {
currency: 'GBP',
};

const tooltip: AgSeriesTooltip<AgRangeBarSeriesTooltipRendererParams> = {
const tooltip: AgSeriesTooltip<AgRangeBarSeriesTooltipRendererParams<any>> = {
renderer: ({ datum, xName, xKey, yLowKey, yHighKey, yLowName, yHighName }) => {
return {
content: `<b>${xName}:</b> ${datum[xKey]}<br/><b>${yLowName}: </b>${datum[yLowKey].toLocaleString(
Expand Down
2 changes: 1 addition & 1 deletion packages/ag-charts-website/src/content/gallery/_examples/range-bar-with-labels/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {

import { getData } from './data';

const tooltip: AgSeriesTooltip<AgRangeBarSeriesTooltipRendererParams> = {
const tooltip: AgSeriesTooltip<AgRangeBarSeriesTooltipRendererParams<any>> = {
renderer: ({ datum, xName, xKey, yLowKey, yHighKey, yLowName, yHighName }) => {
return {
content: `<b>${xName}:</b> ${datum[xKey]}<br/><b>${yLowName}: </b>${datum[yLowKey].toLocaleString('en-GB', {
Expand Down
Loading