fix: change from or to null operator and other fixes suggested in PR.

vydimitrov · Feb 7, 2021 · 2e79ed3 · 2e79ed3
1 parent 4db200f
commit 2e79ed3
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 6 deletions.
diff --git a/packages/mobile/src/components/CountdownCircleTimer.jsx b/packages/mobile/src/components/CountdownCircleTimer.jsx
@@ -71,7 +71,7 @@ const CountdownCircleTimer = (props) => {
         )}
         <Path
           fill="none"
-          strokeWidth={trailStrokeWidth || strokeWidth}
+          strokeWidth={trailStrokeWidth ?? strokeWidth}
           stroke={trailColor}
           d={path}
         />

diff --git a/packages/mobile/types/CountdownCircleTimer.d.ts b/packages/mobile/types/CountdownCircleTimer.d.ts
@@ -31,6 +31,8 @@ export interface CountdownCircleTimerProps {
   rotation?: 'clockwise' | 'counterclockwise'
   /** Circle trail color - takes any valid color format (HEX, rgb, rgba, etc.). Default: #d9d9d9 */
   trailColor?: string
+  /** Trail stroke width. */
+  trailStrokeWidth?: number
   /** Play and pause animation. Default: false */
   isPlaying?: boolean
   /** Apples linear gradient on top of the circle. The gradient doesn't follow the circle path. Works best with two colors. Default: false */

diff --git a/packages/shared/utils/countdownCircleTimerDefaultProps.js b/packages/shared/utils/countdownCircleTimerDefaultProps.js
@@ -1,7 +1,6 @@
 export const countdownCircleTimerDefaultProps = {
   size: 180,
   strokeWidth: 12,
-  trailStrokeWidth: false,
   trailColor: '#d9d9d9',
   isPlaying: false,
   strokeLinecap: 'round',

diff --git a/packages/shared/utils/countdownCircleTimerProps.js b/packages/shared/utils/countdownCircleTimerProps.js
@@ -7,7 +7,7 @@ export const countdownCircleTimerProps = {
   children: PropTypes.oneOfType([PropTypes.func, PropTypes.node]),
   size: PropTypes.number,
   strokeWidth: PropTypes.number,
-  trailStrokeWidth: PropTypes.oneOfType([PropTypes.number, PropTypes.bool]),
+  trailStrokeWidth: PropTypes.number,
   trailColor: PropTypes.string,
   isPlaying: PropTypes.bool,
   strokeLinecap: PropTypes.oneOf(['round', 'square']),

diff --git a/packages/web/src/components/CountdownCircleTimer.jsx b/packages/web/src/components/CountdownCircleTimer.jsx
@@ -55,7 +55,7 @@ const CountdownCircleTimer = ({
           d={path}
           fill="none"
           stroke={trailColor}
-          strokeWidth={trailStrokeWidth || strokeWidth}
+          strokeWidth={trailStrokeWidth ?? strokeWidth}
         />
         <path
           d={path}

diff --git a/packages/web/types/CountdownCircleTimer.d.ts b/packages/web/types/CountdownCircleTimer.d.ts
@@ -25,8 +25,8 @@ export interface CountdownCircleTimerProps {
   size?: number
   /** Path stroke width. Default: 12 */
   strokeWidth?: number
-  /** Trail stroke width Default: false */
-  trailStrokeWidth?: number | boolean
+  /** Trail stroke width */
+  trailStrokeWidth?: number
   /** Path stroke line cap. Default: "round" */
   strokeLinecap?: 'round' | 'square'
   /** Progress path rotation direction. Default: "clockwise" */