From 7bfe6b6be0599cc850ca500b52b976b1644a85fd Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Wed, 13 Dec 2023 12:18:44 +0200
Subject: [PATCH] focus back to surface for find-replace/special char
---
.../FindAndReplaceService/components/FindAndReplaceTool.js | 7 ++++++-
.../components/SpecialCharactersTool.js | 5 ++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/wax-prosemirror-services/src/FindAndReplaceService/components/FindAndReplaceTool.js b/wax-prosemirror-services/src/FindAndReplaceService/components/FindAndReplaceTool.js
index da57e23fc..986968f53 100644
--- a/wax-prosemirror-services/src/FindAndReplaceService/components/FindAndReplaceTool.js
+++ b/wax-prosemirror-services/src/FindAndReplaceService/components/FindAndReplaceTool.js
@@ -12,6 +12,7 @@ import styled from 'styled-components';
import { grid, override } from '@pubsweet/ui-toolkit';
import { WaxContext, MenuButton } from 'wax-prosemirror-core';
import FindAndReplaceComponent from './FindAndReplaceComponent';
+import epigraphPoetry from '../../TrackChangeService/schema/trackChangesNodes/epigraphPoetryTrackNode';
const Wrapper = styled.div`
font-size: 0;
@@ -30,6 +31,7 @@ const DropWrapper = styled.div`
const FindAndReplaceTool = ({ item }) => {
const { t, i18n } = useTranslation();
const {
+ activeView,
pmViews: { main },
} = useContext(WaxContext);
@@ -77,8 +79,10 @@ const FindAndReplaceTool = ({ item }) => {
active={isOpen}
disabled={false}
iconName={icon}
- onMouseDown={() => {
+ onMouseDown={e => {
+ e.preventDefault();
setIsOpen(!isOpen);
+ activeView.focus();
}}
title={
!isEmpty(i18n) && i18n.exists(`Wax.FindAndReplace.${title}`)
@@ -92,6 +96,7 @@ const FindAndReplaceTool = ({ item }) => {
<FindAndReplaceComponent
close={() => {
setIsOpen(false);
+ activeView.focus();
}}
/>
</DropWrapper>
diff --git a/wax-prosemirror-services/src/SpecialCharactersService/components/SpecialCharactersTool.js b/wax-prosemirror-services/src/SpecialCharactersService/components/SpecialCharactersTool.js
index 04b4299c3..6fb440fb5 100644
--- a/wax-prosemirror-services/src/SpecialCharactersService/components/SpecialCharactersTool.js
+++ b/wax-prosemirror-services/src/SpecialCharactersService/components/SpecialCharactersTool.js
@@ -28,6 +28,7 @@ const DropWrapper = styled.div`
const SpecialCharactersTool = ({ item }) => {
const { t, i18n } = useTranslation();
const {
+ activeView,
pmViews: { main },
} = useContext(WaxContext);
@@ -50,8 +51,10 @@ const SpecialCharactersTool = ({ item }) => {
active={isOpen}
disabled={isDisabled}
iconName={icon}
- onMouseDown={() => {
+ onMouseDown={e => {
+ e.preventDefault();
setIsOpen(!isOpen);
+ activeView.focus();
}}
title={
!isEmpty(i18n) && i18n.exists(`Wax.SpecialCharacters.${title}`)
--
GitLab