Skip to content

Commit

Permalink
[RNMobile] Fix crash caused by column block with padding having parag…
Browse files Browse the repository at this point in the history
…raph as a child (#33782)
  • Loading branch information
ceyhun authored Aug 3, 2021
1 parent 4872d19 commit a354e34
Showing 1 changed file with 8 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,17 @@ export const getMergedGlobalStyles = (
blockAttributes,
BLOCK_STYLE_ATTRIBUTES
);
// This prevents certain wrapper styles from being applied to blocks that
// don't support them yet.
const wrapperPropsStyleFiltered = pick(
wrapperPropsStyle,
BLOCK_STYLE_ATTRIBUTES
);

const mergedStyle = {
...baseGlobalColors,
...globalStyle,
...wrapperPropsStyle,
...wrapperPropsStyleFiltered,
};
const blockColors = getBlockColors(
blockStyleAttributes,
Expand Down

0 comments on commit a354e34

Please sign in to comment.