From 5f68a0b6b39054efb2b7b1331b28fbdc14747b71 Mon Sep 17 00:00:00 2001 From: Jiuqing Song Date: Thu, 2 Feb 2023 16:41:47 -0800 Subject: [PATCH] Content Model Editor 1: Rename interface IExperimentalContentModelEditor (#1547) * Content Model code simplify 1 * Content Model: Clean up EditorContext * improve * Content Model: Remove get/setPendingFormat * Content Model: Rename IExperimentalContentModelEditor * fix build --- .../plugins/FormatPainterPlugin.ts | 8 ++++---- .../editor/ExperimentalContentModelEditor.ts | 5 ++--- .../controls/editor/isContentModelEditor.ts | 8 +++----- .../contentModel/ContentModelRibbonPlugin.ts | 6 +++--- .../context/createDomToModelContext.ts | 2 +- packages/roosterjs-content-model/lib/index.ts | 4 ++-- .../context/createModelToDomContext.ts | 2 +- .../lib/publicApi/block/setAlignment.ts | 4 ++-- .../lib/publicApi/block/setDirection.ts | 7 ++----- .../lib/publicApi/block/setHeaderLevel.ts | 4 ++-- .../lib/publicApi/block/setIndentation.ts | 4 ++-- .../lib/publicApi/block/setSpacing.ts | 7 ++----- .../lib/publicApi/block/toggleBlockQuote.ts | 4 ++-- .../lib/publicApi/contentModelToDom.ts | 2 +- .../lib/publicApi/domToContentModel.ts | 2 +- .../lib/publicApi/format/clearFormat.ts | 4 ++-- .../lib/publicApi/format/getFormatState.ts | 4 ++-- .../lib/publicApi/format/getSegmentFormat.ts | 4 ++-- .../lib/publicApi/format/pendingFormat.ts | 10 ++++------ .../publicApi/image/adjustImageSelection.ts | 4 ++-- .../lib/publicApi/image/changeImage.ts | 4 ++-- .../lib/publicApi/image/setImageAltText.ts | 4 ++-- .../lib/publicApi/image/setImageBorder.ts | 4 ++-- .../lib/publicApi/image/setImageBoxShadow.ts | 7 ++----- .../lib/publicApi/insert/insertImage.ts | 4 ++-- .../lib/publicApi/link/adjustLinkSelection.ts | 6 ++---- .../lib/publicApi/link/insertLink.ts | 4 ++-- .../lib/publicApi/link/removeLink.ts | 4 ++-- .../lib/publicApi/list/setListStartNumber.ts | 4 ++-- .../lib/publicApi/list/setListStyle.ts | 7 ++----- .../lib/publicApi/list/toggleBullet.ts | 4 ++-- .../lib/publicApi/list/toggleNumbering.ts | 4 ++-- .../publicApi/segment/applySegmentFormat.ts | 4 ++-- .../publicApi/segment/changeCapitalization.ts | 4 ++-- .../lib/publicApi/segment/changeFontSize.ts | 4 ++-- .../publicApi/segment/setBackgroundColor.ts | 4 ++-- .../lib/publicApi/segment/setFontName.ts | 4 ++-- .../lib/publicApi/segment/setFontSize.ts | 4 ++-- .../lib/publicApi/segment/setTextColor.ts | 7 ++----- .../lib/publicApi/segment/toggleBold.ts | 4 ++-- .../lib/publicApi/segment/toggleItalic.ts | 4 ++-- .../publicApi/segment/toggleStrikethrough.ts | 4 ++-- .../lib/publicApi/segment/toggleSubscript.ts | 4 ++-- .../publicApi/segment/toggleSuperscript.ts | 4 ++-- .../lib/publicApi/segment/toggleUnderline.ts | 4 ++-- .../lib/publicApi/table/editTable.ts | 7 ++----- .../lib/publicApi/table/formatTable.ts | 4 ++-- .../lib/publicApi/table/insertTable.ts | 4 ++-- .../lib/publicApi/table/setTableCellShade.ts | 4 ++-- .../utils/formatImageWithContentModel.ts | 4 ++-- .../utils/formatParagraphWithContentModel.ts | 4 ++-- .../utils/formatSegmentWithContentModel.ts | 7 ++----- .../publicApi/utils/formatWithContentModel.ts | 7 ++----- .../lib/publicPlugin/ContentModelPlugin.ts | 8 ++++---- ...tModelEditor.ts => IContentModelEditor.ts} | 7 +++---- .../publicApi/block/paragraphTestCommon.ts | 6 +++--- .../publicApi/block/setIndentationTest.ts | 6 +++--- .../publicApi/block/toggleBlockQuoteTest.ts | 6 +++--- .../test/publicApi/format/clearFormatTest.ts | 4 ++-- .../publicApi/format/getFormatStateTest.ts | 6 +++--- .../publicApi/format/getSegmentFormatTest.ts | 6 +++--- .../test/publicApi/insert/insertImageTest.ts | 6 +++--- .../publicApi/link/adjustLinkSelectionTest.ts | 10 +++++----- .../test/publicApi/link/insertLinkTest.ts | 10 +++++----- .../test/publicApi/link/removeLinkTest.ts | 10 +++++----- .../test/publicApi/list/toggleBulletTest.ts | 6 +++--- .../publicApi/list/toggleNumberingTest.ts | 6 +++--- .../publicApi/segment/changeFontSizeTest.ts | 4 ++-- .../publicApi/segment/segmentTestCommon.ts | 6 +++--- .../publicApi/table/setTableCellShadeTest.ts | 10 +++++----- .../formatParagraphWithContentModelTest.ts | 6 +++--- .../formatSegmentWithContentModelTest.ts | 6 +++--- .../utils/formatWithContentModelTest.ts | 6 +++--- .../publicPlugin/ContentModelPluginTest.ts | 20 +++++++++---------- 74 files changed, 185 insertions(+), 217 deletions(-) rename packages/roosterjs-content-model/lib/publicTypes/{IExperimentalContentModelEditor.ts => IContentModelEditor.ts} (92%) diff --git a/demo/scripts/controls/contentModel/plugins/FormatPainterPlugin.ts b/demo/scripts/controls/contentModel/plugins/FormatPainterPlugin.ts index b2a380b5c63..941c72e4462 100644 --- a/demo/scripts/controls/contentModel/plugins/FormatPainterPlugin.ts +++ b/demo/scripts/controls/contentModel/plugins/FormatPainterPlugin.ts @@ -3,7 +3,7 @@ import { applySegmentFormat, ContentModelSegmentFormat, getSegmentFormat, - IExperimentalContentModelEditor, + IContentModelEditor, } from 'roosterjs-content-model'; const FORMATPAINTERCURSOR_SVG = require('./formatpaintercursor.svg'); @@ -15,14 +15,14 @@ interface FormatPainterFormatHolder { } export default class FormatPainterPlugin implements EditorPlugin { - private editor: IExperimentalContentModelEditor | null = null; + private editor: IContentModelEditor | null = null; getName() { return 'FormatPainter'; } initialize(editor: IEditor) { - this.editor = editor as IExperimentalContentModelEditor; + this.editor = editor as IContentModelEditor; } dispose() { @@ -42,7 +42,7 @@ export default class FormatPainterPlugin implements EditorPlugin { } } - static startFormatPainter(editor: IExperimentalContentModelEditor) { + static startFormatPainter(editor: IContentModelEditor) { const formatHolder = getFormatHolder(editor); const format = getSegmentFormat(editor); diff --git a/demo/scripts/controls/editor/ExperimentalContentModelEditor.ts b/demo/scripts/controls/editor/ExperimentalContentModelEditor.ts index 2f7b205b93b..f48646f78e0 100644 --- a/demo/scripts/controls/editor/ExperimentalContentModelEditor.ts +++ b/demo/scripts/controls/editor/ExperimentalContentModelEditor.ts @@ -7,7 +7,7 @@ import { domToContentModel, DomToModelOption, EditorContext, - IExperimentalContentModelEditor, + IContentModelEditor, ModelToDomOption, } from 'roosterjs-content-model'; @@ -16,8 +16,7 @@ import { * * Experimental editor to support Content Model */ -export default class ExperimentalContentModelEditor extends Editor - implements IExperimentalContentModelEditor { +export default class ExperimentalContentModelEditor extends Editor implements IContentModelEditor { private getDarkColor: ((lightColor: string) => string) | undefined; /** diff --git a/demo/scripts/controls/editor/isContentModelEditor.ts b/demo/scripts/controls/editor/isContentModelEditor.ts index d243ed87819..924ccef77fc 100644 --- a/demo/scripts/controls/editor/isContentModelEditor.ts +++ b/demo/scripts/controls/editor/isContentModelEditor.ts @@ -1,10 +1,8 @@ +import { IContentModelEditor } from 'roosterjs-content-model'; import { IEditor } from 'roosterjs-editor-types'; -import { IExperimentalContentModelEditor } from 'roosterjs-content-model'; -export default function isContentModelEditor( - editor: IEditor -): editor is IExperimentalContentModelEditor { - const experimentalEditor = editor as IExperimentalContentModelEditor; +export default function isContentModelEditor(editor: IEditor): editor is IContentModelEditor { + const experimentalEditor = editor as IContentModelEditor; return !!experimentalEditor.createContentModel && 'contentDiv' in experimentalEditor; } diff --git a/demo/scripts/controls/ribbonButtons/contentModel/ContentModelRibbonPlugin.ts b/demo/scripts/controls/ribbonButtons/contentModel/ContentModelRibbonPlugin.ts index ecb78f3c353..0a298ecf4bd 100644 --- a/demo/scripts/controls/ribbonButtons/contentModel/ContentModelRibbonPlugin.ts +++ b/demo/scripts/controls/ribbonButtons/contentModel/ContentModelRibbonPlugin.ts @@ -1,10 +1,10 @@ import { FormatState, PluginEvent, PluginEventType } from 'roosterjs-editor-types'; -import { getFormatState, IExperimentalContentModelEditor } from 'roosterjs-content-model'; +import { getFormatState, IContentModelEditor } from 'roosterjs-content-model'; import { getObjectKeys } from 'roosterjs-editor-dom'; import { LocalizedStrings, RibbonButton, RibbonPlugin, UIUtilities } from 'roosterjs-react'; export class ContentModelRibbonPlugin implements RibbonPlugin { - private editor: IExperimentalContentModelEditor | null = null; + private editor: IContentModelEditor | null = null; private onFormatChanged: ((formatState: FormatState) => void) | null = null; private timer = 0; private formatState: FormatState | null = null; @@ -27,7 +27,7 @@ export class ContentModelRibbonPlugin implements RibbonPlugin { * Initialize this plugin * @param editor The editor instance */ - initialize(editor: IExperimentalContentModelEditor) { + initialize(editor: IContentModelEditor) { this.editor = editor; } diff --git a/packages/roosterjs-content-model/lib/domToModel/context/createDomToModelContext.ts b/packages/roosterjs-content-model/lib/domToModel/context/createDomToModelContext.ts index d8f350d6e79..45f02ed3b11 100644 --- a/packages/roosterjs-content-model/lib/domToModel/context/createDomToModelContext.ts +++ b/packages/roosterjs-content-model/lib/domToModel/context/createDomToModelContext.ts @@ -2,7 +2,7 @@ import { defaultFormatParsers, getFormatParsers } from '../../formatHandlers/def import { defaultProcessorMap } from './defaultProcessors'; import { defaultStyleMap } from '../../formatHandlers/utils/defaultStyles'; import { DomToModelContext } from '../../publicTypes/context/DomToModelContext'; -import { DomToModelOption } from '../../publicTypes/IExperimentalContentModelEditor'; +import { DomToModelOption } from '../../publicTypes/IContentModelEditor'; import { EditorContext } from '../../publicTypes/context/EditorContext'; import { SelectionRangeTypes } from 'roosterjs-editor-types'; diff --git a/packages/roosterjs-content-model/lib/index.ts b/packages/roosterjs-content-model/lib/index.ts index 3a5734c9eca..137e04f7f3e 100644 --- a/packages/roosterjs-content-model/lib/index.ts +++ b/packages/roosterjs-content-model/lib/index.ts @@ -175,7 +175,7 @@ export { ContentModelHandler } from './publicTypes/context/ContentModelHandler'; export { Border } from './publicTypes/interface/Border'; export { - IExperimentalContentModelEditor, + IContentModelEditor, DomToModelOption, ModelToDomOption, -} from './publicTypes/IExperimentalContentModelEditor'; +} from './publicTypes/IContentModelEditor'; diff --git a/packages/roosterjs-content-model/lib/modelToDom/context/createModelToDomContext.ts b/packages/roosterjs-content-model/lib/modelToDom/context/createModelToDomContext.ts index 162bd8eaf25..3c9988d2262 100644 --- a/packages/roosterjs-content-model/lib/modelToDom/context/createModelToDomContext.ts +++ b/packages/roosterjs-content-model/lib/modelToDom/context/createModelToDomContext.ts @@ -2,7 +2,7 @@ import { defaultContentModelHandlers } from './defaultContentModelHandlers'; import { defaultImplicitFormatMap } from '../../formatHandlers/utils/defaultStyles'; import { EditorContext } from '../../publicTypes/context/EditorContext'; import { ModelToDomContext } from '../../publicTypes/context/ModelToDomContext'; -import { ModelToDomOption } from '../../publicTypes/IExperimentalContentModelEditor'; +import { ModelToDomOption } from '../../publicTypes/IContentModelEditor'; import { defaultFormatAppliers, getFormatAppliers, diff --git a/packages/roosterjs-content-model/lib/publicApi/block/setAlignment.ts b/packages/roosterjs-content-model/lib/publicApi/block/setAlignment.ts index 9b3e93730ba..382307b2d78 100644 --- a/packages/roosterjs-content-model/lib/publicApi/block/setAlignment.ts +++ b/packages/roosterjs-content-model/lib/publicApi/block/setAlignment.ts @@ -1,5 +1,5 @@ import { formatParagraphWithContentModel } from '../utils/formatParagraphWithContentModel'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; const ResultMap: Record< 'left' | 'center' | 'right', @@ -25,7 +25,7 @@ const ResultMap: Record< * @param alignment Alignment value: left, center or right */ export default function setAlignment( - editor: IExperimentalContentModelEditor, + editor: IContentModelEditor, alignment: 'left' | 'center' | 'right' ) { formatParagraphWithContentModel(editor, 'setAlignment', para => { diff --git a/packages/roosterjs-content-model/lib/publicApi/block/setDirection.ts b/packages/roosterjs-content-model/lib/publicApi/block/setDirection.ts index 52cfe3f0dad..3a11c205bf1 100644 --- a/packages/roosterjs-content-model/lib/publicApi/block/setDirection.ts +++ b/packages/roosterjs-content-model/lib/publicApi/block/setDirection.ts @@ -1,15 +1,12 @@ import { formatParagraphWithContentModel } from '../utils/formatParagraphWithContentModel'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; /** * Set text direction of selected paragraphs (Left to right or Right to left) * @param editor The editor to set alignment * @param direction Direction value: ltr (Left to right) or rtl (Right to left) */ -export default function setDirection( - editor: IExperimentalContentModelEditor, - direction: 'ltr' | 'rtl' -) { +export default function setDirection(editor: IContentModelEditor, direction: 'ltr' | 'rtl') { formatParagraphWithContentModel(editor, 'setDirection', para => { const isOldValueRtl = para.format.direction == 'rtl'; const isNewValueRtl = direction == 'rtl'; diff --git a/packages/roosterjs-content-model/lib/publicApi/block/setHeaderLevel.ts b/packages/roosterjs-content-model/lib/publicApi/block/setHeaderLevel.ts index 80a639c378a..0d87e3ee69b 100644 --- a/packages/roosterjs-content-model/lib/publicApi/block/setHeaderLevel.ts +++ b/packages/roosterjs-content-model/lib/publicApi/block/setHeaderLevel.ts @@ -3,7 +3,7 @@ import { ContentModelSegmentFormat } from '../../publicTypes/format/ContentModel import { defaultImplicitFormatMap } from '../../formatHandlers/utils/defaultStyles'; import { formatParagraphWithContentModel } from '../utils/formatParagraphWithContentModel'; import { getObjectKeys } from 'roosterjs-editor-dom'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; type HeaderLevelTags = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6'; @@ -13,7 +13,7 @@ type HeaderLevelTags = 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6'; * @param headerLevel Level of header, from 1 to 6. Set to 0 means set it back to a regular paragraph */ export default function setHeaderLevel( - editor: IExperimentalContentModelEditor, + editor: IContentModelEditor, headerLevel: 0 | 1 | 2 | 3 | 4 | 5 | 6 ) { formatParagraphWithContentModel(editor, 'setHeaderLevel', para => { diff --git a/packages/roosterjs-content-model/lib/publicApi/block/setIndentation.ts b/packages/roosterjs-content-model/lib/publicApi/block/setIndentation.ts index 95207d6127e..84958490248 100644 --- a/packages/roosterjs-content-model/lib/publicApi/block/setIndentation.ts +++ b/packages/roosterjs-content-model/lib/publicApi/block/setIndentation.ts @@ -1,5 +1,5 @@ import { formatWithContentModel } from '../utils/formatWithContentModel'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; import { setModelIndentation } from '../../modelApi/block/setModelIndentation'; /** @@ -9,7 +9,7 @@ import { setModelIndentation } from '../../modelApi/block/setModelIndentation'; * @param length The length of pixel to indent/outdent @default 40 */ export default function setIndentation( - editor: IExperimentalContentModelEditor, + editor: IContentModelEditor, indentation: 'indent' | 'outdent', length?: number ) { diff --git a/packages/roosterjs-content-model/lib/publicApi/block/setSpacing.ts b/packages/roosterjs-content-model/lib/publicApi/block/setSpacing.ts index 2a16491146b..048e6b0f34e 100644 --- a/packages/roosterjs-content-model/lib/publicApi/block/setSpacing.ts +++ b/packages/roosterjs-content-model/lib/publicApi/block/setSpacing.ts @@ -1,10 +1,7 @@ -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; import { formatParagraphWithContentModel } from '../utils/formatParagraphWithContentModel'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; -export default function setSpacing( - editor: IExperimentalContentModelEditor, - spacing: number | string -) { +export default function setSpacing(editor: IContentModelEditor, spacing: number | string) { formatParagraphWithContentModel(editor, 'setSpacing', paragraph => { paragraph.format.lineHeight = spacing.toString(); paragraph.segments.forEach(segment => { diff --git a/packages/roosterjs-content-model/lib/publicApi/block/toggleBlockQuote.ts b/packages/roosterjs-content-model/lib/publicApi/block/toggleBlockQuote.ts index fc4dacd9587..178dd4bda0d 100644 --- a/packages/roosterjs-content-model/lib/publicApi/block/toggleBlockQuote.ts +++ b/packages/roosterjs-content-model/lib/publicApi/block/toggleBlockQuote.ts @@ -1,7 +1,7 @@ import { ContentModelBlockFormat } from '../../publicTypes/format/ContentModelBlockFormat'; import { ContentModelSegmentFormat } from '../../publicTypes/format/ContentModelSegmentFormat'; import { formatWithContentModel } from '../utils/formatWithContentModel'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; import { toggleModelBlockQuote } from '../../modelApi/block/toggleModelBlockQuote'; const DefaultQuoteFormat: ContentModelBlockFormat = { @@ -27,7 +27,7 @@ const BuildInQuoteFormat: ContentModelBlockFormat = { * @param segmentFormat @optional Segment format for the content of model */ export default function toggleBlockQuote( - editor: IExperimentalContentModelEditor, + editor: IContentModelEditor, quoteFormat: ContentModelBlockFormat = DefaultQuoteFormat, segmentFormat: ContentModelSegmentFormat = DefaultSegmentFormat ) { diff --git a/packages/roosterjs-content-model/lib/publicApi/contentModelToDom.ts b/packages/roosterjs-content-model/lib/publicApi/contentModelToDom.ts index 898f430df6a..eeee2ef1f44 100644 --- a/packages/roosterjs-content-model/lib/publicApi/contentModelToDom.ts +++ b/packages/roosterjs-content-model/lib/publicApi/contentModelToDom.ts @@ -5,7 +5,7 @@ import { EditorContext } from '../publicTypes/context/EditorContext'; import { isNodeOfType } from '../domUtils/isNodeOfType'; import { ModelToDomBlockAndSegmentNode } from '../publicTypes/context/ModelToDomSelectionContext'; import { ModelToDomContext } from '../publicTypes/context/ModelToDomContext'; -import { ModelToDomOption } from '../publicTypes/IExperimentalContentModelEditor'; +import { ModelToDomOption } from '../publicTypes/IContentModelEditor'; import { optimize } from '../modelToDom/optimizers/optimize'; import { NodePosition, diff --git a/packages/roosterjs-content-model/lib/publicApi/domToContentModel.ts b/packages/roosterjs-content-model/lib/publicApi/domToContentModel.ts index 4b8f2b9437d..2847a679946 100644 --- a/packages/roosterjs-content-model/lib/publicApi/domToContentModel.ts +++ b/packages/roosterjs-content-model/lib/publicApi/domToContentModel.ts @@ -1,7 +1,7 @@ import { ContentModelDocument } from '../publicTypes/group/ContentModelDocument'; import { createContentModelDocument } from '../modelApi/creators/createContentModelDocument'; import { createDomToModelContext } from '../domToModel/context/createDomToModelContext'; -import { DomToModelOption } from '../publicTypes/IExperimentalContentModelEditor'; +import { DomToModelOption } from '../publicTypes/IContentModelEditor'; import { EditorContext } from '../publicTypes/context/EditorContext'; import { normalizeContentModel } from '../modelApi/common/normalizeContentModel'; import { parseFormat } from '../domToModel/utils/parseFormat'; diff --git a/packages/roosterjs-content-model/lib/publicApi/format/clearFormat.ts b/packages/roosterjs-content-model/lib/publicApi/format/clearFormat.ts index 4ea673421bb..32f1a3a94b7 100644 --- a/packages/roosterjs-content-model/lib/publicApi/format/clearFormat.ts +++ b/packages/roosterjs-content-model/lib/publicApi/format/clearFormat.ts @@ -5,7 +5,7 @@ import { ContentModelSegment } from '../../publicTypes/segment/ContentModelSegme import { ContentModelSegmentFormat } from '../../publicTypes/format/ContentModelSegmentFormat'; import { ContentModelTable } from '../../publicTypes/block/ContentModelTable'; import { formatWithContentModel } from '../utils/formatWithContentModel'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; import { normalizeContentModel } from '../../modelApi/common/normalizeContentModel'; /** @@ -13,7 +13,7 @@ import { normalizeContentModel } from '../../modelApi/common/normalizeContentMod * @param editor The editor to clear format from */ export default function clearFormat( - editor: IExperimentalContentModelEditor, + editor: IContentModelEditor, defaultSegmentFormat?: ContentModelSegmentFormat ) { formatWithContentModel(editor, 'clearFormat', model => { diff --git a/packages/roosterjs-content-model/lib/publicApi/format/getFormatState.ts b/packages/roosterjs-content-model/lib/publicApi/format/getFormatState.ts index f5732c7f39d..34c2ec9c72c 100644 --- a/packages/roosterjs-content-model/lib/publicApi/format/getFormatState.ts +++ b/packages/roosterjs-content-model/lib/publicApi/format/getFormatState.ts @@ -1,7 +1,7 @@ import { FormatState } from 'roosterjs-editor-types'; import { formatWithContentModel } from '../utils/formatWithContentModel'; import { getPendingFormat } from './pendingFormat'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; import { reducedModelChildProcessor } from '../../domToModel/processors/reducedModelChildProcessor'; import { retrieveModelFormatState } from '../../modelApi/common/retrieveModelFormatState'; @@ -9,7 +9,7 @@ import { retrieveModelFormatState } from '../../modelApi/common/retrieveModelFor * Get current format state * @param editor The editor to get format from */ -export default function getFormatState(editor: IExperimentalContentModelEditor): FormatState { +export default function getFormatState(editor: IContentModelEditor): FormatState { let result: FormatState = { ...editor.getUndoState(), diff --git a/packages/roosterjs-content-model/lib/publicApi/format/getSegmentFormat.ts b/packages/roosterjs-content-model/lib/publicApi/format/getSegmentFormat.ts index 586edda213b..c272afc958a 100644 --- a/packages/roosterjs-content-model/lib/publicApi/format/getSegmentFormat.ts +++ b/packages/roosterjs-content-model/lib/publicApi/format/getSegmentFormat.ts @@ -1,7 +1,7 @@ import { ContentModelSegmentFormat } from '../../publicTypes/format/ContentModelSegmentFormat'; import { formatWithContentModel } from '../utils/formatWithContentModel'; import { getPendingFormat } from './pendingFormat'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; import { iterateSelections } from '../../modelApi/selection/iterateSelections'; import { reducedModelChildProcessor } from '../../domToModel/processors/reducedModelChildProcessor'; @@ -10,7 +10,7 @@ import { reducedModelChildProcessor } from '../../domToModel/processors/reducedM * @param editor The editor to get format from */ export default function getSegmentFormat( - editor: IExperimentalContentModelEditor + editor: IContentModelEditor ): ContentModelSegmentFormat | null { let result = getPendingFormat(editor); diff --git a/packages/roosterjs-content-model/lib/publicApi/format/pendingFormat.ts b/packages/roosterjs-content-model/lib/publicApi/format/pendingFormat.ts index 301ca082bbc..6d8bc85ef0e 100644 --- a/packages/roosterjs-content-model/lib/publicApi/format/pendingFormat.ts +++ b/packages/roosterjs-content-model/lib/publicApi/format/pendingFormat.ts @@ -1,14 +1,12 @@ import { ContentModelSegmentFormat } from '../../publicTypes/format/ContentModelSegmentFormat'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; /** * @internal * Get pending segment format from editor if any, otherwise null * @param editor The editor to get format from */ -export function getPendingFormat( - editor: IExperimentalContentModelEditor -): ContentModelSegmentFormat | null { +export function getPendingFormat(editor: IContentModelEditor): ContentModelSegmentFormat | null { return getPendingFormatHolder(editor).format; } @@ -19,7 +17,7 @@ export function getPendingFormat( * @param format The format to set. Pass null to clear existing format */ export function setPendingFormat( - editor: IExperimentalContentModelEditor, + editor: IContentModelEditor, format: ContentModelSegmentFormat | null ) { getPendingFormatHolder(editor).format = format; @@ -31,7 +29,7 @@ interface PendingFormatHolder { const PendingFormatHolderKey = '__ContentModelPendingFormat'; -function getPendingFormatHolder(editor: IExperimentalContentModelEditor): PendingFormatHolder { +function getPendingFormatHolder(editor: IContentModelEditor): PendingFormatHolder { return editor.getCustomData(PendingFormatHolderKey, () => ({ format: null, })); diff --git a/packages/roosterjs-content-model/lib/publicApi/image/adjustImageSelection.ts b/packages/roosterjs-content-model/lib/publicApi/image/adjustImageSelection.ts index 847182d3660..f8ce9f09452 100644 --- a/packages/roosterjs-content-model/lib/publicApi/image/adjustImageSelection.ts +++ b/packages/roosterjs-content-model/lib/publicApi/image/adjustImageSelection.ts @@ -1,14 +1,14 @@ import { adjustSegmentSelection } from '../../modelApi/selection/adjustSegmentSelection'; import { ContentModelImage } from '../../publicTypes/segment/ContentModelImage'; import { formatWithContentModel } from '../utils/formatWithContentModel'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; /** * Adjust selection to make sure select an image if any * @return Content Model Image object if an image is select, or null */ export default function adjustImageSelection( - editor: IExperimentalContentModelEditor + editor: IContentModelEditor ): ContentModelImage | null { let image: ContentModelImage | null = null; diff --git a/packages/roosterjs-content-model/lib/publicApi/image/changeImage.ts b/packages/roosterjs-content-model/lib/publicApi/image/changeImage.ts index ab5d04c8293..d3029316c8d 100644 --- a/packages/roosterjs-content-model/lib/publicApi/image/changeImage.ts +++ b/packages/roosterjs-content-model/lib/publicApi/image/changeImage.ts @@ -1,6 +1,6 @@ import formatImageWithContentModel from '../utils/formatImageWithContentModel'; import { ContentModelImage } from '../../publicTypes/segment/ContentModelImage'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; import { readFile } from 'roosterjs-editor-dom'; /** @@ -8,7 +8,7 @@ import { readFile } from 'roosterjs-editor-dom'; * @param editor The editor instance * @param file The image file */ -export default function changeImage(editor: IExperimentalContentModelEditor, file: File) { +export default function changeImage(editor: IContentModelEditor, file: File) { readFile(file, dataUrl => { if (dataUrl && !editor.isDisposed()) { formatImageWithContentModel(editor, 'changeImage', (image: ContentModelImage) => { diff --git a/packages/roosterjs-content-model/lib/publicApi/image/setImageAltText.ts b/packages/roosterjs-content-model/lib/publicApi/image/setImageAltText.ts index cf5f9caa208..25da1d8ae72 100644 --- a/packages/roosterjs-content-model/lib/publicApi/image/setImageAltText.ts +++ b/packages/roosterjs-content-model/lib/publicApi/image/setImageAltText.ts @@ -1,6 +1,6 @@ import formatImageWithContentModel from '../utils/formatImageWithContentModel'; import { ContentModelImage } from '../../publicTypes/segment/ContentModelImage'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; /** * Set image alt text for all selected images at selection. If no images is contained @@ -8,7 +8,7 @@ import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimental * @param editor The editor instance * @param altText The image alt text */ -export default function setImageAltText(editor: IExperimentalContentModelEditor, altText: string) { +export default function setImageAltText(editor: IContentModelEditor, altText: string) { formatImageWithContentModel(editor, 'setImageAltText', (image: ContentModelImage) => { image.alt = altText; }); diff --git a/packages/roosterjs-content-model/lib/publicApi/image/setImageBorder.ts b/packages/roosterjs-content-model/lib/publicApi/image/setImageBorder.ts index 09c8aab6a1b..f255e1c66a1 100644 --- a/packages/roosterjs-content-model/lib/publicApi/image/setImageBorder.ts +++ b/packages/roosterjs-content-model/lib/publicApi/image/setImageBorder.ts @@ -2,7 +2,7 @@ import applyImageBorderFormat from '../../modelApi/image/applyImageBorderFormat' import formatImageWithContentModel from '../utils/formatImageWithContentModel'; import { Border } from '../../publicTypes/interface/Border'; import { ContentModelImage } from '../../publicTypes/segment/ContentModelImage'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; /** * Set image border style for all selected images at selection. @@ -12,7 +12,7 @@ import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimental * @param borderRadius the border radius value, if undefined, the border radius will keep the actual value */ export default function setImageBorder( - editor: IExperimentalContentModelEditor, + editor: IContentModelEditor, border: Border, borderRadius?: string ) { diff --git a/packages/roosterjs-content-model/lib/publicApi/image/setImageBoxShadow.ts b/packages/roosterjs-content-model/lib/publicApi/image/setImageBoxShadow.ts index 2c63b4a49f7..95b04ac1584 100644 --- a/packages/roosterjs-content-model/lib/publicApi/image/setImageBoxShadow.ts +++ b/packages/roosterjs-content-model/lib/publicApi/image/setImageBoxShadow.ts @@ -1,16 +1,13 @@ import formatImageWithContentModel from '../utils/formatImageWithContentModel'; import { ContentModelImage } from '../../publicTypes/segment/ContentModelImage'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; /** * Set image box shadow for all selected images at selection. * @param editor The editor instance * @param boxShadow The image box shadow */ -export default function setImageBoxShadow( - editor: IExperimentalContentModelEditor, - boxShadow: string -) { +export default function setImageBoxShadow(editor: IContentModelEditor, boxShadow: string) { formatImageWithContentModel(editor, 'setImageBoxShadow', (image: ContentModelImage) => { image.format.boxShadow = boxShadow; }); diff --git a/packages/roosterjs-content-model/lib/publicApi/insert/insertImage.ts b/packages/roosterjs-content-model/lib/publicApi/insert/insertImage.ts index ea1d804621f..1bd879357c6 100644 --- a/packages/roosterjs-content-model/lib/publicApi/insert/insertImage.ts +++ b/packages/roosterjs-content-model/lib/publicApi/insert/insertImage.ts @@ -1,5 +1,5 @@ import { formatWithContentModel } from '../utils/formatWithContentModel'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; import { insertContent } from '../../modelApi/common/insertContent'; import { readFile } from 'roosterjs-editor-dom'; @@ -8,7 +8,7 @@ import { readFile } from 'roosterjs-editor-dom'; * @param editor The editor to operate on * @param file Image Blob file */ -export default function insertImage(editor: IExperimentalContentModelEditor, file: File) { +export default function insertImage(editor: IContentModelEditor, file: File) { readFile(file, dataUrl => { if (dataUrl && !editor.isDisposed()) { formatWithContentModel(editor, 'insertImage', model => { diff --git a/packages/roosterjs-content-model/lib/publicApi/link/adjustLinkSelection.ts b/packages/roosterjs-content-model/lib/publicApi/link/adjustLinkSelection.ts index 25948fbc9fd..d4acc8bb49a 100644 --- a/packages/roosterjs-content-model/lib/publicApi/link/adjustLinkSelection.ts +++ b/packages/roosterjs-content-model/lib/publicApi/link/adjustLinkSelection.ts @@ -3,16 +3,14 @@ import { adjustWordSelection } from '../../modelApi/selection/adjustWordSelectio import { areSameFormats } from '../../domToModel/utils/areSameFormats'; import { formatWithContentModel } from '../utils/formatWithContentModel'; import { getSelectedSegments } from '../../modelApi/selection/collectSelections'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; import { setSelection } from '../../modelApi/selection/setSelection'; /** * Adjust selection to make sure select a hyperlink if any, or a word if original selection is collapsed * @return A combination of existing link display text and url if any. If there is no existing link, return selected text and null */ -export default function adjustLinkSelection( - editor: IExperimentalContentModelEditor -): [string, string | null] { +export default function adjustLinkSelection(editor: IContentModelEditor): [string, string | null] { let text = ''; let url: string | null = null; diff --git a/packages/roosterjs-content-model/lib/publicApi/link/insertLink.ts b/packages/roosterjs-content-model/lib/publicApi/link/insertLink.ts index 29eb5c1c77d..5d5340cc2c4 100644 --- a/packages/roosterjs-content-model/lib/publicApi/link/insertLink.ts +++ b/packages/roosterjs-content-model/lib/publicApi/link/insertLink.ts @@ -8,7 +8,7 @@ import { formatWithContentModel } from '../utils/formatWithContentModel'; import { getSelectedSegments } from '../../modelApi/selection/collectSelections'; import { HtmlSanitizer, matchLink } from 'roosterjs-editor-dom'; import { HyperLinkColorPlaceholder } from '../../formatHandlers/utils/defaultStyles'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; import { mergeModel } from '../../modelApi/common/mergeModel'; // Regex matching Uri scheme @@ -32,7 +32,7 @@ const FTP_REGEX = /^ftp\./i; * If not specified and there wasn't a link, the link url will be used as display text. */ export default function insertLink( - editor: IExperimentalContentModelEditor, + editor: IContentModelEditor, link: string, anchorTitle?: string, displayText?: string, diff --git a/packages/roosterjs-content-model/lib/publicApi/link/removeLink.ts b/packages/roosterjs-content-model/lib/publicApi/link/removeLink.ts index 224611e2aaf..27c0397ad7d 100644 --- a/packages/roosterjs-content-model/lib/publicApi/link/removeLink.ts +++ b/packages/roosterjs-content-model/lib/publicApi/link/removeLink.ts @@ -3,7 +3,7 @@ import { areSameFormats } from '../../domToModel/utils/areSameFormats'; import { formatWithContentModel } from '../utils/formatWithContentModel'; import { getSelectedSegments } from '../../modelApi/selection/collectSelections'; import { HyperLinkColorPlaceholder } from '../../formatHandlers/utils/defaultStyles'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; /** * Remove link at selection. If no links at selection, do nothing. @@ -11,7 +11,7 @@ import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimental * If only part of a link is selected, the whole link style will be removed. * @param editor The editor instance */ -export default function removeLink(editor: IExperimentalContentModelEditor) { +export default function removeLink(editor: IContentModelEditor) { formatWithContentModel(editor, 'removeLink', model => { adjustSegmentSelection( model, diff --git a/packages/roosterjs-content-model/lib/publicApi/list/setListStartNumber.ts b/packages/roosterjs-content-model/lib/publicApi/list/setListStartNumber.ts index 035eaef509b..aae1b79d3ea 100644 --- a/packages/roosterjs-content-model/lib/publicApi/list/setListStartNumber.ts +++ b/packages/roosterjs-content-model/lib/publicApi/list/setListStartNumber.ts @@ -1,13 +1,13 @@ import { formatWithContentModel } from '../utils/formatWithContentModel'; import { getFirstSelectedListItem } from '../../modelApi/selection/collectSelections'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; /** * Set start number of a list item * @param editor The editor to operate on * @param value The number to set to, must be equal or greater than 1 */ -export default function setListStartNumber(editor: IExperimentalContentModelEditor, value: number) { +export default function setListStartNumber(editor: IContentModelEditor, value: number) { formatWithContentModel(editor, 'setListStartNumber', model => { const listItem = getFirstSelectedListItem(model); const level = listItem?.levels[listItem?.levels.length - 1]; diff --git a/packages/roosterjs-content-model/lib/publicApi/list/setListStyle.ts b/packages/roosterjs-content-model/lib/publicApi/list/setListStyle.ts index 7f564e751d0..3df6c6b1aeb 100644 --- a/packages/roosterjs-content-model/lib/publicApi/list/setListStyle.ts +++ b/packages/roosterjs-content-model/lib/publicApi/list/setListStyle.ts @@ -1,7 +1,7 @@ import { findListItemsInSameThread } from '../../modelApi/list/findListItemsInSameThread'; import { formatWithContentModel } from '../utils/formatWithContentModel'; import { getFirstSelectedListItem } from '../../modelApi/selection/collectSelections'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; import { ListMetadataFormat } from '../../publicTypes/format/formatParts/ListMetadataFormat'; /** @@ -9,10 +9,7 @@ import { ListMetadataFormat } from '../../publicTypes/format/formatParts/ListMet * @param editor The editor to operate on * @param style The target list item style to set */ -export default function setListStyle( - editor: IExperimentalContentModelEditor, - style: ListMetadataFormat -) { +export default function setListStyle(editor: IContentModelEditor, style: ListMetadataFormat) { formatWithContentModel(editor, 'setListStyle', model => { const listItem = getFirstSelectedListItem(model); diff --git a/packages/roosterjs-content-model/lib/publicApi/list/toggleBullet.ts b/packages/roosterjs-content-model/lib/publicApi/list/toggleBullet.ts index ee8681a62d0..5daee5af867 100644 --- a/packages/roosterjs-content-model/lib/publicApi/list/toggleBullet.ts +++ b/packages/roosterjs-content-model/lib/publicApi/list/toggleBullet.ts @@ -1,5 +1,5 @@ import { formatWithContentModel } from '../utils/formatWithContentModel'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; import { setListType } from '../../modelApi/list/setListType'; /** @@ -8,6 +8,6 @@ import { setListType } from '../../modelApi/list/setListType'; * - When all blocks are already in bullet list, turn off / outdent there list type * @param editor The editor to operate on */ -export default function toggleBullet(editor: IExperimentalContentModelEditor) { +export default function toggleBullet(editor: IContentModelEditor) { formatWithContentModel(editor, 'toggleBullet', model => setListType(model, 'UL')); } diff --git a/packages/roosterjs-content-model/lib/publicApi/list/toggleNumbering.ts b/packages/roosterjs-content-model/lib/publicApi/list/toggleNumbering.ts index d23c1a9ac3f..216c0061162 100644 --- a/packages/roosterjs-content-model/lib/publicApi/list/toggleNumbering.ts +++ b/packages/roosterjs-content-model/lib/publicApi/list/toggleNumbering.ts @@ -1,5 +1,5 @@ import { formatWithContentModel } from '../utils/formatWithContentModel'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; import { setListType } from '../../modelApi/list/setListType'; /** @@ -8,6 +8,6 @@ import { setListType } from '../../modelApi/list/setListType'; * - When all blocks are already in numbering list, turn off / outdent there list type * @param editor The editor to operate on */ -export default function toggleNumbering(editor: IExperimentalContentModelEditor) { +export default function toggleNumbering(editor: IContentModelEditor) { formatWithContentModel(editor, 'toggleNumbering', model => setListType(model, 'OL')); } diff --git a/packages/roosterjs-content-model/lib/publicApi/segment/applySegmentFormat.ts b/packages/roosterjs-content-model/lib/publicApi/segment/applySegmentFormat.ts index 2268fa5b374..7b0af7a5c45 100644 --- a/packages/roosterjs-content-model/lib/publicApi/segment/applySegmentFormat.ts +++ b/packages/roosterjs-content-model/lib/publicApi/segment/applySegmentFormat.ts @@ -1,6 +1,6 @@ import { ContentModelSegmentFormat } from '../../publicTypes/format/ContentModelSegmentFormat'; import { formatSegmentWithContentModel } from '../utils/formatSegmentWithContentModel'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; /** * Bulk apply segment format to all selected content. This is usually used for format painter. @@ -8,7 +8,7 @@ import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimental * @param newFormat The segment format to apply */ export default function applySegmentFormat( - editor: IExperimentalContentModelEditor, + editor: IContentModelEditor, newFormat: ContentModelSegmentFormat ) { formatSegmentWithContentModel( diff --git a/packages/roosterjs-content-model/lib/publicApi/segment/changeCapitalization.ts b/packages/roosterjs-content-model/lib/publicApi/segment/changeCapitalization.ts index e2644202c54..a3900553351 100644 --- a/packages/roosterjs-content-model/lib/publicApi/segment/changeCapitalization.ts +++ b/packages/roosterjs-content-model/lib/publicApi/segment/changeCapitalization.ts @@ -1,5 +1,5 @@ import { formatSegmentWithContentModel } from '../utils/formatSegmentWithContentModel'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; /** * Change the capitalization of text in the selection @@ -10,7 +10,7 @@ import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimental * Default is the host environment’s current locale. */ export default function changeCapitalization( - editor: IExperimentalContentModelEditor, + editor: IContentModelEditor, capitalization: 'sentence' | 'lowerCase' | 'upperCase' | 'capitalize', language?: string ) { diff --git a/packages/roosterjs-content-model/lib/publicApi/segment/changeFontSize.ts b/packages/roosterjs-content-model/lib/publicApi/segment/changeFontSize.ts index 6cf4eb033db..e8adc1b2c68 100644 --- a/packages/roosterjs-content-model/lib/publicApi/segment/changeFontSize.ts +++ b/packages/roosterjs-content-model/lib/publicApi/segment/changeFontSize.ts @@ -3,7 +3,7 @@ import { FontSizeFormat } from '../../publicTypes/format/formatParts/FontSizeFor import { FormatParser } from '../../publicTypes/context/DomToModelSettings'; import { formatSegmentWithContentModel } from '../utils/formatSegmentWithContentModel'; import { getComputedStyle } from 'roosterjs-editor-dom'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; /** * Default font size sequence, in pt. Suggest editor UI use this sequence as your font size list, @@ -20,7 +20,7 @@ const MAX_FONT_SIZE = 1000; * @param fontSizes A sorted font size array, in pt. Default value is FONT_SIZES */ export default function changeFontSize( - editor: IExperimentalContentModelEditor, + editor: IContentModelEditor, change: 'increase' | 'decrease' ) { formatSegmentWithContentModel( diff --git a/packages/roosterjs-content-model/lib/publicApi/segment/setBackgroundColor.ts b/packages/roosterjs-content-model/lib/publicApi/segment/setBackgroundColor.ts index b7aea12320c..2dcb2c46b14 100644 --- a/packages/roosterjs-content-model/lib/publicApi/segment/setBackgroundColor.ts +++ b/packages/roosterjs-content-model/lib/publicApi/segment/setBackgroundColor.ts @@ -1,5 +1,5 @@ import { formatSegmentWithContentModel } from '../utils/formatSegmentWithContentModel'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; /** * Set background color @@ -7,7 +7,7 @@ import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimental * @param backgroundColor The color to set. Pass null to remove existing color. */ export default function setBackgroundColor( - editor: IExperimentalContentModelEditor, + editor: IContentModelEditor, backgroundColor: string | null ) { formatSegmentWithContentModel( diff --git a/packages/roosterjs-content-model/lib/publicApi/segment/setFontName.ts b/packages/roosterjs-content-model/lib/publicApi/segment/setFontName.ts index c02f31790bc..48b9f0dc9d1 100644 --- a/packages/roosterjs-content-model/lib/publicApi/segment/setFontName.ts +++ b/packages/roosterjs-content-model/lib/publicApi/segment/setFontName.ts @@ -1,12 +1,12 @@ import { formatSegmentWithContentModel } from '../utils/formatSegmentWithContentModel'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; /** * Set font name * @param editor The editor to operate on * @param fontName The font name to set */ -export default function setFontName(editor: IExperimentalContentModelEditor, fontName: string) { +export default function setFontName(editor: IContentModelEditor, fontName: string) { formatSegmentWithContentModel( editor, 'setFontName', diff --git a/packages/roosterjs-content-model/lib/publicApi/segment/setFontSize.ts b/packages/roosterjs-content-model/lib/publicApi/segment/setFontSize.ts index 4d03a3b8aa0..87fe60c764f 100644 --- a/packages/roosterjs-content-model/lib/publicApi/segment/setFontSize.ts +++ b/packages/roosterjs-content-model/lib/publicApi/segment/setFontSize.ts @@ -1,12 +1,12 @@ import { formatSegmentWithContentModel } from '../utils/formatSegmentWithContentModel'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; /** * Set font size * @param editor The editor to operate on * @param fontSize The font size to set */ -export default function setFontSize(editor: IExperimentalContentModelEditor, fontSize: string) { +export default function setFontSize(editor: IContentModelEditor, fontSize: string) { formatSegmentWithContentModel( editor, 'setFontSize', diff --git a/packages/roosterjs-content-model/lib/publicApi/segment/setTextColor.ts b/packages/roosterjs-content-model/lib/publicApi/segment/setTextColor.ts index 42109d648bb..8c6882e771b 100644 --- a/packages/roosterjs-content-model/lib/publicApi/segment/setTextColor.ts +++ b/packages/roosterjs-content-model/lib/publicApi/segment/setTextColor.ts @@ -1,15 +1,12 @@ import { formatSegmentWithContentModel } from '../utils/formatSegmentWithContentModel'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; /** * Set text color * @param editor The editor to operate on * @param textColor The text color to set. Pass null to remove existing color. */ -export default function setTextColor( - editor: IExperimentalContentModelEditor, - textColor: string | null -) { +export default function setTextColor(editor: IContentModelEditor, textColor: string | null) { formatSegmentWithContentModel( editor, 'setTextColor', diff --git a/packages/roosterjs-content-model/lib/publicApi/segment/toggleBold.ts b/packages/roosterjs-content-model/lib/publicApi/segment/toggleBold.ts index ba2f7bc3702..0e97ad76ed8 100644 --- a/packages/roosterjs-content-model/lib/publicApi/segment/toggleBold.ts +++ b/packages/roosterjs-content-model/lib/publicApi/segment/toggleBold.ts @@ -1,11 +1,11 @@ import { formatSegmentWithContentModel } from '../utils/formatSegmentWithContentModel'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; /** * Toggle bold style * @param editor The editor to operate on */ -export default function toggleBold(editor: IExperimentalContentModelEditor) { +export default function toggleBold(editor: IContentModelEditor) { formatSegmentWithContentModel( editor, 'toggleBold', diff --git a/packages/roosterjs-content-model/lib/publicApi/segment/toggleItalic.ts b/packages/roosterjs-content-model/lib/publicApi/segment/toggleItalic.ts index 6c5b8ad2b43..8c62d361122 100644 --- a/packages/roosterjs-content-model/lib/publicApi/segment/toggleItalic.ts +++ b/packages/roosterjs-content-model/lib/publicApi/segment/toggleItalic.ts @@ -1,11 +1,11 @@ import { formatSegmentWithContentModel } from '../utils/formatSegmentWithContentModel'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; /** * Toggle italic style * @param editor The editor to operate on */ -export default function toggleItalic(editor: IExperimentalContentModelEditor) { +export default function toggleItalic(editor: IContentModelEditor) { formatSegmentWithContentModel( editor, 'toggleItalic', diff --git a/packages/roosterjs-content-model/lib/publicApi/segment/toggleStrikethrough.ts b/packages/roosterjs-content-model/lib/publicApi/segment/toggleStrikethrough.ts index 29b4645431b..aa227e891d3 100644 --- a/packages/roosterjs-content-model/lib/publicApi/segment/toggleStrikethrough.ts +++ b/packages/roosterjs-content-model/lib/publicApi/segment/toggleStrikethrough.ts @@ -1,11 +1,11 @@ import { formatSegmentWithContentModel } from '../utils/formatSegmentWithContentModel'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; /** * Toggle strikethrough style * @param editor The editor to operate on */ -export default function toggleStrikethrough(editor: IExperimentalContentModelEditor) { +export default function toggleStrikethrough(editor: IContentModelEditor) { formatSegmentWithContentModel( editor, 'toggleStrikethrough', diff --git a/packages/roosterjs-content-model/lib/publicApi/segment/toggleSubscript.ts b/packages/roosterjs-content-model/lib/publicApi/segment/toggleSubscript.ts index fe138169b7f..9e9c569fa15 100644 --- a/packages/roosterjs-content-model/lib/publicApi/segment/toggleSubscript.ts +++ b/packages/roosterjs-content-model/lib/publicApi/segment/toggleSubscript.ts @@ -1,11 +1,11 @@ import { formatSegmentWithContentModel } from '../utils/formatSegmentWithContentModel'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; /** * Toggle subscript style * @param editor The editor to operate on */ -export default function toggleSubscript(editor: IExperimentalContentModelEditor) { +export default function toggleSubscript(editor: IContentModelEditor) { formatSegmentWithContentModel( editor, 'toggleSubscript', diff --git a/packages/roosterjs-content-model/lib/publicApi/segment/toggleSuperscript.ts b/packages/roosterjs-content-model/lib/publicApi/segment/toggleSuperscript.ts index 093c8c2d79f..4ebbbe2127d 100644 --- a/packages/roosterjs-content-model/lib/publicApi/segment/toggleSuperscript.ts +++ b/packages/roosterjs-content-model/lib/publicApi/segment/toggleSuperscript.ts @@ -1,11 +1,11 @@ import { formatSegmentWithContentModel } from '../utils/formatSegmentWithContentModel'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; /** * Toggle superscript style * @param editor The editor to operate on */ -export default function toggleSuperscript(editor: IExperimentalContentModelEditor) { +export default function toggleSuperscript(editor: IContentModelEditor) { formatSegmentWithContentModel( editor, 'toggleSuperscript', diff --git a/packages/roosterjs-content-model/lib/publicApi/segment/toggleUnderline.ts b/packages/roosterjs-content-model/lib/publicApi/segment/toggleUnderline.ts index 640103f8e86..e7bcceedb37 100644 --- a/packages/roosterjs-content-model/lib/publicApi/segment/toggleUnderline.ts +++ b/packages/roosterjs-content-model/lib/publicApi/segment/toggleUnderline.ts @@ -1,11 +1,11 @@ import { formatSegmentWithContentModel } from '../utils/formatSegmentWithContentModel'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; /** * Toggle underline style * @param editor The editor to operate on */ -export default function toggleUnderline(editor: IExperimentalContentModelEditor) { +export default function toggleUnderline(editor: IContentModelEditor) { formatSegmentWithContentModel( editor, 'toggleUnderline', diff --git a/packages/roosterjs-content-model/lib/publicApi/table/editTable.ts b/packages/roosterjs-content-model/lib/publicApi/table/editTable.ts index 5b6e4375c3b..0deb3aa5a8f 100644 --- a/packages/roosterjs-content-model/lib/publicApi/table/editTable.ts +++ b/packages/roosterjs-content-model/lib/publicApi/table/editTable.ts @@ -7,7 +7,7 @@ import { deleteTableRow } from '../../modelApi/table/deleteTableRow'; import { formatWithContentModel } from '../utils/formatWithContentModel'; import { getFirstSelectedTable } from '../../modelApi/selection/collectSelections'; import { hasMetadata } from '../../modelApi/metadata/updateMetadata'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; import { insertTableColumn } from '../../modelApi/table/insertTableColumn'; import { insertTableRow } from '../../modelApi/table/insertTableRow'; import { mergeTableCells } from '../../modelApi/table/mergeTableCells'; @@ -23,10 +23,7 @@ import { TableOperation } from 'roosterjs-editor-types'; * @param editor The editor instance * @param operation The table operation to apply */ -export default function editTable( - editor: IExperimentalContentModelEditor, - operation: TableOperation -) { +export default function editTable(editor: IContentModelEditor, operation: TableOperation) { formatWithContentModel(editor, 'editTable', model => { const tableModel = getFirstSelectedTable(model); diff --git a/packages/roosterjs-content-model/lib/publicApi/table/formatTable.ts b/packages/roosterjs-content-model/lib/publicApi/table/formatTable.ts index 617250695e5..9e527888a8a 100644 --- a/packages/roosterjs-content-model/lib/publicApi/table/formatTable.ts +++ b/packages/roosterjs-content-model/lib/publicApi/table/formatTable.ts @@ -1,7 +1,7 @@ import { applyTableFormat } from '../../modelApi/table/applyTableFormat'; import { formatWithContentModel } from '../utils/formatWithContentModel'; import { getFirstSelectedTable } from '../../modelApi/selection/collectSelections'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; import { TableMetadataFormat } from '../../publicTypes/format/formatParts/TableMetadataFormat'; /** @@ -11,7 +11,7 @@ import { TableMetadataFormat } from '../../publicTypes/format/formatParts/TableM * @param keepCellShade Whether keep existing shade color when apply format if there is a manually set shade color */ export default function formatTable( - editor: IExperimentalContentModelEditor, + editor: IContentModelEditor, format: TableMetadataFormat, keepCellShade?: boolean ) { diff --git a/packages/roosterjs-content-model/lib/publicApi/table/insertTable.ts b/packages/roosterjs-content-model/lib/publicApi/table/insertTable.ts index eabcd44cc44..3c9b793e7dc 100644 --- a/packages/roosterjs-content-model/lib/publicApi/table/insertTable.ts +++ b/packages/roosterjs-content-model/lib/publicApi/table/insertTable.ts @@ -3,7 +3,7 @@ import { createContentModelDocument } from '../../modelApi/creators/createConten import { createSelectionMarker } from '../../modelApi/creators/createSelectionMarker'; import { createTableStructure } from '../../modelApi/table/createTableStructure'; import { formatWithContentModel } from '../utils/formatWithContentModel'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; import { mergeModel } from '../../modelApi/common/mergeModel'; import { normalizeTable } from '../../modelApi/table/normalizeTable'; import { setSelection } from '../../modelApi/selection/setSelection'; @@ -19,7 +19,7 @@ import { TableMetadataFormat } from '../../publicTypes/format/formatParts/TableM * background color: #FFF; border color: #ABABAB */ export default function insertTable( - editor: IExperimentalContentModelEditor, + editor: IContentModelEditor, columns: number, rows: number, format?: TableMetadataFormat diff --git a/packages/roosterjs-content-model/lib/publicApi/table/setTableCellShade.ts b/packages/roosterjs-content-model/lib/publicApi/table/setTableCellShade.ts index 83f6c8f4d1c..dcf9a85f145 100644 --- a/packages/roosterjs-content-model/lib/publicApi/table/setTableCellShade.ts +++ b/packages/roosterjs-content-model/lib/publicApi/table/setTableCellShade.ts @@ -1,7 +1,7 @@ import hasSelectionInBlockGroup from '../selection/hasSelectionInBlockGroup'; import { formatWithContentModel } from '../utils/formatWithContentModel'; import { getFirstSelectedTable } from '../../modelApi/selection/collectSelections'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; import { normalizeTable } from '../../modelApi/table/normalizeTable'; import { setTableCellBackgroundColor } from '../../modelApi/table/setTableCellBackgroundColor'; @@ -10,7 +10,7 @@ import { setTableCellBackgroundColor } from '../../modelApi/table/setTableCellBa * @param editor The editor instance * @param color The color to set */ -export default function setTableCellShade(editor: IExperimentalContentModelEditor, color: string) { +export default function setTableCellShade(editor: IContentModelEditor, color: string) { formatWithContentModel(editor, 'setTableCellShade', model => { const table = getFirstSelectedTable(model); diff --git a/packages/roosterjs-content-model/lib/publicApi/utils/formatImageWithContentModel.ts b/packages/roosterjs-content-model/lib/publicApi/utils/formatImageWithContentModel.ts index b85e52df87d..a3170086e90 100644 --- a/packages/roosterjs-content-model/lib/publicApi/utils/formatImageWithContentModel.ts +++ b/packages/roosterjs-content-model/lib/publicApi/utils/formatImageWithContentModel.ts @@ -1,12 +1,12 @@ import { ContentModelImage } from '../../publicTypes/segment/ContentModelImage'; import { formatSegmentWithContentModel } from './formatSegmentWithContentModel'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; /** * @internal */ export default function formatImageWithContentModel( - editor: IExperimentalContentModelEditor, + editor: IContentModelEditor, apiName: string, callback: (segment: ContentModelImage) => void ) { diff --git a/packages/roosterjs-content-model/lib/publicApi/utils/formatParagraphWithContentModel.ts b/packages/roosterjs-content-model/lib/publicApi/utils/formatParagraphWithContentModel.ts index b509a32fdd3..aa68f490f77 100644 --- a/packages/roosterjs-content-model/lib/publicApi/utils/formatParagraphWithContentModel.ts +++ b/packages/roosterjs-content-model/lib/publicApi/utils/formatParagraphWithContentModel.ts @@ -1,13 +1,13 @@ import { ContentModelParagraph } from '../../publicTypes/block/ContentModelParagraph'; import { formatWithContentModel } from './formatWithContentModel'; import { getSelectedParagraphs } from '../../modelApi/selection/collectSelections'; -import { IExperimentalContentModelEditor } from '../../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../publicTypes/IContentModelEditor'; /** * @internal */ export function formatParagraphWithContentModel( - editor: IExperimentalContentModelEditor, + editor: IContentModelEditor, apiName: string, setStyleCallback: (paragraph: ContentModelParagraph) => void ) { diff --git a/packages/roosterjs-content-model/lib/publicApi/utils/formatSegmentWithContentModel.ts b/packages/roosterjs-content-model/lib/publicApi/utils/formatSegmentWithContentModel.ts index efe3a1a61f5..6e1d1f2dca0 100644 --- a/packages/roosterjs-content-model/lib/publicApi/utils/formatSegmentWithContentModel.ts +++ b/packages/roosterjs-content-model/lib/publicApi/utils/formatSegmentWithContentModel.ts @@ -1,18 +1,15 @@ import { adjustWordSelection } from '../../modelApi/selection/adjustWordSelection'; import { ContentModelSegment } from '../../publicTypes/segment/ContentModelSegment'; import { ContentModelSegmentFormat } from '../../publicTypes/format/ContentModelSegmentFormat'; +import { DomToModelOption, IContentModelEditor } from '../../publicTypes/IContentModelEditor'; import { formatWithContentModel } from './formatWithContentModel'; import { getPendingFormat, setPendingFormat } from '../format/pendingFormat'; import { getSelectedSegments } from '../../modelApi/selection/collectSelections'; -import { - DomToModelOption, - IExperimentalContentModelEditor, -} from '../../publicTypes/IExperimentalContentModelEditor'; /** * @internal */ export function formatSegmentWithContentModel( - editor: IExperimentalContentModelEditor, + editor: IContentModelEditor, apiName: string, toggleStyleCallback: ( format: ContentModelSegmentFormat, diff --git a/packages/roosterjs-content-model/lib/publicApi/utils/formatWithContentModel.ts b/packages/roosterjs-content-model/lib/publicApi/utils/formatWithContentModel.ts index 7cb1c0c9276..4c242e2cb00 100644 --- a/packages/roosterjs-content-model/lib/publicApi/utils/formatWithContentModel.ts +++ b/packages/roosterjs-content-model/lib/publicApi/utils/formatWithContentModel.ts @@ -1,15 +1,12 @@ import { ChangeSource } from 'roosterjs-editor-types'; import { ContentModelDocument } from '../../publicTypes/group/ContentModelDocument'; -import { - DomToModelOption, - IExperimentalContentModelEditor, -} from '../../publicTypes/IExperimentalContentModelEditor'; +import { DomToModelOption, IContentModelEditor } from '../../publicTypes/IContentModelEditor'; /** * @internal */ export function formatWithContentModel( - editor: IExperimentalContentModelEditor, + editor: IContentModelEditor, apiName: string, callback: (model: ContentModelDocument) => boolean, domToModelOptions?: DomToModelOption diff --git a/packages/roosterjs-content-model/lib/publicPlugin/ContentModelPlugin.ts b/packages/roosterjs-content-model/lib/publicPlugin/ContentModelPlugin.ts index c35331bd568..14c6e490344 100644 --- a/packages/roosterjs-content-model/lib/publicPlugin/ContentModelPlugin.ts +++ b/packages/roosterjs-content-model/lib/publicPlugin/ContentModelPlugin.ts @@ -2,7 +2,7 @@ import { ContentModelSegmentFormat } from '../publicTypes/format/ContentModelSeg import { createText } from '../modelApi/creators/createText'; import { EditorPlugin, IEditor, Keys, PluginEvent, PluginEventType } from 'roosterjs-editor-types'; import { getPendingFormat, setPendingFormat } from '../publicApi/format/pendingFormat'; -import { IExperimentalContentModelEditor } from '../publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../publicTypes/IContentModelEditor'; import { iterateSelections } from '../modelApi/selection/iterateSelections'; /** @@ -11,7 +11,7 @@ import { iterateSelections } from '../modelApi/selection/iterateSelections'; * 1. Handle pending format changes when selection is collapsed */ export default class ContentModelPlugin implements EditorPlugin { - private editor: IExperimentalContentModelEditor | null = null; + private editor: IContentModelEditor | null = null; /** * Get name of this plugin @@ -28,7 +28,7 @@ export default class ContentModelPlugin implements EditorPlugin { */ initialize(editor: IEditor) { // TODO: Later we may need a different interface for Content Model editor plugin - this.editor = editor as IExperimentalContentModelEditor; + this.editor = editor as IContentModelEditor; } /** @@ -76,7 +76,7 @@ export default class ContentModelPlugin implements EditorPlugin { } function applyPendingFormat( - editor: IExperimentalContentModelEditor, + editor: IContentModelEditor, data: string, format: ContentModelSegmentFormat ) { diff --git a/packages/roosterjs-content-model/lib/publicTypes/IExperimentalContentModelEditor.ts b/packages/roosterjs-content-model/lib/publicTypes/IContentModelEditor.ts similarity index 92% rename from packages/roosterjs-content-model/lib/publicTypes/IExperimentalContentModelEditor.ts rename to packages/roosterjs-content-model/lib/publicTypes/IContentModelEditor.ts index 7bb5c54c224..d699564e5fa 100644 --- a/packages/roosterjs-content-model/lib/publicTypes/IExperimentalContentModelEditor.ts +++ b/packages/roosterjs-content-model/lib/publicTypes/IContentModelEditor.ts @@ -81,11 +81,10 @@ export interface ModelToDomOption { } /** - * !!! This is a temporary interface and will be removed in the future !!! - * - * An interface of editor with Content Model support (in experiment) + * An interface of editor with Content Model support. + * (This interface is still under development, and may still be changed in the future with some breaking changes) */ -export interface IExperimentalContentModelEditor extends IEditor { +export interface IContentModelEditor extends IEditor { /** * Create Content Model from DOM tree in this editor * @param rootNode Optional start node. If provided, Content Model will be created from this node (including itself), diff --git a/packages/roosterjs-content-model/test/publicApi/block/paragraphTestCommon.ts b/packages/roosterjs-content-model/test/publicApi/block/paragraphTestCommon.ts index ae804e305eb..6f4a454f47e 100644 --- a/packages/roosterjs-content-model/test/publicApi/block/paragraphTestCommon.ts +++ b/packages/roosterjs-content-model/test/publicApi/block/paragraphTestCommon.ts @@ -1,9 +1,9 @@ import { ContentModelDocument } from '../../../lib/publicTypes/group/ContentModelDocument'; -import { IExperimentalContentModelEditor } from '../../../lib/publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../../lib/publicTypes/IContentModelEditor'; export function paragraphTestCommon( apiName: string, - executionCallback: (editor: IExperimentalContentModelEditor) => void, + executionCallback: (editor: IContentModelEditor) => void, model: ContentModelDocument, result: ContentModelDocument, calledTimes: number @@ -23,7 +23,7 @@ export function paragraphTestCommon( addUndoSnapshot, focus: jasmine.createSpy(), setContentModel, - } as any) as IExperimentalContentModelEditor; + } as any) as IContentModelEditor; executionCallback(editor); diff --git a/packages/roosterjs-content-model/test/publicApi/block/setIndentationTest.ts b/packages/roosterjs-content-model/test/publicApi/block/setIndentationTest.ts index 5d9c88e0df8..488d932812d 100644 --- a/packages/roosterjs-content-model/test/publicApi/block/setIndentationTest.ts +++ b/packages/roosterjs-content-model/test/publicApi/block/setIndentationTest.ts @@ -1,16 +1,16 @@ import * as formatWithContentModel from '../../../lib/publicApi/utils/formatWithContentModel'; import * as setModelIndentation from '../../../lib/modelApi/block/setModelIndentation'; import setIndentation from '../../../lib/publicApi/block/setIndentation'; -import { IExperimentalContentModelEditor } from '../../../lib/publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../../lib/publicTypes/IContentModelEditor'; describe('setIndentation', () => { const fakeModel: any = { a: 'b' }; - let editor: IExperimentalContentModelEditor; + let editor: IContentModelEditor; beforeEach(() => { editor = ({ createContentModel: () => fakeModel, - } as any) as IExperimentalContentModelEditor; + } as any) as IContentModelEditor; }); it('indent', () => { diff --git a/packages/roosterjs-content-model/test/publicApi/block/toggleBlockQuoteTest.ts b/packages/roosterjs-content-model/test/publicApi/block/toggleBlockQuoteTest.ts index c1bb6179582..9aed7bd2ba4 100644 --- a/packages/roosterjs-content-model/test/publicApi/block/toggleBlockQuoteTest.ts +++ b/packages/roosterjs-content-model/test/publicApi/block/toggleBlockQuoteTest.ts @@ -1,16 +1,16 @@ import * as formatWithContentModel from '../../../lib/publicApi/utils/formatWithContentModel'; import * as toggleModelBlockQuote from '../../../lib/modelApi/block/toggleModelBlockQuote'; import toggleBlockQuote from '../../../lib/publicApi/block/toggleBlockQuote'; -import { IExperimentalContentModelEditor } from '../../../lib/publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../../lib/publicTypes/IContentModelEditor'; describe('toggleBlockQuote', () => { const fakeModel: any = { a: 'b' }; - let editor: IExperimentalContentModelEditor; + let editor: IContentModelEditor; beforeEach(() => { editor = ({ createContentModel: () => fakeModel, - } as any) as IExperimentalContentModelEditor; + } as any) as IContentModelEditor; }); it('toggleBlockQuote', () => { diff --git a/packages/roosterjs-content-model/test/publicApi/format/clearFormatTest.ts b/packages/roosterjs-content-model/test/publicApi/format/clearFormatTest.ts index 823ed06b6c1..2e9ea7b7d53 100644 --- a/packages/roosterjs-content-model/test/publicApi/format/clearFormatTest.ts +++ b/packages/roosterjs-content-model/test/publicApi/format/clearFormatTest.ts @@ -3,11 +3,11 @@ import * as formatWithContentModel from '../../../lib/publicApi/utils/formatWith import * as normalizeContentModel from '../../../lib/modelApi/common/normalizeContentModel'; import clearFormat from '../../../lib/publicApi/format/clearFormat'; import { ContentModelDocument } from '../../../lib/publicTypes/group/ContentModelDocument'; -import { IExperimentalContentModelEditor } from '../../../lib/publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../../lib/publicTypes/IContentModelEditor'; describe('clearFormat', () => { it('Clear format', () => { - const editor = ({} as any) as IExperimentalContentModelEditor; + const editor = ({} as any) as IContentModelEditor; const model = ('Model' as any) as ContentModelDocument; spyOn(formatWithContentModel, 'formatWithContentModel').and.callFake( diff --git a/packages/roosterjs-content-model/test/publicApi/format/getFormatStateTest.ts b/packages/roosterjs-content-model/test/publicApi/format/getFormatStateTest.ts index 07dd7f795c1..5e4c444a681 100644 --- a/packages/roosterjs-content-model/test/publicApi/format/getFormatStateTest.ts +++ b/packages/roosterjs-content-model/test/publicApi/format/getFormatStateTest.ts @@ -10,8 +10,8 @@ import { normalizeContentModel } from '../../../lib/modelApi/common/normalizeCon import { DomToModelOption, - IExperimentalContentModelEditor, -} from '../../../lib/publicTypes/IExperimentalContentModelEditor'; + IContentModelEditor, +} from '../../../lib/publicTypes/IContentModelEditor'; const selectedNodeId = 'Selected'; @@ -54,7 +54,7 @@ describe('getFormatState', () => { return model; }, - } as any) as IExperimentalContentModelEditor; + } as any) as IContentModelEditor; spyOn(getPendingFormat, 'getPendingFormat').and.returnValue(pendingFormat); diff --git a/packages/roosterjs-content-model/test/publicApi/format/getSegmentFormatTest.ts b/packages/roosterjs-content-model/test/publicApi/format/getSegmentFormatTest.ts index aa300bd63d5..8f639d3ced7 100644 --- a/packages/roosterjs-content-model/test/publicApi/format/getSegmentFormatTest.ts +++ b/packages/roosterjs-content-model/test/publicApi/format/getSegmentFormatTest.ts @@ -9,8 +9,8 @@ import { PositionType, SelectionRangeTypes } from 'roosterjs-editor-types'; import { DomToModelOption, - IExperimentalContentModelEditor, -} from '../../../lib/publicTypes/IExperimentalContentModelEditor'; + IContentModelEditor, +} from '../../../lib/publicTypes/IContentModelEditor'; const selectedNodeId = 'Selected'; @@ -64,7 +64,7 @@ describe('getSegmentFormat', () => { return model; }, - } as any) as IExperimentalContentModelEditor; + } as any) as IContentModelEditor; const result = getSegmentFormat(editor); expect(result).toEqual(expectedFormat); diff --git a/packages/roosterjs-content-model/test/publicApi/insert/insertImageTest.ts b/packages/roosterjs-content-model/test/publicApi/insert/insertImageTest.ts index fcbc14dab32..1a191b7dbda 100644 --- a/packages/roosterjs-content-model/test/publicApi/insert/insertImageTest.ts +++ b/packages/roosterjs-content-model/test/publicApi/insert/insertImageTest.ts @@ -4,14 +4,14 @@ import { addSegment } from '../../../lib/modelApi/common/addSegment'; import { ContentModelDocument } from '../../../lib/publicTypes/group/ContentModelDocument'; import { createContentModelDocument } from '../../../lib/modelApi/creators/createContentModelDocument'; import { createSelectionMarker } from '../../../lib/modelApi/creators/createSelectionMarker'; -import { IExperimentalContentModelEditor } from '../../../lib/publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../../lib/publicTypes/IContentModelEditor'; describe('insertImage', () => { const testUrl = 'http://test.com/test'; function runTest( apiName: string, - executionCallback: (editor: IExperimentalContentModelEditor) => void, + executionCallback: (editor: IContentModelEditor) => void, model: ContentModelDocument, result: ContentModelDocument, calledTimes: number @@ -35,7 +35,7 @@ describe('insertImage', () => { setContentModel, isDisposed: () => false, getDocument: () => document, - } as any) as IExperimentalContentModelEditor; + } as any) as IContentModelEditor; executionCallback(editor); diff --git a/packages/roosterjs-content-model/test/publicApi/link/adjustLinkSelectionTest.ts b/packages/roosterjs-content-model/test/publicApi/link/adjustLinkSelectionTest.ts index 6e8979be2bf..719085bd6ce 100644 --- a/packages/roosterjs-content-model/test/publicApi/link/adjustLinkSelectionTest.ts +++ b/packages/roosterjs-content-model/test/publicApi/link/adjustLinkSelectionTest.ts @@ -8,12 +8,12 @@ import { createImage } from '../../../lib/modelApi/creators/createImage'; import { createParagraph } from '../../../lib/modelApi/creators/createParagraph'; import { createSelectionMarker } from '../../../lib/modelApi/creators/createSelectionMarker'; import { createText } from '../../../lib/modelApi/creators/createText'; -import { IExperimentalContentModelEditor } from '../../../lib/publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../../lib/publicTypes/IContentModelEditor'; describe('adjustLinkSelection', () => { - let editor: IExperimentalContentModelEditor; - let setContentModel: jasmine.Spy; - let createContentModel: jasmine.Spy; + let editor: IContentModelEditor; + let setContentModel: jasmine.Spy; + let createContentModel: jasmine.Spy; beforeEach(() => { setContentModel = jasmine.createSpy('setContentModel'); @@ -24,7 +24,7 @@ describe('adjustLinkSelection', () => { addUndoSnapshot: (callback: Function) => callback(), setContentModel, createContentModel, - } as any) as IExperimentalContentModelEditor; + } as any) as IContentModelEditor; }); function runTest( diff --git a/packages/roosterjs-content-model/test/publicApi/link/insertLinkTest.ts b/packages/roosterjs-content-model/test/publicApi/link/insertLinkTest.ts index fcf4ed67866..cdecd2e1ba6 100644 --- a/packages/roosterjs-content-model/test/publicApi/link/insertLinkTest.ts +++ b/packages/roosterjs-content-model/test/publicApi/link/insertLinkTest.ts @@ -7,12 +7,12 @@ import { createImage } from '../../../lib/modelApi/creators/createImage'; import { createSelectionMarker } from '../../../lib/modelApi/creators/createSelectionMarker'; import { createText } from '../../../lib/modelApi/creators/createText'; import { HyperLinkColorPlaceholder } from '../../../lib/formatHandlers/utils/defaultStyles'; -import { IExperimentalContentModelEditor } from '../../../lib/publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../../lib/publicTypes/IContentModelEditor'; describe('insertLink', () => { - let editor: IExperimentalContentModelEditor; - let setContentModel: jasmine.Spy; - let createContentModel: jasmine.Spy; + let editor: IContentModelEditor; + let setContentModel: jasmine.Spy; + let createContentModel: jasmine.Spy; beforeEach(() => { setContentModel = jasmine.createSpy('setContentModel'); @@ -23,7 +23,7 @@ describe('insertLink', () => { addUndoSnapshot: (callback: Function) => callback(), setContentModel, createContentModel, - } as any) as IExperimentalContentModelEditor; + } as any) as IContentModelEditor; }); function runTest( diff --git a/packages/roosterjs-content-model/test/publicApi/link/removeLinkTest.ts b/packages/roosterjs-content-model/test/publicApi/link/removeLinkTest.ts index 5aded16554b..90ba10a4e8f 100644 --- a/packages/roosterjs-content-model/test/publicApi/link/removeLinkTest.ts +++ b/packages/roosterjs-content-model/test/publicApi/link/removeLinkTest.ts @@ -6,12 +6,12 @@ import { ContentModelLink } from '../../../lib/publicTypes/decorator/ContentMode import { createContentModelDocument } from '../../../lib/modelApi/creators/createContentModelDocument'; import { createImage } from '../../../lib/modelApi/creators/createImage'; import { createText } from '../../../lib/modelApi/creators/createText'; -import { IExperimentalContentModelEditor } from '../../../lib/publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../../lib/publicTypes/IContentModelEditor'; describe('removeLink', () => { - let editor: IExperimentalContentModelEditor; - let setContentModel: jasmine.Spy; - let createContentModel: jasmine.Spy; + let editor: IContentModelEditor; + let setContentModel: jasmine.Spy; + let createContentModel: jasmine.Spy; beforeEach(() => { setContentModel = jasmine.createSpy('setContentModel'); @@ -22,7 +22,7 @@ describe('removeLink', () => { addUndoSnapshot: (callback: Function) => callback(), setContentModel, createContentModel, - } as any) as IExperimentalContentModelEditor; + } as any) as IContentModelEditor; }); function runTest(model: ContentModelDocument, expectedModel: ContentModelDocument | null) { diff --git a/packages/roosterjs-content-model/test/publicApi/list/toggleBulletTest.ts b/packages/roosterjs-content-model/test/publicApi/list/toggleBulletTest.ts index def21f3af0a..fbb27ebd9d3 100644 --- a/packages/roosterjs-content-model/test/publicApi/list/toggleBulletTest.ts +++ b/packages/roosterjs-content-model/test/publicApi/list/toggleBulletTest.ts @@ -1,10 +1,10 @@ import * as setListType from '../../../lib/modelApi/list/setListType'; import toggleBullet from '../../../lib/publicApi/list/toggleBullet'; import { ContentModelDocument } from '../../../lib/publicTypes/group/ContentModelDocument'; -import { IExperimentalContentModelEditor } from '../../../lib/publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../../lib/publicTypes/IContentModelEditor'; describe('toggleBullet', () => { - let editor = ({} as any) as IExperimentalContentModelEditor; + let editor = ({} as any) as IContentModelEditor; let addUndoSnapshot: jasmine.Spy; let createContentModel: jasmine.Spy; let setContentModel: jasmine.Spy; @@ -24,7 +24,7 @@ describe('toggleBullet', () => { addUndoSnapshot, createContentModel, setContentModel, - } as any) as IExperimentalContentModelEditor; + } as any) as IContentModelEditor; spyOn(setListType, 'setListType').and.returnValue(true); }); diff --git a/packages/roosterjs-content-model/test/publicApi/list/toggleNumberingTest.ts b/packages/roosterjs-content-model/test/publicApi/list/toggleNumberingTest.ts index d1bd9899437..2b44628334f 100644 --- a/packages/roosterjs-content-model/test/publicApi/list/toggleNumberingTest.ts +++ b/packages/roosterjs-content-model/test/publicApi/list/toggleNumberingTest.ts @@ -1,10 +1,10 @@ import * as setListType from '../../../lib/modelApi/list/setListType'; import toggleNumbering from '../../../lib/publicApi/list/toggleNumbering'; import { ContentModelDocument } from '../../../lib/publicTypes/group/ContentModelDocument'; -import { IExperimentalContentModelEditor } from '../../../lib/publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../../lib/publicTypes/IContentModelEditor'; describe('toggleNumbering', () => { - let editor = ({} as any) as IExperimentalContentModelEditor; + let editor = ({} as any) as IContentModelEditor; let addUndoSnapshot: jasmine.Spy; let createContentModel: jasmine.Spy; let setContentModel: jasmine.Spy; @@ -24,7 +24,7 @@ describe('toggleNumbering', () => { addUndoSnapshot, createContentModel, setContentModel, - } as any) as IExperimentalContentModelEditor; + } as any) as IContentModelEditor; spyOn(setListType, 'setListType').and.returnValue(true); }); diff --git a/packages/roosterjs-content-model/test/publicApi/segment/changeFontSizeTest.ts b/packages/roosterjs-content-model/test/publicApi/segment/changeFontSizeTest.ts index 820599c1285..afadb34733c 100644 --- a/packages/roosterjs-content-model/test/publicApi/segment/changeFontSizeTest.ts +++ b/packages/roosterjs-content-model/test/publicApi/segment/changeFontSizeTest.ts @@ -4,7 +4,7 @@ import changeFontSize from '../../../lib/publicApi/segment/changeFontSize'; import domToContentModel from '../../../lib/publicApi/domToContentModel'; import { ContentModelDocument } from '../../../lib/publicTypes/group/ContentModelDocument'; import { createRange } from 'roosterjs-editor-dom'; -import { IExperimentalContentModelEditor } from '../../../lib/publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../../lib/publicTypes/IContentModelEditor'; import { segmentTestCommon } from './segmentTestCommon'; import { SelectionRangeTypes } from 'roosterjs-editor-types'; @@ -356,7 +356,7 @@ describe('changeFontSize', () => { addUndoSnapshot, focus: jasmine.createSpy(), setContentModel, - } as any) as IExperimentalContentModelEditor; + } as any) as IContentModelEditor; spyOn(getComputedStyles, 'getComputedStyle').and.callFake( (node: HTMLElement, style: string) => { diff --git a/packages/roosterjs-content-model/test/publicApi/segment/segmentTestCommon.ts b/packages/roosterjs-content-model/test/publicApi/segment/segmentTestCommon.ts index 5fb699aa317..574619976be 100644 --- a/packages/roosterjs-content-model/test/publicApi/segment/segmentTestCommon.ts +++ b/packages/roosterjs-content-model/test/publicApi/segment/segmentTestCommon.ts @@ -1,10 +1,10 @@ import * as pendingFormat from '../../../lib/publicApi/format/pendingFormat'; import { ContentModelDocument } from '../../../lib/publicTypes/group/ContentModelDocument'; -import { IExperimentalContentModelEditor } from '../../../lib/publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../../lib/publicTypes/IContentModelEditor'; export function segmentTestCommon( apiName: string, - executionCallback: (editor: IExperimentalContentModelEditor) => void, + executionCallback: (editor: IContentModelEditor) => void, model: ContentModelDocument, result: ContentModelDocument, calledTimes: number @@ -28,7 +28,7 @@ export function segmentTestCommon( focus: jasmine.createSpy(), setContentModel, isDisposed: () => false, - } as any) as IExperimentalContentModelEditor; + } as any) as IContentModelEditor; executionCallback(editor); diff --git a/packages/roosterjs-content-model/test/publicApi/table/setTableCellShadeTest.ts b/packages/roosterjs-content-model/test/publicApi/table/setTableCellShadeTest.ts index 44acc8e9385..29ca81868dc 100644 --- a/packages/roosterjs-content-model/test/publicApi/table/setTableCellShadeTest.ts +++ b/packages/roosterjs-content-model/test/publicApi/table/setTableCellShadeTest.ts @@ -2,12 +2,12 @@ import * as normalizeTable from '../../../lib/modelApi/table/normalizeTable'; import setTableCellShade from '../../../lib/publicApi/table/setTableCellShade'; import { ContentModelTable } from '../../../lib/publicTypes/block/ContentModelTable'; import { createContentModelDocument } from '../../../lib/modelApi/creators/createContentModelDocument'; -import { IExperimentalContentModelEditor } from '../../../lib/publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../../lib/publicTypes/IContentModelEditor'; describe('setTableCellShade', () => { - let editor: IExperimentalContentModelEditor; - let setContentModel: jasmine.Spy; - let createContentModel: jasmine.Spy; + let editor: IContentModelEditor; + let setContentModel: jasmine.Spy; + let createContentModel: jasmine.Spy; beforeEach(() => { setContentModel = jasmine.createSpy('setContentModel'); @@ -20,7 +20,7 @@ describe('setTableCellShade', () => { addUndoSnapshot: (callback: Function) => callback(), setContentModel, createContentModel, - } as any) as IExperimentalContentModelEditor; + } as any) as IContentModelEditor; }); function runTest(table: ContentModelTable, expectedTable: ContentModelTable | null) { diff --git a/packages/roosterjs-content-model/test/publicApi/utils/formatParagraphWithContentModelTest.ts b/packages/roosterjs-content-model/test/publicApi/utils/formatParagraphWithContentModelTest.ts index 6176705838a..5ceba23664a 100644 --- a/packages/roosterjs-content-model/test/publicApi/utils/formatParagraphWithContentModelTest.ts +++ b/packages/roosterjs-content-model/test/publicApi/utils/formatParagraphWithContentModelTest.ts @@ -3,10 +3,10 @@ import { createContentModelDocument } from '../../../lib/modelApi/creators/creat import { createParagraph } from '../../../lib/modelApi/creators/createParagraph'; import { createText } from '../../../lib/modelApi/creators/createText'; import { formatParagraphWithContentModel } from '../../../lib/publicApi/utils/formatParagraphWithContentModel'; -import { IExperimentalContentModelEditor } from '../../../lib/publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../../lib/publicTypes/IContentModelEditor'; describe('formatParagraphWithContentModel', () => { - let editor: IExperimentalContentModelEditor; + let editor: IContentModelEditor; let addUndoSnapshot: jasmine.Spy; let setContentModel: jasmine.Spy; let focus: jasmine.Spy; @@ -24,7 +24,7 @@ describe('formatParagraphWithContentModel', () => { addUndoSnapshot, createContentModel: () => model, setContentModel, - } as any) as IExperimentalContentModelEditor; + } as any) as IContentModelEditor; }); it('empty doc', () => { diff --git a/packages/roosterjs-content-model/test/publicApi/utils/formatSegmentWithContentModelTest.ts b/packages/roosterjs-content-model/test/publicApi/utils/formatSegmentWithContentModelTest.ts index c0558f23f6b..f718054389f 100644 --- a/packages/roosterjs-content-model/test/publicApi/utils/formatSegmentWithContentModelTest.ts +++ b/packages/roosterjs-content-model/test/publicApi/utils/formatSegmentWithContentModelTest.ts @@ -6,10 +6,10 @@ import { createParagraph } from '../../../lib/modelApi/creators/createParagraph' import { createSelectionMarker } from '../../../lib/modelApi/creators/createSelectionMarker'; import { createText } from '../../../lib/modelApi/creators/createText'; import { formatSegmentWithContentModel } from '../../../lib/publicApi/utils/formatSegmentWithContentModel'; -import { IExperimentalContentModelEditor } from '../../../lib/publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../../lib/publicTypes/IContentModelEditor'; describe('formatSegmentWithContentModel', () => { - let editor: IExperimentalContentModelEditor; + let editor: IContentModelEditor; let addUndoSnapshot: jasmine.Spy; let setContentModel: jasmine.Spy; let focus: jasmine.Spy; @@ -32,7 +32,7 @@ describe('formatSegmentWithContentModel', () => { addUndoSnapshot, createContentModel: () => model, setContentModel, - } as any) as IExperimentalContentModelEditor; + } as any) as IContentModelEditor; }); it('empty doc', () => { diff --git a/packages/roosterjs-content-model/test/publicApi/utils/formatWithContentModelTest.ts b/packages/roosterjs-content-model/test/publicApi/utils/formatWithContentModelTest.ts index 4e9c5ab09bc..b40fc3c8909 100644 --- a/packages/roosterjs-content-model/test/publicApi/utils/formatWithContentModelTest.ts +++ b/packages/roosterjs-content-model/test/publicApi/utils/formatWithContentModelTest.ts @@ -1,10 +1,10 @@ import { ChangeSource } from 'roosterjs-editor-types'; import { ContentModelDocument } from '../../../lib/publicTypes/group/ContentModelDocument'; import { formatWithContentModel } from '../../../lib/publicApi/utils/formatWithContentModel'; -import { IExperimentalContentModelEditor } from '../../../lib/publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../../lib/publicTypes/IContentModelEditor'; describe('formatWithContentModel', () => { - let editor: IExperimentalContentModelEditor; + let editor: IContentModelEditor; let addUndoSnapshot: jasmine.Spy; let createContentModel: jasmine.Spy; let setContentModel: jasmine.Spy; @@ -26,7 +26,7 @@ describe('formatWithContentModel', () => { addUndoSnapshot, createContentModel, setContentModel, - } as any) as IExperimentalContentModelEditor; + } as any) as IContentModelEditor; }); it('Callback return false', () => { diff --git a/packages/roosterjs-content-model/test/publicPlugin/ContentModelPluginTest.ts b/packages/roosterjs-content-model/test/publicPlugin/ContentModelPluginTest.ts index 72b7ad473f9..f4855c6092c 100644 --- a/packages/roosterjs-content-model/test/publicPlugin/ContentModelPluginTest.ts +++ b/packages/roosterjs-content-model/test/publicPlugin/ContentModelPluginTest.ts @@ -4,7 +4,7 @@ import { addSegment } from '../../lib/modelApi/common/addSegment'; import { createContentModelDocument } from '../../lib/modelApi/creators/createContentModelDocument'; import { createSelectionMarker } from '../../lib/modelApi/creators/createSelectionMarker'; import { createText } from '../../lib/modelApi/creators/createText'; -import { IExperimentalContentModelEditor } from '../../lib/publicTypes/IExperimentalContentModelEditor'; +import { IContentModelEditor } from '../../lib/publicTypes/IContentModelEditor'; import { PluginEventType } from 'roosterjs-editor-types'; describe('ContentModelPlugin', () => { @@ -12,7 +12,7 @@ describe('ContentModelPlugin', () => { spyOn(pendingFormat, 'setPendingFormat'); spyOn(pendingFormat, 'getPendingFormat').and.returnValue(null); - const editor = ({} as any) as IExperimentalContentModelEditor; + const editor = ({} as any) as IContentModelEditor; const plugin = new ContentModelPlugin(); plugin.initialize(editor); @@ -39,7 +39,7 @@ describe('ContentModelPlugin', () => { createContentModel: () => model, setContentModel, isInIME: () => false, - } as any) as IExperimentalContentModelEditor; + } as any) as IContentModelEditor; const plugin = new ContentModelPlugin(); const model = createContentModelDocument(); @@ -71,7 +71,7 @@ describe('ContentModelPlugin', () => { const editor = ({ createContentModel: () => model, setContentModel, - } as any) as IExperimentalContentModelEditor; + } as any) as IContentModelEditor; const plugin = new ContentModelPlugin(); plugin.initialize(editor); @@ -101,7 +101,7 @@ describe('ContentModelPlugin', () => { createContentModel: () => model, setContentModel, isInIME: () => false, - } as any) as IExperimentalContentModelEditor; + } as any) as IContentModelEditor; const plugin = new ContentModelPlugin(); plugin.initialize(editor); @@ -134,7 +134,7 @@ describe('ContentModelPlugin', () => { createContentModel: () => model, setContentModel, isInIME: () => false, - } as any) as IExperimentalContentModelEditor; + } as any) as IContentModelEditor; const plugin = new ContentModelPlugin(); plugin.initialize(editor); @@ -193,7 +193,7 @@ describe('ContentModelPlugin', () => { const editor = ({ createContentModel: () => model, setContentModel, - } as any) as IExperimentalContentModelEditor; + } as any) as IContentModelEditor; const plugin = new ContentModelPlugin(); plugin.initialize(editor); @@ -247,7 +247,7 @@ describe('ContentModelPlugin', () => { const editor = ({ createContentModel: () => model, setContentModel, - } as any) as IExperimentalContentModelEditor; + } as any) as IContentModelEditor; const plugin = new ContentModelPlugin(); plugin.initialize(editor); @@ -273,7 +273,7 @@ describe('ContentModelPlugin', () => { const editor = ({ createContentModel: () => model, setContentModel, - } as any) as IExperimentalContentModelEditor; + } as any) as IContentModelEditor; const plugin = new ContentModelPlugin(); plugin.initialize(editor); @@ -300,7 +300,7 @@ describe('ContentModelPlugin', () => { const editor = ({ createContentModel: () => model, setContentModel, - } as any) as IExperimentalContentModelEditor; + } as any) as IContentModelEditor; const plugin = new ContentModelPlugin(); plugin.initialize(editor);