Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve performance/selection problems on Android + RN 0.57 fix #155

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Resolve performance/selection problems on Android + RN 0.57 fix #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73ba728
Update to use live fork (original) of webview bridge
Oct 22, 2018
fbb230f
Adhere to original linting rules
Oct 22, 2018
9ecdf13
Replace componentWillMount by DidMount
charpeni Jun 11, 2018
7704a0e
Fix getCaretYPosition
charpeni Jul 24, 2018
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
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"main": "index.js",
"license": "SEE LICENSE IN LICENSE",
"dependencies": {
"react-native-webview-bridge-updated": "^1.0.0"
"react-native-webview-bridge": "0.40.1"
},
"peerDependencies": {
"react": "*",
Expand Down
10 changes: 6 additions & 4 deletions src/RichTextEditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, {Component} from 'react';
import PropTypes from 'prop-types';
import WebViewBridge from 'react-native-webview-bridge-updated';
import WebViewBridge from 'react-native-webview-bridge';
import {InjectedMessageHandler} from './WebviewMessageHandler';
import {actions, messages} from './const';
import {Modal, View, Text, StyleSheet, TextInput, TouchableOpacity, Platform, PixelRatio, Keyboard, Dimensions} from 'react-native';
Expand Down Expand Up @@ -51,7 +51,7 @@ export default class RichTextEditor extends Component {
this._selectedTextChangeListeners = [];
}

componentWillMount() {
componentDidMount() {
if(PlatformIOS) {
this.keyboardEventListeners = [
Keyboard.addListener('keyboardWillShow', this._onKeyboardWillShow),
Expand All @@ -66,7 +66,9 @@ export default class RichTextEditor extends Component {
}

componentWillUnmount() {
this.keyboardEventListeners.forEach((eventListener) => eventListener.remove());
if (this.keyboardEventListeners) {
this.keyboardEventListeners.forEach((eventListener) => eventListener.remove());
}
}

_onKeyboardWillShow(event) {
Expand Down Expand Up @@ -654,4 +656,4 @@ const styles = StyleSheet.create({
marginRight: -20,
marginTop: 20
}
});
});
52 changes: 42 additions & 10 deletions src/editor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -778,6 +778,30 @@
return multi_parser.output.join('');
}

function getMirrorInfo(element) {
if (element.mirrorInfo) {
return element.mirrorInfo;
}

var div = document.createElement('div');
var style = div.style;
var hidden = 'hidden';
var focusOut = 'focusout';
style.whiteSpace = 'pre-wrap';
style.wordWrap = 'break-word';
style.position = 'absolute';
style.visibility = hidden;
style.overflow = hidden;
document.body.appendChild(div);
element.mirrorInfo = { div: div, span: document.createElement('span') };
element.addEventListener(focusOut, function cleanup() {
delete element.mirrorInfo;
document.body.removeChild(div);
element.removeEventListener(focusOut, cleanup);
});
return element.mirrorInfo;
}

/*!
*
* ZSSRichTextEditor v0.5.2
Expand Down Expand Up @@ -1025,16 +1049,24 @@
}

zss_editor.getCaretYPosition = function() {
var sel = window.getSelection();
// Next line is comented to prevent deselecting selection. It looks like work but if there are any issues will appear then uconmment it as well as code above.
//sel.collapseToStart();
var range = sel.getRangeAt(0);
var span = document.createElement('span');// something happening here preventing selection of elements
range.collapse(false);
range.insertNode(span);
var topPosition = span.offsetTop;
span.parentNode.removeChild(span);
return topPosition;
var selection = window.getSelection();
var range = selection.getRangeAt(0);
var container = range.endContainer;
var selectedNode = container.nodeType === 3 ? container.parentNode : container;
var position = selectedNode.selectionEnd;
var _a = getMirrorInfo(selectedNode);
var div = _a.div;
var span = _a.span;
var content = selectedNode.textContent.substring(0, position);

div.textContent = content;
span.textContent = (selectedNode.textContent.substring(position)) || '.';
div.appendChild(span);

var rect = selectedNode.getBoundingClientRect();
var top = span.offsetTop - selectedNode.scrollTop + rect.top;

return top;
}

zss_editor.calculateEditorHeightWithCaretPosition = function() {
Expand Down