Skip to content

Refactor AccountConnection with new layout and type components #7345

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

Merged
merged 3 commits into from
Oct 12, 2022
Merged

Refactor AccountConnection with new layout and type components #7345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
05d5884
Refactor `AccountConnection` with new layout and type components
aveline Oct 4, 2022
69e2dfc
Update AccountConnection.test.tsx
aveline Oct 12, 2022
e134c08
changeset
aveline Oct 12, 2022
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
5 changes: 5 additions & 0 deletions .changeset/pink-apricots-help.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@shopify/polaris': minor
---

Refactored `AccountConnection` to use new layout primitives
10 changes: 0 additions & 10 deletions polaris-react/src/components/AccountConnection/AccountConnection.scss
View file
Open in desktop

This file was deleted.

40 changes: 19 additions & 21 deletions polaris-react/src/components/AccountConnection/AccountConnection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ import React from 'react';
import type {Action} from '../../types';
import {Avatar} from '../Avatar';
import {buttonFrom} from '../Button';
import {Card} from '../Card';
import {Stack} from '../Stack';
import {TextStyle} from '../TextStyle';
import {SettingAction} from '../SettingAction';

import styles from './AccountConnection.scss';
import {AlphaCard} from '../AlphaCard';
import {Box} from '../Box';
import {Inline} from '../Inline';
import {Text} from '../Text';
import {AlphaStack} from '../AlphaStack';

export interface AccountConnectionProps {
/** Content to display as title */
Expand Down Expand Up @@ -54,39 +54,37 @@ export function AccountConnection({

let titleMarkup: React.ReactNode = null;
if (title) {
titleMarkup = <div>{title}</div>;
titleMarkup = <>{title}</>;
} else if (accountName) {
titleMarkup = <div>{accountName}</div>;
titleMarkup = <>{accountName}</>;
}

const detailsMarkup = details ? (
<div>
<TextStyle variation="subdued">{details}</TextStyle>
</div>
<Text as="span" variant="bodyMd" color="subdued">
{details}
</Text>
) : null;

const termsOfServiceMarkup = termsOfService ? (
<div className={styles.TermsOfService}>{termsOfService}</div>
<Box paddingTop="5">{termsOfService}</Box>
Copy link
Contributor

@SeanyB SeanyB Oct 5, 2022

Choose a reason for hiding this comment

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

Shouldn't we be using tokens, rather than hardcoded numbers?

Copy link
Contributor

@SeanyB SeanyB Oct 5, 2022

Choose a reason for hiding this comment

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

Oh, wait. I see. This is a number from the set made available in the Box component props. 🤦

Copy link
Contributor Author

@aveline aveline Oct 5, 2022

Choose a reason for hiding this comment

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

Yes it maps to our spacing tokens. But perhaps it's not very clear? I wonder if there's anything we can do to make that easier?

) : null;

const actionElement = action
? buttonFrom(action, {primary: !connected})
: null;

return (
<Card sectioned>
<AlphaCard>
<SettingAction action={actionElement}>
<Stack>
<Inline spacing="4">
{avatarMarkup}
<Stack.Item fill>
<div className={styles.Content}>
{titleMarkup}
{detailsMarkup}
</div>
</Stack.Item>
</Stack>
<AlphaStack spacing="2">
{titleMarkup}
{detailsMarkup}
</AlphaStack>
</Inline>
</SettingAction>
{termsOfServiceMarkup}
</Card>
</AlphaCard>
);
}
9 changes: 9 additions & 0 deletions polaris-react/src/components/AccountConnection/tests/AccountConnection.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,20 @@
import React from 'react';
import {mountWithApp} from 'tests/utilities';
import {matchMedia} from '@shopify/jest-dom-mocks';

import {Avatar} from '../../Avatar';
import {Button} from '../../Button';
import {AccountConnection} from '../AccountConnection';

describe('<AccountConnection />', () => {
beforeEach(() => {
matchMedia.mock();
});

afterEach(() => {
matchMedia.restore();
});

describe('title', () => {
it('shows the title when one is provided', () => {
const title = 'Example app';
Expand Down