fix: better showDatumElements support

TanStack · Jul 9, 2021 · 89ea984 · 89ea984
1 parent da1b148
commit 89ea984
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 41 deletions.
diff --git a/src/seriesTypes/Area.tsx b/src/seriesTypes/Area.tsx
@@ -95,21 +95,18 @@ export default function AreaComponent<TDatum>({
                   cx={getX(datum)}
                   cy={getY(datum, 1) ?? NaN}
                   stroke="rgba(33,33,33,0.5)"
-                  fill="transparent"
                   style={{
                     // @ts-ignore
                     r: 2,
-                    opacity: 1,
-                    ...(!secondaryAxis.showDatumElements
-                      ? {
-                          opacity: 0,
-                          pointerEvents: 'none',
-                        }
-                      : {}),
                     ...style,
                     ...style.circle,
                     ...dataStyle,
                     ...dataStyle.circle,
+                    ...(!(secondaryAxis.showDatumElements ?? true)
+                      ? {
+                          opacity: 0,
+                        }
+                      : {}),
                   }}
                 />
               )

diff --git a/src/seriesTypes/Line.tsx b/src/seriesTypes/Line.tsx
@@ -11,14 +11,6 @@ const pathDefaultStyle = {
   strokeWidth: 2,
 }
 
-const circleDefaultStyle = {
-  r: 2,
-  strokeWidth: '1',
-  stroke: '#000000',
-  fill: '#000000',
-  opacity: 1,
-}
-
 export default function Line<TDatum>({
   primaryAxis,
   secondaryAxis,
@@ -76,31 +68,36 @@ export default function Line<TDatum>({
 
         return (
           <g key={`lines-${i}`}>
-            {(secondaryAxis.showDatumElements ?? true) &&
-              series.datums.map((datum, i) => {
-                const dataStyle = getDatumStatusStyle(datum, focusedDatum)
+            {series.datums.map((datum, i) => {
+              const dataStyle = getDatumStatusStyle(datum, focusedDatum)
 
-                return (
-                  <circle
-                    key={i}
-                    ref={el => {
-                      datum.element = el
-                    }}
-                    r={2}
-                    cx={getX(datum)}
-                    cy={getY(datum)}
-                    stroke="rgba(33,33,33,0.5)"
-                    fill="transparent"
-                    style={{
-                      ...circleDefaultStyle,
-                      ...style,
-                      ...style.circle,
-                      ...dataStyle,
-                      ...dataStyle.circle,
-                    }}
-                  />
-                )
-              })}
+              return (
+                <circle
+                  key={i}
+                  ref={el => {
+                    datum.element = el
+                  }}
+                  r={2}
+                  cx={getX(datum)}
+                  cy={getY(datum)}
+                  stroke="rgba(33,33,33,0.5)"
+                  fill="transparent"
+                  style={{
+                    // @ts-ignore
+                    r: 2,
+                    ...style,
+                    ...style.circle,
+                    ...dataStyle,
+                    ...dataStyle.circle,
+                    ...(!(secondaryAxis.showDatumElements ?? true)
+                      ? {
+                          opacity: 0,
+                        }
+                      : {}),
+                  }}
+                />
+              )
+            })}
             <path d={linePath} style={lineStyle} />
           </g>
         )

diff --git a/src/types.ts b/src/types.ts
@@ -215,7 +215,6 @@ export type AxisOptionsBase = {
   primaryAxisId?: string
   elementType?: 'line' | 'area' | 'bar'
   showDatumElements?: boolean
-  showOrphanDatumElements?: boolean
   curve?: CurveFactory
   invert?: boolean
   position: Position