Skip to content
Open
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: 4 additions & 0 deletions packages/bruno-app/src/components/CodeEditor/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import stripJsonComments from 'strip-json-comments';
import { getAllVariables } from 'utils/collections';
import { setupLinkAware } from 'utils/codemirror/linkAware';
import { setupLintErrorTooltip } from 'utils/codemirror/lint-errors';
import { setupCodeMirrorResizeRefresh } from 'utils/codemirror/resize';
import CodeMirrorSearch from 'components/CodeMirrorSearch/index';
import {
applyEditorState,
Expand Down Expand Up @@ -248,6 +249,8 @@ class CodeEditor extends React.Component {
if (cmInput) {
cmInput.classList.add('mousetrap');
}

this.cleanupResizeRefresh = setupCodeMirrorResizeRefresh(editor, this._node);
}
}

Expand Down Expand Up @@ -373,6 +376,7 @@ class CodeEditor extends React.Component {

// Clean up lint error tooltip
this.cleanupLintErrorTooltip?.();
this.cleanupResizeRefresh?.();

const wrapper = this.editor.getWrapperElement();
wrapper?.parentNode?.removeChild(wrapper);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import toast from 'react-hot-toast';
import StyledWrapper from './StyledWrapper';
import onHasCompletion from './onHasCompletion';
import { setupLinkAware } from 'utils/codemirror/linkAware';
import { setupCodeMirrorResizeRefresh } from 'utils/codemirror/resize';

const CodeMirror = require('codemirror');

Expand Down Expand Up @@ -137,6 +138,7 @@ export default class QueryEditor extends React.Component {
this.addOverlay();

setupLinkAware(editor);
this.cleanupResizeRefresh = setupCodeMirrorResizeRefresh(editor, this._node);

// Add mousetrap class so Mousetrap captures shortcuts even when CodeMirror is focused
const cmInput = editor.getInputField();
Expand Down Expand Up @@ -180,6 +182,7 @@ export default class QueryEditor extends React.Component {
if (this.editor?._destroyLinkAware) {
this.editor._destroyLinkAware();
}
this.cleanupResizeRefresh?.();
this.editor.off('change', this._onEdit);
this.editor.off('keyup', this._onKeyUp);
this.editor.off('hasCompletion', this._onHasCompletion);
Expand Down
38 changes: 38 additions & 0 deletions packages/bruno-app/src/utils/codemirror/resize.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/**
* Refreshes a CodeMirror editor when its container size changes.
* CodeMirror measures its DOM during refresh(), so resize callbacks are
* coalesced into a single animation frame to avoid repeated layout work.
*
* @param {Object} editor - CodeMirror editor instance
* @param {HTMLElement} element - Element whose size changes should refresh the editor
* @returns {Function} Cleanup function
*/
export const setupCodeMirrorResizeRefresh = (editor, element) => {
if (!editor || !element || typeof ResizeObserver === 'undefined') {
return () => {};
}

let resizeRefreshFrameId = null;

const resizeObserver = new ResizeObserver(() => {
if (resizeRefreshFrameId) {
cancelAnimationFrame(resizeRefreshFrameId);
}

resizeRefreshFrameId = requestAnimationFrame(() => {
editor.refresh?.();
resizeRefreshFrameId = null;
});
});

resizeObserver.observe(element);

return () => {
resizeObserver.disconnect();

if (resizeRefreshFrameId) {
cancelAnimationFrame(resizeRefreshFrameId);
resizeRefreshFrameId = null;
}
};
};
Loading