Merge branch 'inline-custom-tags' into 'master'

Inline custom tags

See merge request !239

editors/editoria/src/config/config.js

@@ -59,7 +59,7 @@ const updateTitle = title => {
 };
 
 const saveTags = tags => {
-  console.log(tags);
+  // console.log(tags);
 };
 
 export default {

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 {

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`

wax-prosemirror-components/package.json

@@ -4,7 +4,7 @@
   "version": "0.0.30",
   "description": "Wax prosemirror UI components",
   "license": "MIT",
-  "main": "dist/index.js",
+  "main": "index.js",
   "files": [
     "dist"
   ],

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;
 

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);

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;
   }

wax-prosemirror-core/package.json

@@ -4,7 +4,7 @@
   "version": "0.0.30",
   "description": "Wax prosemirror core",
   "license": "MIT",
-  "main": "dist/index.js",
+  "main": "index.js",
   "files": [
     "dist"
   ],

wax-prosemirror-plugins/package.json

@@ -4,7 +4,7 @@
   "version": "0.0.30",
   "description": "Wax prosemirror plugins",
   "license": "MIT",
-  "main": "dist/index.js",
+  "main": "index.js",
   "files": [
     "dist"
   ],

wax-prosemirror-schema/package.json

@@ -4,7 +4,7 @@
   "version": "0.0.30",
   "description": "Wax prosemirror schema",
   "license": "MIT",
-  "main": "dist/index.js",
+  "main": "index.js",
   "files": [
     "dist"
   ],

wax-prosemirror-services/package.json

@@ -4,7 +4,7 @@
   "version": "0.0.30",
   "description": "Wax prosemirror services",
   "license": "MIT",
-  "main": "dist/index.js",
+  "main": "index.js",
   "files": [
     "dist"
   ],

wax-prosemirror-utilities/package.json

@@ -4,7 +4,7 @@
   "version": "0.0.30",
   "description": "Wax prosemirror utilities",
   "license": "MIT",
-  "main": "dist/index.js",
+  "main": "index.js",
   "files": [
     "dist"
   ],