Skip to content

Commit 15ae915

Browse files
committed
custom tooltip instead of overlayTrigger
1 parent 2671ab0 commit 15ae915

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

apps/learneth/src/components/BackButton/index.tsx

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React, {useState} from 'react'
22
import {Link, useLocation, useNavigate} from 'react-router-dom'
3-
import {Button, Modal, Tooltip, OverlayTrigger} from 'react-bootstrap'
3+
import {Button, Modal } from 'react-bootstrap'
4+
import { CustomTooltip } from "@remix-ui/helper"
45
import './index.scss'
56

67
function BackButton({entity}: any) {
@@ -24,18 +25,22 @@ function BackButton({entity}: any) {
2425
}}
2526
role="button"
2627
>
27-
<OverlayTrigger placement="right" overlay={<Tooltip id="tooltip-right">Leave tutorial</Tooltip>}>
28+
<CustomTooltip
29+
placement={"right"}
30+
tooltipId="learnethHomeIconTooltip"
31+
tooltipText='Leave tutorial'
32+
>
2833
<i className="fas fa-home ps-1" />
29-
</OverlayTrigger>
34+
</CustomTooltip>
3035
</div>
3136
</li>
3237
{isDetailPage && (
3338
<li className="nav-item">
34-
<OverlayTrigger placement="right" overlay={<Tooltip id="tooltip-rightTutorialMenu">Tutorial menu</Tooltip>}>
39+
<CustomTooltip placement="right" tooltipId="learnethBarsIconTooltip" tooltipText='Tutorial menu'>
3540
<Link className="btn" to={`/list?id=${entity.id}`} onClick={() => (window as any)._paq.push(['trackEvent', 'learneth', 'back_to_menu_step', entity && entity.name])}>
3641
<i className="fas fa-bars" />
3742
</Link>
38-
</OverlayTrigger>
43+
</CustomTooltip>
3944
</li>
4045
)}
4146
</ul>
@@ -49,7 +54,7 @@ function BackButton({entity}: any) {
4954
{stepId + 1}/{entity && <div className="">{entity.steps.length}</div>}
5055
{stepId < entity.steps.length - 1 && (
5156
<Link to={`/detail?id=${entity.id}&stepId=${stepId + 1}`} onClick={() => (window as any)._paq.push(['trackEvent', 'learneth', 'next_step', `${entity.name}/${nextStep && nextStep.name}`])} >
52-
<i className="fas fa-chevron-right ps-1" />
57+
<i className="fas fa-chevron-right ps-1 pe-1" />
5358
</Link>
5459
)}
5560
</form>

apps/learneth/src/components/RepoImporter/index.tsx

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import React, { useState, useEffect } from 'react'
2-
import { Button, Dropdown, Form, Tooltip, OverlayTrigger } from 'react-bootstrap'
2+
import { Button, Dropdown, Form } from 'react-bootstrap'
3+
import { CustomTooltip } from "@remix-ui/helper"
34
import { useAppDispatch, useAppSelector } from '../../redux/hooks'
45
import './index.css'
56

@@ -85,9 +86,9 @@ function RepoImporter({ list, selectedRepo }: any): JSX.Element {
8586
<Form.Label className="me-2" htmlFor="name">
8687
REPO
8788
</Form.Label>
88-
<OverlayTrigger placement="right" overlay={<Tooltip id="tooltip-right">ie username/repository</Tooltip>}>
89+
<CustomTooltip placement="right" tooltipId="learnethQuestionIconTooltip" tooltipText='i.e. username/repository'>
8990
<i className="fas fa-question-circle" />
90-
</OverlayTrigger>
91+
</CustomTooltip>
9192
<Form.Control
9293
id="name"
9394
required

0 commit comments

Comments
 (0)