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

package/demo/App.tsx

@@ -1,13 +1,26 @@
 import React, { useState } from 'react';
-import FormattedTextEditor from '../src/FormattedTextEditor';
+import { Editor, EditorContext, remirrorNodeToSquizNode, squizNodeToRemirrorNode } from '../src';
 import { RemirrorEventListener, Extension } from '@remirror/core';
+import ReactDiffViewer from 'react-diff-viewer-continued';
 
 function App() {
-  const [doc, setDoc] = useState(null as any);
+  const [doc, setDoc] = useState('');
+  const [squizDoc, setSquizDoc] = useState('');
+  const [reconvertedDoc, setReconvertedDoc] = useState('');
+  const [error, setError] = useState<unknown>(null);
   const [editable, setEditable] = useState(true);
+
   const handleEditorChange: RemirrorEventListener<Extension> = (parameter) => {
-    if (doc !== parameter.state.doc) {
-      setDoc(parameter.state.doc);
+    try {
+      setDoc(JSON.stringify(parameter.state.doc, null, 2));
+
+      const newSquizDoc = remirrorNodeToSquizNode(parameter.state.doc);
+      const newReconvertedDoc = parameter.state.schema.nodeFromJSON(squizNodeToRemirrorNode(newSquizDoc));
+
+      setSquizDoc(JSON.stringify(newSquizDoc, null, 2));
+      setReconvertedDoc(JSON.stringify(newReconvertedDoc, null, 2));
+    } catch (e) {
+      setError(e);
     }
   };
 
@@ -22,15 +35,37 @@ function App() {
       </div>
       <h1>Editor</h1>
       <div className="page-section">
-        <FormattedTextEditor
-          editable={editable}
-          content={`<p>Hello <a href="https://www.google.com"><strong>Mr Bean</strong></a>, nice to <a href="https://www.google.com">meet you</a>.</p>`}
-          onChange={handleEditorChange}
-        />
+        <EditorContext.Provider
+          value={{
+            matrix: {
+              matrixDomain: 'https://matrix-domain.squiz.net',
+              matrixIdentifier: 'matrix-api-identifier',
+              isValidMatrixAssetId: (assetId: string) => {
+                return new Promise((resolve) => {
+                  setTimeout(() => {
+                    resolve(assetId.indexOf('invalid') < 0);
+                  }, 200);
+                });
+              },
+            },
+          }}
+        >
+          <Editor
+            editable={editable}
+            content={`<p>Hello <a href="https://www.google.com"><strong>Mr Bean</strong></a>, nice to <a href="https://www.google.com">meet you</a>.<img src="https://media2.giphy.com/media/3o6ozsIxg5legYvggo/giphy.gif" height="150" width="200"/></p>`}
+            onChange={handleEditorChange}
+          />
+        </EditorContext.Provider>
       </div>
       <h1>Document</h1>
       <div className="page-section">
-        <code>{JSON.stringify(doc, null, 2)}</code>
+        {error instanceof Error && (
+          <div className="error">An error occurred when transforming the document: {error.message}</div>
+        )}
+        <div className="code-section">
+          <ReactDiffViewer oldValue={doc} newValue={reconvertedDoc} splitView={false} showDiffOnly={false} />
+          <ReactDiffViewer oldValue={squizDoc} newValue={squizDoc} splitView={false} showDiffOnly={false} />
+        </div>
       </div>
     </div>
   );

package/demo/index.scss

@@ -22,19 +22,20 @@ h1 {
   align-items: center;
 }
 
-code {
-  padding: 8px;
-  display: block;
-  white-space: pre;
-  background-color: #eee;
-  font-size: 0.8rem;
-  height: 40vh;
-  max-height: 40vh;
+.code-section {
+  display: flex;
+  flex-direction: row;
+  gap: 8px;
+  height: 35vh;
   overflow: scroll;
 }
 
 .remirror-editor {
-  height: 40vh;
-  max-height: 40vh;
+  height: 35vh;
+  max-height: 35vh;
   overflow: scroll;
 }
+
+.error {
+  color: red;
+}

package/lib/Editor/Editor.js

@@ -1,15 +1,53 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const react_1 = __importDefault(require("react"));
+const react_1 = __importStar(require("react"));
 const react_2 = require("@remirror/react");
 const EditorToolbar_1 = require("../EditorToolbar");
+const EditorContext_1 = require("./EditorContext");
 const Extensions_1 = require("../Extensions/Extensions");
-const Editor = ({ content, editable, onChange }) => {
+const clsx_1 = __importDefault(require("clsx"));
+const WrappedEditor = () => {
+    const preventImagePaste = (0, react_1.useCallback)((event) => {
+        const { clipboardData } = event;
+        const pastedData = clipboardData?.files[0];
+        if (pastedData?.type && pastedData?.type.startsWith('image/')) {
+            event.preventDefault();
+        }
+        // Allow other paste event handlers to be run.
+        return false;
+    }, []);
+    (0, react_2.useEditorEvent)('paste', preventImagePaste);
+    return react_1.default.createElement(react_2.EditorComponent, null);
+};
+const Editor = ({ content, editable = true, onChange }) => {
     const { manager, state, setState } = (0, react_2.useRemirror)({
-        extensions: Extensions_1.Extensions,
+        extensions: (0, Extensions_1.createExtensions)((0, react_1.useContext)(EditorContext_1.EditorContext)),
         content,
         selection: 'start',
         stringHandler: 'html',
@@ -19,10 +57,10 @@ const Editor = ({ content, editable, onChange }) => {
         onChange?.(parameter);
     };
     return (react_1.default.createElement("div", { className: "squiz-fte-scope" },
-        react_1.default.createElement("div", { className: "remirror-theme formatted-text-editor editor-wrapper" },
+        react_1.default.createElement("div", { className: (0, clsx_1.default)('remirror-theme formatted-text-editor', !editable && 'formatted-text-editor--is-disabled') },
             react_1.default.createElement(react_2.Remirror, { manager: manager, state: state, editable: editable, onChange: handleChange, placeholder: "Write something", label: "Text editor" },
-                react_1.default.createElement(EditorToolbar_1.Toolbar, null),
-                react_1.default.createElement(react_2.EditorComponent, null),
-                react_1.default.createElement(EditorToolbar_1.FloatingToolbar, null)))));
+                editable && react_1.default.createElement(EditorToolbar_1.Toolbar, null),
+                react_1.default.createElement(WrappedEditor, null),
+                editable && react_1.default.createElement(EditorToolbar_1.FloatingToolbar, null)))));
 };
 exports.default = Editor;

package/lib/Editor/EditorContext.d.ts

@@ -0,0 +1,10 @@
+import React from 'react';
+export type EditorContextOptions = {
+    matrix: {
+        matrixIdentifier: string;
+        matrixDomain: string;
+        isValidMatrixAssetId: (assetId: string) => boolean | Promise<boolean>;
+    };
+};
+export declare const defaultEditorContext: EditorContextOptions;
+export declare const EditorContext: React.Context<EditorContextOptions>;

package/lib/Editor/EditorContext.js

@@ -0,0 +1,15 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EditorContext = exports.defaultEditorContext = void 0;
+const react_1 = __importDefault(require("react"));
+exports.defaultEditorContext = {
+    matrix: {
+        matrixIdentifier: '',
+        matrixDomain: '',
+        isValidMatrixAssetId: () => true,
+    },
+};
+exports.EditorContext = react_1.default.createContext(exports.defaultEditorContext);

package/lib/EditorToolbar/FloatingToolbar.js

@@ -37,22 +37,28 @@ const LinkButton_1 = __importDefault(require("./Tools/Link/LinkButton"));
 const react_2 = require("@remirror/react");
 const react_components_1 = require("@remirror/react-components");
 const createToolbarPositioner_1 = require("../utils/createToolbarPositioner");
-// The editor main toolbar
+const ImageButton_1 = __importDefault(require("./Tools/Image/ImageButton"));
+const Extensions_1 = require("../Extensions/Extensions");
 const FloatingToolbar = () => {
+    const watchedMarks = [Extensions_1.MarkName.Link, Extensions_1.MarkName.AssetLink];
     const extensionNames = (0, hooks_1.useExtensionNames)();
-    const positioner = (0, react_1.useMemo)(() => (0, createToolbarPositioner_1.createToolbarPositioner)({ types: ['link'] }), []);
-    const { data } = (0, react_2.usePositioner)(positioner, []);
+    const positioner = (0, react_1.useMemo)(() => (0, createToolbarPositioner_1.createToolbarPositioner)({ types: watchedMarks }), []);
+    const active = (0, react_2.useActive)();
+    const { data: { marks }, } = (0, react_2.usePositioner)(positioner, []);
     let buttons = [
         extensionNames.bold && react_1.default.createElement(BoldButton_1.default, { key: "bold" }),
         extensionNames.italic && react_1.default.createElement(ItalicButton_1.default, { key: "italic" }),
         extensionNames.underline && react_1.default.createElement(UnderlineButton_1.default, { key: "underline" }),
     ];
-    if (data.marks?.link.isExclusivelyActive) {
+    if (active.image()) {
+        buttons = [react_1.default.createElement(ImageButton_1.default, { key: "add-image", inPopover: true })];
+    }
+    else if (marks?.[Extensions_1.MarkName.Link].isExclusivelyActive || marks?.[Extensions_1.MarkName.AssetLink].isExclusivelyActive) {
         // if all of the selected text is a link show the options to update/remove the link instead of the regular
         // formatting options.
         buttons = [react_1.default.createElement(LinkButton_1.default, { key: "update-link", inPopover: true }), react_1.default.createElement(RemoveLinkButton_1.default, { key: "remove-link" })];
     }
-    else if (!data.marks?.link.isActive) {
+    else if (!marks?.[Extensions_1.MarkName.Link].isActive && !marks?.[Extensions_1.MarkName.AssetLink].isActive) {
         // if none of the selected text is a link show the option to create a link.
         buttons.push(react_1.default.createElement(react_components_1.VerticalDivider, { key: "link-divider", className: "editor-divider" }), react_1.default.createElement(LinkButton_1.default, { key: "add-link", inPopover: true }));
     }

package/lib/EditorToolbar/Toolbar.js

@@ -15,6 +15,7 @@ const RedoButton_1 = __importDefault(require("./Tools/Redo/RedoButton"));
 const TextTypeDropdown_1 = __importDefault(require("./Tools/TextType/TextTypeDropdown"));
 const hooks_1 = require("../hooks");
 const LinkButton_1 = __importDefault(require("./Tools/Link/LinkButton"));
+const ImageButton_1 = __importDefault(require("./Tools/Image/ImageButton"));
 const Toolbar = () => {
     const extensionNames = (0, hooks_1.useExtensionNames)();
     return (react_1.default.createElement(react_components_1.Toolbar, { className: "remirror-toolbar editor-toolbar" },
@@ -27,6 +28,7 @@ const Toolbar = () => {
         extensionNames.italic && react_1.default.createElement(ItalicButton_1.default, null),
         extensionNames.underline && react_1.default.createElement(UnderlineButton_1.default, null),
         extensionNames.nodeFormatting && react_1.default.createElement(TextAlignButtons_1.default, null),
-        extensionNames.link && react_1.default.createElement(LinkButton_1.default, null)));
+        extensionNames.link && react_1.default.createElement(LinkButton_1.default, null),
+        extensionNames.image && react_1.default.createElement(ImageButton_1.default, null)));
 };
 exports.Toolbar = Toolbar;

package/lib/EditorToolbar/Tools/Bold/BoldButton.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importDefault(require("react"));
 const react_2 = require("@remirror/react");
-const ToolbarButton_1 = __importDefault(require("../../../ui/ToolbarButton/ToolbarButton"));
+const Button_1 = __importDefault(require("../../../ui/Button/Button"));
 const FormatBoldRounded_1 = __importDefault(require("@mui/icons-material/FormatBoldRounded"));
 const BoldButton = () => {
     const { toggleBold } = (0, react_2.useCommands)();
@@ -17,6 +17,6 @@ const BoldButton = () => {
             chain.toggleBold().focus().run();
         }
     };
-    return (react_1.default.createElement(ToolbarButton_1.default, { handleOnClick: handleSelect, isDisabled: !enabled, isActive: active.bold(), icon: react_1.default.createElement(FormatBoldRounded_1.default, null), label: "Bold (cmd+B)" }));
+    return (react_1.default.createElement(Button_1.default, { handleOnClick: handleSelect, isDisabled: !enabled, isActive: active.bold(), icon: react_1.default.createElement(FormatBoldRounded_1.default, null), label: "Bold (cmd+B)" }));
 };
 exports.default = BoldButton;

package/lib/EditorToolbar/Tools/Image/Form/ImageForm.d.ts

@@ -0,0 +1,17 @@
+import { ReactElement } from 'react';
+import { SubmitHandler } from 'react-hook-form';
+import { ImageAttributes } from '@remirror/extension-image/dist-types/image-extension';
+export type UpdateImageOptions = ImageAttributes & {
+    src: string;
+    alt: string;
+    width: number;
+    height: number;
+};
+export type ImageFormData = Pick<UpdateImageOptions, 'src' | 'alt' | 'width' | 'height'>;
+export type FormProps = {
+    data: Partial<ImageFormData>;
+    onSubmit: SubmitHandler<ImageFormData>;
+};
+export type Dimensions = 'width' | 'height';
+declare const ImageForm: ({ data, onSubmit }: FormProps) => ReactElement;
+export default ImageForm;

package/lib/EditorToolbar/Tools/Image/Form/ImageForm.js

@@ -0,0 +1,82 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const react_1 = __importStar(require("react"));
+const Input_1 = require("../../../../ui/Fields/Input/Input");
+const react_hook_form_1 = require("react-hook-form");
+const react_image_size_1 = require("react-image-size");
+const Button_1 = __importDefault(require("../../../../ui/Button/Button"));
+const LinkOff_1 = __importDefault(require("@mui/icons-material/LinkOff"));
+const InsertLinkRounded_1 = __importDefault(require("@mui/icons-material/InsertLinkRounded"));
+const ImageForm = ({ data, onSubmit }) => {
+    const { register, handleSubmit, setValue } = (0, react_hook_form_1.useForm)({
+        defaultValues: data,
+    });
+    const [aspectRatioFromWidth, setAspectRatioFromWidth] = (0, react_1.useState)(9 / 16);
+    const [aspectRatioFromHeight, setAspectRatioFromHeight] = (0, react_1.useState)(16 / 9);
+    const [aspectRatioLocked, setAspectRatioLocked] = (0, react_1.useState)(true);
+    const setDimensionsFromURL = (e) => {
+        (0, react_image_size_1.getImageSize)(e.target.value)
+            .then(({ width, height }) => {
+            setValue('width', width);
+            setValue('height', height);
+            setAspectRatioFromWidth(height / width);
+            setAspectRatioFromHeight(width / height);
+        })
+            .catch(() => {
+            // TODO: we will use this when we add validation in a follow-up ticket
+        });
+    };
+    const calculateDimensions = () => {
+        if (aspectRatioLocked) {
+            const currentTarget = event?.target;
+            const type = currentTarget.name;
+            const currentValue = currentTarget.value;
+            const otherValue = type === 'width' ? 'height' : 'width';
+            const aspectRatio = type === 'width' ? aspectRatioFromWidth : aspectRatioFromHeight;
+            const newValue = Math.round(aspectRatio * Number(currentValue) * 100) / 100;
+            setValue(otherValue, newValue);
+        }
+    };
+    const toggleAspectRatio = () => {
+        setAspectRatioLocked(!aspectRatioLocked);
+    };
+    return (react_1.default.createElement("form", { className: "squiz-fte-form", onSubmit: handleSubmit(onSubmit) },
+        react_1.default.createElement("div", { className: "squiz-fte-form-group mb-2" },
+            react_1.default.createElement(Input_1.Input, { label: "Source", ...register('src', { onChange: setDimensionsFromURL }) })),
+        react_1.default.createElement("div", { className: "squiz-fte-form-group mb-2" },
+            react_1.default.createElement(Input_1.Input, { label: "Alternative description", ...register('alt') })),
+        react_1.default.createElement("div", { className: "flex flex-row items-end" },
+            react_1.default.createElement("div", { className: "squiz-fte-form-group mb-2" },
+                react_1.default.createElement(Input_1.Input, { label: "Width", ...register('width'), type: "number", name: "width", onChange: calculateDimensions })),
+            react_1.default.createElement("div", { className: "flex mx-1 mb-2" },
+                react_1.default.createElement(Button_1.default, { handleOnClick: toggleAspectRatio, isActive: false, icon: aspectRatioLocked ? react_1.default.createElement(InsertLinkRounded_1.default, null) : react_1.default.createElement(LinkOff_1.default, null), label: "Constrain properties", isDisabled: false })),
+            react_1.default.createElement("div", { className: "squiz-fte-form-group mb-2" },
+                react_1.default.createElement(Input_1.Input, { label: "Height", ...register('height'), type: "number", name: "height", onChange: calculateDimensions })))));
+};
+exports.default = ImageForm;

package/lib/EditorToolbar/Tools/Image/ImageButton.d.ts

@@ -0,0 +1,5 @@
+type ImageButtonProps = {
+    inPopover?: boolean;
+};
+declare const ImageButton: ({ inPopover }: ImageButtonProps) => JSX.Element;
+export default ImageButton;

package/lib/EditorToolbar/Tools/Image/ImageButton.js

@@ -0,0 +1,77 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const react_1 = __importStar(require("react"));
+const ImageRounded_1 = __importDefault(require("@mui/icons-material/ImageRounded"));
+const ImageModal_1 = __importDefault(require("./ImageModal"));
+const Button_1 = __importDefault(require("../../../ui/Button/Button"));
+const react_2 = require("@remirror/react");
+const createToolbarPositioner_1 = require("../../../utils/createToolbarPositioner");
+const ImageButton = ({ inPopover = false }) => {
+    const [showModal, setShowModal] = (0, react_1.useState)(false);
+    const { insertImage } = (0, react_2.useCommands)();
+    const active = (0, react_2.useActive)();
+    const positioner = (0, react_1.useMemo)(() => (0, createToolbarPositioner_1.createToolbarPositioner)({ types: ['link'] }), []);
+    const { data } = (0, react_2.usePositioner)(positioner, []);
+    // if the active selection is not an image, disable the button as it means it will be text
+    const disabled = data.isSelectionInView && !active.image() ? true : false;
+    const handleClick = () => {
+        if (!showModal) {
+            // form element are uncontrolled, let the event loop run to
+            // update the selected text in state before showing the modal.
+            requestAnimationFrame(() => {
+                setShowModal(true);
+            });
+        }
+    };
+    const insertImageFromData = (data) => {
+        const { src, alt, width, height } = data;
+        if (src) {
+            insertImage({ src, alt, width, height });
+        }
+    };
+    const handleSubmit = (data) => {
+        insertImageFromData(data);
+        setShowModal(false);
+    };
+    const handleShortcut = (0, react_1.useCallback)(() => {
+        handleClick();
+        // Prevent other key handlers being run
+        return true;
+    }, []);
+    // when Ctrl+l is pressed show the modal, only registered in the toolbar button instance to avoid the key press
+    // being double handled.
+    if (!inPopover) {
+        // disable the shortcut if the button is disabled
+        (0, react_2.useKeymap)('Mod-l', disabled ? () => false : handleShortcut);
+    }
+    return (react_1.default.createElement(react_1.default.Fragment, null,
+        react_1.default.createElement(Button_1.default, { handleOnClick: handleClick, isActive: active.image(), icon: react_1.default.createElement(ImageRounded_1.default, null), label: "Image (cmd+L)", isDisabled: disabled }),
+        showModal && react_1.default.createElement(ImageModal_1.default, { onCancel: () => setShowModal(false), onSubmit: handleSubmit })));
+};
+exports.default = ImageButton;

package/lib/EditorToolbar/Tools/Image/ImageModal.d.ts

@@ -0,0 +1,8 @@
+import { ImageFormData } from './Form/ImageForm';
+import { SubmitHandler } from 'react-hook-form';
+type ImageModalProps = {
+    onCancel: () => void;
+    onSubmit: SubmitHandler<ImageFormData>;
+};
+declare const ImageModal: ({ onCancel, onSubmit }: ImageModalProps) => JSX.Element;
+export default ImageModal;

package/lib/EditorToolbar/Tools/Image/ImageModal.js

@@ -0,0 +1,16 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ImageForm_1 = __importDefault(require("./Form/ImageForm"));
+const react_1 = __importDefault(require("react"));
+const react_2 = require("@remirror/react");
+const FormModal_1 = __importDefault(require("../../../ui/Modal/FormModal"));
+const ImageModal = ({ onCancel, onSubmit }) => {
+    const selection = (0, react_2.useCurrentSelection)();
+    const currentImage = selection?.node;
+    return (react_1.default.createElement(FormModal_1.default, { title: "Image", onCancel: onCancel },
+        react_1.default.createElement(ImageForm_1.default, { data: { ...currentImage?.attrs, src: currentImage?.attrs.src }, onSubmit: onSubmit })));
+};
+exports.default = ImageModal;

package/lib/EditorToolbar/Tools/Italic/ItalicButton.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = __importDefault(require("react"));
 const react_2 = require("@remirror/react");
-const ToolbarButton_1 = __importDefault(require("../../../ui/ToolbarButton/ToolbarButton"));
+const Button_1 = __importDefault(require("../../../ui/Button/Button"));
 const FormatItalicRounded_1 = __importDefault(require("@mui/icons-material/FormatItalicRounded"));
 const ItalicButton = () => {
     const { toggleItalic } = (0, react_2.useCommands)();
@@ -17,6 +17,6 @@ const ItalicButton = () => {
             chain.toggleItalic().focus().run();
         }
     };
-    return (react_1.default.createElement(ToolbarButton_1.default, { handleOnClick: handleSelect, isDisabled: !enabled, isActive: active.italic(), icon: react_1.default.createElement(FormatItalicRounded_1.default, null), label: "Italic (cmd+I)" }));
+    return (react_1.default.createElement(Button_1.default, { handleOnClick: handleSelect, isDisabled: !enabled, isActive: active.italic(), icon: react_1.default.createElement(FormatItalicRounded_1.default, null), label: "Italic (cmd+I)" }));
 };
 exports.default = ItalicButton;

package/lib/EditorToolbar/Tools/Link/Form/LinkForm.d.ts

@@ -1,10 +1,19 @@
 import { ReactElement } from 'react';
 import { SubmitHandler } from 'react-hook-form';
-import { UpdateLinkOptions } from '../../../../Extensions/LinkExtension/LinkExtension';
-export type LinkFormData = Pick<UpdateLinkOptions, 'href' | 'target' | 'title' | 'text'>;
+import { FromToProps } from 'remirror';
+import { UpdateLinkProps } from '../../../../Extensions/LinkExtension/LinkExtension';
+import { UpdateAssetLinkProps } from '../../../../Extensions/LinkExtension/AssetLinkExtension';
+import { MarkName } from '../../../../Extensions/Extensions';
+import { DeepPartial } from '../../../../types';
+export type LinkFormData = {
+    linkType: MarkName;
+    text: string;
+    link: UpdateLinkProps['attrs'];
+    assetLink: UpdateAssetLinkProps['attrs'];
+    range: FromToProps;
+};
 export type FormProps = {
-    data: Partial<LinkFormData>;
+    data?: DeepPartial<LinkFormData>;
     onSubmit: SubmitHandler<LinkFormData>;
 };
-declare const LinkForm: ({ data, onSubmit }: FormProps) => ReactElement;
-export default LinkForm;
+export declare const LinkForm: ({ data, onSubmit }: FormProps) => ReactElement;

package/lib/EditorToolbar/Tools/Link/Form/LinkForm.js

@@ -1,28 +1,80 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const react_1 = __importDefault(require("react"));
-const TextInput_1 = require("../../../../ui/Inputs/Text/TextInput");
-const Select_1 = require("../../../../ui/Inputs/Select/Select");
+exports.LinkForm = void 0;
+const react_1 = __importStar(require("react"));
+const clsx_1 = __importDefault(require("clsx"));
 const react_hook_form_1 = require("react-hook-form");
-const selectOptions = {
-    _self: { label: 'Current window' },
-    _blank: { label: 'New window' },
+const Input_1 = require("../../../../ui/Fields/Input/Input");
+const Select_1 = require("../../../../ui/Fields/Select/Select");
+const common_1 = require("../../../../Extensions/LinkExtension/common");
+const EditorContext_1 = require("../../../../Editor/EditorContext");
+const Extensions_1 = require("../../../../Extensions/Extensions");
+const linkTypeOptions = {
+    [Extensions_1.MarkName.Link]: { label: 'Link to URL' },
+    [Extensions_1.MarkName.AssetLink]: { label: 'Link to asset' },
+};
+const targetOptions = {
+    [common_1.LinkTarget.Self]: { label: 'Current window' },
+    [common_1.LinkTarget.Blank]: { label: 'New window' },
 };
 const LinkForm = ({ data, onSubmit }) => {
-    const { register, handleSubmit, setValue } = (0, react_hook_form_1.useForm)({
+    const context = (0, react_1.useContext)(EditorContext_1.EditorContext);
+    const { register, handleSubmit, setValue, watch, formState: { errors }, } = (0, react_hook_form_1.useForm)({
         defaultValues: data,
     });
+    const linkType = watch('linkType') || Extensions_1.MarkName.Link;
     return (react_1.default.createElement("form", { className: "squiz-fte-form", onSubmit: handleSubmit(onSubmit) },
         react_1.default.createElement("div", { className: "squiz-fte-form-group mb-2" },
-            react_1.default.createElement(TextInput_1.TextInput, { label: "URL", ...register('href') })),
-        react_1.default.createElement("div", { className: "squiz-fte-form-group mb-2" },
-            react_1.default.createElement(TextInput_1.TextInput, { label: "Text", ...register('text') })),
-        react_1.default.createElement("div", { className: "squiz-fte-form-group mb-2" },
-            react_1.default.createElement(TextInput_1.TextInput, { label: "Title", ...register('title') })),
-        react_1.default.createElement("div", { className: "squiz-fte-form-group mb-0" },
-            react_1.default.createElement(Select_1.Select, { name: "target", label: "Target", value: data.target || '_self', options: selectOptions, onChange: (value) => setValue('target', value) }))));
+            react_1.default.createElement(Select_1.Select, { name: "linkType", label: "Type", value: linkType, options: linkTypeOptions, onChange: (value) => setValue('linkType', value) })),
+        linkType === Extensions_1.MarkName.Link && (react_1.default.createElement(react_1.default.Fragment, null,
+            react_1.default.createElement("div", { className: (0, clsx_1.default)('squiz-fte-form-group mb-2') },
+                react_1.default.createElement(Input_1.Input, { label: "URL", ...register('link.href') })),
+            react_1.default.createElement("div", { className: (0, clsx_1.default)('squiz-fte-form-group mb-2') },
+                react_1.default.createElement(Input_1.Input, { label: "Text", ...register('text') })),
+            react_1.default.createElement("div", { className: (0, clsx_1.default)('squiz-fte-form-group mb-2') },
+                react_1.default.createElement(Input_1.Input, { label: "Title", ...register('link.title') })),
+            react_1.default.createElement("div", { className: (0, clsx_1.default)('squiz-fte-form-group mb-0') },
+                react_1.default.createElement(Select_1.Select, { name: "link.target", label: "Target", value: data?.link?.target || '_self', options: targetOptions, onChange: (value) => setValue('link.target', value) })))),
+        linkType === Extensions_1.MarkName.AssetLink && (react_1.default.createElement(react_1.default.Fragment, null,
+            react_1.default.createElement("div", { className: (0, clsx_1.default)('squiz-fte-form-group mb-2') },
+                react_1.default.createElement(Input_1.Input, { label: "Asset ID", error: errors?.assetLink?.matrixAssetId?.message, ...register('assetLink.matrixAssetId', {
+                        validate: {
+                            isValidAsset: async (assetId) => {
+                                if (assetId && !(await context.matrix.isValidMatrixAssetId(assetId))) {
+                                    return 'Invalid asset ID';
+                                }
+                            },
+                        },
+                    }) })),
+            react_1.default.createElement("div", { className: (0, clsx_1.default)('squiz-fte-form-group mb-2') },
+                react_1.default.createElement(Input_1.Input, { label: "Text", ...register('text') })),
+            react_1.default.createElement("div", { className: (0, clsx_1.default)('squiz-fte-form-group mb-0') },
+                react_1.default.createElement(Select_1.Select, { name: "assetLink.target", label: "Target", value: data?.link?.target || '_self', options: targetOptions, onChange: (value) => setValue('assetLink.target', value) }))))));
 };
-exports.default = LinkForm;
+exports.LinkForm = LinkForm;