@squiz/formatted-text-editor 1.12.0-alpha.44 → 1.12.0-alpha.46

package/lib/ui/Inputs/Select/Select.js

@@ -6,7 +6,7 @@ import clsx from 'clsx';
 export const Select = ({ id, label, value, options }) => {
     const [selectedOption, setSelectedOption] = useState(value);
     return (React.createElement(React.Fragment, null,
-        label && (React.createElement("label", { htmlFor: id, className: "sds-form-label" }, label)),
+        label && (React.createElement("label", { htmlFor: id, className: "squiz-fte-form-label" }, label)),
         React.createElement("div", { className: "relative text-md text-gray-800" },
             React.createElement(Listbox, { value: selectedOption, onChange: setSelectedOption, name: id, "aria-labelledby": id }, ({ open }) => (React.createElement(React.Fragment, null,
                 React.createElement(Listbox.Label, { className: "sr-only" }, label),

package/lib/ui/Inputs/Text/TextInput.js

@@ -1,6 +1,6 @@
 import React from 'react';
 export const TextInput = ({ id, label, value, ...rest }) => {
     return (React.createElement(React.Fragment, null,
-        label && (React.createElement("label", { htmlFor: id, className: "sds-form-label" }, label)),
-        React.createElement("input", { name: id, id: id, type: "text", className: "sds-form-control", defaultValue: value, ...rest })));
+        label && (React.createElement("label", { htmlFor: id, className: "squiz-fte-form-label" }, label)),
+        React.createElement("input", { name: id, id: id, type: "text", className: "squiz-fte-form-control", defaultValue: value, ...rest })));
 };

package/lib/ui/Modal/Modal.js

@@ -14,17 +14,17 @@ const Modal = ({ children, onCancel, onSubmit, className }) => {
         return () => window.removeEventListener('keydown', keydown);
     }, []);
     return (React.createElement(React.Fragment, null,
-        React.createElement("div", { className: `sds-modal-wrapper ${className ? className : ''}` },
+        React.createElement("div", { className: `squiz-fte-modal-wrapper ${className ? className : ''}` },
             React.createElement("div", { className: "w-modal-sm my-6 mx-auto" },
-                React.createElement("div", { className: "sds-modal" },
-                    React.createElement("div", { className: "sds-modal-header p-6 pb-2" },
+                React.createElement("div", { className: "squiz-fte-modal" },
+                    React.createElement("div", { className: "squiz-fte-modal-header p-6 pb-2" },
                         React.createElement("h2", { className: "font-semibold text-gray-900 text-heading-2" }, "Link"),
                         React.createElement("button", { className: "ml-auto -mr-3 -mt-3 bg-transparent border-0 text-gray-600 font-semibold outline-none focus:outline-none hover:text-color-gray-800", onClick: onCancel, "aria-label": "Close" },
                             React.createElement(CloseRoundedIcon, null))),
-                    React.createElement("div", { className: "sds-modal-content" }, children),
-                    React.createElement("div", { className: "sds-modal-footer p-6 pt-3" },
-                        React.createElement("button", { className: "sds-modal-footer__button bg-gray-200 text-gray-700 mr-2 hover:bg-gray-300", type: "button", onClick: onCancel, "aria-label": "Cancel" }, "Cancel"),
-                        onSubmit && (React.createElement("button", { className: "sds-modal-footer__button bg-blue-300 text-white hover:bg-blue-400", type: "button", onClick: onSubmit, "aria-label": "Apply" }, "Apply")))))),
+                    React.createElement("div", { className: "squiz-fte-modal-content" }, children),
+                    React.createElement("div", { className: "squiz-fte-modal-footer p-6 pt-3" },
+                        React.createElement("button", { className: "squiz-fte-modal-footer__button bg-gray-200 text-gray-700 mr-2 hover:bg-gray-300", type: "button", onClick: onCancel, "aria-label": "Cancel" }, "Cancel"),
+                        onSubmit && (React.createElement("button", { className: "squiz-fte-modal-footer__button bg-blue-300 text-white hover:bg-blue-400", type: "button", onClick: onSubmit, "aria-label": "Apply" }, "Apply")))))),
         React.createElement("div", { className: "opacity-25 fixed inset-0 z-40 bg-black" })));
 };
 export default Modal;

package/lib/ui/ToolbarButton/ToolbarButton.js

@@ -1,5 +1,5 @@
 import React from 'react';
 const ToolbarButton = ({ handleOnClick, isDisabled, isActive, icon, label }) => {
-    return (React.createElement("button", { "aria-label": label, title: label, type: "button", onClick: handleOnClick, disabled: isDisabled, className: `sds-btn toolbar-button ${isActive ? 'is-active' : ''}` }, icon));
+    return (React.createElement("button", { "aria-label": label, title: label, type: "button", onClick: handleOnClick, disabled: isDisabled, className: `squiz-fte-btn toolbar-button ${isActive ? 'is-active' : ''}` }, icon));
 };
 export default ToolbarButton;

package/lib/ui/ToolbarDropdown/ToolbarDropdown.d.ts

@@ -1,4 +1,3 @@
-import 'flowbite';
 type ToolbarDropdownProps = {
     children: JSX.Element | JSX.Element[];
     label: string;

package/lib/ui/ToolbarDropdown/ToolbarDropdown.js

@@ -1,12 +1,20 @@
-import React from 'react';
+import React, { useState } from 'react';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
-import 'flowbite';
 const ToolbarDropdown = ({ children, label }) => {
-    return (React.createElement(React.Fragment, null,
-        React.createElement("button", { id: "dropdownHoverButton", "data-dropdown-toggle": "dropdown", className: "toolbar-dropdown__button", type: "button" },
+    const [isOpen, setOpen] = useState(false);
+    const handleDropDown = () => {
+        setOpen(!isOpen);
+    };
+    const handleBlur = (event) => {
+        if (event.relatedTarget?.id !== 'dropdownMenuButton' && !event.target?.className.includes('is-active')) {
+            isOpen && handleDropDown();
+        }
+    };
+    return (React.createElement("div", { className: "toolbar-dropdown", onBlur: handleBlur },
+        React.createElement("button", { id: "dropdownHoverButton", className: "toolbar-dropdown__button", onClick: handleDropDown },
             React.createElement("span", { className: "toolbar-dropdown__label" }, label),
             React.createElement(ExpandMoreIcon, { className: "toolbar-dropdown__icon", "aria-hidden": "true" })),
-        React.createElement("div", { id: "dropdown", className: "toolbar-dropdown__menu z-10 hidden bg-white divide-y divide-gray-100 rounded-lg shadow w-169 dark:bg-gray-700" },
-            React.createElement("ul", { "aria-labelledby": "dropdownHoverButton" }, children))));
+        React.createElement("div", { id: "dropdown", className: `toolbar-dropdown__menu z-10 ${isOpen ? 'block' : 'hidden'} bg-white divide-y w-169` },
+            React.createElement("ul", { "aria-labelledby": "dropdownHoverButton", onClick: handleDropDown }, children))));
 };
 export default ToolbarDropdown;

package/lib/ui/{DropdownButton/DropdownButton.js → ToolbarDropdownButton/ToolbarDropdownButton.js}

@@ -1,7 +1,7 @@
 import React from 'react';
 import CheckIcon from '@mui/icons-material/Check';
 const DropdownButton = ({ children, handleOnClick, isDisabled, isActive, label }) => {
-    return (React.createElement("button", { "aria-label": label, title: label, type: "button", onClick: handleOnClick, disabled: isDisabled, className: `btn dropdown-button ${isActive ? 'is-active' : ''}` },
+    return (React.createElement("button", { "aria-label": label, id: "dropdownMenuButton", title: label, type: "button", onClick: handleOnClick, disabled: isDisabled, className: `btn dropdown-button ${isActive ? 'is-active' : ''}` },
         React.createElement("span", null, children || label),
         isActive && React.createElement(CheckIcon, { className: "dropdown-button-icon" })));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@squiz/formatted-text-editor",
-  "version": "1.12.0-alpha.44",
+  "version": "1.12.0-alpha.46",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
@@ -19,8 +19,8 @@
     "@headlessui/react": "1.7.11",
     "@mui/icons-material": "5.11.0",
     "@remirror/react": "2.0.25",
-    "clsx": "^1.2.1",
-    "flowbite": "^1.6.3"
+    "clsx": "1.2.1",
+    "postcss-prefix-selector": "1.16.0"
   },
   "devDependencies": {
     "@testing-library/cypress": "9.0.0",
@@ -64,5 +64,5 @@
   "volta": {
     "node": "16.19.0"
   },
-  "gitHead": "6ac17a6b2f2c189227874697e8e0af48907cb30c"
+  "gitHead": "047173c3a5a8d33be8d9becf6af6d5575d7ce914"
 }

package/postcss.config.js

@@ -1,3 +1,11 @@
 module.exports = {
-  plugins: [require('tailwindcss'), require('autoprefixer'), require('postcss-nested')],
+  plugins: [
+    require('tailwindcss'),
+    require('autoprefixer'),
+    require('postcss-nested'),
+    require('postcss-prefix-selector')({
+      prefix: '.squiz-fte-scope',
+      exclude: ['.squiz-fte-scope__floating-popover'],
+    }),
+  ],
 };

package/src/Editor/_editor.scss

@@ -2,7 +2,7 @@
   font-family: 'Open Sans' !important;
 
   &.editor-wrapper {
-    @apply bg-white rounded border-gray-300 border-2 border-solid;
+    @apply bg-white rounded border-gray-300 border-2 border-solid m-2;
   }
 
   .remirror-editor-wrapper {

package/src/EditorToolbar/EditorToolbar.tsx

@@ -42,7 +42,7 @@ export const EditorToolbar = ({ manager, isPopover }: EditorToolbarProps) => {
           <TriggerLinkModal />
         </Toolbar>
       ) : (
-        <FloatingToolbar className="remirror-floating-popover">
+        <FloatingToolbar className="squiz-fte-scope squiz-fte-scope__floating-popover">
           {extensionNames.bold && <BoldButton />}
           {extensionNames.italic && <ItalicButton />}
           {extensionNames.underline && <UnderlineButton />}

package/src/EditorToolbar/Tools/Bold/BoldButton.spec.tsx

@@ -11,7 +11,7 @@ describe('Bold button', () => {
 
   it('Activates the button if clicked', () => {
     render(<Editor />);
-    expect(screen.getByRole('button', { name: 'Bold (cmd+B)' }).classList.contains('sds-btn')).toBeTruthy();
+    expect(screen.getByRole('button', { name: 'Bold (cmd+B)' }).classList.contains('squiz-fte-btn')).toBeTruthy();
     const bold = screen.getByRole('button', { name: 'Bold (cmd+B)' });
     fireEvent.click(bold);
     expect(bold.classList.contains('is-active')).toBeTruthy();

package/src/EditorToolbar/Tools/Italic/ItalicButton.spec.tsx

@@ -11,7 +11,7 @@ describe('Italic button', () => {
 
   it('Activates the button if clicked', () => {
     render(<Editor />);
-    expect(screen.getByRole('button', { name: 'Italic (cmd+I)' }).classList.contains('sds-btn')).toBeTruthy();
+    expect(screen.getByRole('button', { name: 'Italic (cmd+I)' }).classList.contains('squiz-fte-btn')).toBeTruthy();
     const italic = screen.getByRole('button', { name: 'Italic (cmd+I)' });
     fireEvent.click(italic);
     expect(italic.classList.contains('is-active')).toBeTruthy();

package/src/EditorToolbar/Tools/Link/Form/LinkForm.spec.tsx

@@ -15,7 +15,7 @@ describe('Link Form', () => {
   it('Renders the form with the specified class', () => {
     render(<LinkForm />);
 
-    const formClass = document.querySelector('.sds-form');
+    const formClass = document.querySelector('.squiz-fte-form');
     expect(formClass).toBeInTheDocument();
   });
 });

package/src/EditorToolbar/Tools/Link/Form/LinkForm.tsx

@@ -21,17 +21,17 @@ const LinkForm = (): ReactElement => {
   };
 
   return (
-    <form action="" method="post" className="sds-form">
-      <div className="sds-form-group mb-2">
+    <form action="" method="post" className="squiz-fte-form">
+      <div className="squiz-fte-form-group mb-2">
         <TextInput id="href" label="URL" value={formValues.href} onChange={handleChange} />
       </div>
-      <div className="sds-form-group mb-2">
+      <div className="squiz-fte-form-group mb-2">
         <TextInput id="text" label="Text" value={formValues.text} onChange={handleChange} />
       </div>
-      <div className="sds-form-group mb-2">
+      <div className="squiz-fte-form-group mb-2">
         <TextInput id="title" label="Title" value={formValues.title} onChange={handleChange} />
       </div>
-      <div className="sds-form-group mb-0">
+      <div className="squiz-fte-form-group mb-0">
         <Select id="target" label="Target" value={formValues.target} options={selectOptions} />
       </div>
     </form>

package/src/EditorToolbar/Tools/TextAlign/CenterAlign/CenterAlignButton.spec.tsx

@@ -0,0 +1,39 @@
+import '@testing-library/jest-dom';
+import { render, fireEvent } from '@testing-library/react';
+import Editor from '../../../../Editor/Editor';
+import React from 'react';
+
+describe('Center align button', () => {
+  it('Renders the center align button', () => {
+    const { baseElement, getByRole } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+    expect(getByRole('button', { name: 'Align center' })).toBeTruthy();
+  });
+
+  it('Applies active status after selecting center align button', () => {
+    const { baseElement, getByRole } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+
+    const centerAlignButton = getByRole('button', { name: 'Align center' });
+    expect(centerAlignButton).toBeTruthy();
+    expect(centerAlignButton.classList.contains('is-active')).toBeFalsy();
+
+    fireEvent.click(centerAlignButton);
+
+    setTimeout(() => {
+      expect(centerAlignButton.classList.contains('is-active')).toBeTruthy();
+    }, 50);
+  });
+
+  it('Should apply center alignment to editor after clicking button', () => {
+    const { baseElement, getByRole } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+    expect(baseElement.querySelector('p[data-node-text-align="center"]')).toBeFalsy();
+
+    const centerAlignButton = getByRole('button', { name: 'Align center' });
+    expect(centerAlignButton).toBeTruthy();
+    fireEvent.click(centerAlignButton);
+
+    expect(baseElement.querySelector('p[data-node-text-align="center"]')).toBeTruthy();
+  });
+});

package/src/EditorToolbar/Tools/TextAlign/JustifyAlign/JustifyAlignButton.spec.tsx

@@ -0,0 +1,39 @@
+import '@testing-library/jest-dom';
+import { render, fireEvent } from '@testing-library/react';
+import Editor from '../../../../Editor/Editor';
+import React from 'react';
+
+describe('Justify align button', () => {
+  it('Renders the justify align button', () => {
+    const { baseElement, getByRole } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+    expect(getByRole('button', { name: 'Justify' })).toBeTruthy();
+  });
+
+  it('Applies active status after selecting justify align button', () => {
+    const { baseElement, getByRole } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+
+    const justifyAlignButton = getByRole('button', { name: 'Justify' });
+    expect(justifyAlignButton).toBeTruthy();
+    expect(justifyAlignButton.classList.contains('is-active')).toBeFalsy();
+
+    fireEvent.click(justifyAlignButton);
+
+    setTimeout(() => {
+      expect(justifyAlignButton.classList.contains('is-active')).toBeTruthy();
+    }, 50);
+  });
+
+  it('Should apply justify alignment to editor after clicking button', () => {
+    const { baseElement, getByRole } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+    expect(baseElement.querySelector('p[data-node-text-align="justify"]')).toBeFalsy();
+
+    const justifyAlignButton = getByRole('button', { name: 'Justify' });
+    expect(justifyAlignButton).toBeTruthy();
+    fireEvent.click(justifyAlignButton);
+
+    expect(baseElement.querySelector('p[data-node-text-align="justify"]')).toBeTruthy();
+  });
+});

package/src/EditorToolbar/Tools/TextAlign/LeftAlign/LeftAlignButton.spec.tsx

@@ -0,0 +1,39 @@
+import '@testing-library/jest-dom';
+import { render, fireEvent } from '@testing-library/react';
+import Editor from '../../../../Editor/Editor';
+import React from 'react';
+
+describe('Left align button', () => {
+  it('Renders the left align button', () => {
+    const { baseElement, getByRole } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+    expect(getByRole('button', { name: 'Align left' })).toBeTruthy();
+  });
+
+  it('Applies active status after selecting left align button', () => {
+    const { baseElement, getByRole } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+
+    const leftAlignButton = getByRole('button', { name: 'Align left' });
+    expect(leftAlignButton).toBeTruthy();
+    expect(leftAlignButton.classList.contains('is-active')).toBeFalsy();
+
+    fireEvent.click(leftAlignButton);
+
+    setTimeout(() => {
+      expect(leftAlignButton.classList.contains('is-active')).toBeTruthy();
+    }, 50);
+  });
+
+  it('Should apply left alignment to editor after clicking button', () => {
+    const { baseElement, getByRole } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+    expect(baseElement.querySelector('p[data-node-text-align="left"]')).toBeFalsy();
+
+    const leftAlignButton = getByRole('button', { name: 'Align left' });
+    expect(leftAlignButton).toBeTruthy();
+    fireEvent.click(leftAlignButton);
+
+    expect(baseElement.querySelector('p[data-node-text-align="left"]')).toBeTruthy();
+  });
+});

package/src/EditorToolbar/Tools/TextAlign/RightAlign/RightAlignButton.spec.tsx

@@ -0,0 +1,39 @@
+import '@testing-library/jest-dom';
+import { render, fireEvent } from '@testing-library/react';
+import Editor from '../../../../Editor/Editor';
+import React from 'react';
+
+describe('Right align button', () => {
+  it('Renders the right align button', () => {
+    const { baseElement, getByRole } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+    expect(getByRole('button', { name: 'Align right' })).toBeTruthy();
+  });
+
+  it('Applies active status after selecting right align button', () => {
+    const { baseElement, getByRole } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+
+    const rightAlignButton = getByRole('button', { name: 'Align right' });
+    expect(rightAlignButton).toBeTruthy();
+    expect(rightAlignButton.classList.contains('is-active')).toBeFalsy();
+
+    fireEvent.click(rightAlignButton);
+
+    setTimeout(() => {
+      expect(rightAlignButton.classList.contains('is-active')).toBeTruthy();
+    }, 50);
+  });
+
+  it('Should apply right alignment to editor after clicking button', () => {
+    const { baseElement, getByRole } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+    expect(baseElement.querySelector('p[data-node-text-align="right"]')).toBeFalsy();
+
+    const rightAlignButton = getByRole('button', { name: 'Align right' });
+    expect(rightAlignButton).toBeTruthy();
+    fireEvent.click(rightAlignButton);
+
+    expect(baseElement.querySelector('p[data-node-text-align="right"]')).toBeTruthy();
+  });
+});

package/src/EditorToolbar/Tools/TextType/Heading/HeadingButton.spec.tsx

@@ -0,0 +1,56 @@
+import '@testing-library/jest-dom';
+import { render, fireEvent } from '@testing-library/react';
+import Editor from '../../../../Editor/Editor';
+import React from 'react';
+
+const headings = [
+  ['Heading 1', 'h1'],
+  ['Heading 2', 'h2'],
+  ['Heading 3', 'h3'],
+  ['Heading 4', 'h4'],
+  ['Heading 5', 'h5'],
+  ['Heading 6', 'h6'],
+];
+
+describe('Heading button', () => {
+  it.each(headings)('Renders the "%s" heading button', (label) => {
+    const { baseElement, getByRole } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+    expect(getByRole('button', { name: label })).toBeTruthy();
+  });
+
+  it.each(headings)('Applies active status after selecting "%s" heading button', (label) => {
+    const { baseElement, getByRole } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+
+    const headingButton = getByRole('button', { name: label });
+    expect(headingButton).toBeTruthy();
+    expect(headingButton.className).not.toContain('is-active');
+
+    fireEvent.click(headingButton);
+    expect(headingButton.className).toContain('is-active');
+  });
+
+  it.each(headings)('Should render a check icon if button is active', (label) => {
+    const { baseElement, getByRole } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+
+    const headingButton = getByRole('button', { name: label });
+    expect(headingButton.querySelector('svg[data-testid="CheckIcon"]')).toBeFalsy();
+
+    fireEvent.click(headingButton);
+    expect(headingButton.querySelector('svg[data-testid="CheckIcon"]')).toBeTruthy();
+  });
+
+  it.each(headings)('Should apply "%s" heading tag to editor after clicking button', (label, tag) => {
+    const { baseElement } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+    expect(baseElement.querySelector('div.remirror-editor h1')).toBeFalsy();
+
+    const headingButton = baseElement.querySelector(`button[title="${label}"]`) as HTMLButtonElement;
+    expect(headingButton).toBeTruthy();
+    fireEvent.click(headingButton);
+
+    expect(baseElement.querySelector(`div.remirror-editor ${tag}`)).toBeTruthy();
+  });
+});

package/src/EditorToolbar/Tools/TextType/Heading/HeadingButton.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { useCommands, useChainedCommands, useActive } from '@remirror/react';
 import { HeadingExtension } from '@remirror/extension-heading';
-import DropdownButton from '../../../../ui/DropdownButton/DropdownButton';
+import DropdownButton from '../../../../ui/ToolbarDropdownButton/ToolbarDropdownButton';
 
 type HeadingButtonProps = {
   level: number;

package/src/EditorToolbar/Tools/TextType/Paragraph/ParagraphButton.spec.tsx

@@ -0,0 +1,30 @@
+import '@testing-library/jest-dom';
+import { render } from '@testing-library/react';
+import Editor from '../../../../Editor/Editor';
+import React from 'react';
+
+describe('Paragraph button', () => {
+  it('Renders paragraph button', () => {
+    const { baseElement } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+    expect(baseElement.querySelector('button[title="Paragraph"]')).toBeTruthy();
+  });
+
+  it('Paragraph button active status should be set on as default', () => {
+    const { baseElement } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+
+    const paragraphButton = baseElement.querySelector('button[title="Paragraph"]') as HTMLButtonElement;
+    expect(paragraphButton).toBeTruthy();
+    expect(paragraphButton.className).toContain('is-active');
+  });
+
+  it('Should render a check icon if button is active', () => {
+    const { baseElement } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+
+    const paragraphButton = baseElement.querySelector('button[title="Paragraph"]') as HTMLButtonElement;
+    expect(paragraphButton).toBeTruthy();
+    expect(paragraphButton.querySelector('svg[data-testid="CheckIcon"]')).toBeTruthy();
+  });
+});

package/src/EditorToolbar/Tools/TextType/Paragraph/ParagraphButton.tsx

@@ -1,14 +1,13 @@
 import React from 'react';
 import { useCommands, useChainedCommands, useActive } from '@remirror/react';
 import { ParagraphExtension } from '@remirror/extension-paragraph';
-import DropdownButton from '../../../../ui/DropdownButton/DropdownButton';
+import DropdownButton from '../../../../ui/ToolbarDropdownButton/ToolbarDropdownButton';
 
 const ParagraphButton = () => {
   const { convertParagraph } = useCommands<ParagraphExtension>();
   const chain = useChainedCommands();
 
   const active = useActive<ParagraphExtension>();
-  const enabled = convertParagraph.enabled();
 
   const handleSelect = () => {
     if (convertParagraph.enabled()) {
@@ -17,7 +16,7 @@ const ParagraphButton = () => {
   };
 
   return (
-    <DropdownButton handleOnClick={handleSelect} isDisabled={!enabled} isActive={active.paragraph()} label="Paragraph">
+    <DropdownButton handleOnClick={handleSelect} isDisabled={false} isActive={active.paragraph()} label="Paragraph">
       <p>Paragraph</p>
     </DropdownButton>
   );

package/src/EditorToolbar/Tools/TextType/Preformatted/PreformattedButton.spec.tsx

@@ -0,0 +1,47 @@
+import '@testing-library/jest-dom';
+import { render, fireEvent } from '@testing-library/react';
+import Editor from '../../../../Editor/Editor';
+import React from 'react';
+
+describe('Preformatted button', () => {
+  it('Renders the preformatted button', () => {
+    const { baseElement, getByRole } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+    expect(getByRole('button', { name: 'Preformatted' })).toBeTruthy();
+  });
+
+  it('Applies active status after selecting preformatted button', () => {
+    const { baseElement, getByRole } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+
+    const preformattedButton = getByRole('button', { name: 'Preformatted' });
+    expect(preformattedButton).toBeTruthy();
+    expect(preformattedButton.className).not.toContain('is-active');
+
+    fireEvent.click(preformattedButton);
+    expect(preformattedButton.className).toContain('is-active');
+  });
+
+  it('Should render a check icon if button is active', () => {
+    const { baseElement, getByRole } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+
+    const preformattedButton = getByRole('button', { name: 'Preformatted' });
+    expect(preformattedButton.querySelector('svg[data-testid="CheckIcon"]')).toBeFalsy();
+
+    fireEvent.click(preformattedButton);
+    expect(preformattedButton.querySelector('svg[data-testid="CheckIcon"]')).toBeTruthy();
+  });
+
+  it('Should apply preformatted tag to editor after clicking button', () => {
+    const { baseElement, getByRole } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+    expect(baseElement.querySelector('div.remirror-editor pre')).toBeFalsy();
+
+    const preformattedButton = getByRole('button', { name: 'Preformatted' });
+    expect(preformattedButton).toBeTruthy();
+    fireEvent.click(preformattedButton);
+
+    expect(baseElement.querySelector(`div.remirror-editor pre`)).toBeTruthy();
+  });
+});

package/src/EditorToolbar/Tools/TextType/Preformatted/PreformattedButton.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import { useCommands, useActive } from '@remirror/react';
 import { PreformattedExtension } from '../../../../Extensions/PreformattedExtension/PreformattedExtension';
-import DropdownButton from '../../../../ui/DropdownButton/DropdownButton';
+import DropdownButton from '../../../../ui/ToolbarDropdownButton/ToolbarDropdownButton';
 
 const PreformattedButton = () => {
   const { togglePreformatted } = useCommands<PreformattedExtension>();

package/src/EditorToolbar/Tools/TextType/TextTypeDropdown.spec.tsx

@@ -0,0 +1,51 @@
+import '@testing-library/jest-dom';
+import { render, fireEvent } from '@testing-library/react';
+import Editor from '../../../Editor/Editor';
+import React from 'react';
+
+const dropdownButtons = [
+  'Paragraph',
+  'Heading 1',
+  'Heading 2',
+  'Heading 3',
+  'Heading 4',
+  'Heading 5',
+  'Heading 6',
+  'Preformatted',
+];
+
+const navigateKeys = ['Enter', 'Space'];
+
+describe('Text type dropdown', () => {
+  it('should render the text type dropdown component', () => {
+    const { baseElement } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+    expect(baseElement.querySelector('button#dropdownHoverButton')).toBeTruthy();
+  });
+
+  it.each(dropdownButtons)('should render %s button in text type dropdown', (type) => {
+    const { baseElement } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+
+    const dropdownButton = baseElement.querySelector('button#dropdownHoverButton') as HTMLButtonElement;
+    expect(dropdownButton).toBeTruthy();
+    fireEvent.click(dropdownButton);
+
+    expect(baseElement.querySelector(`button[title="${type}"]`)).toBeTruthy();
+  });
+
+  it.each(navigateKeys)(`should display dropdown if '%s' is pressed while component is in focus`, async (key) => {
+    const { baseElement } = render(<Editor />);
+    expect(baseElement).toBeTruthy();
+
+    const dropdownMenu = baseElement.querySelector('div.toolbar-dropdown__menu') as HTMLDivElement;
+    expect(dropdownMenu.className).not.toContain('block'); // Hidden
+
+    const dropdownButton = baseElement.querySelector('button#dropdownHoverButton') as HTMLButtonElement;
+    fireEvent.keyDown(dropdownButton, { code: key });
+
+    setTimeout(() => {
+      expect(dropdownMenu.className).toContain('block'); // Visible
+    }, 50);
+  });
+});

package/src/EditorToolbar/Tools/Underline/Underline.spec.tsx

@@ -11,7 +11,7 @@ describe('Underline button', () => {
 
   it('Activates the button if clicked', () => {
     render(<Editor />);
-    expect(screen.getByRole('button', { name: 'Underline (cmd+U)' }).classList.contains('sds-btn')).toBeTruthy();
+    expect(screen.getByRole('button', { name: 'Underline (cmd+U)' }).classList.contains('squiz-fte-btn')).toBeTruthy();
     const underline = screen.getByRole('button', { name: 'Underline (cmd+U)' });
     fireEvent.click(underline);
     expect(underline.classList.contains('is-active')).toBeTruthy();

package/src/EditorToolbar/_editor-toolbar.scss

@@ -11,9 +11,11 @@
   .editor-divider {
     @apply -my-1 mx-1 border;
     margin-right: 2px;
+    height: auto;
   }
 }
 
-.remirror-floating-popover {
-  @apply bg-white border-gray-200 p-1 rounded-md shadow border;
+/// This class is excluded from the scope of squiz-fte-scope as it is outside of the scoped element
+.squiz-fte-scope__floating-popover {
+  @apply bg-white border-gray-200 p-1 shadow rounded-md border flex;
 }