Skip to content

Commit

Permalink
fix(multiselect): field-02 background color when placed inside modal (#…
Browse files Browse the repository at this point in the history
…9328)

* fix(multiselect): correct background color when placed inside modal

* chore: modify throwaway story example

* chore: modify throwaway story example

Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
  • Loading branch information
tay1orjones and kodiakhq[bot] authored Jul 28, 2021
1 parent 7ca7afe commit ab7a3e7
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 1 deletion.
3 changes: 2 additions & 1 deletion packages/components/src/components/modal/_modal.scss
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@
.#{$prefix}--dropdown,
.#{$prefix}--dropdown-list,
.#{$prefix}--number input[type='number'],
.#{$prefix}--date-picker__input {
.#{$prefix}--date-picker__input,
.#{$prefix}--multi-select {
background-color: $field-02;
}
}
Expand Down
26 changes: 26 additions & 0 deletions packages/react/src/components/Modal/Modal-story.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ import {
import Modal from '../Modal';
import Button from '../Button';
import Select from '../Select';
import MultiSelect from '../MultiSelect';
import Dropdown from '../Dropdown';
import SelectItem from '../SelectItem';
import TextInput from '../TextInput';
import mdx from './Modal.mdx';
Expand Down Expand Up @@ -161,6 +163,30 @@ export const Default = () => {
<SelectItem value="us-south" text="US South" />
<SelectItem value="us-east" text="US East" />
</Select>
<Dropdown
id="drop"
label="Dropdown"
titleText="Dropdown"
items={[
{ id: 'one', label: 'one', name: 'one' },
{ id: 'two', label: 'two', name: 'two' },
]}
/>
<MultiSelect
id="test"
label="Multiselect"
items={[
{
id: 'downshift-1-item-0',
text: 'Option 1',
},
{
id: 'downshift-1-item-1',
text: 'Option 2',
},
]}
itemToString={(item) => (item ? item.text : '')}
/>
</Modal>
);
};
Expand Down

0 comments on commit ab7a3e7

Please sign in to comment.