-
Notifications
You must be signed in to change notification settings - Fork 89
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
b1d730d
commit 3045c38
Showing
6 changed files
with
112 additions
and
79 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| --- | ||
| "@salt-ds/core": patch | ||
| --- | ||
|
|
||
| - Fixed ComboBox breaking when `inputRef` is used. | ||
| - Fixed ComboBox having an incorrect focus ring color when validation is applied. | ||
| - Fixed ComboBox having incorrect active styling. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| .saltComboBox-focused { | ||
| outline: var(--salt-focused-outline); | ||
| outline: var(--saltPillInput-outline, var(--salt-focused-outlineWidth) var(--salt-focused-outlineStyle) var(--pillInput-outlineColor)); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,20 @@ | ||
| import { ComboBox, Option } from "@salt-ds/core"; | ||
| import { ComboBox, Option, StackLayout } from "@salt-ds/core"; | ||
| import type { ReactElement } from "react"; | ||
| import { shortColorData } from "./exampleData"; | ||
|
|
||
| export const Disabled = (): ReactElement => { | ||
| return ( | ||
| <ComboBox style={{ width: "266px" }} defaultSelected={["Yellow"]} disabled> | ||
| {shortColorData.map((color) => ( | ||
| <Option value={color} key={color} /> | ||
| ))} | ||
| </ComboBox> | ||
| <StackLayout style={{ width: "266px" }}> | ||
| <ComboBox defaultSelected={["Yellow"]} disabled> | ||
| {shortColorData.map((color) => ( | ||
| <Option value={color} key={color} /> | ||
| ))} | ||
| </ComboBox> | ||
| <ComboBox defaultSelected={["Yellow", "Green"]} disabled multiselect> | ||
| {shortColorData.map((color) => ( | ||
| <Option value={color} key={color} /> | ||
| ))} | ||
| </ComboBox> | ||
| </StackLayout> | ||
| ); | ||
| }; |