From 7b105ff54c49f95f04a4e958920e1f668cbba688 Mon Sep 17 00:00:00 2001 From: Amumu Date: Fri, 16 Dec 2022 10:45:27 +0800 Subject: [PATCH 1/4] chore: remove unused deps (#39596) --- package.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/package.json b/package.json index f857eee37d4d..2fd68799844c 100644 --- a/package.json +++ b/package.json @@ -199,7 +199,6 @@ "chalk": "^4.0.0", "cheerio": "1.0.0-rc.12", "cross-env": "^7.0.0", - "css-minimizer-webpack-plugin": "^1.3.0", "dekko": "^0.2.1", "dumi": "^2.0.2", "duplicate-package-checker-webpack-plugin": "^3.0.0", @@ -221,7 +220,6 @@ "fs-extra": "^11.0.0", "gh-pages": "^4.0.0", "glob": "^8.0.1", - "highlight.js": "^11.5.0", "http-server": "^14.0.0", "husky": "^8.0.1", "identity-obj-proxy": "^3.0.0", @@ -239,10 +237,8 @@ "jsdom": "^20.0.0", "jsonml-to-react-element": "^1.1.11", "jsonml.js": "^0.1.0", - "less-vars-to-js": "^1.3.0", "lint-staged": "^13.0.3", "lz-string": "^1.4.4", - "mini-css-extract-plugin": "^1.6.2", "mockdate": "^3.0.0", "open": "^8.0.1", "prettier": "^2.3.2", From b82c4bf20591110c25d20eac3578426de0d5b9b5 Mon Sep 17 00:00:00 2001 From: lijianan <574980606@qq.com> Date: Fri, 16 Dec 2022 11:52:46 +0800 Subject: [PATCH 2/4] chore: remove lodash/isEqual (#39599) --- components/table/hooks/useFilter/FilterDropdown.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/components/table/hooks/useFilter/FilterDropdown.tsx b/components/table/hooks/useFilter/FilterDropdown.tsx index ad684ce72240..e98238fd19fa 100644 --- a/components/table/hooks/useFilter/FilterDropdown.tsx +++ b/components/table/hooks/useFilter/FilterDropdown.tsx @@ -1,6 +1,6 @@ import FilterFilled from '@ant-design/icons/FilterFilled'; import classNames from 'classnames'; -import isEqual from 'lodash/isEqual'; +import shallowEqual from 'shallowequal'; import type { FieldDataNode } from 'rc-tree'; import * as React from 'react'; import type { MenuProps } from '../../../menu'; @@ -232,7 +232,7 @@ function FilterDropdown(props: FilterDropdownProps) { return null; } - if (isEqual(mergedKeys, filterState?.filteredKeys)) { + if (shallowEqual(mergedKeys, filterState?.filteredKeys)) { return null; } @@ -339,7 +339,7 @@ function FilterDropdown(props: FilterDropdownProps) { } else if (column.filterDropdown) { dropdownContent = column.filterDropdown; } else { - const selectedKeys = (getFilteredKeysSync() || []) as any; + const selectedKeys = getFilteredKeysSync() || []; const getFilterComponent = () => { if ((column.filters || []).length === 0) { return ( @@ -425,7 +425,7 @@ function FilterDropdown(props: FilterDropdownProps) { className={dropdownMenuClass} onSelect={onSelectKeys} onDeselect={onSelectKeys} - selectedKeys={selectedKeys} + selectedKeys={selectedKeys as string[]} getPopupContainer={getPopupContainer} openKeys={openKeys} onOpenChange={onOpenChange} @@ -444,7 +444,7 @@ function FilterDropdown(props: FilterDropdownProps) { const getResetDisabled = () => { if (filterResetToDefaultFilteredValue) { - return isEqual( + return shallowEqual( (defaultFilteredValue || []).map((key) => String(key)), selectedKeys, ); From 1f5ab2d6a7f1a5bb606f8162c99a858e2766dc22 Mon Sep 17 00:00:00 2001 From: lijianan <574980606@qq.com> Date: Fri, 16 Dec 2022 15:02:32 +0800 Subject: [PATCH 3/4] chore: remove lodash/debounce (#39602) * chore: remove lodash/debounce * fix test case --- components/spin/__tests__/delay.test.tsx | 6 +++--- components/spin/index.tsx | 8 ++++---- package.json | 6 ++++-- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/components/spin/__tests__/delay.test.tsx b/components/spin/__tests__/delay.test.tsx index f09853801645..eb67695c4f2f 100644 --- a/components/spin/__tests__/delay.test.tsx +++ b/components/spin/__tests__/delay.test.tsx @@ -1,12 +1,12 @@ import React from 'react'; import { render } from '@testing-library/react'; -import debounce from 'lodash/debounce'; +import { debounce } from 'throttle-debounce'; import Spin from '..'; import { waitFakeTimer } from '../../../tests/utils'; -jest.mock('lodash/debounce'); +jest.mock('throttle-debounce'); (debounce as jest.Mock).mockImplementation((...args: any[]) => - jest.requireActual('lodash/debounce')(...args), + jest.requireActual('throttle-debounce').debounce(...args), ); describe('delay spinning', () => { diff --git a/components/spin/index.tsx b/components/spin/index.tsx index a5ebc3d71783..779db6392214 100644 --- a/components/spin/index.tsx +++ b/components/spin/index.tsx @@ -1,5 +1,5 @@ import classNames from 'classnames'; -import debounce from 'lodash/debounce'; +import { debounce } from 'throttle-debounce'; import omit from 'rc-util/lib/omit'; import * as React from 'react'; import type { ConfigConsumerProps } from '../config-provider'; @@ -75,7 +75,7 @@ const Spin: React.FC = (props) => { const { spinPrefixCls: prefixCls, spinning: customSpinning = true, - delay, + delay = 0, className, size = 'default', tip, @@ -91,9 +91,9 @@ const Spin: React.FC = (props) => { ); React.useEffect(() => { - const updateSpinning = debounce<() => void>(() => { + const updateSpinning = debounce(delay, () => { setSpinning(customSpinning); - }, delay); + }); updateSpinning(); return () => { updateSpinning?.cancel?.(); diff --git a/package.json b/package.json index 2fd68799844c..974d233e2cbf 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,6 @@ "classnames": "^2.2.6", "copy-to-clipboard": "^3.2.0", "dayjs": "^1.11.1", - "lodash": "^4.17.21", "rc-cascader": "~3.8.0", "rc-checkbox": "~2.3.0", "rc-collapse": "~3.4.2", @@ -154,7 +153,8 @@ "rc-upload": "~4.3.0", "rc-util": "^5.25.2", "scroll-into-view-if-needed": "^3.0.3", - "shallowequal": "^1.1.0" + "shallowequal": "^1.1.0", + "throttle-debounce": "^5.0.0" }, "devDependencies": { "@ant-design/tools": "^16.1.0-alpha.2", @@ -189,6 +189,7 @@ "@types/react-sticky": "^6.0.4", "@types/react-window": "^1.8.2", "@types/shallowequal": "^1.1.1", + "@types/throttle-debounce": "^5.0.0", "@types/warning": "^3.0.0", "@typescript-eslint/eslint-plugin": "^5.40.0", "@typescript-eslint/parser": "^5.40.0", @@ -238,6 +239,7 @@ "jsonml-to-react-element": "^1.1.11", "jsonml.js": "^0.1.0", "lint-staged": "^13.0.3", + "lodash": "^4.17.21", "lz-string": "^1.4.4", "mockdate": "^3.0.0", "open": "^8.0.1", From a14b53b4c2f7996065f0d821c7dad10eede19503 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Noel=20Kim=20=28=EA=B9=80=EB=AF=BC=ED=98=81=29?= Date: Fri, 16 Dec 2022 16:52:00 +0900 Subject: [PATCH 4/4] chore(date-picker): remove non-null assertion (#39514) --- components/date-picker/generatePicker/generateRangePicker.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/date-picker/generatePicker/generateRangePicker.tsx b/components/date-picker/generatePicker/generateRangePicker.tsx index 0774a456a7ef..6673f88768dd 100644 --- a/components/date-picker/generatePicker/generateRangePicker.tsx +++ b/components/date-picker/generatePicker/generateRangePicker.tsx @@ -142,7 +142,7 @@ export default function generateRangePicker(generateConfig: GenerateCo compactItemClassnames, className, )} - locale={locale!.lang} + locale={locale.lang} prefixCls={prefixCls} getPopupContainer={customGetPopupContainer || getPopupContainer} generateConfig={generateConfig}