Changeset 44832

Timestamp:

03/12/2019 08:13:14 PM (6 years ago)

Author:

azaozz

Message:

TinyMCE: fix editor height when loaded hidden.

Props nnikolov, azaozz.
Fixes #45461.

File:

• trunk/src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js (modified) (3 diffs)

trunk/src/js/_enqueues/vendor/tinymce/plugins/wordpress/plugin.js

@@ -20 +20 @@
 
     function toggleToolbars( state ) {
-        var initial, toolbars,
+        var initial, toolbars, iframeHeight,
             pixels = 0,
             classicBlockToolbar = tinymce.$( '.block-library-classic__toolbar' );
@@ -45 +45 @@
                     if ( state === 'hide' ) {
                         toolbar.hide();
-                        pixels += 30;
+                        pixels += 34;
                     } else {
                         toolbar.show();
-                        pixels -= 30;
+                        pixels -= 34;
                     }
                 }
@@ -55 +55 @@
 
         // Resize editor iframe, not needed for iOS and inline instances.
-        if ( pixels && ! tinymce.Env.iOS && editor.iframeElement ) {
-            DOM.setStyle( editor.iframeElement, 'height', editor.iframeElement.clientHeight + pixels );
+        // Don't resize if the editor is in a hidden container.
+        if ( pixels && ! tinymce.Env.iOS && editor.iframeElement && editor.iframeElement.clientHeight ) {
+            iframeHeight = editor.iframeElement.clientHeight + pixels;
+
+            // Keep min-height.
+            if ( iframeHeight > 50  ) {
+                DOM.setStyle( editor.iframeElement, 'height', iframeHeight );
+            }
         }