easy-richtextarea 4.0.31 → 4.0.33

package/src/richTextarea.js

@@ -12,10 +12,9 @@ import transformSelection from "./transform/selection";
 import generateOperations from "./operations/generate";
 
 import { TEXT, EMPTY_STRING } from "./constants";
-import { F_KEY_CODE, Z_KEY_CODE } from "./keyCodes";
+import { Z_KEY_CODE } from "./keyCodes";
 import { CUT_EVENT_TYPE,
          COPY_EVENT_TYPE,
-         FIND_EVENT_TYPE,
          BLUR_EVENT_TYPE,
          PASTE_EVENT_TYPE,
          INPUT_EVENT_TYPE,
@@ -164,11 +163,6 @@ export default class RichTextarea extends Element {
       case Z_KEY_CODE:
         preventDefault = this.zKeyDown(event, element);
 
-        break;
-
-      case F_KEY_CODE:
-        preventDefault = this.fKeyDown(event, element);
-
         break;
     }
 
@@ -338,22 +332,6 @@ export default class RichTextarea extends Element {
     }
   }
 
-  fKeyDown(event, element) {
-    let preventDefault = false;
-
-    const { ctrlKey, metaKey } = event;
-
-    if (ctrlKey || metaKey) {
-      const eventType = FIND_EVENT_TYPE;
-
-      this.callHandlers(eventType, event, element);
-
-      preventDefault = true;
-    }
-
-    return preventDefault;
-  }
-
   zKeyDown(event, element) {
     let preventDefault = false;
 
@@ -503,8 +481,7 @@ export default class RichTextarea extends Element {
   }
 
   didMount() {
-    const { onFind, onBlur, onFocus, onScroll, onChange } = this.properties,
-          findHandler = onFind, ///
+    const { onBlur, onFocus, onScroll, onChange } = this.properties,
           blurHandler = onBlur, ///
           focusHandler = onFocus, ///
           scrollHandler = onScroll, ///
@@ -512,8 +489,6 @@ export default class RichTextarea extends Element {
 
     this.updateInitialState();
 
-    findHandler && this.onFind(findHandler, this);
-
     blurHandler && this.onBlur(blurHandler, this);
 
     focusHandler && this.onFocus(focusHandler, this);
@@ -524,15 +499,12 @@ export default class RichTextarea extends Element {
   }
 
   willUnmount() {
-    const { onFind, onBlur, onFocus, onScroll, onChange } = this.properties,
-            findHandler = onFind, ///
+    const { onBlur, onFocus, onScroll, onChange } = this.properties,
             blurHandler = onBlur, ///
             focusHandler = onFocus, ///
             scrollHandler = onScroll, ///
             changeHandler = onChange; ///
 
-    findHandler && this.offFind(findHandler, this);
-
     blurHandler && this.offBlur(blurHandler, this);
 
     focusHandler && this.offFocus(focusHandler, this);
@@ -576,7 +548,6 @@ export default class RichTextarea extends Element {
   static tagName = "textarea";
 
   static ignoredProperties = [
-    "onFind",
     "onBlur",
     "onFocus",
     "onScroll",

package/src/selection.js

@@ -28,6 +28,22 @@ export default class Selection {
     return length;
   }
 
+  compareTo(selection) {
+    let result = 0;
+
+    const startPosition = selection.getStartPosition();
+
+    if (this.startPosition > startPosition) {
+      result = +1;
+    }
+
+    if (this.startPosition < startPosition) {
+      result = -1;
+    }
+
+    return result;
+  }
+
   isEqualTo(selection) {
     let equalTo = false;
 
@@ -43,6 +59,14 @@ export default class Selection {
     return equalTo;
   }
 
+  isOverlappedBy(selection) {
+    const startPosition = selection.getStartPosition(),
+          endPosition  = selection.getEndPosition(),
+          overlappedBy = ((startPosition <= this.endPosition) && (endPosition >= this.startPosition));
+
+    return overlappedBy;
+  }
+
   setStartPosition(startPosition) {
     this.startPosition = startPosition;
   }
@@ -90,20 +114,17 @@ export default class Selection {
     return transformedSelection;
   }
 
-  compareTo(selection) {
-    let result = 0;
+  mergedWith(selection) {
+    let startPosition = selection.getStartPosition(),
+        endPosition = selection.getEndPosition();
 
-    const startPosition = selection.getStartPosition();
+    startPosition = Math.min(startPosition, this.startPosition);  ///
 
-    if (this.startPosition > startPosition) {
-      result = +1;
-    }
+    endPosition = Math.max(endPosition, this.endPosition);  ///
 
-    if (this.startPosition < startPosition) {
-      result = -1;
-    }
+    selection = new Selection(startPosition, endPosition);  ///
 
-    return result;
+    return selection;
   }
 
   emptied() {