superdesk-ui-framework 3.0.1-beta.11 → 3.0.1-beta.13

package/app-typescript/components/SearchBar.tsx

@@ -3,7 +3,7 @@ import classNames from 'classnames';
 import {Icon} from './Icon';
 
 interface IProps {
-    value?: string | number;
+    value?: string;
     type?: 'expanded' | 'collapsed' | 'boxed';
     placeholder: string;
     focused?: boolean;
@@ -79,9 +79,17 @@ export class SearchBar extends React.PureComponent<IProps, IState> {
                 onChange={(event) => this.setState({inputValue: event.target.value})}
                 onFocus={() => this.setState({focused: true})} />
                 {this.state.inputValue &&
-                <button className="sd-searchbar__cancel" onClick={() => this.setState({inputValue: ''})}>
+                <button className="sd-searchbar__cancel" onClick={() => {
+                    this.setState({inputValue: ''});
+                    setTimeout(() => {
+                        if (this.props.onSubmit) {
+                            this.props.onSubmit(this.state.inputValue);
+                        }
+                    });
+                }}>
                     <Icon name='remove-sign' />
                 </button>}
+                {this.state.inputValue &&
                 <button
                 id="sd-searchbar__search-btn"
                 className={`sd-searchbar__search-btn ${this.state.keyDown ? 'sd-searchbar__search-btn--active' : ''}`}
@@ -91,7 +99,7 @@ export class SearchBar extends React.PureComponent<IProps, IState> {
                     }
                 }}>
                     <Icon name='chevron-right-thin' />
-                </button>
+                </button>}
             </div>
         );
     }

package/app-typescript/components/TimePicker.tsx

@@ -1,5 +1,4 @@
 import * as React from 'react';
-// import classNames from 'classnames';
 import nextId from "react-id-generator";
 import { InputWrapper } from './Form';
 
@@ -19,18 +18,8 @@ interface IProps {
     error?: string;
 }
 
-interface IState {
-    invalid: boolean;
-}
-
-export class TimePicker extends React.PureComponent<IProps, IState> {
+export class TimePicker extends React.PureComponent<IProps> {
     private htmlId = nextId();
-    constructor(props: IProps) {
-        super(props);
-        this.state = {
-            invalid: this.props.invalid ? this.props.invalid : false,
-        };
-    }
 
     render() {
         return (
@@ -39,7 +28,7 @@ export class TimePicker extends React.PureComponent<IProps, IState> {
             error={this.props.error}
             required={this.props.required}
             disabled={this.props.disabled}
-            invalid={this.state.invalid}
+            invalid={this.props.invalid}
             info={this.props.info}
             inlineLabel={this.props.inlineLabel}
             labelHidden={this.props.labelHidden}