diff --git a/src/components/bars/SubmitBar/index.tsx b/src/components/bars/SubmitBar/index.tsx index da44ab82..d5952c43 100644 --- a/src/components/bars/SubmitBar/index.tsx +++ b/src/components/bars/SubmitBar/index.tsx @@ -17,6 +17,7 @@ type IProps = typeof mapDispatchToProps & {}; const SubmitBarUnconnected: FC = ({ nodeCreate }) => { const onOpenImageEditor = useCallback(() => nodeCreate(NODE_TYPES.IMAGE), [nodeCreate]); + const onOpenTextEditor = useCallback(() => nodeCreate(NODE_TYPES.TEXT), [nodeCreate]); return (
@@ -24,6 +25,10 @@ const SubmitBarUnconnected: FC = ({ nodeCreate }) => {
+ +
+ +
diff --git a/src/components/editors/TextEditor/styles.scss b/src/components/editors/TextEditor/styles.scss index 4d3618e6..86245f67 100644 --- a/src/components/editors/TextEditor/styles.scss +++ b/src/components/editors/TextEditor/styles.scss @@ -1,3 +1,5 @@ .wrap { - padding-bottom: 60px; + & > div { + padding-bottom: 64px; + } } diff --git a/src/containers/dialogs/EditorDialog/index.tsx b/src/containers/dialogs/EditorDialog/index.tsx index 02d5a53e..8257e08d 100644 --- a/src/containers/dialogs/EditorDialog/index.tsx +++ b/src/containers/dialogs/EditorDialog/index.tsx @@ -13,12 +13,14 @@ import { EditorPanel } from '~/components/editors/EditorPanel'; import * as NODE_ACTIONS from '~/redux/node/actions'; import { selectUploads } from '~/redux/uploads/selectors'; import { ERROR_LITERAL } from '~/constants/errors'; -import { NODE_EDITORS } from '~/redux/node/constants'; +import { NODE_EDITORS, EMPTY_NODE } from '~/redux/node/constants'; const mapStateToProps = state => { const { editor, errors } = selectNode(state); const { statuses, files } = selectUploads(state); + console.log('mss', { editor }); + return { editor, statuses, files, errors }; }; @@ -41,9 +43,11 @@ const EditorDialogUnconnected: FC = ({ onRequestClose, type, }) => { - const [data, setData] = useState(editor); + const [data, setData] = useState(EMPTY_NODE); const [temp, setTemp] = useState([]); + useEffect(() => setData(editor), [editor]); + const setTitle = useCallback( title => { setData({ ...data, title }); @@ -53,10 +57,12 @@ const EditorDialogUnconnected: FC = ({ const onSubmit = useCallback( (event: FormEvent) => { + console.log({ data, editor }); event.preventDefault(); + return; nodeSave(data); }, - [data, nodeSave] + [data, nodeSave, editor] ); useEffect(() => { diff --git a/src/redux/node/handlers.ts b/src/redux/node/handlers.ts index 8600f9b2..3ed37d47 100644 --- a/src/redux/node/handlers.ts +++ b/src/redux/node/handlers.ts @@ -44,7 +44,7 @@ const setTags = (state: INodeState, { tags }: ReturnType) => assocPath(['current', 'tags'], tags, state); const setEditor = (state: INodeState, { editor }: ReturnType) => - assocPath(['current', 'editor'], editor, state); + assocPath(['editor'], editor, state); export const NODE_HANDLERS = { [NODE_ACTIONS.SET_SAVE_ERRORS]: setSaveErrors, diff --git a/src/styles/inputs.scss b/src/styles/inputs.scss index 960b61cb..a605a81d 100644 --- a/src/styles/inputs.scss +++ b/src/styles/inputs.scss @@ -38,7 +38,7 @@ &.focused { opacity: 1; - z-index: 999; + // z-index: 999; &.has_status .status { flex-basis: 0;