Skip to content

Commit f3e3226

Browse files
committed
simplify getTicks interface: require countx/county directly
1 parent f21f738 commit f3e3226

4 files changed

Lines changed: 20 additions & 9 deletions

File tree

src/grid.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,15 @@ const Grid = ({
9292
top: `${apt + pt}px`,
9393
})
9494
)
95-
const values = getTicks({ values: valuesProp, count, logx, logy, x, y })
95+
const values = getTicks({
96+
values: valuesProp,
97+
countx: count,
98+
county: count,
99+
logx,
100+
logy,
101+
x,
102+
y,
103+
})
96104

97105
return (
98106
<>

src/tick-labels.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,6 @@ const TickLabels = ({
159159

160160
const values = getTicks({
161161
values: valuesProp,
162-
count,
163162
countx,
164163
county,
165164
logx,

src/ticks.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,15 @@ const Ticks = ({
140140
left: `${apl + pl}px`,
141141
}))
142142

143-
const values = getTicks({ values: valuesProp, count, logx, logy, x, y })
143+
const values = getTicks({
144+
values: valuesProp,
145+
countx: count,
146+
county: count,
147+
logx,
148+
logy,
149+
x,
150+
y,
151+
})
144152

145153
return (
146154
<>

src/utils/get-ticks.ts

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@ var e10 = Math.sqrt(50),
44

55
interface GetTicksParams {
66
values?: number[]
7-
count: number
8-
countx?: number
9-
county?: number
7+
countx: number
8+
county: number
109
logx: boolean
1110
logy: boolean
1211
x: { domain(): number[] }
@@ -15,16 +14,13 @@ interface GetTicksParams {
1514

1615
export default function getTicks({
1716
values,
18-
count,
1917
countx,
2018
county,
2119
logx,
2220
logy,
2321
x,
2422
y,
2523
}: GetTicksParams): { horizontal: number[]; vertical: number[] } {
26-
countx = countx || count
27-
county = county || count
2824
let verticalValues: number[], horizontalValues: number[]
2925

3026
const verticalGenerator = logx ? logTicks : ticks

0 commit comments

Comments
 (0)