Skip to content

Commit

Permalink
work around 'Done' wrapping on add subteam members (#24173)
Browse files Browse the repository at this point in the history
* work around 'Done' wrapping on add subteam members

* snaps
  • Loading branch information
buoyad committed May 18, 2020
1 parent be3df66 commit 139bb34
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 15 deletions.
43 changes: 31 additions & 12 deletions shared/stories/__rntests__/__snapshots__/Storyshots-rn.js.snap

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 9 additions & 3 deletions shared/teams/new-team/wizard/add-subteam-members.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,11 @@ const AddSubteamMembers = () => {
header={{
leftButton: <Kb.Icon type="iconfont-arrow-left" onClick={onBack} />,
rightButton: Styles.isMobile ? (
<Kb.Text type="BodyBigLink" onClick={onContinue}>
{doneLabel}
</Kb.Text>
<Kb.Box2 direction="horizontal" style={styles.noWrap}>
<Kb.Text type="BodyBigLink" onClick={onContinue}>
{doneLabel}
</Kb.Text>
</Kb.Box2>
) : (
undefined
),
Expand Down Expand Up @@ -143,6 +145,10 @@ const styles = Styles.styleSheetCreate(() => ({
paddingRight: Styles.globalMargins.small,
},
hideOverflow: {overflow: 'hidden'},
noWrap: {
justifyContent: 'flex-end',
width: 48, // wide enough for "Done" or "Skip" to fit. workaround modal2 header measurement onmount
},
search: {
borderRadius: 4,
},
Expand Down

0 comments on commit 139bb34

Please sign in to comment.