Skip to content

Commit 5b206db

Browse files
committed
fix(ava-react/ntv): ntv phrase.origin tooltip can handle number string
1 parent 4a12718 commit 5b206db

File tree

7 files changed

+20
-15
lines changed

7 files changed

+20
-15
lines changed

packages/ava-react/src/NarrativeTextVis/chore/plugin/presets/createCompare.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import React, { ReactNode } from 'react';
22

3-
import { isNumber } from 'lodash';
3+
import { ValueAssessment, EntityMetaData } from '@antv/ava';
44

55
import { ArrowDown, ArrowUp } from '../../../assets/icons';
66
import { createEntityPhraseFactory } from '../createEntityPhraseFactory';
77
import { NTV_PREFIX_CLS } from '../../../constants';
88
import { getThemeColor } from '../../../theme';
9+
import { isNumberLike } from '../../../../utils';
910

10-
import { ValueAssessment, EntityMetaData } from '@antv/ava';
1111
import type { SpecificEntityPhraseDescriptor } from '../plugin-protocol.type';
1212
import type { ThemeType } from '../../../types';
1313

@@ -37,7 +37,7 @@ const defaultDeltaValueDescriptor: SpecificEntityPhraseDescriptor = {
3737
classNames: (value, { assessment }) => [`${NTV_PREFIX_CLS}-value-${assessment}`],
3838
getText: getAssessmentText,
3939
tooltip: {
40-
title: (value, metadata) => (isNumber(metadata.origin) ? `${metadata.origin}` : null),
40+
title: (value, metadata) => (isNumberLike(metadata.origin) ? `${metadata.origin}` : null),
4141
},
4242
};
4343

@@ -51,7 +51,7 @@ const defaultRatioValueDescriptor: SpecificEntityPhraseDescriptor = {
5151
classNames: (value, { assessment }) => [`${NTV_PREFIX_CLS}-value-${assessment}`],
5252
getText: getAssessmentText,
5353
tooltip: {
54-
title: (value, metadata) => (isNumber(metadata.origin) ? `${metadata.origin}` : null),
54+
title: (value, metadata) => (isNumberLike(metadata.origin) ? `${metadata.origin}` : null),
5555
},
5656
};
5757

packages/ava-react/src/NarrativeTextVis/chore/plugin/presets/createContributeRatio.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import { isNumber } from 'lodash';
2-
31
import { createEntityPhraseFactory } from '../createEntityPhraseFactory';
42
import { getThemeColor } from '../../../theme';
3+
import { isNumberLike } from '../../../../utils';
54

65
import type { SpecificEntityPhraseDescriptor } from '../plugin-protocol.type';
76

@@ -10,7 +9,7 @@ const defaultContributeRatioDescriptor: SpecificEntityPhraseDescriptor = {
109
color: (value, metadata, { theme }) => getThemeColor('colorConclusion', theme),
1110
},
1211
tooltip: {
13-
title: (value, metadata) => (isNumber(metadata.origin) ? `${metadata.origin}` : null),
12+
title: (value, metadata) => (isNumberLike(metadata.origin) ? `${metadata.origin}` : null),
1413
},
1514
};
1615

packages/ava-react/src/NarrativeTextVis/chore/plugin/presets/createMetricValue.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import { isNumber } from 'lodash';
2-
31
import { createEntityPhraseFactory } from '../createEntityPhraseFactory';
42
import { getThemeColor } from '../../../theme';
3+
import { isNumberLike } from '../../../../utils';
54

65
import type { SpecificEntityPhraseDescriptor } from '../plugin-protocol.type';
76

@@ -10,7 +9,7 @@ const defaultMetricValueDescriptor: SpecificEntityPhraseDescriptor = {
109
color: (value, metadata, { theme }) => getThemeColor('colorMetricValue', theme),
1110
},
1211
tooltip: {
13-
title: (value, metadata) => (isNumber(metadata.origin) ? `${metadata.origin}` : null),
12+
title: (value, metadata) => (isNumberLike(metadata.origin) ? `${metadata.origin}` : null),
1413
},
1514
};
1615

packages/ava-react/src/NarrativeTextVis/chore/plugin/presets/createOtherMetricValue.tsx

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
import { isNumber } from 'lodash';
2-
31
import { createEntityPhraseFactory } from '../createEntityPhraseFactory';
42
import { getThemeColor } from '../../../theme';
3+
import { isNumberLike } from '../../../../utils';
54

65
import type { SpecificEntityPhraseDescriptor } from '../plugin-protocol.type';
76

@@ -10,7 +9,7 @@ const defaultOtherMetricValueDescriptor: SpecificEntityPhraseDescriptor = {
109
color: (value, metadata, { theme }) => getThemeColor('colorOtherValue', theme),
1110
},
1211
tooltip: {
13-
title: (value, metadata) => (isNumber(metadata.origin) ? `${metadata.origin}` : null),
12+
title: (value, metadata) => (isNumberLike(metadata.origin) ? `${metadata.origin}` : null),
1413
},
1514
};
1615

packages/ava-react/src/NarrativeTextVis/chore/plugin/presets/createProportion.tsx

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
import React from 'react';
22

3-
import { isNumber, isNaN } from 'lodash';
3+
import { isNaN } from 'lodash';
44

55
import { ProportionChart } from '../../../line-charts';
66
import { createEntityPhraseFactory } from '../createEntityPhraseFactory';
7+
import { isNumberLike } from '../../../../utils';
78

89
import type { SpecificEntityPhraseDescriptor } from '../plugin-protocol.type';
910

@@ -23,7 +24,7 @@ const defaultProportionDescriptor: SpecificEntityPhraseDescriptor = {
2324
),
2425
},
2526
tooltip: {
26-
title: (value, metadata) => (isNumber(metadata.origin) ? `${metadata.origin}` : null),
27+
title: (value, metadata) => (isNumberLike(metadata.origin) ? `${metadata.origin}` : null),
2728
},
2829
};
2930

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
export { getPrefixCls } from './getPrefixCls';
22
export { classnames } from './classnames';
3+
export * from './isType';
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import { toNumber, isNaN } from 'lodash';
2+
3+
export function isNumberLike(val: unknown) {
4+
const numVal = toNumber(val);
5+
return !isNaN(numVal);
6+
}

0 commit comments

Comments
 (0)