Skip to content

Fix example app base #5139

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 3 commits into from
Jun 7, 2018
Merged

Fix example app base #5139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dc6ef8d
Fixing example app base.
dzearing Jun 7, 2018
5ee1788
updating change file
dzearing Jun 7, 2018
309c643
Merge branch 'master' of https://github.com/OfficeDev/office-ui-fabri…
dzearing Jun 7, 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/@uifabric/example-app-base/fix-example-app-base_2018-06-07-23-13.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@uifabric/example-app-base",
"comment": "Fixing package dependencies",
"type": "minor"
}
],
"packageName": "@uifabric/example-app-base",
"email": "dzearing@microsoft.com"
}
128 changes: 49 additions & 79 deletions common/config/rush/npm-shrinkwrap.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 2 additions & 4 deletions packages/example-app-base/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,10 @@
"react-dom": ">=16.3.2-0 <17.0.0"
},
"dependencies": {
"@uifabric/styling": ">=6.2.0 <7.0.0",
"@uifabric/utilities": ">=6.2.0 <7.0.0",
"highlight.js": "^9.12.0",
"markdown-to-jsx": "6.6.1",
"office-ui-fabric-react": ">=5.1.0 <6.0.0",
"office-ui-fabric-react": ">=6.6.1 <7.0.0",
"react-syntax-highlighter": "^7.0.2",
"tslib": "^1.7.1"
}
}
}
3 changes: 1 addition & 2 deletions packages/example-app-base/src/components/Highlight/Highlight.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import * as React from 'react';
import { registerLanguage, highlightBlock } from 'highlight.js';
import * as javascript from 'highlight.js/lib/languages/javascript';
import { BaseComponent } from 'office-ui-fabric-react/lib/Utilities';
import { createRef } from '@uifabric/utilities';
import { createRef, BaseComponent } from 'office-ui-fabric-react/lib/Utilities';

registerLanguage('javascript', javascript);

Expand Down
2 changes: 1 addition & 1 deletion packages/example-app-base/src/components/templates/PageExampleCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export class PageExampleCard extends BaseComponent<IPageExampleCardProps, IPageE
return (
<div className={classNames.root}>
<div className={classNames.header}>
<PageHeader getStyles={getSubHeaderStyles}>{title}</PageHeader>
<PageHeader styles={getSubHeaderStyles}>{title}</PageHeader>
<button onClick={this._onToggleCode} className={classNames.showCodeButton}>
{expanded ? 'Hide code' : 'Show code'}
</button>
Expand Down
8 changes: 4 additions & 4 deletions packages/example-app-base/src/components/templates/PageHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import {
IBaseProps,
customizable,
classNamesFunction,
IStyleFunction,
IStyleFunctionOrObject,
styled
} from 'office-ui-fabric-react/lib/Utilities';
import { ITheme, IStyle } from 'office-ui-fabric-react/lib/Styling';
Expand All @@ -31,7 +31,7 @@ export interface IPageHeaderProps extends IBaseProps {
theme?: ITheme;
as?: string;
children?: JSX.Element | string;
getStyles?: IStyleFunction<IPageHeaderStyleProps, IPageHeaderStyles>;
styles?: IStyleFunctionOrObject<IPageHeaderStyleProps, IPageHeaderStyles>;
// getStyles?: IGetStylesFunction<IPageHeaderStyleProps, IPageHeaderStyles>;
}

Expand All @@ -40,9 +40,9 @@ const getClassNames = classNamesFunction<IPageHeaderStyleProps, IPageHeaderStyle
@customizable('PageHeader', ['theme', 'styles'])
export class PageHeaderBase extends BaseComponent<IPageHeaderProps, {}> {
public render(): JSX.Element {
const { as: RootType = 'h1', theme, children, getStyles } = this.props;
const { as: RootType = 'h1', theme, children, styles } = this.props;

const classNames = getClassNames(getStyles, { theme: theme!, as: RootType });
const classNames = getClassNames(styles, { theme: theme!, as: RootType });

return <RootType className={classNames.root}>{children}</RootType>;
}
Expand Down