Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Graduate feature ContentModelPaste #2102

Merged
merged 2 commits into from
Sep 26, 2023
Merged

Graduate feature ContentModelPaste #2102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1a5e290
Graduate feature ContentModelPaste
JiuqingSong Sep 26, 2023
37846d7
Merge branch 'master' into u/jisong/copypaste
JiuqingSong Sep 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions demo/scripts/controls/sidePane/editorOptions/ContentModelEditorOptionsPlugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,7 @@ const initialState: BuildInPluginState = {
linkTitle: 'Ctrl+Click to follow the link:' + UrlPlaceholder,
watermarkText: 'Type content here ...',
forcePreserveRatio: false,
experimentalFeatures: [
ExperimentalFeatures.ContentModelPaste,
ExperimentalFeatures.ReusableContentModelV2,
],
experimentalFeatures: [ExperimentalFeatures.ReusableContentModelV2],
isRtl: false,
tableFeaturesContainerSelector: '#' + 'EditorContainer',
};
Expand Down
1 change: 0 additions & 1 deletion demo/scripts/controls/sidePane/editorOptions/ContentModelExperimentalFeatures.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const FeatureNames: Partial<Record<ExperimentalFeatures, string>> = {
"Reuse ancestor list elements even if they don't match the types from the list item.",
[ExperimentalFeatures.DeleteTableWithBackspace]:
'Delete a table selected with the table selector pressing Backspace key',
[ExperimentalFeatures.ContentModelPaste]: 'Paste with content model',
[ExperimentalFeatures.DisableListChain]: 'Disable list chain functionality',
[ExperimentalFeatures.ReusableContentModelV2]:
'Reuse existing DOM structure if possible, and update the model when content or selection is changed',
Expand Down
9 changes: 2 additions & 7 deletions ...s-content-model/roosterjs-content-model-editor/lib/editor/createContentModelEditorCore.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,8 @@ export const createContentModelEditorCore: CoreCreator<
],
corePluginOverride: {
typeInContainer: new ContentModelTypeInContainerPlugin(),
copyPaste: isFeatureEnabled(
options.experimentalFeatures,
ExperimentalFeatures.ContentModelPaste
)
? new ContentModelCopyPastePlugin(pluginState.copyPaste)
: undefined,
...(options.corePluginOverride || {}),
copyPaste: new ContentModelCopyPastePlugin(pluginState.copyPaste),
...options.corePluginOverride,
},
};

Expand Down
2 changes: 0 additions & 2 deletions ...s-content-model/roosterjs-content-model-editor/test/editor/plugins/paste/e2e/testUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import ContentModelEditor from '../../../../../lib/editor/ContentModelEditor';
import ContentModelPastePlugin from '../../../../../lib/editor/plugins/PastePlugin/ContentModelPastePlugin';
import { cloneModel } from '../../../../../lib/modelApi/common/cloneModel';
import { ContentModelDocument } from 'roosterjs-content-model-types';
import { ExperimentalFeatures } from 'roosterjs-editor-types';
import {
ContentModelEditorOptions,
IContentModelEditor,
Expand All @@ -15,7 +14,6 @@ export function initEditor(id: string) {

let options: ContentModelEditorOptions = {
plugins: [new ContentModelPastePlugin()],
experimentalFeatures: [ExperimentalFeatures.ContentModelPaste],
};

let editor = new ContentModelEditor(node as HTMLDivElement, options);
Expand Down
11 changes: 6 additions & 5 deletions packages/roosterjs-editor-types/lib/enum/ExperimentalFeatures.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,12 @@ export const enum ExperimentalFeatures {
*/
InlineEntityReadOnlyDelimiters = 'InlineEntityReadOnlyDelimiters',

/**
* @deprecated This feature is always enabled
* Paste with Content model
*/
ContentModelPaste = 'ContentModelPaste',

//#endregion

/**
Expand All @@ -168,11 +174,6 @@ export const enum ExperimentalFeatures {
*/
DeleteTableWithBackspace = 'DeleteTableWithBackspace',

/**
* Paste with Content model
*/
ContentModelPaste = 'ContentModelPaste',

/**
* Disable list chain functionality
*/
Expand Down