Skip to content

Viewport: Skip viewport validation before parameters load #33794

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

Merged
valentinpalkovic merged 1 commit into from
Feb 9, 2026
Merged

Viewport: Skip viewport validation before parameters load #33794

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion code/core/src/viewport/useViewport.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,11 @@ export const useViewport = () => {
}, [storyGlobals, update]);

useEffect(() => {
// Skip if parameter not loaded to avoid race condition with default MINIMAL_VIEWPORTS
if (!parameter) {
return;
}

// Reset the viewport to the story global value if the URL state defines an invalid option
if (option) {
if (Object.hasOwn(options, option)) {
Expand All @@ -203,7 +208,7 @@ export const useViewport = () => {
update(normalizeGlobal(storyGlobals?.[PARAM_KEY], false));
}
}
}, [storyGlobals, options, option, update]);
}, [parameter, storyGlobals, options, option, update]);

useEffect(() => {
api.setAddonShortcut(ADDON_ID, {
Expand Down
Loading