summaryrefslogtreecommitdiff
path: root/src/components/Rules.tsx
diff options
context:
space:
mode:
authorMatain <[email protected]>2022-06-12 23:34:56 +0800
committerMatain <[email protected]>2022-06-12 23:34:56 +0800
commitea5d7cf003eeef30cb7bbe789c6ba7f314bf1ce4 (patch)
treebff1bd7b0e8e8eb753d373b57f007bbe97f96c76 /src/components/Rules.tsx
parent4fd2c8f646e48dd0c07d0c2041de52e9a4f8bc82 (diff)
parent38571da24ac54137564be5e41b7a409009e2ee10 (diff)
Merge branch 'master' of https://github.com/haishanh/yacd into haishanh-master
Diffstat (limited to 'src/components/Rules.tsx')
-rw-r--r--src/components/Rules.tsx19
1 files changed, 14 insertions, 5 deletions
diff --git a/src/components/Rules.tsx b/src/components/Rules.tsx
index e105edf..4b17a4b 100644
--- a/src/components/Rules.tsx
+++ b/src/components/Rules.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import * as React from 'react';
import { useTranslation } from 'react-i18next';
import { areEqual, VariableSizeList } from 'react-window';
import { RuleProviderItem } from 'src/components/rules/RuleProviderItem';
@@ -7,7 +7,7 @@ import { RulesPageFab } from 'src/components/rules/RulesPageFab';
import { TextFilter } from 'src/components/shared/TextFitler';
import { ruleFilterText } from 'src/store/rules';
import { State } from 'src/store/types';
-import { ClashAPIConfig } from 'src/types';
+import { ClashAPIConfig, RuleType } from 'src/types';
import useRemainingViewPortHeight from '../hooks/useRemainingViewPortHeight';
import { getClashAPIConfig } from '../store/app';
@@ -41,15 +41,24 @@ function getItemSizeFactory({ provider }) {
const providerQty = provider.names.length;
if (idx < providerQty) {
// provider
- return 90;
+ return 110;
}
// rule
return 60;
};
}
-// @ts-expect-error ts-migrate(2339) FIXME: Property 'index' does not exist on type '{ childre... Remove this comment to see the full error message
-const Row = memo(({ index, style, data }) => {
+type RowProps = {
+ index: number;
+ style: React.CSSProperties;
+ data: {
+ apiConfig: ClashAPIConfig;
+ rules: RuleType[];
+ provider: { names: string[]; byName: any };
+ };
+};
+
+const Row = memo(({ index, style, data }: RowProps) => {
const { rules, provider, apiConfig } = data;
const providerQty = provider.names.length;