@squiz/formatted-text-editor 1.16.0 → 1.21.1-alpha.10

package/.eslintrc.json

@@ -30,5 +30,12 @@
         "extensions": [".js", ".jsx", ".ts", ".tsx"]
       }
     }
+  },
+  "rules": {
+    // The rules below are listed in the order they appear on the eslint-plugin-react rules page.
+
+    // React
+    // https://github.com/yannickcr/eslint-plugin-react#list-of-supported-rules
+    "react/button-has-type": "error"
   }
 }

package/README.md

@@ -53,6 +53,16 @@ npm run test:watch
 
 When testing text input in the text editor, it is recommended to use the `<MockEditor />` component, which is a simple wrapper around the Remirror component that provides additional functionality for testing (supplying text into the editor).
 
+### Test coverage
+
+Test coverage is enforced globally in this package. You can run the test coverage script from the package root:
+
+```sh
+npm run test:coverage
+```
+
+Coverage will also run as part of the normal test script. Please see ./jest.config.ts for the currently configured thresholds.
+
 ### End to end testing
 
 This package uses [Cypress](https://docs.cypress.io/) for end to end testing.

package/demo/App.tsx

@@ -1,13 +1,24 @@
 import React, { useState } from 'react';
 import FormattedTextEditor from '../src/FormattedTextEditor';
 import { RemirrorEventListener, Extension } from '@remirror/core';
+import { remirrorNodeToSquizNode } from '../src/utils/converters/remirrorNodeToSquizNode/remirrorNodeToSquizNode';
+import { squizNodeToRemirrorNode } from '../src/utils/converters/squizNodeToRemirrorNode/squizNodeToRemirrorNode';
+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 [editable, setEditable] = useState(true);
+
   const handleEditorChange: RemirrorEventListener<Extension> = (parameter) => {
     if (doc !== parameter.state.doc) {
-      setDoc(parameter.state.doc);
+      const newSquizDoc = remirrorNodeToSquizNode(parameter.state.doc);
+      const newReconvertedDoc = parameter.state.schema.nodeFromJSON(squizNodeToRemirrorNode(newSquizDoc));
+
+      setDoc(JSON.stringify(parameter.state.doc, null, 2));
+      setSquizDoc(JSON.stringify(newSquizDoc, null, 2));
+      setReconvertedDoc(JSON.stringify(newReconvertedDoc, null, 2));
     }
   };
 
@@ -24,13 +35,16 @@ function App() {
       <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>`}
+          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}
         />
       </div>
       <h1>Document</h1>
       <div className="page-section">
-        <code>{JSON.stringify(doc, null, 2)}</code>
+        <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,25 @@ 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;
 }
+
+.squiz-fte-modal-footer__button {
+  margin-top: 1rem;
+}
+
+.mock-buttons {
+  display: flex;
+  gap: 0.5rem;
+}

package/jest.config.ts

@@ -4,6 +4,14 @@ export default {
   clearMocks: true,
   collectCoverage: true,
   collectCoverageFrom: ['src/**/*.{ts,tsx}'],
+  coverageThreshold: {
+    global: {
+      branches: 90,
+      functions: 90,
+      lines: 90,
+      statements: 90,
+    },
+  },
   errorOnDeprecated: true,
   fakeTimers: {
     enableGlobally: true,
@@ -18,13 +26,4 @@ export default {
     '^react-dom($|/.+)': '<rootDir>/node_modules/react-dom$1',
   },
   setupFilesAfterEnv: ['<rootDir>/jest.bootstrap.ts'],
-  // TODO: enable once directory structure is sorted and we have tests/more complete code being written.
-  // coverageThreshold: {
-  //   global: {
-  //     branches: 90,
-  //     functions: 90,
-  //     lines: 90,
-  //     statements: 90,
-  //   },
-  // },
 };

package/lib/Editor/Editor.js

@@ -1,10 +1,15 @@
-import React from 'react';
-import { EditorComponent, Remirror, useRemirror } from '@remirror/react';
-import { Toolbar, FloatingToolbar } from '../EditorToolbar';
-import { Extensions } from '../Extensions/Extensions';
+"use strict";
+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_2 = require("@remirror/react");
+const EditorToolbar_1 = require("../EditorToolbar");
+const Extensions_1 = require("../Extensions/Extensions");
 const Editor = ({ content, editable, onChange }) => {
-    const { manager, state, setState } = useRemirror({
-        extensions: Extensions,
+    const { manager, state, setState } = (0, react_2.useRemirror)({
+        extensions: Extensions_1.Extensions,
         content,
         selection: 'start',
         stringHandler: 'html',
@@ -13,11 +18,11 @@ const Editor = ({ content, editable, onChange }) => {
         setState(parameter.state);
         onChange?.(parameter);
     };
-    return (React.createElement("div", { className: "squiz-fte-scope" },
-        React.createElement("div", { className: "remirror-theme formatted-text-editor editor-wrapper" },
-            React.createElement(Remirror, { manager: manager, state: state, editable: editable, onChange: handleChange, placeholder: "Write something", label: "Text editor" },
-                React.createElement(Toolbar, null),
-                React.createElement(EditorComponent, null),
-                React.createElement(FloatingToolbar, null)))));
+    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(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)))));
 };
-export default Editor;
+exports.default = Editor;

package/lib/EditorToolbar/FloatingToolbar.js

@@ -1,31 +1,61 @@
-import React, { useMemo } from 'react';
-import ItalicButton from './Tools/Italic/ItalicButton';
-import UnderlineButton from './Tools/Underline/UnderlineButton';
-import BoldButton from './Tools/Bold/BoldButton';
-import { useExtensionNames } from '../hooks';
-import RemoveLinkButton from './Tools/Link/RemoveLinkButton';
-import LinkButton from './Tools/Link/LinkButton';
-import { FloatingToolbar as RemirrorFloatingToolbar, usePositioner } from '@remirror/react';
-import { VerticalDivider } from '@remirror/react-components';
-import { createToolbarPositioner } from '../utils/createToolbarPositioner';
+"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 });
+exports.FloatingToolbar = void 0;
+const react_1 = __importStar(require("react"));
+const ItalicButton_1 = __importDefault(require("./Tools/Italic/ItalicButton"));
+const UnderlineButton_1 = __importDefault(require("./Tools/Underline/UnderlineButton"));
+const BoldButton_1 = __importDefault(require("./Tools/Bold/BoldButton"));
+const hooks_1 = require("../hooks");
+const RemoveLinkButton_1 = __importDefault(require("./Tools/Link/RemoveLinkButton"));
+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
-export const FloatingToolbar = () => {
-    const extensionNames = useExtensionNames();
-    const positioner = useMemo(() => createToolbarPositioner({ types: ['link'] }), []);
-    const { data } = usePositioner(positioner, []);
+const FloatingToolbar = () => {
+    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, []);
     let buttons = [
-        extensionNames.bold && React.createElement(BoldButton, { key: "bold" }),
-        extensionNames.italic && React.createElement(ItalicButton, { key: "italic" }),
-        extensionNames.underline && React.createElement(UnderlineButton, { key: "underline" }),
+        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 all of the selected text is a link show the options to update/remove the link instead of the regular
         // formatting options.
-        buttons = [React.createElement(LinkButton, { key: "update-link", inPopover: true }), React.createElement(RemoveLinkButton, { key: "remove-link" })];
+        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) {
         // if none of the selected text is a link show the option to create a link.
-        buttons.push(React.createElement(VerticalDivider, { key: "link-divider", className: "link-divider" }), React.createElement(LinkButton, { key: "add-link", inPopover: true }));
+        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 }));
     }
-    return (React.createElement(RemirrorFloatingToolbar, { className: "squiz-fte-scope squiz-fte-scope__floating-popover", positioner: positioner }, buttons));
+    return (react_1.default.createElement(react_2.FloatingToolbar, { className: "squiz-fte-scope squiz-fte-scope__floating-popover", positioner: positioner }, buttons));
 };
+exports.FloatingToolbar = FloatingToolbar;

package/lib/EditorToolbar/Toolbar.js

@@ -1,25 +1,34 @@
-import React from 'react';
-import { Toolbar as RemirrorToolbar, VerticalDivider } from '@remirror/react-components';
-import ItalicButton from './Tools/Italic/ItalicButton';
-import UnderlineButton from './Tools/Underline/UnderlineButton';
-import BoldButton from './Tools/Bold/BoldButton';
-import TextAlignButtons from './Tools/TextAlign/TextAlignButtons';
-import UndoButton from './Tools/Undo/UndoButton';
-import RedoButton from './Tools/Redo/RedoButton';
-import TextTypeDropdown from './Tools/TextType/TextTypeDropdown';
-import { useExtensionNames } from '../hooks';
-import LinkButton from './Tools/Link/LinkButton';
-export const Toolbar = () => {
-    const extensionNames = useExtensionNames();
-    return (React.createElement(RemirrorToolbar, { className: "remirror-toolbar editor-toolbar" },
-        extensionNames.history && (React.createElement(React.Fragment, null,
-            React.createElement(UndoButton, null),
-            React.createElement(RedoButton, null),
-            React.createElement(VerticalDivider, { className: "editor-divider" }))),
-        extensionNames.heading && extensionNames.paragraph && extensionNames.preformatted && React.createElement(TextTypeDropdown, null),
-        extensionNames.bold && React.createElement(BoldButton, null),
-        extensionNames.italic && React.createElement(ItalicButton, null),
-        extensionNames.underline && React.createElement(UnderlineButton, null),
-        extensionNames.nodeFormatting && React.createElement(TextAlignButtons, null),
-        extensionNames.link && React.createElement(LinkButton, null)));
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Toolbar = void 0;
+const react_1 = __importDefault(require("react"));
+const react_components_1 = require("@remirror/react-components");
+const ItalicButton_1 = __importDefault(require("./Tools/Italic/ItalicButton"));
+const UnderlineButton_1 = __importDefault(require("./Tools/Underline/UnderlineButton"));
+const BoldButton_1 = __importDefault(require("./Tools/Bold/BoldButton"));
+const TextAlignButtons_1 = __importDefault(require("./Tools/TextAlign/TextAlignButtons"));
+const UndoButton_1 = __importDefault(require("./Tools/Undo/UndoButton"));
+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" },
+        extensionNames.history && (react_1.default.createElement(react_1.default.Fragment, null,
+            react_1.default.createElement(UndoButton_1.default, null),
+            react_1.default.createElement(RedoButton_1.default, null),
+            react_1.default.createElement(react_components_1.VerticalDivider, { className: "editor-divider" }))),
+        extensionNames.heading && extensionNames.paragraph && extensionNames.preformatted && react_1.default.createElement(TextTypeDropdown_1.default, null),
+        extensionNames.bold && react_1.default.createElement(BoldButton_1.default, null),
+        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.image && react_1.default.createElement(ImageButton_1.default, null)));
+};
+exports.Toolbar = Toolbar;

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

@@ -1,17 +1,22 @@
-import React from 'react';
-import { useCommands, useActive, useChainedCommands } from '@remirror/react';
-import ToolbarButton from '../../../ui/ToolbarButton/ToolbarButton';
-import FormatBoldRoundedIcon from '@mui/icons-material/FormatBoldRounded';
+"use strict";
+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_2 = require("@remirror/react");
+const Button_1 = __importDefault(require("../../../ui/Button/Button"));
+const FormatBoldRounded_1 = __importDefault(require("@mui/icons-material/FormatBoldRounded"));
 const BoldButton = () => {
-    const { toggleBold } = useCommands();
-    const chain = useChainedCommands();
-    const active = useActive();
+    const { toggleBold } = (0, react_2.useCommands)();
+    const chain = (0, react_2.useChainedCommands)();
+    const active = (0, react_2.useActive)();
     const enabled = toggleBold.enabled();
     const handleSelect = () => {
         if (toggleBold.enabled()) {
             chain.toggleBold().focus().run();
         }
     };
-    return (React.createElement(ToolbarButton, { handleOnClick: handleSelect, isDisabled: !enabled, isActive: active.bold(), icon: React.createElement(FormatBoldRoundedIcon, 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)" }));
 };
-export default BoldButton;
+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,84 @@
+"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) => {
+        // get the new url, calculate the width and height and set those fields
+        (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((errorMessage) => {
+            // TODO: we will use this when we add validation in a follow-up ticket
+            console.log(errorMessage);
+        });
+    };
+    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'), onBlur: 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,2 @@
+declare const ImageButton: () => JSX.Element;
+export default ImageButton;

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

@@ -0,0 +1,67 @@
+"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 ImageButton = () => {
+    const [showModal, setShowModal] = (0, react_1.useState)(false);
+    const { insertImage } = (0, react_2.useCommands)();
+    const active = showModal;
+    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;
+    }, []);
+    (0, react_2.useKeymap)('Mod-l', handleShortcut);
+    return (react_1.default.createElement(react_1.default.Fragment, null,
+        react_1.default.createElement(Button_1.default, { handleOnClick: handleClick, isActive: active, icon: react_1.default.createElement(ImageRounded_1.default, null), label: "Image (cmd+L)", isDisabled: false }),
+        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,19 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const remirror_1 = require("remirror");
+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 { helpers, view: { state }, } = (0, react_2.useRemirrorContext)();
+    const selection = (0, react_2.useCurrentSelection)();
+    const currentImage = (0, remirror_1.getMarkRanges)(selection, 'image')[0];
+    const selectedImage = helpers.getTextBetween(selection.from, selection.to, state.doc);
+    return (react_1.default.createElement(FormModal_1.default, { title: "Image", onCancel: onCancel },
+        react_1.default.createElement(ImageForm_1.default, { data: { ...currentImage?.mark.attrs, src: selectedImage }, onSubmit: onSubmit })));
+};
+exports.default = ImageModal;

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

@@ -1,17 +1,22 @@
-import React from 'react';
-import { useCommands, useActive, useChainedCommands } from '@remirror/react';
-import ToolbarButton from '../../../ui/ToolbarButton/ToolbarButton';
-import FormatItalicRoundedIcon from '@mui/icons-material/FormatItalicRounded';
+"use strict";
+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_2 = require("@remirror/react");
+const Button_1 = __importDefault(require("../../../ui/Button/Button"));
+const FormatItalicRounded_1 = __importDefault(require("@mui/icons-material/FormatItalicRounded"));
 const ItalicButton = () => {
-    const { toggleItalic } = useCommands();
-    const chain = useChainedCommands();
-    const active = useActive();
+    const { toggleItalic } = (0, react_2.useCommands)();
+    const chain = (0, react_2.useChainedCommands)();
+    const active = (0, react_2.useActive)();
     const enabled = toggleItalic.enabled();
     const handleSelect = () => {
         if (toggleItalic.enabled()) {
             chain.toggleItalic().focus().run();
         }
     };
-    return (React.createElement(ToolbarButton, { handleOnClick: handleSelect, isDisabled: !enabled, isActive: active.italic(), icon: React.createElement(FormatItalicRoundedIcon, 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)" }));
 };
-export default ItalicButton;
+exports.default = ItalicButton;