NOW MANAGED ON CODEBERG
Lexical: Added context toolbar placement, added link toolbar
Dan Brownb1c489090ecf
diff --git a/resources/icons/editor/unlink.svg b/resources/icons/editor/unlink.svgnew file mode 100644index 000000000..28f47fd24--- /dev/null+++ b/resources/icons/editor/unlink.svg@@ -0,0 +1 @@+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="m770-302-60-62q40-11 65-42.5t25-73.5q0-50-35-85t-85-35H520v-80h160q83 0 141.5 58.5T880-480q0 57-29.5 105T770-302ZM634-440l-80-80h86v80h-6ZM792-56 56-792l56-56 736 736-56 56ZM440-280H280q-83 0-141.5-58.5T80-480q0-69 42-123t108-71l74 74h-24q-50 0-85 35t-35 85q0 50 35 85t85 35h160v80ZM320-440v-80h65l79 80H320Z"/></svg>\ No newline at end of filediff --git a/resources/js/wysiwyg/ui/defaults/button-definitions.ts b/resources/js/wysiwyg/ui/defaults/button-definitions.tsindex aa8b27ec5..cebf25807 100644--- a/resources/js/wysiwyg/ui/defaults/button-definitions.ts+++ b/resources/js/wysiwyg/ui/defaults/button-definitions.ts@@ -1,7 +1,7 @@import {EditorBasicButtonDefinition, EditorButton, EditorButtonDefinition} from "../framework/buttons";import {$createNodeSelection,- $createParagraphNode, $getRoot, $getSelection,+ $createParagraphNode, $createTextNode, $getRoot, $getSelection,$isParagraphNode, $isTextNode, $setSelection,BaseSelection, CAN_REDO_COMMAND, CAN_UNDO_COMMAND, COMMAND_PRIORITY_LOW, ElementNode, FORMAT_TEXT_COMMAND,LexicalNode,@@ -45,12 +45,13 @@ import listBulletIcon from "@icons/editor/list-bullet.svg"import listNumberedIcon from "@icons/editor/list-numbered.svg"import listCheckIcon from "@icons/editor/list-check.svg"import linkIcon from "@icons/editor/link.svg"+import unlinkIcon from "@icons/editor/unlink.svg"import tableIcon from "@icons/editor/table.svg"import imageIcon from "@icons/editor/image.svg"import horizontalRuleIcon from "@icons/editor/horizontal-rule.svg"import detailsIcon from "@icons/editor/details.svg"import sourceIcon from "@icons/editor/source-view.svg"-import {$createHorizontalRuleNode, $isHorizontalRuleNode, HorizontalRuleNode} from "../../nodes/horizontal-rule";+import {$createHorizontalRuleNode, $isHorizontalRuleNode} from "../../nodes/horizontal-rule";export const undo: EditorButtonDefinition = {label: 'Undo',@@ -258,6 +259,31 @@ export const link: EditorButtonDefinition = {}};+export const unlink: EditorButtonDefinition = {+ label: 'Remove link',+ icon: unlinkIcon,+ action(context: EditorUiContext) {+ context.editor.update(() => {+ const selection = context.lastSelection;+ const selectedLink = getNodeFromSelection(selection, $isLinkNode) as LinkNode|null;+ const selectionPoints = selection?.getStartEndPoints();++ if (selectedLink) {+ const newNode = $createTextNode(selectedLink.getTextContent());+ selectedLink.replace(newNode);+ if (selectionPoints?.length === 2) {+ newNode.select(selectionPoints[0].offset, selectionPoints[1].offset);+ } else {+ newNode.select();+ }+ }+ });+ },+ isActive(selection: BaseSelection|null): boolean {+ return false;+ }+};+export const table: EditorBasicButtonDefinition = {label: 'Table',icon: tableIcon,diff --git a/resources/js/wysiwyg/ui/framework/manager.ts b/resources/js/wysiwyg/ui/framework/manager.tsindex 685031ff8..4ca90a12a 100644--- a/resources/js/wysiwyg/ui/framework/manager.ts+++ b/resources/js/wysiwyg/ui/framework/manager.ts@@ -94,6 +94,7 @@ export class EditorUIManager {for (const toolbar of this.activeContextToolbars) {toolbar.updateState(update);}+ // console.log('selection update', update.selection);}protected updateContextToolbars(update: EditorUiStateUpdate): void {diff --git a/resources/js/wysiwyg/ui/framework/toolbars.ts b/resources/js/wysiwyg/ui/framework/toolbars.tsindex a844161f4..c9db0d6bd 100644--- a/resources/js/wysiwyg/ui/framework/toolbars.ts+++ b/resources/js/wysiwyg/ui/framework/toolbars.ts@@ -16,8 +16,14 @@ export class EditorContextToolbar extends EditorContainerUiElement {}attachTo(target: HTMLElement) {- // Todo - attach to target position- console.log('attaching context toolbar to', target);+ const targetBounds = target.getBoundingClientRect();+ const dom = this.getDOMElement();+ const domBounds = dom.getBoundingClientRect();++ const targetMid = targetBounds.left + (targetBounds.width / 2);+ const targetLeft = targetMid - (domBounds.width / 2);+ dom.style.top = (targetBounds.bottom + 6) + 'px';+ dom.style.left = targetLeft + 'px';}insert(children: EditorUiElement[]) {diff --git a/resources/js/wysiwyg/ui/index.ts b/resources/js/wysiwyg/ui/index.tsindex 9f05e211e..1f07fe710 100644--- a/resources/js/wysiwyg/ui/index.ts+++ b/resources/js/wysiwyg/ui/index.ts@@ -1,5 +1,5 @@import {LexicalEditor} from "lexical";-import {getImageToolbarContent, getMainEditorFullToolbar} from "./toolbars";+import {getImageToolbarContent, getLinkToolbarContent, getMainEditorFullToolbar} from "./toolbars";import {EditorUIManager} from "./framework/manager";import {image as imageFormDefinition, link as linkFormDefinition, source as sourceFormDefinition} from "./defaults/form-definitions";import {ImageDecorator} from "./decorators/image";@@ -41,6 +41,10 @@ export function buildEditorUI(element: HTMLElement, editor: LexicalEditor) {return originalTarget.closest('a') || originalTarget;}});+ manager.registerContextToolbar('link', {+ selector: 'a',+ content: getLinkToolbarContent(),+ });// Register image decorator listenermanager.registerDecoratorType('image', ImageDecorator);diff --git a/resources/js/wysiwyg/ui/toolbars.ts b/resources/js/wysiwyg/ui/toolbars.tsindex 6e822e9c1..bb3b436b9 100644--- a/resources/js/wysiwyg/ui/toolbars.ts+++ b/resources/js/wysiwyg/ui/toolbars.ts@@ -6,7 +6,7 @@ import {infoCallout, italic, link, numberList, paragraph,redo, source, strikethrough, subscript,successCallout, superscript, table, taskList, textColor, underline,- undo,+ undo, unlink,warningCallout} from "./defaults/button-definitions";import {EditorContainerUiElement, EditorSimpleClassContainer, EditorUiContext, EditorUiElement} from "./framework/core";@@ -91,4 +91,11 @@ export function getMainEditorFullToolbar(): EditorContainerUiElement {export function getImageToolbarContent(): EditorUiElement[] {return [new EditorButton(image)];+}++export function getLinkToolbarContent(): EditorUiElement[] {+ return [+ new EditorButton(link),+ new EditorButton(unlink),+ ];}\ No newline at end of filediff --git a/resources/sass/_editor.scss b/resources/sass/_editor.scssindex e0a2bac90..2fcf4edb3 100644--- a/resources/sass/_editor.scss+++ b/resources/sass/_editor.scss@@ -69,6 +69,30 @@display: flex;}+.editor-context-toolbar {+ position: fixed;+ background-color: #FFF;+ border: 1px solid #DDD;+ padding: .2rem;+ border-radius: 4px;+ box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.12);+ &:before {+ content: '';+ z-index: -1;+ display: block;+ width: 8px;+ height: 8px;+ position: absolute;+ background-color: #FFF;+ border-top: 1px solid #DDD;+ border-left: 1px solid #DDD;+ transform: rotate(45deg);+ left: 50%;+ margin-left: -4px;+ top: -5px;+ }+}+// Modals.editor-modal-wrapper {position: fixed;