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.

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

Core: Reload the preview-iframe when tearing down a story during loading #26735

Merged
merged 6 commits into from
Apr 10, 2024

Conversation

JReinhold
Copy link
Contributor

@JReinhold JReinhold commented Apr 4, 2024

Closes #26723

Works on #26637

Originally proposed in #26649 (comment)

What I did

  • Added the loading phase to the phases that will trigger a full iframe reload if it isn't finished within 3 ticks. The list of phases already included rendering and playing
  • Added tests for this.

Checklist for Contributors

Testing

The changes in this PR are covered in the following automated tests:

  • stories
  • unit tests
  • integration tests
  • end-to-end tests

Manual testing

  1. In a React sandbox add the following RaceConditions.stories.tsx file:
import { expect } from "@storybook/test";

const delay = (ms) => new Promise((resolve) => { setTimeout(resolve, ms)});

export default {
    title: "Race Conditions"
};

let myVariable = "";

export const FastLoader = {
    loaders: async () => {
        await delay(1000);
        myVariable = 'fast';
    },
    render: () => {
        return <div>Rendered: {myVariable}</div>
    }
};

export const SlowLoader = {
    loaders: async () => {
        myVariable = 'slow';
        await delay(3000);
        myVariable += '-end';
    },
    render: () => {
        return <div>Rendered: {myVariable}</div>
    }
};
  1. Open the "Fast Loader" story, and while it is still loading, navigate to the "Slow Loader" story.
  2. The story should say "slow-end" and not "fast-end" as it does currently.

Documentation

  • Add or update documentation reflecting your changes
  • If you are deprecating/removing a feature, make sure to update
    MIGRATION.MD

Checklist for Maintainers

  • When this PR is ready for testing, make sure to add ci:normal, ci:merged or ci:daily GH label to it to run a specific set of sandboxes. The particular set of sandboxes can be found in code/lib/cli/src/sandbox-templates.ts

  • Make sure this PR contains one of the labels below:

    Available labels
    • bug: Internal changes that fixes incorrect behavior.
    • maintenance: User-facing maintenance tasks.
    • dependencies: Upgrading (sometimes downgrading) dependencies.
    • build: Internal-facing build tooling & test updates. Will not show up in release changelog.
    • cleanup: Minor cleanup style change. Will not show up in release changelog.
    • documentation: Documentation only changes. Will not show up in release changelog.
    • feature request: Introducing a new feature.
    • BREAKING CHANGE: Changes that break compatibility in some way with current major version.
    • other: Changes that don't fit in the above categories.

🦋 Canary release

This PR does not have a canary release associated. You can request a canary release of this pull request by mentioning the @storybookjs/core team here.

core team members can create a canary release here or locally with gh workflow run --repo storybookjs/storybook canary-release-pr.yml --field pr=<PR_NUMBER>

Copy link

nx-cloud bot commented Apr 4, 2024

☁️ Nx Cloud Report

CI is running/has finished running commands for commit 45d4b32. As they complete they will appear below. Click to see the status, the terminal output, and the build insights.

📂 See all runs for this CI Pipeline Execution


✅ Successfully ran 1 target

Sent with 💌 from NxCloud.

@JReinhold JReinhold changed the title Preview: Reload the iframe when tearing down a story during loading Core: Reload the preview-iframe when tearing down a story during loading Apr 4, 2024
@JReinhold JReinhold self-assigned this Apr 4, 2024
@JReinhold JReinhold requested a review from tmeasday April 4, 2024 12:28
Copy link
Member

@tmeasday tmeasday left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is great (++ tests). I have a suggestion on how to tweak the test (same suggestion applies to all three) that might make it a little more in line with what actually might happen.

@JReinhold JReinhold marked this pull request as ready for review April 5, 2024 11:27
@JReinhold JReinhold added the bug label Apr 5, 2024
@JReinhold JReinhold marked this pull request as draft April 5, 2024 18:02
@JReinhold JReinhold force-pushed the jeppe/teardown-loading-reload branch from 223a01b to cf6788e Compare April 5, 2024 18:03
@JReinhold JReinhold marked this pull request as ready for review April 5, 2024 18:19
Copy link
Member

@tmeasday tmeasday left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@kasperpeulen kasperpeulen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks great!
1 line change in implementation and 150 lines of added code in tests! 🔥

@kasperpeulen kasperpeulen merged commit 388516c into kasper/module-mocking Apr 10, 2024
55 of 59 checks passed
@kasperpeulen kasperpeulen deleted the jeppe/teardown-loading-reload branch April 10, 2024 11:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants