fix(components): [notification] custom icon not work (#9498)

element-plus · Aug 28, 2022 · ba15302 · ba15302
1 parent fc7343b
commit ba15302
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/packages/components/notification/__tests__/notification.test.ts b/packages/components/notification/__tests__/notification.test.ts
@@ -39,7 +39,7 @@ describe('Notification.vue', () => {
 
       expect(wrapper.text()).toEqual(AXIOM)
       expect(vm.visible).toBe(true)
-      expect(vm.iconComponent).toBe('')
+      expect(vm.iconComponent).toBeUndefined()
       expect(vm.horizontalClass).toBe('right')
       expect(vm.positionStyle).toEqual({
         top: '0px',

diff --git a/packages/components/notification/src/notification.ts b/packages/components/notification/src/notification.ts
@@ -1,4 +1,4 @@
-import { buildProps, definePropType } from '@element-plus/utils'
+import { buildProps, definePropType, iconPropType } from '@element-plus/utils'
 
 import type { ExtractPropTypes, VNode } from 'vue'
 import type Notification from './notification.vue'
@@ -24,8 +24,7 @@ export const notificationProps = buildProps({
     default: 4500,
   },
   icon: {
-    type: definePropType<string | Comment>([String, Object]),
-    default: '',
+    type: iconPropType,
   },
   id: {
     type: String,

diff --git a/packages/components/notification/src/notification.vue b/packages/components/notification/src/notification.vue
@@ -67,7 +67,7 @@ const typeClass = computed(() => {
 })
 
 const iconComponent = computed(() => {
-  if (!props.type) return ''
+  if (!props.type) return props.icon
   return TypeComponentsMap[props.type] || props.icon
 })