Skip to content

add image size tag in image option header #4755

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

Open
wants to merge 1 commit into
base: master-mysterious-egg-next
Choose a base branch
from
Open

add image size tag in image option header #4755

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 20 additions & 0 deletions addons/website/static/src/builder/plugins/image/image_size_tag.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { Component, useState } from "@odoo/owl";
import { useDomState } from "@html_builder/core/utils";
import { loadImageDataURL, getImageSizeFromCache } from "@html_editor/utils/image_processing";
import { KeepLast } from "@web/core/utils/concurrency";

export class ImageSizeTag extends Component {
static template = "website.ImageSizeTag";
setup() {
this.keepLast = new KeepLast();
this.state = useState({ size: 0 });
useDomState((imageEl) => this.updateImageSize(imageEl));
this.updateImageSize(this.env.getEditingElement());
}

async updateImageSize(imageEl) {
const src = imageEl.src;
await this.keepLast.add(loadImageDataURL(src));
this.state.size = Math.round((getImageSizeFromCache(src) / 1024) * 10) / 10;
}
}
6 changes: 6 additions & 0 deletions addons/website/static/src/builder/plugins/image/image_size_tag.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<templates xml:space="preserve">
<t t-name="website.ImageSizeTag">
<span class="badge text-bg-dark" title="Size"><t t-out="state.size"/> kB</span>
</t>
</templates>
81 changes: 53 additions & 28 deletions addons/website/static/src/builder/plugins/image/image_tool_option_plugin.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
import { cropperDataFieldsWithAspectRatio, isGif, loadImage } from "@html_editor/utils/image_processing";
import {
cropperDataFieldsWithAspectRatio,
isGif,
loadImage,
} from "@html_editor/utils/image_processing";
import { registry } from "@web/core/registry";
import { Plugin } from "@html_editor/plugin";
import { ImageToolOption } from "./image_tool_option";
Expand All @@ -11,6 +15,7 @@ import {
} from "@html_builder/utils/option_sequence";
import { ReplaceMediaOption, searchSupportedParentLinkEl } from "./replace_media_option";
import { computeMaxDisplayWidth } from "./image_format_option";
import { ImageSizeTag } from "./image_size_tag";

export const REPLACE_MEDIA_SELECTOR = "img, .media_iframe_video, span.fa, i.fa";
export const REPLACE_MEDIA_EXCLUDE =
Expand All @@ -28,6 +33,10 @@ class ImageToolOptionPlugin extends Plugin {
];
static shared = ["canHaveHoverEffect"];
resources = {
builder_header_middle_buttons: {
Component: ImageSizeTag,
selector: "img",
},
builder_options: [
withSequence(REPLACE_MEDIA, {
OptionComponent: ReplaceMediaOption,
Expand All @@ -49,32 +58,45 @@ class ImageToolOptionPlugin extends Plugin {
on_media_dialog_saved_handlers: async (elements, { node }) => {
for (const image of elements) {
if (image && image.tagName === "IMG") {
const updateImageAttributes = await this.dependencies.imagePostProcess.processImage({
img: image,
newDataset: {
formatMimetype: "image/webp",
},
// TODO Using a callback is currently needed to avoid
// the extra RPC that would occur if loadImageInfo was
// called before processImage as well. This flow can be
// simplified if image infos are somehow cached.
onImageInfoLoaded: async (dataset) => {
if (!dataset.originalSrc || !dataset.originalId) {
return true;
}
const original = await loadImage(dataset.originalSrc);
const maxWidth = dataset.width ? image.naturalWidth : original.naturalWidth;
const optimizedWidth = Math.min(maxWidth, computeMaxDisplayWidth(node || this.editable));
if (!["image/gif", "image/svg+xml"].includes(dataset.mimetypeBeforeConversion)) {
// Convert to recommended format and width.
dataset.resizeWidth = optimizedWidth;
} else if (dataset.shape && dataset.mimetypeBeforeConversion !== "image/gif") {
dataset.resizeWidth = optimizedWidth;
} else {
return true;
}
},
});
const updateImageAttributes =
await this.dependencies.imagePostProcess.processImage({
img: image,
newDataset: {
formatMimetype: "image/webp",
},
// TODO Using a callback is currently needed to avoid
// the extra RPC that would occur if loadImageInfo was
// called before processImage as well. This flow can be
// simplified if image infos are somehow cached.
onImageInfoLoaded: async (dataset) => {
if (!dataset.originalSrc || !dataset.originalId) {
return true;
}
const original = await loadImage(dataset.originalSrc);
const maxWidth = dataset.width
? image.naturalWidth
: original.naturalWidth;
const optimizedWidth = Math.min(
maxWidth,
computeMaxDisplayWidth(node || this.editable)
);
if (
!["image/gif", "image/svg+xml"].includes(
dataset.mimetypeBeforeConversion
)
) {
// Convert to recommended format and width.
dataset.resizeWidth = optimizedWidth;
} else if (
dataset.shape &&
dataset.mimetypeBeforeConversion !== "image/gif"
) {
dataset.resizeWidth = optimizedWidth;
} else {
return true;
}
},
});
updateImageAttributes();
}
}
Expand All @@ -91,7 +113,10 @@ class ImageToolOptionPlugin extends Plugin {
onClose: resolve,
onSave: async (newDataset) => {
resolve(
this.dependencies.imagePostProcess.processImage({ img, newDataset })
this.dependencies.imagePostProcess.processImage({
img,
newDataset,
})
);
},
});
Expand Down