Skip to content

Commit 67479e5

Browse files
fix(orga): replaced deprecated component by PixTooltip and aligned tooltip left, made it inline
1 parent 818ff4c commit 67479e5

File tree

3 files changed

+23
-12
lines changed

3 files changed

+23
-12
lines changed

Diff for: orga/app/components/campaign/results/assessment-list.gjs

+1-1
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ import ParticipationEvolutionIcon from './participation-evolution-icon';
9393
{{#if @campaign.multipleSendings}}
9494
<PixTableColumn @context={{context}}>
9595
<:header>
96-
<EvolutionHeader @tooltipContent={{t "pages.campaign-results.table.evolution-tooltip.content"}} />
96+
<EvolutionHeader />
9797
</:header>
9898
<:cell>
9999
<ParticipationEvolutionIcon @evolution={{participation.evolution}} />
+17-10
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,24 @@
1+
import PixIcon from '@1024pix/pix-ui/components/pix-icon';
2+
import PixTooltip from '@1024pix/pix-ui/components/pix-tooltip';
13
import { t } from 'ember-intl';
24

3-
import TooltipWithIcon from '../../ui/tooltip-with-icon';
4-
55
<template>
66
<span class="evolution-header">
7-
87
{{t "pages.campaign-results.table.column.evolution"}}
9-
10-
<TooltipWithIcon
11-
@iconName="help"
12-
@content={{@tooltipContent}}
13-
@ariaHiddenIcon={{true}}
14-
class="tooltip-with-icon-small"
15-
/>
8+
<PixTooltip @id="evolution-tooltip" @position="left" @isInline={{true}}>
9+
<:triggerElement>
10+
<PixIcon
11+
@name="help"
12+
@plainIcon={{true}}
13+
aria-hidden="true"
14+
tabindex="0"
15+
aria-label={{t "components.certificability-tooltip.aria-label"}}
16+
aria-describedby="evolution-tooltip"
17+
/>
18+
</:triggerElement>
19+
<:tooltip>
20+
{{t "pages.campaign-results.table.evolution-tooltip.content"}}
21+
</:tooltip>
22+
</PixTooltip>
1623
</span>
1724
</template>

Diff for: orga/app/components/certificability/tooltip.gjs

+5-1
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,13 @@ export default class Tooltip extends Component {
1616
return this.intl.t('components.certificability-tooltip.from-collect-notice');
1717
}
1818

19+
get position() {
20+
return this.args.position ? this.args.position : 'bottom-left';
21+
}
22+
1923
<template>
2024
<div class="certificability-tooltip">
21-
<PixTooltip @id="column-is-certifiable-informations" @position="top-left" @isWide={{true}}>
25+
<PixTooltip @id="column-is-certifiable-informations" @position={{this.position}} @isWide={{true}}>
2226
<:triggerElement>
2327
<PixIcon
2428
@name="help"

0 commit comments

Comments
 (0)