Merge branch 'master' into u/jisong/darkcolorimprovement

Author: JiuqingSong

karma.fast.conf.js

@@ -1,5 +1,7 @@
 const argv = require('minimist')(process.argv.slice(2));
 const components = argv.components !== true && argv.components;
+const testPathPattern = argv.testPathPattern !== true && argv.testPathPattern;
+const testNamePattern = argv.testNamePattern !== true && argv.testNamePattern;
 const runCoverage = typeof argv.coverage !== 'undefined';
 const runFirefox = typeof argv.firefox !== 'undefined';
 const runChrome = typeof argv.chrome !== 'undefined';
@@ -69,8 +71,13 @@ module.exports = function (config) {
         plugins,
         client: {
             components: components,
+            testPathPattern: testPathPattern,
+            testNamePattern: testNamePattern,
             clearContext: false,
             captureConsole: true,
+            jasmine: {
+                grep: testNamePattern || null,
+            },
         },
         browsers: launcher,
         files: ['tools/karma.test.all.js'],

package.json

@@ -83,7 +83,7 @@
         "typedoc-plugin-remove-references": "0.0.5",
         "typescript": "4.4.4",
         "url-loader": "4.1.0",
-        "webpack": "5.94.0",
+        "webpack": "5.104.1",
         "webpack-cli": "3.3.11",
         "webpack-dev-server": "3.10.3"
     },

packages/roosterjs-content-model-api/lib/modelApi/table/tableContent.ts

@@ -0,0 +1,87 @@
+import {
+    createTableCell,
+    createTableRow,
+    trimModelForSelection,
+} from 'roosterjs-content-model-dom';
+import type {
+    ContentModelBlock,
+    ContentModelTable,
+    ContentModelTableCellFormat,
+    IEditor,
+    ReadonlyContentModelTable,
+} from 'roosterjs-content-model-types';
+
+/**
+ * @internal
+ */
+export function getSelectedContentForTable(editor: IEditor): ContentModelBlock[][] {
+    const selectedRows: ContentModelBlock[][] = [];
+    const selection = editor.getDOMSelection();
+    if (selection && (selection?.type !== 'range' || !selection.range.collapsed)) {
+        const selectedModel = editor.getContentModelCopy('disconnected');
+        trimModelForSelection(selectedModel, selection);
+
+        for (const block of selectedModel.blocks) {
+            if (block.blockType === 'Table') {
+                extractTableCellsContent(block, selectedRows);
+            } else {
+                selectedRows.push([block as ContentModelBlock]);
+            }
+        }
+    }
+
+    return selectedRows;
+}
+
+function extractTableCellsContent(
+    table: ReadonlyContentModelTable,
+    selectedRows: ContentModelBlock[][]
+) {
+    for (const row of table.rows) {
+        const rowBlocks: ContentModelBlock[] = [];
+        for (const cell of row.cells) {
+            if (!cell.spanLeft && !cell.spanAbove) {
+                rowBlocks.push(...(cell.blocks as ContentModelBlock[]));
+            }
+        }
+        if (rowBlocks.length > 0) {
+            selectedRows.push(rowBlocks);
+        }
+    }
+}
+
+/**
+ * @internal
+ */
+export function insertTableContent(
+    table: ContentModelTable,
+    contentRows: ContentModelBlock[][],
+    colNumber: number,
+    customCellFormat?: ContentModelTableCellFormat
+) {
+    let rowIndex = 0;
+    for (const rowBlocks of contentRows) {
+        if (!table.rows[rowIndex]) {
+            const row = createTableRow();
+            for (let i = 0; i < colNumber; i++) {
+                const cell = createTableCell(
+                    undefined /*spanLeftOrColSpan */,
+                    undefined /*spanAboveOrRowSpan */,
+                    undefined /* isHeader */,
+                    customCellFormat
+                );
+                row.cells.push(cell);
+            }
+            table.rows.push(row);
+        }
+
+        let cellIndex = 0;
+        for (const block of rowBlocks) {
+            if (cellIndex < table.rows[rowIndex].cells.length) {
+                table.rows[rowIndex].cells[cellIndex].blocks = [block];
+            }
+            cellIndex++;
+        }
+        rowIndex++;
+    }
+}

packages/roosterjs-content-model-api/lib/publicApi/table/insertTable.ts

@@ -1,5 +1,6 @@
 import { adjustTableIndentation } from '../../modelApi/common/adjustIndentation';
 import { createTableStructure } from '../../modelApi/table/createTableStructure';
+import { getSelectedContentForTable, insertTableContent } from '../../modelApi/table/tableContent';
 import {
     createContentModelDocument,
     createSelectionMarker,
@@ -38,25 +39,33 @@ export function insertTable(
 ) {
     editor.focus();
 
+    const blocks = getSelectedContentForTable(editor);
+
     editor.formatContentModel(
         (model, context) => {
-            const insertPosition = deleteSelection(model, [], context).insertPoint;
+            const deleteSelectionResult = deleteSelection(model, [], context);
+            const insertPosition = deleteSelectionResult.insertPoint;
 
             if (insertPosition) {
                 const doc = createContentModelDocument();
+
                 const table = createTableStructure(doc, columns, rows, customCellFormat);
+
                 if (format) {
                     table.format = { ...format };
                 }
 
                 normalizeTable(table, editor.getPendingFormat() || insertPosition.marker.format);
                 initCellWidth(table);
 
+                insertTableContent(table, blocks, columns, customCellFormat);
+
                 adjustTableIndentation(insertPosition, table);
 
                 // Assign default vertical align
                 tableMetadataFormat = tableMetadataFormat || { verticalAlign: 'top' };
                 applyTableFormat(table, tableMetadataFormat);
+
                 mergeModel(model, doc, context, {
                     insertPosition,
                     mergeFormat: 'mergeAll',