wikimedia/mediawiki-extensions-CodeMirror
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/CodeMirror synced 2024-11-27 15:40:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

CodeMirrorWikiEditor: Remove hack to fix height in WikiEditor

Browse source 
WikiEditor's ResizingDragBar makes the editor resizable, so we need to
set the height to 100%. This was attempted in Ib49d1d9e71 and
I4deeda192b but both ultimately suffer from race conditions. Instead
we're setting the height in WikiEditor with Ia5e9767e08.

The heightExtension in the CodeMirror class still remains, in the event
a subclass wishes to override the default behaviour in CM directly and
not with CSS.

Bug: T357794
Depends-On: Ia5e9767e0814eac29d58bc0d9c1023344a29dd84
Change-Id: Ic55dd098d70fd173ddee7100e392b889ee6ddd08
This commit is contained in:
MusikAnimal 2024-03-07 16:13:04 -05:00
parent c63e81539a
commit aa3876a97e
4 changed files with 3 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/dist/main.js vendored
View file

File diff suppressed because one or more lines are too long

2
resources/dist/main.js.map.json vendored
View file

File diff suppressed because one or more lines are too long

19
src/codemirror.wikieditor.js
View file

@ -1,5 +1,5 @@
import CodeMirror from './codemirror';
import { EditorState, EditorSelection, Extension } from '@codemirror/state';
import { EditorState, EditorSelection } from '@codemirror/state';
import { EditorView, drawSelection, keymap } from '@codemirror/view';
import { defaultKeymap, history, historyKeymap } from '@codemirror/commands';
import { searchKeymap } from '@codemirror/search';
@ -101,23 +101,6 @@ export default class CodeMirrorWikiEditor extends CodeMirror {
mw.hook( 'ext.CodeMirror.switch' ).fire( true, $( this.view.dom ) );
}
/**
* @inheritDoc
*
* Realtime Preview's ResizingDragBar makes the editor resizable,
* so we need to set the height to 100%.
*
* @return {Extension}
*/
get heightExtension() {
if ( mw.loader.getState( 'ext.wikiEditor.realtimepreview' ) === 'ready' ) {
return EditorView.theme( {
'&': { height: '100%' }
} );
}
return super.heightExtension;
}
/**
* Adds the CodeMirror button to WikiEditor
*/

33
tests/jest/codemirror.wikieditor.test.js
View file

@ -50,39 +50,6 @@ describe( 'addCodeMirrorToWikiEditor', () => {
} );
} );
describe( 'enableCodeMirror', () => {
cmWe.$textarea.wikiEditor = jest.fn();
it( 'should use the height of the textarea if Realtime Preview disabled', () => {
mw.loader.getState.mockImplementation( ( module ) => {
if ( module === 'ext.wikiEditor' ) {
return 'ready';
}
if ( module === 'ext.wikiEditor.realtimepreview' ) {
return null;
}
} );
$textarea.css( 'height', '999px' );
cmWe.initialize();
// Height includes padding and border.
expect( $( cmWe.view.dom ).css( 'height' ) ).toStrictEqual( '1005px' );
} );
it( 'should use 100% height if Realtime Preview is enabled', () => {
mw.loader.getState.mockImplementation( ( module ) => {
if ( module === 'ext.wikiEditor' ) {
return 'ready';
}
if ( module === 'ext.wikiEditor.realtimepreview' ) {
return 'ready';
}
} );
$textarea.css( 'height', '999px' );
cmWe.initialize();
expect( $( cmWe.view.dom ).css( 'height' ) ).toStrictEqual( '100%' );
} );
} );
describe( 'updateToolbarButton', () => {
it( 'should update the toolbar button based on the current CodeMirror state', () => {
const btn = document.getElementById( 'mw-editbutton-codemirror' );