From 33b7bbf67423938da622c55c9ef5b3d6a57e4f58 Mon Sep 17 00:00:00 2001
From: chris <kokosias@yahoo.gr>
Date: Tue, 4 Feb 2020 17:06:47 +0200
Subject: [PATCH] basic note components
---
.../src/components/notes/NoteEditorContainer.js | 16 ++++++++++++++--
.../src/components/notes/NoteNumber.js | 13 +++++++++++++
.../src/LinkService/LinkTool.js | 1 +
.../src/NoteService/Editor.js | 2 ++
4 files changed, 30 insertions(+), 2 deletions(-)
create mode 100644 wax-prosemirror-components/src/components/notes/NoteNumber.js
diff --git a/wax-prosemirror-components/src/components/notes/NoteEditorContainer.js b/wax-prosemirror-components/src/components/notes/NoteEditorContainer.js
index a70081570..56f1019a9 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 000000000..241694643
--- /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 a34f89301..6a7f7054a 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 bfbb79669..9a037ee86 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 });
}, []);
--
GitLab