@squiz/formatted-text-editor 1.21.1-alpha.2 → 1.21.1-alpha.21

package/lib/Extensions/LinkExtension/LinkExtension.d.ts

@@ -1,16 +1,25 @@
-import { ApplySchemaAttributes, MarkExtensionSpec, MarkSpecOverride } from 'remirror';
-import { KeyBindingProps } from '@remirror/core';
-import { CommandFunction } from '@remirror/pm';
-import { LinkAttributes as RemirrorLinkAttributes, LinkExtension as RemirrorLinkExtension } from 'remirror/extensions';
-export type UpdateLinkOptions = LinkAttributes & {
-    text: string;
-};
-export type LinkAttributes = RemirrorLinkAttributes & {
+import { ApplySchemaAttributes, FromToProps, MarkExtensionSpec, MarkSpecOverride } from 'remirror';
+import { CommandFunction, Handler, KeyBindingProps, MarkExtension } from '@remirror/core';
+import { LinkTarget } from './common';
+export type LinkAttributes = {
+    href: string;
     title?: string;
+    target: LinkTarget;
+};
+export type LinkOptions = {
+    defaultTarget?: LinkTarget;
+    supportedTargets?: LinkTarget[];
+    onShortcut?: Handler<() => void>;
+};
+export type UpdateLinkProps = {
+    text: string;
+    attrs: Partial<LinkAttributes>;
+    range: FromToProps;
 };
-export declare class LinkExtension extends RemirrorLinkExtension {
+export declare class LinkExtension extends MarkExtension<LinkOptions> {
+    get name(): string;
     createMarkSpec(extra: ApplySchemaAttributes, override: MarkSpecOverride): MarkExtensionSpec;
-    shortcut({ tr }: KeyBindingProps): boolean;
-    selectLink(): CommandFunction;
-    updateLink(options: UpdateLinkOptions): CommandFunction;
+    shortcut(_: KeyBindingProps): boolean;
+    updateLink({ text, attrs, range }: UpdateLinkProps): CommandFunction;
+    removeLink(): CommandFunction;
 }

package/lib/Extensions/LinkExtension/LinkExtension.js

@@ -1,18 +1,31 @@
 "use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LinkExtension = void 0;
 const remirror_1 = require("remirror");
 const core_1 = require("@remirror/core");
-const extensions_1 = require("remirror/extensions");
-class LinkExtension extends extensions_1.LinkExtension {
+const common_1 = require("./common");
+const CommandsExtension_1 = require("../CommandsExtension/CommandsExtension");
+const Extensions_1 = require("../Extensions");
+let LinkExtension = class LinkExtension extends core_1.MarkExtension {
+    get name() {
+        return Extensions_1.MarkName.Link;
+    }
     createMarkSpec(extra, override) {
-        const spec = super.createMarkSpec(extra, override);
         return {
-            ...spec,
-            excludes: undefined,
+            inclusive: false,
+            excludes: 'assetLink',
+            ...override,
             attrs: {
-                ...spec.attrs,
+                ...extra.defaults(),
+                href: {},
                 title: { default: undefined },
+                target: { default: this.options.defaultTarget },
             },
             parseDOM: [
                 {
@@ -23,75 +36,60 @@ class LinkExtension extends extensions_1.LinkExtension {
                         }
                         return {
                             ...extra.parse(node),
-                            auto: false,
                             href: node.getAttribute('href'),
-                            target: node.getAttribute('target'),
                             title: node.getAttribute('title'),
+                            target: (0, common_1.validateTarget)(node.getAttribute('target'), this.options.supportedTargets, this.options.defaultTarget),
                         };
                     },
                 },
             ],
+            toDOM: (node) => {
+                const { target, ...rest } = (0, core_1.omitExtraAttributes)(node.attrs, extra);
+                const rel = 'noopener noreferrer nofollow';
+                const attrs = {
+                    ...extra.dom(node),
+                    ...rest,
+                    rel,
+                    target: (0, common_1.validateTarget)(target, this.options.supportedTargets, this.options.defaultTarget),
+                };
+                return ['a', attrs, 0];
+            },
         };
     }
-    shortcut({ tr }) {
-        // override parent implementation to allow a link to be inserted without requiring a text selection first.
-        const { from, to, $from } = tr.selection;
-        const mark = (0, core_1.getMarkRange)($from, this.type);
-        const selectedText = tr.doc.textBetween(from, to);
-        this.options.onShortcut({
-            activeLink: mark ? { attrs: mark.mark.attrs, from: mark.from, to: mark.to } : undefined,
-            selectedText,
-            from,
-            to,
-        });
+    shortcut(_) {
+        this.options.onShortcut();
         return true;
     }
-    selectLink() {
-        // parent implementation selects only the link text, this mimics closer to Google Docs where
-        // the select text is widened to include the link but retains non-link selected text as well.
-        return (props) => {
-            const { tr } = props;
-            const ranges = (0, remirror_1.getMarkRanges)(tr.selection, this.type);
-            if (ranges.length === 0) {
-                return false;
-            }
-            // work out the start position of the first link and end position of the last link in the selection.
-            const from = Math.min(tr.selection.from, ...ranges.map((range) => range.from));
-            const to = Math.max(tr.selection.to, ...ranges.map((range) => range.to));
-            // don't need to widen the selection, return early.
-            if (tr.selection.from === from && tr.selection.to === to) {
-                return false;
-            }
-            // widen the selection to make sure the full link is included.
-            this.store.commands.selectText.original({ from, to })(props);
-            return true;
-        };
+    updateLink({ text, attrs, range }) {
+        return this.store.getExtension(CommandsExtension_1.CommandsExtension).updateMark({
+            attrs,
+            text,
+            range,
+            mark: this.type,
+            removeMark: !attrs.href,
+        });
     }
-    updateLink(options) {
-        const { text, ...attrs } = options;
-        return (props) => {
-            const { tr, dispatch, view } = props;
-            const range = { from: tr.selection.from, to: tr.selection.to };
-            const selectedText = tr.doc.textBetween(range.from, range.to);
-            if (text !== selectedText) {
-                // update the text in the editor if it was updated, update the range to cover the length of the new text.
-                tr.insertText(text);
-                range.to = range.from + text.length;
-            }
-            // apply the link, or remove it if no URL was provided.
-            if (attrs.href.length > 0) {
-                tr.addMark(range.from, range.to, this.type.create(attrs));
-            }
-            else {
-                tr.removeMark(range.from, range.to, this.type);
-            }
-            // move the cursor to the end of the link and re-focus the editor.
-            tr.setSelection((0, core_1.getTextSelection)({ from: range.to, to: range.to }, tr.doc));
-            // apply the transaction.
-            dispatch?.(tr);
-            view?.focus();
-            return true;
-        };
+    removeLink() {
+        return (0, core_1.removeMark)({ type: this.type });
     }
-}
+};
+__decorate([
+    (0, core_1.keyBinding)({ shortcut: core_1.NamedShortcut.InsertLink })
+], LinkExtension.prototype, "shortcut", null);
+__decorate([
+    (0, core_1.command)()
+], LinkExtension.prototype, "updateLink", null);
+__decorate([
+    (0, core_1.command)()
+], LinkExtension.prototype, "removeLink", null);
+LinkExtension = __decorate([
+    (0, core_1.extension)({
+        defaultOptions: {
+            defaultTarget: common_1.LinkTarget.Self,
+            supportedTargets: [common_1.LinkTarget.Self, common_1.LinkTarget.Blank],
+        },
+        handlerKeys: ['onShortcut'],
+        defaultPriority: remirror_1.ExtensionPriority.Medium,
+    })
+], LinkExtension);
 exports.LinkExtension = LinkExtension;

package/lib/Extensions/LinkExtension/common.d.ts

@@ -0,0 +1,7 @@
+export declare enum LinkTarget {
+    Self = "_self",
+    Blank = "_blank",
+    Parent = "_parent",
+    Top = "_top"
+}
+export declare const validateTarget: (target: unknown, supportedTargets: LinkTarget[], defaultTarget: LinkTarget) => LinkTarget;

package/lib/Extensions/LinkExtension/common.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateTarget = exports.LinkTarget = void 0;
+var LinkTarget;
+(function (LinkTarget) {
+    LinkTarget["Self"] = "_self";
+    LinkTarget["Blank"] = "_blank";
+    LinkTarget["Parent"] = "_parent";
+    LinkTarget["Top"] = "_top";
+})(LinkTarget = exports.LinkTarget || (exports.LinkTarget = {}));
+const validateTarget = (target, supportedTargets, defaultTarget) => {
+    return supportedTargets.includes(target) ? target : defaultTarget;
+};
+exports.validateTarget = validateTarget;

package/lib/Extensions/PreformattedExtension/PreformattedExtension.d.ts

@@ -1,7 +1,7 @@
 import { ApplySchemaAttributes, CommandFunction, NodeExtension, NodeExtensionSpec, NodeSpecOverride } from '@remirror/core';
 export declare class PreformattedExtension extends NodeExtension {
     get name(): "preformatted";
-    createTags(): ("formattingNode" | "block" | "textBlock")[];
+    createTags(): ("block" | "formattingNode" | "textBlock")[];
     createNodeSpec(extra: ApplySchemaAttributes, override: NodeSpecOverride): NodeExtensionSpec;
     /**
      * Toggle the <pre> for the current block.

package/lib/hooks/index.d.ts

@@ -1 +1,2 @@
 export * from './useExtensionNames';
+export * from './useExpandedSelection';

package/lib/hooks/index.js

@@ -15,3 +15,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./useExtensionNames"), exports);
+__exportStar(require("./useExpandedSelection"), exports);

package/lib/hooks/useExpandedSelection.d.ts

@@ -0,0 +1,23 @@
+import { Selection } from '@remirror/core';
+import { Mark, MarkType } from 'remirror';
+export type ExpandedSelection = {
+    selection: Selection;
+    marks: Mark[];
+};
+/**
+ * Returns a single range that is either:
+ * 1. The current selection if the current selection does not contain any of the indicated marks.
+ * 2. An expanded version of the current selection if the range contains any of the indicated marks.
+ *
+ * For example, given the content:
+ *
+ * <strong>Bold</strong> regular <u>underline</u> <u>more underline</u>
+ *
+ * If the marks passed in are 'bold' and 'underline' and the text "old regular under" is selected
+ * the returned range will be "Bold regular underline".
+ *
+ * @param {(MarkType|string)[]} markTypes
+ *
+ * @return {ExpandedSelection}
+ */
+export declare const useExpandedSelection: (markTypes: (MarkType | string)[]) => ExpandedSelection;

package/lib/hooks/useExpandedSelection.js

@@ -0,0 +1,37 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useExpandedSelection = void 0;
+const remirror_1 = require("remirror");
+const react_1 = require("@remirror/react");
+/**
+ * Returns a single range that is either:
+ * 1. The current selection if the current selection does not contain any of the indicated marks.
+ * 2. An expanded version of the current selection if the range contains any of the indicated marks.
+ *
+ * For example, given the content:
+ *
+ * <strong>Bold</strong> regular <u>underline</u> <u>more underline</u>
+ *
+ * If the marks passed in are 'bold' and 'underline' and the text "old regular under" is selected
+ * the returned range will be "Bold regular underline".
+ *
+ * @param {(MarkType|string)[]} markTypes
+ *
+ * @return {ExpandedSelection}
+ */
+const useExpandedSelection = (markTypes) => {
+    const { doc, selection } = (0, react_1.useEditorState)();
+    const ranges = [];
+    markTypes.forEach((markType) => {
+        ranges.push(...(0, remirror_1.getMarkRanges)(selection, markType));
+    });
+    if (ranges.length === 0) {
+        return { selection, marks: [] };
+    }
+    // work out the start position of the first link and end position of the last link in the selection.
+    const from = Math.min(selection.from, ...ranges.map((range) => range.from));
+    const to = Math.max(selection.to, ...ranges.map((range) => range.to));
+    const marks = ranges.map((range) => range.mark);
+    return { selection: (0, remirror_1.getTextSelection)({ from, to }, doc), marks };
+};
+exports.useExpandedSelection = useExpandedSelection;

package/lib/index.css

@@ -376,6 +376,10 @@
 .squiz-fte-scope .z-40 {
   z-index: 40 !important;
 }
+.squiz-fte-scope .mx-1 {
+  margin-left: 0.25rem !important;
+  margin-right: 0.25rem !important;
+}
 .squiz-fte-scope .mx-auto {
   margin-left: auto !important;
   margin-right: auto !important;
@@ -437,6 +441,12 @@
   -moz-user-select: none !important;
   user-select: none !important;
 }
+.squiz-fte-scope .flex-row {
+  flex-direction: row !important;
+}
+.squiz-fte-scope .items-end {
+  align-items: flex-end !important;
+}
 .squiz-fte-scope .items-center {
   align-items: center !important;
 }
@@ -566,6 +576,47 @@
   --tw-blur: blur(8px) !important;
   filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow) !important;
 }
+.squiz-fte-scope a {
+  --tw-text-opacity: 1;
+  color: rgb(7 116 210 / var(--tw-text-opacity));
+  text-decoration: underline;
+}
+.squiz-fte-scope h1 {
+  font-size: 1.625rem;
+  font-weight: 600;
+  letter-spacing: -0.2px;
+  line-height: 2rem;
+}
+.squiz-fte-scope h2 {
+  font-size: 1.25rem;
+  font-weight: 600;
+  letter-spacing: -0.5px;
+  line-height: 1.5rem;
+}
+.squiz-fte-scope h3 {
+  font-size: 1.125rem;
+  font-weight: 600;
+  letter-spacing: -0.2px;
+  line-height: 1.375rem;
+}
+.squiz-fte-scope h4 {
+  font-size: 1rem;
+  font-weight: 700;
+  letter-spacing: -0.2px;
+  line-height: 1.25rem;
+}
+.squiz-fte-scope h5 {
+  font-size: 1rem;
+  font-weight: 600;
+  letter-spacing: -0.2px;
+  line-height: 1.25rem;
+}
+.squiz-fte-scope h6 {
+  font-size: 0.875rem;
+  font-weight: 600;
+  letter-spacing: -0.2px;
+  line-height: 1.25rem;
+}
 .squiz-fte-scope .squiz-fte-form-group {
   display: flex;
   flex-direction: column;
@@ -611,33 +662,23 @@
 .squiz-fte-scope .squiz-fte-form-control:active {
   box-shadow: none;
 }
-.squiz-fte-scope .squiz-fte-btn {
-  border-radius: 4px;
-  font-weight: 400;
-  transition-property: all;
-  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
-  transition-duration: 150ms;
-  transition-timing-function: linear;
-  display: flex;
-  align-items: center;
-  text-align: center;
-  white-space: nowrap;
-  vertical-align: middle;
-  touch-action: manipulation;
-  cursor: pointer;
-  background-image: none;
-  border: 1px solid transparent;
-  padding: 6px 12px;
+.squiz-fte-scope .squiz-fte-invalid-form-field .squiz-fte-form-control {
+  --tw-border-opacity: 1;
+  border-color: rgb(215 35 33 / var(--tw-border-opacity));
+  background-repeat: no-repeat;
+  background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iMjQiIHdpZHRoPSIyNCI+PHJlY3Qgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgZmlsbD0ibm9uZSIvPjxnIGNsYXNzPSJjdXJyZW50TGF5ZXIiPjxwYXRoIGQ9Ik00LjQ3IDIxaDE1LjA2YzEuNTQgMCAyLjUtMS42NyAxLjczLTNMMTMuNzMgNC45OWMtLjc3LTEuMzMtMi42OS0xLjMzLTMuNDYgMEwyLjc0IDE4Yy0uNzcgMS4zMy4xOSAzIDEuNzMgM3pNMTIgMTRjLS41NSAwLTEtLjQ1LTEtMXYtMmMwLS41NS40NS0xIDEtMXMxIC40NSAxIDF2MmMwIC41NS0uNDUgMS0xIDF6bTEgNGgtMnYtMmgydjJ6IiBjbGFzcz0ic2VsZWN0ZWQiIGZpbGw9IiNkNzIzMjEiLz48L2c+PC9zdmc+);
+  background-position: top 0.25rem right 0.25rem;
+  background-size: 1.5rem;
 }
-.squiz-fte-scope .squiz-fte-btn.disabled,
-.squiz-fte-scope .squiz-fte-btn[disabled] {
-  cursor: not-allowed;
-  opacity: 0.5;
+.squiz-fte-scope .squiz-fte-form-error {
+  --tw-text-opacity: 1;
+  color: rgb(215 35 33 / var(--tw-text-opacity));
+  font-size: 13px;
+  line-height: 1.23;
+  padding-top: 0.25rem;
 }
 .squiz-fte-scope .formatted-text-editor {
   font-family: "Open Sans" !important;
-}
-.squiz-fte-scope .formatted-text-editor.editor-wrapper {
   border-radius: 4px;
   border-width: 2px;
   border-style: solid;
@@ -649,7 +690,7 @@
 .squiz-fte-scope .formatted-text-editor .remirror-editor-wrapper {
   padding-top: 0px;
   --tw-text-opacity: 1;
-  color: rgb(112 112 112 / var(--tw-text-opacity));
+  color: rgb(61 61 61 / var(--tw-text-opacity));
 }
 .squiz-fte-scope .formatted-text-editor .remirror-editor {
   border-bottom-right-radius: 4px;
@@ -663,7 +704,8 @@
     var(--tw-ring-offset-shadow, 0 0 #0000),
     var(--tw-ring-shadow, 0 0 #0000),
     var(--tw-shadow);
-  min-height: 6rem;
+  overflow: auto;
+  min-height: 15vh;
 }
 .squiz-fte-scope .formatted-text-editor .remirror-editor:active,
 .squiz-fte-scope .formatted-text-editor .remirror-editor:focus {
@@ -672,6 +714,14 @@
 .squiz-fte-scope .formatted-text-editor .remirror-editor p {
   display: block;
 }
+.squiz-fte-scope .formatted-text-editor--is-disabled .remirror-editor {
+  cursor: not-allowed;
+  --tw-bg-opacity: 1;
+  background-color: rgb(224 224 224 / var(--tw-bg-opacity));
+}
+.squiz-fte-scope .formatted-text-editor--is-disabled .remirror-is-empty:first-of-type::before {
+  display: none;
+}
 .squiz-fte-scope .formatted-text-editor .remirror-is-empty:first-of-type::before {
   position: absolute;
   pointer-events: none;
@@ -681,48 +731,17 @@
   --tw-text-opacity: 1;
   color: rgb(148 148 148 / var(--tw-text-opacity));
 }
-.squiz-fte-scope a {
-  --tw-text-opacity: 1;
-  color: rgb(7 116 210 / var(--tw-text-opacity));
-  text-decoration: underline;
-}
-.squiz-fte-scope .remirror-theme h1 {
-  font-size: 1.625rem;
-  font-weight: 600;
-  letter-spacing: -0.2px;
-  line-height: 2rem;
-}
-.squiz-fte-scope .remirror-theme h2 {
-  font-size: 1.25rem;
-  font-weight: 600;
-  letter-spacing: -0.5px;
-  line-height: 1.5rem;
-}
-.squiz-fte-scope .remirror-theme h3 {
-  font-size: 1.125rem;
-  font-weight: 600;
-  letter-spacing: -0.2px;
-  line-height: 1.375rem;
-}
-.squiz-fte-scope .remirror-theme h4 {
-  font-size: 1rem;
-  font-weight: 700;
-  letter-spacing: -0.2px;
-  line-height: 1.25rem;
-}
-.squiz-fte-scope .remirror-theme h5 {
-  font-size: 1rem;
-  font-weight: 600;
-  letter-spacing: -0.2px;
-  line-height: 1.25rem;
+.squiz-fte-scope .formatted-text-editor .ProseMirror-selectednode {
+  border-width: 2px;
+  border-style: solid;
+  --tw-border-opacity: 1;
+  border-color: rgb(7 116 210 / var(--tw-border-opacity));
 }
-.squiz-fte-scope .remirror-theme h6 {
-  font-size: 0.875rem;
-  font-weight: 600;
-  letter-spacing: -0.2px;
-  line-height: 1.25rem;
+.squiz-fte-scope .formatted-text-editor img {
+  display: inline;
 }
-.squiz-fte-scope .editor-toolbar {
+.squiz-fte-scope .editor-toolbar,
+.squiz-fte-scope__floating-popover {
   border-bottom-width: 2px;
   border-style: solid;
   --tw-border-opacity: 1;
@@ -733,10 +752,12 @@
   display: flex;
   justify-items: center;
 }
-.squiz-fte-scope .editor-toolbar > *:not(:first-child, .editor-divider) {
+.squiz-fte-scope .editor-toolbar > *:not(:first-child, .editor-divider),
+.squiz-fte-scope .squiz-fte-scope__floating-popover > *:not(:first-child, .editor-divider) {
   margin: 0 0 0 2px;
 }
-.squiz-fte-scope .editor-divider {
+.squiz-fte-scope .editor-toolbar .editor-divider,
+.squiz-fte-scope .squiz-fte-scope__floating-popover .editor-divider {
   margin-top: -0.25rem;
   margin-bottom: -0.25rem;
   margin-left: 0.25rem;
@@ -745,6 +766,14 @@
   margin-right: 2px;
   height: auto;
 }
+.squiz-fte-scope .editor-toolbar .squiz-fte-btn,
+.squiz-fte-scope .squiz-fte-scope__floating-popover .squiz-fte-btn {
+  padding: 0.25rem;
+}
+.squiz-fte-scope .editor-toolbar .squiz-fte-btn ~ .squiz-fte-btn,
+.squiz-fte-scope .squiz-fte-scope__floating-popover .squiz-fte-btn ~ .squiz-fte-btn {
+  margin-left: 2px;
+}
 .squiz-fte-scope__floating-popover {
   display: flex;
   border-radius: 6px;
@@ -761,22 +790,49 @@
     var(--tw-ring-shadow, 0 0 #0000),
     var(--tw-shadow);
 }
-.squiz-fte-scope .toolbar-button {
+.squiz-fte-scope .squiz-fte-scope__floating-popover .editor-divider {
+  margin-top: 0px;
+  margin-bottom: 0px;
+}
+.squiz-fte-scope .squiz-fte-btn {
+  border-radius: 4px;
   --tw-bg-opacity: 1;
   background-color: rgb(255 255 255 / var(--tw-bg-opacity));
-  padding: 0.25rem;
+  font-weight: 400;
   --tw-text-opacity: 1;
   color: rgb(112 112 112 / var(--tw-text-opacity));
+  transition-property: all;
+  transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
+  transition-duration: 150ms;
+  transition-timing-function: linear;
+  display: flex;
+  align-items: center;
+  text-align: center;
+  white-space: nowrap;
+  vertical-align: middle;
+  touch-action: manipulation;
+  cursor: pointer;
+  background-image: none;
+  border: 1px solid transparent;
+  padding: 6px 12px;
+}
+.squiz-fte-scope .squiz-fte-btn--is-icon {
+  padding: 6px;
 }
-.squiz-fte-scope .toolbar-button ~ .toolbar-button {
+.squiz-fte-scope .squiz-fte-btn ~ .squiz-fte-btn {
   margin-left: 2px;
 }
-.squiz-fte-scope .toolbar-button:hover,
-.squiz-fte-scope .toolbar-button:focus {
+.squiz-fte-scope .squiz-fte-btn.disabled,
+.squiz-fte-scope .squiz-fte-btn[disabled] {
+  cursor: not-allowed;
+  opacity: 0.5;
+}
+.squiz-fte-scope .squiz-fte-btn:hover,
+.squiz-fte-scope .squiz-fte-btn:focus {
   background-color: rgba(0, 0, 0, 0.04);
 }
-.squiz-fte-scope .toolbar-button.is-active,
-.squiz-fte-scope .toolbar-button:active {
+.squiz-fte-scope .squiz-fte-btn--is-active,
+.squiz-fte-scope .squiz-fte-btn:active {
   --tw-bg-opacity: 1;
   background-color: rgb(230 241 250 / var(--tw-bg-opacity));
   --tw-text-opacity: 1;
@@ -785,6 +841,7 @@
 .squiz-fte-scope .toolbar-dropdown__button {
   display: flex;
   align-items: center;
+  border-radius: 4px;
   font-family:
     Open Sans,
     Arial,
@@ -899,8 +956,23 @@
 }
 .squiz-fte-scope .squiz-fte-modal-footer__button {
   font-size: 0.875rem;
+  font-weight: 700;
+}
+.squiz-fte-scope .editor-toolbar .squiz-fte-modal-footer__button,
+.squiz-fte-scope .squiz-fte-scope__floating-popover .squiz-fte-modal-footer__button {
+  padding: 0.25rem;
+}
+.squiz-fte-scope .editor-toolbar .squiz-fte-modal-footer__button ~ .squiz-fte-btn,
+.squiz-fte-scope .squiz-fte-scope__floating-popover .squiz-fte-modal-footer__button ~ .squiz-fte-btn {
+  margin-left: 2px;
+}
+.squiz-fte-scope .squiz-fte-modal-footer__button {
   border-radius: 4px;
+  --tw-bg-opacity: 1;
+  background-color: rgb(255 255 255 / var(--tw-bg-opacity));
   font-weight: 400;
+  --tw-text-opacity: 1;
+  color: rgb(112 112 112 / var(--tw-text-opacity));
   transition-property: all;
   transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
   transition-duration: 150ms;
@@ -916,11 +988,24 @@
   border: 1px solid transparent;
   padding: 6px 12px;
 }
+.squiz-fte-scope .squiz-fte-modal-footer__button ~ .squiz-fte-btn {
+  margin-left: 2px;
+}
 .squiz-fte-scope .squiz-fte-modal-footer__button.disabled,
 .squiz-fte-scope .squiz-fte-modal-footer__button[disabled] {
   cursor: not-allowed;
   opacity: 0.5;
 }
+.squiz-fte-scope .squiz-fte-modal-footer__button:hover,
+.squiz-fte-scope .squiz-fte-modal-footer__button:focus {
+  background-color: rgba(0, 0, 0, 0.04);
+}
+.squiz-fte-scope .squiz-fte-modal-footer__button:active {
+  --tw-bg-opacity: 1;
+  background-color: rgb(230 241 250 / var(--tw-bg-opacity));
+  --tw-text-opacity: 1;
+  color: rgb(7 116 210 / var(--tw-text-opacity));
+}
 .squiz-fte-scope .hover\:bg-blue-400:hover {
   --tw-bg-opacity: 1 !important;
   background-color: rgb(4 73 133 / var(--tw-bg-opacity)) !important;

package/lib/index.d.ts

@@ -1,2 +1,5 @@
-import FormattedTextEditor from './FormattedTextEditor';
-export { FormattedTextEditor };
+import Editor from './Editor/Editor';
+import { EditorContext } from './Editor/EditorContext';
+import { remirrorNodeToSquizNode } from './utils/converters/remirrorNodeToSquizNode/remirrorNodeToSquizNode';
+import { squizNodeToRemirrorNode } from './utils/converters/squizNodeToRemirrorNode/squizNodeToRemirrorNode';
+export { Editor, EditorContext, remirrorNodeToSquizNode, squizNodeToRemirrorNode };