Merge pull request #306 from FrancisMengx/change-getTextContent

Add getTextContent
microsoft · Jun 6, 2019 · 1a667bf · 1a667bf
2 parents 5834321 + 90628f9
commit 1a667bf
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 9 deletions.
diff --git a/packages/roosterjs-editor-core/lib/editor/Editor.ts b/packages/roosterjs-editor-core/lib/editor/Editor.ts
@@ -29,6 +29,7 @@ import {
     findClosestElementAncestor,
     fromHtml,
     getBlockElementAtNode,
+    getTextContent,
     getInlineElementAtNode,
     getPositionRect,
     getRangeFromSelectionPath,
@@ -104,10 +105,10 @@ export default class Editor {
             if (Browser.isFirefox) {
                 this.core.document.execCommand(DocumentCommand.EnableObjectResizing, false, <
                     string
-                >(<any>false));
+                    >(<any>false));
                 this.core.document.execCommand(DocumentCommand.EnableInlineTableEditing, false, <
                     string
-                >(<any>false));
+                    >(<any>false));
             } else if (Browser.isIE) {
                 // Change the default paragraph separater to DIV. This is mainly for IE since its default setting is P
                 this.core.document.execCommand(
@@ -116,7 +117,7 @@ export default class Editor {
                     'div'
                 );
             }
-        } catch (e) {}
+        } catch (e) { }
 
         // 9. Let plugins know that we are ready
         this.triggerEvent(
@@ -385,7 +386,7 @@ export default class Editor {
      * @returns The text content inside editor
      */
     public getTextContent(): string {
-        return this.core.contentDiv.innerText;
+        return getTextContent(this.core.contentDiv);
     }
 
     /**
@@ -406,7 +407,7 @@ export default class Editor {
                     this.deleteNode(pathComment);
                     let range = getRangeFromSelectionPath(contentDiv, path);
                     this.select(range);
-                } catch {}
+                } catch { }
             }
 
             if (triggerContentChangedEvent) {
@@ -621,8 +622,8 @@ export default class Editor {
         nameOrMap:
             | string
             | {
-                  [eventName: string]: (event: UIEvent) => void;
-              },
+                [eventName: string]: (event: UIEvent) => void;
+            },
         handler?: (event: UIEvent) => void
     ): () => void {
         if (nameOrMap instanceof Object) {

diff --git a/packages/roosterjs-editor-dom/lib/blockElements/NodeBlockElement.ts b/packages/roosterjs-editor-dom/lib/blockElements/NodeBlockElement.ts
@@ -7,7 +7,7 @@ import { BlockElement } from 'roosterjs-editor-types';
  * In most cases, it corresponds to an HTML block level element, i.e. P, DIV, LI, TD etc.
  */
 export default class NodeBlockElement implements BlockElement {
-    constructor(private element: HTMLElement) {}
+    constructor(private element: HTMLElement) { }
 
     /**
      * Collapse this element to a single DOM element.
@@ -56,4 +56,11 @@ export default class NodeBlockElement implements BlockElement {
     public contains(node: Node): boolean {
         return contains(this.element, node, true /*treatSameNodeAsContain*/);
     }
+
+    /**
+     * Get the text content of this block element
+     */
+    public getTextContent(): string {
+        return this.element.textContent;
+    }
 }
diff --git a/packages/roosterjs-editor-dom/lib/blockElements/StartEndBlockElement.ts b/packages/roosterjs-editor-dom/lib/blockElements/StartEndBlockElement.ts
@@ -6,6 +6,7 @@ import isNodeAfter from '../utils/isNodeAfter';
 import wrap from '../utils/wrap';
 import { BlockElement } from 'roosterjs-editor-types';
 import { splitBalancedNodeRange } from '../utils/splitParentNode';
+import createRange from '../selection/createRange';
 
 const STRUCTURE_NODE_TAGS = ['TD', 'TH', 'LI', 'BLOCKQUOTE'];
 
@@ -18,7 +19,7 @@ const STRUCTURE_NODE_TAGS = ['TD', 'TH', 'LI', 'BLOCKQUOTE'];
  * This start and end must be in same sibling level and have same parent in DOM tree
  */
 export default class StartEndBlockElement implements BlockElement {
-    constructor(private rootNode: Node, private startNode: Node, private endNode: Node) {}
+    constructor(private rootNode: Node, private startNode: Node, private endNode: Node) { }
 
     static getBlockContext(node: Node): HTMLElement {
         while (node && !isBlockElement(node)) {
@@ -94,4 +95,11 @@ export default class StartEndBlockElement implements BlockElement {
             (isNodeAfter(node, this.startNode) && isNodeAfter(this.endNode, node))
         );
     }
+
+    /**
+     * Get the text content of this block element
+     */
+    public getTextContent(): string {
+        return createRange(this.getStartNode(), this.getEndNode()).toString();
+    }
 }
diff --git a/packages/roosterjs-editor-dom/lib/index.ts b/packages/roosterjs-editor-dom/lib/index.ts
@@ -34,6 +34,7 @@ export { default as unwrap } from './utils/unwrap';
 export { default as wrap } from './utils/wrap';
 export { getNextLeafSibling, getPreviousLeafSibling } from './utils/getLeafSibling';
 export { getFirstLeafNode, getLastLeafNode } from './utils/getLeafNode';
+export { default as getTextContent } from './utils/getTextContent';
 
 export { default as VTable, VCell } from './table/VTable';
 

diff --git a/packages/roosterjs-editor-dom/lib/utils/getTextContent.ts b/packages/roosterjs-editor-dom/lib/utils/getTextContent.ts
@@ -0,0 +1,19 @@
+import ContentTraverser from '../contentTraverser/ContentTraverser';
+
+/**
+ * get block element's text content.
+ * @param rootNode Root node that the get the textContent of.
+ * @returns text content of given text content.
+ */
+export default function getTextContent(rootNode: Node): string {
+    const traverser = ContentTraverser.createBodyTraverser(rootNode);
+    let block = traverser && traverser.currentBlockElement;
+    let textContent: string[] = [];
+
+    while (block) {
+        textContent.push(block.getTextContent());
+        block = traverser.getNextBlockElement();
+    }
+
+    return textContent.join('\n');
+}
diff --git a/packages/roosterjs-editor-types/lib/interface/BlockElement.ts b/packages/roosterjs-editor-types/lib/interface/BlockElement.ts
@@ -34,4 +34,9 @@ export default interface BlockElement {
      * Check if the given node is within this block element
      */
     contains(node: Node): boolean;
+
+    /**
+     * Get the text content of this block element
+     */
+    getTextContent(): string;
 }