Skip to content

fix: ensure compatibility with typescript@4.8 #17582

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

Merged
pissang merged 3 commits into from
Sep 1, 2022
Merged

fix: ensure compatibility with typescript@4.8 #17582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
204f7a8
fix(theme): fix tooltips text style of the theme macarons
mousne Aug 23, 2022
71e9548
Merge pull request #17551 from mousne/master
Ovilia Aug 26, 2022
8b66bf7
fix: ensure compatibility with typescript@4.8
Aug 27, 2022
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
8 changes: 4 additions & 4 deletions src/animation/basicTransition.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import {
AnimationOption
} from '../util/types';
import { AnimationEasing } from 'zrender/src/animation/easing';
import Element, { ElementAnimateConfig } from 'zrender/src/Element';
import Element, { ElementAnimateConfig, ElementProps } from 'zrender/src/Element';
import Model from '../model/Model';
import {
isFunction,
Expand Down Expand Up @@ -216,7 +216,7 @@ function animateOrSetProps<Props>(
* position: [100, 100]
* }, seriesModel, function () { console.log('Animation done!'); });
*/
function updateProps<Props>(
function updateProps<Props extends ElementProps>(
el: Element<Props>,
props: Props,
// TODO: TYPE AnimatableModel
Expand All @@ -238,7 +238,7 @@ export {updateProps};
* So do not use this method to one element twice before
* animation starts, unless you know what you are doing.
*/
export function initProps<Props>(
export function initProps<Props extends ElementProps>(
el: Element<Props>,
props: Props,
animatableModel?: Model<AnimationOptionMixin>,
Expand Down Expand Up @@ -335,4 +335,4 @@ export function saveOldStyle(el: Displayable) {

export function getOldStyle(el: Displayable) {
return transitionStore(el).oldStyle;
}
}
7 changes: 4 additions & 3 deletions src/chart/bar/BaseBarSeries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,15 @@ import {
SeriesOnCartesianOptionMixin,
SeriesOnPolarOptionMixin,
ScaleDataValue,
DefaultStatesMixin
DefaultStatesMixin,
StatesMixinBase
} from '../../util/types';
import GlobalModel from '../../model/Global';
import Cartesian2D from '../../coord/cartesian/Cartesian2D';
import SeriesData from '../../data/SeriesData';


export interface BaseBarSeriesOption<StateOption, ExtraStateOption = DefaultStatesMixin>
export interface BaseBarSeriesOption<StateOption, ExtraStateOption extends StatesMixinBase = DefaultStatesMixin>
extends SeriesOption<StateOption, ExtraStateOption>,
SeriesOnCartesianOptionMixin,
SeriesOnPolarOptionMixin {
Expand Down Expand Up @@ -121,4 +122,4 @@ class BaseBarSeriesModel<Opts extends BaseBarSeriesOption<unknown> = BaseBarSeri

SeriesModel.registerClass(BaseBarSeriesModel);

export default BaseBarSeriesModel;
export default BaseBarSeriesModel;
4 changes: 4 additions & 0 deletions theme/macarons.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,11 @@
},

tooltip: {
borderWidth: 0,
backgroundColor: 'rgba(50,50,50,0.5)',
textStyle: {
color: '#FFF'
},
axisPointer: {
type: 'line',
lineStyle: {
Expand Down