From 1bb20fc607236f5bfa673ef2a01fb5fd29201730 Mon Sep 17 00:00:00 2001 From: chris <kokosias@yahoo.gr> Date: Tue, 20 Oct 2020 16:36:54 +0300 Subject: [PATCH] back space fix --- .../src/components/findAndReplace/FindComponent.js | 10 +++++++++- .../src/ShortCutsService/ShortCuts.js | 3 +-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js b/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js index 32b11ec5a..a65c58cca 100644 --- a/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js +++ b/wax-prosemirror-components/src/components/findAndReplace/FindComponent.js @@ -7,12 +7,14 @@ import React, { useCallback, useEffect, } from 'react'; -import { debounce } from 'lodash'; +import { debounce, each } from 'lodash'; import styled from 'styled-components'; import { grid, th } from '@pubsweet/ui-toolkit'; import { WaxContext } from 'wax-prosemirror-core'; import Icon from '../../helpers/Icon'; +import { selectParentNode } from 'prosemirror-commands'; + const Wrapper = styled.div` width: 400px; background: ${th('colorBackgroundHue')}; @@ -75,8 +77,10 @@ const FindComponent = ({ close, expand, setPreviousSearcValue }) => { const { app, view: { main }, + view, } = useContext(WaxContext); + console.log(view); const { state: { doc, tr }, } = main; @@ -106,6 +110,10 @@ const FindComponent = ({ close, expand, setPreviousSearcValue }) => { const mergedTextNodes = []; let index = 0; + each(view, (singleView, viewId) => { + // console.log(singleView, viewId); + }); + doc.descendants((node, pos) => { if (node.isText) { if (mergedTextNodes[index]) { diff --git a/wax-prosemirror-services/src/ShortCutsService/ShortCuts.js b/wax-prosemirror-services/src/ShortCutsService/ShortCuts.js index 56433e941..87660df9b 100644 --- a/wax-prosemirror-services/src/ShortCutsService/ShortCuts.js +++ b/wax-prosemirror-services/src/ShortCutsService/ShortCuts.js @@ -51,12 +51,11 @@ const backSpaceShortCut = (state, dispatch, view) => { } }); - backSpace( + return backSpace( state, tr => dispatch(tr.setMeta('inputType', 'backwardsDelete')), view, ); - return true; }; const undoShortCut = (state, dispatch, view) => -- GitLab