From 153570f145bdd885ae1e1725627bd2259f2c2914 Mon Sep 17 00:00:00 2001 From: Joseph Izang Date: Fri, 28 Oct 2022 00:21:49 +0100 Subject: [PATCH] add custom tooltip to search --- .../search/src/lib/components/Find.tsx | 103 +++++++++++------- .../src/lib/components/FindContainer.tsx | 31 ++++-- .../lib/components/results/ResultFileName.tsx | 17 ++- .../lib/components/results/ResultSummary.tsx | 14 ++- 4 files changed, 103 insertions(+), 62 deletions(-) diff --git a/libs/remix-ui/search/src/lib/components/Find.tsx b/libs/remix-ui/search/src/lib/components/Find.tsx index 284a2d07ba..529cb7667d 100644 --- a/libs/remix-ui/search/src/lib/components/Find.tsx +++ b/libs/remix-ui/search/src/lib/components/Find.tsx @@ -1,3 +1,4 @@ +import { CustomTooltip } from '@remix-ui/helper' import React, { useContext, useEffect, useRef, useState } from 'react' import { SearchContext } from '../context/context' @@ -42,48 +43,66 @@ export const Find = () => { onKeyUp={handleKeypress} >
-
{ - toggleCaseSensitive() - }} - >
-
{ - toggleMatchWholeWord() - }} - >
-
{ - toggleUseRegex() - }} - >
+ +
{ + toggleCaseSensitive() + }} + >
+
+ +
{ + toggleMatchWholeWord() + }} + >
+
+ +
{ + toggleUseRegex() + }} + >
+
diff --git a/libs/remix-ui/search/src/lib/components/FindContainer.tsx b/libs/remix-ui/search/src/lib/components/FindContainer.tsx index 7bd5d5ba1c..ed52d893fd 100644 --- a/libs/remix-ui/search/src/lib/components/FindContainer.tsx +++ b/libs/remix-ui/search/src/lib/components/FindContainer.tsx @@ -1,3 +1,4 @@ +import { CustomTooltip } from '@remix-ui/helper' import React, { useContext, useEffect, useState } from 'react' import { SearchContext } from '../context/context' import { Find } from './Find' @@ -13,18 +14,24 @@ export const FindContainer = props => { }, [expanded]) return (
-
+ +
+
{expanded ? diff --git a/libs/remix-ui/search/src/lib/components/results/ResultFileName.tsx b/libs/remix-ui/search/src/lib/components/results/ResultFileName.tsx index 303e8da21e..333c608a9b 100644 --- a/libs/remix-ui/search/src/lib/components/results/ResultFileName.tsx +++ b/libs/remix-ui/search/src/lib/components/results/ResultFileName.tsx @@ -1,6 +1,6 @@ import React, { useEffect, useState } from 'react' import { SearchResult } from '../../types' -import { getPathIcon } from '@remix-ui/helper' +import { CustomTooltip, getPathIcon } from '@remix-ui/helper' import * as path from 'path' interface ResultItemProps { file: SearchResult @@ -18,10 +18,17 @@ export const ResultFileName = (props: ResultItemProps) => { return ( <> {icon ?
: null} -
- {path.basename(props.file.path)} - {path.dirname(props.file.path)} -
+ +
+ {path.basename(props.file.path)} + {path.dirname(props.file.path)} +
+
) } diff --git a/libs/remix-ui/search/src/lib/components/results/ResultSummary.tsx b/libs/remix-ui/search/src/lib/components/results/ResultSummary.tsx index 0d4a640a04..ad6141ecbc 100644 --- a/libs/remix-ui/search/src/lib/components/results/ResultSummary.tsx +++ b/libs/remix-ui/search/src/lib/components/results/ResultSummary.tsx @@ -1,5 +1,6 @@ import { useDialogDispatchers } from '@remix-ui/app' +import { CustomTooltip } from '@remix-ui/helper' import React, { useContext } from 'react' import { SearchContext } from '../../context/context' import { SearchResult, SearchResultLine, SearchResultLineLine } from '../../types' @@ -53,9 +54,16 @@ export const ResultSummary = (props: ResultSummaryProps) => {
{state.replaceEnabled?
-
{ - replace(lineItem) - }} className="codicon codicon-find-replace" role="button" aria-label="Replace" aria-disabled="false">
+ +
{ + replace(lineItem) + }} className="codicon codicon-find-replace" role="button" aria-label="Replace" aria-disabled="false">
+
:null}
))}