diff --git a/wax-prosemirror-components/src/components/notes/NoteEditorContainer.js b/wax-prosemirror-components/src/components/notes/NoteEditorContainer.js index a70081570690b4e73e71e69703155c5bef7c0a0f..56f1019a952c64ac1ee861fca4e2226ae489b6c3 100644 --- a/wax-prosemirror-components/src/components/notes/NoteEditorContainer.js +++ b/wax-prosemirror-components/src/components/notes/NoteEditorContainer.js @@ -1,15 +1,27 @@ -import React, { useRef } from "react"; +import React from "react"; import styled from "styled-components"; +import NoteNumber from "./NoteNumber"; + const NoteEditorContainerStyled = styled.div` + display: flex; + flex-direction: row; height: 50px; width: 61%; margin-left: 14%; +`; + +const NoteStyled = styled.div` + display: flex; + width: 96%; + height: 100%; border: 1px solid black; `; const NoteEditorContainer = React.forwardRef((props, ref) => ( - <NoteEditorContainerStyled ref={ref} {...props} /> + <NoteEditorContainerStyled> + <NoteNumber /> <NoteStyled ref={ref} {...props} /> + </NoteEditorContainerStyled> )); export default NoteEditorContainer; diff --git a/wax-prosemirror-components/src/components/notes/NoteNumber.js b/wax-prosemirror-components/src/components/notes/NoteNumber.js new file mode 100644 index 0000000000000000000000000000000000000000..24169464328e15d3e8c38a835886d9d7ca41a2a8 --- /dev/null +++ b/wax-prosemirror-components/src/components/notes/NoteNumber.js @@ -0,0 +1,13 @@ +import React from "react"; +import styled from "styled-components"; + +const NoteNumberStyled = styled.div` + display: flex; + width: 2%; +`; + +const NoteNumber = ({ number }) => { + return <NoteNumberStyled>1.</NoteNumberStyled>; +}; + +export default NoteNumber; diff --git a/wax-prosemirror-services/src/LinkService/LinkTool.js b/wax-prosemirror-services/src/LinkService/LinkTool.js index a34f8930135459bd07524272799c604ff0b18d85..6a7f7054a4e6f1a7abbd644964ed64d7c138f742 100644 --- a/wax-prosemirror-services/src/LinkService/LinkTool.js +++ b/wax-prosemirror-services/src/LinkService/LinkTool.js @@ -15,6 +15,7 @@ export default class LinkTool extends Tools { toggleMark(state.config.schema.marks.link)(state, dispatch); return true; } + //TODO disable creating multiblock links Commands.createLink(state, dispatch); }; } diff --git a/wax-prosemirror-services/src/NoteService/Editor.js b/wax-prosemirror-services/src/NoteService/Editor.js index bfbb79669c4340114f626d2081320593c1e597db..9a037ee86db9a1f1ccf1002fb97bff9fcaa023b9 100644 --- a/wax-prosemirror-services/src/NoteService/Editor.js +++ b/wax-prosemirror-services/src/NoteService/Editor.js @@ -9,6 +9,7 @@ import { Commands } from "wax-prosemirror-utilities"; import { NoteEditorContainer } from "wax-prosemirror-components"; export default ({ node, view, pos }) => { + console.log(pos); const editorRef = useRef(); const context = useContext(WaxContext); @@ -62,6 +63,7 @@ export default ({ node, view, pos }) => { } } ); + noteView.focus(); context.updateView({ [pos]: noteView }); }, []);