@ckeditor/ckeditor5-image 27.1.0 → 29.2.0

package/theme/image.css

@@ -3,34 +3,114 @@
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
-.ck-content .image {
-	display: table;
-	clear: both;
-	text-align: center;
+.ck-content {
+	& .image {
+		display: table;
+		clear: both;
+		text-align: center;
 
-	/* Make sure there is some space between the content and the image. Center image by default. */
-	margin: 1em auto;
+		/* Make sure there is some space between the content and the image. Center image by default. */
+		/* The first value should be equal to --ck-spacing-large variable if used in the editor context
+	 	to avoid the content jumping (See https://github.com/ckeditor/ckeditor5/issues/9825). */
+		margin: 0.9em auto;
 
-	& img {
-		/* Prevent unnecessary margins caused by line-height (see #44). */
-		display: block;
+		/* Make sure the caption will be displayed properly (See: https://github.com/ckeditor/ckeditor5/issues/1870). */
+		min-width: 50px;
+
+		& img {
+			/* Prevent unnecessary margins caused by line-height (see #44). */
+			display: block;
+
+			/* Center the image if its width is smaller than the content's width. */
+			margin: 0 auto;
+
+			/* Make sure the image never exceeds the size of the parent container (ckeditor/ckeditor5-ui#67). */
+			max-width: 100%;
+
+			/* Make sure the image is never smaller than the parent container (See: https://github.com/ckeditor/ckeditor5/issues/9300). */
+			min-width: 100%
+		}
+	}
 
-		/* Center the image if its width is smaller than the content's width. */
-		margin: 0 auto;
+	& .image-inline {
+		/*
+		 * Normally, the .image-inline would have "display: inline-block" and "img { width: 100% }" (to follow the wrapper while resizing).
+		 * Unfortunately, together with "srcset", it gets automatically stretched up to the width of the editing root.
+		 * This strange behavior does not happen with inline-flex.
+		 */
+		display: inline-flex;
 
-		/* Make sure the image never exceeds the size of the parent container (ckeditor/ckeditor5-ui#67). */
+		/* While being resized, don't allow the image to exceed the width of the editing root. */
 		max-width: 100%;
 
-		/* Make sure the caption will be displayed properly (See: https://github.com/ckeditor/ckeditor5/issues/1870). */
-		min-width: 50px;
+		/* This is required by Safari to resize images in a sensible way. Without this, the browser breaks the ratio. */
+		align-items: flex-start;
+
+		/* When the picture is present it must act as a flex container to let the img resize properly */
+		& picture {
+			display: flex;
+		}
+
+		/* When the picture is present, it must act like a resizable img. */
+		& picture,
+		& img {
+			/* This is necessary for the img to span the entire .image-inline wrapper and to resize properly. */
+			flex-grow: 1;
+			flex-shrink: 1;
+
+			/* Prevents overflowing the editing root boundaries when an inline image is very wide. */
+			max-width: 100%;
+		}
 	}
 }
 
-/*
- * Since the caption placeholder for images disappears when focused, it does not require special treatment
- * and can go with a position that follows text alignment of an .image out-of-the-box (center by default).
- * See https://github.com/ckeditor/ckeditor5/issues/8689.
- */
-.ck.ck-editor__editable .image > figcaption.ck-placeholder::before {
-	position: static;
+.ck.ck-editor__editable {
+	/*
+	 * Inhertit the content styles padding of the <figcaption> in case the integration overrides `text-align: center`
+	 * of `.image` (e.g. to the left/right). This ensures the placeholder stays at the padding just like the native
+	 * caret does, and not at the edge of <figcaption>.
+	 */
+	& .image > figcaption.ck-placeholder::before {
+		padding-left: inherit;
+		padding-right: inherit;
+
+		/*
+		 * Make sure the image caption placeholder doesn't overflow the placeholder area.
+		 * See https://github.com/ckeditor/ckeditor5/issues/9162.
+		 */
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+
+
+	/*
+	 * Make sure the selected inline image always stays on top of its siblings.
+	 * See https://github.com/ckeditor/ckeditor5/issues/9108.
+	 */
+	& .image.ck-widget_selected {
+		z-index: 1;
+	}
+
+	& .image-inline.ck-widget_selected {
+		z-index: 1;
+
+		/*
+		 * Make sure the native browser selection style is not displayed.
+		 * Inline image widgets have their own styles for the selected state and
+		 * leaving this up to the browser is asking for a visual collision.
+		 */
+		& ::selection {
+			display: none;
+		}
+	}
+
+	/* The inline image nested in the table should have its original size if not resized.
+	See https://github.com/ckeditor/ckeditor5/issues/9117. */
+	& td,
+	& th {
+		& .image-inline img {
+			max-width: none;
+		}
+	}
 }

package/theme/imagecaption.css

@@ -3,13 +3,35 @@
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
+:root {
+	--ck-color-image-caption-background: hsl(0, 0%, 97%);
+	--ck-color-image-caption-text: hsl(0, 0%, 20%);
+	--ck-color-image-caption-highligted-background: hsl(52deg 100% 50%);
+}
+
+/* Content styles */
 .ck-content .image > figcaption {
 	display: table-caption;
 	caption-side: bottom;
 	word-break: break-word;
-	color: hsl(0, 0%, 20%);
-	background-color: hsl(0, 0%, 97%);
+	color: var(--ck-color-image-caption-text);
+	background-color: var(--ck-color-image-caption-background);
 	padding: .6em;
 	font-size: .75em;
 	outline-offset: -1px;
 }
+
+/* Editing styles */
+.ck.ck-editor__editable .image > figcaption.image__caption_highlighted {
+	animation: ck-image-caption-highlight .6s ease-out;
+}
+
+@keyframes ck-image-caption-highlight {
+	0% {
+		background-color: var(--ck-color-image-caption-highligted-background);
+	}
+
+	100% {
+		background-color: var(--ck-color-image-caption-background);
+	}
+}

package/theme/imageresize.css

@@ -24,6 +24,17 @@
 	}
 }
 
+.ck.ck-editor__editable {
+	/* The resized inline image nested in the table should respect its parent size.
+	See https://github.com/ckeditor/ckeditor5/issues/9117. */
+	& td,
+	& th {
+		& .image-inline.image_resized img {
+			max-width: 100%;
+		}
+	}
+}
+
 [dir="ltr"] .ck.ck-button.ck-button_with-text.ck-resize-image-button .ck-button__icon {
 	margin-right: var(--ck-spacing-standard);
 }

package/theme/imagestyle.css

@@ -5,9 +5,25 @@
 
 :root {
 	--ck-image-style-spacing: 1.5em;
+	--ck-inline-image-style-spacing: calc(var(--ck-image-style-spacing) / 2);
 }
 
 .ck-content {
+	/* Provides a minimal side margin for the left and right aligned images, so that the user has a visual feedback
+	confirming successful application of the style if image width exceeds the editor's size.
+	See https://github.com/ckeditor/ckeditor5/issues/9342 */
+	& .image-style-block-align-left,
+	& .image-style-block-align-right {
+		max-width: calc(100% - var(--ck-image-style-spacing));
+	}
+
+	/* Allows displaying multiple floating images in the same line.
+	See https://github.com/ckeditor/ckeditor5/issues/9183#issuecomment-804988132 */
+	& .image-style-align-left,
+	& .image-style-align-right {
+		clear: none;
+	}
+
 	& .image-style-side {
 		float: right;
 		margin-left: var(--ck-image-style-spacing);
@@ -28,4 +44,64 @@
 		float: right;
 		margin-left: var(--ck-image-style-spacing);
 	}
+
+	& .image-style-block-align-right {
+		margin-right: 0;
+		margin-left: auto;
+	}
+
+	& .image-style-block-align-left {
+		margin-left: 0;
+		margin-right: auto;
+	}
+
+	/* Simulates margin collapsing with the preceding paragraph, which does not work for the floating elements. */
+	& p + .image-style-align-left,
+	& p + .image-style-align-right,
+	& p + .image-style-side {
+		margin-top: 0;
+	}
+
+	& .image-inline {
+		&.image-style-align-left,
+		&.image-style-align-right {
+			margin-top: var(--ck-inline-image-style-spacing);
+			margin-bottom: var(--ck-inline-image-style-spacing);
+		}
+
+		&.image-style-align-left {
+			margin-right: var(--ck-inline-image-style-spacing);
+		}
+
+		&.image-style-align-right {
+			margin-left: var(--ck-inline-image-style-spacing);
+		}
+	}
+}
+
+.ck.ck-splitbutton {
+	/* The button should display as a regular drop-down if the action button
+	is forced to fire the same action as the arrow button. */
+	&.ck-splitbutton_flatten {
+		&:hover,
+		&.ck-splitbutton_open {
+			& > .ck-splitbutton__action:not(.ck-disabled),
+			& > .ck-splitbutton__arrow:not(.ck-disabled),
+			& > .ck-splitbutton__arrow:not(.ck-disabled):not(:hover) {
+				background-color: var(--ck-color-button-on-background);
+
+				&::after {
+					display: none;
+				}
+			}
+		}
+
+		&.ck-splitbutton_open:hover {
+			& > .ck-splitbutton__action:not(.ck-disabled),
+			& > .ck-splitbutton__arrow:not(.ck-disabled),
+			& > .ck-splitbutton__arrow:not(.ck-disabled):not(:hover) {
+				background-color: var(--ck-color-button-on-hover-background);
+			}
+		}
+	}
 }

package/theme/imageuploadicon.css

@@ -6,9 +6,15 @@
 .ck-image-upload-complete-icon {
 	display: block;
 	position: absolute;
-	top: 10px;
-	right: 10px;
+
+	/*
+	 * Smaller images should have the icon closer to the border.
+	 * Match the icon position with the linked image indicator brought by the link image feature.
+	 */
+	top: min(var(--ck-spacing-medium), 6%);
+	right: min(var(--ck-spacing-medium), 6%);
 	border-radius: 50%;
+	z-index: 1;
 
 	&::after {
 		content: "";

package/theme/imageuploadprogress.css

@@ -3,13 +3,17 @@
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
 
-.ck.ck-editor__editable .image {
-	position: relative;
-}
+.ck.ck-editor__editable {
+	& .image,
+	& .image-inline {
+		position: relative;
+	}
 
-/* Upload progress bar. */
-.ck.ck-editor__editable .image .ck-progress-bar {
-	position: absolute;
-	top: 0;
-	left: 0;
+	/* Upload progress bar. */
+	& .image .ck-progress-bar,
+	& .image-inline .ck-progress-bar {
+		position: absolute;
+		top: 0;
+		left: 0;
+	}
 }