Skip to content

Commit 291d3a2

Browse files
committed
fix: grid overlap issue
1 parent 4fa06cb commit 291d3a2

File tree

2 files changed

+19
-0
lines changed

2 files changed

+19
-0
lines changed

src/role-inferencer.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,12 +190,21 @@ export function inferSkeletonNode(
190190
padding: style.padding,
191191
border: style.border,
192192
boxSizing: style.boxSizing,
193+
flex: style.flex,
194+
flexGrow: style.flexGrow,
195+
flexShrink: style.flexShrink,
196+
flexBasis: style.flexBasis,
197+
alignSelf: style.alignSelf,
198+
justifySelf: style.justifySelf,
193199
justifyContent: style.justifyContent,
194200
alignItems: style.alignItems,
195201
flexDirection: style.flexDirection,
196202
minHeight: style.minHeight,
197203
gridTemplateColumns: style.gridTemplateColumns,
198204
gridTemplateRows: style.gridTemplateRows,
205+
gridColumn: style.gridColumn,
206+
gridRow: style.gridRow,
207+
gridArea: style.gridArea,
199208
},
200209
};
201210
}

src/skeleton-renderer.tsx

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,16 @@ function renderNode(
140140
// Don't set fixed height - let container size naturally from children
141141
// This avoids issues with incorrect height measurement from alt text
142142
boxSizing: 'border-box',
143+
margin: node.preservedStyles?.margin,
143144
padding: node.preservedStyles?.padding,
144145
border: hasMeaningfulBorder ? node.preservedStyles?.border : undefined,
145146
borderRadius: node.borderRadius,
147+
flex: node.preservedStyles?.flex,
148+
flexGrow: node.preservedStyles?.flexGrow ? Number(node.preservedStyles.flexGrow) : undefined,
149+
flexShrink: node.preservedStyles?.flexShrink ? Number(node.preservedStyles.flexShrink) : undefined,
150+
flexBasis: node.preservedStyles?.flexBasis,
151+
alignSelf: node.preservedStyles?.alignSelf as React.CSSProperties['alignSelf'],
152+
justifySelf: node.preservedStyles?.justifySelf as React.CSSProperties['justifySelf'],
146153
justifyContent: node.preservedStyles?.justifyContent as React.CSSProperties['justifyContent'],
147154
alignItems: node.preservedStyles?.alignItems as React.CSSProperties['alignItems'],
148155
flexDirection: node.preservedStyles?.flexDirection as React.CSSProperties['flexDirection'],
@@ -151,6 +158,9 @@ function renderNode(
151158
// are kept exactly during skeleton rendering.
152159
gridTemplateColumns: node.preservedStyles?.gridTemplateColumns,
153160
gridTemplateRows: node.preservedStyles?.gridTemplateRows,
161+
gridColumn: node.preservedStyles?.gridColumn,
162+
gridRow: node.preservedStyles?.gridRow,
163+
gridArea: node.preservedStyles?.gridArea,
154164
}}
155165
>
156166
{node.children.map((child, i) =>

0 commit comments

Comments
 (0)