Skip to content

Commit 14e84b3

Browse files
author
Ben Grynhaus
committed
Fix wrong type for renderIcon
1 parent 3bcc903 commit 14e84b3

File tree

2 files changed

+8
-28
lines changed

2 files changed

+8
-28
lines changed

libs/fabric/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "../../node_modules/ng-packagr/package.schema.json",
33
"name": "@angular-react/fabric",
4-
"version": "0.3.0",
4+
"version": "0.3.1",
55
"ngPackage": {
66
"lib": {
77
"entryFile": "public-api.ts",

libs/fabric/src/lib/components/command-bar/command-bar.component.ts

Lines changed: 7 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,13 @@
11
import { 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';
163
import { 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';
185
import { Subscription } from 'rxjs';
196
import { OnChanges, TypedChanges } from '../../declarations/angular/typed-changes';
207
import omit from '../../utils/omit';
218
import { mergeItemChanges } from '../core/declarative/item-changed';
229
import { 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

236216
export interface ICommandBarItemOptionsRenderIconContext {
237-
readonly contextualMenuItemProps: IContextualMenuItemProps;
217+
readonly contextualMenuItem: IContextualMenuItem;
238218
}

0 commit comments

Comments
 (0)