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

chore: migrate FormattedNumber component from jsx to tsx #17361

Merged
merged 4 commits into from
Nov 22, 2021
Merged

chore: migrate FormattedNumber component from jsx to tsx #17361

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
841c03c
migrate FormattedNumber component from jsx to tsx
Damans227 Nov 5, 2021
82df406
Unset default prop on format
Damans227 Nov 12, 2021
0741443
undo asserting and overriding the type for num
Damans227 Nov 12, 2021
a4f2fff
Add a ts comment to ignore error
Damans227 Nov 17, 2021
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
22 changes: 7 additions & 15 deletions ...ualizations/TimeTable/FormattedNumber.jsx → ...ualizations/TimeTable/FormattedNumber.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,27 +17,19 @@
* under the License.
*/
import React from 'react';
import PropTypes from 'prop-types';
import { formatNumber } from '@superset-ui/core';

const propTypes = {
num: PropTypes.number,
format: PropTypes.string,
};

const defaultProps = {
num: 0,
format: undefined,
};
interface FormattedNumberProps {
num?: string | number;
format?: string;
}

function FormattedNumber({ num, format }) {
function FormattedNumber({ num = 0, format }: FormattedNumberProps) {
if (format) {
return <span title={num}>{formatNumber(format, num)}</span>;
// @ts-expect-error formatNumber can actually accept strings, even though it's not typed as such
return <span title={`${num}`}>{formatNumber(format, num)}</span>;
}
return <span>{num}</span>;
}

FormattedNumber.propTypes = propTypes;
FormattedNumber.defaultProps = defaultProps;

export default FormattedNumber;