11import { InputRendererOptions , Omit , ReactWrapperComponent } from '@angular-react/core' ;
2- import {
3- AfterContentInit ,
4- ChangeDetectionStrategy ,
5- ChangeDetectorRef ,
6- Component ,
7- ContentChild ,
8- ElementRef ,
9- EventEmitter ,
10- Input ,
11- OnDestroy ,
12- Output ,
13- QueryList ,
14- ViewChild ,
15- } from '@angular/core' ;
2+ import { AfterContentInit , ChangeDetectionStrategy , ChangeDetectorRef , Component , ContentChild , ElementRef , EventEmitter , Input , OnDestroy , Output , QueryList , ViewChild } from '@angular/core' ;
163import { ICommandBarItemProps , ICommandBarProps } from 'office-ui-fabric-react/lib/CommandBar' ;
17- import { IContextualMenuItemProps } from 'office-ui-fabric-react/lib/ContextualMenu' ;
4+ import { IContextualMenuItem } from 'office-ui-fabric-react/lib/ContextualMenu' ;
185import { Subscription } from 'rxjs' ;
196import { OnChanges , TypedChanges } from '../../declarations/angular/typed-changes' ;
207import omit from '../../utils/omit' ;
218import { mergeItemChanges } from '../core/declarative/item-changed' ;
229import { CommandBarItemChangedPayload , CommandBarItemDirective } from './directives/command-bar-item.directives' ;
23- import {
24- CommandBarFarItemsDirective ,
25- CommandBarItemsDirective ,
26- CommandBarItemsDirectiveBase ,
27- CommandBarOverflowItemsDirective ,
28- } from './directives/command-bar-items.directives' ;
10+ import { CommandBarFarItemsDirective , CommandBarItemsDirective , CommandBarItemsDirectiveBase , CommandBarOverflowItemsDirective } from './directives/command-bar-items.directives' ;
2911
3012@Component ( {
3113 selector : 'fab-command-bar' ,
@@ -210,11 +192,9 @@ export class FabCommandBarComponent extends ReactWrapperComponent<ICommandBarPro
210192 return Object . assign (
211193 { } ,
212194 sharedProperties ,
213- iconRenderer &&
214- ( { onRenderIcon : props => iconRenderer ( { contextualMenuItemProps : props } ) } as Pick <
215- ICommandBarItemProps ,
216- 'onRenderIcon'
217- > ) ,
195+ iconRenderer && {
196+ onRenderIcon : ( item : IContextualMenuItem ) => iconRenderer ( { contextualMenuItem : item } ) ,
197+ } as any /* NOTE: Fix for wrong typings of `onRenderIcon` in office-ui-fabric-react */ ,
218198 renderer &&
219199 ( { onRender : ( item , dismissMenu ) => renderer ( { item, dismissMenu } ) } as Pick < ICommandBarItemProps , 'onRender' > )
220200 ) as ICommandBarItemProps ;
@@ -234,5 +214,5 @@ export interface ICommandBarItemOptionsRenderContext {
234214}
235215
236216export interface ICommandBarItemOptionsRenderIconContext {
237- readonly contextualMenuItemProps : IContextualMenuItemProps ;
217+ readonly contextualMenuItem : IContextualMenuItem ;
238218}
0 commit comments