feat(pie): use optional chaining and nullish coalescing

plouc · Nov 5, 2020 · a770ed5 · a770ed5
1 parent ff242a9
commit a770ed5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/packages/pie/src/PieCanvas.tsx b/packages/pie/src/PieCanvas.tsx
@@ -128,7 +128,7 @@ const PieCanvas = <R, >({
 
     legends = defaultProps.legends,
 }: PieCanvasProps<R>) => {
-    const canvasEl = useRef<HTMLCanvasElement>(null)
+    const canvasEl = useRef<HTMLCanvasElement | null>(null)
     const theme = useTheme()
 
     const { margin, innerWidth, innerHeight, outerWidth, outerHeight } = useDimensions(
@@ -296,7 +296,7 @@ const PieCanvas = <R, >({
     const handleMouseHover = (event: React.MouseEvent<HTMLCanvasElement>) => {
         const datum = getArcFromMouse(event)
         if (datum) {
-            if (onMouseMove) onMouseMove(datum, event)
+            onMouseMove?.(datum, event)
             showTooltipFromEvent(createElement(tooltip, { datum }), event)
         } else {
             hideTooltip()

diff --git a/packages/pie/src/PieSlice.tsx b/packages/pie/src/PieSlice.tsx
@@ -38,31 +38,31 @@ export const PieSlice = <R, >({
 
     const handleMouseEnter = useCallback(
         event => {
-            if (onMouseEnter) onMouseEnter(datum, event)
+            onMouseEnter?.(datum, event)
             handleTooltip(event)
         },
         [onMouseEnter, handleTooltip, datum]
     )
 
     const handleMouseMove = useCallback(
         event => {
-            if (onMouseMove) onMouseMove(datum, event)
+            onMouseMove?.(datum, event)
             handleTooltip(event)
         },
         [onMouseMove, handleTooltip, datum]
     )
 
     const handleMouseLeave = useCallback(
         event => {
-            if (onMouseLeave) onMouseLeave(datum, event)
+            onMouseLeave?.(datum, event)
             hideTooltip(event)
         },
         [onMouseLeave, hideTooltip, datum]
     )
 
     const handleClick = useCallback(
         event => {
-            if (onClick) onClick(datum, event)
+            onClick?.(datum, event)
         },
         [onClick, datum]
     )

diff --git a/packages/pie/src/props.ts b/packages/pie/src/props.ts
@@ -58,5 +58,5 @@ export const defaultProps = {
 
     role: 'img',
 
-    pixelRatio: window && window.devicePixelRatio ? window.devicePixelRatio : 1,
+    pixelRatio: window?.devicePixelRatio ?? 1,
 }