Skip to content

Commit

Permalink
Merge pull request #10 from crimx/fix-empty-editor
Browse files Browse the repository at this point in the history
fix(browser): fix state updates on unmounted component
  • Loading branch information
yantze authored May 19, 2022
2 parents e1e266d + c36c762 commit f64442f
Showing 1 changed file with 11 additions and 9 deletions.
20 changes: 11 additions & 9 deletions src/modules/demo/browser/editor-empty-component.contribution.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React from 'react';
import { useMemo, useState } from 'react';
import { useMemo, useState, useEffect } from 'react';
import {
Domain,
ComponentContribution,
Expand All @@ -11,7 +11,7 @@ import { KeybindingRegistry } from '@opensumi/ide-core-browser/lib/keybinding/ke
import { useInjectable } from '@opensumi/ide-core-browser/lib/react-hooks';
import { KeybindingView } from '@opensumi/ide-quick-open/lib/browser/components/keybinding';
import { QUICK_OPEN_COMMANDS } from '@opensumi/ide-quick-open/lib/common';
import { Disposable, localize, registerLocalizationBundle } from '@opensumi/ide-core-common';
import { localize, registerLocalizationBundle } from '@opensumi/ide-core-common';
import { IKeymapService } from '@opensumi/ide-keymaps/lib/common/keymaps';
import { ThrottledDelayer } from '@opensumi/ide-core-common/lib/async';

Expand Down Expand Up @@ -54,19 +54,21 @@ export const EditorEmptyComponent = () => {
return primaryKeybinding || keyBindings[0];
};

const init = () =>
useEffect(() => {
let isMount = true;

// 监听快捷键是否有更新
keymapService.onDidKeymapChanges(() => {
const keymapChangesDisposer = keymapService.onDidKeymapChanges(() => {
keymapChangeDelayer.trigger(async () => {
setKeyMapLoaded(true);
if (isMount) {
setKeyMapLoaded(true);
}
});
});
React.useEffect(() => {
const disposer = new Disposable();
disposer.addDispose(init());

return () => {
disposer.dispose();
isMount = false;
keymapChangesDisposer.dispose();
};
}, []);

Expand Down

0 comments on commit f64442f

Please sign in to comment.