Upcast height style to height attribute if no other styles/attributes…

… are provided.
ckeditor · Jun 23, 2023 · fc13ab7 · fc13ab7
1 parent 1f1be62
commit fc13ab7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/packages/ckeditor5-image/src/imageresize/imageresizeediting.ts b/packages/ckeditor5-image/src/imageresize/imageresizeediting.ts
@@ -179,6 +179,10 @@ export default class ImageResizeEditing extends Plugin {
 							return null;
 						}
 
+						if ( heightStyle ) {
+							return null;
+						}
+
 						return viewElement.getStyle( 'height' );
 					}
 				}

diff --git a/packages/ckeditor5-image/src/imagesizeattributes.ts b/packages/ckeditor5-image/src/imagesizeattributes.ts
@@ -110,6 +110,15 @@ export default class ImageSizeAttributes extends Plugin {
 							return heightStyle;
 						}
 
+						const img = imageUtils.findViewImgElement( viewElement )!;
+						const imgHasAttributes = img.getAttribute( 'width' ) || img.getAttribute( 'height' );
+
+						if ( heightStyle && !viewElement.getStyle( 'width' ) ) {
+							if ( !imgHasAttributes ) {
+								return heightStyle;
+							}
+						}
+
 						return null;
 					}
 				}