From 8cbda913de13ed88ae8b47aa4a210862f83950ab Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Thu, 11 Feb 2021 20:52:03 +0200
Subject: [PATCH] fixes
---
editors/editoria/src/config/config.js | 2 +-
editors/editoria/src/layout/EditorElements.js | 7 +++++--
editors/editoria/src/layout/EditoriaLayout.js | 4 ++--
.../src/components/customtag/CustomTagBlockComponent.js | 2 +-
.../customtag/CustomTagInlineOverlayCompoment.js | 2 +-
wax-prosemirror-components/src/ui/tabs/BlockLevelTools.js | 3 ++-
6 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/editors/editoria/src/config/config.js b/editors/editoria/src/config/config.js
index de11fc6f4..96bdb592b 100644
--- a/editors/editoria/src/config/config.js
+++ b/editors/editoria/src/config/config.js
@@ -59,7 +59,7 @@ const updateTitle = title => {
};
const saveTags = tags => {
- console.log(tags);
+ // console.log(tags);
};
export default {
diff --git a/editors/editoria/src/layout/EditorElements.js b/editors/editoria/src/layout/EditorElements.js
index 28ed6b48b..7322e4916 100644
--- a/editors/editoria/src/layout/EditorElements.js
+++ b/editors/editoria/src/layout/EditorElements.js
@@ -27,7 +27,10 @@ export default css`
h1 span::selection,
h2 span::selection,
h3 span::selection,
- code span::selection {
+ h4 span::selection,
+ code span::selection,
+ custom-tag-block::selection,
+ custom-tag-inline::selection {
background-color: transparent;
}
@@ -42,8 +45,8 @@ export default css`
}
div[contenteditable='false'] {
- user-select: none;
pointer-events: none;
+ user-select: none;
}
/* .ProseMirror title {
diff --git a/editors/editoria/src/layout/EditoriaLayout.js b/editors/editoria/src/layout/EditoriaLayout.js
index 5871d1f6d..f64c6cce5 100644
--- a/editors/editoria/src/layout/EditoriaLayout.js
+++ b/editors/editoria/src/layout/EditoriaLayout.js
@@ -79,7 +79,7 @@ const SideMenu = styled.div`
background: ${th('colorBackgroundToolBar')}
border-right: ${th('borderWidth')} ${th('borderStyle')} ${th('colorBorder')};
min-width: 250px;
- height: 100%;
+ height: 81%;
`;
const EditorArea = styled.div`
@@ -129,7 +129,7 @@ const CommentTrackToolsContainer = styled.div`
right: 30px;
z-index: 1;
background: white;
- padding-left: 5%;
+ width: 25%;
`;
const CommentTrackTools = styled.div`
diff --git a/wax-prosemirror-components/src/components/customtag/CustomTagBlockComponent.js b/wax-prosemirror-components/src/components/customtag/CustomTagBlockComponent.js
index 0b40e4c05..688b99c48 100644
--- a/wax-prosemirror-components/src/components/customtag/CustomTagBlockComponent.js
+++ b/wax-prosemirror-components/src/components/customtag/CustomTagBlockComponent.js
@@ -82,7 +82,7 @@ const CustomTagBlockComponent = ({ isShowTag, item }) => {
: initialArr;
const saveTags =
- customTagsConfig && customTagsConfig.tags
+ customTagsConfig && customTagsConfig.updateTags
? customTagsConfig.updateTags
: () => true;
diff --git a/wax-prosemirror-components/src/components/customtag/CustomTagInlineOverlayCompoment.js b/wax-prosemirror-components/src/components/customtag/CustomTagInlineOverlayCompoment.js
index 135ba97f4..730ce240e 100644
--- a/wax-prosemirror-components/src/components/customtag/CustomTagInlineOverlayCompoment.js
+++ b/wax-prosemirror-components/src/components/customtag/CustomTagInlineOverlayCompoment.js
@@ -101,7 +101,7 @@ const CustomTagInlineOverlayComponent = ({ mark, setPosition, position }) => {
? customTagsConfig.tags
: initialArr;
const saveTags =
- customTagsConfig && customTagsConfig.tags
+ customTagsConfig && customTagsConfig.updateTags
? customTagsConfig.updateTags
: () => true;
const [allTags, setAllTags] = useState(configTags);
diff --git a/wax-prosemirror-components/src/ui/tabs/BlockLevelTools.js b/wax-prosemirror-components/src/ui/tabs/BlockLevelTools.js
index b7106d2a5..1597c036c 100644
--- a/wax-prosemirror-components/src/ui/tabs/BlockLevelTools.js
+++ b/wax-prosemirror-components/src/ui/tabs/BlockLevelTools.js
@@ -5,8 +5,9 @@ import styled from 'styled-components';
import BlockElementGroup from './BlockElementGroup';
const Wrapper = styled.div`
+ height: 100%;
+ overflow-y: auto;
padding: 8px;
-
> div:not(:last-child) {
margin-bottom: 10px;
}
--
GitLab