From 36cc0fd97e7bd2dd4de7a937ba918f9fceb646ed Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Fri, 29 Jan 2021 13:14:51 +0200
Subject: [PATCH] temp
---
.../findAndReplace/FindAndReplaceComponent.js | 5 +++
.../findAndReplace/FindComponent.js | 31 +++++++++++++------
2 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceComponent.js b/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceComponent.js
index 5e6e7ebc1..6f85d283c 100644
--- a/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceComponent.js
+++ b/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceComponent.js
@@ -19,6 +19,10 @@ const FindAndReplaceComponent = ({ close }) => {
setMatchCaseOption(matchCase);
};
+ const FindNextMatch = nextMatch => {
+ return nextMatch;
+ };
+
return isExpanded ? (
<ExandedFindAndReplaceComponent
close={close}
@@ -31,6 +35,7 @@ const FindAndReplaceComponent = ({ close }) => {
expand={expand}
setMatchCaseValue={getMatchCaseOption}
setPreviousSearcValue={getNonExpandedText}
+ FindNextMatch={FindNextMatch}
/>
);
};
diff --git a/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js b/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js
index 2ebfd06e6..fe5146619 100644
--- a/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js
+++ b/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js
@@ -101,6 +101,7 @@ const FindComponent = ({
expand,
setPreviousSearcValue,
setMatchCaseValue,
+ FindNextMatch,
}) => {
const { app, view, activeViewId } = useContext(WaxContext);
const searchRef = useRef(null);
@@ -141,20 +142,25 @@ const FindComponent = ({
}
}, [searchValue, delayedSearch, matchCaseSearch, JSON.stringify(allStates)]);
- const searchDocument = () => {
- setCounterText('0 of 0');
- let counter = 0;
- findAndReplacePlugin.props.setSearchText(searchValue);
- findAndReplacePlugin.props.setSearchMatchCase(matchCaseSearch);
- counter = helpers.getMatchesByView(view, searchValue, matchCaseSearch);
+ const setCounterSearches = counter => {
+ if (counter === 0) return setCounterText('0 of 0');
+
const results = helpers.getAllResultsByView(
view,
searchValue,
matchCaseSearch,
);
- if (results.main) {
- }
- if (counter > 0) setCounterText(`1 of ${counter}`);
+
+ setCounterText(`1 of ${counter}`);
+ };
+
+ const searchDocument = () => {
+ let counter = 0;
+ findAndReplacePlugin.props.setSearchText(searchValue);
+ findAndReplacePlugin.props.setSearchMatchCase(matchCaseSearch);
+ counter = helpers.getMatchesByView(view, searchValue, matchCaseSearch);
+
+ setCounterSearches(counter);
if (searchRef.current === document.activeElement) {
eachRight(view, (singleView, viewId) => {
@@ -227,6 +233,7 @@ const FindComponent = ({
lastSelection.from,
resultsFrom[lastActiveViewId],
);
+
const position = resultsFrom[lastActiveViewId].indexOf(found);
/* User selection lesser than found */
if (lastSelection.from < found) {
@@ -359,7 +366,11 @@ const FindComponent = ({
<IconWrapper onClick={findPrevious} role="button" tabIndex="0">
<StyledIcon name="navigatePrevious" />
</IconWrapper>
- <IconWrapper onClick={findNext} role="button" tabIndex="0">
+ <IconWrapper
+ onClick={() => FindNextMatch(findNext())}
+ role="button"
+ tabIndex="0"
+ >
<StyledIcon name="navigateNext" />
</IconWrapper>
--
GitLab