diff --git a/packages/react/components/Pattern/part.mjs b/packages/react/components/Pattern/part.mjs index e773244caa9..1d86bbd13ab 100644 --- a/packages/react/components/Pattern/part.mjs +++ b/packages/react/components/Pattern/part.mjs @@ -3,7 +3,7 @@ import React, { forwardRef } from 'react' import { getId, getProps } from './utils.mjs' export const PartInner = forwardRef( - ({ stackName, partName, part, settings, components, strings }, ref) => { + ({ stackName, partName, part, settings, components, strings, drillProps }, ref) => { const { Group, Path, Point, Snippet } = components return ( @@ -15,7 +15,7 @@ export const PartInner = forwardRef( topLeft={part.topLeft} bottomRight={part.bottomRight} units={settings[0].units} - {...{ stackName, partName, pathName, part, settings, components, strings }} + {...{ stackName, partName, pathName, part, settings, components, strings, drillProps }} /> ))} {Object.keys(part.points).map((pointName) => ( @@ -24,14 +24,23 @@ export const PartInner = forwardRef( point={part.points[pointName]} topLeft={part.topLeft} bottomRight={part.bottomRight} - {...{ stackName, partName, pointName, part, settings, components, strings }} + {...{ stackName, partName, pointName, part, settings, components, strings, drillProps }} /> ))} {Object.keys(part.snippets).map((snippetName) => ( ))} @@ -41,12 +50,12 @@ export const PartInner = forwardRef( PartInner.displayName = 'PartInner' -export const Part = ({ stackName, partName, part, settings, components, strings }) => { +export const Part = ({ stackName, partName, part, settings, components, strings, drillProps }) => { const { Group } = components return ( - + ) } diff --git a/packages/react/components/Pattern/stack.mjs b/packages/react/components/Pattern/stack.mjs index 954fab2c3ab..4c17fd29ba8 100644 --- a/packages/react/components/Pattern/stack.mjs +++ b/packages/react/components/Pattern/stack.mjs @@ -1,14 +1,14 @@ import React from 'react' import { getProps } from './utils.mjs' -export const Stack = ({ stackName, stack, settings, components, strings }) => { +export const Stack = ({ stackName, stack, settings, components, strings, drillProps }) => { const { Group, Part, Grid } = components return ( {settings[0].paperless ? : null} {[...stack.parts].map((part, key) => ( - + ))} ) diff --git a/packages/react/components/Xray/index.mjs b/packages/react/components/Xray/index.mjs index ecf28f555e9..85f4ad1026c 100644 --- a/packages/react/components/Xray/index.mjs +++ b/packages/react/components/Xray/index.mjs @@ -17,11 +17,11 @@ export const Xray = forwardRef((props, ref) => { // desctructure props const { renderProps = false, - t = (string) => string, children = false, className = 'freesewing pattern', components = {}, drillProps = {}, + strings = [], } = props // Merge pattern, default, and custom components @@ -57,7 +57,7 @@ export const Xray = forwardRef((props, ref) => { stack={renderProps.stacks[stackName]} settings={renderProps.settings} components={mergedComponents} - t={t} + strings={strings} drillProps={drillProps} /> ))} diff --git a/packages/react/components/Xray/path.mjs b/packages/react/components/Xray/path.mjs index 07fce678e63..3495028d9f4 100644 --- a/packages/react/components/Xray/path.mjs +++ b/packages/react/components/Xray/path.mjs @@ -21,7 +21,7 @@ export const PathXray = ({ path, settings, components, - t, + strings, drillProps = {}, }) => { /* @@ -87,7 +87,7 @@ export const PathXray = ({ return ( {output} - + ) } diff --git a/packages/react/components/Xray/point.mjs b/packages/react/components/Xray/point.mjs index a711702a1c2..f26f72753f5 100644 --- a/packages/react/components/Xray/point.mjs +++ b/packages/react/components/Xray/point.mjs @@ -14,7 +14,7 @@ export const PointXray = ({ point, settings, components, - t, + strings, drillProps = {}, }) => { // Don't include parts outside the part bounding box @@ -32,7 +32,9 @@ export const PointXray = ({ return ( <> - +