diff --git a/editors/editoria/src/config/config.js b/editors/editoria/src/config/config.js index de11fc6f46a6ec5a2f9e5542043f261b8cb7bbd2..96bdb592bd41434bc14e2e2eaa262e136d69ae7b 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 28ed6b48bc1c255396240d2abac96c01cc3712ea..7322e4916a73a35ac0b17e8af01f4a789377f98f 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 5871d1f6d83dfd915f70fb9bc00fa7237a1db5ee..f64c6cce56179ab8cd77d4dfe6f0a59168d50000 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 0b40e4c05d5bb1cb45543ad273322a8da681fe9c..688b99c48be71bc57713713641ab2b66fc680ea0 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 135ba97f4677371629429ff6787b60a183bf01c7..730ce240ea205b9d61d533d569dd7459c5a21e6b 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 b7106d2a53790e2823581038edff531e56360b6b..1597c036ca6cb5de83b6fa30d21355073cef2812 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; }