Skip to content

Commit 87d97ad

Browse files
committed
2 parents 2e014d1 + 5338d4c commit 87d97ad

File tree

7 files changed

+19
-21
lines changed

7 files changed

+19
-21
lines changed

packages/components/src/core/ComplexFilter/__tests__/__snapshots__/index.test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ exports[`<ComplexFilter /> Default story renders snapshot 1`] = `
66
>
77
<button
88
aria-label="Dropdown input"
9-
class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary css-yho5y9-MuiButtonBase-root-MuiButton-root"
9+
class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary css-1bcxl8g-MuiButtonBase-root-MuiButton-root"
1010
label="Click Target"
1111
tabindex="0"
1212
type="button"

packages/components/src/core/Dropdown/__tests__/__snapshots__/index.test.tsx.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
exports[`<Dropdown /> Default story renders snapshot 1`] = `
44
<button
55
aria-label="Dropdown input"
6-
class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary css-yho5y9-MuiButtonBase-root-MuiButton-root"
6+
class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary css-1bcxl8g-MuiButtonBase-root-MuiButton-root"
77
label="Click Target"
88
tabindex="0"
99
type="button"
@@ -48,7 +48,7 @@ exports[`<Dropdown /> Default story renders snapshot 1`] = `
4848
exports[`<Dropdown /> MultiColumnWithButtons story renders snapshot 1`] = `
4949
<button
5050
aria-label="Dropdown input"
51-
class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary css-yho5y9-MuiButtonBase-root-MuiButton-root"
51+
class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary css-1bcxl8g-MuiButtonBase-root-MuiButton-root"
5252
label="Click Target"
5353
tabindex="0"
5454
type="button"

packages/components/src/core/InputDropdown/__storybook__/index.stories.tsx

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,11 @@ export default {
5353
type: "boolean",
5454
},
5555
},
56+
style: {
57+
control: {
58+
type: "object",
59+
},
60+
},
5661
width: {
5762
control: {
5863
type: "number",

packages/components/src/core/InputDropdown/__storybook__/stories/default.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { useEffect, useState } from "react";
44
import { DefaultAutocompleteOption } from "src/core/Autocomplete";
55
import Callout from "src/core/Callout";
66
import DropdownMenu from "src/core/DropdownMenu";
7-
import { StyledInputDropdown } from "../style";
7+
import RawInputDropdown from "src/core/InputDropdown";
88

99
type DisableClearable = false;
1010
type FreeSolo = false;
@@ -131,7 +131,7 @@ export const InputDropdown = <
131131
body='When using the InputDropdown component, please note that the combination of setting the sdsType prop to "value" and the multiple prop to "true" is not allowed.'
132132
/>
133133
) : (
134-
<StyledInputDropdown
134+
<RawInputDropdown
135135
disabled={disabled}
136136
label={storybookLabel}
137137
onClick={handleClick}

packages/components/src/core/InputDropdown/__storybook__/style.ts

Lines changed: 0 additions & 12 deletions
This file was deleted.

packages/components/src/core/InputDropdown/__tests__/__snapshots__/index.test.tsx.snap

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ exports[`<InputDropdown /> Default story renders snapshot 1`] = `
44
<div>
55
<button
66
aria-label="Dropdown input"
7-
class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary css-1k4jv7d-MuiButtonBase-root-MuiButton-root"
7+
class="MuiButtonBase-root MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary MuiButton-root MuiButton-text MuiButton-textPrimary MuiButton-sizeMedium MuiButton-textSizeMedium MuiButton-colorPrimary css-1p7a1s5-MuiButtonBase-root-MuiButton-root"
88
data-testid="InputDropdown"
99
label="Label"
1010
tabindex="0"

packages/components/src/core/InputDropdown/style.ts

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ export interface InputDropdownProps
5252
value?: ReactNode;
5353
shouldTruncateMinimalDetails?: boolean;
5454
shouldPutAColonAfterLabel?: boolean;
55+
width?: number;
56+
className?: string;
5557
// (masoudmanson): This is a temporary fix for the issue where the style prop
5658
// is not correctly passed to the underlying Button component when asserting as
5759
// a React.ComponentType<InputDropdownProps>. This is a workaround until a more
@@ -63,6 +65,8 @@ const labelFontBodyS = fontBody("s", "regular");
6365
const labelFontBodyXs = fontBody("xs", "regular");
6466

6567
const inputDropdownStyles = (props: InputDropdownProps): SerializedStyles => {
68+
const { width = "auto" } = props;
69+
6670
const spaces = getSpaces(props);
6771
const borders = getBorders(props);
6872
const semanticColors = getSemanticColors(props);
@@ -81,6 +85,7 @@ const inputDropdownStyles = (props: InputDropdownProps): SerializedStyles => {
8185
cursor: pointer;
8286
padding: ${padding};
8387
justify-content: start;
88+
width: ${width}px;
8489
8590
&.MuiButton-text {
8691
&:hover {
@@ -149,7 +154,7 @@ const minimal = (props: InputDropdownProps): SerializedStyles => {
149154
flex-direction: column;
150155
padding: ${spaces?.xs}px ${spaces?.s}px;
151156
background-color: transparent;
152-
min-width: fit-content;
157+
min-width: auto;
153158
/* Nesting to increase CSS specificity for style override */
154159
&.MuiButton-text {
155160
.styled-label {
@@ -201,7 +206,7 @@ const square = (props: InputDropdownProps): SerializedStyles => {
201206

202207
return css`
203208
border-radius: ${corners?.m}px;
204-
min-width: fit-content;
209+
min-width: auto;
205210
background-color: transparent;
206211
`;
207212
};
@@ -211,7 +216,7 @@ const rounded = (props: InputDropdownProps): SerializedStyles => {
211216

212217
return css`
213218
border-radius: ${corners?.l}px;
214-
min-width: fit-content;
219+
min-width: auto;
215220
background-color: transparent;
216221
`;
217222
};

0 commit comments

Comments
 (0)