From 917860c4d396cf9ce22127fb39159fe2a1e09a5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Fri, 6 Mar 2020 16:21:46 +0100
Subject: [PATCH] Cascader: Do not override default width behavior (#22620)

* Cascader: Do not override default width behavior

* Fixed storybook
---
 packages/grafana-ui/src/components/Cascader/Cascader.tsx   | 5 +++--
 packages/grafana-ui/src/components/Select/Select.story.tsx | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/grafana-ui/src/components/Cascader/Cascader.tsx b/packages/grafana-ui/src/components/Cascader/Cascader.tsx
index 028c9ba2cff..6db4c13a50a 100644
--- a/packages/grafana-ui/src/components/Cascader/Cascader.tsx
+++ b/packages/grafana-ui/src/components/Cascader/Cascader.tsx
@@ -8,6 +8,7 @@ import { FormInputSize } from '../Forms/types';
 import { Input } from '../Forms/Input/Input';
 import { SelectableValue } from '@grafana/data';
 import { css } from 'emotion';
+
 interface CascaderProps {
   /** The seperator between levels in the search */
   separator?: string;
@@ -184,7 +185,7 @@ export class Cascader extends React.PureComponent<CascaderProps, CascaderState>
             onChange={this.onSelect}
             onBlur={this.onBlur}
             options={searchableOptions}
-            size={size || 'md'}
+            size={size}
             onCreateOption={this.onCreateOption}
             formatCreateLabel={this.props.formatCreateLabel}
           />
@@ -205,7 +206,7 @@ export class Cascader extends React.PureComponent<CascaderProps, CascaderState>
           >
             <div className={disableDivFocus}>
               <Input
-                size={size || 'md'}
+                size={size}
                 placeholder={placeholder}
                 value={activeLabel}
                 onKeyDown={this.onInputKeyDown}
diff --git a/packages/grafana-ui/src/components/Select/Select.story.tsx b/packages/grafana-ui/src/components/Select/Select.story.tsx
index d4a8acfb45a..704e76cf08d 100644
--- a/packages/grafana-ui/src/components/Select/Select.story.tsx
+++ b/packages/grafana-ui/src/components/Select/Select.story.tsx
@@ -34,6 +34,7 @@ export const basic = () => {
           <Select
             placeholder="Choose..."
             options={options}
+            width={20}
             onChange={value => {
               action('onChanged fired')(value);
               updateValue(value);
@@ -57,6 +58,7 @@ export const withAllowCustomValue = () => {
             // value={value}
             placeholder="Choose..."
             options={options}
+            width={20}
             allowCustomValue={true}
             onChange={value => {
               action('onChanged fired')(value);
@@ -87,6 +89,7 @@ export const asyncSelect = () => {
     <AsyncSelect
       value={value}
       defaultOptions
+      width={20}
       isLoading={isLoading}
       loadOptions={loadAsyncOptions}
       onChange={value => {