Skip to content

Commit 1894428

Browse files
authored
Temporarily support string for Badge size (#1580)
1 parent fa2bc1d commit 1894428

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

generatedTypes/src/components/avatar/index.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ declare class Avatar extends PureComponent<AvatarProps> {
150150
getRibbonStyle(): StyleProp<ViewStyle>;
151151
getBadgeBorderWidth: () => any;
152152
getBadgeColor(): any;
153-
getBadgeSize: () => number;
153+
getBadgeSize: () => string | number;
154154
getBadgePosition: () => object;
155155
renderBadge(): JSX.Element | undefined;
156156
renderRibbon(): JSX.Element | undefined;

generatedTypes/src/components/badge/index.d.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ export declare type BadgeProps = ViewProps & TouchableOpacityProps & {
1515
/**
1616
* the badge size
1717
*/
18-
size?: number;
18+
size?: number | string;
1919
/**
2020
* Press handler
2121
*/
@@ -83,7 +83,7 @@ declare class Badge extends PureComponent<BadgeProps> {
8383
accessibilityRole: string;
8484
accessibilityLabel: string;
8585
};
86-
get size(): number;
86+
get size(): string | number;
8787
isSmallBadge(): boolean;
8888
getBadgeSizeStyle(): any;
8989
getFormattedLabel(): any;
@@ -343,7 +343,7 @@ declare const _default: React.ComponentClass<ViewProps & TouchableOpacityProps &
343343
/**
344344
* the badge size
345345
*/
346-
size?: number | undefined;
346+
size?: string | number | undefined;
347347
/**
348348
* Press handler
349349
*/

src/components/avatar/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,7 @@ class Avatar extends PureComponent<AvatarProps> {
237237
const radius = size / 2;
238238
const x = Math.sqrt(radius ** 2 * 2);
239239
const y = x - radius;
240+
// @ts-expect-error TODO: once badge size will stop supporting string type this should be resolved
240241
const shift = Math.sqrt(y ** 2 / 2) - (this.getBadgeSize() + this.getBadgeBorderWidth() * 2) / 2;
241242
const badgeLocation = _.split(_.toLower(badgePosition), '_', 2);
242243
const badgeAlignment = {position: 'absolute', [badgeLocation[0]]: shift, [badgeLocation[1]]: shift};

src/components/badge/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ export type BadgeProps = ViewProps &
3737
/**
3838
* the badge size
3939
*/
40-
size?: number;
40+
size?: number | string;
4141
/**
4242
* Press handler
4343
*/

0 commit comments

Comments
 (0)