Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve custom RTE by passing the view #6339

Merged
merged 1 commit into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions packages/core/src/dom_components/view/ComponentTextView.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export default class ComponentTextView<TComp extends ComponentText = ComponentTe
* Enable element content editing
* @private
* */
async onActive(ev: Event) {
async onActive(ev: MouseEvent) {
const { rte, em } = this;
const { result, delegate } = this.canActivate();

Expand All @@ -91,7 +91,8 @@ export default class ComponentTextView<TComp extends ComponentText = ComponentTe

if (rte) {
try {
this.activeRte = await rte.enable(this, this.activeRte!, { event: ev });
const view = this;
this.activeRte = await rte.enable(view, this.activeRte!, { event: ev, view });
} catch (err) {
em.logError(err as any);
}
Expand Down
12 changes: 9 additions & 3 deletions packages/core/src/rich_text_editor/config/config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
import ComponentTextView from '../../dom_components/view/ComponentTextView';
import Editor from '../../editor';
import RichTextEditor from '../model/RichTextEditor';

export interface CustomRteOptions {
event?: MouseEvent;
view: ComponentTextView;
}

export interface CustomRTE<T = any> {
/**
* If true, the returned HTML content will be parsed into Components, allowing
Expand All @@ -11,16 +17,16 @@ export interface CustomRTE<T = any> {
/**
* Create or enable the custom RTE.
*/
enable: (el: HTMLElement, rte: T | undefined) => T | Promise<T>;
enable: (el: HTMLElement, rte: T | undefined, opts: CustomRteOptions) => T | Promise<T>;
/**
* Disable the custom RTE.
*/
disable: (el: HTMLElement, rte: T) => any | Promise<any>;
disable: (el: HTMLElement, rte: T, opts: CustomRteOptions) => any | Promise<any>;
/**
* Get HTML content from the custom RTE.
* If not specified, it will use the innerHTML of the element (passed also as `content` in options).
*/
getContent?: (el: HTMLElement, rte: T | undefined) => string | Promise<string>;
getContent?: (el: HTMLElement, rte: T | undefined, opts: CustomRteOptions) => string | Promise<string>;
/**
* Destroy the custom RTE.
* Will be triggered on editor destroy.
Expand Down
23 changes: 11 additions & 12 deletions packages/core/src/rich_text_editor/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,14 @@
import { debounce, isFunction, isString } from 'underscore';
import { Module } from '../abstract';
import { Debounced, DisableOptions, Model } from '../common';
import ComponentView from '../dom_components/view/ComponentView';
import EditorModel from '../editor/model/Editor';
import { createEl, cx, on, removeEl } from '../utils/dom';
import { hasWin, isDef } from '../utils/mixins';
import defConfig, { CustomRTE, RichTextEditorConfig } from './config/config';
import defConfig, { CustomRTE, CustomRteOptions, RichTextEditorConfig } from './config/config';
import RichTextEditor, { RichTextEditorAction } from './model/RichTextEditor';
import CanvasEvents from '../canvas/types';
import { ComponentsEvents } from '../dom_components/types';
import ComponentTextView from '../dom_components/view/ComponentTextView';

export type RichTextEditorEvent = 'rte:enable' | 'rte:disable' | 'rte:custom';

Expand All @@ -64,7 +64,7 @@ const events = {
};

interface ModelRTE {
currentView?: ComponentView;
currentView?: ComponentTextView;
}

export interface RteDisableResult {
Expand Down Expand Up @@ -360,13 +360,13 @@ export default class RichTextEditorModule extends Module<RichTextEditorConfig &
* @param {Object} rte The instance of already defined RTE
* @private
* */
async enable(view: ComponentView, rte: RichTextEditor, opts: any = {}) {
async enable(view: ComponentTextView, rte: RichTextEditor, opts: CustomRteOptions) {
this.lastEl = view.el;
const { customRte, em } = this;
const el = view.getChildrenContainer();

this.toolbar.style.display = '';
const rteInst = await (customRte ? customRte.enable(el, rte) : this.initRte(el).enable(opts));
const rteInst = await (customRte ? customRte.enable(el, rte, opts) : this.initRte(el).enable(opts));

if (em) {
setTimeout(this.updatePosition.bind(this), 0);
Expand All @@ -380,13 +380,14 @@ export default class RichTextEditorModule extends Module<RichTextEditorConfig &
return rteInst;
}

async getContent(view: ComponentView, rte: RichTextEditor) {
async getContent(view: ComponentTextView, rte: RichTextEditor) {
const { customRte } = this;
const el = view.getChildrenContainer();

if (customRte && rte && isFunction(customRte.getContent)) {
return await customRte.getContent(view.el, rte);
return await customRte.getContent(el, rte, { view });
} else {
return view.getChildrenContainer().innerHTML;
return el.innerHTML;
}
}

Expand All @@ -404,15 +405,13 @@ export default class RichTextEditorModule extends Module<RichTextEditorConfig &
* @param {Object} rte The instance of already defined RTE
* @private
* */
async disable(view: ComponentView, rte?: RichTextEditor, opts: DisableOptions = {}) {
async disable(view: ComponentTextView, rte?: RichTextEditor, opts: DisableOptions = {}) {
let result: RteDisableResult = {};
const { em } = this;
const customRte = this.customRte;
// @ts-ignore
const el = view.getChildrenContainer();

if (customRte) {
const res = await customRte.disable(el, rte);
const res = await customRte.disable(view.getChildrenContainer(), rte, { ...opts, view });
if (res) {
result = res;
}
Expand Down
Loading