From f1af89fe57ff06f3a784d0875da71204b060b9b5 Mon Sep 17 00:00:00 2001 From: saseungmin Date: Fri, 27 Nov 2020 02:11:47 +0900 Subject: [PATCH 1/2] [Feature] Applying to draft.js editor --- __mocks__/fileMock.js | 1 + __mocks__/styleMock.js | 1 + jest.config.js | 4 + package-lock.json | 134 +++++++++++++++++- package.json | 4 + src/components/write/WriteEditor.jsx | 44 ++++++ src/components/write/WriteEditor.test.jsx | 20 +++ src/components/write/WriteForm.jsx | 13 +- src/components/write/WriteForm.test.jsx | 3 +- src/containers/write/WriteEditorContainer.jsx | 28 ++++ .../write/WriteEditorContainer.test.jsx | 49 +++++++ .../write/WriteFormContainer.test.jsx | 1 - src/index.jsx | 1 + src/pages/WritePage.jsx | 2 + src/pages/WritePage.test.jsx | 1 - 15 files changed, 288 insertions(+), 18 deletions(-) create mode 100644 __mocks__/fileMock.js create mode 100644 __mocks__/styleMock.js create mode 100644 src/components/write/WriteEditor.jsx create mode 100644 src/components/write/WriteEditor.test.jsx create mode 100644 src/containers/write/WriteEditorContainer.jsx create mode 100644 src/containers/write/WriteEditorContainer.test.jsx diff --git a/__mocks__/fileMock.js b/__mocks__/fileMock.js new file mode 100644 index 0000000..86059f3 --- /dev/null +++ b/__mocks__/fileMock.js @@ -0,0 +1 @@ +module.exports = 'test-file-stub'; diff --git a/__mocks__/styleMock.js b/__mocks__/styleMock.js new file mode 100644 index 0000000..f053ebf --- /dev/null +++ b/__mocks__/styleMock.js @@ -0,0 +1 @@ +module.exports = {}; diff --git a/jest.config.js b/jest.config.js index 7d826e8..8586944 100644 --- a/jest.config.js +++ b/jest.config.js @@ -12,4 +12,8 @@ module.exports = { statements: 100, }, }, + moduleNameMapper: { + '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': '/__mocks__/fileMock.js', + '\\.(css|less)$': '/__mocks__/styleMock.js', + }, }; diff --git a/package-lock.json b/package-lock.json index 547ca38..38bf243 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2690,6 +2690,11 @@ "function-bind": "^1.1.1" } }, + "asap": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", + "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=" + }, "asn1": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", @@ -3863,6 +3868,11 @@ } } }, + "classnames": { + "version": "2.2.6", + "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz", + "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==" + }, "clean-css": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.2.3.tgz", @@ -4190,6 +4200,11 @@ "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", "dev": true }, + "core-js": { + "version": "3.8.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.8.0.tgz", + "integrity": "sha512-W2VYNB0nwQQE7tKS7HzXd7r2y/y2SVJl4ga6oH/dnaLFzM0o2lB2P3zCkWj5Wc/zyMYjtgd5Hmhk0ObkQFZOIA==" + }, "core-js-compat": { "version": "3.7.0", "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.7.0.tgz", @@ -4287,6 +4302,14 @@ "sha.js": "^2.4.8" } }, + "cross-fetch": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.0.6.tgz", + "integrity": "sha512-KBPUbqgFjzWlVcURG+Svp9TlhA5uliYtiNx/0r8nv0pdypeQCRJ9IaSIc3q/x3q8t3F75cHuwxVql1HFGHCNJQ==", + "requires": { + "node-fetch": "2.6.1" + } + }, "cross-spawn": { "version": "6.0.5", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", @@ -4850,6 +4873,26 @@ "is-obj": "^2.0.0" } }, + "draft-js": { + "version": "0.11.7", + "resolved": "https://registry.npmjs.org/draft-js/-/draft-js-0.11.7.tgz", + "integrity": "sha512-ne7yFfN4sEL82QPQEn80xnADR8/Q6ALVworbC5UOSzOvjffmYfFsr3xSZtxbIirti14R7Y33EZC5rivpLgIbsg==", + "requires": { + "fbjs": "^2.0.0", + "immutable": "~3.7.4", + "object-assign": "^4.1.1" + } + }, + "draftjs-to-html": { + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/draftjs-to-html/-/draftjs-to-html-0.9.1.tgz", + "integrity": "sha512-fFstE6+IayaVFBEvaFt/wN8vdj8FsTRzij7dy7LI9QIwf5LgfHFi9zSpvCg+feJ2tbYVqHxUkjcibwpsTpgFVQ==" + }, + "draftjs-utils": { + "version": "0.10.2", + "resolved": "https://registry.npmjs.org/draftjs-utils/-/draftjs-utils-0.10.2.tgz", + "integrity": "sha512-EstHqr3R3JVcilJrBaO/A+01GvwwKmC7e4TCjC7S94ZeMh4IVmf60OuQXtHHpwItK8C2JCi3iljgN5KHkJboUg==" + }, "duplexer": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", @@ -6033,6 +6076,26 @@ "bser": "2.1.1" } }, + "fbjs": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-2.0.0.tgz", + "integrity": "sha512-8XA8ny9ifxrAWlyhAbexXcs3rRMtxWcs3M0lctLfB49jRDHiaxj+Mo0XxbwE7nKZYzgCFoq64FS+WFd4IycPPQ==", + "requires": { + "core-js": "^3.6.4", + "cross-fetch": "^3.0.4", + "fbjs-css-vars": "^1.0.0", + "loose-envify": "^1.0.0", + "object-assign": "^4.1.0", + "promise": "^7.1.1", + "setimmediate": "^1.0.5", + "ua-parser-js": "^0.7.18" + } + }, + "fbjs-css-vars": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz", + "integrity": "sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ==" + }, "figgy-pudding": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz", @@ -6629,6 +6692,12 @@ "har-schema": "^2.0.0" } }, + "harmony-reflect": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/harmony-reflect/-/harmony-reflect-1.6.1.tgz", + "integrity": "sha512-WJTeyp0JzGtHcuMsi7rw2VwtkvLa+JyfEKJCFyfcS0+CDkjQ5lHPu7zEhFZP+PDSRrEgXa5Ah0l1MbgbE41XjA==", + "dev": true + }, "has": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", @@ -6855,6 +6924,11 @@ } } }, + "html-to-draftjs": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/html-to-draftjs/-/html-to-draftjs-1.5.0.tgz", + "integrity": "sha512-kggLXBNciKDwKf+KYsuE+V5gw4dZ7nHyGMX9m0wy7urzWjKGWyNFetmArRLvRV0VrxKN70WylFsJvMTJx02OBQ==" + }, "html-webpack-plugin": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-4.5.0.tgz", @@ -7104,6 +7178,15 @@ "integrity": "sha512-aF2Cf/CkEZrI/vsu5WI/I+akFgdbwQHVE9YRZxATrhH4PVIe6a3BIjwjEcW+z+jP/hNh+YvM3lAAn1wJQ6opSg==", "dev": true }, + "identity-obj-proxy": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/identity-obj-proxy/-/identity-obj-proxy-3.0.0.tgz", + "integrity": "sha1-lNK9qWCERT7zb7xarsN+D3nx/BQ=", + "dev": true, + "requires": { + "harmony-reflect": "^1.4.6" + } + }, "ieee754": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", @@ -7127,6 +7210,11 @@ "resolved": "https://registry.npmjs.org/immer/-/immer-7.0.14.tgz", "integrity": "sha512-BxCs6pJwhgSEUEOZjywW7OA8DXVzfHjkBelSEl0A+nEu0+zS4cFVdNOONvt55N4WOm8Pu4xqSPYxhm1Lv2iBBA==" }, + "immutable": { + "version": "3.7.6", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-3.7.6.tgz", + "integrity": "sha1-E7TTyxK++hVIKib+Gy665kAHHks=" + }, "import-fresh": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz", @@ -9398,6 +9486,14 @@ "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=" }, + "linkify-it": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-2.2.0.tgz", + "integrity": "sha512-GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==", + "requires": { + "uc.micro": "^1.0.1" + } + }, "load-json-file": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", @@ -9968,6 +10064,11 @@ "tslib": "^1.10.0" } }, + "node-fetch": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz", + "integrity": "sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==" + }, "node-forge": { "version": "0.10.0", "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz", @@ -10892,6 +10993,14 @@ "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", "dev": true }, + "promise": { + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz", + "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==", + "requires": { + "asap": "~2.0.3" + } + }, "promise-inflight": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", @@ -11126,6 +11235,18 @@ "scheduler": "^0.20.1" } }, + "react-draft-wysiwyg": { + "version": "1.14.5", + "resolved": "https://registry.npmjs.org/react-draft-wysiwyg/-/react-draft-wysiwyg-1.14.5.tgz", + "integrity": "sha512-utbJEs91757QXYoBwKRb/4kB3JdswLlj0heUiAeXs/OxZAUISJXxLMFLBIixRlIcUnNkwxOsMikRshDMtWIS3g==", + "requires": { + "classnames": "^2.2.6", + "draftjs-utils": "^0.10.2", + "html-to-draftjs": "^1.5.0", + "linkify-it": "^2.2.0", + "prop-types": "^15.7.2" + } + }, "react-is": { "version": "16.13.1", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", @@ -12250,8 +12371,7 @@ "setimmediate": { "version": "1.0.5", "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=", - "dev": true + "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=" }, "setprototypeof": { "version": "1.1.1", @@ -13517,6 +13637,16 @@ "is-typedarray": "^1.0.0" } }, + "ua-parser-js": { + "version": "0.7.22", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.22.tgz", + "integrity": "sha512-YUxzMjJ5T71w6a8WWVcMGM6YWOTX27rCoIQgLXiWaxqXSx9D7DNjiGWn1aJIRSQ5qr0xuhra77bSIh6voR/46Q==" + }, + "uc.micro": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", + "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==" + }, "unicode-canonical-property-names-ecmascript": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz", diff --git a/package.json b/package.json index 89c3206..5783733 100644 --- a/package.json +++ b/package.json @@ -28,11 +28,14 @@ "@emotion/styled": "^11.0.0", "@reduxjs/toolkit": "^1.4.0", "axios": "^0.21.0", + "draft-js": "^0.11.7", + "draftjs-to-html": "^0.9.1", "moment": "^2.29.1", "moment-timezone": "^0.5.32", "qs": "^6.9.4", "react": "^17.0.1", "react-dom": "^17.0.1", + "react-draft-wysiwyg": "^1.14.5", "react-moment": "^1.0.0", "react-redux": "^7.2.2", "react-router-dom": "^5.2.0", @@ -58,6 +61,7 @@ "file-loader": "^6.2.0", "given2": "^2.1.7", "html-webpack-plugin": "^4.5.0", + "identity-obj-proxy": "^3.0.0", "jest": "^26.6.3", "jest-plugin-context": "^2.9.0", "json-server": "^0.16.3", diff --git a/src/components/write/WriteEditor.jsx b/src/components/write/WriteEditor.jsx new file mode 100644 index 0000000..7487096 --- /dev/null +++ b/src/components/write/WriteEditor.jsx @@ -0,0 +1,44 @@ +import React, { useState } from 'react'; + +import styled from '@emotion/styled'; + +import { EditorState, convertToRaw } from 'draft-js'; +import draftToHtml from 'draftjs-to-html'; +import { Editor } from 'react-draft-wysiwyg'; + +const WriteEditorWrapper = styled.div``; + +const WriteEditor = ({ onChange }) => { + const [editorState, setEditorState] = useState(EditorState.createEmpty()); + + const handleChangeEditor = (state) => { + setEditorState(state); + onChange({ + name: 'contents', + value: draftToHtml(convertToRaw(state.getCurrentContent())), + }); + }; + + return ( + + + + ); +}; + +export default WriteEditor; diff --git a/src/components/write/WriteEditor.test.jsx b/src/components/write/WriteEditor.test.jsx new file mode 100644 index 0000000..7ce6166 --- /dev/null +++ b/src/components/write/WriteEditor.test.jsx @@ -0,0 +1,20 @@ +import React from 'react'; + +import { render } from '@testing-library/react'; + +import WriteEditor from './WriteEditor'; + +describe('WriteEditor', () => { + const handleChange = jest.fn(); + const renderWriteButtons = () => render(( + + )); + + it('render Write Editor', () => { + const { container } = renderWriteButtons(); + + expect(container).toHaveTextContent('내용을 작성해주세요.'); + }); +}); diff --git a/src/components/write/WriteForm.jsx b/src/components/write/WriteForm.jsx index 9a4cdd7..300ee8d 100644 --- a/src/components/write/WriteForm.jsx +++ b/src/components/write/WriteForm.jsx @@ -6,7 +6,7 @@ const WriteFormWrapper = styled.div``; const WriteForm = ({ onChange, fields }) => { const { - title, applyEndDate, personnel, contents, + title, applyEndDate, personnel, } = fields; const handleChange = (e) => { @@ -46,17 +46,6 @@ const WriteForm = ({ onChange, fields }) => { id="participants-number" /> -
- {/* TODO: 추후 draft.js를 사용하여 변경 예정 */} -