Skip to content

Commit

Permalink
Rename point nD params, #511
Browse files Browse the repository at this point in the history
  • Loading branch information
cocopon committed Mar 11, 2023
1 parent b1bbf69 commit 63f7415
Show file tree
Hide file tree
Showing 8 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion packages/core/src/common/params.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export type ListParamsOptions<T> =
| ObjectStyleListOptions<T>;

export interface PointDimensionParams {
formatter?: Formatter<number>;
format?: Formatter<number>;
max?: number;
min?: number;
step?: number;
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/common/point-nd/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {PointDimensionParams} from '../params';

export function createPointDimensionParser(p: typeof MicroParsers) {
return {
formatter: p.optional.function as MicroParser<Formatter<number>>,
format: p.optional.function as MicroParser<Formatter<number>>,
max: p.optional.number,
min: p.optional.number,
step: p.optional.number,
Expand Down
8 changes: 4 additions & 4 deletions packages/core/src/input-binding/point-2d/plugin-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -189,15 +189,15 @@ describe(Point2dInputPlugin.id, () => {
[
{
params: {
formatter: () => 'foo',
x: {formatter: () => 'bar'},
format: () => 'foo',
x: {format: () => 'bar'},
},
expected: ['bar', 'foo'],
},
{
params: {
formatter: () => 'foo',
y: {formatter: () => 'bar'},
format: () => 'foo',
y: {format: () => 'bar'},
},
expected: ['foo', 'bar'],
},
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/input-binding/point-2d/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ export const Point2dInputPlugin: InputBindingPlugin<
axes: value.rawValue.getComponents().map((comp, i) =>
createPointAxis({
constraint: c.components[i],
formatter: dParams[i]?.formatter ?? args.params.formatter,
formatter: dParams[i]?.format ?? args.params.format,
initialValue: comp,
}),
) as Tuple2<PointAxis>,
Expand Down
12 changes: 6 additions & 6 deletions packages/core/src/input-binding/point-3d/plugin-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,22 +146,22 @@ describe(Point3dInputPlugin.id, () => {
[
{
params: {
formatter: () => 'foo',
x: {formatter: () => 'bar'},
format: () => 'foo',
x: {format: () => 'bar'},
},
expected: ['bar', 'foo', 'foo'],
},
{
params: {
formatter: () => 'foo',
y: {formatter: () => 'bar'},
format: () => 'foo',
y: {format: () => 'bar'},
},
expected: ['foo', 'bar', 'foo'],
},
{
params: {
formatter: () => 'foo',
z: {formatter: () => 'bar'},
format: () => 'foo',
z: {format: () => 'bar'},
},
expected: ['foo', 'foo', 'bar'],
},
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/input-binding/point-3d/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export const Point3dInputPlugin: InputBindingPlugin<
axes: value.rawValue.getComponents().map((comp, i) =>
createPointAxis({
constraint: c.components[i],
formatter: dParams[i]?.formatter ?? args.params.formatter,
formatter: dParams[i]?.format ?? args.params.format,
initialValue: comp,
}),
),
Expand Down
16 changes: 8 additions & 8 deletions packages/core/src/input-binding/point-4d/plugin-test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -154,29 +154,29 @@ describe(Point4dInputPlugin.id, () => {
[
{
params: {
formatter: () => 'foo',
x: {formatter: () => 'bar'},
format: () => 'foo',
x: {format: () => 'bar'},
},
expected: ['bar', 'foo', 'foo', 'foo'],
},
{
params: {
formatter: () => 'foo',
y: {formatter: () => 'bar'},
format: () => 'foo',
y: {format: () => 'bar'},
},
expected: ['foo', 'bar', 'foo', 'foo'],
},
{
params: {
formatter: () => 'foo',
z: {formatter: () => 'bar'},
format: () => 'foo',
z: {format: () => 'bar'},
},
expected: ['foo', 'foo', 'bar', 'foo'],
},
{
params: {
formatter: () => 'foo',
w: {formatter: () => 'bar'},
format: () => 'foo',
w: {format: () => 'bar'},
},
expected: ['foo', 'foo', 'foo', 'bar'],
},
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/input-binding/point-4d/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export const Point4dInputPlugin: InputBindingPlugin<
axes: value.rawValue.getComponents().map((comp, i) =>
createPointAxis({
constraint: c.components[i],
formatter: dParams[i]?.formatter ?? args.params.formatter,
formatter: dParams[i]?.format ?? args.params.format,
initialValue: comp,
}),
),
Expand Down

0 comments on commit 63f7415

Please sign in to comment.