diff --git a/ui/core/components/item_notice/item_notice.tsx b/ui/core/components/item_notice/item_notice.tsx index d6a75a2a2e..dfde18f340 100644 --- a/ui/core/components/item_notice/item_notice.tsx +++ b/ui/core/components/item_notice/item_notice.tsx @@ -50,25 +50,31 @@ export class ItemNotice extends Component { private get noticeContent() { if (!this.hasNotice) return null; const itemNotice = ITEM_NOTICES.get(this.itemId)!; - const specNotice = ( - <> - {itemNotice?.[this.player.getSpec()]} - {this.additionalNoticeData} - - ); - - return typeof specNotice === 'boolean' ? null : specNotice || itemNotice?.[Spec.SpecUnknown]; + const genericSpecItemNotice = itemNotice?.[Spec.SpecUnknown]; + const playerSpecItemNotice = itemNotice?.[this.player.getSpec()]; + + const specNotices = []; + + if (playerSpecItemNotice) { + specNotices.push(playerSpecItemNotice?.cloneNode(true)); + } else if (genericSpecItemNotice) { + specNotices.push(genericSpecItemNotice?.cloneNode(true)); + } + + if (this.additionalNoticeData) specNotices.push(this.additionalNoticeData.cloneNode(true)); + + return !specNotices.length ? null : <>{specNotices.map(notice => notice)}; } private get template() { if (!this.hasNotice) return null; - const tooltipContent = this.noticeContent?.cloneNode(true); + const tooltipContent = this.noticeContent; if (!tooltipContent) return null; const noticeIconRef = ref(); const template = ; this.tooltip = tippy(noticeIconRef.value!, { - content: tooltipContent.cloneNode(true) as HTMLElement, + content: tooltipContent, }); return template; diff --git a/ui/core/constants/item_notices.tsx b/ui/core/constants/item_notices.tsx index d38d70d52e..d80d6a7e67 100644 --- a/ui/core/constants/item_notices.tsx +++ b/ui/core/constants/item_notices.tsx @@ -154,7 +154,7 @@ export const ITEM_NOTICES = new Map([ [ 71086, { - [Spec.SpecUnknown]:

This item is unsupported for this spec.

, + [Spec.SpecUnknown]:

This item is unsupported for this spec.

, [Spec.SpecBalanceDruid]: DTR_FIRST_IMPLEMENTATION_WARNING, [Spec.SpecArcaneMage]: DTR_FIRST_IMPLEMENTATION_WARNING, [Spec.SpecFireMage]: DTR_FIRST_IMPLEMENTATION_WARNING,