Publish 8.37.0 with 4 changes (#1430)

* Fix a list color issue in dark mode (#1428) (#1429) * Fix a list color issue in dark mode * fix test * Add test * Improve shadow edit behavior when there is entity in editor (#1408) * Move mergeFragmentWithEntity to roosterjs * Shadow edit with entity * 8.37.0 * Merge pull request #1425 from microsoft/u/juliaroldi/auto-format-list-special-char Valid numbering * Merge pull request #1426 from microsoft/u/juliaroldi/previous-line-bug Fix cursor jump bug. Co-authored-by: Julia Roldi <[email protected]>
microsoft · Jun 16, 2023 · 292259e · 292259e
1 parent 027d4a7
commit 292259e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 601 deletions.
diff --git a/packages/roosterjs-content-model/lib/publicApi/mergeFragmentWithEntity.ts b/packages/roosterjs-content-model/lib/publicApi/mergeFragmentWithEntity.ts
diff --git a/packages/roosterjs-content-model/lib/publicApi/table/editTable.ts b/packages/roosterjs-content-model/lib/publicApi/table/editTable.ts
@@ -14,7 +14,6 @@ import { mergeTableCells } from '../../modelApi/table/mergeTableCells';
 import { mergeTableColumn } from '../../modelApi/table/mergeTableColumn';
 import { mergeTableRow } from '../../modelApi/table/mergeTableRow';
 import { normalizeTable } from '../../modelApi/table/normalizeTable';
-import { preprocessEntitiesFromContentModel } from '../mergeFragmentWithEntity';
 import { splitTableCellHorizontally } from '../../modelApi/table/splitTableCellHorizontally';
 import { splitTableCellVertically } from '../../modelApi/table/splitTableCellVertically';
 import { TableOperation } from 'roosterjs-editor-types';

diff --git a/packages/roosterjs-content-model/lib/publicApi/table/setTableCellShade.ts b/packages/roosterjs-content-model/lib/publicApi/table/setTableCellShade.ts
@@ -3,7 +3,6 @@ import { formatWithContentModel } from '../utils/formatWithContentModel';
 import { getFirstSelectedTable } from '../../modelApi/selection/collectSelections';
 import { IContentModelEditor } from '../../publicTypes/IContentModelEditor';
 import { normalizeTable } from '../../modelApi/table/normalizeTable';
-import { preprocessEntitiesFromContentModel } from '../mergeFragmentWithEntity';
 import { setTableCellBackgroundColor } from '../../modelApi/table/setTableCellBackgroundColor';
 
 /**

diff --git a/packages/roosterjs-content-model/lib/publicTypes/context/ModelToDomEntityContext.ts b/packages/roosterjs-content-model/lib/publicTypes/context/ModelToDomEntityContext.ts
@@ -1,21 +1,14 @@
 /**
- * Represent an object pair of Entity DOM node and placeholder comment node
+ * Represents context for entity
  */
-export interface EntityPlaceholderPair {
+export interface ModelToDomEntityContext {
     /**
-     * Wrapper element of element
+     * When set to true, directly put entity DOM nodes into the result DOM tree when doing Content Model to DOM conversion and do not use placeholder
      */
-    entityWrapper: HTMLElement;
+    doNotReuseEntityDom: boolean;
 
     /**
-     * Placeholder comment node
+     * Entities collected during DOM tree generation, used for reusing existing DOM structure of entities
      */
-    placeholder: Comment;
-}
-
-/**
- * Represents context for entity
- */
-export interface ModelToDomEntityContext {
-    entityPairs: EntityPlaceholderPair[];
+    entities: Record<string, HTMLElement>;
 }