Fix issues with top, bottom, left, right keys in generated React Native code #841

Closed
dhruska wants to merge 2 commits from @dhruska/fix-position-properties into main

View File

@@ -71,18 +71,19 @@ function getLayoutCode(node: LayoutRecordT, indent: string = ''): string {
top !== untouchedLayout[key].top && top !== untouchedLayout[key].top &&
top === left && top === left &&
top === right && top === right &&
top === bottom top === bottom &&
key !== 'position'
) { ) {
// all edges // all edges
lines.push(indent + ` ${key}: ${node[key].top},`); lines.push(indent + ` ${key}: ${node[key].top},`);
return; return;
} }
const alreadySet = []; const alreadySet = [];
if (top && top !== untouchedLayout[key].top && top === bottom) { if (top && top !== untouchedLayout[key].top && top === bottom && key !== 'position') {
lines.push(indent + ` ${key}Vertical: ${getValue(node[key].top)},`); lines.push(indent + ` ${key}Vertical: ${getValue(node[key].top)},`);
alreadySet.push('top', 'bottom'); alreadySet.push('top', 'bottom');
} }
if (left && left !== untouchedLayout[key].left && left === right) { if (left && left !== untouchedLayout[key].left && left === right && key !== 'position') {
lines.push(indent + ` ${key}Horizontal: ${getValue(node[key].left)},`); lines.push(indent + ` ${key}Horizontal: ${getValue(node[key].left)},`);
alreadySet.push('left', 'right'); alreadySet.push('left', 'right');
} }
@@ -95,9 +96,11 @@ function getLayoutCode(node: LayoutRecordT, indent: string = ''): string {
) { ) {
lines.push( lines.push(
indent + indent +
` ${key}${pKey[0].toUpperCase()}${pKey.substr(1)}: ${getValue( ` ${
node[key][pKey], key === "position"
)},`, ? pKey
: `${key}${pKey[0].toUpperCase()}${pKey.substr(1)}`
}: ${getValue(node[key][pKey])},`
); );
} }
}); });