diff --git a/src/ImageMap/index.stories.tsx b/src/ImageMap/index.stories.tsx index 9cfe7e5e..8cf7e98a 100644 --- a/src/ImageMap/index.stories.tsx +++ b/src/ImageMap/index.stories.tsx @@ -2,7 +2,7 @@ import { Story } from '@storybook/react'; import React from 'react'; import { Plate } from '../Plate'; -import { COORDINATE_SYSTEM_96_WELL } from '../Plate/coordinateSystem96Well'; +import { COORDINATE_SYSTEM_12X8 } from '../Plate/coordinateSystem12x8'; import { TecanLayout } from '../index'; import { HiddenArea } from './HiddenArea'; @@ -23,7 +23,7 @@ export const TecanLayoutExample: Story = function Default() { content: ( ), }, @@ -56,7 +56,7 @@ export const Default: Story = function Default(args) { content={ } /> diff --git a/src/Plate/coordinateSystem96Well.ts b/src/Plate/coordinateSystem12x8.ts similarity index 62% rename from src/Plate/coordinateSystem96Well.ts rename to src/Plate/coordinateSystem12x8.ts index 5c2ad7ed..59a9524d 100644 --- a/src/Plate/coordinateSystem96Well.ts +++ b/src/Plate/coordinateSystem12x8.ts @@ -1,8 +1,8 @@ import { CoordinateSystem } from './types'; -export const COORDINATE_SYSTEM_96_WELL = { +export const COORDINATE_SYSTEM_12X8 = { rows: ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H'], columns: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], } as const satisfies CoordinateSystem; -export type CoordinateSystem96Well = typeof COORDINATE_SYSTEM_96_WELL; +export type CoordinateSystem12X8 = typeof COORDINATE_SYSTEM_12X8; diff --git a/src/Plate/index.stories.tsx b/src/Plate/index.stories.tsx index a83a039a..91cc2767 100644 --- a/src/Plate/index.stories.tsx +++ b/src/Plate/index.stories.tsx @@ -5,9 +5,9 @@ import React from 'react'; import { PALETTE } from '../theme'; import { - COORDINATE_SYSTEM_96_WELL, - CoordinateSystem96Well, -} from './coordinateSystem96Well'; + COORDINATE_SYSTEM_12X8, + CoordinateSystem12X8, +} from './coordinateSystem12x8'; import { PlateProps, PlateWell } from './types'; import { allCoordinateSystemPositions, coordinatesForPosition } from './utils'; @@ -21,33 +21,33 @@ export default { }, }; -const data: Array> = [ +const data: Array> = [ { coordinates: { - row: COORDINATE_SYSTEM_96_WELL.rows[0], - column: COORDINATE_SYSTEM_96_WELL.columns[6], + row: COORDINATE_SYSTEM_12X8.rows[0], + column: COORDINATE_SYSTEM_12X8.columns[6], }, content: It renders any ReactNode, }, { coordinates: { - row: COORDINATE_SYSTEM_96_WELL.rows[0], - column: COORDINATE_SYSTEM_96_WELL.columns[7], + row: COORDINATE_SYSTEM_12X8.rows[0], + column: COORDINATE_SYSTEM_12X8.columns[7], }, content: 'Test', color: PALETTE.red, }, { coordinates: { - row: COORDINATE_SYSTEM_96_WELL.rows[1], - column: COORDINATE_SYSTEM_96_WELL.columns[2], + row: COORDINATE_SYSTEM_12X8.rows[1], + column: COORDINATE_SYSTEM_12X8.columns[2], }, content: 'Some text', }, { coordinates: { - row: COORDINATE_SYSTEM_96_WELL.rows[2], - column: COORDINATE_SYSTEM_96_WELL.columns[2], + row: COORDINATE_SYSTEM_12X8.rows[2], + column: COORDINATE_SYSTEM_12X8.columns[2], }, content: ( <> @@ -61,31 +61,27 @@ const data: Array> = [ ]; const COORDINATE_SYSTEM_96_WELL_POSITIONS = allCoordinateSystemPositions( - COORDINATE_SYSTEM_96_WELL, + COORDINATE_SYSTEM_12X8, ); -const rowFlowData: Array> = +const rowFlowData: Array> = COORDINATE_SYSTEM_96_WELL_POSITIONS.map((well) => ({ - coordinates: coordinatesForPosition(well, 'row', COORDINATE_SYSTEM_96_WELL), + coordinates: coordinatesForPosition(well, 'row', COORDINATE_SYSTEM_12X8), content: well, })); -const columnFlowData: Array> = +const columnFlowData: Array> = COORDINATE_SYSTEM_96_WELL_POSITIONS.map((well) => ({ - coordinates: coordinatesForPosition( - well, - 'column', - COORDINATE_SYSTEM_96_WELL, - ), + coordinates: coordinatesForPosition(well, 'column', COORDINATE_SYSTEM_12X8), content: well, })); -const Template: Story>> = +const Template: Story>> = function Template(args) { return ( { it('renders without data', () => { - render(); + render(); }); }); diff --git a/src/Plate/index.tsx b/src/Plate/index.tsx index 68bf16af..8054a8c9 100644 --- a/src/Plate/index.tsx +++ b/src/Plate/index.tsx @@ -16,7 +16,7 @@ import { } from './utils'; export * from './constants'; -export * from './coordinateSystem96Well'; +export * from './coordinateSystem12x8'; export * from './coordinateSystem2x16'; export * from './types'; export * from './utils'; diff --git a/src/Plate/utils.test.tsx b/src/Plate/utils.test.tsx index 9b389dc9..ca8719e9 100644 --- a/src/Plate/utils.test.tsx +++ b/src/Plate/utils.test.tsx @@ -1,7 +1,7 @@ import { - COORDINATE_SYSTEM_96_WELL, - CoordinateSystem96Well, -} from './coordinateSystem96Well'; + COORDINATE_SYSTEM_12X8, + CoordinateSystem12X8, +} from './coordinateSystem12x8'; import { Coordinates, CoordinateSystem } from './types'; import { allCoordinateSystemCoordinates, @@ -80,13 +80,13 @@ const data = [ describe.each(data)('rowForPosition', (dataSet) => { it('provides the row for a position depending on the flow', () => { expect( - rowForPosition(dataSet.rowFlowPosition, 'row', COORDINATE_SYSTEM_96_WELL), + rowForPosition(dataSet.rowFlowPosition, 'row', COORDINATE_SYSTEM_12X8), ).toBe(dataSet.row); expect( rowForPosition( dataSet.columnFlowPosition, 'column', - COORDINATE_SYSTEM_96_WELL, + COORDINATE_SYSTEM_12X8, ), ).toBe(dataSet.row); }); @@ -95,17 +95,13 @@ describe.each(data)('rowForPosition', (dataSet) => { describe.each(data)('columnForPosition', (dataSet) => { it('provides the column for a position depending on the flow', () => { expect( - columnForPosition( - dataSet.rowFlowPosition, - 'row', - COORDINATE_SYSTEM_96_WELL, - ), + columnForPosition(dataSet.rowFlowPosition, 'row', COORDINATE_SYSTEM_12X8), ).toBe(dataSet.column); expect( columnForPosition( dataSet.columnFlowPosition, 'column', - COORDINATE_SYSTEM_96_WELL, + COORDINATE_SYSTEM_12X8, ), ).toBe(dataSet.column); }); @@ -116,7 +112,7 @@ describe.each(data)('convertPositionFromColumnToRowFlow', (dataSet) => { expect( convertPositionFromColumnToRowFlow( dataSet.columnFlowPosition, - COORDINATE_SYSTEM_96_WELL, + COORDINATE_SYSTEM_12X8, ), ).toBe(dataSet.rowFlowPosition); }); @@ -127,7 +123,7 @@ describe.each(data)('convertPositionFromRowToColumnFlow', (dataSet) => { expect( convertPositionFromRowToColumnFlow( dataSet.rowFlowPosition, - COORDINATE_SYSTEM_96_WELL, + COORDINATE_SYSTEM_12X8, ), ).toBe(dataSet.columnFlowPosition); }); @@ -136,10 +132,7 @@ describe.each(data)('convertPositionFromRowToColumnFlow', (dataSet) => { describe('ensureCoordinatesInRange', () => { it('throws on invalid rows', () => { expect(() => - ensureCoordinatesInRange( - { row: 'X', column: 2 }, - COORDINATE_SYSTEM_96_WELL, - ), + ensureCoordinatesInRange({ row: 'X', column: 2 }, COORDINATE_SYSTEM_12X8), ).toThrow(); }); @@ -147,32 +140,32 @@ describe('ensureCoordinatesInRange', () => { expect(() => ensureCoordinatesInRange( { row: 'B', column: 23 }, - COORDINATE_SYSTEM_96_WELL, + COORDINATE_SYSTEM_12X8, ), ).toThrow(); }); it('works with valid coordinates', () => { - const coordinates: Coordinates = { + const coordinates: Coordinates = { row: 'A', column: 3, }; - expect( - ensureCoordinatesInRange(coordinates, COORDINATE_SYSTEM_96_WELL), - ).toBe(coordinates); + expect(ensureCoordinatesInRange(coordinates, COORDINATE_SYSTEM_12X8)).toBe( + coordinates, + ); }); }); describe('areEqualCoordinates', () => { it('match', () => { - const a: Coordinates = { row: 'A', column: 2 }; + const a: Coordinates = { row: 'A', column: 2 }; expect(areEqualCoordinates(a, a)).toBe(true); expect(areEqualCoordinates(a, { ...a, foo: 'bar' })).toBe(true); }); it('no match', () => { - const a: Coordinates = { row: 'A', column: 2 }; - const b: Coordinates = { row: 'B', column: 3 }; + const a: Coordinates = { row: 'A', column: 2 }; + const b: Coordinates = { row: 'B', column: 3 }; expect(areEqualCoordinates(a, b)).toBe(false); expect(areEqualCoordinates(a, { ...b, foo: 'bar' })).toBe(false); });