Skip to content
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.

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

Merge main at ab9b3d3 into next #10615

Merged
merged 106 commits into from
Sep 22, 2023
Merged
Show file tree
Hide file tree
Changes from 100 commits
Commits
Show all changes
106 commits
Select commit Hold shift + click to select a range
5ecaafc
[ResourceList] Remove layout jank when bulk actions enabled and item …
jesstelford Aug 15, 2023
49f1257
Fix icon optimize config (#10087)
kyledurand Aug 16, 2023
5a5b379
[Modal] Activator no longer wrapped in Box (#10086)
joelzwarrington Aug 16, 2023
882f58a
Bump fastify from 4.5.3 to 4.15.0 (#8750)
dependabot[bot] Aug 17, 2023
25ef78c
Bump webpack from 5.72.0 to 5.76.0 (#8667)
dependabot[bot] Aug 17, 2023
584e012
Bump decode-uri-component from 0.2.0 to 0.2.2 (#7832)
dependabot[bot] Aug 17, 2023
cba5c6a
Bump deep-object-diff from 1.1.7 to 1.1.9 (#7734)
dependabot[bot] Aug 17, 2023
3982ef9
Bump loader-utils from 1.4.0 to 1.4.2 (#7725)
dependabot[bot] Aug 17, 2023
e6a2d35
Remove `polaris-cli` and `polaris-codemods` packages (#10101)
sam-b-rose Aug 17, 2023
23c1391
Allow migrator to target subcomponents and change prop values (#10071)
kyledurand Aug 17, 2023
b340df1
Update sandbox.md (#10186)
m4thieulavoie Aug 23, 2023
7891c7e
[Button] Deprecate connectedDisclosure (#10183)
kyledurand Aug 23, 2023
5401f4d
Fix migration resolution path (#10188)
aveline Aug 23, 2023
219be15
Support dynamic fontsizes in iOS devices (#10181)
ssetem Aug 23, 2023
295feef
Version Packages (#10078)
shopify-github-actions-access[bot] Aug 24, 2023
ef7ddb4
ActionsList filtering (#9907)
MaxCloutier Aug 24, 2023
338eed4
Create Code style guide.md (#10176)
aveline Aug 24, 2023
ac044b3
[Avatar] Override SE23 background override with imageHasLoaded (#10211)
peterlazzarino Aug 24, 2023
90eac18
Update translations: default (#10219)
translation-platform[bot] Aug 25, 2023
e4a6d47
Fix rename prop migration (#10215)
aveline Aug 25, 2023
1947b46
Allow value changes in prop migration (#10246)
kyledurand Aug 28, 2023
cd15782
Dynamic Fontsize for apple devices - target mobile only (#10288)
ssetem Aug 31, 2023
9b14e23
[ActionList.SearchField] Fix text and focus styles (#10287)
laurkim Aug 31, 2023
72f55e3
Check for string type before calling string method (#10292)
kyledurand Aug 31, 2023
377a074
Version Packages (#10204)
shopify-github-actions-access[bot] Aug 31, 2023
abb5025
Focus text field when focusing spinner (#10276)
highfieldjames Sep 1, 2023
9a2d4f6
[Tooltip] Fix pointer alignment (#10282)
kyledurand Sep 1, 2023
cbf5394
Improve scrollbar experience in the admin (#9701)
martenbjork Sep 1, 2023
ee0496f
Fix action list filtering to accept components (#10294)
MaxCloutier Sep 5, 2023
47652f7
[Icons] Updates social media icons (#9856)
heyjoethomas Sep 6, 2023
eba75d2
[IndexFiltering] Set focus default to true (#10284)
zakwarsame Sep 6, 2023
67699cb
Migration update button component (#10263)
aveline Sep 6, 2023
12a62b4
[IndexFilters] Update mobile view when in uplift mood (#10343)
mrcthms Sep 7, 2023
3bda0a1
Revert "Fix action list filtering to accept components" (#10355)
kyledurand Sep 7, 2023
88b3ea3
Version Packages (#10297)
shopify-github-actions-access[bot] Sep 7, 2023
5939b49
Add multi-theme support to Polaris (#10290)
aaronccasanova Sep 7, 2023
08b9d76
Version Packages (#10363)
shopify-github-actions-access[bot] Sep 7, 2023
101abb8
Rename `ThemeVariant` to `Theme` (#10372)
aaronccasanova Sep 7, 2023
e5f88b8
Fix action list filter css and add story (#10385)
kyledurand Sep 8, 2023
2c1f93c
[IndexTable] vertically align sort and tooltip column headers (#10389)
mattkubej Sep 11, 2023
624e0b5
[FilterPill] Remove filter pill on Popover close if empty (#10397)
mrcthms Sep 11, 2023
15ba67f
Version Packages (#10376)
shopify-github-actions-access[bot] Sep 11, 2023
b7f25f0
[TextField] Allow TextField to disable 1Password integration (#10394)
mrcthms Sep 12, 2023
16c6166
Add private primitive `size` token scale (#10418)
lgriffee Sep 12, 2023
87f559c
[Toast|Dialog] Improve screen reader experience for Toasts and Toasts…
mrcthms Sep 13, 2023
26ab8ce
Add public primitive `border-radius` token scale (#10432)
lgriffee Sep 13, 2023
7514dd1
Add public primitive `space` token scales (#10448)
lgriffee Sep 13, 2023
98a9a96
Add private primitive `size` tokens (#10453)
lgriffee Sep 13, 2023
889bdab
Add private primitive `space` token (#10456)
lgriffee Sep 13, 2023
d35d55e
[IndexFilters] Fix layout shift when going from between default and f…
mrcthms Sep 14, 2023
2e65a7e
[Filters] Fix vanishing applied filters bug (#10429)
mrcthms Sep 14, 2023
ea93110
Version Packages (#10405)
shopify-github-actions-access[bot] Sep 14, 2023
2bccc22
Add public primitive `line-height` token scale (#10462)
lgriffee Sep 14, 2023
66b2599
Add public primitive and semantic `border-width` token scales (#10434)
lgriffee Sep 14, 2023
52fcdd8
Only add 'untriaged' label for issues with 'Bug' label (#10466)
sam-b-rose Sep 14, 2023
3dd0575
Update `polaris-tokens` tests (#10464)
lgriffee Sep 14, 2023
5e073c2
Add public primitive `height` token scale (#10458)
lgriffee Sep 14, 2023
c07de6c
Add public primitive `width` token scale (#10460)
lgriffee Sep 14, 2023
0334245
Add public primitive `font-size` token scale (#10474)
lgriffee Sep 14, 2023
5f94cae
[Pagination] introduce type prop and table type (#10310)
mattkubej Sep 14, 2023
7c22e7e
Move `token-groups` to `themes/base` directory (#10482)
aaronccasanova Sep 14, 2023
eeff4ea
[GitHub Workflows] Update next on push to main (#10480)
chloerice Sep 14, 2023
a30fcc8
Version Packages (#10471)
shopify-github-actions-access[bot] Sep 15, 2023
d5ff72d
[Storybook] Fix stories containing Modal components (#10492)
mrcthms Sep 15, 2023
8be227e
ActionList: Make filtering opt in (#10478)
MaxCloutier Sep 15, 2023
120e96e
Update public primitive `base` and `light-uplift` theme scales (#10485)
lgriffee Sep 15, 2023
fe1aac1
Update private primitive `colors` (#10465)
aaronccasanova Sep 18, 2023
c6f9272
[polaris.shopify.com] Fix Modal examples (#10541)
kyledurand Sep 18, 2023
76807c3
[Sandbox] Mock Frame functions in the Sandbox to avoid hard failures
jesstelford Sep 18, 2023
7d786bd
Support scoping both responsive and non-responsive CSS Custom Propert…
jesstelford Sep 12, 2023
5acfcec
Ensure non-responsive React props are properly encapsulated when conv…
jesstelford Sep 12, 2023
372b56d
Tweak main->next PR creation workflow to use existing PR and merge di…
jesstelford Sep 19, 2023
9d87d9c
Tweak merge-main-into-next.yml to use correct username
jesstelford Sep 19, 2023
0674894
Run workflow within repo (#10549)
jesstelford Sep 19, 2023
0284a56
Always add all reviewers to next -> main PR
jesstelford Sep 19, 2023
15ec8ad
Use correct POSIX sed command in workflow
jesstelford Sep 19, 2023
d7a7a31
Better existing PR check
jesstelford Sep 19, 2023
475fd39
Fix conditional check in workflow file
jesstelford Sep 19, 2023
bb48629
workflow variables set correctly
jesstelford Sep 19, 2023
5823b29
Simpler addition of reviewers to PR in workflow
jesstelford Sep 19, 2023
4a2891c
Simplify adding reviewers
jesstelford Sep 19, 2023
fcdfe02
Use long-form cli switches
jesstelford Sep 19, 2023
9fed743
[Filters] Fix bug where changes to `appliedFilters` prop don't get re…
mrcthms Sep 19, 2023
790a001
Update semantic `color` tokens (#10477)
aaronccasanova Sep 19, 2023
c232efa
[Coming soon][View Transitions API] Initial prototype (#10338)
chloerice Sep 19, 2023
ea6b542
Handle `buttonFrom` function in migration (#10575)
aveline Sep 20, 2023
da09e0b
[polaris.shopify.com] Update browser url when copying url (#10573)
kyledurand Sep 20, 2023
7be9c24
[IndexTable] Add support for subheaders and range selection (#9445)
m4thieulavoie Sep 20, 2023
6a2e22f
Update lovely-rings-enjoy.md
chloerice Sep 20, 2023
01ae538
Update lovely-rings-enjoy.md
chloerice Sep 20, 2023
05c1379
[Docs] Clarify why Grid#areas is deprecated
jesstelford Aug 16, 2023
863f15f
[IndexFilters] Use context provider for IndexFilters mode state (#10490)
mrcthms Sep 21, 2023
7db26ac
Polaris v12 border migration (#10596)
sam-b-rose Sep 21, 2023
9748b08
[polaris.shopify.com] Fix preview for color tokens (#10605)
laurkim Sep 21, 2023
81c7f7a
Fix incorrect manual border migration from #10596 (#10608)
sam-b-rose Sep 21, 2023
f1a4346
Replay previous merge Xours
chloerice Sep 21, 2023
ab9b3d3
Revert border migration (#10620)
sam-b-rose Sep 21, 2023
a92ac94
Merge branch 'next' into chloe/update-next
chloerice Sep 21, 2023
14ab3fc
[Update ] merge in main @ ab9b3d354c94de95a6c92d5d714f37a181a1f6cd an…
chloerice Sep 21, 2023
04d9f98
:fire: deleted subcomponent and duplicate import in ActionList
chloerice Sep 21, 2023
9af2d19
Re-resolve conflicts and remove already removed code
chloerice Sep 21, 2023
112b5d1
Fix type error in polaris-tokens
chloerice Sep 21, 2023
4288a29
Fix lint errors in IndexTable.scss
chloerice Sep 21, 2023
24c4bd4
post merge straggler
chloerice Sep 21, 2023
e516a74
haha...mdx
chloerice Sep 21, 2023
327bbc8
Merge latest next
sophschneider Sep 22, 2023
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/dull-dingos-collect.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@shopify/polaris-migrator': patch
---

Handled `buttonFrom` and `buttonsFrom` functions in `Button` migration
15 changes: 15 additions & 0 deletions .changeset/lovely-rings-enjoy.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
'@shopify/polaris': minor
---

Added support for subheaders and selection of a range of `IndexTable.Rows` -- See the [With subheaders](https://polaris.shopify.com/components/tables/index-table) example on polaris.shopify.com for how to properly configure
- `IndexTable.Row`
- Added support for setting the `indeterminate` value on the `selected` prop
- Added the `selectionRange` prop to specify a range of other consecutive, related rows selected when the row is selected
- Added the `rowType` prop to indicate the relationship or role of the row's contents (defaults to `data`, `subheader` renders the row to look and behave like the table header row)
Added support for setting accessibility attributes on `IndexTable.Cell`
- `IndexTable.Cell`
- Added the `as` prop to support rendering the cell as a `th` element if it is serving as a subheading cell
- Added support for the `headers` attribute to manually associate all headers when the cell is described by more than its column heading
- Added support for the `colSpan` attribute to specify the number of the columns that the cell element should extend to
- Added support for the `scope` attribute to indicate whether the `th` is a header for a column, row, or group of columns or rows
5 changes: 5 additions & 0 deletions .changeset/lucky-wombats-push.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@shopify/polaris': minor
---

Add new `IndexFiltersManager` for allowing disabling of Page Header actions when in Filtering or EditingColumns mode
5 changes: 5 additions & 0 deletions .changeset/silly-years-search.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'polaris.shopify.com': patch
---

Updated logic for rendering `color` custom property previews in `TokenList`
5 changes: 5 additions & 0 deletions .changeset/ten-snakes-play.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'polaris.shopify.com': patch
---

Updated copy url to change browser url
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import {buttonFrom, buttonsFrom} from '@shopify/polaris';

const myButtonFrom = buttonFrom;

export function App() {
const primaryFooterActionMarkup = buttonFrom(
{content: 'Edit', onAction: () => {}},
{
primary: true,
},
);

const myButtonMarkup = myButtonFrom(
{content: 'Edit', onAction: () => {}},
{
primary: true,
},
);

const multipleButtonsMarkup = buttonsFrom(
{content: 'Edit', onAction: () => {}},
{
primary: true,
},
);

return primaryFooterActionMarkup;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import {buttonFrom} from '@shopify/polaris';

const myButtonFrom =
/* polaris-migrator: Unable to migrate the following expression. Please upgrade manually. */
buttonFrom;

export function App() {
const primaryFooterActionMarkup =
/* polaris-migrator: Unable to migrate the following expression. Please upgrade manually. */
buttonFrom(
{content: 'Edit', onAction: () => {}},
{
primary: true,
},
);

const myButtonMarkup = myButtonFrom(
{content: 'Edit', onAction: () => {}},
{
primary: true,
},
);

const multipleButtonsMarkup =
/* polaris-migrator: Unable to migrate the following expression. Please upgrade manually. */
buttonsFrom(
{content: 'Edit', onAction: () => {}},
{
primary: true,
},
);

return primaryFooterActionMarkup;
}
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,27 @@ export default function transformer(
) {
const source = j(fileInfo.source);

// If `Button` component name is not imported, exit
// If `Button` component name or `buttonFrom` function is not imported, exit
if (
!(
hasImportDeclaration(j, source, '@shopify/polaris') &&
(hasImportSpecifier(j, source, 'Button', '@shopify/polaris') ||
hasImportSpecifier(j, source, 'ButtonProps', '@shopify/polaris'))
hasImportSpecifier(j, source, 'ButtonProps', '@shopify/polaris') ||
hasImportSpecifier(j, source, 'buttonFrom', '@shopify/polaris') ||
hasImportSpecifier(j, source, 'buttonsFrom', '@shopify/polaris'))
)
) {
return fileInfo.source;
}

const localFunctionName =
getImportSpecifierName(j, source, 'buttonFrom', '@shopify/polaris') ||
'buttonFrom';

const localFunctionPluralName =
getImportSpecifierName(j, source, 'buttonsFrom', '@shopify/polaris') ||
'buttonsFrom';

const localElementName =
getImportSpecifierName(j, source, 'Button', '@shopify/polaris') || 'Button';

Expand Down Expand Up @@ -308,7 +318,9 @@ export default function transformer(
.filter(
(path) =>
path.node.name === localElementName ||
path.node.name === localElementTypeName,
path.node.name === localElementTypeName ||
path.node.name === localFunctionName ||
path.node.name === localFunctionPluralName,
)
.forEach((path) => {
if (path.node.type !== 'Identifier') return;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@ import type {ComponentMeta} from '@storybook/react';
import {
ActionList,
Avatar,
Box,
Button,
Icon,
Popover,
TextField,
sophschneider marked this conversation as resolved.
Show resolved Hide resolved
Thumbnail,
BlockStack,
} from '@shopify/polaris';
Expand Down
2 changes: 2 additions & 0 deletions polaris-react/src/components/ActionList/components/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
export * from './Item';

export * from './Section';

export * from './SearchField';
sophschneider marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {mountWithApp} from 'tests/utilities';

import {ActionList} from '../ActionList';
import {Badge} from '../../Badge';
import {Item, Section} from '../components';
import {Item, SearchField, Section} from '../components';
sophschneider marked this conversation as resolved.
Show resolved Hide resolved
import {Key} from '../../../types';
import {KeypressListener} from '../../KeypressListener';
import {TextField} from '../../TextField';
Expand Down
3 changes: 2 additions & 1 deletion polaris-react/src/components/AppProvider/AppProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import {
ScrollLockManager,
ScrollLockManagerContext,
} from '../../utilities/scroll-lock-manager';
import {IndexFiltersManager} from '../../utilities/index-filters';
import {
StickyManager,
StickyManagerContext,
Expand Down Expand Up @@ -177,7 +178,7 @@ export class AppProvider extends Component<AppProviderProps, State> {
<PortalsManager>
<FocusManager>
<EphemeralPresenceManager>
{children}
<IndexFiltersManager>{children}</IndexFiltersManager>
</EphemeralPresenceManager>
</FocusManager>
</PortalsManager>
Expand Down
4 changes: 3 additions & 1 deletion polaris-react/src/components/Grid/Grid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@ type Gap = {
export interface GridProps {
/**
* Set grid-template-areas
* @deprecated Use nested layout components instead
* @deprecated To avoid a11y issues, nest layout components in individual grid
* cells instead. See:
* https://polaris.shopify.com/components/layout-and-structure
*/
areas?: Areas;
/* Number of columns */
Expand Down
4 changes: 3 additions & 1 deletion polaris-react/src/components/Grid/components/Cell/Cell.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ interface Columns {
export interface CellProps {
/**
* Set grid-template-areas
* @deprecated Use nested layout components instead
* @deprecated To avoid a11y issues, nest layout components in individual grid
* cells instead. See:
* https://polaris.shopify.com/components/layout-and-structure
*/
area?: string;
column?: Cell;
Expand Down
Loading
Loading