fix: notification from useApp should consume App config (ant-design#4…

…9339) * feat: notfication use global showProgress, pauseOnHover config * fix: notification not inherit app config
madocto · Jun 11, 2024 · bcd6670 · bcd6670
1 parent 50a5bf6
commit bcd6670
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/components/notification/index.tsx b/components/notification/index.tsx
@@ -34,10 +34,10 @@ let taskQueue: Task[] = [];
 let defaultGlobalConfig: GlobalConfigProps = {};
 
 function getGlobalContext() {
-  const { getContainer, rtl, maxCount, top, bottom } = defaultGlobalConfig;
+  const { getContainer, rtl, maxCount, top, bottom, showProgress, pauseOnHover } = defaultGlobalConfig;
   const mergedContainer = getContainer?.() || document.body;
 
-  return { getContainer: () => mergedContainer, rtl, maxCount, top, bottom };
+  return { getContainer: () => mergedContainer, rtl, maxCount, top, bottom, showProgress, pauseOnHover };
 }
 
 interface GlobalHolderRef {

diff --git a/components/notification/useNotification.tsx b/components/notification/useNotification.tsx
@@ -65,6 +65,8 @@ const Holder = React.forwardRef<HolderRef, HolderProps>((props, ref) => {
     onAllRemoved,
     stack,
     duration,
+    pauseOnHover = true,
+    showProgress,
   } = props;
   const { getPrefixCls, getPopupContainer, notification, direction } = useContext(ConfigContext);
   const [, token] = useToken();
@@ -89,9 +91,10 @@ const Holder = React.forwardRef<HolderRef, HolderProps>((props, ref) => {
     closable: true,
     closeIcon: getCloseIcon(prefixCls),
     duration: duration ?? DEFAULT_DURATION,
-    pauseOnHover: true,
     getContainer: () => staticGetContainer?.() || getPopupContainer?.() || document.body,
     maxCount,
+    pauseOnHover,
+    showProgress,
     onAllRemoved,
     renderNotifications,
     stack: