Skip to content

Commit bbf6a43

Browse files
JiuqingSongjuliaroldiBryanValverdeUAndres-CT98ianeli1
authored
Bump version to 8.59.0 (#2203)
* margin in lists * remove code * type * refactor * fixes * remove parameter * refactor * remove file change * Use Content Model to handle Delete/Backspace key in more cases (#2162) * Do not set focus when quite shadow edit (#2163) * Fix #237217 (#2164) * Fix #237735 (#2165) * Fix #236416 (#2166) * wip * fixes * Fix #2160 (#2167) * Fix #2160 * fix build * test * remove test * remove test * remove test * Rearrange parameters of iterateSelections (#2180) * Rearrange parameters of iterateSelections * improve * Standalone editor step 0: Create a copy of Editor class (#2175) * Standalone editor step 0: Create a copy of Editor class * remove unnecessary change * improve * Fix #2061, apply pending format on Android (#2172) * Fix #2061 * Fix for Android * Fix #2080 (#2173) * Standalone editor Step 0.5: Create test page for adapter editor (#2176) * Standalone editor step 0: Create a copy of Editor class * Standalone editor Step 0.5: Create test page for adapter editor * Add Content Model functionality to AdapterEditor * remove unnecessary change * remove unnecessary change * improve * toggleListType * type * Fix Mouseout behavior to hide table editors (#2181) * init * init * fix build * Add comment * Fix apply Table Inside borders operation and Demo site (#2184) * fix cases * fix demo * Add image size checkmarks to context menu (#2168) * Allow a max error un percentage size check * Allow a checkmark to be shown in ctx menu * Add checkmark to image sizes * Add missing type * Fix types * Add comment * Attempt to fix image selection * Revert unneeded changes in image selection * Use attr as backup in resize calc * Rely entirely on image selection * Revert changes to domeventplugin * Copy changes into content model adapter * Revert previous standalone editor change (#2189) * Revert previous standalone change * fix build * Move formatWithContentModel to be a core API (#2185) * Content Model: Allow clear cache from formatContentModel (#2186) * Move formatWithContentModel to be a core API * Content Model: Allow clear cache from formatContentModel * Content Model: Potential perf improvement in getFormatState (#2187) * Content Model: Move pending format into editor core (#2188) * Move formatWithContentModel to be a core API * Content Model: Allow clear cache from formatContentModel * Content Model: Move pending format into editor core * Convert DeleteResult from const enum to string literal type (#2191) * Move paste plugin to roosterjs-content-model-plugins package (#2192) * image selection plugin * check image parent node * Adding module entry to package.json (#2197) * Move ContentModelEdit plugin to plugins package (#2195) * Move ContentModelEdit plugin to plugins package * improve --------- Co-authored-by: Bryan Valverde U <bvalverde@microsoft.com> * Move type files to roosterjs-content-model-types package (#2196) * Move ContentModelEdit plugin to plugins package * Move types to roosterjs-content-model-types package * improve * Improve * improve * Improve * improve * fix build * fix build * Move core API to roosterjs-content-model-core package (#2198) * Move ContentModelEdit plugin to plugins package * Move types to roosterjs-content-model-types package * improve * Improve * improve * Improve * improve * Move core API to core package * fix build * improve * fix build * fix build * Move corePlugins to roosterjs-content-model-core package (#2199) * Move ContentModelEdit plugin to plugins package * Move types to roosterjs-content-model-types package * improve * Improve * improve * Improve * improve * Move core API to core package * fix build * improve * Move corePlugins to roosterjs-content-model-core package * fix build * improve * fix build * fix build * Move format API to roosterjs-content-model-api package (#2200) * Move ContentModelEdit plugin to plugins package * Move types to roosterjs-content-model-types package * improve * Improve * improve * Improve * improve * Move core API to core package * fix build * improve * Move corePlugins to roosterjs-content-model-core package * fix build * improve * fix build * Move format API to roosterjs-content-model-api package * fix build * Improve --------- Co-authored-by: Júlia Roldi <juliaroldi@microsoft.com> Co-authored-by: Julia Roldi <87443959+juliaroldi@users.noreply.github.com> Co-authored-by: Bryan Valverde U <bvalverde@microsoft.com> Co-authored-by: Andres-CT98 <107568016+Andres-CT98@users.noreply.github.com> Co-authored-by: Ian Elizondo <ianeli@microsoft.com> Co-authored-by: Keven Arroyo <dake.3601@gmail.com>
1 parent 8a4f529 commit bbf6a43

File tree

457 files changed

+8591
-6939
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

457 files changed

+8591
-6939
lines changed

‎demo/scripts/controls/ContentModelEditorMainPane.tsx‎

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,11 @@ import SnapshotPlugin from './sidePane/snapshot/SnapshotPlugin';
1515
import TitleBar from './titleBar/TitleBar';
1616
import { arrayPush } from 'roosterjs-editor-dom';
1717
import { ContentModelEditor } from 'roosterjs-content-model-editor';
18+
import { ContentModelEditPlugin } from 'roosterjs-content-model-plugins';
1819
import { ContentModelRibbonPlugin } from './ribbonButtons/contentModel/ContentModelRibbonPlugin';
20+
import { createEmojiPlugin, createPasteOptionPlugin, RibbonPlugin } from 'roosterjs-react';
1921
import { EditorOptions, EditorPlugin } from 'roosterjs-editor-types';
2022
import { PartialTheme } from '@fluentui/react/lib/Theme';
21-
import {
22-
createRibbonPlugin,
23-
RibbonPlugin,
24-
createPasteOptionPlugin,
25-
createEmojiPlugin,
26-
} from 'roosterjs-react';
2723

2824
const styles = require('./ContentModelEditorMainPane.scss');
2925

@@ -86,8 +82,8 @@ class ContentModelEditorMainPane extends MainPaneBase {
8682
private editorOptionPlugin: ContentModelEditorOptionsPlugin;
8783
private eventViewPlugin: ContentModelEventViewPlugin;
8884
private apiPlaygroundPlugin: ApiPlaygroundPlugin;
89-
private ContentModelPanePlugin: ContentModelPanePlugin;
90-
private ribbonPlugin: RibbonPlugin;
85+
private contentModelPanePlugin: ContentModelPanePlugin;
86+
private contentModelEditPlugin: ContentModelEditPlugin;
9187
private contentModelRibbonPlugin: RibbonPlugin;
9288
private pasteOptionPlugin: EditorPlugin;
9389
private emojiPlugin: EditorPlugin;
@@ -103,8 +99,8 @@ class ContentModelEditorMainPane extends MainPaneBase {
10399
this.eventViewPlugin = new ContentModelEventViewPlugin();
104100
this.apiPlaygroundPlugin = new ApiPlaygroundPlugin();
105101
this.snapshotPlugin = new SnapshotPlugin();
106-
this.ContentModelPanePlugin = new ContentModelPanePlugin();
107-
this.ribbonPlugin = createRibbonPlugin();
102+
this.contentModelPanePlugin = new ContentModelPanePlugin();
103+
this.contentModelEditPlugin = new ContentModelEditPlugin();
108104
this.contentModelRibbonPlugin = new ContentModelRibbonPlugin();
109105
this.pasteOptionPlugin = createPasteOptionPlugin();
110106
this.emojiPlugin = createEmojiPlugin();
@@ -131,7 +127,7 @@ class ContentModelEditorMainPane extends MainPaneBase {
131127
}
132128

133129
renderTitleBar() {
134-
return <TitleBar className={styles.noGrow} isContentModelPane={true} />;
130+
return <TitleBar className={styles.noGrow} mode="contentModel" />;
135131
}
136132

137133
renderRibbon(isPopout: boolean) {
@@ -165,9 +161,9 @@ class ContentModelEditorMainPane extends MainPaneBase {
165161

166162
const plugins = [
167163
...this.toggleablePlugins,
168-
this.ribbonPlugin,
169164
this.contentModelRibbonPlugin,
170-
this.ContentModelPanePlugin.getInnerRibbonPlugin(),
165+
this.contentModelPanePlugin.getInnerRibbonPlugin(),
166+
this.contentModelEditPlugin,
171167
this.pasteOptionPlugin,
172168
this.emojiPlugin,
173169
this.formatPainterPlugin,
@@ -205,7 +201,7 @@ class ContentModelEditorMainPane extends MainPaneBase {
205201
this.eventViewPlugin,
206202
this.apiPlaygroundPlugin,
207203
this.snapshotPlugin,
208-
this.ContentModelPanePlugin,
204+
this.contentModelPanePlugin,
209205
];
210206
}
211207
}

‎demo/scripts/controls/MainPane.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ class MainPane extends MainPaneBase {
143143
}
144144

145145
renderTitleBar() {
146-
return <TitleBar className={styles.noGrow} isContentModelPane={false} />;
146+
return <TitleBar className={styles.noGrow} mode="classical" />;
147147
}
148148

149149
renderRibbon(isPopout: boolean) {

‎demo/scripts/controls/MainPaneBase.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import * as ReactDOM from 'react-dom';
33
import BuildInPluginState from './BuildInPluginState';
44
import SidePane from './sidePane/SidePane';
55
import SnapshotPlugin from './sidePane/snapshot/SnapshotPlugin';
6-
import { Border } from 'roosterjs-content-model-editor';
6+
import { Border } from 'roosterjs-content-model-types';
77
import { EditorOptions, EditorPlugin, IEditor } from 'roosterjs-editor-types';
88
import { getDarkColor } from 'roosterjs-color-utils';
99
import { PartialTheme, ThemeProvider } from '@fluentui/react/lib/Theme';

‎demo/scripts/controls/contentModel/components/format/formatPart/BorderFormatRenderers.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import { BorderFormat } from 'roosterjs-content-model-types';
2+
import { combineBorderValue, extractBorderValues } from 'roosterjs-content-model-core';
13
import { createDropDownFormatRenderer } from '../utils/createDropDownFormatRenderer';
24
import { createTextFormatRenderer } from '../utils/createTextFormatRenderer';
35
import { FormatRenderer } from '../utils/FormatRenderer';
4-
import { BorderFormat } from 'roosterjs-content-model-types';
5-
import { combineBorderValue, extractBorderValues } from 'roosterjs-content-model-editor';
66

77
type BorderStyle =
88
| 'dashed'

‎demo/scripts/controls/contentModel/components/model/ContentModelDocumentView.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import * as React from 'react';
22
import { BlockGroupContentView } from './BlockGroupContentView';
33
import { ContentModelDocument } from 'roosterjs-content-model-types';
44
import { ContentModelView } from '../ContentModelView';
5-
import { hasSelectionInBlockGroup } from 'roosterjs-content-model-editor';
5+
import { hasSelectionInBlockGroup } from 'roosterjs-content-model-api';
66

77
const styles = require('./ContentModelDocumentView.scss');
88

‎demo/scripts/controls/contentModel/components/model/ContentModelFormatContainerView.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { ContentModelView } from '../ContentModelView';
55
import { DisplayFormatRenderer } from '../format/formatPart/DisplayFormatRenderer';
66
import { FormatRenderer } from '../format/utils/FormatRenderer';
77
import { FormatView } from '../format/FormatView';
8-
import { hasSelectionInBlock } from 'roosterjs-content-model-editor';
8+
import { hasSelectionInBlock } from 'roosterjs-content-model-api';
99
import { SegmentFormatView } from '../format/SegmentFormatView';
1010
import { SizeFormatRenderers } from '../format/formatPart/SizeFormatRenderers';
1111
import {

‎demo/scripts/controls/contentModel/components/model/ContentModelGeneralView.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { BlockGroupContentView } from './BlockGroupContentView';
33
import { ContentModelCodeView } from './ContentModelCodeView';
44
import { ContentModelLinkView } from './ContentModelLinkView';
55
import { ContentModelView } from '../ContentModelView';
6-
import { hasSelectionInBlock } from 'roosterjs-content-model-editor';
6+
import { hasSelectionInBlock } from 'roosterjs-content-model-api';
77
import { SegmentFormatView } from '../format/SegmentFormatView';
88
import {
99
ContentModelGeneralBlock,

‎demo/scripts/controls/contentModel/components/model/ContentModelImageView.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { MetadataView } from '../format/MetadataView';
1313
import { PaddingFormatRenderer } from '../format/formatPart/PaddingFormatRenderer';
1414
import { SegmentFormatView } from '../format/SegmentFormatView';
1515
import { SizeFormatRenderers } from '../format/formatPart/SizeFormatRenderers';
16-
import { updateImageMetadata } from 'roosterjs-content-model-editor';
16+
import { updateImageMetadata } from 'roosterjs-content-model-core';
1717
import { useProperty } from '../../hooks/useProperty';
1818

1919
const styles = require('./ContentModelImageView.scss');

‎demo/scripts/controls/contentModel/components/model/ContentModelListItemView.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { FontFamilyFormatRenderer } from '../format/formatPart/FontFamilyFormatR
77
import { FontSizeFormatRenderer } from '../format/formatPart/FontSizeFormatRenderer';
88
import { FormatRenderer } from '../format/utils/FormatRenderer';
99
import { FormatView } from '../format/FormatView';
10-
import { hasSelectionInBlockGroup } from 'roosterjs-content-model-editor';
10+
import { hasSelectionInBlockGroup } from 'roosterjs-content-model-api';
1111
import { LineHeightFormatRenderer } from '../format/formatPart/LineHeightFormatRenderer';
1212
import { MarginFormatRenderer } from '../format/formatPart/MarginFormatRenderer';
1313
import { TextAlignFormatRenderer } from '../format/formatPart/TextAlignFormatRenderer';

‎demo/scripts/controls/contentModel/components/model/ContentModelListLevelView.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import { MarginFormatRenderer } from '../format/formatPart/MarginFormatRenderer'
1010
import { MetadataView } from '../format/MetadataView';
1111
import { PaddingFormatRenderer } from '../format/formatPart/PaddingFormatRenderer';
1212
import { TextAlignFormatRenderer } from '../format/formatPart/TextAlignFormatRenderer';
13-
import { updateListMetadata } from 'roosterjs-content-model-editor';
13+
import { updateListMetadata } from 'roosterjs-content-model-core';
1414
import { useProperty } from '../../hooks/useProperty';
1515
import {
1616
ContentModelListItemLevelFormat,

0 commit comments

Comments
 (0)