diff --git a/packages/core/src/common/params.ts b/packages/core/src/common/params.ts index ef4a3565c..402691a8b 100644 --- a/packages/core/src/common/params.ts +++ b/packages/core/src/common/params.ts @@ -13,7 +13,7 @@ export type ListParamsOptions = | ObjectStyleListOptions; export interface PointDimensionParams { - formatter?: Formatter; + format?: Formatter; max?: number; min?: number; step?: number; diff --git a/packages/core/src/common/point-nd/util.ts b/packages/core/src/common/point-nd/util.ts index 00a808d46..f9b6de56a 100644 --- a/packages/core/src/common/point-nd/util.ts +++ b/packages/core/src/common/point-nd/util.ts @@ -8,7 +8,7 @@ import {PointDimensionParams} from '../params'; export function createPointDimensionParser(p: typeof MicroParsers) { return { - formatter: p.optional.function as MicroParser>, + format: p.optional.function as MicroParser>, max: p.optional.number, min: p.optional.number, step: p.optional.number, diff --git a/packages/core/src/input-binding/point-2d/plugin-test.ts b/packages/core/src/input-binding/point-2d/plugin-test.ts index f350345b7..83f398db8 100644 --- a/packages/core/src/input-binding/point-2d/plugin-test.ts +++ b/packages/core/src/input-binding/point-2d/plugin-test.ts @@ -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'], }, diff --git a/packages/core/src/input-binding/point-2d/plugin.ts b/packages/core/src/input-binding/point-2d/plugin.ts index 48ac2153f..c2c31ba17 100644 --- a/packages/core/src/input-binding/point-2d/plugin.ts +++ b/packages/core/src/input-binding/point-2d/plugin.ts @@ -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, diff --git a/packages/core/src/input-binding/point-3d/plugin-test.ts b/packages/core/src/input-binding/point-3d/plugin-test.ts index 6e9796bda..f616ce756 100644 --- a/packages/core/src/input-binding/point-3d/plugin-test.ts +++ b/packages/core/src/input-binding/point-3d/plugin-test.ts @@ -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'], }, diff --git a/packages/core/src/input-binding/point-3d/plugin.ts b/packages/core/src/input-binding/point-3d/plugin.ts index 9bea07704..c78b0e30c 100644 --- a/packages/core/src/input-binding/point-3d/plugin.ts +++ b/packages/core/src/input-binding/point-3d/plugin.ts @@ -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, }), ), diff --git a/packages/core/src/input-binding/point-4d/plugin-test.ts b/packages/core/src/input-binding/point-4d/plugin-test.ts index 8e9bc1679..ee22f0a66 100644 --- a/packages/core/src/input-binding/point-4d/plugin-test.ts +++ b/packages/core/src/input-binding/point-4d/plugin-test.ts @@ -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'], }, diff --git a/packages/core/src/input-binding/point-4d/plugin.ts b/packages/core/src/input-binding/point-4d/plugin.ts index c11f492c9..9d57211d9 100644 --- a/packages/core/src/input-binding/point-4d/plugin.ts +++ b/packages/core/src/input-binding/point-4d/plugin.ts @@ -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, }), ),