superdesk-ui-framework 3.0.1-beta.3 → 3.0.1-beta.4

package/app-typescript/components/DurationInput.tsx

@@ -0,0 +1,306 @@
+import * as React from 'react';
+import classNames from 'classnames';
+import moment from 'moment';
+import nextId from "react-id-generator";
+
+interface IProps {
+    hours?: number;
+    minutes?: number;
+    seconds?: number;
+    disabled?: boolean;
+    inlineLabel?: boolean;
+    required?: boolean;
+    fullWidth?: boolean;
+    invalid?: boolean;
+    labelHidden?: boolean;
+    tabindex?: number;
+    label?: string;
+    info?: string;
+    error?: string;
+    onChange(e: number): void;
+}
+
+interface IState {
+    hours?: any;
+    minutes?: any;
+    seconds?: any;
+    invalid?: any;
+}
+
+export class DurationInput extends React.PureComponent<IProps, IState> {
+    hourRef: React.RefObject<HTMLInputElement>;
+    minuteRef: React.RefObject<HTMLInputElement>;
+    secondRef: React.RefObject<HTMLInputElement>;
+    constructor(props: IProps) {
+        super(props);
+        this.state = {
+            hours: this.props.hours ? this.zerPad(this.props.hours) : this.zerPad(0),
+            minutes: this.props.minutes ? this.zerPad(this.props.minutes) : this.zerPad(0),
+            seconds: this.props.seconds ? this.zerPad(this.props.seconds) : this.zerPad(0),
+            invalid: this.props.invalid ?? false,
+        };
+
+        this.hourRef = React.createRef();
+        this.minuteRef = React.createRef();
+        this.secondRef = React.createRef();
+        this.handleKeyDown = this.handleKeyDown.bind(this);
+        this.zerPad = this.zerPad.bind(this);
+        this.handleChange = this.handleChange.bind(this);
+        this.handleFocusOnKeyUp = this.handleFocusOnKeyUp.bind(this);
+        this.handleKeyValue = this.handleKeyValue.bind(this);
+
+    }
+
+    componentDidUpdate(_: any, prevState: IState) {
+        if (this.props.onChange) {
+            this.props.onChange(moment.duration(`${this.state.hours}:${this.state.minutes}:${this.state.seconds}`)
+            .asSeconds());
+        }
+        if (!this.hourRef.current || !this.minuteRef.current || !this.secondRef.current ) {
+            return;
+        }
+        if (this.state.hours !== prevState.hours) {
+            if (Number(this.hourRef.current.value) > 99) {
+                this.setState({
+                    hours: this.zerPad(99),
+                });
+            }
+        }
+        if (this.state.minutes !== prevState.minutes) {
+            if (Number(this.minuteRef.current.value) > 59) {
+                this.setState({
+                    hours: this.zerPad(Number(this.state.hours) + 1),
+                    minutes: this.zerPad(0),
+                });
+            }
+            if (Number(this.minuteRef.current.value) < 0) {
+                this.setState({
+                    hours: this.zerPad(Number(this.state.hours)) > 0
+                    ? this.zerPad(Number(this.state.hours) - 1)
+                    : this.zerPad(Number(this.state.hours)),
+                    minutes: 59,
+                });
+            }
+        }
+        if (this.state.seconds !== prevState.seconds) {
+            if (Number(this.secondRef.current.value) > 59) {
+                this.setState({
+                    minutes: this.zerPad(Number(this.state.minutes) + 1),
+                    seconds: this.zerPad(0),
+                });
+            }
+            if (Number(this.secondRef.current.value) < 0) {
+                this.setState({
+                    minutes: this.zerPad(Number(this.state.minutes) - 1),
+                    seconds: 59,
+                });
+            }
+        }
+    }
+
+    handleKeyDown(event: React.KeyboardEvent<HTMLInputElement>) {
+        if (!(event.target instanceof HTMLInputElement)) {
+            return;
+        }
+        if (event.target.id === 'hours') {
+            if (event.key === 'ArrowRight') {
+                if (event.target.selectionEnd === event.target.value.length) {
+                    this.handleFocus(this.minuteRef.current, event.target.id);
+                }
+            }
+            if (event.key === 'ArrowLeft') {
+                if (event.target.selectionStart === 0) {
+                    this.handleFocus(this.secondRef.current, event.target.id);
+                }
+            }
+        }
+        if (event.target.id === 'minutes') {
+            if (event.key === 'ArrowRight') {
+                if (event.target.selectionEnd === event.target.value.length) {
+                    this.handleFocus(this.secondRef.current, event.target.id);
+                }
+            }
+            if (event.key === 'ArrowLeft') {
+                if (event.target.selectionStart === 0) {
+                    this.handleFocus(this.hourRef.current, event.target.id);
+                }
+            }
+        }
+        if (event.target.id === 'seconds') {
+            if (event.key === 'ArrowRight') {
+                if (event.target.selectionEnd === event.target.value.length) {
+                    this.handleFocus(this.hourRef.current, event.target.id);
+                }
+            }
+            if (event.key === 'ArrowLeft') {
+                if (event.target.selectionStart === 0) {
+                    this.handleFocus(this.minuteRef.current, event.target.id);
+                }
+            }
+        }
+        if (event.key === 'ArrowUp' || event.key === 'ArrowDown') {
+            this.handleKeyValue(event, event.target.id as 'hours' | 'minutes' | 'seconds');
+        }
+    }
+
+    handleKeyValue(event: React.KeyboardEvent<HTMLInputElement>, state: 'hours' | 'minutes' | 'seconds') {
+        if (!(event.target instanceof HTMLInputElement)) {
+            return;
+        }
+        if (!this.state[state]) {
+            return;
+        }
+        event.preventDefault();
+        event.stopPropagation();
+
+        let stateClone: IState = {};
+        if (event.key === 'ArrowUp') {
+            if (event.target.id === 'hours') {
+                stateClone[state] = this.state[state] < 99
+                ? this.zerPad(Number(this.state[state]) + 1)
+                : this.zerPad(99);
+            } else {
+                stateClone[state] = this.zerPad(Number(this.state[state]) + 1);
+            }
+        } else if (event.key === 'ArrowDown') {
+            if (event.target.id === 'hours') {
+                stateClone[state] = this.state[state] > 0 ? this.zerPad(Number(this.state[state]) - 1) : this.zerPad(0);
+            } else {
+                stateClone[state] = this.zerPad(Number(this.state[state]) - 1);
+            }
+        }
+        this.setState(stateClone);
+    }
+
+    zerPad(value: number | string) {
+        if (value.toString().length === 1 || value === 0) {
+            return `0${value}`;
+        } else if (!value) {
+            return '00';
+        } else {
+            return value;
+        }
+    }
+
+    handleChange(event: React.ChangeEvent<HTMLInputElement>, state: 'hours' | 'minutes' | 'seconds') {
+        let stateClone: IState = {};
+        if (event.target.value.length >= 2) {
+            stateClone[state] = event.target.value.slice(0, 2);
+        } else {
+            stateClone[state] = event.target.value;
+        }
+        this.setState(stateClone);
+    }
+
+    handleFocus(ref: HTMLInputElement | null, state: 'hours' | 'minutes' | 'seconds') {
+        ref?.focus();
+        setTimeout(() => {
+            ref?.setSelectionRange(0, 2);
+        });
+        let stateClone: IState = {};
+        stateClone[state] = this.zerPad(this.state[state]);
+        this.setState(stateClone);
+    }
+
+    handleFocusOnKeyUp(event: React.KeyboardEvent<HTMLInputElement>, ref: HTMLInputElement | null) {
+        if (event.key !== 'ArrowRight' && event.key !== 'ArrowLeft' && event.key !== 'ArrowUp' && event.key !== 'ArrowDown' && event.key !== 'Backspace') {
+            const target = event.target as HTMLInputElement;
+            if (target.value.length >= 2) {
+                ref?.focus();
+                setTimeout(() => {
+                    ref?.setSelectionRange(0, 2);
+                });
+            }
+        }
+    }
+
+    render() {
+        let InputClasses = classNames('sd-input__duration-input');
+
+        const classes = classNames('sd-input', {
+            'sd-input--inline-label': this.props.inlineLabel,
+            'sd-input--required': this.props.required,
+            'sd-input--disabled': this.props.disabled,
+            'sd-input--full-width': this.props.fullWidth,
+            'sd-input--invalid': this.props.invalid || this.state.invalid,
+        });
+        const labelClasses = classNames('sd-input__label', {
+            'a11y-only': this.props.labelHidden,
+        });
+
+        let htmlId = nextId();
+
+        return (
+            <div className={classes}>
+                <label className={labelClasses} htmlFor={htmlId} id={htmlId + 'label'}
+                tabIndex={this.props.tabindex === undefined ? undefined : -1}>
+                    {this.props.label}
+                </label>
+                <div className={InputClasses}>
+                    <input
+                    className='duration-input'
+                    type='text'
+                    id='hours'
+                    max={99}
+                    min={0}
+                    ref={this.hourRef}
+                    value={this.state.hours}
+                    disabled={this.props.disabled}
+                    onKeyDown={(event) => this.handleKeyDown(event)}
+                    onKeyUp={(event) => this.handleFocusOnKeyUp(event, this.minuteRef.current)}
+                    onChange={(event) => { this.handleChange(event, 'hours'); }}
+                    onBlur={(event) => this.setState({hours: this.zerPad(event.target.value)})}
+                    onKeyPress={(event) => {
+                        if (!/[0-9]/.test(event.key)) {
+                            event.preventDefault();
+                        }
+                    }} />
+                    <span className='sd-input__suffix'>h</span>
+
+                    <input
+                    className='duration-input'
+                    type='text'
+                    id='minutes'
+                    ref={this.minuteRef}
+                    value={this.state.minutes}
+                    disabled={this.props.disabled}
+                    onKeyDown={(event) => this.handleKeyDown(event)}
+                    onKeyUp={(event) => this.handleFocusOnKeyUp(event, this.secondRef.current)}
+                    onChange={(event) => { this.handleChange(event, 'minutes'); }}
+                    onBlur={(event) => this.setState({minutes: this.zerPad(event.target.value)})}
+                    onKeyPress={(event) => {
+                        if (!/[0-9]/.test(event.key)) {
+                            event.preventDefault();
+                        }
+                    }} />
+                    <span className='sd-input__suffix'>m</span>
+
+                    <input
+                    className='duration-input'
+                    type='text'
+                    id='seconds'
+                    ref={this.secondRef}
+                    value={this.state.seconds}
+                    disabled={this.props.disabled}
+                    onKeyDown={(event) => this.handleKeyDown(event)}
+                    onKeyUp={(event) => this.handleFocusOnKeyUp(event, this.hourRef.current)}
+                    onChange={(event) => { this.handleChange(event, 'seconds'); }}
+                    onBlur={(event) => this.setState({seconds: this.zerPad(event.target.value)})}
+                    onKeyPress={(event) => {
+                        if (!/[0-9]/.test(event.key)) {
+                            event.preventDefault();
+                        }
+                    }} />
+                    <span className='sd-input__suffix'>s</span>
+                </div>
+                <div className='sd-input__message-box'>
+                    {this.props.info && !this.props.invalid && !this.state.invalid ?
+                        <div className='sd-input__hint'>{this.props.info}</div> : null}
+                    {this.props.invalid || this.state.invalid ?
+                        <div className='sd-input__message'>{this.props.error}</div>
+                        : null}
+                </div>
+            </div>
+        );
+    }
+}

package/app-typescript/components/Form/InputBase.tsx

@@ -0,0 +1,85 @@
+import * as React from 'react';
+
+interface IPropsBase {
+    error?: string;
+    required?: boolean;
+    disabled?: boolean;
+    invalid?: boolean;
+    tabIndex?: number;
+    fullWidth?: boolean;
+    boxedStyle?: boolean;
+    boxedLable?: boolean;
+    placeholder?: string;
+    htmlId?: string;
+    id?: string;
+    size?: 'medium' | 'large' | 'x-large'; // default: 'medium'
+}
+
+interface IPropsText extends IPropsBase {
+    type: 'text';
+    value: string;
+    onChange(newValue: string): void;
+}
+
+interface IPropsPassword extends IPropsBase {
+    type: 'password';
+    value: string;
+    onChange(newValue: string): void;
+}
+
+interface IPropsNumber extends IPropsBase {
+    type: 'number';
+    value: number;
+    onChange(newValue: number): void;
+}
+
+type IProps = IPropsText | IPropsNumber | IPropsPassword;
+
+interface IState {
+    value: string | number;
+    invalid: boolean;
+}
+
+export class InputBase extends React.Component<IProps, IState> {
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            value: this.props.value ?? '',
+            invalid: this.props.invalid ?? false,
+        };
+
+        this.handleChange = this.handleChange.bind(this);
+    }
+
+    // htmlId = nextId();
+
+    handleChange(event: React.ChangeEvent<HTMLInputElement>) {
+        this.setState({ value: event.target.value });
+        if (this.props.type === 'number') {
+            this.props.onChange(Number(event.target.value));
+        } else {
+            this.props.onChange(event.target.value);
+        }
+    }
+
+    componentDidUpdate(prevProps: any) {
+        if (prevProps.value !== this.props.value) {
+            this.setState({value: this.props.value});
+        }
+    }
+
+    render() {
+        return (
+            <input className='sd-input__input'
+            type={this.props.type ?? 'text'}
+            id={this.props.htmlId}
+            value={this.state.value}
+            aria-describedby={this.props.htmlId + 'label'}
+            tabIndex={this.props.tabIndex}
+            onChange={this.handleChange}
+            placeholder={this.props.placeholder}
+            disabled={this.props.disabled} />
+        );
+    }
+}

package/app-typescript/components/Form/InputNew.tsx

@@ -0,0 +1,105 @@
+import * as React from 'react';
+import nextId from "react-id-generator";
+
+import {
+    InputBase,
+    InputWrapper
+} from '.';
+
+interface IPropsBase {
+    label?: string;
+    maxLength?: number;
+    info?: string;
+    inlineLabel?: boolean;
+    labelHidden?: boolean;
+    error?: string;
+    required?: boolean;
+    disabled?: boolean;
+    invalid?: boolean;
+    tabindex?: number;
+    fullWidth?: boolean;
+    boxedStyle?: boolean;
+    boxedLable?: boolean;
+    placeholder?: string;
+    size?: 'medium' | 'large' | 'x-large'; // default: 'medium'
+}
+
+interface IPropsText extends IPropsBase {
+    type: 'text';
+    value: string;
+    onChange(newValue: string): void;
+}
+
+interface IPropsPassword extends IPropsBase {
+    type: 'password';
+    value: string;
+    onChange(newValue: string): void;
+}
+
+interface IPropsNumber extends IPropsBase {
+    type: 'number';
+    value: string;
+    onChange(newValue: string): void;
+}
+
+type IProps = IPropsText | IPropsNumber | IPropsPassword;
+
+interface IState {
+    value: string;
+    invalid: boolean;
+}
+
+export class InputNew extends React.PureComponent<IProps, IState> {
+    constructor(props: IProps) {
+        super(props);
+
+        this.state = {
+            value: this.props.value ?? '',
+            invalid: this.props.invalid ?? false,
+        };
+    }
+
+    componentDidUpdate(prevProps: any) {
+        if (prevProps.value !== this.props.value) {
+            this.setState({ value: this.props.value });
+        }
+    }
+
+    htmlId = nextId();
+
+    render() {
+        return (
+            <InputWrapper
+                label={this.props.label}
+                error={this.props.error}
+                required={this.props.required}
+                disabled={this.props.disabled}
+                value={this.state.value}
+                invalid={this.state.invalid}
+                info={this.props.info}
+                maxLength={this.props.maxLength}
+                inlineLabel={this.props.inlineLabel}
+                labelHidden={this.props.labelHidden}
+                size={this.props.size ?? 'medium'}
+                fullWidth={this.props.fullWidth}
+                htmlId={this.htmlId}
+                boxedStyle={this.props.boxedStyle}
+                boxedLable={this.props.boxedLable}
+                tabindex={this.props.tabindex}>
+                <InputBase
+                    type="text"
+                    onChange={(value: string) => {
+                        this.setState({ value: value });
+                        this.setState({ invalid: this.props.maxLength ? (value as string).length > this.props.maxLength : false });
+                        this.props.onChange(value as string);
+                    }}
+                    disabled={this.props.disabled}
+                    htmlId={this.htmlId}
+                    value={this.state.value}
+                    aria-describedby={this.htmlId + 'label'}
+                    tabIndex={this.props.tabindex}
+                    placeholder={this.props.placeholder} />
+            </InputWrapper>
+        );
+    }
+}

package/app-typescript/components/Form/InputWrapper.tsx

@@ -0,0 +1,79 @@
+import * as React from 'react';
+import classNames from 'classnames';
+
+interface IPropsBase {
+    label?: string;
+    children: React.ReactNode;
+    maxLength?: number;
+    info?: string;
+    error?: string;
+    required?: boolean;
+    disabled?: boolean;
+    invalid?: boolean;
+    inlineLabel?: boolean;
+    labelHidden?: boolean;
+    tabindex?: number;
+    fullWidth?: boolean;
+    boxedStyle?: boolean;
+    boxedLable?: boolean;
+    value?: string | number;
+    htmlId?: string;
+    size?: 'medium' | 'large' | 'x-large'; // default: 'medium'
+}
+
+interface IState {
+    value: string | number;
+}
+
+export class InputWrapper extends React.Component<IPropsBase, IState> {
+    constructor(props: IPropsBase) {
+        super(props);
+
+        this.state = {
+            value: this.props.value ?? '',
+        };
+    }
+
+    render() {
+        const classes = classNames('sd-input', {
+            'sd-input--inline-label': this.props.inlineLabel,
+            'sd-input--required': this.props.required,
+            'sd-input--disabled': this.props.disabled,
+            'sd-input--full-width': this.props.fullWidth,
+            'sd-input--invalid': this.props.invalid,
+            'sd-input--medium': this.props.size === undefined,
+            [`sd-input--${this.props.size}`]: this.props.size || this.props.size !== undefined,
+            'sd-input--boxed-style': this.props.boxedStyle,
+            'sd-input--boxed-label': this.props.boxedLable,
+        });
+        const labelClasses = classNames('sd-input__label', {
+            'a11y-only': this.props.labelHidden,
+            'sd-input__label--boxed': this.props.boxedLable,
+        });
+
+        return (
+            <div className={classes}>
+                <label className={labelClasses} htmlFor={this.props.htmlId} id={this.props.htmlId + 'label'}
+                        tabIndex={this.props.tabindex === undefined ? undefined : -1}>
+                    {this.props.label}
+                </label>
+                <div className="sd-input__input-container">
+                    {this.props.children}
+                </div>
+                {this.props.maxLength
+                    ? <div className='sd-input__char-count'>
+                        {this.props.value?.toString().length} / {this.props.maxLength}
+                    </div>
+                    : null}
+                <div className='sd-input__message-box'>
+                    {this.props.info && !this.props.invalid && !this.props.invalid
+                        ? <div className='sd-input__hint'>{this.props.info}</div>
+                        : null}
+                    {this.props.invalid || this.props.invalid
+                        ? <div className='sd-input__message'>{this.props.error}</div>
+                        : null}
+                </div>
+            </div>
+        );
+    }
+}

package/app-typescript/components/Form/index.tsx

@@ -3,3 +3,6 @@ export { FormGroup } from './FormGroup';
 export { FormItem } from './FormItem';
 export { FormText } from './FormText';
 export { FormLabel } from './FormLabel';
+export { InputWrapper } from './InputWrapper';
+export { InputBase } from './InputBase';
+export { InputNew } from './InputNew';

package/app-typescript/components/Input.tsx

@@ -1,6 +1,7 @@
 import * as React from 'react';
-import classNames from 'classnames';
+// import classNames from 'classnames';
 import nextId from "react-id-generator";
+import { InputWrapper } from './Form';
 
 interface IPropsBase {
     label?: string;
@@ -79,53 +80,35 @@ export class Input extends React.Component<IProps, IState> {
     }
 
     render() {
-        const classes = classNames('sd-input', {
-            'sd-input--inline-label': this.props.inlineLabel,
-            'sd-input--required': this.props.required,
-            'sd-input--disabled': this.props.disabled,
-            'sd-input--full-width': this.props.fullWidth,
-            'sd-input--invalid': this.props.invalid || this.state.invalid,
-            'sd-input--medium': this.props.size === undefined,
-            [`sd-input--${this.props.size}`]: this.props.size || this.props.size !== undefined,
-            'sd-input--boxed-style': this.props.boxedStyle,
-            'sd-input--boxed-label': this.props.boxedLable,
-        });
-        const labelClasses = classNames('sd-input__label', {
-            'a11y-only': this.props.labelHidden,
-            'sd-input__label--boxed': this.props.boxedLable,
-        });
 
         return (
-            <div className={classes}>
-                <label className={labelClasses} htmlFor={this.htmlId} id={this.htmlId + 'label'}
-                        tabIndex={this.props.tabindex === undefined ? undefined : -1}>
-                    {this.props.label}
-                </label>
-
+            <InputWrapper
+            label={this.props.label}
+            error={this.props.error}
+            required={this.props.required}
+            disabled={this.props.disabled}
+            value={this.state.value}
+            invalid={this.state.invalid}
+            info={this.props.info}
+            maxLength={this.props.maxLength}
+            inlineLabel={this.props.inlineLabel}
+            labelHidden={this.props.labelHidden}
+            size={this.props.size ?? 'medium'}
+            fullWidth={this.props.fullWidth}
+            htmlId={this.htmlId}
+            boxedStyle={this.props.boxedStyle}
+            boxedLable={this.props.boxedLable}
+            tabindex={this.props.tabindex}>
                 <input className='sd-input__input'
-                    type={this.props.type ?? 'text'}
-                    id={this.htmlId}
-                    value={this.state.value}
-                    aria-describedby={this.htmlId + 'label'}
-                    tabIndex={this.props.tabindex}
-                    onChange={this.handleChange}
-                    placeholder={this.props.placeholder}
-                    disabled={this.props.disabled} />
-
-                {this.props.maxLength ?
-                    <div className='sd-input__char-count'>
-                        {this.state.value.toString().length} / {this.props.maxLength}
-                    </div>
-                    : null}
-
-                <div className='sd-input__message-box'>
-                    {this.props.info && !this.props.invalid && !this.state.invalid ?
-                        <div className='sd-input__hint'>{this.props.info}</div> : null}
-                    {this.props.invalid || this.state.invalid ?
-                        <div className='sd-input__message'>{this.props.error}</div>
-                        : null}
-                </div>
-            </div>
+                type={this.props.type ?? 'text'}
+                id={this.htmlId}
+                value={this.state.value}
+                aria-describedby={this.htmlId + 'label'}
+                tabIndex={this.props.tabindex}
+                onChange={this.handleChange}
+                placeholder={this.props.placeholder}
+                disabled={this.props.disabled} />
+            </InputWrapper>
         );
     }
 }