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.

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

Toggle: theme is now injectable. #1943

Merged
merged 3 commits into from
Jun 6, 2017
Merged

Toggle: theme is now injectable. #1943

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
2e42338
Updating toggle to have a customizable theme.
dzearing Jun 6, 2017
eface1b
Adding changefile.
dzearing Jun 6, 2017
81affb7
Removing getTheme initializer which doesn't work in a memoized function.
dzearing Jun 6, 2017
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/office-ui-fabric-react/toggle_2017-06-06-07-11.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "Toggle: theme now injectable through Customizer.",
"type": "minor"
}
],
"packageName": "office-ui-fabric-react",
"email": "[email protected]"
}
3 changes: 1 addition & 2 deletions packages/office-ui-fabric-react/src/components/Button/DefaultButton/DefaultButton.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { IButtonStyles } from '../Button.Props';
import {
ITheme,
getTheme,
mergeStyleSets
} from '../../../Styling';
import { memoizeFunction } from '../../../Utilities';
Expand All @@ -14,7 +13,7 @@ const DEFAULT_BUTTON_MINWIDTH = '80px';
const DEFAULT_PADDING = '0 16px';

export const getStyles = memoizeFunction((
theme: ITheme = getTheme(),
theme: ITheme,
customStyles?: IButtonStyles,
focusInset?: string,
focusColor?: string
Expand Down
7 changes: 6 additions & 1 deletion packages/office-ui-fabric-react/src/components/Toggle/Toggle.Props.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { Toggle } from './Toggle';
import { IStyle } from '../../Styling';
import { IStyle, ITheme } from '../../Styling';

export interface IToggle {
focus: () => void;
Expand Down Expand Up @@ -61,6 +61,11 @@ export interface IToggleProps extends React.HTMLProps<HTMLElement | Toggle> {
*/
onChanged?: (checked: boolean) => void;

/**
* Theme provided by HOC.
*/
theme?: ITheme;

/**
* Custom styles for this component
*/
Expand Down
3 changes: 1 addition & 2 deletions packages/office-ui-fabric-react/src/components/Toggle/Toggle.styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import { IToggleStyles } from './Toggle.Props';
import {
ITheme,
getTheme,
mergeStyleSets,
getFocusStyle
} from '../../Styling';
import { memoizeFunction } from '../../Utilities';

export const getStyles = memoizeFunction((
theme: ITheme = getTheme(),
theme: ITheme,
customStyles?: IToggleStyles
): IToggleStyles => {
const { semanticColors } = theme;
Expand Down
11 changes: 9 additions & 2 deletions packages/office-ui-fabric-react/src/components/Toggle/Toggle.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,11 @@ describe('Toggle', () => {
let callback = (isToggled) => {
isToggledValue = isToggled;
};
let component = ReactTestUtils.renderIntoDocument<React.ReactInstance>(
let component;

ReactTestUtils.renderIntoDocument<React.ReactInstance>(
<Toggle
componentRef={ ref => component = ref }
label='Label'
onChanged={ callback }
/>
Expand All @@ -43,8 +46,11 @@ describe('Toggle', () => {
});

it(`doesn't update the state if the user provides checked`, () => {
let component = ReactTestUtils.renderIntoDocument(
let component;

ReactTestUtils.renderIntoDocument(
<Toggle
componentRef={ ref => component = ref }
label='Label'
checked={ false }
/>
Expand All @@ -66,6 +72,7 @@ describe('Toggle', () => {
let renderedDOM = ReactDOM.findDOMNode(component as React.ReactInstance);
let label = renderedDOM.querySelector('label');

// tslint:disable-next-line:no-unused-expression
expect(label).is.null;
});

Expand Down
7 changes: 6 additions & 1 deletion packages/office-ui-fabric-react/src/components/Toggle/Toggle.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ import {
IToggleStyles
} from './Toggle.Props';
import { Label } from '../../Label';
import {
customizable
} from '../../Utilities';
import {
mergeStyles
} from '../../Styling';
Expand All @@ -32,6 +35,7 @@ interface IToggleClassNames {
text: string;
}

@customizable(['theme'])
export class Toggle extends BaseComponent<IToggleProps, IToggleState> implements IToggle {

private _id: string;
Expand Down Expand Up @@ -74,6 +78,7 @@ export class Toggle extends BaseComponent<IToggleProps, IToggleState> implements

let {
className,
theme,
styles: customStyles,
disabled,
label,
Expand All @@ -87,7 +92,7 @@ export class Toggle extends BaseComponent<IToggleProps, IToggleState> implements
const ariaLabel = isChecked ? onAriaLabel : offAriaLabel;
const toggleNativeProps = getNativeProps(this.props, inputProperties, ['defaultChecked']);
const classNames = this._getClassNames(
getStyles(undefined, customStyles),
getStyles(theme, customStyles),
className,
disabled,
isChecked
Expand Down