Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "office-ui-fabric-react",
"comment": "Part 1 of converting Slider to mergeStyles",
"type": "minor"
}
],
"packageName": "office-ui-fabric-react",
"email": "[email protected]"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,309 @@
import * as React from 'react';
import {
BaseComponent,
KeyCodes,
css,
getId,
getRTL,
getRTLSafeKeyCode,
createRef
} from '../../Utilities';
import { ISliderProps, ISlider } from './Slider.types';
import { Label } from '../../Label';
import * as stylesImport from './Slider.scss';
const styles: any = stylesImport;

export interface ISliderState {
value?: number;
renderedValue?: number;
}

/**
* @deprecated Unused.
*/
export enum ValuePosition {
Previous = 0,
Next = 1
}

export class SliderBase extends BaseComponent<ISliderProps, ISliderState> implements ISlider {
public static defaultProps: ISliderProps = {
step: 1,
min: 0,
max: 10,
showValue: true,
disabled: false,
vertical: false,
buttonProps: {}
};

private _sliderLine = createRef<HTMLDivElement>();
private _thumb = createRef<HTMLSpanElement>();
private _id: string;

constructor(props: ISliderProps) {
super(props);

this._warnMutuallyExclusive({
'value': 'defaultValue'
});

this._id = getId('Slider');

const value = props.value || props.defaultValue || props.min;

this.state = {
value: value,
renderedValue: value
};
}

/**
* Invoked when a component is receiving new props. This method is not called for the initial render.
*/
public componentWillReceiveProps(newProps: ISliderProps): void {

if (newProps.value !== undefined) {
const value = Math.max(newProps.min as number, Math.min(newProps.max as number, newProps.value));

this.setState({
value: value,
renderedValue: value
});
}
}

public render(): React.ReactElement<{}> {
const {
ariaLabel,
className,
disabled,
label,
max,
min,
showValue,
buttonProps,
vertical
} = this.props;
const { value, renderedValue } = this.state;
const thumbOffsetPercent: number = (renderedValue! - min!) / (max! - min!) * 100;
const lengthString = vertical ? 'height' : 'width';
const onMouseDownProp: {} = disabled ? {} : { onMouseDown: this._onMouseDownOrTouchStart };
const onTouchStartProp: {} = disabled ? {} : { onTouchStart: this._onMouseDownOrTouchStart };
const onKeyDownProp: {} = disabled ? {} : { onKeyDown: this._onKeyDown };

return (
<div
className={ css('ms-Slider', styles.root, className, {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For next PR: Make sure all this logic is in the styles file, including the globalClassNames such as "ms-Slider-enabled" etc. There shouldn't be a need for the css() function anywhere.

['ms-Slider-enabled ' + styles.rootIsEnabled]: !disabled,
['ms-Slider-disabled ' + styles.rootIsDisabled]: disabled,
['ms-Slider-row ' + styles.rootIsHorizontal]: !vertical,
['ms-Slider-column ' + styles.rootIsVertical]: vertical
}) }
>
{ label && (
<Label className={ styles.titleLabel } { ...ariaLabel ? {} : { 'htmlFor': this._id } }>
{ label }
</Label>
) }
<div className={ css('ms-Slider-container', styles.container) }>
<button
aria-valuenow={ value }
aria-valuemin={ min }
aria-valuemax={ max }
aria-valuetext={ this._getAriaValueText(value) }
aria-label={ ariaLabel || label }
{ ...onMouseDownProp }
{ ...onTouchStartProp }
{ ...onKeyDownProp }
{ ...buttonProps }
className={ css(
'ms-Slider-slideBox',
styles.slideBox,
buttonProps!.className,
!!showValue && 'ms-Slider-showValue',
(renderedValue === value) && ('ms-Slider-showTransitions ' + styles.showTransitions)
) }
id={ this._id }
disabled={ disabled }
type='button'
role='slider'
>
<div
ref={ this._sliderLine }
className={ css('ms-Slider-line', styles.line) }
>
<span
ref={ this._thumb }
className={ css('ms-Slider-thumb', styles.thumb) }
style={ this._getThumbStyle(vertical, thumbOffsetPercent) }
/>
<span
className={ css('ms-Slider-active', styles.lineContainer, styles.activeSection) }
style={ { [lengthString]: thumbOffsetPercent + '%' } }
/>
<span
className={ css('ms-Slider-inactive', styles.lineContainer, styles.inactiveSection) }
style={ { [lengthString]: (100 - thumbOffsetPercent) + '%' } }
/>
</div>
</button>
{ showValue && <Label className={ css('ms-Slider-value', styles.valueLabel) }>{ value }</Label> }
</div>
</div>
) as React.ReactElement<{}>;
}
public focus(): void {
if (this._thumb.current) {
this._thumb.current.focus();
}
}

public get value(): number | undefined {
return this.state.value;
}

private _getAriaValueText = (value: number | undefined): string | undefined => {
if (this.props.ariaValueText && value !== undefined) {
return this.props.ariaValueText(value);
}
}

private _getThumbStyle(vertical: boolean | undefined, thumbOffsetPercent: number): any {
const direction: string = vertical ? 'bottom' : (getRTL() ? 'right' : 'left');
return {
[direction]: thumbOffsetPercent + '%'
};
}

private _onMouseDownOrTouchStart = (event: MouseEvent | TouchEvent): void => {
if (event.type === 'mousedown') {
this._events.on(window, 'mousemove', this._onMouseMoveOrTouchMove, true);
this._events.on(window, 'mouseup', this._onMouseUpOrTouchEnd, true);
} else if (event.type === 'touchstart') {
this._events.on(window, 'touchmove', this._onMouseMoveOrTouchMove, true);
this._events.on(window, 'touchend', this._onMouseUpOrTouchEnd, true);
}
this._onMouseMoveOrTouchMove(event, true);
}

private _onMouseMoveOrTouchMove = (event: MouseEvent | TouchEvent, suppressEventCancelation?: boolean): void => {
if (!this._sliderLine.current) {
return;
}

const { max, min, step } = this.props;
const steps: number = (max! - min!) / step!;
const sliderPositionRect: ClientRect = this._sliderLine.current.getBoundingClientRect();
const sliderLength: number = !this.props.vertical ? sliderPositionRect.width : sliderPositionRect.height;
const stepLength: number = sliderLength / steps;
let currentSteps: number | undefined;
let distance: number | undefined;

if (!this.props.vertical) {
const left: number | undefined = this._getPosition(event, this.props.vertical);
distance = getRTL() ? sliderPositionRect.right - left! : left! - sliderPositionRect.left;
currentSteps = distance / stepLength;
} else {
const bottom: number | undefined = this._getPosition(event, this.props.vertical);
distance = sliderPositionRect.bottom - bottom!;
currentSteps = distance / stepLength;
}

let currentValue: number | undefined;
let renderedValue: number | undefined;

// The value shouldn't be bigger than max or be smaller than min.
if (currentSteps! > Math.floor(steps)) {
renderedValue = currentValue = max as number;
} else if (currentSteps! < 0) {
renderedValue = currentValue = min as number;
} else {
renderedValue = min! + step! * currentSteps!;
currentValue = min! + step! * Math.round(currentSteps!);
}

this._updateValue(currentValue, renderedValue);

if (!suppressEventCancelation) {
event.preventDefault();
event.stopPropagation();
}
}

private _getPosition(event: MouseEvent | TouchEvent, vertical: boolean | undefined): number | undefined {
let currentPosition: number | undefined;
switch (event.type) {
case 'mousedown':
case 'mousemove':
currentPosition = !vertical ? (event as MouseEvent).clientX : (event as MouseEvent).clientY;
break;
case 'touchstart':
case 'touchmove':
currentPosition = !vertical ? (event as TouchEvent).touches[0].clientX : (event as TouchEvent).touches[0].clientY;
break;
}
return currentPosition;
}
private _updateValue(value: number, renderedValue: number): void {
const interval: number = 1.0 / this.props.step!;
// Make sure value has correct number of decimal places based on steps without JS's floating point issues
const roundedValue: number = Math.round(value * interval) / interval;

const valueChanged = roundedValue !== this.state.value;

this.setState({
value: roundedValue,
renderedValue
}, () => {
if (valueChanged && this.props.onChange) {
this.props.onChange(this.state.value as number);
}
});
}

private _onMouseUpOrTouchEnd = (): void => {
// Synchronize the renderedValue to the actual value.
this.setState({
renderedValue: this.state.value
});

this._events.off();
}

private _onKeyDown = (event: KeyboardEvent): void => {
let value: number | undefined = this.state.value;
const { max, min, step } = this.props;

let diff: number | undefined = 0;

switch (event.which) {
case getRTLSafeKeyCode(KeyCodes.left):
case KeyCodes.down:
diff = -(step as number);
break;
case getRTLSafeKeyCode(KeyCodes.right):
case KeyCodes.up:
diff = step;
break;

case KeyCodes.home:
value = min;
break;

case KeyCodes.end:
value = max;
break;

default:
return;
}

const newValue: number = Math.min(max as number, Math.max(min as number, value! + diff!));

this._updateValue(newValue, newValue);

event.preventDefault();
event.stopPropagation();
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
import { ISliderStyleProps, ISliderStyles } from './Slider.types';
import { getGlobalClassNames } from '../..';

const GlobalClassNames = {
root: 'ms-Slider',
container: 'ms-Slider-container',
slideBox: 'ms-Slider-slideBox',
line: 'ms-Slider-line',
thumb: 'ms-Slider-thumb',
activeSection: 'ms-Slider-active',
inactiveSection: 'ms-Slider-inactive',
valueLabel: 'ms-Slider-value'
};

export const getStyles = (props: ISliderStyleProps): ISliderStyles => {

const { className, theme } = props;
const classNames = getGlobalClassNames(GlobalClassNames, theme);

return ({
root: [
classNames.root,
{},
className
],
container: [
classNames.container,
{}
],
slideBox: [
classNames.slideBox,
{}
],
line: [
classNames.line,
{}
],
thumb: [
classNames.thumb,
{}
],
lineContainer: [
{}
],
activeSection: [
classNames.activeSection,
{}
],
inactiveSection: [
classNames.inactiveSection,
{}
],
valueLabel: [
classNames.valueLabel,
{}
]
});
};
Loading