Skip to content

fix(editor): Close Find popup when Replace is triggered (Fixes #3428) #3431

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 2 commits into
base: develop
Choose a base branch
from
+50 −32
Open

fix(editor): Close Find popup when Replace is triggered (Fixes #3428) #3431

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
997164d
fix(editor): close Find popup when Replace is triggered via UI or sho…
LalitNarayanYadav Apr 5, 2025
666bb40
Merge branch 'develop' into issue-fix
LalitNarayanYadav Apr 7, 2025
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
82 changes: 50 additions & 32 deletions client/modules/IDE/components/Editor/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,36 +153,48 @@ class Editor extends React.Component {

delete this._cm.options.lint.options.errors;

const replaceCommand =
metaKey === 'Ctrl' ? `${metaKey}-H` : `${metaKey}-Option-F`;
this._cm.setOption('extraKeys', {
Tab: (cm) => {
if (!cm.execCommand('emmetExpandAbbreviation')) return;
// might need to specify and indent more?
const selection = cm.doc.getSelection();
if (selection.length > 0) {
cm.execCommand('indentMore');
} else {
cm.replaceSelection(' '.repeat(INDENTATION_AMOUNT));
}
},
Enter: 'emmetInsertLineBreak',
Esc: 'emmetResetAbbreviation',
[`Shift-Tab`]: false,
[`${metaKey}-Enter`]: () => null,
[`Shift-${metaKey}-Enter`]: () => null,
[`${metaKey}-F`]: 'findPersistent',
[`Shift-${metaKey}-F`]: this.tidyCode,
[`${metaKey}-G`]: 'findPersistentNext',
[`Shift-${metaKey}-G`]: 'findPersistentPrev',
[replaceCommand]: 'replace',
// Cassie Tarakajian: If you don't set a default color, then when you
// choose a color, it deletes characters inline. This is a
// hack to prevent that.
[`${metaKey}-K`]: (cm, event) =>
cm.state.colorpicker.popup_color_picker({ length: 0 }),
[`${metaKey}-.`]: 'toggleComment' // Note: most adblockers use the shortcut ctrl+.
});
const replaceCommand =
metaKey === 'Ctrl' ? `${metaKey}-H` : `${metaKey}-Option-F`;
this._cm.setOption('extraKeys', {
Tab: (cm) => {
if (!cm.execCommand('emmetExpandAbbreviation')) return;
// might need to specify and indent more?
const selection = cm.doc.getSelection();
if (selection.length > 0) {
cm.execCommand('indentMore');
} else {
cm.replaceSelection(' '.repeat(INDENTATION_AMOUNT));
}
},
Enter: 'emmetInsertLineBreak',
Esc: 'emmetResetAbbreviation',
[`Shift-Tab`]: false,
[`${metaKey}-Enter`]: () => null,
[`Shift-${metaKey}-Enter`]: () => null,
[`${metaKey}-F`]: (cm) => {
// Close any existing search dialog first
if (cm.state.search && cm.state.search.query) {
CodeMirror.commands.closeSearch(cm);
}
cm.execCommand('findPersistent');
},
[`Shift-${metaKey}-F`]: this.tidyCode,
[`${metaKey}-G`]: 'findPersistentNext',
[`Shift-${metaKey}-G`]: 'findPersistentPrev',
[replaceCommand]: (cm) => {
// Close any existing search dialog first
if (cm.state.search && cm.state.search.query) {
CodeMirror.commands.closeSearch(cm);
}
cm.execCommand('replace');
},
// Cassie Tarakajian: If you don't set a default color, then when you
// choose a color, it deletes characters inline. This is a
// hack to prevent that.
[`${metaKey}-K`]: (cm, event) =>
cm.state.colorpicker.popup_color_picker({ length: 0 }),
[`${metaKey}-.`]: 'toggleComment'
});

this.initializeDocuments(this.props.files);
this._cm.swapDoc(this._docs[this.props.file.id]);
Expand Down Expand Up @@ -372,8 +384,11 @@ class Editor extends React.Component {
};

showFind() {
this._cm.execCommand('findPersistent');
if (this._cm.state.search && this._cm.state.search.query) {
CodeMirror.commands.closeSearch(this._cm);
}
this._cm.execCommand('findPersistent');
}

showHint(_cm) {
if (!this.props.autocompleteHinter) {
Expand Down Expand Up @@ -469,8 +484,11 @@ class Editor extends React.Component {
}

showReplace() {
this._cm.execCommand('replace');
if (this._cm.state.search && this._cm.state.search.query) {
CodeMirror.commands.closeSearch(this._cm);
}
this._cm.execCommand('replace');
}

prettierFormatWithCursor(parser, plugins) {
try {
Expand Down