From b397bead4043bdf9c3f66a877b0f504e3658f077 Mon Sep 17 00:00:00 2001 From: chris <kokosias@yahoo.gr> Date: Fri, 12 Mar 2021 10:33:22 +0200 Subject: [PATCH] fix replace all --- ...Component.js => ExpandedFindAndReplaceComponent.js} | 10 +++++++--- .../findAndReplace/FindAndReplaceComponent.js | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) rename wax-prosemirror-components/src/components/findAndReplace/{ExandedFindAndReplaceComponent.js => ExpandedFindAndReplaceComponent.js} (96%) diff --git a/wax-prosemirror-components/src/components/findAndReplace/ExandedFindAndReplaceComponent.js b/wax-prosemirror-components/src/components/findAndReplace/ExpandedFindAndReplaceComponent.js similarity index 96% rename from wax-prosemirror-components/src/components/findAndReplace/ExandedFindAndReplaceComponent.js rename to wax-prosemirror-components/src/components/findAndReplace/ExpandedFindAndReplaceComponent.js index 3455807ed..6c499c69b 100644 --- a/wax-prosemirror-components/src/components/findAndReplace/ExandedFindAndReplaceComponent.js +++ b/wax-prosemirror-components/src/components/findAndReplace/ExpandedFindAndReplaceComponent.js @@ -8,6 +8,7 @@ import React, { } from 'react'; import { each, eachRight, debounce } from 'lodash'; import { WaxContext } from 'wax-prosemirror-core'; +import { DocumentHelpers } from 'wax-prosemirror-utilities'; import styled from 'styled-components'; import { grid, th } from '@pubsweet/ui-toolkit'; import Icon from '../../helpers/Icon'; @@ -137,7 +138,7 @@ const PreviousNextButton = styled.span` } `; -const ExandedFindAndReplaceComponent = ({ +const ExpandedFindAndReplaceComponent = ({ close, findNextMatch, findPreviousMatch, @@ -255,7 +256,10 @@ const ExandedFindAndReplaceComponent = ({ const replaceAll = () => { each(view, (singleView, viewId) => { - const results = helpers.findMatches(singleView.state.doc, searchValue); + const results = DocumentHelpers.findMatches( + singleView.state.doc, + searchValue, + ); const { state: { tr }, } = singleView; @@ -340,4 +344,4 @@ const ExandedFindAndReplaceComponent = ({ ); }; -export default ExandedFindAndReplaceComponent; +export default ExpandedFindAndReplaceComponent; diff --git a/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceComponent.js b/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceComponent.js index 25a981d5f..c18dd56ce 100644 --- a/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceComponent.js +++ b/wax-prosemirror-components/src/components/findAndReplace/FindAndReplaceComponent.js @@ -3,7 +3,7 @@ import React, { useState, useContext, useEffect } from 'react'; import { TextSelection } from 'prosemirror-state'; import { WaxContext } from 'wax-prosemirror-core'; import FindComponent from './FindComponent'; -import ExandedFindAndReplaceComponent from './ExandedFindAndReplaceComponent'; +import ExpandedFindAndReplaceComponent from './ExpandedFindAndReplaceComponent'; import helpers from './helpers'; let lastActiveViewId; @@ -228,7 +228,7 @@ const FindAndReplaceComponent = ({ close }) => { }; return isExpanded ? ( - <ExandedFindAndReplaceComponent + <ExpandedFindAndReplaceComponent close={close} findNextMatch={findNextMatch} findPreviousMatch={findPreviousMatch} -- GitLab