Skip to content

Fix hover source display on multi-line search results #240

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix hover source display on multi-line search results #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions static/rustw.out.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8043,7 +8043,7 @@ var FileResult = function (_React$Component2) {
app = _props2.app;

var self = this;
var divLines = lines.map(function (l) {
var divLines = lines.map(function (l, i) {
var lineId = 'snippet_line_number_' + kind + '_' + count + '_' + l.line_start;
var snippetId = 'snippet_line_' + kind + '_' + count + '_' + l.line_start;

Expand Down Expand Up @@ -8078,18 +8078,20 @@ var FileResult = function (_React$Component2) {
};

var onMouseOver = function onMouseOver(e) {
self.setState({ peekContext: { pre: l.pre_context, post: l.post_context } });
self.setState({ peekContext: { line: i, pre: l.pre_context, post: l.post_context } });
e.preventDefault();
e.stopPropagation();
};
var onMouseOut = function onMouseOut(e) {
self.setState({ peekContext: null });
if (self.state.peekContext.line == i) {
self.setState({ peekContext: null });
}
e.preventDefault();
e.stopPropagation();
};

var context = null;
if (_this3.state.peekContext) {
if (_this3.state.peekContext && _this3.state.peekContext.line == i) {
context = _react2.default.createElement(SearchContext, { line: l.line, preContext: _this3.state.peekContext.pre, postContext: _this3.state.peekContext.post });
}

Expand Down
2 changes: 1 addition & 1 deletion static/rustw.out.js.map
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 6 additions & 4 deletions static/search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class FileResult extends React.Component {
render() {
const { lines, file_name, kind, count, app } = this.props;
const self = this;
let divLines = lines.map((l) => {
let divLines = lines.map((l, i) => {
const lineId = `snippet_line_number_${kind}_${count}_${l.line_start}`;
const snippetId = `snippet_line_${kind}_${count}_${l.line_start}`;

Expand Down Expand Up @@ -81,18 +81,20 @@ class FileResult extends React.Component {
};

const onMouseOver = (e) => {
self.setState({ peekContext: { pre: l.pre_context, post: l.post_context }});
self.setState({ peekContext: { line: i, pre: l.pre_context, post: l.post_context } });
e.preventDefault();
e.stopPropagation();
}
const onMouseOut = (e) => {
self.setState({ peekContext: null });
if (self.state.peekContext.line == i) {
self.setState({ peekContext: null });
}
e.preventDefault();
e.stopPropagation();
}

let context = null;
if (this.state.peekContext) {
if (this.state.peekContext && this.state.peekContext.line == i) {
context = <SearchContext line={l.line} preContext={this.state.peekContext.pre} postContext={this.state.peekContext.post} />
}

Expand Down