From 78c6658e8b6cf4e6c82bf601ec897af93df7b9f3 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Sat, 19 Nov 2022 14:29:38 +0200
Subject: [PATCH] fullscreen
---
wax-prosemirror-components/index.js | 1 -
.../src/components/TitleButton.js | 2 +-
.../src/FullScreenService/FullScreenTool.js | 4 ++--
.../FullScreenService/components/FullScreenButton.js | 10 +++++-----
4 files changed, 8 insertions(+), 9 deletions(-)
rename wax-prosemirror-components/src/components/various/FullScreen.js => wax-prosemirror-services/src/FullScreenService/components/FullScreenButton.js (82%)
diff --git a/wax-prosemirror-components/index.js b/wax-prosemirror-components/index.js
index 1d983a0b3..0160177fa 100644
--- a/wax-prosemirror-components/index.js
+++ b/wax-prosemirror-components/index.js
@@ -15,7 +15,6 @@ export { default as TrackChangeEnable } from './src/components/trackChanges/Trac
export { default as CreateTable } from './src/components/tables/CreateTable';
export { default as Tabs } from './src/ui/tabs/Tabs';
export { default as BlockLevelTools } from './src/ui/tabs/BlockLevelTools';
-export { default as FullScreen } from './src/components/various/FullScreen';
export { default as LeftSideButton } from './src/components/various/LeftSideButton';
export { default as SpecialCharactersTool } from './src/components/specialCharacters/SpecialCharactersTool';
export { default as TextHighlightingTool } from './src/components/textHighlight/TextHighlightingTool';
diff --git a/wax-prosemirror-components/src/components/TitleButton.js b/wax-prosemirror-components/src/components/TitleButton.js
index ef271206f..946c777eb 100644
--- a/wax-prosemirror-components/src/components/TitleButton.js
+++ b/wax-prosemirror-components/src/components/TitleButton.js
@@ -21,7 +21,7 @@ const TitleButton = ({ view = {}, item }) => {
true,
);
- const handleMouseDown = (e, editorState, editorDispatch) => {
+ const handleMouseDown = (e, editorState) => {
e.preventDefault();
run(editorState, dispatch);
};
diff --git a/wax-prosemirror-services/src/FullScreenService/FullScreenTool.js b/wax-prosemirror-services/src/FullScreenService/FullScreenTool.js
index e26eaf75d..a722c60db 100644
--- a/wax-prosemirror-services/src/FullScreenService/FullScreenTool.js
+++ b/wax-prosemirror-services/src/FullScreenService/FullScreenTool.js
@@ -1,8 +1,8 @@
import React from 'react';
import { isEmpty } from 'lodash';
import { injectable } from 'inversify';
-import { FullScreen } from 'wax-prosemirror-components';
import { Tools } from 'wax-prosemirror-core';
+import FullScreenButton from './components/FullScreenButton';
@injectable()
export default class FullScreenTool extends Tools {
@@ -28,7 +28,7 @@ export default class FullScreenTool extends Tools {
if (isEmpty(view)) return null;
// eslint-disable-next-line no-underscore-dangle
return this._isDisplayed ? (
- <FullScreen item={this.toJSON()} key="FullScreen" view={view} />
+ <FullScreenButton item={this.toJSON()} key="FullScreen" view={view} />
) : null;
}
}
diff --git a/wax-prosemirror-components/src/components/various/FullScreen.js b/wax-prosemirror-services/src/FullScreenService/components/FullScreenButton.js
similarity index 82%
rename from wax-prosemirror-components/src/components/various/FullScreen.js
rename to wax-prosemirror-services/src/FullScreenService/components/FullScreenButton.js
index 2615a2a3b..f6bee8079 100644
--- a/wax-prosemirror-components/src/components/various/FullScreen.js
+++ b/wax-prosemirror-services/src/FullScreenService/components/FullScreenButton.js
@@ -3,9 +3,9 @@
import React, { useContext, useMemo } from 'react';
import { TextSelection } from 'prosemirror-state';
import { WaxContext } from 'wax-prosemirror-core';
-import MenuButton from '../../ui/buttons/MenuButton';
+import { MenuButton } from 'wax-prosemirror-components';
-const Button = ({ view = {}, item }) => {
+const FullScreenButton = ({ view = {}, item }) => {
const { active, icon, label, select, title } = item;
const context = useContext(WaxContext);
@@ -13,7 +13,7 @@ const Button = ({ view = {}, item }) => {
const { state } = view;
- const handleMouseDown = (e, editorState, editorDispatch) => {
+ const handleMouseDown = e => {
e.preventDefault();
Object.assign(options, { fullScreen: !options.fullScreen });
activeView.dispatch(
@@ -39,7 +39,7 @@ const Button = ({ view = {}, item }) => {
disabled={false}
iconName={usedIcon}
label={label}
- onMouseDown={e => handleMouseDown(e, view.state, view.dispatch)}
+ onMouseDown={e => handleMouseDown(e)}
title={title}
/>
),
@@ -49,4 +49,4 @@ const Button = ({ view = {}, item }) => {
return MenuButtonComponent;
};
-export default Button;
+export default FullScreenButton;
--
GitLab