Skip to content

Commit d33dba8

Browse files
erha19Ricbet
authored andcommitted
chore: fix warnings and remove some useless code (#2795)
1 parent ad73e1a commit d33dba8

4 files changed

Lines changed: 29 additions & 28 deletions

File tree

packages/components/src/recycle-list/RecycleList.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ export const RecycleList: React.FC<IRecycleListProps> = ({
269269
};
270270
useEffect(() => {
271271
if (rowRoot.current && listRef.current) {
272-
observer.current = new MutationObserver((mutations, observer) => {
272+
observer.current = new MutationObserver(() => {
273273
setItemSize();
274274
});
275275
const observerOption = {

packages/components/src/recycle-tree/RecycleTree.tsx

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import fuzzy from 'fuzzy';
2-
import React, { useEffect, createRef } from 'react';
3-
import { FixedSizeList, VariableSizeList, shouldComponentUpdate, ListProps } from 'react-window';
2+
import React, { useEffect, createRef, useMemo } from 'react';
3+
import { FixedSizeList, VariableSizeList, ListProps } from 'react-window';
44

55
import {
66
DisposableCollection,
@@ -900,24 +900,28 @@ export class RecycleTree extends React.Component<IRecycleTreeProps> {
900900
}
901901
}, []);
902902

903-
const setSize = supportDynamicHeights
904-
? () => {
905-
let size = 0;
906-
if (wrapRef.current) {
907-
const ref = wrapRef.current;
908-
size = Array.from(ref.children).reduce(
909-
(pre, cur: HTMLElement) => pre + cur.getBoundingClientRect().height,
910-
0,
911-
);
912-
}
913-
if (size) {
914-
this.dynamicSizeMap.set(index, size);
915-
this.layoutItem();
916-
}
917-
918-
return Math.max(size, RecycleTree.DEFAULT_ITEM_HEIGHT);
919-
}
920-
: () => {};
903+
const setSize = useMemo(
904+
() =>
905+
supportDynamicHeights
906+
? () => {
907+
let size = 0;
908+
if (wrapRef.current) {
909+
const ref = wrapRef.current;
910+
size = Array.from(ref.children).reduce(
911+
(pre, cur: HTMLElement) => pre + cur.getBoundingClientRect().height,
912+
0,
913+
);
914+
}
915+
if (size) {
916+
this.dynamicSizeMap.set(index, size);
917+
this.layoutItem();
918+
}
919+
920+
return Math.max(size, RecycleTree.DEFAULT_ITEM_HEIGHT);
921+
}
922+
: () => {},
923+
[supportDynamicHeights],
924+
);
921925

922926
const itemStyle = overflow === 'ellipsis' ? style : { ...style, width: 'auto', minWidth: '100%' };
923927

@@ -930,7 +934,6 @@ export class RecycleTree extends React.Component<IRecycleTreeProps> {
930934
template={template}
931935
hasPrompt={!!this.promptHandle && !this.promptHandle.destroyed}
932936
expanded={CompositeTreeNode.is(item) ? (item as CompositeTreeNode).expanded : void 0}
933-
setSize={setSize}
934937
>
935938
{children as INodeRenderer}
936939
</NodeRendererWrap>
@@ -942,7 +945,6 @@ export class RecycleTree extends React.Component<IRecycleTreeProps> {
942945
if (!this.props.supportDynamicHeights) {
943946
return;
944947
}
945-
// (this.listRef?.current as VariableSizeList<any>).resetAfterIndex(0);
946948
// eslint-disable-next-line no-unsafe-optional-chaining
947949
if (this.listRef && this.listRef?.current && '_getRangeToRender' in this.listRef?.current) {
948950
// _getRangeToRender 是 react-window 的内部方法,用于获取可视区域的下标范围

packages/components/src/recycle-tree/TreeNodeRendererWrap.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ export interface INodeRendererWrapProps {
3939
depth: number;
4040
expanded?: boolean;
4141
hasPrompt?: boolean;
42-
setSize: () => void;
4342
children: INodeRenderer;
4443
}
4544

packages/extension-manager/src/browser/vsx-extension.view.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,11 @@ export const VSXExtensionView = observer(() => {
7171
{activeKey === TabActiveKey.MARKETPLACE && (
7272
<div className={styles.extensions_view}>
7373
<Progress loading={loading} />
74-
{vsxExtensionService.extensions.map((e) => (
74+
{vsxExtensionService.extensions.map((e: VSXExtension, index: number) => (
7575
<Extension
76+
key={`${index}:${e.namespace}-${e.name}`}
7677
onClick={onClick}
7778
onInstall={onInstall}
78-
key={`${e.namespace}-${e.name}`}
7979
extension={e}
8080
type={ExtensionViewType.MARKETPLACE}
8181
installedExtensions={vsxExtensionService.installedExtensions}
@@ -86,11 +86,11 @@ export const VSXExtensionView = observer(() => {
8686
)}
8787
{activeKey === TabActiveKey.INSTALLED && (
8888
<div className={styles.extensions_view}>
89-
{vsxExtensionService.installedExtensions.map((e) => (
89+
{vsxExtensionService.installedExtensions.map((e: VSXExtension, index: number) => (
9090
<Extension
91+
key={`${index}:${e.namespace}-${e.name}`}
9192
onClick={onClick}
9293
onInstall={onInstall}
93-
key={`${e.namespace}-${e.name}`}
9494
extension={e}
9595
type={ExtensionViewType.INSTALLED}
9696
openVSXRegistry={vsxExtensionService.openVSXRegistry}

0 commit comments

Comments
 (0)