Skip to content
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.

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

Fabric 7: TypeScript 3.5 Updates (WIP) #9298

Closed
wants to merge 16 commits into from
Closed
37 changes: 15 additions & 22 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,7 @@
"label": "Typescript (oufr) watch",
"type": "process",
"command": "node",
"args": [
"./scripts/node_modules/typescript/bin/tsc",
"-p",
"packages/office-ui-fabric-react/tsconfig.json",
"-w",
"--noEmit"
],
"args": ["./scripts/node_modules/typescript/bin/tsc", "-p", "packages/office-ui-fabric-react/tsconfig.json", "-w", "--noEmit"],
"problemMatcher": "$tsc",
"group": {
"kind": "build",
Expand All @@ -22,13 +16,7 @@
"label": "Typescript (vr-tests) watch",
"type": "process",
"command": "node",
"args": [
"./scripts/node_modules/typescript/bin/tsc",
"-p",
"apps/vr-tests/tsconfig.json",
"-w",
"--noEmit"
],
"args": ["./scripts/node_modules/typescript/bin/tsc", "-p", "apps/vr-tests/tsconfig.json", "-w", "--noEmit"],
"problemMatcher": "$tsc",
"group": {
"kind": "build",
Expand All @@ -39,18 +27,23 @@
"label": "Typescript (experiments) watch",
"type": "process",
"command": "node",
"args": [
"./scripts/node_modules/typescript/bin/tsc",
"-p",
"packages/experiments/tsconfig.json",
"-w",
"--noEmit"
],
"args": ["./scripts/node_modules/typescript/bin/tsc", "-p", "packages/experiments/tsconfig.json", "-w", "--noEmit"],
"problemMatcher": "$tsc",
"group": {
"kind": "build",
"isDefault": true
}
},
{
"label": "Typescript (example-app-base) watch",
"type": "process",
"command": "node",
"args": ["./scripts/node_modules/typescript/bin/tsc", "-p", "packages/example-app-base/tsconfig.json", "-w", "--noEmit"],
"problemMatcher": "$tsc",
"group": {
"kind": "build",
"isDefault": true
}
}
]
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,14 @@ const baseUrl = 'https://github.com/OfficeDev/office-ui-fabric-react/tree/master

export const AvatarPage: React.StatelessComponent<IControlsPageProps> = props => {
const { platform } = props;
return <ControlsAreaPage {...props} title="Avatar" {...AvatarPageProps[platform]} otherSections={_otherSections(platform)} />;
return (
<ControlsAreaPage
{...props}
title="Avatar"
{...AvatarPageProps[platform]}
otherSections={_otherSections(platform) as IPageSectionProps[]}
/>
);
};

function _otherSections(platform: Platforms): IPageSectionProps<Platforms>[] {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export class ButtonPage extends React.Component<
title="Button"
{...buttonPageProps[this.props.platform]}
exampleKnobs={this.renderKnobs()}
otherSections={this._otherSections(this.props.platform)}
otherSections={this._otherSections(this.props.platform) as IPageSectionProps[]}
/>
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,14 @@ const baseUrl = 'https://github.com/OfficeDev/office-ui-fabric-react/tree/master

export const CalendarPage: React.StatelessComponent<IControlsPageProps> = props => {
const { platform } = props;
return <ControlsAreaPage {...props} title="Calendar" {...CalendarPageProps[props.platform]} otherSections={_otherSections(platform)} />;
return (
<ControlsAreaPage
{...props}
title="Calendar"
{...CalendarPageProps[props.platform]}
otherSections={_otherSections(platform) as IPageSectionProps[]}
/>
);
};

function _otherSections(platform: Platforms): IPageSectionProps<Platforms>[] {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const baseUrl = 'https://github.com/OfficeDev/office-ui-fabric-react/tree/master

export const ChipPage: React.StatelessComponent<IControlsPageProps> = props => {
const { platform } = props;
return <ControlsAreaPage {...props} {...ChipPageProps[platform]} otherSections={_otherSections(platform)} />;
return <ControlsAreaPage {...props} {...ChipPageProps[platform]} otherSections={_otherSections(platform) as IPageSectionProps[]} />;
};

function _otherSections(platform: Platforms): IPageSectionProps<Platforms>[] {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const baseUrl = 'https://github.com/OfficeDev/office-ui-fabric-react/tree/master

export const DatePickerPage: React.StatelessComponent<IControlsPageProps> = props => {
const { platform } = props;
return <ControlsAreaPage {...props} {...DatePickerPageProps[platform]} otherSections={_otherSections(platform)} />;
return <ControlsAreaPage {...props} {...DatePickerPageProps[platform]} otherSections={_otherSections(platform) as IPageSectionProps[]} />;
};

function _otherSections(platform: Platforms): IPageSectionProps<Platforms>[] {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const baseUrl = 'https://github.com/OfficeDev/office-ui-fabric-react/tree/master

export const DrawerPage: React.StatelessComponent<IControlsPageProps> = props => {
const { platform } = props;
return <ControlsAreaPage {...props} {...DrawerPageProps[platform]} otherSections={_otherSections(platform)} />;
return <ControlsAreaPage {...props} {...DrawerPageProps[platform]} otherSections={_otherSections(platform) as IPageSectionProps[]} />;
};

function _otherSections(platform: Platforms): IPageSectionProps<Platforms>[] {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const baseUrl = 'https://github.com/OfficeDev/office-ui-fabric-react/tree/master

export const ListCellsPage: React.StatelessComponent<IControlsPageProps> = props => {
const { platform } = props;
return <ControlsAreaPage {...props} {...ListCellsPageProps[platform]} otherSections={_otherSections(platform)} />;
return <ControlsAreaPage {...props} {...ListCellsPageProps[platform]} otherSections={_otherSections(platform) as IPageSectionProps[]} />;
};

function _otherSections(platform: Platforms): IPageSectionProps<Platforms>[] {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@ const baseUrl = 'https://github.com/OfficeDev/office-ui-fabric-react/tree/master
export const PeoplePickerPage: React.StatelessComponent<IControlsPageProps> = props => {
const { platform } = props;
return (
<ControlsAreaPage {...props} title="People Picker" {...PeoplePickerPageProps[platform]} otherSections={_otherSections(platform)} />
<ControlsAreaPage
{...props}
title="People Picker"
{...PeoplePickerPageProps[platform]}
otherSections={_otherSections(platform) as IPageSectionProps[]}
/>
);
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,14 @@ const baseUrl = 'https://github.com/OfficeDev/office-ui-fabric-react/tree/master

export const PersonaPage: React.StatelessComponent<IControlsPageProps> = props => {
const { platform } = props;
return <ControlsAreaPage {...props} title="Persona" {...PersonaPageProps[platform]} otherSections={_otherSections(platform)} />;
return (
<ControlsAreaPage
{...props}
title="Persona"
{...PersonaPageProps[platform]}
otherSections={_otherSections(platform) as IPageSectionProps[]}
/>
);
};

function _otherSections(platform: Platforms): IPageSectionProps<Platforms>[] {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@ import { Platforms } from '../../../interfaces/Platforms';
const baseUrl = 'https://github.com/OfficeDev/office-ui-fabric-react/tree/master/apps/fabric-website/src/pages/Controls/PivotPage/';

export const PivotPage: React.StatelessComponent<IControlsPageProps> = props => {
return <ControlsAreaPage {...props} {...PivotPageProps[props.platform]} otherSections={_otherSections(props.platform)} />;
return (
<ControlsAreaPage
{...props}
{...PivotPageProps[props.platform]}
otherSections={_otherSections(props.platform) as IPageSectionProps[]}
/>
);
};

function _otherSections(platform?: Platforms): IPageSectionProps<Platforms>[] | undefined {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const baseUrl = 'https://github.com/OfficeDev/office-ui-fabric-react/tree/master

export const PopupMenuPage: React.StatelessComponent<IControlsPageProps> = props => {
const { platform } = props;
return <ControlsAreaPage {...props} {...PopupMenuPageProps[platform]} otherSections={_otherSections(platform)} />;
return <ControlsAreaPage {...props} {...PopupMenuPageProps[platform]} otherSections={_otherSections(platform) as IPageSectionProps[]} />;
};

function _otherSections(platform: Platforms): IPageSectionProps<Platforms>[] {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const baseUrl = 'https://github.com/OfficeDev/office-ui-fabric-react/tree/master

export const SnackbarPage: React.StatelessComponent<IControlsPageProps> = props => {
const { platform } = props;
return <ControlsAreaPage {...props} {...SnackbarPageProps[platform]} otherSections={_otherSections(platform)} />;
return <ControlsAreaPage {...props} {...SnackbarPageProps[platform]} otherSections={_otherSections(platform) as IPageSectionProps[]} />;
};

function _otherSections(platform: Platforms): IPageSectionProps<Platforms>[] {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,14 @@ import { IPageSectionProps } from '@uifabric/example-app-base/lib/index2';

export const SpinnerPage: React.StatelessComponent<IControlsPageProps> = props => {
const { platform } = props;
return <ControlsAreaPage {...props} title="Spinner" {...SpinnerPageProps[platform]} otherSections={_otherSections(platform)} />;
return (
<ControlsAreaPage
{...props}
title="Spinner"
{...SpinnerPageProps[platform]}
otherSections={_otherSections(platform) as IPageSectionProps[]}
/>
);
};

function _otherSections(platform: Platforms): IPageSectionProps<Platforms>[] {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,13 @@ import { Platforms } from '../../../interfaces/Platforms';
const baseUrl = 'https://github.com/OfficeDev/office-ui-fabric-react/tree/master/apps/fabric-website/src/pages/Controls/TooltipPage/';

export const TooltipPage: React.StatelessComponent<IControlsPageProps> = props => {
return <ControlsAreaPage {...props} {...TooltipPageProps[props.platform]} otherSections={_otherSections(props.platform)} />;
return (
<ControlsAreaPage
{...props}
{...TooltipPageProps[props.platform]}
otherSections={_otherSections(props.platform) as IPageSectionProps[]}
/>
);
};

function _otherSections(platform?: Platforms): IPageSectionProps<Platforms>[] | undefined {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const ControlsPageBase: React.StatelessComponent<IPageProps<Platforms>> = props
title="Controls"
platform={platform}
subTitle={getSubTitle(platform)}
otherSections={_otherSections(platform)}
otherSections={_otherSections(platform) as IPageSectionProps[]}
showSideRail={false}
{...ControlsPageProps[platform]}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const GetStartedPageBase: React.StatelessComponent<IGetStartedPageProps> = props
subTitle={getSubTitle(platform)}
{...props}
{...GetStartedPageProps[platform]}
otherSections={_otherSections(platform)}
otherSections={_otherSections(platform) as IPageSectionProps[]}
/>
);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const StylesPageBase: React.StatelessComponent<IPageProps<Platforms>> = props =>
title="Styles"
platform={platform}
subTitle={getSubTitle(platform)}
otherSections={_otherSections(platform)}
otherSections={_otherSections(platform) as IPageSectionProps[]}
showSideRail={false}
sectionWrapperClassName={styles.cardWrapper}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const TemplatePageBase: React.StatelessComponent<ITemplatePageProps> = props =>
// Use the getSubTitle helper function to get the page header subtitle from the active platform.
subTitle={getSubTitle(platform)}
// You can define custom sections using the `otherSections` prop. Here it is using a method that takes the platform as an argument to return the correct array of section props.
otherSections={_otherSections(platform)}
otherSections={_otherSections(platform) as IPageSectionProps[]}

// You can hide the side rail by setting `showSideRail` to false.
// showSideRail={false}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ const baseUrl = 'https://github.com/OfficeDev/office-ui-fabric-react/tree/master

export const ColorsMessagingPage: React.StatelessComponent<IStylesPageProps> = props => {
const { platform } = props;
return <StylesAreaPage {...props} {...ColorsMessagingPageProps[platform]} otherSections={_otherSections(platform)} />;
return (
<StylesAreaPage {...props} {...ColorsMessagingPageProps[platform]} otherSections={_otherSections(platform) as IPageSectionProps[]} />
);
};

function _otherSections(platform: Platforms): IPageSectionProps<Platforms>[] {
Expand Down
4 changes: 3 additions & 1 deletion apps/fabric-website/src/pages/Styles/Colors/NeutralsPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ const neutralColors = require<IColorSwatch[]>('@uifabric/fabric-website/lib/data

export const ColorsNeutralsPage: React.StatelessComponent<IStylesPageProps> = props => {
const { platform } = props;
return <StylesAreaPage {...props} {...ColorsNeutralsPageProps[platform]} otherSections={_otherSections(platform)} />;
return (
<StylesAreaPage {...props} {...ColorsNeutralsPageProps[platform]} otherSections={_otherSections(platform) as IPageSectionProps[]} />
);
};

function _otherSections(platform: Platforms): IPageSectionProps<Platforms>[] {
Expand Down
4 changes: 3 additions & 1 deletion apps/fabric-website/src/pages/Styles/Colors/PersonasPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,9 @@ const personaGroupColors = require<IColorSwatch[]>('@uifabric/fabric-website/lib

export const ColorsPersonasPage: React.StatelessComponent<IStylesPageProps> = props => {
const { platform } = props;
return <StylesAreaPage {...props} {...ColorsPersonasPageProps[platform]} otherSections={_otherSections(platform)} />;
return (
<StylesAreaPage {...props} {...ColorsPersonasPageProps[platform]} otherSections={_otherSections(platform) as IPageSectionProps[]} />
);
};

function _otherSections(platform: Platforms): IPageSectionProps<Platforms>[] {
Expand Down
4 changes: 3 additions & 1 deletion apps/fabric-website/src/pages/Styles/Colors/PresencePage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ const baseUrl = 'https://github.com/OfficeDev/office-ui-fabric-react/tree/master

export const ColorsPresencePage: React.StatelessComponent<IStylesPageProps> = props => {
const { platform } = props;
return <StylesAreaPage {...props} {...ColorsPresencePageProps[platform]} otherSections={_otherSections(platform)} />;
return (
<StylesAreaPage {...props} {...ColorsPresencePageProps[platform]} otherSections={_otherSections(platform) as IPageSectionProps[]} />
);
};

function _otherSections(platform: Platforms): IPageSectionProps<Platforms>[] {
Expand Down
2 changes: 1 addition & 1 deletion apps/fabric-website/src/pages/Styles/Colors/SharedPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const sharedColors = require<IColorSwatch[]>('@uifabric/fabric-website/lib/data/

export const ColorsSharedPage: React.StatelessComponent<IStylesPageProps> = props => {
const { platform } = props;
return <StylesAreaPage {...props} {...ColorsSharedPageProps[platform]} otherSections={_otherSections(platform)} />;
return <StylesAreaPage {...props} {...ColorsSharedPageProps[platform]} otherSections={_otherSections(platform) as IPageSectionProps[]} />;
};

function _otherSections(platform: Platforms): IPageSectionProps<Platforms>[] {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const baseUrl = 'https://github.com/OfficeDev/office-ui-fabric-react/tree/master

export const ElevationPage: React.StatelessComponent<IStylesPageProps> = props => {
const { platform } = props;
return <StylesAreaPage {...props} {...ElevationPageProps[platform]} otherSections={_otherSections(platform)} />;
return <StylesAreaPage {...props} {...ElevationPageProps[platform]} otherSections={_otherSections(platform) as IPageSectionProps[]} />;
};

function _otherSections(platform: Platforms): IPageSectionProps<Platforms>[] {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const enDash = '–';

export const FabricIconsPage: React.StatelessComponent<IStylesPageProps> = props => {
const { platform } = props;
return <StylesAreaPage {...props} {...FabricIconsPageProps[platform]} otherSections={_otherSections(platform)} />;
return <StylesAreaPage {...props} {...FabricIconsPageProps[platform]} otherSections={_otherSections(platform) as IPageSectionProps[]} />;
};

function _otherSections(platform: Platforms): IPageSectionProps<Platforms>[] {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const breakpointsData = require('../../../data/responsive-breakpoints.json');

export const LayoutPage: React.StatelessComponent<IStylesPageProps> = props => {
const { platform } = props;
return <StylesAreaPage {...props} {...LayoutPageProps[platform]} otherSections={_otherSections(platform)} />;
return <StylesAreaPage {...props} {...LayoutPageProps[platform]} otherSections={_otherSections(platform) as IPageSectionProps[]} />;
};

function _otherSections(platform: Platforms): IPageSectionProps<Platforms>[] {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const localizedFontsData = require('../../../data/localized-fonts.json');

export const LocalizationPage: React.StatelessComponent<IStylesPageProps> = props => {
const { platform } = props;
return <StylesAreaPage {...props} {...LocalizationPageProps[platform]} otherSections={_otherSections(platform)} />;
return <StylesAreaPage {...props} {...LocalizationPageProps[platform]} otherSections={_otherSections(platform) as IPageSectionProps[]} />;
};

function _otherSections(platform: Platforms): IPageSectionProps<Platforms>[] {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ const PatternTable = ({ rows }) => (

export const MotionPage: React.StatelessComponent<IStylesPageProps> = props => {
const { platform } = props;
return <StylesAreaPage {...props} {...MotionPageProps[platform]} otherSections={_otherSections(platform)} />;
return <StylesAreaPage {...props} {...MotionPageProps[platform]} otherSections={_otherSections(platform) as IPageSectionProps[]} />;
};

function _otherSections(platform: Platforms): IPageSectionProps<Platforms>[] {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ const monochromeIcons = require('@uifabric/fabric-website/lib/data/brand-icons-m

export const OfficeBrandIconsPage: React.StatelessComponent<IStylesPageProps> = props => {
const { platform } = props;
return <StylesAreaPage {...props} {...OfficeBrandIconsPageProps[platform]} otherSections={_otherSections(platform)} />;
return (
<StylesAreaPage {...props} {...OfficeBrandIconsPageProps[platform]} otherSections={_otherSections(platform) as IPageSectionProps[]} />
);
};

function _otherSections(platform: Platforms): IPageSectionProps<Platforms>[] {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const baseUrl = 'https://github.com/OfficeDev/office-ui-fabric-react/tree/master

export const TypographyPage: React.StatelessComponent<IStylesPageProps> = props => {
const { platform } = props;
return <StylesAreaPage {...props} {...TypographyPageProps[platform]} otherSections={_otherSections(platform)} />;
return <StylesAreaPage {...props} {...TypographyPageProps[platform]} otherSections={_otherSections(platform) as IPageSectionProps[]} />;
};

function _otherSections(platform: Platforms): IPageSectionProps<Platforms>[] {
Expand Down
2 changes: 1 addition & 1 deletion apps/theming-designer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"office-ui-fabric-react": ">=6.187.1 <7.0.0",
"react": ">=16.8.0 <17.0.0",
"react-dom": ">=16.8.0 <17.0.0",
"typescript": "3.3.3",
"typescript": "3.5.1",
"tslib": "^1.7.1"
}
}