Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/blue-tools-fetch.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'polaris.shopify.com': patch
---

Replaced usage of typography components (`DisplayText`, `Heading`, `Subheading`, `Caption`, `VisuallyHidden`, `TextStyle`) with the new `Text` component
8 changes: 4 additions & 4 deletions polaris.shopify.com/pages/examples/app-provider-default.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
Card,
ResourceList,
Avatar,
TextStyle,
Text,
} from '@shopify/polaris';
import React from 'react';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
Expand Down Expand Up @@ -53,9 +53,9 @@ function AppProviderExample() {

return (
<ResourceList.Item id={id} url={url} media={media}>
<h3>
<TextStyle variation="strong">{name}</TextStyle>
</h3>
<Text variant="bodyMd" fontWeight="bold" as="h3">
{name}
</Text>
<div>{location}</div>
</ResourceList.Item>
);
Expand Down
8 changes: 4 additions & 4 deletions polaris.shopify.com/pages/examples/app-provider-with-i18n.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
Card,
ResourceList,
Avatar,
TextStyle,
Text,
} from '@shopify/polaris';
import React from 'react';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
Expand Down Expand Up @@ -53,9 +53,9 @@ function AppProviderI18NExample() {

return (
<ResourceList.Item id={id} url={url} media={media}>
<h3>
<TextStyle variation="strong">{name}</TextStyle>
</h3>
<Text variant="bodyMd" fontWeight="bold" as="h3">
{name}
</Text>
<div>{location}</div>
</ResourceList.Item>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Card, Stack, Icon, Subheading, List} from '@shopify/polaris';
import {Card, Stack, Icon, List, Text} from '@shopify/polaris';
import {ProductsMajor} from '@shopify/polaris-icons';
import React from 'react';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
Expand All @@ -10,7 +10,9 @@ function CardExample() {
title={
<Stack>
<Icon source={ProductsMajor} />
<Subheading>New Products</Subheading>
<Text variant="headingXs" as="h3">
New Products
</Text>
</Stack>
}
>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import {
TextStyle,
Stack,
Tag,
Listbox,
EmptySearchResult,
Combobox,
Text,
} from '@shopify/polaris';
import {useState, useCallback, useMemo} from 'react';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
Expand Down Expand Up @@ -68,7 +68,9 @@ function MultiselectTagComboboxExample() {
return (
<p>
{start}
<TextStyle variation="strong">{highlight}</TextStyle>
<Text variant="bodyMd" fontWeight="bold" as="span">
{highlight}
</Text>
{end}
</p>
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
import {
Stack,
Thumbnail,
Caption,
Banner,
List,
DropZone,
} from '@shopify/polaris';
import {Stack, Thumbnail, Banner, List, DropZone, Text} from '@shopify/polaris';
import {useState, useCallback} from 'react';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';

Expand All @@ -32,7 +25,10 @@ function DropZoneAcceptingSVGFilesExample() {
source={window.URL.createObjectURL(file)}
/>
<div>
{file.name} <Caption>{file.size} bytes</Caption>
{file.name}{' '}
<Text variant="bodySm" as="p">
{file.size} bytes
</Text>
</div>
</Stack>
))}
Expand Down
7 changes: 5 additions & 2 deletions polaris.shopify.com/pages/examples/drop-zone-default.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {DropZone, Stack, Thumbnail, Caption} from '@shopify/polaris';
import {DropZone, Stack, Thumbnail, Text} from '@shopify/polaris';
import {NoteMinor} from '@shopify/polaris-icons';
import {useState, useCallback} from 'react';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
Expand Down Expand Up @@ -30,7 +30,10 @@ function DropZoneExample() {
}
/>
<div>
{file.name} <Caption>{file.size} bytes</Caption>
{file.name}{' '}
<Text variant="bodySm" as="p">
{file.size} bytes
</Text>
</div>
</Stack>
))}
Expand Down
7 changes: 5 additions & 2 deletions polaris.shopify.com/pages/examples/drop-zone-nested.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {DropZone, Stack, Thumbnail, Caption, Card} from '@shopify/polaris';
import {DropZone, Stack, Thumbnail, Card, Text} from '@shopify/polaris';
import {NoteMinor} from '@shopify/polaris-icons';
import {useState, useCallback} from 'react';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
Expand Down Expand Up @@ -29,7 +29,10 @@ function NestedDropZoneExample() {
}
/>
<div>
{file.name} <Caption>{file.size} bytes</Caption>
{file.name}{' '}
<Text variant="bodySm" as="p">
{file.size} bytes
</Text>
</div>
</Stack>
))}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Stack, Thumbnail, Caption, Card, DropZone} from '@shopify/polaris';
import {Stack, Thumbnail, Card, DropZone, Text} from '@shopify/polaris';
import {NoteMinor} from '@shopify/polaris-icons';
import {useState, useCallback} from 'react';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
Expand Down Expand Up @@ -33,7 +33,10 @@ function DropZoneWithCustomFileDialogExample() {
}
/>
<div>
{file.name} <Caption>{file.size} bytes</Caption>
{file.name}{' '}
<Text variant="bodySm" as="p">
{file.size} bytes
</Text>
</div>
</Stack>
))}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {DropZone, Stack, Thumbnail, Caption} from '@shopify/polaris';
import {DropZone, Stack, Thumbnail, Text} from '@shopify/polaris';
import {NoteMinor} from '@shopify/polaris-icons';
import {useState, useCallback} from 'react';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
Expand Down Expand Up @@ -32,7 +32,10 @@ function DropZoneExample() {
}
/>
<div>
{file.name} <Caption>{file.size} bytes</Caption>
{file.name}{' '}
<Text variant="bodySm" as="p">
{file.size} bytes
</Text>
</div>
</Stack>
))}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Stack, Thumbnail, Caption, DropZone, Page} from '@shopify/polaris';
import {Stack, Thumbnail, DropZone, Page, Text} from '@shopify/polaris';
import {NoteMinor} from '@shopify/polaris-icons';
import {useState, useCallback} from 'react';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
Expand Down Expand Up @@ -28,7 +28,10 @@ function DropZoneWithDropOnPageExample() {
}
/>
<div>
{file.name} <Caption>{file.size} bytes</Caption>
{file.name}{' '}
<Text variant="bodySm" as="p">
{file.size} bytes
</Text>
</div>
</Stack>
))}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
import {
DropZone,
Stack,
Thumbnail,
Caption,
Banner,
List,
} from '@shopify/polaris';
import {DropZone, Stack, Thumbnail, Banner, List, Text} from '@shopify/polaris';
import {useState, useCallback} from 'react';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';

Expand Down Expand Up @@ -33,7 +26,10 @@ function DropZoneWithImageFileUpload() {
source={window.URL.createObjectURL(file)}
/>
<div>
{file.name} <Caption>{file.size} bytes</Caption>
{file.name}{' '}
<Text variant="bodySm" as="p">
{file.size} bytes
</Text>
</div>
</Stack>
))}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {DropZone, Stack, Thumbnail, Caption} from '@shopify/polaris';
import {DropZone, Stack, Thumbnail, Text} from '@shopify/polaris';
import {NoteMinor} from '@shopify/polaris-icons';
import {useState, useCallback} from 'react';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
Expand Down Expand Up @@ -27,7 +27,10 @@ function DropZoneExample() {
}
/>
<div>
{file.name} <Caption>{file.size} bytes</Caption>
{file.name}{' '}
<Text variant="bodySm" as="p">
{file.size} bytes
</Text>
</div>
</Stack>
);
Expand Down
8 changes: 4 additions & 4 deletions polaris.shopify.com/pages/examples/filters-disabled.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
Filters,
Button,
Avatar,
TextStyle,
Text,
} from '@shopify/polaris';
import {useState, useCallback} from 'react';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
Expand Down Expand Up @@ -107,9 +107,9 @@ function DisableAllFiltersExample() {
media={media}
accessibilityLabel={`View details for ${name}`}
>
<h3>
<TextStyle variation="strong">{name}</TextStyle>
</h3>
<Text as="h3" variant="bodyMd" fontWeight="bold">
{name}
</Text>
<div>{location}</div>
</ResourceList.Item>
);
Expand Down
8 changes: 4 additions & 4 deletions polaris.shopify.com/pages/examples/filters-some-disabled.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
Filters,
Button,
Avatar,
TextStyle,
Text,
} from '@shopify/polaris';
import {useState, useCallback} from 'react';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
Expand Down Expand Up @@ -126,9 +126,9 @@ function DisableSomeFiltersExample() {
media={media}
accessibilityLabel={`View details for ${name}`}
>
<h3>
<TextStyle variation="strong">{name}</TextStyle>
</h3>
<Text as="h3" variant="bodyMd" fontWeight="bold">
{name}
</Text>
<div>{location}</div>
</ResourceList.Item>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
ResourceList,
Filters,
Avatar,
TextStyle,
Text,
} from '@shopify/polaris';
import {useState, useCallback} from 'react';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
Expand Down Expand Up @@ -172,9 +172,9 @@ function ResourceListFiltersExample() {
media={media}
accessibilityLabel={`View details for ${name}`}
>
<h3>
<TextStyle variation="strong">{name}</TextStyle>
</h3>
<Text as="h3" variant="bodyMd" fontWeight="bold">
{name}
</Text>
<div>{location}</div>
</ResourceList.Item>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
Filters,
Button,
Avatar,
TextStyle,
Text,
} from '@shopify/polaris';
import {useState, useCallback} from 'react';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
Expand Down Expand Up @@ -103,9 +103,9 @@ function FiltersExample() {
media={media}
accessibilityLabel={`View details for ${name}`}
>
<h3>
<TextStyle variation="strong">{name}</TextStyle>
</h3>
<Text as="h3" variant="bodyMd" fontWeight="bold">
{name}
</Text>
<div>{location}</div>
</ResourceList.Item>
);
Expand Down
8 changes: 4 additions & 4 deletions polaris.shopify.com/pages/examples/filters-with-help-text.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
ResourceList,
Filters,
Avatar,
TextStyle,
Text,
} from '@shopify/polaris';
import {useState, useCallback} from 'react';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
Expand Down Expand Up @@ -174,9 +174,9 @@ function ResourceListFiltersExample() {
media={media}
accessibilityLabel={`View details for ${name}`}
>
<h3>
<TextStyle variation="strong">{name}</TextStyle>
</h3>
<Text as="h3" variant="bodyMd" fontWeight="bold">
{name}
</Text>
<div>{location}</div>
</ResourceList.Item>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
ResourceList,
Filters,
Avatar,
TextStyle,
Text,
} from '@shopify/polaris';
import {useState, useCallback} from 'react';
import {withPolarisExample} from '../../src/components/PolarisExampleWrapper';
Expand Down Expand Up @@ -173,9 +173,9 @@ function ResourceListFiltersExample() {
media={media}
accessibilityLabel={`View details for ${name}`}
>
<h3>
<TextStyle variation="strong">{name}</TextStyle>
</h3>
<Text as="h3" variant="bodyMd" fontWeight="bold">
{name}
</Text>
<div>{location}</div>
</ResourceList.Item>
);
Expand Down
Loading