@5even7/dlc-ui 0.2.3 → 0.2.5

package/dist/progress.mjs

@@ -147,9 +147,13 @@ function getPreset(kind, ref) {
   const list = PROGRESS_PRESETS ;
   if (!list) throw new Error(`Unknown preset kind: ${kind} (use "capsule" or "progress")`);
   const key = String(ref).trim().toLowerCase();
-  const found = list.find(
-    (preset) => preset.name.toLowerCase() === key
-  );
+  let found = null;
+  for (let index = 0; index < list.length; index += 1) {
+    if (list[index].name.toLowerCase() === key) {
+      found = list[index];
+      break;
+    }
+  }
   if (!found) throw new Error(`Unknown ${kind} preset: ${ref}`);
   return found;
 }
@@ -159,9 +163,8 @@ const DEFAULTS = {
     width: 454,
     height: 104,
     min: 0,
-    max: 100,
+    max: 100,
     draggable: true,
-    keyboard: true,
     disabled: false,
     readonly: false,
     valueSuffix: '%',
@@ -354,7 +357,7 @@ function normalizeRgbArgs(args) {
   if (parts.length < 3) return null;
   const to255 = (value) => {
     if (typeof value !== 'string' || !value) return null;
-    if (value.endsWith('%')) return clampChannel((parseFloat(value) / 100) * 255);
+    if (value.charAt(value.length - 1) === '%') return clampChannel((parseFloat(value) / 100) * 255);
     const number = Number(value);
     return Number.isFinite(number) ? clampChannel(number) : null;
   };
@@ -362,7 +365,11 @@ function normalizeRgbArgs(args) {
   const green = to255(parts[1]);
   const blue = to255(parts[2]);
   if (red === null || green === null || blue === null) return null;
-  return `#${[red, green, blue].map((n) => n.toString(16).padStart(2, '0')).join('')}`;
+  const hex = (n) => {
+    const text = n.toString(16);
+    return text.length === 1 ? `0${text}` : text;
+  };
+  return `#${hex(red)}${hex(green)}${hex(blue)}`;
 }
 
 /**
@@ -974,13 +981,17 @@ const PALETTES = {
   'tide': ['#0a2239', '#2e9bff', '#7fe3ff', '#eaf9ff']
 };
 
-function drawCloud(context, x, y, radiusX, radiusY, color, alpha) {
-  context.save();
-  context.translate(x, y);
-  context.scale(1, radiusY / radiusX);
-  const gradient = context.createRadialGradient(0, 0, 0, 0, 0, radiusX);
-  gradient.addColorStop(0, `${color}${Math.round(alpha * 255).toString(16).padStart(2, '0')}`);
-  gradient.addColorStop(0.46, `${color}${Math.round(alpha * 0.42 * 255).toString(16).padStart(2, '0')}`);
+function drawCloud(context, x, y, radiusX, radiusY, color, alpha) {
+  context.save();
+  context.translate(x, y);
+  context.scale(1, radiusY / radiusX);
+  const gradient = context.createRadialGradient(0, 0, 0, 0, 0, radiusX);
+  const alphaHex = (value) => {
+    const text = Math.round(value).toString(16);
+    return text.length === 1 ? `0${text}` : text;
+  };
+  gradient.addColorStop(0, `${color}${alphaHex(alpha * 255)}`);
+  gradient.addColorStop(0.46, `${color}${alphaHex(alpha * 0.42 * 255)}`);
   gradient.addColorStop(1, `${color}00`);
   context.fillStyle = gradient;
   context.fillRect(-radiusX, -radiusX, radiusX * 2, radiusX * 2);
@@ -1426,9 +1437,14 @@ class ProgressCapsuleController {
     ctx.restore();
   }
 
-  setRange(min, max) {
-    this.min = min;
-    this.max = max;
+  setRange(min, max) {
+    if (min > max) {
+      const swap = min;
+      min = max;
+      max = swap;
+    }
+    this.min = min;
+    this.max = max;
     const clamped = clamp(this.value, this.min, this.max);
     if (clamped !== this.value) this.setProgress(clamped, 'prop');
   }
@@ -1623,33 +1639,7 @@ class ProgressCapsuleController {
       this.root.addEventListener('pointercancel', this.handlers.pointercancel);
     }
 
-    if (this.options.keyboard !== false) {
-      this.handlers.keydown = (event) => {
-        const step = (this.max - this.min) * 0.02;
-        const actions = {
-          ArrowLeft: -step,
-          ArrowDown: -step,
-          ArrowRight: step,
-          ArrowUp: step,
-          PageDown: -step * 5,
-          PageUp: step * 5
-        };
-        if (event.key === 'Home') {
-          event.preventDefault();
-          this.setProgress(this.min, 'keyboard');
-        } else if (event.key === 'End') {
-          event.preventDefault();
-          this.setProgress(this.max, 'keyboard');
-        } else if (actions[event.key]) {
-          event.preventDefault();
-          this.setProgress(this.value + actions[event.key], 'keyboard');
-        } else {
-          return;
-        }
-      };
-      this.root.addEventListener('keydown', this.handlers.keydown);
-    }
-  }
+  }
 
   update(delta, paused) {
     if (!paused) this.flowTime += delta;
@@ -1687,7 +1677,7 @@ class ProgressCapsuleController {
  * Mount a fluid progress capsule into `container`.
  *
  * Options: preset (id/code/name or object), width, height, value, min, max,
- * draggable, keyboard, colors, edgeStyle, textRatio (0-100, text region
+ * draggable, colors, edgeStyle, textRatio (0-100, text region
  * width in percent), text (HTML string or DOM nodes for the text slot),
  * colorContent (HTML string or DOM nodes for the color slot),
  * showValue (show/hide the right-side percentage), quality,
@@ -1700,6 +1690,11 @@ function createProgressCapsule(container, options = {}) {
 
   const preset = { ...getPreset('progress', options.preset ?? '星火') };
   const merged = normalizeOptions(DEFAULTS.progress, preset, options);
+  if (merged.min > merged.max) {
+    const swap = merged.min;
+    merged.min = merged.max;
+    merged.max = swap;
+  }
   const normalizedColors = merged.colors.map(normalizeColor);
   if (normalizedColors.every(Boolean)) preset.colors = normalizedColors;
   preset.edgeStyle = merged.edgeStyle;
@@ -1711,7 +1706,6 @@ function createProgressCapsule(container, options = {}) {
   const readonly = merged.readonly === true || merged.readonly === '' || merged.readonly === 'true';
   const locked = disabled || readonly;
   const effectiveDraggable = locked ? false : merged.draggable !== false;
-  const effectiveKeyboard = locked ? false : merged.keyboard !== false;
   const dirty = {
     preset: false,
     colors: false,
@@ -1724,7 +1718,6 @@ function createProgressCapsule(container, options = {}) {
   const root = document.createElement('div');
   root.className = 'hj-capsule-root hj-progress-root';
   root.setAttribute('role', 'slider');
-  root.setAttribute('tabindex', '0');
   root.setAttribute('data-draggable', String(effectiveDraggable));
   if (disabled) {
     root.setAttribute('aria-disabled', 'true');
@@ -1734,6 +1727,7 @@ function createProgressCapsule(container, options = {}) {
     root.setAttribute('aria-readonly', 'true');
     root.classList.add('is-readonly');
   }
+  if (locked) root.setAttribute('tabindex', '-1');
   root.setAttribute('aria-valuemin', String(merged.min ?? 0));
   root.setAttribute('aria-valuemax', String(merged.max ?? 100));
   root.setAttribute('aria-valuenow', String(preset.initialProgress));
@@ -1744,8 +1738,6 @@ function createProgressCapsule(container, options = {}) {
     );
   };
   updateAria();
-  if (!effectiveKeyboard) root.setAttribute('tabindex', '-1');
-
   const canvas = document.createElement('canvas');
   canvas.className = 'hj-progress-canvas';
   canvas.setAttribute('aria-hidden', 'true');
@@ -1807,7 +1799,7 @@ function createProgressCapsule(container, options = {}) {
     valueElement,
     preset,
     emitter,
-    options: { ...merged, draggable: effectiveDraggable, keyboard: effectiveKeyboard },
+    options: { ...merged, draggable: effectiveDraggable },
     copy,
     dirty
   });
@@ -1948,10 +1940,16 @@ function createProgressCapsule(container, options = {}) {
       controller.resizeCanvas();
       return this;
     },
-    setSize(width, height) {
-      if (width !== undefined) merged.width = width;
-      if (height !== undefined) merged.height = height;
-      applySize();
+    setSize(width, height) {
+      if (width !== undefined) {
+        parseSize(width);
+        merged.width = width;
+      }
+      if (height !== undefined) {
+        parseSize(height);
+        merged.height = height;
+      }
+      applySize();
       controller.resizeCanvas();
       return this;
     },
@@ -1981,8 +1979,8 @@ function createProgressCapsule(container, options = {}) {
       controller.dispose();
       root.remove();
     },
-    textRatio: merged.textRatio,
-    cssVars: merged.cssVars,
+    get textRatio() { return merged.textRatio; },
+    get cssVars() { return merged.cssVars; },
     dirty
   };
 }

package/dist/vue2.cjs

@@ -416,9 +416,13 @@ function getPreset(kind, ref) {
   var list = kind === 'capsule' ? CAPSULE_PRESETS : kind === 'progress' ? PROGRESS_PRESETS : null;
   if (!list) throw new Error("Unknown preset kind: ".concat(kind, " (use \"capsule\" or \"progress\")"));
   var key = String(ref).trim().toLowerCase();
-  var found = list.find(function (preset) {
-    return preset.name.toLowerCase() === key;
-  });
+  var found = null;
+  for (var index = 0; index < list.length; index += 1) {
+    if (list[index].name.toLowerCase() === key) {
+      found = list[index];
+      break;
+    }
+  }
   if (!found) throw new Error("Unknown ".concat(kind, " preset: ").concat(ref));
   return found;
 }
@@ -439,7 +443,6 @@ var DEFAULTS = {
     min: 0,
     max: 100,
     draggable: true,
-    keyboard: true,
     disabled: false,
     readonly: false,
     valueSuffix: '%',
@@ -630,7 +633,7 @@ function normalizeRgbArgs(args) {
   if (parts.length < 3) return null;
   var to255 = function to255(value) {
     if (typeof value !== 'string' || !value) return null;
-    if (value.endsWith('%')) return clampChannel(parseFloat(value) / 100 * 255);
+    if (value.charAt(value.length - 1) === '%') return clampChannel(parseFloat(value) / 100 * 255);
     var number = Number(value);
     return Number.isFinite(number) ? clampChannel(number) : null;
   };
@@ -638,9 +641,11 @@ function normalizeRgbArgs(args) {
   var green = to255(parts[1]);
   var blue = to255(parts[2]);
   if (red === null || green === null || blue === null) return null;
-  return "#".concat([red, green, blue].map(function (n) {
-    return n.toString(16).padStart(2, '0');
-  }).join(''));
+  var hex = function hex(n) {
+    var text = n.toString(16);
+    return text.length === 1 ? "0".concat(text) : text;
+  };
+  return "#".concat(hex(red)).concat(hex(green)).concat(hex(blue));
 }
 
 /**
@@ -905,6 +910,7 @@ var FallbackRenderer = /*#__PURE__*/function () {
     this.preset = preset;
     this.context = canvas.getContext('2d');
     this.visible = true;
+    this.timePhase = 0;
   }
   return _createClass(FallbackRenderer, [{
     key: "resize",
@@ -925,7 +931,7 @@ var FallbackRenderer = /*#__PURE__*/function () {
       var _this$canvas = this.canvas,
         width = _this$canvas.width,
         height = _this$canvas.height;
-      var t = time * (this.preset.speed || 1);
+      var t = (time + this.timePhase) * (this.preset.speed || 1);
       var phase = (this.preset.seed || 0) * 0.7;
       var gradient = ctx.createLinearGradient(0, 0, width, height);
       gradient.addColorStop(0, this.preset.colors[0]);
@@ -962,7 +968,10 @@ var FallbackRenderer = /*#__PURE__*/function () {
   }, {
     key: "randomize",
     value: function randomize() {
-      if (this.preset) this.preset.seed = Math.random() * 100;
+      if (this.preset) {
+        this.preset.seed = Math.random() * 100;
+        this.timePhase = Math.random() * Math.PI * 2;
+      }
     }
   }, {
     key: "setMouseColor",
@@ -1208,8 +1217,9 @@ function createCapsule(container) {
     }
     if (merged.textRatio !== undefined) {
       root.style.setProperty('--hj-text-width', "".concat(merged.textRatio, "%"));
-      var userMinWidth = merged.cssVars && merged.cssVars['--hj-text-min-width'];
-      if (merged.textRatio === 0) root.style.setProperty('--hj-text-min-width', '0');else if (userMinWidth) root.style.setProperty('--hj-text-min-width', userMinWidth);else root.style.removeProperty('--hj-text-min-width');
+      // textRatio 是文字区宽度的唯一权威值：min-width 会阻止其缩小到
+      // 164px 以下（--hj-copy-min-width 的历史默认），这里强制归零。
+      root.style.setProperty('--hj-text-min-width', '0');
     }
     renderer.resize();
   };
@@ -1333,8 +1343,7 @@ function createCapsule(container) {
       dirty.textRatio = true;
       merged.textRatio = value;
       root.style.setProperty('--hj-text-width', "".concat(value, "%"));
-      var userMinWidth = merged.cssVars && merged.cssVars['--hj-text-min-width'];
-      if (value === 0) root.style.setProperty('--hj-text-min-width', '0');else if (userMinWidth) root.style.setProperty('--hj-text-min-width', userMinWidth);else root.style.removeProperty('--hj-text-min-width');
+      root.style.setProperty('--hj-text-min-width', '0');
       return this;
     },
     setCssVars: function setCssVars(vars) {
@@ -1353,8 +1362,14 @@ function createCapsule(container) {
       return this;
     },
     setSize: function setSize(width, height) {
-      if (width !== undefined) merged.width = width;
-      if (height !== undefined) merged.height = height;
+      if (width !== undefined) {
+        parseSize(width); // 非法尺寸直接抛错前先校验，避免污染内部状态
+        merged.width = width;
+      }
+      if (height !== undefined) {
+        parseSize(height);
+        merged.height = height;
+      }
       applySize();
       return this;
     },
@@ -1383,8 +1398,12 @@ function createCapsule(container) {
       renderer.dispose();
       root.remove();
     },
-    textRatio: merged.textRatio,
-    cssVars: merged.cssVars,
+    get textRatio() {
+      return merged.textRatio;
+    },
+    get cssVars() {
+      return merged.cssVars;
+    },
     dirty: dirty
   };
 }
@@ -1680,8 +1699,12 @@ function drawCloud(context, x, y, radiusX, radiusY, color, alpha) {
   context.translate(x, y);
   context.scale(1, radiusY / radiusX);
   var gradient = context.createRadialGradient(0, 0, 0, 0, 0, radiusX);
-  gradient.addColorStop(0, "".concat(color).concat(Math.round(alpha * 255).toString(16).padStart(2, '0')));
-  gradient.addColorStop(0.46, "".concat(color).concat(Math.round(alpha * 0.42 * 255).toString(16).padStart(2, '0')));
+  var alphaHex = function alphaHex(value) {
+    var text = Math.round(value).toString(16);
+    return text.length === 1 ? "0".concat(text) : text;
+  };
+  gradient.addColorStop(0, "".concat(color).concat(alphaHex(alpha * 255)));
+  gradient.addColorStop(0.46, "".concat(color).concat(alphaHex(alpha * 0.42 * 255)));
   gradient.addColorStop(1, "".concat(color, "00"));
   context.fillStyle = gradient;
   context.fillRect(-radiusX, -radiusX, radiusX * 2, radiusX * 2);
@@ -2131,6 +2154,11 @@ var ProgressCapsuleController = /*#__PURE__*/function () {
   }, {
     key: "setRange",
     value: function setRange(min, max) {
+      if (min > max) {
+        var swap = min;
+        min = max;
+        max = swap;
+      }
       this.min = min;
       this.max = max;
       var clamped = clamp(this.value, this.min, this.max);
@@ -2348,32 +2376,6 @@ var ProgressCapsuleController = /*#__PURE__*/function () {
         this.root.addEventListener('pointerup', this.handlers.pointerup);
         this.root.addEventListener('pointercancel', this.handlers.pointercancel);
       }
-      if (this.options.keyboard !== false) {
-        this.handlers.keydown = function (event) {
-          var step = (_this3.max - _this3.min) * 0.02;
-          var actions = {
-            ArrowLeft: -step,
-            ArrowDown: -step,
-            ArrowRight: step,
-            ArrowUp: step,
-            PageDown: -step * 5,
-            PageUp: step * 5
-          };
-          if (event.key === 'Home') {
-            event.preventDefault();
-            _this3.setProgress(_this3.min, 'keyboard');
-          } else if (event.key === 'End') {
-            event.preventDefault();
-            _this3.setProgress(_this3.max, 'keyboard');
-          } else if (actions[event.key]) {
-            event.preventDefault();
-            _this3.setProgress(_this3.value + actions[event.key], 'keyboard');
-          } else {
-            return;
-          }
-        };
-        this.root.addEventListener('keydown', this.handlers.keydown);
-      }
     }
   }, {
     key: "update",
@@ -2420,7 +2422,7 @@ var ProgressCapsuleController = /*#__PURE__*/function () {
  * Mount a fluid progress capsule into `container`.
  *
  * Options: preset (id/code/name or object), width, height, value, min, max,
- * draggable, keyboard, colors, edgeStyle, textRatio (0-100, text region
+ * draggable, colors, edgeStyle, textRatio (0-100, text region
  * width in percent), text (HTML string or DOM nodes for the text slot),
  * colorContent (HTML string or DOM nodes for the color slot),
  * showValue (show/hide the right-side percentage), quality,
@@ -2434,6 +2436,11 @@ function createProgressCapsule(container) {
   }
   var preset = _objectSpread2({}, getPreset('progress', (_options$preset = options.preset) !== null && _options$preset !== void 0 ? _options$preset : '星火'));
   var merged = normalizeOptions(DEFAULTS.progress, preset, options);
+  if (merged.min > merged.max) {
+    var swap = merged.min;
+    merged.min = merged.max;
+    merged.max = swap;
+  }
   var normalizedColors = merged.colors.map(normalizeColor);
   if (normalizedColors.every(Boolean)) preset.colors = normalizedColors;
   preset.edgeStyle = merged.edgeStyle;
@@ -2445,7 +2452,6 @@ function createProgressCapsule(container) {
   var readonly = merged.readonly === true || merged.readonly === '' || merged.readonly === 'true';
   var locked = disabled || readonly;
   var effectiveDraggable = locked ? false : merged.draggable !== false;
-  var effectiveKeyboard = locked ? false : merged.keyboard !== false;
   var dirty = {
     preset: false,
     colors: false,
@@ -2457,7 +2463,6 @@ function createProgressCapsule(container) {
   var root = document.createElement('div');
   root.className = 'hj-capsule-root hj-progress-root';
   root.setAttribute('role', 'slider');
-  root.setAttribute('tabindex', '0');
   root.setAttribute('data-draggable', String(effectiveDraggable));
   if (disabled) {
     root.setAttribute('aria-disabled', 'true');
@@ -2467,6 +2472,7 @@ function createProgressCapsule(container) {
     root.setAttribute('aria-readonly', 'true');
     root.classList.add('is-readonly');
   }
+  if (locked) root.setAttribute('tabindex', '-1');
   root.setAttribute('aria-valuemin', String((_merged$min = merged.min) !== null && _merged$min !== void 0 ? _merged$min : 0));
   root.setAttribute('aria-valuemax', String((_merged$max = merged.max) !== null && _merged$max !== void 0 ? _merged$max : 100));
   root.setAttribute('aria-valuenow', String(preset.initialProgress));
@@ -2478,7 +2484,6 @@ function createProgressCapsule(container) {
     }));
   };
   updateAria();
-  if (!effectiveKeyboard) root.setAttribute('tabindex', '-1');
   var canvas = document.createElement('canvas');
   canvas.className = 'hj-progress-canvas';
   canvas.setAttribute('aria-hidden', 'true');
@@ -2545,8 +2550,7 @@ function createProgressCapsule(container) {
     preset: preset,
     emitter: emitter,
     options: _objectSpread2(_objectSpread2({}, merged), {}, {
-      draggable: effectiveDraggable,
-      keyboard: effectiveKeyboard
+      draggable: effectiveDraggable
     }),
     copy: copy,
     dirty: dirty
@@ -2706,8 +2710,14 @@ function createProgressCapsule(container) {
       return this;
     },
     setSize: function setSize(width, height) {
-      if (width !== undefined) merged.width = width;
-      if (height !== undefined) merged.height = height;
+      if (width !== undefined) {
+        parseSize(width);
+        merged.width = width;
+      }
+      if (height !== undefined) {
+        parseSize(height);
+        merged.height = height;
+      }
       applySize();
       controller.resizeCanvas();
       return this;
@@ -2738,8 +2748,12 @@ function createProgressCapsule(container) {
       controller.dispose();
       root.remove();
     },
-    textRatio: merged.textRatio,
-    cssVars: merged.cssVars,
+    get textRatio() {
+      return merged.textRatio;
+    },
+    get cssVars() {
+      return merged.cssVars;
+    },
     dirty: dirty
   };
 }
@@ -2944,9 +2958,15 @@ function createColorBackground(host) {
       renderer.dispose();
       layer.remove();
     },
-    opacity: merged.opacity,
-    fallbackColor: merged.fallbackColor,
-    mouseColor: merged.mouseColor,
+    get opacity() {
+      return merged.opacity;
+    },
+    get fallbackColor() {
+      return merged.fallbackColor;
+    },
+    get mouseColor() {
+      return merged.mouseColor;
+    },
     dirty: dirty
   };
 }
@@ -2999,17 +3019,23 @@ function makeWrapper(_ref) {
       this.applyAttrs();
     },
     recreate: function recreate() {
+      var _this2 = this;
       var extraState = this.runtimeState();
       if (this.controller) this.controller.dispose();
       this.mountController(extraState);
+      // 结构属性连续变化时，插槽内容可能在重建后才被 Vue 写入容器，
+      // 补一次搬运确保不丢。
+      this.$nextTick(function () {
+        return _this2.moveSlots();
+      });
     },
     scheduleRecreate: function scheduleRecreate() {
-      var _this2 = this;
+      var _this3 = this;
       if (this._recreateQueued) return;
       this._recreateQueued = true;
       this.$nextTick(function () {
-        _this2._recreateQueued = false;
-        _this2.recreate();
+        _this3._recreateQueued = false;
+        _this3.recreate();
       });
     },
     moveSlots: function moveSlots() {
@@ -3179,7 +3205,7 @@ function makeCapsuleWrapper(createCapsule, render) {
 function makeProgressWrapper(createProgressCapsule, render) {
   return makeWrapper({
     name: 'ProgressCapsule',
-    props: ['preset', 'width', 'height', 'value', 'min', 'max', 'draggable', 'keyboard', 'disabled', 'readonly', 'edgeStyle', 'colors', 'textRatio', 'label', 'showValue', 'valueSuffix', 'quality', 'renderer', 'respectReducedMotion', 'cssVars'],
+    props: ['preset', 'width', 'height', 'value', 'min', 'max', 'draggable', 'disabled', 'readonly', 'edgeStyle', 'colors', 'textRatio', 'label', 'showValue', 'valueSuffix', 'quality', 'renderer', 'respectReducedMotion', 'cssVars'],
     events: PROGRESS_EVENTS,
     create: createProgressCapsule,
     render: render,
@@ -3220,9 +3246,6 @@ function makeProgressWrapper(createProgressCapsule, render) {
       draggable: function draggable() {
         this.scheduleRecreate();
       },
-      keyboard: function keyboard() {
-        this.scheduleRecreate();
-      },
       renderer: function renderer() {
         this.scheduleRecreate();
       }