Skip to content

bugfix/MIG-6690 Fix border #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 20, 2025
Merged

bugfix/MIG-6690 Fix border #34

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 28 additions & 7 deletions src/components/field/field.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,9 @@ const FieldBorderAnimated = styled.div<{ height: string; left: string; width: st
position: absolute;
width: ${props => props.width};
height: ${props => props.height};
left: ${props => props.left};
top: ${FIELD_BORDER_ANIMATED_PADDING / 2}px;
left: calc(${props => props.left} - ${FIELD_BORDER_ANIMATED_PADDING}px);
top: ${FIELD_BORDER_ANIMATED_PADDING / 2 - FIELD_BORDER_ANIMATED_PADDING}px;
${animatedBlueBorder};
padding: ${FIELD_BORDER_ANIMATED_PADDING}px;
margin: -${FIELD_BORDER_ANIMATED_PADDING}px;
}
`;

Expand Down Expand Up @@ -159,6 +157,28 @@ export const Field = ({
</>
);

/**
* Set the height based on the number of fields in preview multiplied by the default field height.
* Add some padding.
*/
const previewBorderHeight = `${previewGroupLength * DEFAULT_FIELD_HEIGHT + FIELD_BORDER_ANIMATED_PADDING}px`;

/**
* Set the width to 100%.
* Increase the width to cover any glyphs.
* Decrease the width if the field is nested.
* Add some padding.
*/
const previewBorderWidth = `calc(100% + ${
glyphs.length * FIELD_GLYPH_SPACING - depth * FIELD_BORDER_ANIMATED_PADDING * 2 + FIELD_BORDER_ANIMATED_PADDING * 2
}px)`;

/**
* Inset the border to the right if the field is nested.
* Inset the border to the left if the field has glyphs.
*/
const previewBorderLeft = `${depth * DEFAULT_DEPTH_SPACING - glyphs.length * FIELD_GLYPH_SPACING}px`;

return (
<FieldWrapper color={getTextColor()}>
<InnerFieldWrapper width={spacing}>
Expand All @@ -168,9 +188,10 @@ export const Field = ({
</InnerFieldWrapper>
{previewGroupLength ? (
<FieldBorder
height={`${previewGroupLength * DEFAULT_FIELD_HEIGHT - FIELD_BORDER_ANIMATED_PADDING / 2}px`}
left={`${depth * DEFAULT_DEPTH_SPACING - glyphs.length * FIELD_GLYPH_SPACING}px`}
width={`calc(100% + ${glyphs.length * FIELD_GLYPH_SPACING - depth * FIELD_BORDER_ANIMATED_PADDING * 2}px)`}
data-testid={`preview-border-${name}`}
height={previewBorderHeight}
left={previewBorderLeft}
width={previewBorderWidth}
>
{content}
</FieldBorder>
Expand Down