@5even7/dlc-ui 0.2.3 → 0.2.4

package/dist/index.cjs

@@ -417,9 +417,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;
 }
@@ -440,7 +444,6 @@ var DEFAULTS = {
     min: 0,
     max: 100,
     draggable: true,
-    keyboard: true,
     disabled: false,
     readonly: false,
     valueSuffix: '%',
@@ -631,7 +634,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;
   };
@@ -639,9 +642,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));
 }
 
 /**
@@ -911,6 +916,7 @@ var FallbackRenderer = /*#__PURE__*/function () {
     this.preset = preset;
     this.context = canvas.getContext('2d');
     this.visible = true;
+    this.timePhase = 0;
   }
   return _createClass(FallbackRenderer, [{
     key: "resize",
@@ -931,7 +937,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]);
@@ -968,7 +974,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",
@@ -1366,8 +1375,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;
     },
@@ -1396,8 +1411,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
   };
 }
@@ -1693,8 +1712,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);
@@ -2144,6 +2167,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);
@@ -2361,32 +2389,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",
@@ -2433,7 +2435,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,
@@ -2447,6 +2449,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;
@@ -2458,7 +2465,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,
@@ -2470,7 +2476,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');
@@ -2480,6 +2485,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));
@@ -2491,7 +2497,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');
@@ -2558,8 +2563,7 @@ function createProgressCapsule(container) {
     preset: preset,
     emitter: emitter,
     options: _objectSpread2(_objectSpread2({}, merged), {}, {
-      draggable: effectiveDraggable,
-      keyboard: effectiveKeyboard
+      draggable: effectiveDraggable
     }),
     copy: copy,
     dirty: dirty
@@ -2719,8 +2723,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;
@@ -2751,8 +2761,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
   };
 }
@@ -2957,9 +2971,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
   };
 }

package/dist/index.mjs

@@ -176,9 +176,13 @@ function getPreset(kind, ref) {
   const list = kind === 'capsule' ? CAPSULE_PRESETS : kind === 'progress' ? PROGRESS_PRESETS : null;
   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;
 }
@@ -197,9 +201,8 @@ const DEFAULTS = {
     width: 454,
     height: 104,
     min: 0,
-    max: 100,
+    max: 100,
     draggable: true,
-    keyboard: true,
     disabled: false,
     readonly: false,
     valueSuffix: '%',
@@ -392,7 +395,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;
   };
@@ -400,7 +403,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)}`;
 }
 
 /**
@@ -763,12 +770,13 @@ function rgb(color, alpha = 1) {
 }
 
 class FallbackRenderer {
-  constructor(canvas, preset) {
-    this.canvas = canvas;
-    this.preset = preset;
-    this.context = canvas.getContext('2d');
-    this.visible = true;
-  }
+  constructor(canvas, preset) {
+    this.canvas = canvas;
+    this.preset = preset;
+    this.context = canvas.getContext('2d');
+    this.visible = true;
+    this.timePhase = 0;
+  }
 
   resize() {
     const rect = this.canvas.getBoundingClientRect();
@@ -784,7 +792,7 @@ class FallbackRenderer {
   drawNebula(time) {
     const ctx = this.context;
     const { width, height } = this.canvas;
-    const t = time * (this.preset.speed || 1);
+    const t = (time + this.timePhase) * (this.preset.speed || 1);
     const phase = (this.preset.seed || 0) * 0.7;
     const gradient = ctx.createLinearGradient(0, 0, width, height);
     gradient.addColorStop(0, this.preset.colors[0]);
@@ -819,7 +827,10 @@ class FallbackRenderer {
   }
 
   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;
+    }
   }
   setMouseColor() {}
   dispose() {}
@@ -1175,11 +1186,17 @@ function createCapsule(container, options = {}) {
       return this;
     },
     setSize(width, height) {
-      if (width !== undefined) merged.width = width;
-      if (height !== undefined) merged.height = height;
-      applySize();
-      return this;
-    },
+      if (width !== undefined) {
+        parseSize(width); // 非法尺寸直接抛错前先校验，避免污染内部状态
+        merged.width = width;
+      }
+      if (height !== undefined) {
+        parseSize(height);
+        merged.height = height;
+      }
+      applySize();
+      return this;
+    },
     randomize() {
       this.setSeed(Math.random() * 100);
       return this;
@@ -1206,8 +1223,8 @@ function createCapsule(container, options = {}) {
       renderer.dispose();
       root.remove();
     },
-    textRatio: merged.textRatio,
-    cssVars: merged.cssVars,
+    get textRatio() { return merged.textRatio; },
+    get cssVars() { return merged.cssVars; },
     dirty
   };
 }
@@ -1692,13 +1709,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);
@@ -2128,9 +2149,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');
   }
@@ -2325,33 +2351,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;
@@ -2389,7 +2389,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,
@@ -2402,6 +2402,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;
@@ -2413,7 +2418,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,
@@ -2426,7 +2430,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');
@@ -2436,6 +2439,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));
@@ -2446,8 +2450,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');
@@ -2509,7 +2511,7 @@ function createProgressCapsule(container, options = {}) {
     valueElement,
     preset,
     emitter,
-    options: { ...merged, draggable: effectiveDraggable, keyboard: effectiveKeyboard },
+    options: { ...merged, draggable: effectiveDraggable },
     copy,
     dirty
   });
@@ -2650,10 +2652,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;
     },
@@ -2683,8 +2691,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
   };
 }
@@ -2904,9 +2912,9 @@ function createColorBackground(host, options = {}) {
       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
   };
 }