diff --git a/.codesandbox/ci.json b/.codesandbox/ci.json index c1e8e1305f..96c2526e4c 100644 --- a/.codesandbox/ci.json +++ b/.codesandbox/ci.json @@ -1,4 +1,4 @@ { - "sandboxes": ["antd-reproduction-template-y9vgcf"], - "node": "14" + "sandboxes": ["antd-reproduction-template-forked-jyh2k9"], + "node": "18" } diff --git a/.github/lock.yml b/.github/lock.yml deleted file mode 100644 index e5b9a627f1..0000000000 --- a/.github/lock.yml +++ /dev/null @@ -1,14 +0,0 @@ -# Configuration for lock-threads - https://github.com/dessant/lock-threads - -# Number of days of inactivity before a closed issue or pull request is locked -daysUntilLock: 365 -# Comment to post before locking. Set to `false` to disable -lockComment: > - This thread has been automatically locked because it has not had recent - activity. Please open a new issue for related bugs and link to relevant - comments in this thread. -# Issues or pull requests with these labels will not be locked -# exemptLabels: -# - no-locking -# Limit to only `issues` or `pulls` -only: issues diff --git a/.github/tests_checker.yml b/.github/tests_checker.yml deleted file mode 100644 index 46378d7461..0000000000 --- a/.github/tests_checker.yml +++ /dev/null @@ -1,3 +0,0 @@ -comment: 'Could you please add tests to make sure this change works as expected?', -fileExtensions: [.ts', '.tsx', '.json'] -testDir: '__tests__' diff --git a/README-zh_CN.md b/README-zh_CN.md index aaa74d60c8..ff2c60baa5 100644 --- a/README-zh_CN.md +++ b/README-zh_CN.md @@ -104,7 +104,7 @@ export default App; ### 🛡 TypeScript -参考 [在 TypeScript 中使用](https://ant.design/docs/react/use-in-typescript-cn)。 +`antd` 使用 TypeScript 编写,具有完整的类型定义,参考 [在 create-react-app 中使用](https://ant.design/docs/react/use-with-create-react-app-cn)。 ## 🌍 国际化 diff --git a/README.md b/README.md index cae1958768..18fbbcd8ea 100644 --- a/README.md +++ b/README.md @@ -100,7 +100,7 @@ export default App; ### TypeScript -`antd` is written in TypeScript with complete definitions, check [Use in TypeScript](https://ant.design/docs/react/use-in-typescript) to get started. +`antd` is written in TypeScript with complete definitions, check [Usage with create-react-app](https://ant.design/docs/react/use-with-create-react-app) to get started. ## 🌍 Internationalization diff --git a/components/modal/PurePanel.tsx b/components/modal/PurePanel.tsx index 66ee59fcf2..7abde56479 100644 --- a/components/modal/PurePanel.tsx +++ b/components/modal/PurePanel.tsx @@ -13,8 +13,8 @@ import { Footer, renderCloseIcon } from './shared'; import useStyle from './style'; export interface PurePanelProps - extends Omit, - Pick { + extends Omit, + Pick { prefixCls?: string; style?: React.CSSProperties; } @@ -28,6 +28,7 @@ const PurePanel: React.FC = (props) => { type, title, children, + footer, ...restProps } = props; const { getPrefixCls } = React.useContext(ConfigContext); @@ -60,7 +61,7 @@ const PurePanel: React.FC = (props) => { additionalProps = { closable: closable ?? true, title, - footer: props.footer === undefined ?