Merge branch 'develop' into feat/DEVSU-2179-report-specific-appendix-2

Author: elewis2

app/components/IPRWYSIWYGEditor/index.tsx

@@ -14,6 +14,7 @@ import {
   Box,
 } from '@mui/material';
 import './index.scss';
+import Underline from '@tiptap/extension-underline';
 import {
   useEditor, EditorContent, Editor,
 } from '@tiptap/react';
@@ -25,6 +26,7 @@ import {
 
 const extensions = [
   StarterKit,
+  Underline,
 ];
 
 const MenuBarButton = forwardRef<HTMLButtonElement, ToggleButtonProps>(
@@ -61,7 +63,7 @@ const MenuBar = ({
             <FormatItalic />
           </MenuBarButton>
           <MenuBarButton
-            onClick={() => editor.chain().focus().toggleCode().run()}
+            onClick={() => editor.chain().focus().toggleUnderline().run()}
             value="underline"
             selected={editor.isActive('underline')}
           >

package-lock.json

@@ -109,6 +109,7 @@
     "@mui/system": "~5.14.8",
     "@storybook/addon-actions": "~7.4.0",
     "@storybook/react": "^7.4.0",
+    "@tiptap/extension-underline": "^2.2.3",
     "@tiptap/pm": "^2.1.12",
     "@tiptap/react": "^2.1.12",
     "@tiptap/starter-kit": "^2.1.12",