diff --git a/common/changes/office-ui-fabric-react/activity-item-fix_2018-05-07-21-20.json b/common/changes/office-ui-fabric-react/activity-item-fix_2018-05-07-21-20.json new file mode 100644 index 0000000000000..9f1859b2bfc78 --- /dev/null +++ b/common/changes/office-ui-fabric-react/activity-item-fix_2018-05-07-21-20.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "comment": "ActivityItem: Fix a previous breaking change in getStyles. Passing specific props at the end instead of general props at the beginning.", + "packageName": "office-ui-fabric-react", + "type": "none" + } + ], + "packageName": "office-ui-fabric-react", + "email": "lynam.emily@gmail.com" +} \ No newline at end of file diff --git a/packages/office-ui-fabric-react/src/components/ActivityItem/ActivityItem.styles.ts b/packages/office-ui-fabric-react/src/components/ActivityItem/ActivityItem.styles.ts index e6fe80298c0e9..438cb857a6bd2 100644 --- a/packages/office-ui-fabric-react/src/components/ActivityItem/ActivityItem.styles.ts +++ b/packages/office-ui-fabric-react/src/components/ActivityItem/ActivityItem.styles.ts @@ -20,14 +20,17 @@ const ANIMATION_OUTER_DIMENSION = '28px'; const ANIMATION_BORDER_WIDTH = '4px'; export const getStyles = memoizeFunction(( - props: IActivityItemProps, theme: ITheme = getTheme(), - customStyles?: IActivityItemStyles + customStyles?: IActivityItemStyles, + animateBeaconSignal?: IActivityItemProps['animateBeaconSignal'], + beaconColorOne?: IActivityItemProps['beaconColorOne'], + beaconColorTwo?: IActivityItemProps['beaconColorTwo'], + isCompact?: IActivityItemProps['isCompact'] ): IActivityItemStyles => { const continuousPulse = PulsingBeaconAnimationStyles.continuousPulseAnimationSingle( - props.beaconColorOne ? props.beaconColorOne : theme.palette.themePrimary, - props.beaconColorTwo ? props.beaconColorTwo : theme.palette.themeTertiary, + beaconColorOne ? beaconColorOne : theme.palette.themePrimary, + beaconColorTwo ? beaconColorTwo : theme.palette.themeTertiary, ANIMATION_INNER_DIMENSION, ANIMATION_OUTER_DIMENSION, ANIMATION_BORDER_WIDTH @@ -74,7 +77,7 @@ export const getStyles = memoizeFunction(( boxSizing: 'border-box', color: theme.palette.neutralSecondary }, - (props.isCompact && props.animateBeaconSignal) && fadeInAnimation + (isCompact && animateBeaconSignal) && fadeInAnimation ], pulsingBeacon: [ @@ -89,7 +92,7 @@ export const getStyles = memoizeFunction(( borderStyle: 'solid', opacity: 0 }, - (props.isCompact && props.animateBeaconSignal) && continuousPulseAnimation + (isCompact && animateBeaconSignal) && continuousPulseAnimation ], isCompactRoot: { @@ -170,7 +173,7 @@ export const getStyles = memoizeFunction(( { padding: '0 8px' }, - (props.isCompact && props.animateBeaconSignal) && slideInAnimation + (isCompact && animateBeaconSignal) && slideInAnimation ], activityText: { diff --git a/packages/office-ui-fabric-react/src/components/ActivityItem/ActivityItem.tsx b/packages/office-ui-fabric-react/src/components/ActivityItem/ActivityItem.tsx index 7f11a08413276..8eae74257c376 100644 --- a/packages/office-ui-fabric-react/src/components/ActivityItem/ActivityItem.tsx +++ b/packages/office-ui-fabric-react/src/components/ActivityItem/ActivityItem.tsx @@ -129,6 +129,13 @@ export class ActivityItem extends BaseComponent { } private _getClassNames(props: IActivityItemProps): IActivityItemClassNames { - return getClassNames(getStyles(props, undefined, props.styles), props.className!, props.activityPersonas!, props.isCompact!); + return getClassNames(getStyles( + undefined, + props.styles, + props.animateBeaconSignal, + props.beaconColorOne, + props.beaconColorTwo, + props.isCompact + ), props.className!, props.activityPersonas!, props.isCompact!); } }