@eva/plugin-ui 2.1.0-beta.2 → 2.1.0-beta.4

package/dist/plugin-ui.esm.js

@@ -508,6 +508,37 @@ function resolveViewRef(game, go, ref) {
     }
     return null;
 }
+/**
+ * @pixi/ui ProgressBar 的非 nine-slice fillPaddings 只移动 fill.x/y,
+ * 不会自动把 fill view 缩成内层尺寸。DSL 常用的 inline color/shape
+ * 需要先扣除 padding,否则 fill 会向下或向右溢出,造成上下层偏差。
+ */
+function normalizeProgressFillViewRef(ref, fillPaddings, fallbackSize) {
+    if (!ref)
+        return ref;
+    const paddings = normalizePaddings(fillPaddings);
+    if (paddings.top === 0 && paddings.right === 0 && paddings.bottom === 0 && paddings.left === 0) {
+        return ref;
+    }
+    const fallback = ref.fallback
+        ? normalizeProgressFillViewRef(ref.fallback, paddings, fallbackSize)
+        : undefined;
+    if ('color' in ref) {
+        const width = shrinkSize(ref.width, paddings.left + paddings.right);
+        const height = shrinkSize(ref.height, paddings.top + paddings.bottom);
+        return Object.assign(Object.assign(Object.assign({}, ref), { width,
+            height, radius: shrinkRadius(ref.radius, width, height) }), (fallback ? { fallback } : {}));
+    }
+    if ('shape' in ref) {
+        return Object.assign(Object.assign(Object.assign({}, ref), { shape: shrinkInlineShape(ref.shape, paddings, fallbackSize) }), (fallback ? { fallback } : {}));
+    }
+    if ('ui' in ref) {
+        return Object.assign(Object.assign(Object.assign({}, ref), { ui: shrinkInlineShape(ref.ui, paddings, fallbackSize) }), (fallback ? { fallback } : {}));
+    }
+    if (fallback)
+        return Object.assign(Object.assign({}, ref), { fallback });
+    return ref;
+}
 function wrapBorrowedEntityView(childContainer, childName) {
     const wrapper = new Container();
     wrapper.label = childName ? `${childName}:view-ref` : 'plugin-ui-view-ref';
@@ -535,26 +566,28 @@ function resolveTexture(game, key) {
     }
 }
 function drawInlineShape(shape) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     if (!shape || !shape.type)
         return null;
     const g = new Graphics$1();
     const { style } = shape;
-    const w = (_a = style.width) !== null && _a !== void 0 ? _a : 0;
-    const h = (_b = style.height) !== null && _b !== void 0 ? _b : 0;
-    const r = (_c = style.radius) !== null && _c !== void 0 ? _c : 0;
+    const x = (_a = style.x) !== null && _a !== void 0 ? _a : 0;
+    const y = (_b = style.y) !== null && _b !== void 0 ? _b : 0;
+    const w = (_c = style.width) !== null && _c !== void 0 ? _c : 0;
+    const h = (_d = style.height) !== null && _d !== void 0 ? _d : 0;
+    const r = (_e = style.radius) !== null && _e !== void 0 ? _e : 0;
     switch (shape.type) {
         case 'rect':
-            g.rect(0, 0, w, h);
+            drawRect(g, x, y, w, h);
             break;
         case 'roundedRect':
-            g.roundRect(0, 0, w, h, r);
+            drawRoundedRect(g, x, y, w, h, r);
             break;
         case 'circle':
-            g.circle(r, r, r);
+            drawCircle(g, x + r, y + r, r);
             break;
         case 'ellipse':
-            g.ellipse(w / 2, h / 2, w / 2, h / 2);
+            drawEllipse(g, x + w / 2, y + h / 2, w / 2, h / 2);
             break;
     }
     if (style.fill !== undefined)
@@ -576,6 +609,79 @@ function drawInlineShape(shape) {
     catch (_) { }
     return g;
 }
+function drawRect(g, x, y, width, height) {
+    const anyGraphics = g;
+    if (typeof anyGraphics.rect === 'function') {
+        anyGraphics.rect(x, y, width, height);
+        return;
+    }
+    anyGraphics.drawRect(x, y, width, height);
+}
+function drawRoundedRect(g, x, y, width, height, radius) {
+    const anyGraphics = g;
+    if (typeof anyGraphics.roundRect === 'function') {
+        anyGraphics.roundRect(x, y, width, height, radius);
+        return;
+    }
+    anyGraphics.drawRoundedRect(x, y, width, height, radius);
+}
+function drawCircle(g, x, y, radius) {
+    const anyGraphics = g;
+    if (typeof anyGraphics.circle === 'function') {
+        anyGraphics.circle(x, y, radius);
+        return;
+    }
+    anyGraphics.drawCircle(x, y, radius);
+}
+function drawEllipse(g, x, y, halfWidth, halfHeight) {
+    const anyGraphics = g;
+    if (typeof anyGraphics.ellipse === 'function') {
+        anyGraphics.ellipse(x, y, halfWidth, halfHeight);
+        return;
+    }
+    anyGraphics.drawEllipse(x, y, halfWidth, halfHeight);
+}
+function normalizePaddings(fillPaddings) {
+    return {
+        top: readPadding(fillPaddings === null || fillPaddings === void 0 ? void 0 : fillPaddings.top),
+        right: readPadding(fillPaddings === null || fillPaddings === void 0 ? void 0 : fillPaddings.right),
+        bottom: readPadding(fillPaddings === null || fillPaddings === void 0 ? void 0 : fillPaddings.bottom),
+        left: readPadding(fillPaddings === null || fillPaddings === void 0 ? void 0 : fillPaddings.left),
+    };
+}
+function readPadding(value) {
+    if (typeof value !== 'number' || !Number.isFinite(value))
+        return 0;
+    return Math.max(0, value);
+}
+function shrinkSize(value, inset) {
+    return Math.max(0, value - inset);
+}
+function shrinkOptionalSize(value, fallback, inset) {
+    if (typeof value === 'number')
+        return shrinkSize(value, inset);
+    if (typeof fallback === 'number')
+        return shrinkSize(fallback, inset);
+    return value;
+}
+function shrinkRadius(radius, width, height) {
+    if (typeof radius !== 'number' || !Number.isFinite(radius))
+        return radius;
+    const limits = [radius];
+    if (typeof width === 'number')
+        limits.push(width / 2);
+    if (typeof height === 'number')
+        limits.push(height / 2);
+    return Math.max(0, Math.min(...limits));
+}
+function shrinkInlineShape(shape, paddings, fallbackSize) {
+    var _a;
+    const style = (_a = shape.style) !== null && _a !== void 0 ? _a : {};
+    const width = shrinkOptionalSize(style.width, fallbackSize === null || fallbackSize === void 0 ? void 0 : fallbackSize.width, paddings.left + paddings.right);
+    const height = shrinkOptionalSize(style.height, fallbackSize === null || fallbackSize === void 0 ? void 0 : fallbackSize.height, paddings.top + paddings.bottom);
+    const radius = shrinkRadius(style.radius, width, height);
+    return Object.assign(Object.assign({}, shape), { style: Object.assign(Object.assign(Object.assign(Object.assign({}, style), (width !== undefined ? { width } : {})), (height !== undefined ? { height } : {})), (radius !== undefined ? { radius } : {})) });
+}
 /**
  * 在 GameObject 的 transform.children 中查找指定名字的子 entity。
  * 不递归 — plugin-ui 的视觉子项语义只允许直接子节点。
@@ -2658,12 +2764,16 @@ var UISystem$1 = UISystem;
  */
 function inlineResolveSpecialViews(name, c, game, go) {
     switch (name) {
-        case 'ProgressBar':
+        case 'ProgressBar': {
+            const fillView = c.nineSliceSprite
+                ? c.fillView
+                : normalizeProgressFillViewRef(c.fillView, c.fillPaddings, { width: c.width, height: c.height });
             c.__resolved_bg = resolveViewRef(game, go, c.bgView);
-            c.__resolved_fill = resolveViewRef(game, go, c.fillView);
+            c.__resolved_fill = resolveViewRef(game, go, fillView);
             c.__resolved_bg_view = c.nineSliceSprite && c.bgView && 'texture' in c.bgView ? c.bgView.texture : c.__resolved_bg;
             c.__resolved_fill_view = c.nineSliceSprite && c.fillView && 'texture' in c.fillView ? c.fillView.texture : c.__resolved_fill;
             break;
+        }
         case 'Select':
             c.__resolved_closedView = resolveViewRef(game, go, c.closedView);
             c.__resolved_openView = resolveViewRef(game, go, c.openView);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eva/plugin-ui",
-  "version": "2.1.0-beta.2",
+  "version": "2.1.0-beta.4",
   "description": "@eva/plugin-ui",
   "main": "index.js",
   "module": "dist/plugin-ui.esm.js",
@@ -19,9 +19,9 @@
   "license": "MIT",
   "homepage": "https://eva.js.org",
   "dependencies": {
-    "@eva/eva.js": "2.1.0-beta.2",
-    "@eva/plugin-renderer": "2.1.0-beta.2",
-    "@eva/plugin-renderer-graphics": "2.1.0-beta.2",
+    "@eva/eva.js": "2.1.0-beta.4",
+    "@eva/plugin-renderer": "2.1.0-beta.4",
+    "@eva/plugin-renderer-graphics": "2.1.0-beta.4",
     "@pixi/ui": "^2.3.2",
     "pixi.js": "^8.17.0"
   }