Separate out isInEditor from isEditableInEditor #1027
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Update fork
* origin/master:
Merge upstream master
* ianstormtaylor/master: Clarifying insertTextByKey description (ianstormtaylor#778) Documenting node's 'getFirstText' & 'getLastText' (ianstormtaylor#779) 0.19.22 fix selection handling for changing tabs, and inside embedded inputs, closes ianstormtaylor#749 fix to restrict window blur/focus handling, closes ianstormtaylor#773 remove warn throwing since console.warn includes callsites now Update defining-custom-block-nodes.md (ianstormtaylor#776) 0.19.21 update table example to make scope clearer Fixed the link to comparisons, which was broken (ianstormtaylor#769) fix error when dragging void nodes without selection, closes ianstormtaylor#757 fix to depend on prop-types for react 15.5 fix to maintain focus on switching tabs, closes ianstormtaylor#756 update issue template Add "data-key" to root div for the whole document (ianstormtaylor#759) add an issue template
* ianstormtaylor/master: (21 commits) Fix json (ianstormtaylor#798) update readme 0.19.29 allow memoization without arguments for faster lookups (ianstormtaylor#796) 0.19.28 Add tests for plugins (ianstormtaylor#792) improve perf delaying conversion to immutable objects (ianstormtaylor#794) 0.19.27 fix schema normalizing to merge into history 0.19.26 `moveNode` operation fix (ianstormtaylor#782) fix large document example imports refactor examples, upgrade dependencies v0.19.25 fix void copying to attach to the right dom element 0.19.24 0.19.23 Add firstOnly prop to Placeholder (ianstormtaylor#765) rename issue template Copy void (ianstormtaylor#788) ...
* ianstormtaylor/master: (61 commits) 0.21.2 alphabetize package.json scripts Speed up getting blocks at a range Remove instanceOf checks to allow Slate objects to be identifiable across module instances (ianstormtaylor#930) Refactor render arrow functions (ianstormtaylor#969) update prosemirror description in readme update prosemirror description in docs update prosemirror comparison in readme 0.21.1 Fix for HTML pasting not working in IE (ianstormtaylor#882) Remove unneeded check. (ianstormtaylor#961) Upgrade react-frame-component. (ianstormtaylor#962) adding forced-layout-example (ianstormtaylor#954) Reckon with inconsistencies between parse5 and native DOMParser (ianstormtaylor#952) Omit version on gzip size badge (ianstormtaylor#947) update issue template and contributing docs add reboo editor to resources add showcase to resources 0.21.0 update changelog ...
* ianstormtaylor/master: (21 commits) 0.21.3 Add .babelrc into .npmignore (ianstormtaylor#1020) Add a missing dependency which was causing errors (ianstormtaylor#1017) Fixes ianstormtaylor#1010 — adds debuginfo to Contributing.md (ianstormtaylor#1011) Add State.characters to docs (ianstormtaylor#1006) Use parent node to find text node parent (ianstormtaylor#1004) IE11 compat (ianstormtaylor#996) Add .editorconfig and .gitattributes (ianstormtaylor#997) Improve documentation (ianstormtaylor#1000) Consistently use toLowerCase in tag name comparisons. (ianstormtaylor#1001) Custom wrapper component (ianstormtaylor#978) Add link to IME reference page in Contributing.md (ianstormtaylor#995) Don't break macOS emoji insert nor composition when fixing ianstormtaylor#938 (ianstormtaylor#994) When the `isInEditor` parameter is a text node use its parent only if the parent exists (ianstormtaylor#974) Document Raw serializer options (ianstormtaylor#993) tagName returns capitalized name now (ianstormtaylor#985) Fixes ianstormtaylor#938 chrome eating first line of text on space at beginning of line (ianstormtaylor#991) Fixes ianstormtaylor#817; fragment matcher regex (ianstormtaylor#992) Update ISSUE_TEMPLATE.md Update Contributing.md ...
There was a problem hiding this comment.
Hey @oyeanuj, sweet! Looks good. Have you tested it to be sure that the ones that are switching don't cause any issues?
src/components/content.js
Outdated
| * @param {Element} target | ||
| * @return {Boolean} | ||
| */ | ||
|
|
||
| isInEditor = (target) => { | ||
| const { element } = this | ||
| // COMPAT: Text nodes don't have `isContentEditable` property. So, when | ||
| // `target` is a text node use its parent node for check. | ||
| const el = target.nodeType === 3 ? target.parentNode : target |
There was a problem hiding this comment.
I think we no longer need this line (and comment) in the isInEditor function, judging by the comments text since it was only to allow for using el.isContentEditable.
|
@ianstormtaylor So, the only issue that is coming up in testing so far is the Embed example. Pasting into an input in the void node breaks unless I update the On the other hand, we can check for I'll keep testing a little bit more to ensure no breakage. |
Closed
|
Fixed by #3093. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hey @ianstormtaylor, as per your recommendation, here is the fix for #980.
The only deviation from that is that you had suggested replacing current usage of
isInEditortoisEditableInEditoreverywhere exceptonDrop. Looking at the code, it seems like the following methods should still check for onlyisInEditorsince these seem like valid operations on avoidnode.onCopyonCutonDragEndonDragOveronDragStartonPasteLet me know if you think otherwise.