@pixui-dev/pixui-richtext-helper 0.2.19 → 0.2.21

package/dist/RichTextCore.d.ts

@@ -86,6 +86,10 @@ export declare class RichTextCore {
     private static flattenNestedText;
     /** 将同一行的 text 节点转为 div 并外包一层 text */
     private static convertSiblingTextToDiv;
+    /**
+     * 将首尾的空格替换为透明占位 key，避免被 PixUI trim 掉。
+     */
+    private static ensureKeyEdgeSpacesPreserved;
     /** text-indent 首行缩进处理 */
     private static handleTextIndent;
     /** 处理 line-height / letter-spacing 属性 */

package/dist/RichTextCore.js

@@ -15,13 +15,23 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : function(o, v) {
     o["default"] = v;
 });
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
         if (ar || !(i in from)) {
@@ -43,7 +53,7 @@ var LinkNodeType;
 (function (LinkNodeType) {
     LinkNodeType["IMG"] = "img";
     LinkNodeType["DIV"] = "div";
-})(LinkNodeType = exports.LinkNodeType || (exports.LinkNodeType = {}));
+})(LinkNodeType || (exports.LinkNodeType = LinkNodeType = {}));
 var textNodeStyle = [
     { key: "direction", isNumber: false },
     { key: "line-height", isNumber: true },
@@ -303,9 +313,17 @@ var RichTextCore = /** @class */ (function () {
      * @returns 转换后的HTML字符串
      */
     RichTextCore.convertAllPxToEm = function (html) {
+        var styleCache = new Map(); // 避免重复转换相同style
         // 转换style属性中的px
         html = html.replace(/style="([^"]*?)"/g, function (match, styleContent) {
-            var convertedStyle = convertStylePxToEm(styleContent);
+            if (!styleContent || styleContent.indexOf("px") === -1) {
+                return match;
+            }
+            var convertedStyle = styleCache.get(styleContent);
+            if (!convertedStyle) {
+                convertedStyle = convertStylePxToEm(styleContent);
+                styleCache.set(styleContent, convertedStyle);
+            }
             return "style=\"".concat(convertedStyle, "\"");
         });
         return html;
@@ -402,6 +420,7 @@ var RichTextCore = /** @class */ (function () {
      * 处理单个段落片段，返回转换后的片段 HTML
      */
     RichTextCore.processSegment = function (segmentHtml, config) {
+        segmentHtml = segmentHtml.replaceAll(/&nbsp;/g, " ");
         var $ = cheerio.load(segmentHtml, null, false);
         // 预处理：data-list → class、class → style、margin→padding 合并
         this.preprocess($);
@@ -433,6 +452,8 @@ var RichTextCore = /** @class */ (function () {
         this.flattenNestedText($);
         // 同级文本：拆分为 <key> 片段并统一包入父 <text>
         this.convertSiblingTextToDiv($);
+        // 保留 key 节点首尾空格,转为透明占位-，避免被 PixUI trim
+        this.ensureKeyEdgeSpacesPreserved($);
         // 首行缩进：text-indent 转透明占位
         this.handleTextIndent($);
         // 行高与字间距：聚合到父 <text> 并按配置缩放 line-height
@@ -444,13 +465,10 @@ var RichTextCore = /** @class */ (function () {
         // 清理空 <text>
         this.removeEmptyText($);
         // this.fixHeadingFontSize($);
-        // 最后：修正 img 结束标签、nbsp
         var res = $.html();
         res = res
             .replaceAll(/<img([^>]+)>/g, "<img$1 />")
             .replaceAll(/&nbsp;/g, " ")
-            .replaceAll(/&amp;/g, "&")
-            .replaceAll(/&quot;/g, '"')
             .replaceAll("\"", "\"");
         // 统一进行px到em转换
         if (config === null || config === void 0 ? void 0 : config.convertPxToEm) {
@@ -674,10 +692,10 @@ var RichTextCore = /** @class */ (function () {
                     }
                     // 根据 list-style-type 与列表类型决定 marker
                     var BULLET_MARKER_MAP = {
-                        disc: "●",
-                        circle: "○",
-                        square: "■",
-                        "empty square": "□",
+                        disc: "●", // 实心圆
+                        circle: "○", // 空心圆
+                        square: "■", // 实心方块
+                        "empty square": "□", //空心方块
                         none: "",
                     };
                     var finalMarker = "";
@@ -857,8 +875,8 @@ var RichTextCore = /** @class */ (function () {
                 if (brParent.length > 0)
                     return;
                 if (this.type === "text") {
-                    var text = this.data.trim();
-                    if (text.length > 0) {
+                    var text = this.data;
+                    if (text.trim().length > 0) {
                         $(this).replaceWith("<text style=\"".concat(mergeStyles("flex-shrink: 0", "flex-direction: row", "word-break: break-word"), "\">").concat(text, "</text>"));
                     }
                 }
@@ -1066,6 +1084,47 @@ var RichTextCore = /** @class */ (function () {
             }
         });
     };
+    /**
+     * 将首尾的空格替换为透明占位 key，避免被 PixUI trim 掉。
+     */
+    RichTextCore.ensureKeyEdgeSpacesPreserved = function ($) {
+        var placeholderStyle = mergeStyles("color: transparent", "flex-shrink: 0", "font-size: 1em");
+        $("text").each(function () {
+            $(this)
+                .find("key")
+                .each(function () {
+                var $key = $(this);
+                var nodes = $key.contents().toArray();
+                var textNodes = nodes.filter(function (n) { return n && n.type === "text"; });
+                if (textNodes.length === 0)
+                    return;
+                //节点的字号1/2或者0.5em
+                var fontSize = $key.css("font-size");
+                var fontSizeRes = "0.5em";
+                if (fontSize) {
+                    fontSizeRes = "".concat(parseFloat(fontSize) / 2).concat(fontSize.replace(/(\d+)/g, ""));
+                }
+                // 处理前导空格
+                var firstTextNode = textNodes[0];
+                var firstData = (firstTextNode.data || "");
+                var leadingMatch = firstData.match(/^( +)/);
+                if (leadingMatch && leadingMatch[1].length > 0) {
+                    var n = leadingMatch[1].length;
+                    $key.before("<key style=\"".concat(mergeStyles(placeholderStyle, "font-size: ".concat(fontSizeRes)), "\">").concat("-".repeat(n), "</key>"));
+                    firstTextNode.data = firstData.slice(n);
+                }
+                // 处理后缀空格
+                var lastTextNode = textNodes[textNodes.length - 1];
+                var lastData = (lastTextNode.data || "");
+                var trailingMatch = lastData.match(/( +)$/);
+                if (trailingMatch && trailingMatch[1].length > 0) {
+                    var n = trailingMatch[1].length;
+                    $key.after("<key style=\"".concat(mergeStyles(placeholderStyle, "font-size: ".concat(fontSizeRes)), "\">").concat("-".repeat(n), "</key>"));
+                    lastTextNode.data = lastData.slice(0, lastData.length - n);
+                }
+            });
+        });
+    };
     /** text-indent 首行缩进处理 */
     RichTextCore.handleTextIndent = function ($) {
         $("*").each(function () {

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const LIB_VERSION = "0.2.19";
+export declare const LIB_VERSION = "0.2.21";

package/dist/version.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LIB_VERSION = void 0;
 /* Auto-generated by scripts/generate-version.js */
-exports.LIB_VERSION = "0.2.19";
+exports.LIB_VERSION = "0.2.21";

package/package.json

@@ -1,27 +1,27 @@
-{
-    "name": "@pixui-dev/pixui-richtext-helper",
-    "version": "0.2.19",
-    "description": "pixui richtext helper",
-    "main": "dist/index.js",
-    "types": "dist/index.d.ts",
-    "files": [
-        "dist/**/*",
-        "index.js",
-        "readme.md"
-    ],
-    "scripts": {
-        "build": "node scripts/generate-version.js && rm -rf dist && tsc"
-    },
-    "publishConfig": {
-        "access": "public"
-    },
-    "author": "jnjnjnzhang",
-    "license": "ISC",
-    "devDependencies": {
-        "@types/node": "^22.15.33",
-        "typescript": "^5.8.3"
-    },
-    "dependencies": {
-        "cheerio": "1.0.0-rc.10"
-    }
+{
+    "name": "@pixui-dev/pixui-richtext-helper",
+    "version": "0.2.21",
+    "description": "pixui richtext helper",
+    "main": "dist/index.js",
+    "types": "dist/index.d.ts",
+    "files": [
+        "dist/**/*",
+        "index.js",
+        "readme.md"
+    ],
+    "scripts": {
+        "build": "node scripts/generate-version.js && rm -rf dist && tsc"
+    },
+    "publishConfig": {
+        "access": "public"
+    },
+    "author": "jnjnjnzhang",
+    "license": "ISC",
+    "devDependencies": {
+        "@types/node": "^22.15.33",
+        "typescript": "^5.8.3"
+    },
+    "dependencies": {
+        "cheerio": "1.0.0-rc.10"
+    }
 }

package/readme.md

@@ -149,3 +149,15 @@ componentDidMount() { // 在节点渲染后绑定点击事件
 0.2.14(f196abf819a64d9b762137512560261e1742c4d4)
 
 1. 修复：段落缩进距离过长
+
+0.2.19
+
+1. 手动补充阿语空格，绕过pixui在阿语rtl节点下key节点内容不带阿语的时候有可能排版错误的问题
+
+0.2.20
+
+1. 直接填充透明占位符规避行内多个节点的时候空格被pixui trim的问题
+
+0.2.21
+
+1. 优化px转换为em的工具函数的性能