diff --git a/editors/editoria/src/Editoria.js b/editors/editoria/src/Editoria.js
index 43ea1150a0f0ddd92659106e25a0b5025cb355b7..e7b51cea453085c9ac746cb67af35e0bfb83900c 100644
--- a/editors/editoria/src/Editoria.js
+++ b/editors/editoria/src/Editoria.js
@@ -47,7 +47,7 @@ const Editoria = () => (
// value={`<p class="paragraph">This is the first paragraph</p><p class="paragraph">This is the second paragraph</p><p class="author">This is an author</p>`}
layout={EditoriaLayout}
// debug
- onChange={source => console.log(source)}
+ // onChange={source => console.log(source)}
user={user}
/>
</Fragment>
diff --git a/wax-prosemirror-components/package.json b/wax-prosemirror-components/package.json
index 8c931f8a292d8d17c6f114495bf65b498fd93e18..72f5ec582a8ae451b4cf838e84e28aca8e79bb2f 100644
--- a/wax-prosemirror-components/package.json
+++ b/wax-prosemirror-components/package.json
@@ -4,7 +4,7 @@
"version": "0.0.20",
"description": "Wax prosemirror UI components",
"license": "MIT",
- "main": "dist/index.js",
+ "main": "index.js",
"files": [
"dist"
],
diff --git a/wax-prosemirror-components/src/components/Button.js b/wax-prosemirror-components/src/components/Button.js
index cf7004cd11dfd222e71a957eded71a980a98d4e8..6817892542777b3758a8687da0cff1a1ca86dd9e 100644
--- a/wax-prosemirror-components/src/components/Button.js
+++ b/wax-prosemirror-components/src/components/Button.js
@@ -28,7 +28,7 @@ const Button = ({ view = {}, item }) => {
return (
<MenuButton
- active={isActive}
+ active={isActive || false}
disabled={isDisabled}
iconName={icon}
label={label}
diff --git a/wax-prosemirror-components/src/components/comments/ConnectedComment.js b/wax-prosemirror-components/src/components/comments/ConnectedComment.js
index 3a3e4e5341b354e599b9abd2b4459b0d7416e24d..998aae93ed85789e41b29032893621e23d9fd897 100644
--- a/wax-prosemirror-components/src/components/comments/ConnectedComment.js
+++ b/wax-prosemirror-components/src/components/comments/ConnectedComment.js
@@ -112,6 +112,7 @@ export default ({ comment, top, commentId, recalculateTops }) => {
let minPos = comment.pos;
allCommentsWithSameId.forEach(singleComment => {
+ console.log(singleComment.pos);
const markPosition = DocumentHelpers.findMarkPosition(
state,
singleComment.pos,
@@ -120,9 +121,8 @@ export default ({ comment, top, commentId, recalculateTops }) => {
if (markPosition.from < minPos) minPos = markPosition.from;
if (markPosition.to > maxPos) maxPos = markPosition.to;
});
-
- if (allCommentsWithSameId.length > 1)
- maxPos += last(allCommentsWithSameId).node.nodeSize;
+ // if (allCommentsWithSameId.length > 1);
+ // maxPos += last(allCommentsWithSameId).node.nodeSize;
dispatch(state.tr.removeMark(minPos, maxPos, commentMark));
activeView.focus();
};
diff --git a/wax-prosemirror-components/src/ui/buttons/Dropdown.js b/wax-prosemirror-components/src/ui/buttons/Dropdown.js
index ffd67ef3f421a15e6715631e87e3c77659e779eb..6ee345b520926e72e25990bf7a0b1f02d53d7e67 100644
--- a/wax-prosemirror-components/src/ui/buttons/Dropdown.js
+++ b/wax-prosemirror-components/src/ui/buttons/Dropdown.js
@@ -9,11 +9,13 @@ import { grid } from '@pubsweet/ui-toolkit';
const Wrapper = styled.div`
font-size: 0;
position: relative;
+ z-index: 2;
`;
const DropWrapper = styled.div`
margin-top: ${grid(1)};
position: absolute;
+ background: white;
`;
const Dropdown = props => {
diff --git a/wax-prosemirror-core/package.json b/wax-prosemirror-core/package.json
index cc4d3fd093a5a3678ea2b97948962af394f8b3b0..1bacd15961ecf39af7a5950f1ef87bc85772607b 100644
--- a/wax-prosemirror-core/package.json
+++ b/wax-prosemirror-core/package.json
@@ -4,7 +4,7 @@
"version": "0.0.20",
"description": "Wax prosemirror core",
"license": "MIT",
- "main": "dist/index.js",
+ "main": "index.js",
"files": [
"dist"
],
diff --git a/wax-prosemirror-core/src/WaxView.js b/wax-prosemirror-core/src/WaxView.js
index 37d0470a2223be8fb2dd2f6925f351f1fc5abf90..951965abb77e74d303b2cfab0fce17ee02938878 100644
--- a/wax-prosemirror-core/src/WaxView.js
+++ b/wax-prosemirror-core/src/WaxView.js
@@ -52,7 +52,10 @@ export default props => {
'main',
);
if (debug) applyDevTools(view);
- if (autoFocus) view.focus();
+ if (autoFocus)
+ setTimeout(() => {
+ view.focus();
+ });
return () => view.destroy();
}
@@ -61,7 +64,6 @@ export default props => {
const dispatchTransaction = transaction => {
const { TrackChange } = props;
-
const tr =
TrackChange && TrackChange.enabled
? trackedTransaction(transaction, view.state, user)
diff --git a/wax-prosemirror-layouts/package.json b/wax-prosemirror-layouts/package.json
index 35a33eae13a99a9cea512e5ff13f15062732858d..9c1b1a24a411d355c88c430b5e2bd60cb68dcbfd 100644
--- a/wax-prosemirror-layouts/package.json
+++ b/wax-prosemirror-layouts/package.json
@@ -4,7 +4,7 @@
"version": "0.0.20",
"description": "Wax prosemirror layouts",
"license": "MIT",
- "main": "dist/index.js",
+ "main": "index.js",
"files": [
"dist"
],
diff --git a/wax-prosemirror-layouts/src/layouts/EditorElements.js b/wax-prosemirror-layouts/src/layouts/EditorElements.js
index 922a2f997102719ee69f804158ff89fadfe7dafb..182722835e85d9acc473f553341eaf185081a75a 100644
--- a/wax-prosemirror-layouts/src/layouts/EditorElements.js
+++ b/wax-prosemirror-layouts/src/layouts/EditorElements.js
@@ -36,8 +36,7 @@ export default css`
}
.ProseMirror .wax-selection-marker {
- background-color: ${th('colorPrimary')};
- color: white;
+ background-color: ${th('colorSelection')};
}
div[contenteditable='false'] {
@@ -51,8 +50,9 @@ export default css`
text-align: center;
width: 17px;
height: 17px;
- background: black;
- color: white;
+ background: white;
+ border-bottom: 2px solid black;
+ color: black;
cursor: pointer;
}
@@ -207,7 +207,7 @@ export default css`
span.insertion {
color: royalblue;
- footnote: {
+ footnote {
background: royalblue;
}
}
@@ -252,7 +252,7 @@ export default css`
.active-comment {
background-color: gold;
- color: black;
+ /* color: black; */
}
}
`;
diff --git a/wax-prosemirror-plugins/package.json b/wax-prosemirror-plugins/package.json
index 08c98c7320bad4f7ab0a88dcc98d988862f81203..1d72fd394b69a0d2cafdada3f8fc2f9101ee43be 100644
--- a/wax-prosemirror-plugins/package.json
+++ b/wax-prosemirror-plugins/package.json
@@ -4,7 +4,7 @@
"version": "0.0.20",
"description": "Wax prosemirror plugins",
"license": "MIT",
- "main": "dist/index.js",
+ "main": "index.js",
"files": [
"dist"
],
diff --git a/wax-prosemirror-schema/package.json b/wax-prosemirror-schema/package.json
index 0fc629183eead3283069d1f32a872eb43382d97c..f8f677018f65ed4a3df98793f7dfe66907a7ff93 100644
--- a/wax-prosemirror-schema/package.json
+++ b/wax-prosemirror-schema/package.json
@@ -4,7 +4,7 @@
"version": "0.0.20",
"description": "Wax prosemirror schema",
"license": "MIT",
- "main": "dist/index.js",
+ "main": "index.js",
"files": [
"dist"
],
diff --git a/wax-prosemirror-services/package.json b/wax-prosemirror-services/package.json
index 762087d3ee5fa72a7dd01869def6d4fb02de97b0..0cea0c6ca80ff30082fe868ae20216c2eb4f0dd4 100644
--- a/wax-prosemirror-services/package.json
+++ b/wax-prosemirror-services/package.json
@@ -4,7 +4,7 @@
"version": "0.0.20",
"description": "Wax prosemirror services",
"license": "MIT",
- "main": "dist/index.js",
+ "main": "index.js",
"files": [
"dist"
],
diff --git a/wax-prosemirror-services/src/MenuService/MenuWrapper.js b/wax-prosemirror-services/src/MenuService/MenuWrapper.js
index 5b67f631aa0cecb92704f784686b2088c4989fed..4a77932c3d544e05809355fe07609ce840520704 100644
--- a/wax-prosemirror-services/src/MenuService/MenuWrapper.js
+++ b/wax-prosemirror-services/src/MenuService/MenuWrapper.js
@@ -2,9 +2,7 @@
/* eslint react/prop-types: 0 */
import React from 'react';
-import { v4 as uuidv4 } from 'uuid';
import { map } from 'lodash';
-import { ToolGroupComponent, ToolGroups } from 'wax-prosemirror-components';
const MainMenuBar = ({ items = [], view }) => {
return <>{map(items, item => item.renderTools(view))}</>;
diff --git a/wax-prosemirror-services/src/WaxToolGroups/DisplayTextToolGroupService/DisplayText.js b/wax-prosemirror-services/src/WaxToolGroups/DisplayTextToolGroupService/DisplayText.js
index 481200f5b7fccfc4441436604e9b52cb3bab2143..5b1c4263191ffae80b5f61c50cd2ba9935c5d52b 100644
--- a/wax-prosemirror-services/src/WaxToolGroups/DisplayTextToolGroupService/DisplayText.js
+++ b/wax-prosemirror-services/src/WaxToolGroups/DisplayTextToolGroupService/DisplayText.js
@@ -1,9 +1,10 @@
import React from 'react';
import { injectable, inject } from 'inversify';
import { BlockLevelTools, Tabs, ToolGroups } from 'wax-prosemirror-components';
-import ToolGroup from '../../lib/ToolGroup';
import { isEmpty } from 'lodash';
import styled from 'styled-components';
+import { v4 as uuidv4 } from 'uuid';
+import ToolGroup from '../../lib/ToolGroup';
const Empty = styled.div`
background: khaki;
@@ -49,7 +50,7 @@ class DisplayText extends ToolGroup {
};
const tabList = [first, second];
- return <Tabs tabList={tabList} />;
+ return <Tabs key={uuidv4()} tabList={tabList} />;
}
}
diff --git a/wax-prosemirror-themes/package.json b/wax-prosemirror-themes/package.json
index 27385d5522a7c7ed721ba329172b9474029d3aec..8f478b755665ba9f871dc98c79a5bde2a641bf8b 100644
--- a/wax-prosemirror-themes/package.json
+++ b/wax-prosemirror-themes/package.json
@@ -4,7 +4,7 @@
"version": "0.0.20",
"description": "Wax prosemirror themes",
"license": "MIT",
- "main": "dist/index.js",
+ "main": "index.js",
"files": [
"dist"
],
diff --git a/wax-prosemirror-themes/src/coko-theme/index.js b/wax-prosemirror-themes/src/coko-theme/index.js
index 75ab0f31c73841a42312ae71f8bb2e0ce1c5f78b..54c45d7069224b9529dd426c47eac26b8d263888 100644
--- a/wax-prosemirror-themes/src/coko-theme/index.js
+++ b/wax-prosemirror-themes/src/coko-theme/index.js
@@ -20,6 +20,7 @@ const cokoTheme = {
colorTextPlaceholder: '#595959',
colorWarning: '#ffc107',
colorBackgroundToolBar: '#D9D9D9',
+ colorSelection: '#D3D3D3',
/* Text variables */
diff --git a/wax-prosemirror-utilities/package.json b/wax-prosemirror-utilities/package.json
index 1fb80454051ae5ac5b72f1e0795dd23af8c79f0e..cd413ff21dcc6dfec35051a3a028ad7ba585b8d8 100644
--- a/wax-prosemirror-utilities/package.json
+++ b/wax-prosemirror-utilities/package.json
@@ -4,7 +4,7 @@
"version": "0.0.20",
"description": "Wax prosemirror utilities",
"license": "MIT",
- "main": "dist/index.js",
+ "main": "index.js",
"files": [
"dist"
],
diff --git a/wax-prosemirror-utilities/src/commands/Commands.js b/wax-prosemirror-utilities/src/commands/Commands.js
index d5193ac54f3295ef2a41de4a1049d233cf99b90c..95b579ff46495ef5621462f1d5a9ba449af4d3e4 100644
--- a/wax-prosemirror-utilities/src/commands/Commands.js
+++ b/wax-prosemirror-utilities/src/commands/Commands.js
@@ -33,9 +33,11 @@ const setBlockType = (nodeType, attrs = {}) => {
const markActive = type => state => {
const { from, $from, to, empty } = state.selection;
- return empty
+ const mark = empty
? type.isInSet(state.storedMarks || $from.marks())
: state.doc.rangeHasMark(from, to, type);
+ if (mark) return true;
+ return false;
};
const blockActive = (nodeType, attrs = {}) => {