diff --git a/editors/editoria/package.json b/editors/editoria/package.json
index 79ce72dd705aca391a5e3879425f9bd74b6dfd74..e421ac919c09471f914b8355430439e7de88de73 100644
--- a/editors/editoria/package.json
+++ b/editors/editoria/package.json
@@ -5,7 +5,7 @@
"dependencies": {
"@guardian/prosemirror-invisibles": "^1.2.0",
"prosemirror-schema-list": "^1.0.0",
- "prosemirror-tables": "^0.7.10",
+ "prosemirror-tables": "^0.9.5",
"react": "^16.8.6",
"react-dom": "^16.8.6",
"styled-components": "^4.2.0",
@@ -24,16 +24,11 @@
"eslintConfig": {
"extends": "react-app"
},
- "browserslist": [
- ">0.2%",
- "not dead",
- "not ie <= 11",
- "not op_mini all"
- ],
+ "browserslist": [">0.2%", "not dead", "not ie <= 11", "not op_mini all"],
"devDependencies": {
"babel-eslint": "10.0.3",
"babel-loader": "8.0.6",
"react-app-rewired": "^2.1.1",
"react-scripts": "3.2.0"
}
-}
\ No newline at end of file
+}
diff --git a/package.json b/package.json
index dbf78de917a4ab373ad50b44ace4f5864775191d..f58069cdae2c41a537cd5c44185c321617693ee6 100644
--- a/package.json
+++ b/package.json
@@ -36,7 +36,8 @@
"svg-inline-loader": "^0.8.0"
},
"resolutions": {
- "styled-components": "4.2.0"
+ "styled-components": "4.2.0",
+ "prosemirror-model": "1.8.0"
},
"workspaces": [
"wax-prosemirror-core",
diff --git a/wax-prosemirror-components/index.js b/wax-prosemirror-components/index.js
index 9b8a5e7d67e183e93b9082b88614463b6b987323..c40a956b813ed0b8e7f67e17479b67c26f3b7bdb 100644
--- a/wax-prosemirror-components/index.js
+++ b/wax-prosemirror-components/index.js
@@ -1,2 +1,3 @@
export { default as MainMenuBar } from "./src/mainMenuBar/MainMenuBar";
export { default as SideMenuBar } from "./src/sideMenuBar/SideMenuBar";
+export { default as InfoArea } from "./src/components/infoArea/InfoArea";
diff --git a/wax-prosemirror-components/package.json b/wax-prosemirror-components/package.json
index 898dfcfff92388641e70d747c2f9c06bebef4e3d..87072635a65045947c8da9cef9581bb61e484268 100644
--- a/wax-prosemirror-components/package.json
+++ b/wax-prosemirror-components/package.json
@@ -13,8 +13,8 @@
"@fortawesome/fontawesome-free-solid": "^5.0.4",
"@fortawesome/react-fontawesome": "^0.0.17",
"lodash": "^4.17.4",
- "react": "^16.8.4",
- "react-dom": "^16.8.4",
+ "react": "^16.8.6",
+ "react-dom": "^16.8.6",
"react-dropdown": "^1.6.2",
"styled-components": "^4.2.0",
"uuid": "^3.3.2"
diff --git a/wax-prosemirror-components/src/components/infoArea/InfoArea.js b/wax-prosemirror-components/src/components/infoArea/InfoArea.js
new file mode 100644
index 0000000000000000000000000000000000000000..1abbefdfa4d2fc492fd17d576aaec5e3df7821a2
--- /dev/null
+++ b/wax-prosemirror-components/src/components/infoArea/InfoArea.js
@@ -0,0 +1,15 @@
+import React from "react";
+import styled from "styled-components";
+
+const InfoAreaContainer = styled.div`
+ height: ${props => (props.height ? props.height : "30px")};
+ position: fixed;
+ bottom: 0;
+ z-index: 9999;
+ background: #efefef;
+ width: 100%;
+`;
+
+const InfoArea = () => <InfoAreaContainer />;
+
+export default InfoArea;
diff --git a/wax-prosemirror-core/package.json b/wax-prosemirror-core/package.json
index 76eacba1db94b084f11361a18aed3de0750c5dcc..0e82e27a4893e5c151b2d94d3eab58c58a4ed874 100644
--- a/wax-prosemirror-core/package.json
+++ b/wax-prosemirror-core/package.json
@@ -10,19 +10,19 @@
},
"dependencies": {
"lodash": "^4.17.4",
- "prosemirror-commands": "^1.0.7",
+ "prosemirror-commands": "^1.1.0",
"prosemirror-dev-tools": "^2.1.1",
- "prosemirror-dropcursor": "^1.1.1",
- "prosemirror-gapcursor": "^1.0.3",
- "prosemirror-history": "^1.0.4",
- "prosemirror-inputrules": "^1.0.1",
- "prosemirror-keymap": "^1.0.1",
- "prosemirror-model": "^1.7.0",
+ "prosemirror-dropcursor": "^1.3.0",
+ "prosemirror-gapcursor": "^1.1.0",
+ "prosemirror-history": "^1.1.0",
+ "prosemirror-inputrules": "^1.1.0",
+ "prosemirror-keymap": "^1.1.0",
+ "prosemirror-model": "^1.8.0",
"prosemirror-state": "^1.2.2",
- "prosemirror-transform": "^1.1.3",
- "prosemirror-view": "^1.8.9",
- "react": "^16.8.4",
- "react-dom": "^16.8.4",
+ "prosemirror-transform": "^1.2.0",
+ "prosemirror-view": "^1.13.1",
+ "react": "^16.8.6",
+ "react-dom": "^16.8.6",
"styled-components": "^4.2.0"
},
"devDependencies": {
diff --git a/wax-prosemirror-layouts/src/layouts/EditoriaLayout.js b/wax-prosemirror-layouts/src/layouts/EditoriaLayout.js
index b70150b960f4232caaa2b1469f56adba17f8edd3..5f4c4dd0b2a36558bf455bba44e8d0b632ed3a47 100644
--- a/wax-prosemirror-layouts/src/layouts/EditoriaLayout.js
+++ b/wax-prosemirror-layouts/src/layouts/EditoriaLayout.js
@@ -1,6 +1,6 @@
import styled, { ThemeProvider } from "styled-components";
import React, { Fragment } from "react";
-import { MainMenuBar, SideMenuBar } from "wax-prosemirror-components";
+import { MainMenuBar, SideMenuBar, InfoArea } from "wax-prosemirror-components";
import EditorElements from "./EditorElements";
import { cokoTheme } from "wax-prosemirror-themes";
@@ -35,7 +35,6 @@ const WaxSurfaceScroll = styled.div`
const CommentsContainer = styled.div``;
const NotesContainer = styled.div``;
-const InfoAreaContainer = styled.div``;
const EditoriaLayout = ({ editor, view, ...props }) => (
<ThemeProvider theme={cokoTheme}>
@@ -47,6 +46,7 @@ const EditoriaLayout = ({ editor, view, ...props }) => (
{editor}
</WaxSurfaceScroll>
</WaxSurfaceContainer>
+ <InfoArea />
</LayoutWrapper>
</ThemeProvider>
);
diff --git a/wax-prosemirror-plugins/package.json b/wax-prosemirror-plugins/package.json
index 7c14e10bbdc965b1514a2dca3a3311b9f88f1f2b..df3f425273551097a9a157948f5a3ea0a362335c 100644
--- a/wax-prosemirror-plugins/package.json
+++ b/wax-prosemirror-plugins/package.json
@@ -10,6 +10,6 @@
},
"dependencies": {
"prosemirror-state": "^1.2.2",
- "prosemirror-view": "^1.8.9"
+ "prosemirror-view": "^1.13.1"
}
}
diff --git a/wax-prosemirror-schema/package.json b/wax-prosemirror-schema/package.json
index 3eaf662436046941de32230fa5bc77a63995d540..a8f8fc69916ad227f1f0ab5cb24416ffb5cba403 100644
--- a/wax-prosemirror-schema/package.json
+++ b/wax-prosemirror-schema/package.json
@@ -10,6 +10,6 @@
},
"dependencies": {
"prosemirror-schema-list": "^1.0.0",
- "prosemirror-tables": "^0.7.10"
+ "prosemirror-tables": "^0.9.5"
}
}
diff --git a/wax-prosemirror-themes/src/coko-theme/index.js b/wax-prosemirror-themes/src/coko-theme/index.js
index 314007987680eb80babb87da18fc5554362c028a..d400d828fc775e35cee0406c405d3c7394b7aa7b 100644
--- a/wax-prosemirror-themes/src/coko-theme/index.js
+++ b/wax-prosemirror-themes/src/coko-theme/index.js
@@ -2,7 +2,7 @@
import "typeface-fira-sans-condensed";
import "typeface-vollkorn";
-import { ButtonStyled } from "./elements";
+import { ButtonStyles } from "./elements";
const cokoTheme = {
/* Colors */
@@ -69,7 +69,7 @@ const cokoTheme = {
cssOverrides: {
ui: {
- ButtonStyled
+ ButtonStyles
}
}
};