suneditor 3.0.0-alpha.2 → 3.0.0-alpha.20

package/src/plugins/modal/image.js

@@ -1,208 +1,276 @@
 import EditorInjector from '../../editorInjector';
 import { Modal, Figure, FileManager, ModalAnchorEditor } from '../../modules';
-import { domUtils, numbers, env } from '../../helper';
+import { dom, numbers, env, keyCodeMap } from '../../helper';
 import { CreateTooltipInner } from '../../core/section/constructor';
 const { NO_EVENT } = env;
 
-const Image_ = function (editor, pluginOptions) {
-	// plugin bisic properties
-	EditorInjector.call(this, editor);
-	this.title = this.lang.image;
-	this.icon = 'image';
-
-	// define plugin options
-	this.pluginOptions = {
-		canResize: pluginOptions.canResize === undefined ? true : pluginOptions.canResize,
-		showHeightInput: pluginOptions.showHeightInput === undefined ? true : !!pluginOptions.showHeightInput,
-		defaultWidth: !pluginOptions.defaultWidth ? 'auto' : numbers.is(pluginOptions.defaultWidth) ? pluginOptions.defaultWidth + 'px' : pluginOptions.defaultWidth,
-		defaultHeight: !pluginOptions.defaultHeight ? 'auto' : numbers.is(pluginOptions.defaultHeight) ? pluginOptions.defaultHeight + 'px' : pluginOptions.defaultHeight,
-		percentageOnlySize: !!pluginOptions.percentageOnlySize,
-		createFileInput: pluginOptions.createFileInput === undefined ? true : pluginOptions.createFileInput,
-		createUrlInput: pluginOptions.createUrlInput === undefined || !pluginOptions.createFileInput ? true : pluginOptions.createUrlInput,
-		uploadUrl: typeof pluginOptions.uploadUrl === 'string' ? pluginOptions.uploadUrl : null,
-		uploadHeaders: pluginOptions.uploadHeaders || null,
-		uploadSizeLimit: /\d+/.test(pluginOptions.uploadSizeLimit) ? numbers.get(pluginOptions.uploadSizeLimit, 0) : null,
-		uploadSingleSizeLimit: /\d+/.test(pluginOptions.uploadSingleSizeLimit) ? numbers.get(pluginOptions.uploadSingleSizeLimit, 0) : null,
-		allowMultiple: !!pluginOptions.allowMultiple,
-		acceptedFormats: typeof pluginOptions.acceptedFormats !== 'string' || pluginOptions.acceptedFormats.trim() === '*' ? 'image/*' : pluginOptions.acceptedFormats.trim() || 'image/*'
-		// useFormatType: pluginOptions.useFormatType ?? false,
-		// defaultFormatType: ['block', 'inline'].includes(pluginOptions.defaultFormatType) ? pluginOptions.defaultFormatType : 'block'
-	};
-
-	// create HTML
-	const sizeUnit = this.pluginOptions.percentageOnlySize ? '%' : 'px';
-	const modalEl = CreateHTML_modal(editor, this.pluginOptions);
-	const figureControls =
-		pluginOptions.controls || !this.pluginOptions.canResize
-			? [['mirror_h', 'mirror_v', 'align', 'caption', 'revert', 'edit', 'remove']]
-			: [
-					['resize_auto,100,75,50', 'rotate_l', 'rotate_r', 'mirror_h', 'mirror_v'],
-					['edit', 'align', 'caption', 'revert', 'remove']
-			  ];
-
-	// show align
-	this.alignForm = modalEl.querySelector('.se-figure-align');
-	if (!figureControls.some((subArray) => subArray.includes('align'))) this.alignForm.style.display = 'none';
-
-	// modules
-	const Link = this.plugins.link ? this.plugins.link.pluginOptions : {};
-	this.anchor = new ModalAnchorEditor(this, modalEl, {
-		textToDisplay: false,
-		title: true,
-		openNewWindow: Link.openNewWindow,
-		relList: Link.relList,
-		defaultRel: Link.defaultRel,
-		noAutoPrefix: Link.noAutoPrefix,
-		enableFileUpload: pluginOptions.linkEnableFileUpload
-	});
-	this.modal = new Modal(this, modalEl);
-	this.figure = new Figure(this, figureControls, {
-		sizeUnit: sizeUnit
-	});
-	this.fileManager = new FileManager(this, {
-		query: 'img',
-		loadHandler: this.events.onImageLoad,
-		eventHandler: this.events.onImageAction
-	});
-
-	// members
-	this.fileModalWrapper = modalEl.querySelector('.se-flex-input-wrapper');
-	this.imgInputFile = modalEl.querySelector('.__se__file_input');
-	this.imgUrlFile = modalEl.querySelector('._se_image_url');
-	this.focusElement = this.imgInputFile || this.imgUrlFile;
-	this.altText = modalEl.querySelector('._se_image_alt');
-	this.captionCheckEl = modalEl.querySelector('._se_image_check_caption');
-	this.previewSrc = modalEl.querySelector('._se_tab_content_image .se-link-preview');
-	this.sizeUnit = sizeUnit;
-	this.proportion = {};
-	this.inputX = {};
-	this.inputY = {};
-	this._linkElement = null;
-	this._linkValue = '';
-	this._align = 'none';
-	this._svgDefaultSize = '30%';
-	this._base64RenderIndex = 0;
-	this._element = null;
-	this._cover = null;
-	this._container = null;
-	this._caption = null;
-	this._ratio = {
-		w: 1,
-		h: 1
-	};
-	this._origin_w = this.pluginOptions.defaultWidth === 'auto' ? '' : this.pluginOptions.defaultWidth;
-	this._origin_h = this.pluginOptions.defaultHeight === 'auto' ? '' : this.pluginOptions.defaultHeight;
-	this._resizing = this.pluginOptions.canResize;
-	this._onlyPercentage = this.pluginOptions.percentageOnlySize;
-	this._nonResizing = !this._resizing || !this.pluginOptions.showHeightInput || this._onlyPercentage;
-
-	// init
-	modalEl.querySelector('.se-modal-tabs').addEventListener('click', this._openTab.bind(this));
-	if (this.imgInputFile) modalEl.querySelector('.se-file-remove').addEventListener('click', RemoveSelectedFiles.bind(this));
-	if (this.imgUrlFile) this.imgUrlFile.addEventListener('input', OnLinkPreview.bind(this));
-	if (this.imgInputFile && this.imgUrlFile) this.imgInputFile.addEventListener('change', OnfileInputChange.bind(this));
-
-	const imageGalleryButton = modalEl.querySelector('.__se__gallery');
-	if (imageGalleryButton) imageGalleryButton.addEventListener('click', OpenGallery.bind(this));
-
-	if (this._resizing) {
-		this.proportion = modalEl.querySelector('._se_image_check_proportion');
-		this.inputX = modalEl.querySelector('._se_image_size_x');
-		this.inputY = modalEl.querySelector('._se_image_size_y');
-		this.inputX.value = this.pluginOptions.defaultWidth;
-		this.inputY.value = this.pluginOptions.defaultHeight;
-
-		const ratioChange = OnChangeRatio.bind(this);
-		this.eventManager.addEvent(this.inputX, 'keyup', OnInputSize.bind(this, 'x'));
-		this.eventManager.addEvent(this.inputY, 'keyup', OnInputSize.bind(this, 'y'));
-		this.eventManager.addEvent(this.inputX, 'change', ratioChange);
-		this.eventManager.addEvent(this.inputY, 'change', ratioChange);
-		this.eventManager.addEvent(this.proportion, 'change', ratioChange);
-		this.eventManager.addEvent(modalEl.querySelector('.se-modal-btn-revert'), 'click', OnClickRevert.bind(this));
+/**
+ * @typedef {import('../../core/base/events').ImageInfo} ImageInfo
+ */
+
+/**
+ * @typedef {import('../../modules/Figure').FigureControls} FigureControls
+ */
+
+/**
+ * @typedef {Object} ImagePluginOptions
+ * @property {boolean} [canResize=true] - Whether the image element can be resized.
+ * @property {boolean} [showHeightInput=true] - Whether to display the height input field.
+ * @property {string} [defaultWidth="auto"] - The default width of the image. If a number is provided, "px" will be appended.
+ * @property {string} [defaultHeight="auto"] - The default height of the image. If a number is provided, "px" will be appended.
+ * @property {boolean} [percentageOnlySize=false] - Whether to allow only percentage-based sizing.
+ * @property {boolean} [createFileInput=true] - Whether to create a file input element for image uploads.
+ * @property {boolean} [createUrlInput=true] - Whether to create a URL input element for image insertion.
+ * @property {string} [uploadUrl] - The URL endpoint for image file uploads.
+ * @property {Object<string, string>} [uploadHeaders] - Additional headers to include in the file upload request.
+ * @property {number} [uploadSizeLimit] - The total upload size limit in bytes.
+ * @property {number} [uploadSingleSizeLimit] - The single file upload size limit in bytes.
+ * @property {boolean} [allowMultiple=false] - Whether multiple image uploads are allowed.
+ * @property {string} [acceptedFormats="image/*"] - The accepted file formats for image uploads.
+ * @property {boolean} [useFormatType=true] - Whether to enable format type selection (block or inline).
+ * @property {string} [defaultFormatType="block"] - The default image format type ("block" or "inline").
+ * @property {boolean} [keepFormatType=false] - Whether to retain the chosen format type after image insertion.
+ * @property {boolean} [linkEnableFileUpload] - Whether to enable file uploads for linked images.
+ * @property {FigureControls} [controls] - Figure controls.
+ */
+
+/**
+ * @class
+ * @description Image plugin.
+ * - This plugin provides image insertion functionality within the editor, supporting both file upload and URL input.
+ */
+class Image_ extends EditorInjector {
+	static key = 'image';
+	static type = 'modal';
+	static className = '';
+	/**
+	 * @this {Image_}
+	 * @param {Element} node - The node to check.
+	 * @returns {Element|null} Returns a node if the node is a valid component.
+	 */
+	static component(node) {
+		const compNode = dom.check.isFigure(node) || (/^span$/i.test(node.nodeName) && dom.utils.hasClass(node, 'se-component')) ? node.firstElementChild : node;
+		return /^IMG$/i.test(compNode?.nodeName) ? compNode : dom.check.isAnchor(compNode) && /^IMG$/i.test(compNode?.firstElementChild?.nodeName) ? compNode?.firstElementChild : null;
 	}
 
-	if (this.pluginOptions.useFormatType) {
-		this.as = this.pluginOptions.defaultFormatType;
-		this.asBlock = modalEl.querySelector('[data-command="asBlock"]');
-		this.asInline = modalEl.querySelector('[data-command="asInline"]');
-		this.eventManager.addEvent([this.asBlock, this.asInline], 'click', OnClickAsButton.bind(this));
+	/**
+	 * @constructor
+	 * @param {__se__EditorCore} editor - The root editor instance
+	 * @param {ImagePluginOptions} pluginOptions
+	 */
+	constructor(editor, pluginOptions) {
+		// plugin bisic properties
+		super(editor);
+		this.title = this.lang.image;
+		this.icon = 'image';
+
+		this.pluginOptions = {
+			canResize: pluginOptions.canResize === undefined ? true : pluginOptions.canResize,
+			showHeightInput: pluginOptions.showHeightInput === undefined ? true : !!pluginOptions.showHeightInput,
+			defaultWidth: !pluginOptions.defaultWidth ? 'auto' : numbers.is(pluginOptions.defaultWidth) ? pluginOptions.defaultWidth + 'px' : pluginOptions.defaultWidth,
+			defaultHeight: !pluginOptions.defaultHeight ? 'auto' : numbers.is(pluginOptions.defaultHeight) ? pluginOptions.defaultHeight + 'px' : pluginOptions.defaultHeight,
+			percentageOnlySize: !!pluginOptions.percentageOnlySize,
+			createFileInput: pluginOptions.createFileInput === undefined ? true : pluginOptions.createFileInput,
+			createUrlInput: pluginOptions.createUrlInput === undefined || !pluginOptions.createFileInput ? true : pluginOptions.createUrlInput,
+			uploadUrl: typeof pluginOptions.uploadUrl === 'string' ? pluginOptions.uploadUrl : null,
+			uploadHeaders: pluginOptions.uploadHeaders || null,
+			uploadSizeLimit: numbers.get(pluginOptions.uploadSizeLimit, 0),
+			uploadSingleSizeLimit: numbers.get(pluginOptions.uploadSingleSizeLimit, 0),
+			allowMultiple: !!pluginOptions.allowMultiple,
+			acceptedFormats: typeof pluginOptions.acceptedFormats !== 'string' || pluginOptions.acceptedFormats.trim() === '*' ? 'image/*' : pluginOptions.acceptedFormats.trim() || 'image/*',
+			useFormatType: pluginOptions.useFormatType ?? true,
+			defaultFormatType: ['block', 'inline'].includes(pluginOptions.defaultFormatType) ? pluginOptions.defaultFormatType : 'block',
+			keepFormatType: pluginOptions.keepFormatType ?? false
+		};
+
+		// create HTML
+		const sizeUnit = this.pluginOptions.percentageOnlySize ? '%' : 'px';
+		const modalEl = CreateHTML_modal(editor, this.pluginOptions);
+		const ctrlAs = this.pluginOptions.useFormatType ? 'as' : '';
+		const figureControls =
+			pluginOptions.controls || !this.pluginOptions.canResize
+				? [[ctrlAs, 'mirror_h', 'mirror_v', 'align', 'caption', 'revert', 'edit', 'remove']]
+				: [
+						[ctrlAs, 'resize_auto,100,75,50', 'rotate_l', 'rotate_r', 'mirror_h', 'mirror_v'],
+						['edit', 'align', 'caption', 'revert', 'remove']
+				  ];
+
+		// show align
+		this.alignForm = modalEl.alignForm;
+		if (!figureControls.some((subArray) => subArray.includes('align'))) this.alignForm.style.display = 'none';
+
+		// modules
+		const Link = this.plugins.link ? this.plugins.link.pluginOptions : {};
+		this.anchor = new ModalAnchorEditor(this, modalEl.html, {
+			textToDisplay: false,
+			title: true,
+			openNewWindow: Link.openNewWindow,
+			relList: Link.relList,
+			defaultRel: Link.defaultRel,
+			noAutoPrefix: Link.noAutoPrefix,
+			enableFileUpload: pluginOptions.linkEnableFileUpload
+		});
+		this.modal = new Modal(this, modalEl.html);
+		this.figure = new Figure(this, figureControls, {
+			sizeUnit: sizeUnit
+		});
+		this.fileManager = new FileManager(this, {
+			query: 'img',
+			loadHandler: this.events.onImageLoad,
+			eventHandler: this.events.onImageAction
+		});
+
+		// members
+		this.fileModalWrapper = modalEl.fileModalWrapper;
+		this.imgInputFile = modalEl.imgInputFile;
+		this.imgUrlFile = modalEl.imgUrlFile;
+		this.focusElement = this.imgInputFile || this.imgUrlFile;
+		this.altText = modalEl.altText;
+		this.captionCheckEl = modalEl.captionCheckEl;
+		this.captionEl = this.captionCheckEl?.parentElement;
+		this.previewSrc = modalEl.previewSrc;
+		this.sizeUnit = sizeUnit;
+		this.as = 'block';
+		this.proportion = null;
+		this.inputX = null;
+		this.inputY = null;
+		this._linkElement = null;
+		this._linkValue = '';
+		this._align = 'none';
+		this._svgDefaultSize = '30%';
+		this._base64RenderIndex = 0;
+		this._element = null;
+		this._cover = null;
+		this._container = null;
+		this._caption = null;
+		this._ratio = {
+			w: 1,
+			h: 1
+		};
+		this._origin_w = this.pluginOptions.defaultWidth === 'auto' ? '' : this.pluginOptions.defaultWidth;
+		this._origin_h = this.pluginOptions.defaultHeight === 'auto' ? '' : this.pluginOptions.defaultHeight;
+		this._resizing = this.pluginOptions.canResize;
+		this._onlyPercentage = this.pluginOptions.percentageOnlySize;
+		this._nonResizing = !this._resizing || !this.pluginOptions.showHeightInput || this._onlyPercentage;
+
+		// init
+		this.eventManager.addEvent(modalEl.tabs, 'click', this.#OpenTab.bind(this));
+		if (this.imgInputFile) this.eventManager.addEvent(modalEl.fileRemoveBtn, 'click', this.#RemoveSelectedFiles.bind(this));
+		if (this.imgUrlFile) this.eventManager.addEvent(this.imgUrlFile, 'input', this.#OnLinkPreview.bind(this));
+		if (this.imgInputFile && this.imgUrlFile) this.eventManager.addEvent(this.imgInputFile, 'change', this.#OnfileInputChange.bind(this));
+
+		const galleryButton = modalEl.galleryButton;
+		if (galleryButton) this.eventManager.addEvent(galleryButton, 'click', this.#OpenGallery.bind(this));
+
+		if (this._resizing) {
+			this.proportion = modalEl.proportion;
+			this.inputX = modalEl.inputX;
+			this.inputY = modalEl.inputY;
+			this.inputX.value = this.pluginOptions.defaultWidth;
+			this.inputY.value = this.pluginOptions.defaultHeight;
+
+			const ratioChange = this.#OnChangeRatio.bind(this);
+			this.eventManager.addEvent(this.inputX, 'keyup', this.#OnInputSize.bind(this, 'x'));
+			this.eventManager.addEvent(this.inputY, 'keyup', this.#OnInputSize.bind(this, 'y'));
+			this.eventManager.addEvent(this.inputX, 'change', ratioChange);
+			this.eventManager.addEvent(this.inputY, 'change', ratioChange);
+			this.eventManager.addEvent(this.proportion, 'change', ratioChange);
+			this.eventManager.addEvent(modalEl.revertBtn, 'click', this.#OnClickRevert.bind(this));
+		}
+
+		if (this.pluginOptions.useFormatType) {
+			this.as = this.pluginOptions.defaultFormatType;
+			this.asBlock = modalEl.asBlock;
+			this.asInline = modalEl.asInline;
+			this.eventManager.addEvent([this.asBlock, this.asInline], 'click', this.#OnClickAsButton.bind(this));
+		}
 	}
-};
-
-Image_.key = 'image';
-Image_.type = 'modal';
-Image_.component = function (node) {
-	node = domUtils.isFigure(node) ? node.firstElementChild : node;
-	return /^IMG$/i.test(node?.nodeName) ? node : domUtils.isAnchor(node) && /^IMG$/i.test(node?.firstElementChild?.nodeName) ? node?.firstElementChild : null;
-};
-Image_.className = '';
-Image_.prototype = {
+
 	/**
-	 * @override type = "modal"
+	 * @editorMethod Modules.Modal
+	 * @description Executes the method that is called when a "Modal" module's is opened.
 	 */
 	open() {
 		this.modal.open();
-	},
+	}
 
 	/**
-	 * @override Figure
+	 * @editorMethod Modules.Controller(Figure)
+	 * @description Executes the method that is called when a target component is edited.
 	 */
 	edit() {
 		this.modal.open();
-	},
+	}
 
 	/**
-	 * @override modal
-	 * @param {boolean} isUpdate open state is update
+	 * @editorMethod Modules.Modal
+	 * @description Executes the method that is called when a plugin's modal is opened.
+	 * @param {boolean} isUpdate "Indicates whether the modal is for editing an existing component (true) or registering a new one (false)."
 	 */
 	on(isUpdate) {
 		if (!isUpdate) {
-			this.inputX.value = this._origin_w = this.pluginOptions.defaultWidth === 'auto' ? '' : this.pluginOptions.defaultWidth;
-			this.inputY.value = this._origin_h = this.pluginOptions.defaultHeight === 'auto' ? '' : this.pluginOptions.defaultHeight;
+			if (this._resizing) {
+				this.inputX.value = this._origin_w = this.pluginOptions.defaultWidth === 'auto' ? '' : this.pluginOptions.defaultWidth;
+				this.inputY.value = this._origin_h = this.pluginOptions.defaultHeight === 'auto' ? '' : this.pluginOptions.defaultHeight;
+			}
 			if (this.imgInputFile && this.pluginOptions.allowMultiple) this.imgInputFile.setAttribute('multiple', 'multiple');
 		} else {
 			if (this.imgInputFile && this.pluginOptions.allowMultiple) this.imgInputFile.removeAttribute('multiple');
 		}
 
 		this.anchor.on(isUpdate);
-	},
+	}
 
 	/**
-	 * @description On paste or drop
-	 * @param {*} params { frameContext, event, file }
+	 * @editorMethod Editor.EventManager
+	 * @description Executes the event function of "paste" or "drop".
+	 * @param {Object} params { frameContext, event, file }
+	 * @param {__se__FrameContext} params.frameContext Frame context
+	 * @param {ClipboardEvent} params.event Event object
+	 * @param {File} params.file File object
+	 * @returns {boolean} - If return false, the file upload will be canceled
 	 */
 	onPastAndDrop({ file }) {
 		if (!/^image/.test(file.type)) return;
 
-		this._submitFile([file]);
+		this.submitFile([file]);
 		this.editor.focus();
 
 		return false;
-	},
+	}
 
 	/**
-	 * @override modal
-	 * @returns {boolean | undefined}
+	 * @editorMethod Modules.Modal
+	 * @description This function is called when a form within a modal window is "submit".
+	 * @returns {Promise<boolean>} Success or failure
 	 */
 	async modalAction() {
-		this._align = this.modal.form.querySelector('input[name="suneditor_image_radio"]:checked').value;
+		this._align = /** @type {HTMLInputElement} */ (this.modal.form.querySelector('input[name="suneditor_image_radio"]:checked')).value;
 
 		if (this.modal.isUpdate) {
-			this._update(this.inputX.value, this.inputY.value);
+			this._update(this.inputX?.value, this.inputY?.value);
 			this.history.push(false);
 		}
 
 		if (this.imgInputFile && this.imgInputFile.files.length > 0) {
-			return await this._submitFile(this.imgInputFile.files);
+			return await this.submitFile(this.imgInputFile.files);
 		} else if (this.imgUrlFile && this._linkValue.length > 0) {
-			return await this._submitURL(this._linkValue);
+			return await this.submitURL(this._linkValue);
 		}
 
 		return false;
-	},
+	}
 
 	/**
-	 * @override core
+	 * @editorMethod Editor.core
+	 * @description This method is used to validate and preserve the format of the component within the editor.
+	 * - It ensures that the structure and attributes of the element are maintained and secure.
+	 * - The method checks if the element is already wrapped in a valid container and updates its attributes if necessary.
+	 * - If the element isn't properly contained, a new container is created to retain the format.
+	 * @returns {{query: string, method: (element: HTMLImageElement) => void}} The format retention object containing the query and method to process the element.
+	 * - query: The selector query to identify the relevant elements (in this case, 'audio').
+	 * - method:The function to execute on the element to validate and preserve its format.
+	 * - The function takes the element as an argument, checks if it is contained correctly, and applies necessary adjustments.
 	 */
 	retainFormat() {
 		return {
@@ -211,33 +279,34 @@ Image_.prototype = {
 				const figureInfo = Figure.GetContainer(element);
 				if (figureInfo && figureInfo.container && figureInfo.cover) return;
 
-				this.ready(element);
+				this._ready(element);
 				this._fileCheck(this._origin_w, this._origin_h);
 			}
 		};
-	},
+	}
 
 	/**
-	 * @override modal
+	 * @editorMethod Modules.Modal
+	 * @description This function is called before the modal window is opened, but before it is closed.
 	 */
 	init() {
 		Modal.OnChangeFile(this.fileModalWrapper, []);
 		if (this.imgInputFile) this.imgInputFile.value = '';
 		if (this.imgUrlFile) this._linkValue = this.previewSrc.textContent = this.imgUrlFile.value = '';
 		if (this.imgInputFile && this.imgUrlFile) {
-			this.imgUrlFile.removeAttribute('disabled');
+			this.imgUrlFile.disabled = false;
 			this.previewSrc.style.textDecoration = '';
 		}
 
 		this.altText.value = '';
-		this.modal.form.querySelector('input[name="suneditor_image_radio"][value="none"]').checked = true;
+		/** @type {HTMLInputElement} */ (this.modal.form.querySelector('input[name="suneditor_image_radio"][value="none"]')).checked = true;
 		this.captionCheckEl.checked = false;
 		this._element = null;
 		this._ratio = {
 			w: 1,
 			h: 1
 		};
-		this._openTab('init');
+		this.#OpenTab('init');
 
 		if (this._resizing) {
 			this.inputX.value = this.pluginOptions.defaultWidth === 'auto' ? '' : this.pluginOptions.defaultWidth;
@@ -246,28 +315,32 @@ Image_.prototype = {
 		}
 
 		if (this.pluginOptions.useFormatType) {
-			this._activeAsInline(this.pluginOptions.defaultFormatType === 'inline');
+			this._activeAsInline((this.pluginOptions.keepFormatType ? this.as : this.pluginOptions.defaultFormatType) === 'inline');
 		}
 
 		this.anchor.init();
-	},
+	}
 
 	/**
-	 * @override component, fileManager
-	 * @description Called when a container is selected.
-	 * @param {Element} element Target element
+	 * @editorMethod Editor.Component
+	 * @description Executes the method that is called when a component of a plugin is selected.
+	 * @param {HTMLElement} target Target component element
 	 */
-	select(element) {
-		this.ready(element);
-	},
+	select(target) {
+		this._ready(target);
+	}
 
 	/**
-	 * @override fileManager, figure
+	 * @private
+	 * @description Prepares the component for selection.
+	 * - Ensures that the controller is properly positioned and initialized.
+	 * - Prevents duplicate event handling if the component is already selected.
+	 * @param {HTMLElement} target - The selected element.
 	 */
-	ready(target) {
+	_ready(target) {
 		if (!target) return;
 		const figureInfo = this.figure.open(target, { nonResizing: this._nonResizing, nonSizeInfo: false, nonBorder: false, figureTarget: false, __fileManagerInfo: false });
-		this.anchor.set(domUtils.isAnchor(target.parentNode) ? target.parentNode : null);
+		this.anchor.set(dom.check.isAnchor(target.parentNode) ? target.parentNode : null);
 
 		this._linkElement = this.anchor.currentTarget;
 		this._element = target;
@@ -277,13 +350,15 @@ Image_.prototype = {
 		this._align = figureInfo.align;
 		target.style.float = '';
 
-		this._origin_w = figureInfo.originWidth || figureInfo.w || '';
-		this._origin_h = figureInfo.originHeight || figureInfo.h || '';
+		this._origin_w = String(figureInfo.originWidth || figureInfo.w || '');
+		this._origin_h = String(figureInfo.originHeight || figureInfo.h || '');
 		this.altText.value = this._element.alt;
 
 		if (this.imgUrlFile) this._linkValue = this.previewSrc.textContent = this.imgUrlFile.value = this._element.src;
 
-		(this.modal.form.querySelector('input[name="suneditor_image_radio"][value="' + this._align + '"]') || this.modal.form.querySelector('input[name="suneditor_image_radio"][value="none"]')).checked = true;
+		/** @type {HTMLInputElement} */
+		const activeAlign = this.modal.form.querySelector('input[name="suneditor_image_radio"][value="' + this._align + '"]') || this.modal.form.querySelector('input[name="suneditor_image_radio"][value="none"]');
+		activeAlign.checked = true;
 		this.captionCheckEl.checked = !!this._caption;
 
 		if (!this._resizing) return;
@@ -294,11 +369,11 @@ Image_.prototype = {
 			w = numbers.get(w, 2);
 			if (w > 100) w = 100;
 		}
-		this.inputX.value = w === 'auto' ? '' : w;
+		this.inputX.value = String(w === 'auto' ? '' : w);
 
 		if (!this._onlyPercentage) {
 			const h = percentageRotation ? '' : figureInfo.height;
-			this.inputY.value = h === 'auto' ? '' : h;
+			this.inputY.value = String(h === 'auto' ? '' : h);
 		}
 
 		this.proportion.checked = true;
@@ -316,21 +391,24 @@ Image_.prototype = {
 		if (this.pluginOptions.useFormatType) {
 			this._activeAsInline(this.component.isInline(figureInfo.container));
 		}
-	},
+	}
 
 	/**
-	 * @override fileManager
+	 * @editorMethod Editor.Component
+	 * @description Method to delete a component of a plugin, called by the "FileManager", "Controller" module.
+	 * @param {HTMLElement} target Target element
+	 * @returns {Promise<void>}
 	 */
-	async destroy(element) {
-		const targetEl = element || this._element;
-		const container = domUtils.getParentElement(targetEl, Figure.__is) || targetEl;
+	async destroy(target) {
+		const targetEl = target || this._element;
+		const container = dom.query.getParentElement(targetEl, Figure.is) || targetEl;
 		const focusEl = container.previousElementSibling || container.nextElementSibling;
 		const emptyDiv = container.parentNode;
 
-		const message = await this.triggerEvent('onImageDeleteBefore', { target: targetEl, container, align: this._align, alt: this.altText.value, url: this._linkValue });
+		const message = await this.triggerEvent('onImageDeleteBefore', { element: targetEl, container, align: this._align, alt: this.altText.value, url: this._linkValue });
 		if (message === false) return;
 
-		domUtils.removeItem(container);
+		dom.utils.removeItem(container);
 		this.init();
 
 		if (emptyDiv !== this.editor.frameContext.get('wysiwyg')) {
@@ -346,46 +424,61 @@ Image_.prototype = {
 		// focus
 		this.editor.focusEdge(focusEl);
 		this.history.push(false);
-	},
+	}
 
+	/**
+	 * @private
+	 * @description Retrieves the current image information.
+	 * @returns {*} - The image data.
+	 */
 	_getInfo() {
 		return {
 			element: this._element,
 			anchor: this.anchor.create(true),
-			inputWidth: this.inputX.value,
-			inputHeight: this.inputY.value,
+			inputWidth: this.inputX?.value || '',
+			inputHeight: this.inputY?.value || '',
 			align: this._align,
 			isUpdate: this.modal.isUpdate,
 			alt: this.altText.value
 		};
-	},
+	}
 
+	/**
+	 * @private
+	 * @description Toggles between block and inline image format.
+	 * @param {boolean} isInline - Whether the image should be inline.
+	 */
 	_activeAsInline(isInline) {
-		const ctrlAlignBtn = this.figure.controller.form.querySelector('[data-command="onalign"]');
-
 		if (isInline) {
-			domUtils.addClass(this.asInline, 'on');
-			domUtils.removeClass(this.asBlock, 'on');
+			dom.utils.addClass(this.asInline, 'on');
+			dom.utils.removeClass(this.asBlock, 'on');
 			this.as = 'inline';
 			// buttns
 			if (this.alignForm) this.alignForm.style.display = 'none';
-			if (ctrlAlignBtn) ctrlAlignBtn.style.display = 'none';
+			// caption
+			if (this.captionEl) this.captionEl.style.display = 'none';
 		} else {
-			domUtils.addClass(this.asBlock, 'on');
-			domUtils.removeClass(this.asInline, 'on');
+			dom.utils.addClass(this.asBlock, 'on');
+			dom.utils.removeClass(this.asInline, 'on');
 			this.as = 'block';
 			// buttns
 			if (this.alignForm) this.alignForm.style.display = '';
-			if (ctrlAlignBtn) ctrlAlignBtn.style.display = '';
+			// caption
+			if (this.captionEl) this.captionEl.style.display = '';
 		}
-	},
+	}
 
-	async _submitFile(fileList) {
+	/**
+	 * @description Create an "image" component using the provided files.
+	 * @param {FileList|File[]} fileList File object list
+	 * @returns {Promise<boolean>} If return false, the file upload will be canceled
+	 */
+	async submitFile(fileList) {
 		if (fileList.length === 0) return false;
 
 		let fileSize = 0;
 		const files = [];
-		const slngleSizeLimit = this.uploadSingleSizeLimit;
+		const slngleSizeLimit = this.pluginOptions.uploadSingleSizeLimit;
 		for (let i = 0, len = fileList.length, f, s; i < len; i++) {
 			f = fileList[i];
 			if (!/image/i.test(f.type)) continue;
@@ -400,7 +493,7 @@ Image_.prototype = {
 					file: f
 				});
 
-				this.notice.open(message === NO_EVENT ? err : message || err);
+				this.ui.noticeOpen(message === NO_EVENT ? err : message || err);
 
 				return false;
 			}
@@ -420,7 +513,7 @@ Image_.prototype = {
 				uploadSize: fileSize
 			});
 
-			this.notice.open(message === NO_EVENT ? err : message || err);
+			this.ui.noticeOpen(message === NO_EVENT ? err : message || err);
 
 			return false;
 		}
@@ -430,9 +523,11 @@ Image_.prototype = {
 			infos = newInfos || infos;
 			this._serverUpload(infos, infos.files);
 		}.bind(this, imgInfo);
+		// se-ts-ignore
+		this._serverUpload;
 
 		const result = await this.triggerEvent('onImageUploadBefore', {
-			...imgInfo,
+			info: imgInfo,
 			handler
 		});
 
@@ -441,9 +536,14 @@ Image_.prototype = {
 		if (result !== null && typeof result === 'object') handler(result);
 
 		if (result === true || result === NO_EVENT) handler(null);
-	},
+	}
 
-	async _submitURL(url) {
+	/**
+	 * @description Create an "image" component using the provided url.
+	 * @param {string} url File url
+	 * @returns {Promise<boolean>} If return false, the file upload will be canceled
+	 */
+	async submitURL(url) {
 		if (!url) url = this._linkValue;
 		if (!url) return false;
 
@@ -458,11 +558,11 @@ Image_.prototype = {
 			infos = newInfos || infos;
 			const infoUrl = infos.url;
 			if (this.modal.isUpdate) this._updateSrc(infoUrl, infos.element, infos.files);
-			else this.create(infoUrl, infos.anchor, infos.inputWidth, infos.inputHeight, infos.align, infos.files, infos.alt);
+			else this._produce(infoUrl, infos.anchor, infos.inputWidth, infos.inputHeight, infos.align, infos.files, infos.alt);
 		}.bind(this, imgInfo);
 
 		const result = await this.triggerEvent('onImageUploadBefore', {
-			...imgInfo,
+			info: imgInfo,
 			handler
 		});
 
@@ -473,11 +573,17 @@ Image_.prototype = {
 		if (result === true || result === NO_EVENT) handler(null);
 
 		return true;
-	},
+	}
 
+	/**
+	 * @private
+	 * @description Updates the selected image size, alt text, and caption.
+	 * @param {string} width - New image width.
+	 * @param {string} height - New image height.
+	 */
 	_update(width, height) {
-		if (!width) width = this.inputX.value || 'auto';
-		if (!height) height = this.inputY.value || 'auto';
+		if (!width) width = this.inputX?.value || 'auto';
+		if (!height) height = this.inputY?.value || 'auto';
 
 		let imageEl = this._element;
 		const cover = this._cover;
@@ -505,7 +611,7 @@ Image_.prototype = {
 			}
 		} else {
 			if (this._caption) {
-				domUtils.removeItem(this._caption);
+				dom.utils.removeItem(this._caption);
 				this._caption = null;
 				modifiedCaption = true;
 			}
@@ -531,11 +637,11 @@ Image_.prototype = {
 
 		// size
 		if (this._resizing && changeSize) {
-			this.applySize(width, height);
+			this._applySize(width, height);
 		}
 
 		if (isNewAnchor) {
-			domUtils.removeItem(anchor);
+			dom.utils.removeItem(anchor);
 		}
 
 		// transform
@@ -556,23 +662,34 @@ Image_.prototype = {
 		imageEl.onload = () => {
 			this.select(imageEl);
 		};
-	},
+	}
 
+	/**
+	 * @private
+	 * @description Validates the image size and applies necessary transformations.
+	 * @param {string} width - The width of the image.
+	 * @param {string} height - The height of the image.
+	 */
 	_fileCheck(width, height) {
-		if (!width) width = this.inputX.value || 'auto';
-		if (!height) height = this.inputY.value || 'auto';
+		if (!width) width = this.inputX?.value || 'auto';
+		if (!height) height = this.inputY?.value || 'auto';
 
 		let imageEl = this._element;
 		let cover = this._cover;
+		let inlineCover = null;
 		let container = this._container === this._cover ? null : this._container;
 		let isNewContainer = false;
 
 		if (!cover || !container) {
 			isNewContainer = true;
 			imageEl = this._element.cloneNode(true);
-			const figureInfo = Figure.CreateContainer(imageEl, 'se-image-container');
+			const figureInfo =
+				this.pluginOptions.useFormatType && width !== 'auto' && (/^span$/i.test(this._element.parentElement?.nodeName) || this.format.isLine(this._element.parentElement))
+					? Figure.CreateInlineContainer(imageEl, 'se-image-container')
+					: Figure.CreateContainer(imageEl, 'se-image-container');
 			cover = figureInfo.cover;
 			container = figureInfo.container;
+			inlineCover = figureInfo.inlineCover;
 			this.figure.open(imageEl, { nonResizing: true, nonSizeInfo: false, nonBorder: false, figureTarget: false, __fileManagerInfo: true });
 		}
 
@@ -591,16 +708,18 @@ Image_.prototype = {
 
 		// caption
 		let modifiedCaption = false;
-		if (this.captionCheckEl.checked) {
-			if (!this._caption || isNewContainer) {
-				this._caption = Figure.CreateCaption(cover, this.lang.caption);
-				modifiedCaption = true;
-			}
-		} else {
-			if (this._caption) {
-				domUtils.removeItem(this._caption);
-				this._caption = null;
-				modifiedCaption = true;
+		if (!inlineCover) {
+			if (this.captionCheckEl.checked) {
+				if (!this._caption || isNewContainer) {
+					this._caption = Figure.CreateCaption(cover, this.lang.caption);
+					modifiedCaption = true;
+				}
+			} else {
+				if (this._caption) {
+					dom.utils.removeItem(this._caption);
+					this._caption = null;
+					modifiedCaption = true;
+				}
 			}
 		}
 
@@ -624,7 +743,7 @@ Image_.prototype = {
 
 		if (isNewContainer) {
 			imageEl = this._element;
-			this.figure._retainFigureFormat(container, this._element, isNewAnchor ? anchor : null);
+			this.figure.retainFigureFormat(container, this._element, isNewAnchor ? anchor : null, this.fileManager);
 			this._element = imageEl = container.querySelector('img');
 			this._cover = cover;
 			this._container = container;
@@ -632,16 +751,16 @@ Image_.prototype = {
 
 		// size
 		if (this._resizing && changeSize) {
-			this.applySize(width, height);
+			this._applySize(width, height);
 		}
 
 		if (isNewAnchor) {
 			if (!isNewContainer) {
-				domUtils.removeItem(anchor);
+				dom.utils.removeItem(anchor);
 			} else {
-				domUtils.removeItem(isNewAnchor);
-				if (domUtils.getListChildren(anchor, (current) => /IMG/i.test(current.tagName)).length === 0) {
-					domUtils.removeItem(anchor);
+				dom.utils.removeItem(isNewAnchor);
+				if (dom.query.getListChildren(anchor, (current) => /IMG/i.test(current.tagName)).length === 0) {
+					dom.utils.removeItem(anchor);
 				}
 			}
 		}
@@ -659,11 +778,16 @@ Image_.prototype = {
 
 		// align
 		this.figure.setAlign(imageEl, this._align);
-	},
+	}
 
-	_openTab(e) {
+	/**
+	 * @description Opens a specific tab inside the modal.
+	 * @param {MouseEvent|string} e - The event object or tab name.
+	 * @returns {boolean} - Whether the tab was successfully opened.
+	 */
+	#OpenTab(e) {
 		const modalForm = this.modal.form;
-		const targetElement = e === 'init' ? modalForm.querySelector('._se_tab_link') : e.target;
+		const targetElement = typeof e === 'string' ? modalForm.querySelector('._se_tab_link') : dom.query.getEventTarget(e);
 
 		if (!/^BUTTON$/i.test(targetElement.tagName)) {
 			return false;
@@ -674,7 +798,7 @@ Image_.prototype = {
 		let i;
 
 		// Get all elements with class="tabcontent" and hide them
-		const tabContent = modalForm.getElementsByClassName('_se_tab_content');
+		const tabContent = /** @type {HTMLCollectionOf<HTMLElement>}*/ (modalForm.getElementsByClassName('_se_tab_content'));
 		for (i = 0; i < tabContent.length; i++) {
 			tabContent[i].style.display = 'none';
 		}
@@ -682,12 +806,12 @@ Image_.prototype = {
 		// Get all elements with class="tablinks" and remove the class "active"
 		const tabLinks = modalForm.getElementsByClassName('_se_tab_link');
 		for (i = 0; i < tabLinks.length; i++) {
-			domUtils.removeClass(tabLinks[i], 'active');
+			dom.utils.removeClass(tabLinks[i], 'active');
 		}
 
 		// Show the current tab, and add an "active" class to the button that opened the tab
-		modalForm.querySelector('._se_tab_content_' + tabName).style.display = 'block';
-		domUtils.addClass(targetElement, 'active');
+		/** @type {HTMLElement}*/ (modalForm.querySelector('._se_tab_content_' + tabName)).style.display = 'block';
+		dom.utils.addClass(targetElement, 'active');
 
 		// focus
 		if (e !== 'init') {
@@ -699,20 +823,57 @@ Image_.prototype = {
 		}
 
 		return false;
-	},
+	}
 
-	applySize(w, h) {
-		if (!w) w = this.inputX.value || this.pluginOptions.defaultWidth;
-		if (!h) h = this.inputY.value || this.pluginOptions.defaultHeight;
+	/**
+	 * @private
+	 * @description Creates a new image component based on provided parameters.
+	 * @param {string} src - The image source URL.
+	 * @param {?Node} anchor - Optional anchor wrapping the image.
+	 * @param {string} width - Image width.
+	 * @param {string} height - Image height.
+	 * @param {string} align - Image alignment.
+	 * @param {{name: string, size: number}} file - File metadata.
+	 * @param {string} alt - Alternative text.
+	 */
+	_produce(src, anchor, width, height, align, file, alt) {
+		if (this.as !== 'inline') {
+			this.create(src, anchor, width, height, align, file, alt);
+		} else {
+			this.createInline(src, anchor, width, height, file, alt);
+		}
+	}
+
+	/**
+	 * @private
+	 * @description Applies the specified width and height to the image.
+	 * @param {string} w - Image width.
+	 * @param {string} h - Image height.
+	 */
+	_applySize(w, h) {
+		if (!w) w = this.inputX?.value || this.pluginOptions.defaultWidth;
+		if (!h) h = this.inputY?.value || this.pluginOptions.defaultHeight;
 		if (this._onlyPercentage) {
 			if (!w) w = '100%';
 			else if (/%$/.test(w)) w += '%';
 		}
-		this.figure.setSize(w, h, null);
-	},
+		this.figure.setSize(w, h);
+	}
 
+	/**
+	 * @description Creates a new image component, wraps it in a figure container with an optional anchor,
+	 * - applies size and alignment settings, and inserts it into the editor.
+	 * @param {string} src - The URL of the image to be inserted.
+	 * @param {?Node} anchor - An optional anchor element to wrap the image. If provided, a clone is used.
+	 * @param {string} width - The width value to be applied to the image.
+	 * @param {string} height - The height value to be applied to the image.
+	 * @param {string} align - The alignment setting for the image (e.g., 'left', 'center', 'right').
+	 * @param {{name: string, size: number}} file - File metadata associated with the image
+	 * @param {string} alt - The alternative text for the image.
+	 */
 	create(src, anchor, width, height, align, file, alt) {
-		const oImg = domUtils.createElement('IMG');
+		/** @type {HTMLImageElement} */
+		const oImg = dom.utils.createElement('IMG');
 		oImg.src = src;
 		oImg.alt = alt;
 		anchor = this._setAnchor(oImg, anchor ? anchor.cloneNode(false) : null);
@@ -732,23 +893,69 @@ Image_.prototype = {
 		this.figure.open(oImg, { nonResizing: this._nonResizing, nonSizeInfo: false, nonBorder: false, figureTarget: false, __fileManagerInfo: true });
 
 		// set size
-		this.applySize(width, height);
+		this._applySize(width, height);
 
 		// align
 		this.figure.setAlign(oImg, align);
 
 		this.fileManager.setFileData(oImg, file);
 
-		oImg.onload = OnloadImg.bind(this, oImg, this._svgDefaultSize, container);
-		this.component.insert(container, false, true);
-	},
+		oImg.onload = this.#OnloadImg.bind(this, oImg, this._svgDefaultSize, container);
+		this.component.insert(container, { skipCharCount: false, skipSelection: !this.options.get('componentAutoSelect'), skipHistory: false });
+	}
 
+	/**
+	 * @description Creates a new inline image component, wraps it in an inline figure container with an optional anchor,
+	 * - applies size settings, and inserts it into the editor.
+	 * @param {string} src - The URL of the image to be inserted.
+	 * @param {?Node} anchor - An optional anchor element to wrap the image. If provided, a clone is used.
+	 * @param {string} width - The width value to be applied to the image.
+	 * @param {string} height - The height value to be applied to the image.
+	 * @param {{name: string, size: number}} file - File metadata associated with the image
+	 * @param {string} alt - The alternative text for the image.
+	 */
+	createInline(src, anchor, width, height, file, alt) {
+		/** @type {HTMLImageElement} */
+		const oImg = dom.utils.createElement('IMG');
+		oImg.src = src;
+		oImg.alt = alt;
+		anchor = this._setAnchor(oImg, anchor ? anchor.cloneNode(false) : null);
+
+		const figureInfo = Figure.CreateInlineContainer(anchor, 'se-image-container');
+		const container = figureInfo.container;
+
+		this._element = oImg;
+		this._container = container;
+		this.figure.open(oImg, { nonResizing: this._nonResizing, nonSizeInfo: false, nonBorder: false, figureTarget: false, __fileManagerInfo: true });
+
+		// set size
+		this._applySize(width, height);
+
+		this.fileManager.setFileData(oImg, file);
+
+		oImg.onload = this.#OnloadImg.bind(this, oImg, this._svgDefaultSize, container);
+		this.component.insert(container, { skipCharCount: false, skipSelection: true, skipHistory: false });
+	}
+
+	/**
+	 * @private
+	 * @description Updates the image source URL.
+	 * @param {string} src - The new image source.
+	 * @param {HTMLImageElement} element - The image element.
+	 * @param {{ name: string, size: number }} file - File metadata.
+	 */
 	_updateSrc(src, element, file) {
 		element.src = src;
 		this.fileManager.setFileData(element, file);
 		this.component.select(element, Image_.key, false);
-	},
+	}
 
+	/**
+	 * @private
+	 * @description Registers the uploaded image and inserts it into the editor.
+	 * @param {ImageInfo} info - Image info.
+	 * @param {Object<string, *>} response - Server response data.
+	 */
 	_register(info, response) {
 		const fileList = response.result;
 
@@ -761,37 +968,57 @@ Image_.prototype = {
 				this._updateSrc(fileList[i].url, info.element, file);
 				break;
 			} else {
-				this.create(fileList[i].url, info.anchor, info.inputWidth, info.inputHeight, info.align, file, info.alt);
+				this._produce(fileList[i].url, info.anchor, info.inputWidth, info.inputHeight, info.align, file, info.alt);
 			}
 		}
-	},
+	}
 
+	/**
+	 * @private
+	 * @description Uploads the image to the server.
+	 * @param {ImageInfo} info - Image upload info.
+	 * @param {FileList} files - List of image files.
+	 */
 	_serverUpload(info, files) {
 		if (!files) return;
 
 		// server upload
 		const imageUploadUrl = this.pluginOptions.uploadUrl;
 		if (typeof imageUploadUrl === 'string' && imageUploadUrl.length > 0) {
-			this.fileManager.upload(imageUploadUrl, this.pluginOptions.uploadHeaders, files, UploadCallBack.bind(this, info), this._error.bind(this));
+			this.fileManager.upload(imageUploadUrl, this.pluginOptions.uploadHeaders, files, this.#UploadCallBack.bind(this, info), this._error.bind(this));
 		} else {
 			this._setBase64(files, info.anchor, info.inputWidth, info.inputHeight, info.align, info.alt, info.isUpdate);
 		}
-	},
+	}
 
+	/**
+	 * @private
+	 * @description Converts an image file to Base64 and inserts it into the editor.
+	 * @param {FileList|File[]} files - List of image files.
+	 * @param {?Node} anchor - Optional anchor wrapping the image.
+	 * @param {string} width - Image width.
+	 * @param {string} height - Image height.
+	 * @param {string} align - Image alignment.
+	 * @param {string} alt - Alternative text.
+	 * @param {boolean} isUpdate - Whether the image is being updated.
+	 */
 	_setBase64(files, anchor, width, height, align, alt, isUpdate) {
 		try {
 			const filesLen = this.modal.isUpdate ? 1 : files.length;
 
 			if (filesLen === 0) {
-				this.editor.hideLoading();
+				this.ui.hideLoading();
 				console.warn('[SUNEDITOR.image.base64.fail] cause : No applicable files');
 				return;
 			}
 
 			this._base64RenderIndex = filesLen;
-			const filesStack = [filesLen];
-			this.inputX.value = width;
-			this.inputY.value = height;
+			const filesStack = new Array(filesLen);
+
+			if (this._resizing) {
+				this.inputX.value = width;
+				this.inputY.value = height;
+			}
 
 			for (let i = 0, reader, file; i < filesLen; i++) {
 				reader = new FileReader();
@@ -805,28 +1032,51 @@ Image_.prototype = {
 
 					if (--this._base64RenderIndex === 0) {
 						this._onRenderBase64(update, filesStack, updateElement, anchor, width, height, align, alt);
-						this.editor.hideLoading();
+						this.ui.hideLoading();
 					}
 				}.bind(this, reader, isUpdate, this._element, file, i);
+				// se-ts-ignore
+				this._onRenderBase64;
 
 				reader.readAsDataURL(file);
 			}
 		} catch (error) {
-			this.editor.hideLoading();
+			this.ui.hideLoading();
 			throw Error(`[SUNEDITOR.plugins.image._setBase64.fail] ${error.message}`);
 		}
-	},
+	}
 
+	/**
+	 * @private
+	 * @description Inserts an image using a Base64-encoded string.
+	 * @param {boolean} update - Whether the image is being updated.
+	 * @param {Array<{result: string, file: { name: string, size: number }}>} filesStack - Stack of Base64-encoded files.
+	 * - result: Image url or Base64-encoded string
+	 * - file: File metadata ({ name: string, size: number })
+	 * @param {HTMLImageElement} updateElement - The image element being updated.
+	 * @param {?HTMLAnchorElement} anchor - Optional anchor wrapping the image.
+	 * @param {string} width - Image width.
+	 * @param {string} height - Image height.
+	 * @param {string} align - Image alignment.
+	 * @param {string} alt - Alternative text.
+	 */
 	_onRenderBase64(update, filesStack, updateElement, anchor, width, height, align, alt) {
 		for (let i = 0, len = filesStack.length; i < len; i++) {
 			if (update) {
 				this._updateSrc(filesStack[i].result, updateElement, filesStack[i].file);
 			} else {
-				this.create(filesStack[i].result, anchor, width, height, align, filesStack[i].file, alt);
+				this._produce(filesStack[i].result, anchor, width, height, align, filesStack[i].file, alt);
 			}
 		}
-	},
+	}
 
+	/**
+	 * @private
+	 * @description Wraps an image element with an anchor if provided.
+	 * @param {Node} imgTag - The image element to be wrapped.
+	 * @param {?Node} anchor - The anchor element to wrap around the image. If null, returns the image itself.
+	 * @returns {Node} - The wrapped image inside the anchor or the original image element.
+	 */
 	_setAnchor(imgTag, anchor) {
 		if (anchor) {
 			anchor.appendChild(imgTag);
@@ -834,127 +1084,172 @@ Image_.prototype = {
 		}
 
 		return imgTag;
-	},
+	}
 
+	/**
+	 * @private
+	 * @description Handles errors during image upload and displays appropriate messages.
+	 * @param {Object<string, *>} response - The error response from the server.
+	 * @returns {Promise<void>}
+	 */
 	async _error(response) {
 		const message = await this.triggerEvent('onImageUploadError', { error: response });
 		const err = message === NO_EVENT ? response.errorMessage : message || response.errorMessage;
-		this.notice.open(err);
+		this.ui.noticeOpen(err);
 		console.error('[SUNEDITOR.plugin.image.error]', err);
-	},
-
-	constructor: Image_
-};
+	}
 
-async function UploadCallBack(info, xmlHttp) {
-	if ((await this.triggerEvent('imageUploadHandler', { xmlHttp, info })) === NO_EVENT) {
-		const response = JSON.parse(xmlHttp.responseText);
-		if (response.errorMessage) {
-			this._error(response);
-		} else {
-			this._register(info, response);
+	/**
+	 * @description Handles the callback function for image upload completion.
+	 * @param {ImageInfo} info - Image information.
+	 * @param {XMLHttpRequest} xmlHttp - The XMLHttpRequest object.
+	 */
+	async #UploadCallBack(info, xmlHttp) {
+		if ((await this.triggerEvent('imageUploadHandler', { xmlHttp, info })) === NO_EVENT) {
+			const response = JSON.parse(xmlHttp.responseText);
+			if (response.errorMessage) {
+				this._error(response);
+			} else {
+				this._register(info, response);
+			}
 		}
 	}
-}
 
-function RemoveSelectedFiles() {
-	this.imgInputFile.value = '';
-	if (this.imgUrlFile) {
-		this.imgUrlFile.removeAttribute('disabled');
-		this.previewSrc.style.textDecoration = '';
+	#RemoveSelectedFiles() {
+		this.imgInputFile.value = '';
+		if (this.imgUrlFile) {
+			this.imgUrlFile.disabled = false;
+			this.previewSrc.style.textDecoration = '';
+		}
+
+		// inputFile check
+		Modal.OnChangeFile(this.fileModalWrapper, []);
 	}
 
-	// inputFile check
-	Modal.OnChangeFile(this.fileModalWrapper, []);
-}
+	#OnInputSize(xy, e) {
+		if (keyCodeMap.isSpace(e.code)) {
+			e.preventDefault();
+			return;
+		}
+
+		if (xy === 'x' && this._onlyPercentage && e.target.value > 100) {
+			e.target.value = 100;
+		} else if (this.proportion.checked) {
+			const ratioSize = Figure.CalcRatio(this.inputX.value, this.inputY.value, this.sizeUnit, this._ratio);
+			if (xy === 'x') {
+				this.inputY.value = String(ratioSize.h);
+			} else {
+				this.inputX.value = String(ratioSize.w);
+			}
+		}
+	}
 
-function OnInputSize(xy, e) {
-	if (e.keyCode === 32) {
-		e.preventDefault();
-		return;
+	#OnChangeRatio() {
+		this._ratio = this.proportion.checked
+			? Figure.GetRatio(this.inputX.value, this.inputY.value, this.sizeUnit)
+			: {
+					w: 1,
+					h: 1
+			  };
 	}
 
-	if (xy === 'x' && this._onlyPercentage && e.target.value > 100) {
-		e.target.value = 100;
-	} else if (this.proportion.checked) {
-		const ratioSize = Figure.CalcRatio(this.inputX.value, this.inputY.value, this.sizeUnit, this._ratio);
-		if (xy === 'x') {
-			this.inputY.value = ratioSize.h;
+	#OnClickRevert() {
+		if (this._onlyPercentage) {
+			this.inputX.value = Number(this._origin_w) > 100 ? '100' : this._origin_w;
 		} else {
-			this.inputX.value = ratioSize.w;
+			this.inputX.value = this._origin_w;
+			this.inputY.value = this._origin_h;
 		}
 	}
-}
 
-function OnChangeRatio() {
-	this._ratio = this.proportion.checked
-		? Figure.GetRatio(this.inputX.value, this.inputY.value, this.sizeUnit)
-		: {
-				w: 1,
-				h: 1
-		  };
-}
+	#OnClickAsButton({ target }) {
+		this._activeAsInline(target.getAttribute('data-command') === 'asInline');
+	}
 
-function OnClickRevert() {
-	if (this._onlyPercentage) {
-		this.inputX.value = this._origin_w > 100 ? 100 : this._origin_w;
-	} else {
-		this.inputX.value = this._origin_w;
-		this.inputY.value = this._origin_h;
+	#OnLinkPreview(e) {
+		const value = e.target.value.trim();
+		this._linkValue = this.previewSrc.textContent = !value
+			? ''
+			: this.options.get('defaultUrlProtocol') && !value.includes('://') && value.indexOf('#') !== 0
+			? this.options.get('defaultUrlProtocol') + value
+			: !value.includes('://')
+			? '/' + value
+			: value;
 	}
-}
 
-function OnClickAsButton({ target }) {
-	this._activeAsInline(target.getAttribute('data-command') === 'asInline');
-}
+	#OnfileInputChange({ target }) {
+		if (!this.imgInputFile.value) {
+			this.imgUrlFile.disabled = false;
+			this.previewSrc.style.textDecoration = '';
+		} else {
+			this.imgUrlFile.disabled = true;
+			this.previewSrc.style.textDecoration = 'line-through';
+		}
 
-function OnLinkPreview(e) {
-	const value = e.target.value.trim();
-	this._linkValue = this.previewSrc.textContent = !value
-		? ''
-		: this.options.get('defaultUrlProtocol') && !value.includes('://') && value.indexOf('#') !== 0
-		? this.options.get('defaultUrlProtocol') + value
-		: !value.includes('://')
-		? '/' + value
-		: value;
-}
+		// inputFile check
+		Modal.OnChangeFile(this.fileModalWrapper, target.files);
+	}
 
-function OnfileInputChange({ target }) {
-	if (!this.imgInputFile.value) {
-		this.imgUrlFile.removeAttribute('disabled');
-		this.previewSrc.style.textDecoration = '';
-	} else {
-		this.imgUrlFile.setAttribute('disabled', true);
-		this.previewSrc.style.textDecoration = 'line-through';
+	#OpenGallery() {
+		this.plugins.imageGallery.open(this.#SetUrlInput.bind(this));
 	}
 
-	// inputFile check
-	Modal.OnChangeFile(this.fileModalWrapper, target.files);
-}
+	#SetUrlInput(target) {
+		this.altText.value = target.getAttribute('data-value') || target.alt;
+		this._linkValue = this.previewSrc.textContent = this.imgUrlFile.value = target.getAttribute('data-command') || target.src;
+		this.imgUrlFile.focus();
+	}
 
-function OpenGallery() {
-	this.plugins.imageGallery.open(_setUrlInput.bind(this));
-}
+	#OnloadImg(oImg, _svgDefaultSize, container) {
+		// svg exception handling
+		if (oImg.offsetWidth === 0) this._applySize(_svgDefaultSize, '');
+		if (this.options.get('componentAutoSelect')) {
+			this.component.select(oImg, Image_.key, false);
+		} else {
+			if (!this.component.isInline(container)) {
+				const line = this.format.addLine(container, null);
+				if (line) this.selection.setRange(line, 0, line, 0);
+			} else {
+				const r = this.selection.getNearRange(container);
+				if (r) {
+					this.selection.setRange(r.container, r.offset, r.container, r.offset);
+				} else {
+					this.component.select(oImg, Image_.key, false);
+				}
+			}
+		}
 
-function _setUrlInput(target) {
-	this.altText.value = target.getAttribute('data-value') || target.alt;
-	this._linkValue = this.previewSrc.textContent = this.imgUrlFile.value = target.getAttribute('data-command') || target.src;
-	this.imgUrlFile.focus();
-}
+		this.editor._iframeAutoHeight(this.editor.frameContext);
+		this.history.push(false);
 
-function OnloadImg(oImg, _svgDefaultSize, container) {
-	// svg exception handling
-	if (oImg.offsetWidth === 0) this.applySize(_svgDefaultSize, '');
-	if (this.options.get('mediaAutoSelect')) {
-		this.component.select(oImg, Image_.key, false);
-	} else {
-		const line = this.format.addLine(container, null);
-		if (line) this.setRange(line, 0, line, 0);
+		delete oImg.onload;
 	}
-
-	delete oImg.onload;
 }
 
+/**
+ * @typedef {Object} ModalReturns
+ * @property {HTMLElement} html
+ * @property {HTMLElement} alignForm
+ * @property {HTMLElement} fileModalWrapper
+ * @property {HTMLInputElement} imgInputFile
+ * @property {HTMLInputElement} imgUrlFile
+ * @property {HTMLInputElement} altText
+ * @property {HTMLInputElement} captionCheckEl
+ * @property {HTMLElement} previewSrc
+ * @property {HTMLElement} tabs
+ * @property {HTMLButtonElement} galleryButton
+ * @property {HTMLInputElement} proportion
+ * @property {HTMLInputElement} inputX
+ * @property {HTMLInputElement} inputY
+ * @property {HTMLButtonElement} revertBtn
+ * @property {HTMLButtonElement} asBlock
+ * @property {HTMLButtonElement} asInline
+ * @property {HTMLButtonElement} fileRemoveBtn
+ *
+ * @param {__se__EditorCore} editor
+ * @param {*} pluginOptions
+ * @returns {ModalReturns}
+ */
 function CreateHTML_modal({ lang, icons, plugins }, pluginOptions) {
 	const createFileInputHtml = !pluginOptions.createFileInput
 		? ''
@@ -970,7 +1265,7 @@ function CreateHTML_modal({ lang, icons, plugins }, pluginOptions) {
 		<div class="se-modal-form">
 			<label>${lang.image_modal_url}</label>
 			<div class="se-modal-form-files">
-				<input class="se-input-form se-input-url _se_image_url" data-focus type="text" />
+				<input class="se-input-form se-input-url" data-focus type="text" />
 				${
 					plugins.imageGallery
 						? `<button type="button" class="se-btn se-tooltip se-modal-files-edge-button __se__gallery" aria-label="${lang.imageGallery}">
@@ -992,10 +1287,10 @@ function CreateHTML_modal({ lang, icons, plugins }, pluginOptions) {
 				<label class="se-modal-size-x">&nbsp;</label>
 				<label class="size-h">${lang.height}</label>
 			</div>
-			<input class="se-input-control _se_image_size_x" placeholder="auto" type="text" />
+			<input class="se-input-control _se_size_x" placeholder="auto" type="text" />
 			<label class="se-modal-size-x">x</label>
-			<input type="text" class="se-input-control _se_image_size_y" placeholder="auto" />
-			<label><input type="checkbox" class="se-modal-btn-check _se_image_check_proportion" checked/>&nbsp;${lang.proportion}</label>
+			<input type="text" class="se-input-control _se_size_y" placeholder="auto" />
+			<label><input type="checkbox" class="se-modal-btn-check _se_check_proportion" checked/>&nbsp;${lang.proportion}</label>
 			<button type="button" aria-label="${lang.revert}" class="se-btn se-tooltip se-modal-btn-revert">
 				${icons.revert}
 				${CreateTooltipInner(lang.revert)}
@@ -1008,11 +1303,11 @@ function CreateHTML_modal({ lang, icons, plugins }, pluginOptions) {
 		<div class="se-modal-form">
 			<div class="se-modal-flex-form">
 				<button type="button" data-command="asBlock" class="se-btn se-tooltip" aria-label="${lang.inlineStyle}">
-					${icons.component_outline}
+					${icons.as_block}
 					${CreateTooltipInner(lang.blockStyle)}
 				</button>
 				<button type="button" data-command="asInline" class="se-btn se-tooltip" aria-label="${lang.inlineStyle}">
-					${icons.component_inline}
+					${icons.as_inline}
 					${CreateTooltipInner(lang.inlineStyle)}
 				</button>
 			</div>
@@ -1056,7 +1351,27 @@ function CreateHTML_modal({ lang, icons, plugins }, pluginOptions) {
 			</div>
 		</form>`;
 
-	return domUtils.createElement('DIV', { class: 'se-modal-content' }, html);
+	const content = dom.utils.createElement('DIV', { class: 'se-modal-content' }, html);
+
+	return {
+		html: content,
+		alignForm: content.querySelector('.se-figure-align'),
+		fileModalWrapper: content.querySelector('.se-flex-input-wrapper'),
+		imgInputFile: content.querySelector('.__se__file_input'),
+		imgUrlFile: content.querySelector('.se-input-url'),
+		altText: content.querySelector('._se_image_alt'),
+		captionCheckEl: content.querySelector('._se_image_check_caption'),
+		previewSrc: content.querySelector('._se_tab_content_image .se-link-preview'),
+		tabs: content.querySelector('.se-modal-tabs'),
+		galleryButton: content.querySelector('.__se__gallery'),
+		proportion: content.querySelector('._se_check_proportion'),
+		inputX: content.querySelector('._se_size_x'),
+		inputY: content.querySelector('._se_size_y'),
+		revertBtn: content.querySelector('.se-modal-btn-revert'),
+		asBlock: content.querySelector('[data-command="asBlock"]'),
+		asInline: content.querySelector('[data-command="asInline"]'),
+		fileRemoveBtn: content.querySelector('.se-file-remove')
+	};
 }
 
 export default Image_;