Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Controls: Fix color control not resetting when initial value is defined #20049

Merged
merged 4 commits into from
Dec 9, 2022
Merged

Controls: Fix color control not resetting when initial value is defined #20049

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe6232a
fix: color control not resetting
gitstart Dec 1, 2022
04db1a8
Merge branch 'next' of github.com:storybookjs/storybook into pr/gitst…
JReinhold Dec 8, 2022
e6e1e6b
Merge commit 'f5aa7bd18204e0f9902f02741c92bfb6cbed7759' of https://gi…
gitstart Dec 8, 2022
ea90b23
chore: refactor changes
gitstart Dec 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions code/ui/blocks/src/controls/Color.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,12 +214,13 @@ const useColorInput = (
const [color, setColor] = useState(() => parseValue(value));
const [colorSpace, setColorSpace] = useState(color?.colorSpace || ColorSpace.HEX);

gitstart marked this conversation as resolved.
Show resolved Hide resolved
// Reset state when initialValue becomes undefined (when resetting controls)
// Reset state when initialValue changes (when resetting controls)
useEffect(() => {
if (initialValue !== undefined) return;
setValue('');
setColor(undefined);
setColorSpace(ColorSpace.HEX);
const nextValue = initialValue || '';
const nextColor = parseValue(nextValue);
setValue(nextValue);
setColor(nextColor);
setColorSpace(nextColor?.colorSpace || ColorSpace.HEX);
}, [initialValue]);

const realValue = useMemo(
Expand Down