mirror of
https://github.com/laurent22/joplin.git
synced 2024-12-24 10:27:10 +02:00
Clean up
This commit is contained in:
Laurent Cozic
parent
577d62e783
commit
5ad0b2eed9
1
ElectronClient/.gitignore
vendored
1
ElectronClient/.gitignore
vendored
@ -3,4 +3,5 @@ app/packageInfo.js
|
||||
dist/
|
||||
app/lib/
|
||||
app/gui/*.min.js
|
||||
app/plugins/*.min.js
|
||||
.DS_Store
|
||||
376
ElectronClient/app/plugins/GotoAnything.min.js
vendored
376
ElectronClient/app/plugins/GotoAnything.min.js
vendored
@ -1,376 +0,0 @@
|
||||
const React = require('react');
|
||||
const { connect } = require('react-redux');
|
||||
const { _ } = require('lib/locale.js');
|
||||
const { themeStyle } = require('../theme.js');
|
||||
const SearchEngine = require('lib/services/SearchEngine');
|
||||
const BaseModel = require('lib/BaseModel');
|
||||
const Tag = require('lib/models/Tag');
|
||||
const { ItemList } = require('../gui/ItemList.min');
|
||||
const { substrWithEllipsis, surroundKeywords } = require('lib/string-utils.js');
|
||||
|
||||
const PLUGIN_NAME = 'gotoAnything';
|
||||
const itemHeight = 60;
|
||||
|
||||
class GotoAnything {
|
||||
|
||||
onTrigger(event) {
|
||||
this.dispatch({
|
||||
type: 'PLUGIN_DIALOG_SET',
|
||||
open: true,
|
||||
pluginName: PLUGIN_NAME
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
class Dialog extends React.PureComponent {
|
||||
|
||||
constructor() {
|
||||
super();
|
||||
|
||||
this.state = {
|
||||
query: '',
|
||||
results: [],
|
||||
selectedItemId: null,
|
||||
keywords: [],
|
||||
listType: BaseModel.TYPE_NOTE,
|
||||
showHelp: false
|
||||
};
|
||||
|
||||
this.styles_ = {};
|
||||
|
||||
this.inputRef = React.createRef();
|
||||
this.itemListRef = React.createRef();
|
||||
|
||||
this.onKeyDown = this.onKeyDown.bind(this);
|
||||
this.input_onChange = this.input_onChange.bind(this);
|
||||
this.input_onKeyDown = this.input_onKeyDown.bind(this);
|
||||
this.listItemRenderer = this.listItemRenderer.bind(this);
|
||||
this.listItem_onClick = this.listItem_onClick.bind(this);
|
||||
this.helpButton_onClick = this.helpButton_onClick.bind(this);
|
||||
}
|
||||
|
||||
style() {
|
||||
if (this.styles_[this.props.theme]) return this.styles_[this.props.theme];
|
||||
|
||||
const theme = themeStyle(this.props.theme);
|
||||
|
||||
this.styles_[this.props.theme] = {
|
||||
dialogBox: Object.assign({}, theme.dialogBox, { minWidth: '50%', maxWidth: '50%' }),
|
||||
input: Object.assign({}, theme.inputStyle, { flex: 1 }),
|
||||
row: { overflow: 'hidden', height: itemHeight, display: 'flex', justifyContent: 'center', flexDirection: 'column', paddingLeft: 10, paddingRight: 10 },
|
||||
help: Object.assign({}, theme.textStyle, { marginBottom: 10 }),
|
||||
inputHelpWrapper: { display: 'flex', flexDirection: 'row', alignItems: 'center' },
|
||||
helpIcon: { flex: 0, width: 16, height: 16, marginLeft: 10 },
|
||||
helpButton: { color: theme.color, textDecoration: 'none' }
|
||||
};
|
||||
|
||||
const rowTextStyle = {
|
||||
fontSize: theme.fontSize,
|
||||
color: theme.color,
|
||||
fontFamily: theme.fontFamily,
|
||||
whiteSpace: 'nowrap',
|
||||
opacity: 0.7,
|
||||
userSelect: 'none'
|
||||
};
|
||||
|
||||
const rowTitleStyle = Object.assign({}, rowTextStyle, {
|
||||
fontSize: rowTextStyle.fontSize * 1.4,
|
||||
marginBottom: 5,
|
||||
color: theme.colorFaded
|
||||
});
|
||||
|
||||
this.styles_[this.props.theme].rowSelected = Object.assign({}, this.styles_[this.props.theme].row, { backgroundColor: theme.selectedColor });
|
||||
this.styles_[this.props.theme].rowPath = rowTextStyle;
|
||||
this.styles_[this.props.theme].rowTitle = rowTitleStyle;
|
||||
|
||||
return this.styles_[this.props.theme];
|
||||
}
|
||||
|
||||
componentDidMount() {
|
||||
document.addEventListener('keydown', this.onKeyDown);
|
||||
}
|
||||
|
||||
componentWillUnmount() {
|
||||
if (this.listUpdateIID_) clearTimeout(this.listUpdateIID_);
|
||||
document.removeEventListener('keydown', this.onKeyDown);
|
||||
}
|
||||
|
||||
onKeyDown(event) {
|
||||
if (event.keyCode === 27) {
|
||||
// ESCAPE
|
||||
this.props.dispatch({
|
||||
pluginName: PLUGIN_NAME,
|
||||
type: 'PLUGIN_DIALOG_SET',
|
||||
open: false
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
helpButton_onClick(event) {
|
||||
this.setState({ showHelp: !this.state.showHelp });
|
||||
}
|
||||
|
||||
input_onChange(event) {
|
||||
this.setState({ query: event.target.value });
|
||||
|
||||
this.scheduleListUpdate();
|
||||
}
|
||||
|
||||
scheduleListUpdate() {
|
||||
if (this.listUpdateIID_) return;
|
||||
|
||||
this.listUpdateIID_ = setTimeout(async () => {
|
||||
await this.updateList();
|
||||
this.listUpdateIID_ = null;
|
||||
}, 10);
|
||||
}
|
||||
|
||||
makeSearchQuery(query) {
|
||||
const splitted = query.split(' ');
|
||||
const output = [];
|
||||
for (let i = 0; i < splitted.length; i++) {
|
||||
const s = splitted[i].trim();
|
||||
if (!s) continue;
|
||||
|
||||
output.push('title:' + s + '*');
|
||||
}
|
||||
|
||||
return output.join(' ');
|
||||
}
|
||||
|
||||
keywords(searchQuery) {
|
||||
const parsedQuery = SearchEngine.instance().parseQuery(searchQuery);
|
||||
return SearchEngine.instance().allParsedQueryTerms(parsedQuery);
|
||||
}
|
||||
|
||||
async updateList() {
|
||||
if (!this.state.query) {
|
||||
this.setState({ results: [], keywords: [] });
|
||||
} else {
|
||||
let results = [];
|
||||
let listType = null;
|
||||
let searchQuery = '';
|
||||
|
||||
if (this.state.query.indexOf('#') === 0) {
|
||||
// TAGS
|
||||
listType = BaseModel.TYPE_TAG;
|
||||
searchQuery = '*' + this.state.query.split(' ')[0].substr(1).trim() + '*';
|
||||
results = await Tag.searchAllWithNotes({ titlePattern: searchQuery });
|
||||
} else if (this.state.query.indexOf('@') === 0) {
|
||||
// FOLDERS
|
||||
listType = BaseModel.TYPE_FOLDER;
|
||||
searchQuery = '*' + this.state.query.split(' ')[0].substr(1).trim() + '*';
|
||||
results = await Folder.search({ titlePattern: searchQuery });
|
||||
|
||||
for (let i = 0; i < results.length; i++) {
|
||||
const row = results[i];
|
||||
const path = Folder.folderPathString(this.props.folders, row.parent_id);
|
||||
results[i] = Object.assign({}, row, { path: path ? path : '/' });
|
||||
}
|
||||
} else {
|
||||
// NOTES
|
||||
listType = BaseModel.TYPE_NOTE;
|
||||
searchQuery = this.makeSearchQuery(this.state.query);
|
||||
results = await SearchEngine.instance().search(searchQuery);
|
||||
|
||||
for (let i = 0; i < results.length; i++) {
|
||||
const row = results[i];
|
||||
const path = Folder.folderPathString(this.props.folders, row.parent_id);
|
||||
results[i] = Object.assign({}, row, { path: path });
|
||||
}
|
||||
}
|
||||
|
||||
let selectedItemId = null;
|
||||
const itemIndex = this.selectedItemIndex(results, this.state.selectedItemId);
|
||||
if (itemIndex > 0) {
|
||||
selectedItemId = this.state.selectedItemId;
|
||||
} else if (results.length > 0) {
|
||||
selectedItemId = results[0].id;
|
||||
}
|
||||
|
||||
this.setState({
|
||||
listType: listType,
|
||||
results: results,
|
||||
keywords: this.keywords(searchQuery),
|
||||
selectedItemId: selectedItemId
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
gotoItem(item) {
|
||||
this.props.dispatch({
|
||||
pluginName: PLUGIN_NAME,
|
||||
type: 'PLUGIN_DIALOG_SET',
|
||||
open: false
|
||||
});
|
||||
|
||||
if (this.state.listType === BaseModel.TYPE_NOTE) {
|
||||
this.props.dispatch({
|
||||
type: "FOLDER_AND_NOTE_SELECT",
|
||||
folderId: item.parent_id,
|
||||
noteId: item.id
|
||||
});
|
||||
} else if (this.state.listType === BaseModel.TYPE_TAG) {
|
||||
this.props.dispatch({
|
||||
type: "TAG_SELECT",
|
||||
id: item.id
|
||||
});
|
||||
} else if (this.state.listType === BaseModel.TYPE_FOLDER) {
|
||||
this.props.dispatch({
|
||||
type: "FOLDER_SELECT",
|
||||
id: item.id
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
listItem_onClick(event) {
|
||||
const itemId = event.currentTarget.getAttribute('data-id');
|
||||
const parentId = event.currentTarget.getAttribute('data-parent-id');
|
||||
|
||||
this.gotoItem({
|
||||
id: itemId,
|
||||
parent_id: parentId
|
||||
});
|
||||
}
|
||||
|
||||
listItemRenderer(item) {
|
||||
const theme = themeStyle(this.props.theme);
|
||||
const style = this.style();
|
||||
const rowStyle = item.id === this.state.selectedItemId ? style.rowSelected : style.row;
|
||||
const titleHtml = surroundKeywords(this.state.keywords, item.title, '<span style="font-weight: bold; color: ' + theme.colorBright + ';">', '</span>');
|
||||
|
||||
const pathComp = !item.path ? null : React.createElement(
|
||||
'div',
|
||||
{ style: style.rowPath },
|
||||
item.path
|
||||
);
|
||||
|
||||
return React.createElement(
|
||||
'div',
|
||||
{ key: item.id, style: rowStyle, onClick: this.listItem_onClick, 'data-id': item.id, 'data-parent-id': item.parent_id },
|
||||
React.createElement('div', { style: style.rowTitle, dangerouslySetInnerHTML: { __html: titleHtml } }),
|
||||
pathComp
|
||||
);
|
||||
}
|
||||
|
||||
selectedItemIndex(results, itemId) {
|
||||
if (typeof results === 'undefined') results = this.state.results;
|
||||
if (typeof itemId === 'undefined') itemId = this.state.selectedItemId;
|
||||
for (let i = 0; i < results.length; i++) {
|
||||
const r = results[i];
|
||||
if (r.id === itemId) return i;
|
||||
}
|
||||
return -1;
|
||||
}
|
||||
|
||||
selectedItem() {
|
||||
const index = this.selectedItemIndex();
|
||||
if (index < 0) return null;
|
||||
return this.state.results[index];
|
||||
}
|
||||
|
||||
input_onKeyDown(event) {
|
||||
const keyCode = event.keyCode;
|
||||
|
||||
if (this.state.results.length > 0 && (keyCode === 40 || keyCode === 38)) {
|
||||
// DOWN / UP
|
||||
event.preventDefault();
|
||||
|
||||
const inc = keyCode === 38 ? -1 : +1;
|
||||
let index = this.selectedItemIndex();
|
||||
if (index < 0) return; // Not possible, but who knows
|
||||
|
||||
index += inc;
|
||||
if (index < 0) index = 0;
|
||||
if (index >= this.state.results.length) index = this.state.results.length - 1;
|
||||
|
||||
const newId = this.state.results[index].id;
|
||||
|
||||
this.itemListRef.current.makeItemIndexVisible(index);
|
||||
|
||||
this.setState({ selectedItemId: newId });
|
||||
}
|
||||
|
||||
if (keyCode === 13) {
|
||||
// ENTER
|
||||
event.preventDefault();
|
||||
|
||||
const item = this.selectedItem();
|
||||
if (!item) return;
|
||||
|
||||
this.gotoItem(item);
|
||||
}
|
||||
}
|
||||
|
||||
renderList() {
|
||||
const style = {
|
||||
marginTop: 5,
|
||||
height: Math.min(itemHeight * this.state.results.length, 7 * itemHeight)
|
||||
};
|
||||
|
||||
return React.createElement(ItemList, {
|
||||
ref: this.itemListRef,
|
||||
itemHeight: itemHeight,
|
||||
items: this.state.results,
|
||||
style: style,
|
||||
itemRenderer: this.listItemRenderer
|
||||
});
|
||||
}
|
||||
|
||||
render() {
|
||||
const theme = themeStyle(this.props.theme);
|
||||
const style = this.style();
|
||||
const helpComp = !this.state.showHelp ? null : React.createElement(
|
||||
'div',
|
||||
{ style: style.help },
|
||||
_('Type a note title to jump to it. Or type # followed by a tag name, or @ followed by a notebook name.')
|
||||
);
|
||||
|
||||
return React.createElement(
|
||||
'div',
|
||||
{ style: theme.dialogModalLayer },
|
||||
React.createElement(
|
||||
'div',
|
||||
{ style: style.dialogBox },
|
||||
helpComp,
|
||||
React.createElement(
|
||||
'div',
|
||||
{ style: style.inputHelpWrapper },
|
||||
React.createElement('input', { autoFocus: true, type: 'text', style: style.input, ref: this.inputRef, value: this.state.query, onChange: this.input_onChange, onKeyDown: this.input_onKeyDown }),
|
||||
React.createElement(
|
||||
'a',
|
||||
{ href: '#', style: style.helpButton, onClick: this.helpButton_onClick },
|
||||
React.createElement('i', { style: style.helpIcon, className: "fa fa-question-circle" })
|
||||
)
|
||||
),
|
||||
this.renderList()
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
const mapStateToProps = state => {
|
||||
return {
|
||||
folders: state.folders,
|
||||
theme: state.settings.theme
|
||||
};
|
||||
};
|
||||
|
||||
GotoAnything.Dialog = connect(mapStateToProps)(Dialog);
|
||||
|
||||
GotoAnything.manifest = {
|
||||
|
||||
name: PLUGIN_NAME,
|
||||
menuItems: [{
|
||||
name: 'main',
|
||||
parent: 'tools',
|
||||
label: _('Goto Anything...'),
|
||||
accelerator: 'CommandOrControl+P',
|
||||
screens: ['Main']
|
||||
}]
|
||||
|
||||
};
|
||||
|
||||
module.exports = GotoAnything;
|
||||
Loading…
Reference in New Issue
Block a user