diff --git a/.dockerignore b/.dockerignore
index 45aa008eb7e1e4199fe6e249ac96b13abbe81b1b..3a679c803ce27f37931d2f1ac7353c91ec94b137 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -32,6 +32,7 @@ cypress/
data/
coverage/
logs/
+minio/
stories/
tmp/
uploads/*
diff --git a/app/components/wax-collab/src/EditoriaLayout.js b/app/components/wax-collab/src/EditoriaLayout.js
index d813a25aeb4a0b93ce97dbf06fc5fb51edc13045..aa08285ac34f8240aa0c39db8755305fb149b2f5 100644
--- a/app/components/wax-collab/src/EditoriaLayout.js
+++ b/app/components/wax-collab/src/EditoriaLayout.js
@@ -1,17 +1,15 @@
+/* eslint-disable react/prop-types */
+
import React from 'react'
import styled, { css } from 'styled-components'
-import { InfoArea } from 'wax-prosemirror-components'
-import { componentPlugin } from 'wax-prosemirror-services'
+import { ComponentPlugin } from 'wax-prosemirror-core'
import { th, grid } from '@pubsweet/ui-toolkit'
import EditorElements from './EditorElements'
-// import { WaxContext } from 'wax-prosemirror-core/src/ioc-react'
-
const Layout = styled.div`
background-color: ${th('colorBackground')};
border-radius: 0 ${th('borderRadius')} ${th('borderRadius')}
${th('borderRadius')};
- // max-width: 90rem;
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06);
display: grid;
@@ -23,72 +21,58 @@ const Layout = styled.div`
`
: css`
grid-template-rows: 40px 1fr;
- `} // flex-direction: column;
- // height: 100vh;
- // width: 100hh;
+ `}
`
const Editor = styled.div`
grid-area: editor;
- // box-sizing: border-box;
overflow: auto;
padding: 16px;
- // padding: 0 2px 2px 2px;
- // height: 100%;
+
+ /* stylelint-disable-next-line order/properties-alphabetical-order */
${EditorElements};
`
const Menu = styled.div`
- grid-area: menu;
+ align-items: center;
background: #fff;
+ border-bottom: 1px solid ${th('colorFurniture')};
+ border-top-left-radius: ${th('borderRadius')};
+ border-top-right-radius: ${th('borderRadius')};
+ display: flex;
+ grid-area: menu;
line-height: 40px;
-
padding-left: 4px;
+ position: sticky;
+ top: 0;
user-select: none;
- border-bottom: 1px solid ${th('colorFurniture')};
- display: flex;
- align-items: center;
+ z-index: 10;
- // Hack to hide
- // TODO: https://gitlab.coko.foundation/wax/wax-prosemirror/issues/13
+ /* Hack to hide */
+ /* TODO: https://gitlab.coko.foundation/wax/wax-prosemirror/issues/13 */
button[title='show more tools'] {
display: none;
}
+
button {
padding: ${grid(1)};
}
+
div {
- display: flex;
align-items: center;
+ display: flex;
justify-content: center;
}
-
- position: sticky;
- top: 0;
- z-index: 10;
- border-top-right-radius: ${th('borderRadius')};
- border-top-left-radius: ${th('borderRadius')};
`
-// export const Container = styled.div`
-// background-color: ${th('colorBackground')};
-// border-radius: ${th('borderRadius')};
-// `
-
export const Container = styled.div`
background: ${th('colorBackgroundHue')};
`
-// const LeftSideBar = componentPlugin("leftSideBar");
-// const RightSideBar = componentPlugin("rightSideBar");
-const TopBar = componentPlugin('topBar')
-// const NotesArea = componentPlugin("notesArea");
-// const CommentsArea = componentPlugin("commentsArea");
-const WaxOverlays = componentPlugin('waxOverlays')
+
+const TopBar = ComponentPlugin('topBar')
+const WaxOverlays = ComponentPlugin('waxOverlays')
const EditoriaLayout = readonly => ({ editor }) => (
- // const {
- // view: { main },
- // } = useContext(WaxContext)
<Container>
<Layout readonly={readonly}>
{!readonly && (
@@ -98,7 +82,6 @@ const EditoriaLayout = readonly => ({ editor }) => (
)}
<Editor className="wax-surface-scroll">{editor}</Editor>
</Layout>
- <InfoArea />
<WaxOverlays />
</Container>
)
diff --git a/app/components/wax-collab/src/config/config.js b/app/components/wax-collab/src/config/config.js
index 635d0b5ac38566c19f11c0e763ca7f627266cc6a..25dc9a3c1f1833a67cb25c04e8a4963a62daef2c 100644
--- a/app/components/wax-collab/src/config/config.js
+++ b/app/components/wax-collab/src/config/config.js
@@ -1,9 +1,10 @@
import { emDash, ellipsis } from 'prosemirror-inputrules'
+import { DefaultSchema } from 'wax-prosemirror-utilities'
+
import {
AnnotationToolGroupService,
ImageService,
- PlaceholderService,
InlineAnnotationsService,
LinkService,
// ListsService,
@@ -31,6 +32,7 @@ import invisibles, {
} from '@guardian/prosemirror-invisibles'
export default {
+ SchemaService: DefaultSchema,
MenuService: [
{
templateArea: 'topBar',
@@ -51,7 +53,6 @@ export default {
PmPlugins: [invisibles([hardBreak()])],
services: [
- new PlaceholderService(),
new ImageService(),
// new ListsService(),
new InlineAnnotationsService(),
diff --git a/package.json b/package.json
index dd8e297bb0eba9c9235d6f4f18cdd70992f2d502..ff8c81ef009e1c7c7f9c0c90fdc21143dbe74a99 100644
--- a/package.json
+++ b/package.json
@@ -83,8 +83,7 @@
"graphql": "15.5.0",
"pg": "8.4.0",
"prettier": "2.2.1",
- "prosemirror-gapcursor": "^1.1.3",
- "prosemirror-model": "1.11.2",
+ "prosemirror-model": "1.13.3",
"pubsweet-server": "13.12.3",
"react": "16.14.0",
"styled-components": "5.2.1"
@@ -162,11 +161,11 @@
"superagent": "^3.8.3",
"supertest": "3.4.2",
"waait": "^1.0.5",
- "wax-prosemirror-core": "0.0.10",
- "wax-prosemirror-plugins": "0.0.10",
- "wax-prosemirror-schema": "0.0.10",
- "wax-prosemirror-services": "0.0.10",
- "wax-prosemirror-utilities": "0.0.10",
+ "wax-prosemirror-core": "0.0.40",
+ "wax-prosemirror-plugins": "0.0.40",
+ "wax-prosemirror-schema": "0.0.40",
+ "wax-prosemirror-services": "0.0.40",
+ "wax-prosemirror-utilities": "0.0.40",
"winston": "2.4.5",
"ws": "^7.4.2",
"xpub-edit": "2.6.11",
diff --git a/yarn.lock b/yarn.lock
index 13e900e13ea1f31298c1979925a3d5cc0e2fa7b7..5e119deb1ce771baa61afed23df226359a0eea61 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2555,6 +2555,15 @@
dependencies:
"@pubsweet/logger" "^0.2.54"
+"@pubsweet/ui-toolkit@^2.3.1":
+ version "2.3.12"
+ resolved "https://registry.yarnpkg.com/@pubsweet/ui-toolkit/-/ui-toolkit-2.3.12.tgz#3ad96e34b7dcbf42ae9e9029cab6bc49f6070a66"
+ integrity sha512-g8zfNl658UjsN03tgKhVD8ZEyvAya2wZwlGybRV/Z/gftaolOsYSiqyJp5CFxzfNQLpj0MrddsM17FIEem/6jQ==
+ dependencies:
+ color "^3.0.0"
+ lodash "^4.17.4"
+ styled-components "^4.1.1"
+
"@pubsweet/ui-toolkit@^2.3.2", "@pubsweet/ui-toolkit@^2.3.5":
version "2.3.10"
resolved "https://registry.yarnpkg.com/@pubsweet/ui-toolkit/-/ui-toolkit-2.3.10.tgz#70c461e3bd6a3babcfe8106aa5cf723b71de7f2f"
@@ -3542,7 +3551,7 @@
dependencies:
"@types/react" "*"
-"@types/react@*":
+"@types/react@*", "@types/react@^17.0.0":
version "17.0.3"
resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.3.tgz#ba6e215368501ac3826951eef2904574c262cc79"
integrity sha512-wYOUxIgs2HZZ0ACNiIayItyluADNbONl7kt8lkLjVK8IitMH5QMyAh75Fwhmo37r1m7L2JaFj03sIfxBVDvRAg==
@@ -7731,6 +7740,11 @@ deprecated-decorator@^0.1.6:
resolved "https://registry.yarnpkg.com/deprecated-decorator/-/deprecated-decorator-0.1.6.tgz#00966317b7a12fe92f3cc831f7583af329b86c37"
integrity sha1-AJZjF7ehL+kvPMgx91g68ym4bDc=
+dequal@^2.0.2:
+ version "2.0.2"
+ resolved "https://registry.yarnpkg.com/dequal/-/dequal-2.0.2.tgz#85ca22025e3a87e65ef75a7a437b35284a7e319d"
+ integrity sha512-q9K8BlJVxK7hQYqa6XISGmBZbtQQWVXSrRrWreHC94rMt1QL/Impruc+7p2CYSYuVIUr+YCt6hjrs1kkdJRTug==
+
des.js@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.1.tgz#5382142e1bdc53f85d86d53e5f4aa7deb91e0843"
@@ -12650,6 +12664,13 @@ jws@^3.2.2:
jwa "^1.4.1"
safe-buffer "^5.0.1"
+katex@^0.12.0:
+ version "0.12.0"
+ resolved "https://registry.yarnpkg.com/katex/-/katex-0.12.0.tgz#2fb1c665dbd2b043edcf8a1f5c555f46beaa0cb9"
+ integrity sha512-y+8btoc/CK70XqcHqjxiGWBOeIL8upbS0peTPXTvgrh21n1RiWWcIpSWM+4uXq+IAgNh9YYQWdc7LVDPDAEEAg==
+ dependencies:
+ commander "^2.19.0"
+
keyv@^3.0.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.1.0.tgz#ecc228486f69991e49e9476485a5be1e8fc5c4d9"
@@ -13890,7 +13911,7 @@ moment@2.27.0:
resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d"
integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==
-moment@^2.22.1, moment@^2.29.1:
+moment@^2.22.1, moment@^2.29.0, moment@^2.29.1:
version "2.29.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
@@ -16038,7 +16059,7 @@ property-information@^5.0.0, property-information@^5.3.0:
dependencies:
xtend "^4.0.0"
-prosemirror-commands@^1.0.1, prosemirror-commands@^1.1.3:
+prosemirror-commands@1.1.7, prosemirror-commands@^1.0.1:
version "1.1.7"
resolved "https://registry.yarnpkg.com/prosemirror-commands/-/prosemirror-commands-1.1.7.tgz#5b31ae0fe82835d36d22c780641c0b651f27dd03"
integrity sha512-tuQr8q5euDjE+WAHWmu1JMLYWsPfUDH80QLLpnQrPYOPysO26FZyyHwEvA0+hUzvF8fOt1oMj0+/YM9UsPkZiA==
@@ -16065,7 +16086,16 @@ prosemirror-dev-tools@^2.1.1:
react-json-tree "^0.11.0"
unstated "^2.1.1"
-prosemirror-dropcursor@^1.0.0, prosemirror-dropcursor@^1.3.2:
+prosemirror-dropcursor@1.3.2:
+ version "1.3.2"
+ resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.3.2.tgz#28738c4ed7102e814d7a8a26d70018523fc7cd6d"
+ integrity sha512-4c94OUGyobGnwcQI70OXyMhE/9T4aTgjU+CHxkd5c7D+jH/J0mKM/lk+jneFVKt7+E4/M0D9HzRPifu8U28Thw==
+ dependencies:
+ prosemirror-state "^1.0.0"
+ prosemirror-transform "^1.1.0"
+ prosemirror-view "^1.1.0"
+
+prosemirror-dropcursor@^1.0.0:
version "1.3.3"
resolved "https://registry.yarnpkg.com/prosemirror-dropcursor/-/prosemirror-dropcursor-1.3.3.tgz#583d6a82b4960d468132c07c40803cc1d697fda4"
integrity sha512-zavE+wh+qkDcP7LaWn+jXVujGyQzBYSmM8E2HSngQ3KaaR+HJYgEBYGs9ynLHqKWLlLCXsxWdVYPV49v4caFyg==
@@ -16074,7 +16104,7 @@ prosemirror-dropcursor@^1.0.0, prosemirror-dropcursor@^1.3.2:
prosemirror-transform "^1.1.0"
prosemirror-view "^1.1.0"
-prosemirror-gapcursor@^1.0.0, prosemirror-gapcursor@^1.1.3:
+prosemirror-gapcursor@1.1.5, prosemirror-gapcursor@^1.0.0:
version "1.1.5"
resolved "https://registry.yarnpkg.com/prosemirror-gapcursor/-/prosemirror-gapcursor-1.1.5.tgz#0c37fd6cbb1d7c46358c2e7397f8da9a8b5c6246"
integrity sha512-SjbUZq5pgsBDuV3hu8GqgIpZR5eZvGLM+gPQTqjVVYSMUCfKW3EGXTEYaLHEl1bGduwqNC95O3bZflgtAb4L6w==
@@ -16084,7 +16114,12 @@ prosemirror-gapcursor@^1.0.0, prosemirror-gapcursor@^1.1.3:
prosemirror-state "^1.0.0"
prosemirror-view "^1.0.0"
-prosemirror-history@^1.0.0, prosemirror-history@^1.1.3:
+prosemirror-highlightjs@^0.2.0:
+ version "0.2.0"
+ resolved "https://registry.yarnpkg.com/prosemirror-highlightjs/-/prosemirror-highlightjs-0.2.0.tgz#601932dea9060f72d9e4701ce2531140d03c735c"
+ integrity sha512-2qI/M6FTSfhtshAWfUC+tiCgJzReGQGSLc6EtXtxe5lgiqFUqfsICiyna69x8GUrO30zr5JW9acsearX8/r37w==
+
+prosemirror-history@1.1.3, prosemirror-history@^1.0.0:
version "1.1.3"
resolved "https://registry.yarnpkg.com/prosemirror-history/-/prosemirror-history-1.1.3.tgz#4f76a1e71db4ef7cdf0e13dec6d8da2aeaecd489"
integrity sha512-zGDotijea+vnfnyyUGyiy1wfOQhf0B/b6zYcCouBV8yo6JmrE9X23M5q7Nf/nATywEZbgRLG70R4DmfSTC+gfg==
@@ -16093,7 +16128,7 @@ prosemirror-history@^1.0.0, prosemirror-history@^1.1.3:
prosemirror-transform "^1.0.0"
rope-sequence "^1.3.0"
-prosemirror-inputrules@^1.0.0, prosemirror-inputrules@^1.1.2, prosemirror-inputrules@^1.1.3:
+prosemirror-inputrules@1.1.3, prosemirror-inputrules@^1.0.0, prosemirror-inputrules@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/prosemirror-inputrules/-/prosemirror-inputrules-1.1.3.tgz#93f9199ca02473259c30d7e352e4c14022d54638"
integrity sha512-ZaHCLyBtvbyIHv0f5p6boQTIJjlD6o2NPZiEaZWT2DA+j591zS29QQEMT4lBqwcLW3qRSf7ZvoKNbf05YrsStw==
@@ -16101,7 +16136,7 @@ prosemirror-inputrules@^1.0.0, prosemirror-inputrules@^1.1.2, prosemirror-inputr
prosemirror-state "^1.0.0"
prosemirror-transform "^1.0.0"
-prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2, prosemirror-keymap@^1.1.3:
+prosemirror-keymap@1.1.4, prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2:
version "1.1.4"
resolved "https://registry.yarnpkg.com/prosemirror-keymap/-/prosemirror-keymap-1.1.4.tgz#8b481bf8389a5ac40d38dbd67ec3da2c7eac6a6d"
integrity sha512-Al8cVUOnDFL4gcI5IDlG6xbZ0aOD/i3B17VT+1JbHWDguCgt/lBHVTHUBcKvvbSg6+q/W4Nj1Fu6bwZSca3xjg==
@@ -16109,10 +16144,10 @@ prosemirror-keymap@^1.0.0, prosemirror-keymap@^1.1.2, prosemirror-keymap@^1.1.3:
prosemirror-state "^1.0.0"
w3c-keyname "^2.2.0"
-prosemirror-model@1.11.2, prosemirror-model@>=1.0.0, prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.2.0, prosemirror-model@^1.8.1, prosemirror-model@^1.9.1:
- version "1.11.2"
- resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.11.2.tgz#3ce08172b465bc725c8808c18c2e9378fe69418d"
- integrity sha512-+gM+x1VUfGAyKR/g0bK7FC46fVNq0xVVL859QAQ7my2p5HzKrPps/pSbYn7T50XTG2r2IhZJChsUFUBHtcoN0Q==
+prosemirror-model@1.13.3, prosemirror-model@>=1.0.0, prosemirror-model@^1.0.0, prosemirror-model@^1.1.0, prosemirror-model@^1.2.0, prosemirror-model@^1.8.1:
+ version "1.13.3"
+ resolved "https://registry.yarnpkg.com/prosemirror-model/-/prosemirror-model-1.13.3.tgz#3ccfde73b9c9e706933c72bdf7462906509ff1c9"
+ integrity sha512-wujIYYQEcxdkbKmIJiekVjqtylKxuoEcc+w2PnN7Itc58m/75J4rCUz2dibygVQJFi3gZrD2DNFLjOS6LP4w1g==
dependencies:
orderedmap "^1.1.0"
@@ -16123,7 +16158,7 @@ prosemirror-schema-basic@^1.0.0:
dependencies:
prosemirror-model "^1.2.0"
-prosemirror-schema-list@^1.0.0, prosemirror-schema-list@^1.1.2:
+prosemirror-schema-list@1.1.4, prosemirror-schema-list@^1.0.0, prosemirror-schema-list@^1.1.4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/prosemirror-schema-list/-/prosemirror-schema-list-1.1.4.tgz#471f9caf2d2bed93641d2e490434c0d2d4330df1"
integrity sha512-pNTuZflacFOBlxrTcWSdWhjoB8BaucwfJVp/gJNxztOwaN3wQiC65axclXyplf6TKgXD/EkWfS/QAov3/Znadw==
@@ -16131,7 +16166,15 @@ prosemirror-schema-list@^1.0.0, prosemirror-schema-list@^1.1.2:
prosemirror-model "^1.0.0"
prosemirror-transform "^1.0.0"
-prosemirror-state@>=1.0.0, prosemirror-state@^1.0.0, prosemirror-state@^1.0.1, prosemirror-state@^1.2.2, prosemirror-state@^1.3.1, prosemirror-state@^1.3.2:
+prosemirror-state@1.3.3:
+ version "1.3.3"
+ resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.3.3.tgz#b2862866b14dec2b3ae1ab18229f2bd337651a2c"
+ integrity sha512-PLXh2VJsIgvlgSTH6I2Yg6vk1CzPDp21DFreVpQtDMY2S6WaMmrQgDTLRcsrD8X38v8Yc873H7+ogdGzyIPn+w==
+ dependencies:
+ prosemirror-model "^1.0.0"
+ prosemirror-transform "^1.0.0"
+
+prosemirror-state@>=1.0.0, prosemirror-state@^1.0.0, prosemirror-state@^1.0.1, prosemirror-state@^1.2.2, prosemirror-state@^1.3.1:
version "1.3.4"
resolved "https://registry.yarnpkg.com/prosemirror-state/-/prosemirror-state-1.3.4.tgz#4c6b52628216e753fc901c6d2bfd84ce109e8952"
integrity sha512-Xkkrpd1y/TQ6HKzN3agsQIGRcLckUMA9u3j207L04mt8ToRgpGeyhbVv0HI7omDORIBHjR29b7AwlATFFf2GLA==
@@ -16150,7 +16193,7 @@ prosemirror-tables@^0.7.11:
prosemirror-transform "^1.0.0"
prosemirror-view "^1.0.0"
-prosemirror-tables@^1.1.0:
+prosemirror-tables@^1.1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/prosemirror-tables/-/prosemirror-tables-1.1.1.tgz#ad66300cc49500455cf1243bb129c9e7d883321e"
integrity sha512-LmCz4jrlqQZRsYRDzCRYf/pQ5CUcSOyqZlAj5kv67ZWBH1SVLP2U9WJEvQfimWgeRlIz0y0PQVqO1arRm1+woA==
@@ -16161,7 +16204,14 @@ prosemirror-tables@^1.1.0:
prosemirror-transform "^1.2.1"
prosemirror-view "^1.13.3"
-prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.2.1, prosemirror-transform@^1.2.3:
+prosemirror-transform@1.2.6:
+ version "1.2.6"
+ resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.2.6.tgz#b3ad86e976c49f7dd541cc39e0d7215bcfe7b596"
+ integrity sha512-DyV6cRip8//GIHTrqBe2B7I8VjPFQZYuBuB4clpguq1SrS9lLponoBt/0XRWxETkCVsxYSvwE76X0zo6AZhwaw==
+ dependencies:
+ prosemirror-model "^1.0.0"
+
+prosemirror-transform@^1.0.0, prosemirror-transform@^1.1.0, prosemirror-transform@^1.2.1:
version "1.2.12"
resolved "https://registry.yarnpkg.com/prosemirror-transform/-/prosemirror-transform-1.2.12.tgz#4398b568faf75a1540fbf5c659ca436a8657ed6f"
integrity sha512-S73syqLcGBq6QiPaF7vriB8kpvK/aIFsnErrriKaFLSiE/GxMgBc62TPhNQAeGQr7/9GCDApIReTsJFcMt4o2w==
@@ -16173,7 +16223,16 @@ prosemirror-utils@^0.9.6:
resolved "https://registry.yarnpkg.com/prosemirror-utils/-/prosemirror-utils-0.9.6.tgz#3d97bd85897e3b535555867dc95a51399116a973"
integrity sha512-UC+j9hQQ1POYfMc5p7UFxBTptRiGPR7Kkmbl3jVvU8VgQbkI89tR/GK+3QYC8n+VvBZrtAoCrJItNhWSxX3slA==
-prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.11, prosemirror-view@^1.13.3, prosemirror-view@^1.5.1:
+prosemirror-view@1.18.0:
+ version "1.18.0"
+ resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.18.0.tgz#92d27b2583877938c529e173e6e3a0f3f6aa0e1c"
+ integrity sha512-UoY29oeWruT6RKhH7wGytUBVrlaszNx43wvOxZPCMjYPvKBT21EIXR8Ezr/3XstvFVBQAWdDh6Ke0qHmF43y/A==
+ dependencies:
+ prosemirror-model "^1.1.0"
+ prosemirror-state "^1.0.0"
+ prosemirror-transform "^1.1.0"
+
+prosemirror-view@^1.0.0, prosemirror-view@^1.1.0, prosemirror-view@^1.13.3, prosemirror-view@^1.5.1:
version "1.18.1"
resolved "https://registry.yarnpkg.com/prosemirror-view/-/prosemirror-view-1.18.1.tgz#52ad1c67f51144e27e368bba129142ce87c7791e"
integrity sha512-TZd8byDRfdopLiokBY7T27msCSfWqqRxWs/LnBbdI030F+iI2kS+tO59/XFnpZxMLFKlJgOgGGhM9SzD1Nwdxw==
@@ -16832,13 +16891,6 @@ react-moment@0.9.7:
resolved "https://registry.yarnpkg.com/react-moment/-/react-moment-0.9.7.tgz#ca570466595b1aa4f7619e62da18b3bb2de8b6f3"
integrity sha512-ifzUrUGF6KRsUN2pRG5k56kO0mJBr8kRkWb0wNvtFIsBIxOuPxhUpL1YlXwpbQCbHq23hUu6A0VEk64HsFxk9g==
-react-panelgroup@^1.0.10:
- version "1.0.12"
- resolved "https://registry.yarnpkg.com/react-panelgroup/-/react-panelgroup-1.0.12.tgz#e19c2d9d1fa4fbe504cdac9255eebc1c569c08f4"
- integrity sha512-DuA+6TnxLK1TmlQqijYCbzvEVZYS3i6SyG9xqk7SW/S4pzzIxQ73lkSHLkMBG55/iOvGQEL/uH3Y96btk6mPDw==
- dependencies:
- prop-types "^15.6.1"
-
react-popper-tooltip@^3.1.1:
version "3.1.1"
resolved "https://registry.yarnpkg.com/react-popper-tooltip/-/react-popper-tooltip-3.1.1.tgz#329569eb7b287008f04fcbddb6370452ad3f9eac"
@@ -20061,6 +20113,15 @@ use-composed-ref@^1.0.0:
dependencies:
ts-essentials "^2.0.3"
+use-deep-compare-effect@^1.3.1:
+ version "1.6.1"
+ resolved "https://registry.yarnpkg.com/use-deep-compare-effect/-/use-deep-compare-effect-1.6.1.tgz#061a0ac5400aa0461e33dddfaa2a98bca873182a"
+ integrity sha512-VB3b+7tFI81dHm8buGyrpxi8yBhzYZdyMX9iBJra7SMFMZ4ci4FJ1vFc1nvChiB1iLv4GfjqaYfvbNEpTT1rFQ==
+ dependencies:
+ "@babel/runtime" "^7.12.5"
+ "@types/react" "^17.0.0"
+ dequal "^2.0.2"
+
use-isomorphic-layout-effect@^1.0.0:
version "1.1.1"
resolved "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.1.tgz#7bb6589170cd2987a152042f9084f9effb75c225"
@@ -20348,94 +20409,115 @@ watchpack@^1.7.4:
chokidar "^3.4.1"
watchpack-chokidar2 "^2.0.1"
-wax-prosemirror-components@^0.0.10:
- version "0.0.10"
- resolved "https://registry.yarnpkg.com/wax-prosemirror-components/-/wax-prosemirror-components-0.0.10.tgz#2fc7cb4130530316e9a78222d46e425589077c8e"
- integrity sha512-LSTMVcgyoDbkiuVA7fmQRJbhMgMwFU9Oy1Kz8zmFAePjPUjQe+hya1Ma7+4bNQIVRr0K8xKLu1H7qsKY1ZKZwQ==
+wax-prosemirror-components@^0.0.40:
+ version "0.0.40"
+ resolved "https://registry.yarnpkg.com/wax-prosemirror-components/-/wax-prosemirror-components-0.0.40.tgz#f4ef37b5f7ae15debd975f7a2ef62bc0de47b5c0"
+ integrity sha512-VlkIso3GTvE3DkMv0TURhUya3fWKkQSG8/U3gY4SjD2okBVKe8df5zePTKFUCYwROXExyIMLkvIVgdQFBCj4vA==
dependencies:
"@fortawesome/fontawesome" "^1.1.2"
"@fortawesome/free-solid-svg-icons" "^5.12.0"
"@fortawesome/react-fontawesome" "^0.0.17"
+ "@pubsweet/ui-toolkit" "^2.3.1"
lodash "^4.17.4"
- react "^16.13.1"
- react-dom "^16.13.1"
+ moment "^2.29.0"
+ prop-types "^15.7.2"
+ prosemirror-model "1.13.3"
+ prosemirror-state "1.3.3"
react-dropdown "^1.6.2"
react-transition-group "^4.3.0"
styled-components "^4.2.0"
+ use-deep-compare-effect "^1.3.1"
uuid "^7.0.3"
+ wax-prosemirror-core "^0.0.40"
+ wax-prosemirror-utilities "^0.0.40"
-wax-prosemirror-core@0.0.10, wax-prosemirror-core@^0.0.10:
- version "0.0.10"
- resolved "https://registry.yarnpkg.com/wax-prosemirror-core/-/wax-prosemirror-core-0.0.10.tgz#36bf79404575a75f14b81300cc4d2ac633bc3333"
- integrity sha512-OkbS74BWhg0nydnLSNxaGKe+0SWgRZ0CVJhNERY8YYR7O3FklvE5LiJ3xQzfikpzRjlcDK6zF3FjtHzAD7QuQw==
+wax-prosemirror-core@0.0.40, wax-prosemirror-core@^0.0.40:
+ version "0.0.40"
+ resolved "https://registry.yarnpkg.com/wax-prosemirror-core/-/wax-prosemirror-core-0.0.40.tgz#f2c55e2b4fdb108055a5b275faa778fc1e193f06"
+ integrity sha512-hLeW8GgKmR8cf9bNtf56ZNqrciOc7m4FHLCwxlAY3Sd1Qt14QJE3VFtfPnUotPXLWeqyCuC++syXFti4bNB3KQ==
dependencies:
deepmerge "^4.2.2"
inversify "^5.0.1"
inversify-inject-decorators "^3.1.0"
lodash "^4.17.4"
- prosemirror-commands "^1.1.3"
+ prosemirror-commands "1.1.7"
prosemirror-dev-tools "^2.1.1"
- prosemirror-dropcursor "^1.3.2"
- prosemirror-gapcursor "^1.1.3"
- prosemirror-history "^1.1.3"
- prosemirror-inputrules "^1.1.2"
- prosemirror-keymap "^1.1.3"
- prosemirror-model "^1.9.1"
- prosemirror-state "^1.3.2"
- prosemirror-transform "^1.2.3"
- prosemirror-view "^1.13.11"
- react "^16.13.1"
- react-dom "^16.13.1"
+ prosemirror-dropcursor "1.3.2"
+ prosemirror-gapcursor "1.1.5"
+ prosemirror-history "1.1.3"
+ prosemirror-inputrules "1.1.3"
+ prosemirror-keymap "1.1.4"
+ prosemirror-model "1.13.3"
+ prosemirror-state "1.3.3"
+ prosemirror-transform "1.2.6"
+ prosemirror-view "1.18.0"
reflect-metadata "^0.1.13"
styled-components "^4.2.0"
+ uuid "^7.0.3"
+ wax-prosemirror-services "^0.0.40"
+ wax-prosemirror-utilities "^0.0.40"
-wax-prosemirror-layouts@^0.0.10:
- version "0.0.10"
- resolved "https://registry.yarnpkg.com/wax-prosemirror-layouts/-/wax-prosemirror-layouts-0.0.10.tgz#a69957f76631b1209c9049493b47d12eccfcb624"
- integrity sha512-Bu3Jmixx9/h293i7oizsHcf9elS3nE5qiOwpsyLT8QYiJ4DlXlUJhVrvI4KAKPJfUkwt9CPv53dRVbV59RLbMA==
- dependencies:
- react "^16.13.1"
- react-dom "^16.13.1"
- react-panelgroup "^1.0.10"
- styled-components "^4.2.0"
-
-wax-prosemirror-plugins@0.0.10:
- version "0.0.10"
- resolved "https://registry.yarnpkg.com/wax-prosemirror-plugins/-/wax-prosemirror-plugins-0.0.10.tgz#e3beb4be35c498b4821fb25746512efbe5442eb5"
- integrity sha512-1Ce4yvnCHDA7RG/5vjao9jjRckuNkVWgE/8vGs+64HfY6+2XILTRvypwKcqCvo7zQIYy4XlHAH4zGK/HXyXDxg==
- dependencies:
- wax-prosemirror-components "^0.0.10"
- wax-prosemirror-core "^0.0.10"
- wax-prosemirror-layouts "^0.0.10"
-
-wax-prosemirror-schema@0.0.10:
- version "0.0.10"
- resolved "https://registry.yarnpkg.com/wax-prosemirror-schema/-/wax-prosemirror-schema-0.0.10.tgz#18e0b81ca18d6e96ad21ffec8314271372f00cf5"
- integrity sha512-HRQp5hyAW3VNlDQPOKFrRC+a1RsY17GLzpo5LSvmIepnDTrqOmSIpr7WZWMx8bElOw5t60vQIdNyIr5hWpUH6w==
+wax-prosemirror-plugins@0.0.40, wax-prosemirror-plugins@^0.0.40:
+ version "0.0.40"
+ resolved "https://registry.yarnpkg.com/wax-prosemirror-plugins/-/wax-prosemirror-plugins-0.0.40.tgz#d1756cda168dbdff8694ba832b55bce4c455204e"
+ integrity sha512-XSg+xpW10KOGc/obzcnZh+2fgRm99zudU2OWsuWL50wG7WErcX70YxTsbgjELP7uDiSDJHiIyHwNgKDglx1xBQ==
dependencies:
- prosemirror-schema-list "^1.1.2"
- prosemirror-tables "^1.1.0"
-
-wax-prosemirror-services@0.0.10:
- version "0.0.10"
- resolved "https://registry.yarnpkg.com/wax-prosemirror-services/-/wax-prosemirror-services-0.0.10.tgz#bdc8695b280edbaadd1453b1875130fe86888a58"
- integrity sha512-9GMLqqJ8d2o+amKIBmhy8V2Xl8CaFbhRmS0wReIdjEJT3bvDbrFG5F+rzaHLputx8/JypP5CfVqNQ9O2CAWfYQ==
+ highlight.js "^10.1.1"
+ katex "^0.12.0"
+ lodash "^4.17.4"
+ prosemirror-commands "1.1.7"
+ prosemirror-highlightjs "^0.2.0"
+ prosemirror-keymap "1.1.4"
+ prosemirror-state "1.3.3"
+ prosemirror-transform "1.2.6"
+ prosemirror-view "1.18.0"
+ wax-prosemirror-components "^0.0.40"
+ wax-prosemirror-core "^0.0.40"
+ wax-prosemirror-utilities "^0.0.40"
+
+wax-prosemirror-schema@0.0.40, wax-prosemirror-schema@^0.0.40:
+ version "0.0.40"
+ resolved "https://registry.yarnpkg.com/wax-prosemirror-schema/-/wax-prosemirror-schema-0.0.40.tgz#511e0fbc2ae8b3d3bd2162b39a9f1bbfaf24c488"
+ integrity sha512-i2ueWi/1sgtEnNZOXc3q3hAXrC5ogwVoPKU+vV7oBoPDZ9WvGFYwzMKljydRYO+TpfARxIDXk+i7foBZladaeg==
+ dependencies:
+ prosemirror-schema-list "^1.1.4"
+ prosemirror-tables "^1.1.1"
+ wax-prosemirror-utilities "^0.0.40"
+
+wax-prosemirror-services@0.0.40, wax-prosemirror-services@^0.0.40:
+ version "0.0.40"
+ resolved "https://registry.yarnpkg.com/wax-prosemirror-services/-/wax-prosemirror-services-0.0.40.tgz#723f63950675ec1b9eaa290d1c29281a47d15ce9"
+ integrity sha512-D4F5sF6M6CSGar0SFZmTVzvRFDPTeJHeLUHGbdGC2RxcUj6Kl0THMoC/VgWsP9VpyGp5MXdCvzsUH+IWHnsFqQ==
dependencies:
inversify "^5.0.1"
inversify-inject-decorators "^3.1.0"
- react "^16.13.1"
- react-dom "^16.13.1"
+ lodash "^4.17.4"
+ prosemirror-commands "1.1.7"
+ prosemirror-history "1.1.3"
+ prosemirror-inputrules "1.1.3"
+ prosemirror-keymap "1.1.4"
+ prosemirror-model "1.13.3"
+ prosemirror-schema-list "1.1.4"
+ prosemirror-state "1.3.3"
+ prosemirror-transform "1.2.6"
+ prosemirror-view "1.18.0"
styled-components "^4.2.0"
- wax-prosemirror-components "^0.0.10"
- wax-prosemirror-core "^0.0.10"
- wax-prosemirror-layouts "^0.0.10"
-
-wax-prosemirror-utilities@0.0.10:
- version "0.0.10"
- resolved "https://registry.yarnpkg.com/wax-prosemirror-utilities/-/wax-prosemirror-utilities-0.0.10.tgz#0e962e6e8a7a44000dacd720932a602e7729c37c"
- integrity sha512-uTPHkUvF66MwnsrW67MrkD4ISnIH1/SSAaJ0+s9PWHi5wBqlWQ6ED7HmKK/MHlLwE7aVTwg8BXP7hI2s5jfaUg==
- dependencies:
+ use-deep-compare-effect "^1.3.1"
+ uuid "^7.0.3"
+ wax-prosemirror-components "^0.0.40"
+ wax-prosemirror-core "^0.0.40"
+ wax-prosemirror-plugins "^0.0.40"
+ wax-prosemirror-schema "^0.0.40"
+ wax-prosemirror-utilities "^0.0.40"
+
+wax-prosemirror-utilities@0.0.40, wax-prosemirror-utilities@^0.0.40:
+ version "0.0.40"
+ resolved "https://registry.yarnpkg.com/wax-prosemirror-utilities/-/wax-prosemirror-utilities-0.0.40.tgz#6517ce9678110fee687d1a245fc094d2d7d06f79"
+ integrity sha512-oPClqK5rRcjpywB1vRplnjlltFLKvSZxRmnJUqv1MoNGtt1QIRD/F/bTMHTuU/0r8EmUdNkA0GGgCh+qyWEwFw==
+ dependencies:
+ prosemirror-commands "1.1.7"
prosemirror-utils "^0.9.6"
+ uuid "^7.0.3"
wbuf@^1.1.0, wbuf@^1.7.3:
version "1.7.3"