Skip to content

Commit 3bbe565

Browse files
Jack-WorksAndyPengc12
authored andcommitted
fix: devtools cannot be closed correctly (facebook#25510)
<!-- Thanks for submitting a pull request! We appreciate you spending the time to work on these changes. Please provide enough information so that others can review your pull request. The three fields below are mandatory. Before submitting a pull request, please make sure the following is done: 1. Fork [the repository](https://github.com/facebook/react) and create your branch from `main`. 2. Run `yarn` in the repository root. 3. If you've fixed a bug or added code that should be tested, add tests! 4. Ensure the test suite passes (`yarn test`). Tip: `yarn test --watch TestName` is helpful in development. 5. Run `yarn test --prod` to test in the production environment. It supports the same options as `yarn test`. 6. If you need a debugger, run `yarn debug-test --watch TestName`, open `chrome://inspect`, and press "Inspect". 7. Format your code with [prettier](https://github.com/prettier/prettier) (`yarn prettier`). 8. Make sure your code lints (`yarn lint`). Tip: `yarn linc` to only check changed files. 9. Run the [Flow](https://flowtype.org/) type checks (`yarn flow`). 10. If you haven't already, complete the CLA. Learn more about contributing: https://reactjs.org/docs/how-to-contribute.html --> ## Summary Fix devtools cannot be shutdown by bridge.shutdown(). <!-- Explain the **motivation** for making this change. What existing problem does the pull request solve? --> ## How did you test this change? <!-- Demonstrate the code is solid. Example: The exact commands you ran and their output, screenshots / videos if the pull request changes the user interface. How exactly did you verify that your PR solves the issue you wanted to solve? If you leave this empty, your PR will very likely be closed. -->
1 parent e026324 commit 3bbe565

File tree

2 files changed

+4
-0
lines changed

2 files changed

+4
-0
lines changed

packages/react-devtools-shared/src/__tests__/bridge-test.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ describe('Bridge', () => {
2121
send: jest.fn(),
2222
};
2323
const bridge = new Bridge(wall);
24+
const shutdownCallback = jest.fn();
25+
bridge.addListener('shutdown', shutdownCallback);
2426

2527
// Check that we're wired up correctly.
2628
bridge.send('reloadAppForProfiling');
@@ -36,6 +38,7 @@ describe('Bridge', () => {
3638
expect(wall.send).toHaveBeenCalledWith('update', '1');
3739
expect(wall.send).toHaveBeenCalledWith('update', '2');
3840
expect(wall.send).toHaveBeenCalledWith('shutdown');
41+
expect(shutdownCallback).toHaveBeenCalledTimes(1);
3942

4043
// Verify that the Bridge doesn't send messages after shutdown.
4144
jest.spyOn(console, 'warn').mockImplementation(() => {});

packages/react-devtools-shared/src/bridge.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -334,6 +334,7 @@ class Bridge<
334334
}
335335

336336
// Queue the shutdown outgoing message for subscribers.
337+
this.emit('shutdown');
337338
this.send('shutdown');
338339

339340
// Mark this bridge as destroyed, i.e. disable its public API.

0 commit comments

Comments
 (0)