Fix confict after merge branch master

2020-10-13 11:58:28 +09:00
parent bd63a0131a ae17b99a0c
commit 57528851ff
166 changed files with 31383 additions and 382 deletions
@@ -2,8 +2,11 @@ import { DraggableEvent } from 'react-draggable';
 import { MouseEvent as ReactMouseEvent } from 'react';

 export const isInputDOMNode = (e: ReactMouseEvent | DraggableEvent | KeyboardEvent) => {
-  const target = e.target as HTMLElement;
-  return e && target && ['INPUT', 'SELECT', 'TEXTAREA', 'BUTTON'].includes(target.nodeName);
+  const target = e?.target as HTMLElement;
+
+  return (
+    ['INPUT', 'SELECT', 'TEXTAREA', 'BUTTON'].includes(target?.nodeName) || target?.hasAttribute('contenteditable')
+  );
 };

 export const getDimensions = (node: HTMLDivElement) => ({