fix: add resize listener for code mirror instances (#7889)

This commit is contained in:
prateek-bruno
2026-05-15 14:40:19 +05:30
committed by GitHub
parent df06d1558b
commit a2ec2c6d56
3 changed files with 45 additions and 0 deletions

View File

@@ -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,
@@ -269,6 +270,8 @@ class CodeEditor extends React.Component {
if (cmInput) {
cmInput.classList.add('mousetrap');
}
this.cleanupResizeRefresh = setupCodeMirrorResizeRefresh(editor, this._node);
}
}
@@ -402,6 +405,7 @@ class CodeEditor extends React.Component {
// Clean up lint error tooltip
this.cleanupLintErrorTooltip?.();
this.cleanupResizeRefresh?.();
const wrapper = this.editor.getWrapperElement();
wrapper?.parentNode?.removeChild(wrapper);

View File

@@ -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');
@@ -149,6 +150,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();
@@ -192,6 +194,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);

View File

@@ -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;
}
};
};