From: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
Date: Mon, 17 Dec 2018 16:56:55 +0000 (+0100)
Subject: Merge branch 'master' into 14603-add-controlled-vocabulary-to-advanced-search
X-Git-Tag: 1.4.0~71^2~16^2~5
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/3ddd45b007768a39591cd116b4a213cd39019e0c?hp=-c

Merge branch 'master' into 14603-add-controlled-vocabulary-to-advanced-search

refs #14603

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>
---

3ddd45b007768a39591cd116b4a213cd39019e0c
diff --combined src/components/autocomplete/autocomplete.tsx
index 57881f1a,b250c7b8..52918c34
--- a/src/components/autocomplete/autocomplete.tsx
+++ b/src/components/autocomplete/autocomplete.tsx
@@@ -15,6 -15,7 +15,7 @@@ export interface AutocompleteProps<Item
      suggestions?: Suggestion[];
      error?: boolean;
      helperText?: string;
+     autofocus?: boolean;
      onChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
      onBlur?: (event: React.FocusEvent<HTMLInputElement>) => void;
      onFocus?: (event: React.FocusEvent<HTMLInputElement>) => void;
@@@ -29,6 -30,7 +30,7 @@@ export interface AutocompleteState 
      suggestionsOpen: boolean;
      selectedSuggestionIndex: number;
  }
+ 
  export class Autocomplete<Value, Suggestion> extends React.Component<AutocompleteProps<Value, Suggestion>, AutocompleteState> {
  
      state = {
@@@ -59,6 -61,7 +61,7 @@@
  
      renderInput() {
          return <Input
+             autoFocus={this.props.autofocus}
              inputRef={this.inputRef}
              value={this.props.value}
              startAdornment={this.renderChips()}
@@@ -149,15 -152,6 +152,15 @@@
  
      renderChips() {
          const { items, onDelete } = this.props;
 +
 +        /**
 +         * If input startAdornment prop is not undefined, input's label will stay above the input.
 +         * If there is not items, we want the label to go back to placeholder position.
 +         */
 +        if (items.length === 0) {
 +            return;
 +        }
 +
          return items.map(
              (item, index) =>
                  <Chip