File tree Expand file tree Collapse file tree 2 files changed +8
-14
lines changed Expand file tree Collapse file tree 2 files changed +8
-14
lines changed Original file line number Diff line number Diff line change @@ -43,10 +43,9 @@ const SearchComponent = ({
43
43
} , [ isOpen ] ) ;
44
44
45
45
useEffect ( ( ) => {
46
- if ( search ) {
47
- setIndex ( 0 ) ;
48
- onSearch ?.( search ) ;
49
- }
46
+ setIndex ( 0 ) ;
47
+ setNumResults ( 0 ) ;
48
+ onSearch ?.( search ) ;
50
49
} , [ search ] ) ;
51
50
52
51
const middleware : Middleware [ ] = [ ] ;
Original file line number Diff line number Diff line change @@ -546,7 +546,11 @@ const WebView = memo(({ model, onFailLoad }: WebViewProps) => {
546
546
const setNumSearchResults = useSetAtom ( searchProps . numResultsAtom ) ;
547
547
const onSearch = useCallback ( ( search : string ) => {
548
548
try {
549
- model . webviewRef . current ?. findInPage ( search ) ;
549
+ if ( search ) {
550
+ model . webviewRef . current ?. findInPage ( search ) ;
551
+ } else {
552
+ model . webviewRef . current ?. stopFindInPage ( "clearSelection" ) ;
553
+ }
550
554
} catch ( e ) {
551
555
console . error ( "Failed to search" , e ) ;
552
556
}
@@ -574,15 +578,6 @@ const WebView = memo(({ model, onFailLoad }: WebViewProps) => {
574
578
setNumSearchResults ( result . matches ) ;
575
579
setSearchIndex ( result . activeMatchOrdinal - 1 ) ;
576
580
} , [ ] ) ;
577
- useEffect ( ( ) => {
578
- if ( ! isSearchOpen ) {
579
- try {
580
- model . webviewRef . current ?. stopFindInPage ( "clearSelection" ) ;
581
- } catch ( e ) {
582
- console . error ( "Failed to stop find in page" , e ) ;
583
- }
584
- }
585
- } , [ isSearchOpen ] ) ;
586
581
// End Search
587
582
588
583
// The initial value of the block metadata URL when the component first renders. Used to set the starting src value for the webview.
You can’t perform that action at this time.
0 commit comments