Skip to content

fixes header action selector #523

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 13 commits into from
Nov 15, 2018
Merged

fixes header action selector #523

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
bf8ff0e
fixes header action selector
kvendrik Oct 24, 2018
de1a5e1
rm debug code
kvendrik Oct 24, 2018
91644ce
adds unreleased entry
kvendrik Oct 24, 2018
8952a87
updates selector name
kvendrik Oct 24, 2018
15c67f3
rm playground
kvendrik Oct 24, 2018
a913577
fixes minor layout issue
kvendrik Oct 24, 2018
4e08f9b
updates unreleased item
kvendrik Oct 24, 2018
cf0e787
Merge branch 'master' into fix/header-action-selector
kvendrik Nov 1, 2018
e1582cf
Merge branch 'master' into fix/header-action-selector
kvendrik Nov 13, 2018
282c823
fixes action group key
kvendrik Nov 14, 2018
b928e68
fixes unreleased tense
kvendrik Nov 15, 2018
2251c51
Merge branch 'master' into fix/header-action-selector
kvendrik Nov 15, 2018
a76ea55
fixes unreleased log
kvendrik Nov 15, 2018
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
2 changes: 2 additions & 0 deletions UNRELEASED.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ Use [the changelog guidelines](https://git.io/polaris-changelog-guidelines) to f

### Bug fixes

- Fixed `Action`s selector in `Page`'s `Header` component ([#2487](https://github.com/Shopify/polaris-react/pull/2487))

### Documentation

### Development workflow
4 changes: 3 additions & 1 deletion src/components/Page/components/Header/Header.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,9 @@ $action-horizontal-padding: (1.5 * spacing(tight));
display: flex;
align-items: center;

> * {
> .IndividualAction {
display: inline-flex;

&:first-child {
// Compensates for the fact that we push the icon slightly to the left
margin-left: -1 * $action-horizontal-padding;
Expand Down
32 changes: 18 additions & 14 deletions src/components/Page/components/Header/Header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,17 +180,21 @@ export default class Header extends React.PureComponent<Props, State> {

const actionGroupsMarkup =
actionGroups.length > 0
? actionGroups.map(({title, icon, actions, details}) => (
<ActionGroup
key={title}
title={title}
icon={icon}
actions={actions}
details={details}
onOpen={this.handleActionGroupOpen}
onClose={this.handleActionGroupClose}
active={title === openActionGroup}
/>
? actionGroups.map(({title, icon, actions, details}, index) => (
<div
className={styles.IndividualAction}
key={`ActionGroup-${title}-${index}`}
>
<ActionGroup
title={title}
icon={icon}
actions={actions}
details={details}
onOpen={this.handleActionGroupOpen}
onClose={this.handleActionGroupClose}
active={title === openActionGroup}
Copy link

Choose a reason for hiding this comment

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

Should this logic be in a variable?

Copy link
Member Author

@kvendrik kvendrik Nov 15, 2018 •
edited
Loading

Choose a reason for hiding this comment

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

I would say yes although I think in this specific case its okay to leave it as is considering storing this in a variable would involve changing this into a block which would arguably make it harder to read.

/>
</div>
))
: null;

Expand Down Expand Up @@ -263,8 +267,8 @@ function secondaryActionsFrom(
actions: SecondaryAction[],
): ReadonlyArray<JSX.Element> {
return actions.map(({content, ...action}, index) => (
<Action {...action} key={`Action-${content || index}`}>
{content}
</Action>
<div className={styles.IndividualAction} key={`Action-${content || index}`}>
<Action {...action}>{content}</Action>
</div>
));
}