Skip to content

Commit

Permalink
Merge pull request #835 from gympass/EXUX-971
Browse files Browse the repository at this point in the history
💣 feat: add new system in Box and Text
  • Loading branch information
flavia-moraes authored Aug 1, 2024
2 parents a0fb25f + a413a34 commit 3a5d055
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 16 deletions.
1 change: 1 addition & 0 deletions packages/system/src/newSystem/defaultProps.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ const props = {
mv: 'marginVertical',
mh: 'marginHorizontal',
bRadius: 'borderRadius',
bc: 'borderColor',
};

export default props;
4 changes: 2 additions & 2 deletions packages/yoga/src/Box/native/Box.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import styled from 'styled-components';
import { system } from '@gympass/yoga-system';
import { newSystem } from '@gympass/yoga-system';

const Box = styled.View(system);
const Box = styled.View(newSystem);

export default Box;
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,7 @@ exports[`<EventCard /> Snapshots should match snapshot of small EventCard active
"borderStyle": "solid",
"borderWidth": 1,
"justifyContent": "center",
"paddingBottom": 20,
"paddingTop": 20,
"paddingVertical": 20,
"width": 56,
},
]
Expand Down Expand Up @@ -275,8 +274,7 @@ exports[`<EventCard /> Snapshots should match snapshot of small EventCard with d
"borderStyle": "solid",
"borderWidth": 1,
"justifyContent": "center",
"paddingBottom": 20,
"paddingTop": 20,
"paddingVertical": 20,
"width": 56,
},
]
Expand Down Expand Up @@ -445,8 +443,7 @@ exports[`<EventCard /> Snapshots should match snapshot of small EventCard with e
"borderStyle": "solid",
"borderWidth": 1,
"justifyContent": "center",
"paddingBottom": 20,
"paddingTop": 20,
"paddingVertical": 20,
"width": 56,
},
]
Expand Down Expand Up @@ -619,8 +616,7 @@ exports[`<EventCard /> Snapshots should match snapshot of small EventCard with e
"borderStyle": "solid",
"borderWidth": 1,
"justifyContent": "center",
"paddingBottom": 20,
"paddingTop": 20,
"paddingVertical": 20,
"width": 56,
},
]
Expand Down
4 changes: 2 additions & 2 deletions packages/yoga/src/Text/native/Text.jsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import React from 'react';
import styled from 'styled-components';
import { oneOf, bool } from 'prop-types';
import { system } from '@gympass/yoga-system';
import { newSystem } from '@gympass/yoga-system';
import textStyle from '../textStyle';
import { deprecated } from '../../shared';

const styledText = type => styled.Text`
${textStyle(type)}
${system}
${newSystem}
`;

const Display1 = styledText('display1');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1194,10 +1194,8 @@ exports[`<Text /> Snapshots should match snapshot with spacing prop system 1`] =
"marginLeft": 20,
"marginRight": 20,
"marginTop": 20,
"paddingBottom": 24,
"paddingLeft": 16,
"paddingRight": 16,
"paddingTop": 24,
"paddingHorizontal": 16,
"paddingVertical": 24,
},
]
}
Expand Down

0 comments on commit 3a5d055

Please sign in to comment.