Skip to content

Commit

Permalink
chore: remove unnecessary useMemo and inline func
Browse files Browse the repository at this point in the history
  • Loading branch information
maasencioh committed Nov 1, 2020
1 parent 8b35562 commit 2fd3505
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 26 deletions.
23 changes: 6 additions & 17 deletions src/Wafer.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { CSSProperties, FunctionComponent, useMemo } from 'react';
import React, { CSSProperties, useMemo } from 'react';

import WaferCircle from './WaferCircle';
import { calculateDiameter, listLabels } from './utils';
Expand Down Expand Up @@ -58,27 +58,16 @@ function getItemStyle(
};
}

export const Wafer: FunctionComponent<WaferProps> = (props) => {
export function Wafer(props: WaferProps) {
const { rows, columns, size, pickedItems = [], onSelect } = props;
const devices = useMemo(() => listLabels(rows, columns, pickedItems), [
rows,
columns,
pickedItems,
]);
const waferStyle = useMemo(() => getWaferStyle(columns, size), [
columns,
size,
]);
const itemStyle = useMemo(() => getItemStyle(rows, columns, size), [
rows,
columns,
size,
]);
const diameter = useMemo(() => calculateDiameter(size, rows, columns), [
rows,
columns,
size,
]);
const waferStyle = getWaferStyle(columns, size);
const itemStyle = getItemStyle(rows, columns, size);
const diameter = calculateDiameter(size, rows, columns);
return (
<div style={waferStyle}>
<WaferCircle diameter={diameter} size={size} />
Expand All @@ -96,4 +85,4 @@ export const Wafer: FunctionComponent<WaferProps> = (props) => {
))}
</div>
);
};
}
14 changes: 5 additions & 9 deletions src/WaferCircle.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { CSSProperties, FunctionComponent, useMemo } from 'react';
import React, { CSSProperties } from 'react';

interface WaferCircleProps {
diameter: number;
Expand All @@ -14,11 +14,9 @@ function getCircleStyle(diameter: number): CSSProperties {
background: '#549ADA',
};
}
const WaferCircle: FunctionComponent<WaferCircleProps> = ({
diameter,
size,
}) => {
const circleStyle = useMemo(() => getCircleStyle(diameter), [diameter]);

export default function WaferCircle({ diameter, size }: WaferCircleProps) {
const circleStyle = getCircleStyle(diameter);
const containerStyle: CSSProperties = {
position: 'absolute',
width: size,
Expand All @@ -34,6 +32,4 @@ const WaferCircle: FunctionComponent<WaferCircleProps> = ({
<div style={circleStyle} />
</div>
);
};

export default WaferCircle;
}

0 comments on commit 2fd3505

Please sign in to comment.