Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore(gd): Styles for SVG Icons thumbnails were broken #29278

Merged
merged 3 commits into from
Jul 19, 2024
Merged

chore(gd): Styles for SVG Icons thumbnails were broken #29278

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78dfdcd
fix styles for svg icons
zJaaal Jul 18, 2024
e6cb726
Merge branch 'master' into 29098-improve-thumbnails-in-content-search…
zJaaal Jul 19, 2024
5c592df
Merge branch 'master' into 29098-improve-thumbnails-in-content-search…
zJaaal Jul 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .../dotcms-webcomponents/src/elements/dot-contentlet-thumbnail/dot-contentlet-thumbnail.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,11 @@ dot-contentlet-icon {
background-size: cover;
background-position: center center;
background-repeat: no-repeat;

&.svg-thumbnail {
background-size: contain;
}

img {
width: 0px;
height: 0px;
Expand Down
26 changes: 17 additions & 9 deletions ...s/dotcms-webcomponents/src/elements/dot-contentlet-thumbnail/dot-contentlet-thumbnail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,11 @@ export class DotContentletThumbnail {
fieldVariable = '';

@State() renderImage: boolean;
@State() isSVG: boolean;

componentWillLoad() {
const { hasTitleImage, mimeType } = this.contentlet;
this.isSVG = mimeType === 'image/svg+xml';
// Some endpoints return this property as a boolean
if (typeof hasTitleImage === 'boolean' && hasTitleImage) {
this.renderImage = hasTitleImage;
Expand All @@ -54,6 +56,7 @@ export class DotContentletThumbnail {
const backgroundImageURL =
this.contentlet && this.backgroundImage ? `url(${this.getImageURL()})` : '';
const imgClass = this.backgroundImage ? 'background-image' : '';
const svgClass = this.isSVG ? ' svg-thumbnail' : '';

return (
<Host>
Expand All @@ -66,8 +69,10 @@ export class DotContentletThumbnail {
/>
) : this.renderImage ? (
<div
class={`thumbnail ${imgClass}`}
style={{ 'background-image': backgroundImageURL }}>
class={`thumbnail ${imgClass}${svgClass}`}
style={{
'background-image': backgroundImageURL
}}>
zJaaal marked this conversation as resolved.
Show resolved Hide resolved
<img
src={this.getImageURL()}
alt={this.alt}
Expand All @@ -87,13 +92,16 @@ export class DotContentletThumbnail {
}

private getImageURL(): string {
return this.contentlet.mimeType === 'application/pdf'
? `/contentAsset/image/${this.contentlet.inode}/${
this.fieldVariable || this.contentlet.titleImage
}/pdf_page/1/resize_w/250/quality_q/45`
: `/dA/${this.contentlet.inode}/${this.fieldVariablePath()}500w/50q?r=${
this.contentlet.modDateMilis || this.contentlet.modDate
}`;
if (this.contentlet.mimeType === 'application/pdf')
return `/contentAsset/image/${this.contentlet.inode}/${
this.fieldVariable || this.contentlet.titleImage
}/pdf_page/1/resize_w/250/quality_q/45`;

if (this.isSVG) return `/contentAsset/image/${this.contentlet.inode}/asset`;

return `/dA/${this.contentlet.inode}/${this.fieldVariablePath()}500w/50q?r=${
this.contentlet.modDateMilis || this.contentlet.modDate
}`;
}

private fieldVariablePath(): string {
Expand Down
8 changes: 7 additions & 1 deletion ...-binary-field/components/dot-binary-field-preview/dot-binary-field-preview.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,14 @@
}

dot-contentlet-thumbnail::ng-deep {
.background-image:not(.svg-thumbnail) {
img {
object-fit: cover;
}
}

img {
object-fit: cover;
object-fit: contain;
}
}

Expand Down