Skip to content

Add imageErrorAs to icon #4009

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
dzearing merged 9 commits into from
Feb 22, 2018
Merged

Add imageErrorAs to icon #4009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
34a8651
Add errorAs callback to Icon
staylo8 Feb 16, 2018
d7761f3
change name
staylo8 Feb 16, 2018
583e884
add change file
staylo8 Feb 16, 2018
37ec036
Fix Build Errors
staylo8 Feb 20, 2018
debb161
Merge conflicts
staylo8 Feb 20, 2018
d9494f3
Fix build errors
staylo8 Feb 20, 2018
3c09df3
fix bundle error WITH PERMISSION. And extend base component and props
staylo8 Feb 20, 2018
a04a038
Merge conflicts
staylo8 Feb 21, 2018
dee7769
Make imageErrorAs type safe
staylo8 Feb 21, 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
11 changes: 11 additions & 0 deletions common/changes/office-ui-fabric-react/staylo-AddErrorAsToIcon_2018-02-16-22-54.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "Add imageErrorAs to IIconProps",
"type": "minor"
}
],
"packageName": "office-ui-fabric-react",
"email": "staylo@microsoft.com"
}
2 changes: 0 additions & 2 deletions ...fice-ui-fabric-react/src/components/ActivityItem/__snapshots__/ActivityItem.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,6 @@ exports[`ActivityItem renders compact with an icon correctly 1`] = `
>
<i
aria-hidden={true}
aria-label={undefined}
className=

{
Expand Down Expand Up @@ -594,7 +593,6 @@ exports[`ActivityItem renders with an icon correctly 1`] = `
>
<i
aria-hidden={true}
aria-label={undefined}
className=

{
Expand Down
8 changes: 4 additions & 4 deletions packages/office-ui-fabric-react/src/components/Breadcrumb/Breadcrumb.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,10 @@ export class Breadcrumb extends BaseComponent<IBreadcrumbProps, any> {
directionalHint: DirectionalHint.bottomLeftEdge
} }
/>
{ Icon({
className: css('ms-Breadcrumb-chevron', styles.chevron),
iconName: getRTL() ? 'ChevronLeft' : 'ChevronRight'
}) }
{ <Icon
className={ css('ms-Breadcrumb-chevron', styles.chevron) }
iconName={ getRTL() ? 'ChevronLeft' : 'ChevronRight' }
/> }
</li>
) }
{ renderedItems.map(
Expand Down
8 changes: 0 additions & 8 deletions ...s/office-ui-fabric-react/src/components/Breadcrumb/__snapshots__/Breadcrumb.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ exports[`Breadcrumb renders breadcumb correctly 1`] = `
</span>
<i
aria-hidden={true}
aria-label={undefined}
className=
ms-Breadcrumb-chevron
{
Expand Down Expand Up @@ -73,7 +72,6 @@ exports[`Breadcrumb renders breadcumb correctly 1`] = `
</span>
<i
aria-hidden={true}
aria-label={undefined}
className=
ms-Breadcrumb-chevron
{
Expand Down Expand Up @@ -102,7 +100,6 @@ exports[`Breadcrumb renders breadcumb correctly 1`] = `
</span>
<i
aria-hidden={true}
aria-label={undefined}
className=
ms-Breadcrumb-chevron
{
Expand Down Expand Up @@ -131,7 +128,6 @@ exports[`Breadcrumb renders breadcumb correctly 1`] = `
</span>
<i
aria-hidden={true}
aria-label={undefined}
className=
ms-Breadcrumb-chevron
{
Expand Down Expand Up @@ -253,7 +249,6 @@ exports[`Breadcrumb renders breadcumb correctly 2`] = `
>
<i
aria-hidden={true}
aria-label={undefined}
className=
ms-Button-icon
{
Expand All @@ -278,7 +273,6 @@ exports[`Breadcrumb renders breadcumb correctly 2`] = `
</button>
<i
aria-hidden={true}
aria-label={undefined}
className=
ms-Breadcrumb-chevron
{
Expand Down Expand Up @@ -307,7 +301,6 @@ exports[`Breadcrumb renders breadcumb correctly 2`] = `
</span>
<i
aria-hidden={true}
aria-label={undefined}
className=
ms-Breadcrumb-chevron
{
Expand Down Expand Up @@ -336,7 +329,6 @@ exports[`Breadcrumb renders breadcumb correctly 2`] = `
</span>
<i
aria-hidden={true}
aria-label={undefined}
className=
ms-Breadcrumb-chevron
{
Expand Down
10 changes: 6 additions & 4 deletions packages/office-ui-fabric-react/src/components/Button/BaseButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,10 +254,12 @@ export class BaseButton extends BaseComponent<IBaseButtonProps, IBaseButtonState
} = this.props;

if (iconProps) {
return Icon({
...iconProps,
className: this._classNames.icon
});
return (
<Icon
{...iconProps}
className={ this._classNames.icon }
/>
);
}
return null;
}
Expand Down
3 changes: 0 additions & 3 deletions packages/office-ui-fabric-react/src/components/Button/__snapshots__/Button.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,6 @@ exports[`Button renders CommandBarButton correctly 1`] = `
>
<i
aria-hidden={true}
aria-label={undefined}
className=
ms-Button-icon
{
Expand Down Expand Up @@ -227,7 +226,6 @@ exports[`Button renders CommandBarButton correctly 1`] = `
</div>
<i
aria-hidden={true}
aria-label={undefined}
className=
ms-Button-menuIcon
{
Expand Down Expand Up @@ -553,7 +551,6 @@ exports[`Button renders IconButton correctly 1`] = `
>
<i
aria-hidden={true}
aria-label={undefined}
className=
ms-Button-icon
{
Expand Down
4 changes: 0 additions & 4 deletions packages/office-ui-fabric-react/src/components/Calendar/__snapshots__/Calendar.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ exports[`Calendar Test rendering simplest calendar Renders simple calendar corre
>
<i
aria-hidden={true}
aria-label={undefined}
className=

{
Expand All @@ -60,7 +59,6 @@ exports[`Calendar Test rendering simplest calendar Renders simple calendar corre
>
<i
aria-hidden={true}
aria-label={undefined}
className=

{
Expand Down Expand Up @@ -916,7 +914,6 @@ exports[`Calendar Test rendering simplest calendar Renders simple calendar corre
>
<i
aria-hidden={true}
aria-label={undefined}
className=

{
Expand All @@ -936,7 +933,6 @@ exports[`Calendar Test rendering simplest calendar Renders simple calendar corre
>
<i
aria-hidden={true}
aria-label={undefined}
className=

{
Expand Down
16 changes: 8 additions & 8 deletions packages/office-ui-fabric-react/src/components/Check/Check.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ export class Check extends BaseComponent<ICheckProps, {}> {
}
) }
>
{ Icon({
className: 'ms-Check-circle ' + styles.circle,
iconName: 'CircleRing'
}) }
{ Icon({
className: 'ms-Check-check ' + styles.check,
iconName: 'StatusCircleCheckmark'
}) }
{ <Icon
Copy link
Copy Markdown
Member

@dzearing dzearing Feb 17, 2018

Choose a reason for hiding this comment

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

The original intent here was that because Check is a hotspot, calling the stateless component directly was a performance optimization. I think the perf optimization is dated though, so I think this is fine.

I made a codepen to test the theory about if JSX or function calls are faster. They look pretty comparable.

https://codepen.io/dzearing/pen/xYpjrQ

Copy link
Copy Markdown
Contributor

@cschleiden cschleiden Feb 20, 2018

Choose a reason for hiding this comment

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

That's for creation, is there also a management overhead later when removing etc?

Copy link
Copy Markdown
Member

@dzearing dzearing Feb 20, 2018

Choose a reason for hiding this comment

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

The example also has a "clear" button which also measures, and I didn't see a noticeable impact.

className={ 'ms-Check-circle ' + styles.circle }
iconName={ 'CircleRing' }
/> }
{ <Icon
className={ 'ms-Check-check ' + styles.check }
iconName={ 'StatusCircleCheckmark' }
/> }
</div>
);
}
Expand Down
1 change: 0 additions & 1 deletion packages/office-ui-fabric-react/src/components/Checkbox/__snapshots__/Checkbox.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ exports[`Checkbox renders Checkbox correctly 1`] = `
>
<i
aria-hidden={true}
aria-label={undefined}
className=

{
Expand Down
1 change: 0 additions & 1 deletion packages/office-ui-fabric-react/src/components/ComboBox/__snapshots__/ComboBox.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,6 @@ exports[`ComboBox Renders ComboBox correctly 1`] = `
>
<i
aria-hidden={true}
aria-label={undefined}
className=
ms-Button-icon
{
Expand Down
2 changes: 1 addition & 1 deletion packages/office-ui-fabric-react/src/components/CommandBar/CommandBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ export class CommandBar extends BaseComponent<ICommandBarProps, ICommandBarState
'ms-CommandBarSearch-iconWrapper ms-CommandBarSearch-iconSearchWrapper',
styles.searchIconWrapper, styles.searchIconSearchWrapper) }
>
{ Icon({ iconName: 'Search' }) }
{ <Icon iconName={ 'Search' } /> }
</div>
<div
className={ css(
Expand Down
1 change: 0 additions & 1 deletion ...s/office-ui-fabric-react/src/components/CommandBar/__snapshots__/CommandBar.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ exports[`CommandBar renders CommandBar correctly 1`] = `
</span>
<i
aria-hidden={true}
aria-label={undefined}
className=
ms-CommandBarItem-chevronDown
{
Expand Down
1 change: 0 additions & 1 deletion ...s/office-ui-fabric-react/src/components/DatePicker/__snapshots__/DatePicker.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ exports[`DatePicker renders default DatePicker correctly 1`] = `
/>
<i
aria-hidden={true}
aria-label={undefined}
className=
ms-DatePicker-event--without-label
{
Expand Down
1 change: 0 additions & 1 deletion ...fice-ui-fabric-react/src/components/DocumentCard/__snapshots__/DocumentCard.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ exports[`DocumentCard renders DocumentCard correctly 1`] = `
>
<i
aria-hidden={true}
aria-label={undefined}
className=

{
Expand Down
2 changes: 0 additions & 2 deletions packages/office-ui-fabric-react/src/components/Dropdown/__snapshots__/Dropdown.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ exports[`Dropdown multi-select Renders multiselect Dropdown correctly 1`] = `
>
<i
aria-hidden={true}
aria-label={undefined}
className=
ms-Dropdown-caretDown
{
Expand Down Expand Up @@ -84,7 +83,6 @@ exports[`Dropdown single-select Renders single-select Dropdown correctly 1`] = `
>
<i
aria-hidden={true}
aria-label={undefined}
className=
ms-Dropdown-caretDown
{
Expand Down
Loading