Skip to content

Minor optimization to display block shim #389

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −7
Open

Minor optimization to display block shim #389

Show file tree
Hide file tree
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
24 changes: 18 additions & 6 deletions packages/react-strict-dom/src/native/modules/createStrictDOMComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,13 +135,25 @@ export function createStrictDOMComponent<T, P: StrictProps>(
} else if (displayValue === 'block' && displayInsideValue === 'flow') {
// Force the block emulation styles
nextDisplayInsideValue = 'flow';
nativeProps.style.alignItems = 'stretch';
nativeProps.style.display = 'flex';
nativeProps.style.flexBasis = 'auto';
nativeProps.style.flexDirection = 'column';
nativeProps.style.flexShrink = 0;
nativeProps.style.flexWrap = 'nowrap';
nativeProps.style.justifyContent = 'flex-start';
if (nativeProps.style.alignItems != null) {
nativeProps.style.alignItems = 'stretch';
}
if (nativeProps.style.flexBasis != null) {
nativeProps.style.flexBasis = 'auto';
}
if (nativeProps.style.flexDirection != null) {
nativeProps.style.flexDirection = 'column';
}
if (nativeProps.style.flexShrink != null) {
nativeProps.style.flexShrink = 0;
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This might benefit from a little more logic, because I think flexShrink has an effect if the element is block but also a flex child

}
if (nativeProps.style.flexWrap != null) {
nativeProps.style.flexWrap = 'nowrap';
}
if (nativeProps.style.justifyContent != null) {
nativeProps.style.justifyContent = 'flex-start';
}
}

if (displayInsideValue === 'flex') {
Expand Down
5 changes: 4 additions & 1 deletion packages/react-strict-dom/tests/html-test.native.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,13 @@ describe('<html.*>', () => {
test('block layout override of flex layout', () => {
const styles = css.create({
root: {
display: 'block',
flexBasis: '25%',
flexDirection: 'row',
alignItems: 'start',
flexShrink: '1',
display: 'block'
flexWrap: 'wrap',
justifyContent: 'flex-end'
}
});

Expand Down