Skip to content
This repository was archived by the owner on Feb 6, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/component/base/DraftEditor.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ class DraftEditor extends React.Component<DraftEditorProps, State> {
): void => {
const {editorState} = this.props;
const alreadyHasFocus = editorState.getSelection().getHasFocus();
const editorNode = ReactDOM.findDOMNode(this.editor);
const editorNode = this.editor;

if (!editorNode) {
// once in a while people call 'focus' in a setTimeout, and the node has
Expand Down Expand Up @@ -504,7 +504,7 @@ class DraftEditor extends React.Component<DraftEditorProps, State> {
};

blur: () => void = (): void => {
const editorNode = ReactDOM.findDOMNode(this.editor);
const editorNode = this.editor;
invariant(
editorNode instanceof HTMLElement,
'editorNode is not an HTMLElement',
Expand Down
12 changes: 10 additions & 2 deletions src/component/contents/DraftEditorBlock.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@ const isBlockOnSelectionEdge = (
* appropriate decorator and inline style components.
*/
class DraftEditorBlock extends React.Component<Props> {
_node: ?HTMLDivElement;

shouldComponentUpdate(nextProps: Props): boolean {
return (
this.props.block !== nextProps.block ||
Expand Down Expand Up @@ -100,7 +102,10 @@ class DraftEditorBlock extends React.Component<Props> {
return;
}

const blockNode = ReactDOM.findDOMNode(this);
const blockNode = this._node;
if (blockNode == null) {
return;
}
const scrollParent = Style.getScrollParent(blockNode);
const scrollPosition = getScrollPosition(scrollParent);
let scrollDelta;
Expand Down Expand Up @@ -227,7 +232,10 @@ class DraftEditorBlock extends React.Component<Props> {
});

return (
<div data-offset-key={offsetKey} className={className}>
<div
data-offset-key={offsetKey}
className={className}
ref={ref => (this._node = ref)}>
{this._renderChildren()}
</div>
);
Expand Down
10 changes: 3 additions & 7 deletions src/component/contents/DraftEditorLeaf.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import type SelectionState from 'SelectionState';

const DraftEditorTextNode = require('DraftEditorTextNode.react');
const React = require('React');
const ReactDOM = require('ReactDOM');

const invariant = require('invariant');
const setDraftEditorSelection = require('setDraftEditorSelection');
Expand Down Expand Up @@ -94,18 +93,15 @@ class DraftEditorLeaf extends React.Component<Props> {
// Determine the appropriate target node for selection. If the child
// is not a text node, it is a <br /> spacer. In this case, use the
// <span> itself as the selection target.
const node = ReactDOM.findDOMNode(this);
const node = this.leaf;
invariant(node, 'Missing node');
const child = node.firstChild;
invariant(child, 'Missing child');
let targetNode;

if (child.nodeType === Node.TEXT_NODE) {
targetNode = child;
/* $FlowFixMe(>=0.79.1 site=www) This comment suppresses an error found
* when Flow v0.79 was deployed. To see the error delete this comment and
* run Flow. */
} else if (child.tagName === 'BR') {
} else if (child instanceof Element && child.tagName === 'BR') {
targetNode = node;
} else {
targetNode = child.firstChild;
Expand All @@ -116,7 +112,7 @@ class DraftEditorLeaf extends React.Component<Props> {
}

shouldComponentUpdate(nextProps: Props): boolean {
const leafNode = ReactDOM.findDOMNode(this.leaf);
const leafNode = this.leaf;
invariant(leafNode, 'Missing leafNode');
const shouldUpdate =
leafNode.textContent !== nextProps.text ||
Expand Down
43 changes: 25 additions & 18 deletions src/component/contents/DraftEditorTextNode.react.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
'use strict';

const React = require('React');
const ReactDOM = require('ReactDOM');
const UserAgent = require('UserAgent');

const invariant = require('invariant');
Expand All @@ -39,21 +38,23 @@ function isNewline(node: Element): boolean {
* See http://jsfiddle.net/9khdavod/ for the failure case, and
* http://jsfiddle.net/7pg143f7/ for the fixed case.
*/
const NEWLINE_A = useNewlineChar ? (
<span key="A" data-text="true">
{'\n'}
</span>
) : (
<br key="A" data-text="true" />
);
const NEWLINE_A = ref =>
useNewlineChar ? (
<span key="A" data-text="true" ref={ref}>
{'\n'}
</span>
) : (
<br key="A" data-text="true" ref={ref} />
);

const NEWLINE_B = useNewlineChar ? (
<span key="B" data-text="true">
{'\n'}
</span>
) : (
<br key="B" data-text="true" />
);
const NEWLINE_B = ref =>
useNewlineChar ? (
<span key="B" data-text="true" ref={ref}>
{'\n'}
</span>
) : (
<br key="B" data-text="true" ref={ref} />
);

type Props = {
children: string,
Expand All @@ -68,6 +69,7 @@ type Props = {
*/
class DraftEditorTextNode extends React.Component<Props> {
_forceFlag: boolean;
_node: ?(HTMLSpanElement | HTMLBRElement);

constructor(props: Props) {
super(props);
Expand All @@ -77,7 +79,7 @@ class DraftEditorTextNode extends React.Component<Props> {
}

shouldComponentUpdate(nextProps: Props): boolean {
const node = ReactDOM.findDOMNode(this);
const node = this._node;
const shouldBeNewline = nextProps.children === '';
invariant(node instanceof Element, 'node is not an Element');
if (shouldBeNewline) {
Expand All @@ -96,10 +98,15 @@ class DraftEditorTextNode extends React.Component<Props> {

render(): React.Node {
if (this.props.children === '') {
return this._forceFlag ? NEWLINE_A : NEWLINE_B;
return this._forceFlag
? NEWLINE_A(ref => (this._node = ref))
: NEWLINE_B(ref => (this._node = ref));
}
return (
<span key={this._forceFlag ? 'A' : 'B'} data-text="true">
<span
key={this._forceFlag ? 'A' : 'B'}
data-text="true"
ref={ref => (this._node = ref)}>
{this.props.children}
</span>
);
Expand Down