suneditor 3.1.2 → 3.1.3

package/src/plugins/dropdown/table/services/table.style.js

@@ -598,16 +598,25 @@ export class TableStyleService {
 		this._propsCache = [];
 
 		for (let i = 0, t, isBreak; (t = targets[i]); i++) {
-			// eslint-disable-next-line no-shadow
-			const { cssText, border, backgroundColor, color, textAlign, verticalAlign, fontWeight, textDecoration, fontStyle } = t.style;
-			this._propsCache.push([t, cssText]);
+			const {
+				cssText: t_cssText,
+				border: t_border,
+				backgroundColor: t_backgroundColor,
+				color: t_color,
+				textAlign: t_textAlign,
+				verticalAlign: t_verticalAlign,
+				fontWeight: t_fontWeight,
+				textDecoration: t_textDecoration,
+				fontStyle: t_fontStyle,
+			} = t.style;
+			this._propsCache.push([t, t_cssText]);
 			if (isBreak) continue;
 
-			const { c, s, w } = this.#getBorderStyle(border);
+			const { c, s, w } = this.#getBorderStyle(t_border);
 
 			// use getComputedStyle to normalize any CSS color format to rgb
-			let hexBackColor = backgroundColor;
-			let hexColor = color;
+			let hexBackColor = t_backgroundColor;
+			let hexColor = t_color;
 			if (hexBackColor || hexColor) {
 				const computed = _w.getComputedStyle(t);
 				if (hexBackColor) hexBackColor = computed.backgroundColor;
@@ -619,12 +628,12 @@ export class TableStyleService {
 			if (b_width && cellBorder.w !== w) b_width = '';
 			if (backColor !== converter.rgb2hex(hexBackColor)) backColor = '';
 			if (fontColor !== converter.rgb2hex(hexColor)) fontColor = '';
-			if (align !== (isTable ? this.#state.figureElement?.style.float : textAlign)) align = '';
-			if (align_v && align_v !== verticalAlign) align_v = '';
-			if (bold && bold !== /.+/.test(fontWeight)) bold = false;
-			if (underline && underline !== /underline/i.test(textDecoration)) underline = false;
-			if (strike && strike !== /line-through/i.test(textDecoration)) strike = false;
-			if (italic && italic !== /italic/i.test(fontStyle)) italic = false;
+			if (align !== (isTable ? this.#state.figureElement?.style.float : t_textAlign)) align = '';
+			if (align_v && align_v !== t_verticalAlign) align_v = '';
+			if (bold && bold !== /.+/.test(t_fontWeight)) bold = false;
+			if (underline && underline !== /underline/i.test(t_textDecoration)) underline = false;
+			if (strike && strike !== /line-through/i.test(t_textDecoration)) strike = false;
+			if (italic && italic !== /italic/i.test(t_fontStyle)) italic = false;
 			if (!b_color || !b_style || !b_width || !backColor || !fontColor) {
 				isBreak = true;
 			}

package/types/core/schema/options.d.ts

@@ -309,7 +309,7 @@ export namespace DEFAULTS {
  *   attributeWhitelist: {
  *     a: 'href|target',
  *     img: 'src|alt',
- *     '*': 'id|data-*'
+ *     '*': 'id|data-[^\s]+'
  *   }
  * }
  * ```
@@ -1055,7 +1055,7 @@ export type EditorBaseOptions = {
 	 * attributeWhitelist: {
 	 * a: 'href|target',
 	 * img: 'src|alt',
-	 * '*': 'id|data-*'
+	 * '*': 'id|data-[^\s]+'
 	 * }
 	 * }
 	 * ```

package/types/core/section/documentType.d.ts

@@ -30,9 +30,19 @@ declare class DocumentType {
 	 * @param {number} t - The initial top position value to be adjusted.
 	 * @param {HTMLCollection} chr - The elements array in the current (main) page.
 	 * @param {HTMLCollection} mChr - The elements array in the mirrored page.
+	 * @param {Array.<{number: number, top: number, isBreak?: boolean}>} [pages] - The pages array containing page break info.
 	 * @returns {number|null} The adjusted top value.
 	 */
-	_calcPageBreakTop(t: number, chr: HTMLCollection, mChr: HTMLCollection): number | null;
+	_calcPageBreakTop(
+		t: number,
+		chr: HTMLCollection,
+		mChr: HTMLCollection,
+		pages?: Array<{
+			number: number;
+			top: number;
+			isBreak?: boolean;
+		}>,
+	): number | null;
 	/**
 	 * @internal
 	 * @description Initializes the cache for document elements.
@@ -44,6 +54,7 @@ declare class DocumentType {
 	 * @description Retrieves the element at a given position.
 	 * @param {number} pageTop - The vertical position to check.
 	 * @param {HTMLCollection} mChr - List of mirrored elements.
+	 * @param {Array.<{number: number, top: number, isBreak?: boolean}>} [pages] - The pages array containing page break info for skipping break elements.
 	 * @returns {{ci: number, cm: number, ch: number}} The closest element and its related data.
 	 * - ci: The index of the closest element.
 	 * - cm: The distance between the top of the closest element and the given position.
@@ -52,6 +63,11 @@ declare class DocumentType {
 	_getElementAtPosition(
 		pageTop: number,
 		mChr: HTMLCollection,
+		pages?: Array<{
+			number: number;
+			top: number;
+			isBreak?: boolean;
+		}>,
 	): {
 		ci: number;
 		cm: number;