remove density mentions

Summary: removing dead code

Reviewed By: lblasa

Differential Revision: D50495989

fbshipit-source-id: 769f853b50bf6ec48705dbcec03977ec6a5bffa3
This commit is contained in:
Anton Kastritskiy
2023-10-20 07:23:34 -07:00
committed by Facebook GitHub Bot
parent a978c96987
commit fd774a2d52
5 changed files with 22 additions and 55 deletions

View File

@@ -94,7 +94,7 @@ function ColoredIcon(
}
ColoredIcon.displayName = 'Glyph:ColoredIcon';
export default class Glyph extends React.PureComponent<{
export default function Glyph(props: {
name: string;
size?: IconSize;
variant?: 'filled' | 'outline';
@@ -102,33 +102,22 @@ export default class Glyph extends React.PureComponent<{
color?: string;
style?: React.CSSProperties;
title?: string;
}> {
render() {
const {
name,
size = 16,
variant,
color,
className,
style,
title,
} = this.props;
}) {
const {name, size = 16, variant, color, className, style, title} = props;
return (
<ColoredIcon
name={name}
className={className}
color={color}
size={size}
title={title}
src={getIconURL({
name,
variant: variant ?? 'filled',
size,
density: typeof window !== 'undefined' ? window.devicePixelRatio : 1,
})}
style={style}
/>
);
}
return (
<ColoredIcon
name={name}
className={className}
color={color}
size={size}
title={title}
src={getIconURL({
name,
variant: variant ?? 'filled',
size,
})}
style={style}
/>
);
}

View File

@@ -11,19 +11,16 @@ import {getRenderHostInstance} from 'flipper-frontend-core';
import {IconSize} from '../ui/components/Glyph';
const AVAILABLE_SIZES: IconSize[] = [8, 10, 12, 16, 18, 20, 24, 28, 32, 48];
const DENSITIES = [1, 1.5, 2, 3, 4];
export type Icon = {
name: string;
variant: 'outline' | 'filled';
size: IconSize;
density: number;
};
function normalizeIcon(icon: Icon): Icon {
let {size, density} = icon;
let requestedSize = size as number;
if (!AVAILABLE_SIZES.includes(size as any)) {
let requestedSize = icon.size as number;
if (!AVAILABLE_SIZES.includes(icon.size as any)) {
// find the next largest size
const possibleSize = AVAILABLE_SIZES.find((size) => {
return size > requestedSize;
@@ -37,24 +34,9 @@ function normalizeIcon(icon: Icon): Icon {
}
}
if (!DENSITIES.includes(density)) {
// find the next largest size
const possibleDensity = DENSITIES.find((scale) => {
return scale > density;
});
// set to largest size if the real size is larger than what we have
if (possibleDensity == null) {
density = Math.max(...DENSITIES);
} else {
density = possibleDensity;
}
}
return {
...icon,
size: requestedSize as IconSize,
density,
};
}