From 17725ff941e1ff188cbab83e8330862267ffd6f6 Mon Sep 17 00:00:00 2001 From: joostdecock Date: Sun, 4 Jun 2023 17:28:02 +0200 Subject: [PATCH] fix(react-components): Paperless grid in Pattern --- packages/react-components/src/pattern/defs.mjs | 11 +++++------ packages/react-components/src/pattern/grid.mjs | 12 ++++++------ packages/react-components/src/pattern/part.mjs | 3 +-- packages/react-components/src/pattern/stack.mjs | 3 ++- 4 files changed, 14 insertions(+), 15 deletions(-) diff --git a/packages/react-components/src/pattern/defs.mjs b/packages/react-components/src/pattern/defs.mjs index cd178ac111f..d876255cd69 100644 --- a/packages/react-components/src/pattern/defs.mjs +++ b/packages/react-components/src/pattern/defs.mjs @@ -11,14 +11,13 @@ export const Defs = (props) => { let defs = props.svg.defs.forSvg if (props.settings[0].paperless) { defs += grids[props.settings[0].units || 'metric'] - for (let p in props.parts[0]) { + for (let stack in props.stacks) { + const part = props.stacks[stack].parts[0] let anchor = { x: 0, y: 0 } - if (typeof props.parts[0][p].points.gridAnchor !== 'undefined') - anchor = props.parts[0][p].points.gridAnchor - else if (typeof props.parts[0][p].points.anchor !== 'undefined') - anchor = props.parts[0][p].points.anchor + if (typeof part.points.gridAnchor !== 'undefined') anchor = part.points.gridAnchor + else if (typeof part.points.anchor !== 'undefined') anchor = part.points.anchor - defs += `` + defs += `` } } diff --git a/packages/react-components/src/pattern/grid.mjs b/packages/react-components/src/pattern/grid.mjs index 084963cc3e2..852eaa34f07 100644 --- a/packages/react-components/src/pattern/grid.mjs +++ b/packages/react-components/src/pattern/grid.mjs @@ -1,12 +1,12 @@ import React from 'react' -export const Grid = ({ part, partName, settings }) => ( +export const Grid = ({ stack, stackName }) => ( ) diff --git a/packages/react-components/src/pattern/part.mjs b/packages/react-components/src/pattern/part.mjs index a415171e23c..9d56af4a682 100644 --- a/packages/react-components/src/pattern/part.mjs +++ b/packages/react-components/src/pattern/part.mjs @@ -3,11 +3,10 @@ import { getId, getProps } from './utils.mjs' export const PartInner = forwardRef( ({ stackName, partName, part, settings, components, t }, ref) => { - const { Group, Grid, Path, Point, Snippet } = components + const { Group, Path, Point, Snippet } = components return ( - {settings.paperless ? : null} {Object.keys(part.paths).map((pathName) => ( { - const { Group, Part } = components + const { Group, Part, Grid } = components return ( + {settings[0].paperless ? : null} {[...stack.parts].map((part, key) => ( ))}