Open platform to collect and prioritize feedback
Fixed some niggles, styling
Matt Roberts6097f65b5000
diff --git a/package-lock.json b/package-lock.jsonindex 495c1b639..5350603b6 100644--- a/package-lock.json+++ b/package-lock.json@@ -10,6 +10,7 @@"dependencies": {"@lingui/format-json": "^5.1.2","@lingui/react": "^5.1.2",+ "@tiptap/extension-hard-break": "^2.11.5","@tiptap/extension-mention": "^2.11.5","@tiptap/extension-placeholder": "^2.11.5","@tiptap/pm": "^2.11.5",@@ -23,10 +24,6 @@"react-dom": "^18.3.1","react-textarea-autosize": "^8.5.4","react-toastify": "^9.0.1",- "slate": "^0.110.2",- "slate-history": "^0.110.3",- "slate-react": "^0.111.0",- "tippy.js": "^6.3.7","tiptap-markdown": "^0.8.10"},"devDependencies": {@@ -3718,12 +3715,6 @@"@jridgewell/sourcemap-codec": "^1.4.14"}},- "node_modules/@juggle/resize-observer": {- "version": "3.4.0",- "resolved": "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.4.0.tgz",- "integrity": "sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==",- "license": "Apache-2.0"- },"node_modules/@lingui/babel-plugin-extract-messages": {"version": "5.1.2","resolved": "https://registry.npmjs.org/@lingui/babel-plugin-extract-messages/-/babel-plugin-extract-messages-5.1.2.tgz",@@ -7107,12 +7098,6 @@"url": "https://github.com/sponsors/sindresorhus"}},- "node_modules/compute-scroll-into-view": {- "version": "3.1.0",- "resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-3.1.0.tgz",- "integrity": "sha512-rj8l8pD4bJ1nx+dAkMhV1xB5RuZEyVysfxJqB1pRchh1KVvwOv9b7CGB8ZfjTImVv2oF+sYMUkMZq6Na5Ftmbg==",- "license": "MIT"- },"node_modules/concat-map": {"version": "0.0.1","resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",@@ -7739,19 +7724,6 @@"node": ">=8"}},- "node_modules/direction": {- "version": "1.0.4",- "resolved": "https://registry.npmjs.org/direction/-/direction-1.0.4.tgz",- "integrity": "sha512-GYqKi1aH7PJXxdhTeZBFrg8vUBeKXi+cNprXsC1kpJcbcVnV9wBsrOu1cQEdG0WeQwlfHiy3XvnKfIrJ2R0NzQ==",- "license": "MIT",- "bin": {- "direction": "cli.js"- },- "funding": {- "type": "github",- "url": "https://github.com/sponsors/wooorm"- }- },"node_modules/doctrine": {"version": "3.0.0","resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",@@ -10316,16 +10288,6 @@"node": ">=0.10.0"}},- "node_modules/immer": {- "version": "10.1.1",- "resolved": "https://registry.npmjs.org/immer/-/immer-10.1.1.tgz",- "integrity": "sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==",- "license": "MIT",- "funding": {- "type": "opencollective",- "url": "https://opencollective.com/immer"- }- },"node_modules/immutable": {"version": "4.3.7","resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz",@@ -10694,12 +10656,6 @@"node": ">=0.10.0"}},- "node_modules/is-hotkey": {- "version": "0.2.0",- "resolved": "https://registry.npmjs.org/is-hotkey/-/is-hotkey-0.2.0.tgz",- "integrity": "sha512-UknnZK4RakDmTgz4PI1wIph5yxSs/mvChWs9ifnlXsKuXgWmOkY/hAE0H/k2MIqH0RlRye0i1oC07MCRSD28Mw==",- "license": "MIT"- },"node_modules/is-interactive": {"version": "1.0.0","resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",@@ -12958,6 +12914,7 @@"version": "4.17.21","resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz","integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",+ "dev": true,"license": "MIT"},"node_modules/lodash-es": {@@ -15749,15 +15706,6 @@"url": "https://opencollective.com/webpack"}},- "node_modules/scroll-into-view-if-needed": {- "version": "3.1.0",- "resolved": "https://registry.npmjs.org/scroll-into-view-if-needed/-/scroll-into-view-if-needed-3.1.0.tgz",- "integrity": "sha512-49oNpRjWRvnU8NyGVmUaYG4jtTkNonFZI86MmGRDqBphEK2EXT9gdEUoQPZhuBM8yWHxCWbobltqYO5M4XrUvQ==",- "license": "MIT",- "dependencies": {- "compute-scroll-into-view": "^3.0.2"- }- },"node_modules/seed-random": {"version": "2.2.0","resolved": "https://registry.npmjs.org/seed-random/-/seed-random-2.2.0.tgz",@@ -15929,106 +15877,6 @@"node": ">=8"}},- "node_modules/slate": {- "version": "0.110.2",- "resolved": "https://registry.npmjs.org/slate/-/slate-0.110.2.tgz",- "integrity": "sha512-4xGULnyMCiEQ0Ml7JAC1A6HVE6MNpPJU7Eq4cXh1LxlrR0dFXC3XC+rNfQtUJ7chHoPkws57x7DDiWiZAt+PBA==",- "license": "MIT",- "dependencies": {- "immer": "^10.0.3",- "is-plain-object": "^5.0.0",- "tiny-warning": "^1.0.3"- }- },- "node_modules/slate-dom": {- "version": "0.111.0",- "resolved": "https://registry.npmjs.org/slate-dom/-/slate-dom-0.111.0.tgz",- "integrity": "sha512-VjeBh2xIRvP6ToEhrO1TPahc5fPezxbeSUhsRTppBPtHfidEdyp/MTI9TjUrZnlznJiVZ7QKrORXilFq8hsbtQ==",- "license": "MIT",- "peer": true,- "dependencies": {- "@juggle/resize-observer": "^3.4.0",- "direction": "^1.0.4",- "is-hotkey": "^0.2.0",- "is-plain-object": "^5.0.0",- "lodash": "^4.17.21",- "scroll-into-view-if-needed": "^3.1.0",- "tiny-invariant": "1.3.1"- },- "peerDependencies": {- "slate": ">=0.99.0"- }- },- "node_modules/slate-dom/node_modules/is-plain-object": {- "version": "5.0.0",- "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",- "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",- "license": "MIT",- "peer": true,- "engines": {- "node": ">=0.10.0"- }- },- "node_modules/slate-history": {- "version": "0.110.3",- "resolved": "https://registry.npmjs.org/slate-history/-/slate-history-0.110.3.tgz",- "integrity": "sha512-sgdff4Usdflmw5ZUbhDkxFwCBQ2qlDKMMkF93w66KdV48vHOgN2BmLrf+2H8SdX8PYIpP/cTB0w8qWC2GwhDVA==",- "license": "MIT",- "dependencies": {- "is-plain-object": "^5.0.0"- },- "peerDependencies": {- "slate": ">=0.65.3"- }- },- "node_modules/slate-history/node_modules/is-plain-object": {- "version": "5.0.0",- "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",- "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",- "license": "MIT",- "engines": {- "node": ">=0.10.0"- }- },- "node_modules/slate-react": {- "version": "0.111.0",- "resolved": "https://registry.npmjs.org/slate-react/-/slate-react-0.111.0.tgz",- "integrity": "sha512-DiiVSYn+dilx0j40FjaaHiG2KbaX4lZfTdEnYvUJMnpc+d9evcuO2nV6KCDQOtS6xr4w0sBzQMxrpGlA5alKww==",- "license": "MIT",- "dependencies": {- "@juggle/resize-observer": "^3.4.0",- "direction": "^1.0.4",- "is-hotkey": "^0.2.0",- "is-plain-object": "^5.0.0",- "lodash": "^4.17.21",- "scroll-into-view-if-needed": "^3.1.0",- "tiny-invariant": "1.3.1"- },- "peerDependencies": {- "react": ">=18.2.0",- "react-dom": ">=18.2.0",- "slate": ">=0.99.0",- "slate-dom": ">=0.110.2"- }- },- "node_modules/slate-react/node_modules/is-plain-object": {- "version": "5.0.0",- "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",- "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",- "license": "MIT",- "engines": {- "node": ">=0.10.0"- }- },- "node_modules/slate/node_modules/is-plain-object": {- "version": "5.0.0",- "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz",- "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==",- "license": "MIT",- "engines": {- "node": ">=0.10.0"- }- },"node_modules/snapdragon": {"version": "0.8.2","resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",@@ -17263,18 +17111,6 @@"dev": true,"license": "MIT"},- "node_modules/tiny-invariant": {- "version": "1.3.1",- "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.1.tgz",- "integrity": "sha512-AD5ih2NlSssTCwsMznbvwMZpJ1cbhkGd2uueNxzv2jDlEeZdU04JQfRnggJQ8DrcVBGjAsCKwFBbDlVNtEMlzw==",- "license": "MIT"- },- "node_modules/tiny-warning": {- "version": "1.0.3",- "resolved": "https://registry.npmjs.org/tiny-warning/-/tiny-warning-1.0.3.tgz",- "integrity": "sha512-lBN9zLN/oAf68o3zNXYrdCt1kP8WsiGW8Oo2ka41b2IM5JL/S1CTyX1rW0mb/zSuJun0ZUrDxx4sqvYS2FWzPA==",- "license": "MIT"- },"node_modules/tippy.js": {"version": "6.3.7","resolved": "https://registry.npmjs.org/tippy.js/-/tippy.js-6.3.7.tgz",diff --git a/package.json b/package.jsonindex 9b66d8984..dae6d9b3e 100644--- a/package.json+++ b/package.json@@ -6,6 +6,7 @@"dependencies": {"@lingui/format-json": "^5.1.2","@lingui/react": "^5.1.2",+ "@tiptap/extension-hard-break": "^2.11.5","@tiptap/extension-mention": "^2.11.5","@tiptap/extension-placeholder": "^2.11.5","@tiptap/pm": "^2.11.5",diff --git a/public/components/common/form/CommentEditor.scss b/public/components/common/form/CommentEditor.scssindex c9d017a82..6fb0d44d2 100644--- a/public/components/common/form/CommentEditor.scss+++ b/public/components/common/form/CommentEditor.scss@@ -2,8 +2,9 @@/* Styling for content elements */.fider-tiptap-editor .ProseMirror {- p {- margin: 0 0 0.75em 0;+ p,+ pre {+ margin: 0 0 0.25em 0;}ul,ol {@@ -20,6 +21,7 @@.c-editor-toolbar {border-bottom: 1px solid get("colors.gray.300");padding: spacing(1);+ height: 40px;}.c-editor-button-group {diff --git a/public/components/common/form/CommentEditor.tsx b/public/components/common/form/CommentEditor.tsxindex 531d9d159..f919e2206 100644--- a/public/components/common/form/CommentEditor.tsx+++ b/public/components/common/form/CommentEditor.tsx@@ -8,6 +8,7 @@ import Placeholder from "@tiptap/extension-placeholder"import Document from "@tiptap/extension-document"import Paragraph from "@tiptap/extension-paragraph"import Text from "@tiptap/extension-text"+import HardBreak from "@tiptap/extension-hard-break"import "./CommentEditor.scss"@@ -160,10 +161,11 @@ interface CommentEditorProps {const markdownToHtml = (markdownString: string) => {return markdownString- .replace("\n\n", "\n")- .split("\n")+ .split("\n\n").map((line: string) => `<p>${line}</p>`).join("")+ .replace(/\\\n/g, "<br>")+ .replace(/\n/g, "<br>")}const Tiptap: React.FunctionComponent<CommentEditorProps> = (props) => {@@ -197,7 +199,7 @@ const Tiptap: React.FunctionComponent<CommentEditorProps> = (props) => {const updated = ({ editor }: { editor: Editor; transaction: any }): void => {const markdown = isRawMarkdownMode ? editor.getText() : editor.storage.markdown.getMarkdown()- console.log("updated", markdown)+ console.log("updated", JSON.stringify(markdown))props.onChange && props.onChange(markdown)}@@ -207,6 +209,7 @@ const Tiptap: React.FunctionComponent<CommentEditorProps> = (props) => {Document,Paragraph,Text,+ HardBreak,Placeholder.configure({placeholder: props.placeholder ?? "Write your comment here...",emptyEditorClass: "tiptap-is-empty",@@ -216,6 +219,7 @@ const Tiptap: React.FunctionComponent<CommentEditorProps> = (props) => {StarterKit,Markdown.configure({html: true,+ breaks: true,}),CustomMention.configure({HTMLAttributes: {