mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-12-04 00:49:39 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

refactor(notification): reduce the configuration parameter code (#44372)

Browse Source 
* refactor(notification): reduce the configuration parameter code

* chore: modify the return type definition

* chore: delete the initialization function
This commit is contained in:
JiaQi 2023-08-25 09:37:32 +08:00 committed by GitHub
parent 34054509d5
commit d7d493eaaa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
components/message/index.tsx
View File

@ -1,9 +1,9 @@
'use client';
import { render } from 'rc-util/lib/React/render';
import * as React from 'react';
import { render } from 'rc-util/lib/React/render';
import ConfigProvider, { globalConfig, warnContext } from '../config-provider';
import PurePanel from './PurePanel';
import type {
ArgsProps,
ConfigOptions,
@ -12,6 +12,7 @@ import type {
NoticeType,
TypeOpen,
} from './interface';
import PurePanel from './PurePanel';
import useMessage, { useInternalMessage } from './useMessage';
import { wrapPromiseFn } from './util';
@ -70,7 +71,7 @@ function getGlobalContext() {
return {
prefixCls: mergedPrefixCls,
container: mergedContainer,
getContainer: () => mergedContainer!,
duration,
rtl,
maxCount,
@ -84,20 +85,7 @@ interface GlobalHolderRef {
}
const GlobalHolder = React.forwardRef<GlobalHolderRef, {}>((_, ref) => {
const initializeMessageConfig: () => ConfigOptions = () => {
const { prefixCls, container, maxCount, duration, rtl, top } = getGlobalContext();
return {
prefixCls,
getContainer: () => container!,
maxCount,
duration,
rtl,
top,
};
};
const [messageConfig, setMessageConfig] = React.useState<ConfigOptions>(initializeMessageConfig);
const [messageConfig, setMessageConfig] = React.useState<ConfigOptions>(getGlobalContext);
const [api, holder] = useInternalMessage(messageConfig);
@ -107,7 +95,7 @@ const GlobalHolder = React.forwardRef<GlobalHolderRef, {}>((_, ref) => {
const theme = global.getTheme();
const sync = () => {
setMessageConfig(initializeMessageConfig);
setMessageConfig(getGlobalContext);
};
React.useEffect(sync, []);

40
components/notification/index.tsx
View File

@ -1,10 +1,11 @@
'use client';
import { render } from 'rc-util/lib/React/render';
import * as React from 'react';
import { render } from 'rc-util/lib/React/render';
import ConfigProvider, { globalConfig, warnContext } from '../config-provider';
import PurePanel from './PurePanel';
import type { ArgsProps, GlobalConfigProps, NotificationInstance } from './interface';
import PurePanel from './PurePanel';
import useNotification, { useInternalNotification } from './useNotification';
let notification: GlobalNotification | null = null;
@ -45,7 +46,7 @@ function getGlobalContext() {
return {
prefixCls: mergedPrefixCls,
container: mergedContainer,
getContainer: () => mergedContainer!,
rtl,
maxCount,
top,
@ -59,21 +60,10 @@ interface GlobalHolderRef {
}
const GlobalHolder = React.forwardRef<GlobalHolderRef, {}>((_, ref) => {
const [prefixCls, setPrefixCls] = React.useState<string>();
const [container, setContainer] = React.useState<HTMLElement | ShadowRoot>();
const [maxCount, setMaxCount] = React.useState<number>();
const [rtl, setRTL] = React.useState<boolean>();
const [top, setTop] = React.useState<number>();
const [bottom, setBottom] = React.useState<number>();
const [notificationConfig, setNotificationConfig] =
React.useState<GlobalConfigProps>(getGlobalContext);
const [api, holder] = useInternalNotification({
prefixCls,
getContainer: () => container!,
maxCount,
rtl,
top,
bottom,
});
const [api, holder] = useInternalNotification(notificationConfig);
const global = globalConfig();
const rootPrefixCls = global.getRootPrefixCls();
@ -81,21 +71,7 @@ const GlobalHolder = React.forwardRef<GlobalHolderRef, {}>((_, ref) => {
const theme = global.getTheme();
const sync = () => {
const {
prefixCls: nextGlobalPrefixCls,
container: nextGlobalContainer,
maxCount: nextGlobalMaxCount,
rtl: nextGlobalRTL,
top: nextTop,
bottom: nextBottom,
} = getGlobalContext();
setPrefixCls(nextGlobalPrefixCls);
setContainer(nextGlobalContainer);
setMaxCount(nextGlobalMaxCount);
setRTL(nextGlobalRTL);
setTop(nextTop);
setBottom(nextBottom);
setNotificationConfig(getGlobalContext);
};
React.useEffect(sync, []);