mdui 2.0.2 → 2.0.3

package/components/radio/radio-group.js

@@ -1,5 +1,5 @@
 import { __decorate } from "tslib";
-import { html, LitElement } from 'lit';
+import { html } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
 import { createRef, ref } from 'lit/directives/ref.js';
@@ -7,13 +7,12 @@ import { $ } from '@mdui/jq/$.js';
 import '@mdui/jq/methods/closest.js';
 import '@mdui/jq/methods/find.js';
 import '@mdui/jq/methods/get.js';
-import { isNodeName } from '@mdui/jq/shared/helper.js';
+import { MduiElement } from '@mdui/shared/base/mdui-element.js';
 import { DefinedController } from '@mdui/shared/controllers/defined.js';
 import { FormController, formResets } from '@mdui/shared/controllers/form.js';
 import { defaultValue } from '@mdui/shared/decorators/default-value.js';
 import { watch } from '@mdui/shared/decorators/watch.js';
 import { booleanConverter } from '@mdui/shared/helpers/decorator.js';
-import { emit } from '@mdui/shared/helpers/event.js';
 import { componentStyle } from '@mdui/shared/lit-styles/component-style.js';
 import { radioGroupStyle } from './radio-group-style.js';
 /**
@@ -32,7 +31,7 @@ import { radioGroupStyle } from './radio-group-style.js';
  *
  * @slot - `<mdui-radio>` 元素
  */
-let RadioGroup = class RadioGroup extends LitElement {
+let RadioGroup = class RadioGroup extends MduiElement {
     constructor() {
         super(...arguments);
         /**
@@ -91,8 +90,8 @@ let RadioGroup = class RadioGroup extends LitElement {
     async onValueChange() {
         this.isInitial = false;
         await this.definedController.whenDefined();
-        emit(this, 'input');
-        emit(this, 'change');
+        this.emit('input');
+        this.emit('change');
         this.updateItems();
         this.updateRadioFocusable();
         await this.updateComplete;
@@ -116,7 +115,7 @@ let RadioGroup = class RadioGroup extends LitElement {
     checkValidity() {
         const valid = this.inputRef.value.checkValidity();
         if (!valid) {
-            emit(this, 'invalid', {
+            this.emit('invalid', {
                 bubbles: false,
                 cancelable: true,
                 composed: false,
@@ -132,13 +131,13 @@ let RadioGroup = class RadioGroup extends LitElement {
     reportValidity() {
         this.invalid = !this.inputRef.value.reportValidity();
         if (this.invalid) {
-            const requestInvalid = emit(this, 'invalid', {
+            const eventProceeded = this.emit('invalid', {
                 bubbles: false,
                 cancelable: true,
                 composed: false,
             });
-            // 调用了 preventDefault() 时，隐藏默认的表单错误提示
-            if (requestInvalid.defaultPrevented) {
+            if (!eventProceeded) {
+                // 调用了 preventDefault() 时，隐藏默认的表单错误提示
                 this.inputRef.value.blur();
                 this.inputRef.value.focus();
             }
@@ -177,9 +176,7 @@ let RadioGroup = class RadioGroup extends LitElement {
     async onClick(event) {
         await this.definedController.whenDefined();
         const target = event.target;
-        const item = isNodeName(target, 'mdui-radio')
-            ? target
-            : $(target).closest('mdui-radio')[0];
+        const item = target.closest('mdui-radio');
         if (!item || item.disabled) {
             return;
         }

package/components/radio/radio.d.ts

@@ -1,10 +1,10 @@
-import { LitElement } from 'lit';
+import { MduiElement } from '@mdui/shared/base/mdui-element.js';
 import '@mdui/shared/icons/circle.js';
 import '@mdui/shared/icons/radio-button-unchecked.js';
 import '../icon.js';
 import type { Ripple } from '../ripple/index.js';
 import type { CSSResultGroup, PropertyValues, TemplateResult } from 'lit';
-declare const Radio_base: import("@open-wc/dedupe-mixin").Constructor<import("../ripple/ripple-mixin.js").RippleMixinInterface> & import("@open-wc/dedupe-mixin").Constructor<import("@mdui/shared/mixins/focusable.js").FocusableMixinInterface> & typeof LitElement;
+declare const Radio_base: import("@open-wc/dedupe-mixin").Constructor<import("../ripple/ripple-mixin.js").RippleMixinInterface> & import("@open-wc/dedupe-mixin").Constructor<import("@mdui/shared/mixins/focusable.js").FocusableMixinInterface> & typeof MduiElement;
 /**
  * @summary 单选框组件。需与 `<mdui-radio-group>` 组件配合使用
  *
@@ -28,7 +28,7 @@ declare const Radio_base: import("@open-wc/dedupe-mixin").Constructor<import("..
  * @csspart checked-icon 选中状态的图标
  * @csspart label - 文本
  */
-export declare class Radio extends Radio_base {
+export declare class Radio extends Radio_base<RadioEventMap> {
     static styles: CSSResultGroup;
     /**
      * 当前单选项的值
@@ -64,6 +64,11 @@ export declare class Radio extends Radio_base {
     protected render(): TemplateResult;
     private isDisabled;
 }
+export interface RadioEventMap {
+    focus: FocusEvent;
+    blur: FocusEvent;
+    change: CustomEvent<void>;
+}
 declare global {
     interface HTMLElementTagNameMap {
         'mdui-radio': Radio;

package/components/radio/radio.js

@@ -1,11 +1,11 @@
 import { __decorate } from "tslib";
-import { html, LitElement } from 'lit';
+import { html } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
 import { createRef, ref } from 'lit/directives/ref.js';
+import { MduiElement } from '@mdui/shared/base/mdui-element.js';
 import { watch } from '@mdui/shared/decorators/watch.js';
 import { booleanConverter } from '@mdui/shared/helpers/decorator.js';
-import { emit } from '@mdui/shared/helpers/event.js';
 import '@mdui/shared/icons/circle.js';
 import '@mdui/shared/icons/radio-button-unchecked.js';
 import { componentStyle } from '@mdui/shared/lit-styles/component-style.js';
@@ -36,7 +36,7 @@ import { radioStyle } from './radio-style.js';
  * @csspart checked-icon 选中状态的图标
  * @csspart label - 文本
  */
-let Radio = class Radio extends RippleMixin(FocusableMixin(LitElement)) {
+let Radio = class Radio extends RippleMixin(FocusableMixin(MduiElement)) {
     constructor() {
         super(...arguments);
         /**
@@ -76,7 +76,7 @@ let Radio = class Radio extends RippleMixin(FocusableMixin(LitElement)) {
         return this.isDisabled() || !this.focusable;
     }
     onCheckedChange() {
-        emit(this, 'change');
+        this.emit('change');
     }
     firstUpdated(_changedProperties) {
         super.firstUpdated(_changedProperties);

package/components/range-slider/index.d.ts

@@ -1,9 +1,8 @@
-import { PropertyValues } from 'lit';
 import '@mdui/jq/methods/css.js';
 import { SliderBase } from '../slider/slider-base.js';
 import type { Ripple } from '../ripple/index.js';
 import type { FormControl } from '@mdui/jq/shared/form.js';
-import type { CSSResultGroup, TemplateResult } from 'lit';
+import type { CSSResultGroup, PropertyValues, TemplateResult } from 'lit';
 /**
  * @summary 范围滑块组件
  *
@@ -23,7 +22,7 @@ import type { CSSResultGroup, TemplateResult } from 'lit';
  * @csspart label - 提示文本
  * @csspart tickmark - 刻度标记
  */
-export declare class RangeSlider extends SliderBase implements FormControl {
+export declare class RangeSlider extends SliderBase<RangeSliderEventMap> implements FormControl {
     static styles: CSSResultGroup;
     /**
      * 默认值。在重置表单时，将重置为该默认值。该属性只能通过 JavaScript 属性设置
@@ -60,6 +59,13 @@ export declare class RangeSlider extends SliderBase implements FormControl {
     private updateStyle;
     private onInput;
 }
+export interface RangeSliderEventMap {
+    focus: FocusEvent;
+    blur: FocusEvent;
+    change: CustomEvent<void>;
+    input: Event;
+    invalid: CustomEvent<void>;
+}
 declare global {
     interface HTMLElementTagNameMap {
         'mdui-range-slider': RangeSlider;

package/components/range-slider/index.js

@@ -65,7 +65,7 @@ let RangeSlider = class RangeSlider extends SliderBase {
     }
     set value(_value) {
         const oldValue = [...this._value];
-        this._value = _value;
+        this._value = [this.fixValue(_value[0]), this.fixValue(_value[1])];
         this.requestUpdate('value', oldValue);
         this.updateComplete.then(() => {
             this.updateStyle();
@@ -85,7 +85,11 @@ let RangeSlider = class RangeSlider extends SliderBase {
     }
     connectedCallback() {
         super.connectedCallback();
-        this.value = [this.min, this.max];
+        if (!this.value.length) {
+            this.value = [this.min, this.max];
+        }
+        this.value[0] = this.fixValue(this.value[0]);
+        this.value[1] = this.fixValue(this.value[1]);
         if (!this.defaultValue.length) {
             this.defaultValue = [...this.value];
         }

package/components/ripple/index.d.ts

@@ -1,4 +1,3 @@
-import { LitElement } from 'lit';
 import '@mdui/jq/methods/addClass.js';
 import '@mdui/jq/methods/children.js';
 import '@mdui/jq/methods/css.js';
@@ -11,13 +10,14 @@ import '@mdui/jq/methods/offset.js';
 import '@mdui/jq/methods/on.js';
 import '@mdui/jq/methods/prependTo.js';
 import '@mdui/jq/methods/remove.js';
+import { MduiElement } from '@mdui/shared/base/mdui-element.js';
 import type { TemplateResult, CSSResultGroup } from 'lit';
 /**
  * 处理点击时的涟漪动画；及添加 hover、focused、dragged 的背景色
  * 背景色通过在 .surface 元素上添加对应的 class 实现
  * 阴影在 ripple-mixin 中处理，通过在 :host 元素上添加 attribute 供 CSS 选择器添加样式
  */
-export declare class Ripple extends LitElement {
+export declare class Ripple extends MduiElement<RippleEventMap> {
     static styles: CSSResultGroup;
     /**
      * 是否禁用涟漪动画
@@ -37,6 +37,8 @@ export declare class Ripple extends LitElement {
     endDrag(): void;
     protected render(): TemplateResult;
 }
+export interface RippleEventMap {
+}
 declare global {
     interface HTMLElementTagNameMap {
         'mdui-ripple': Ripple;

package/components/ripple/index.js

@@ -1,5 +1,5 @@
 import { __decorate } from "tslib";
-import { LitElement, html } from 'lit';
+import { html } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
 import { createRef, ref } from 'lit/directives/ref.js';
@@ -16,6 +16,7 @@ import '@mdui/jq/methods/offset.js';
 import '@mdui/jq/methods/on.js';
 import '@mdui/jq/methods/prependTo.js';
 import '@mdui/jq/methods/remove.js';
+import { MduiElement } from '@mdui/shared/base/mdui-element.js';
 import { booleanConverter } from '@mdui/shared/helpers/decorator.js';
 import { componentStyle } from '@mdui/shared/lit-styles/component-style.js';
 import { style } from './style.js';
@@ -24,7 +25,7 @@ import { style } from './style.js';
  * 背景色通过在 .surface 元素上添加对应的 class 实现
  * 阴影在 ripple-mixin 中处理，通过在 :host 元素上添加 attribute 供 CSS 选择器添加样式
  */
-let Ripple = class Ripple extends LitElement {
+let Ripple = class Ripple extends MduiElement {
     constructor() {
         super(...arguments);
         /**

package/components/ripple/ripple-mixin.d.ts

@@ -3,7 +3,7 @@ import './index.js';
 import type { Ripple } from './index.js';
 import type { Constructor } from '@open-wc/dedupe-mixin';
 import type { LitElement } from 'lit';
-export declare class RippleMixinInterface extends LitElement {
+export declare class RippleMixinInterface {
     noRipple: boolean;
     protected getRippleIndex: () => number | undefined;
     protected get rippleElement(): Ripple | Ripple[] | NodeListOf<Ripple>;

package/components/ripple/ripple-mixin.js

@@ -253,6 +253,5 @@ export const RippleMixin = (superclass) => {
             attribute: 'no-ripple',
         })
     ], Mixin.prototype, "noRipple", void 0);
-    // @ts-ignore
     return Mixin;
 };

package/components/segmented-button/segmented-button-group-style.js

@@ -1,2 +1,2 @@
 import { css } from 'lit';
-export const segmentedButtonGroupStyle = css `:host{--shape-corner:var(--mdui-shape-corner-full);position:relative;display:inline-flex;height:2.5rem;font-size:var(--mdui-typescale-label-large-size);font-weight:var(--mdui-typescale-label-large-weight);letter-spacing:var(--mdui-typescale-label-large-tracking);line-height:var(--mdui-typescale-label-large-line-height);color:rgb(var(--mdui-color-on-surface));--mdui-comp-ripple-state-layer-color:var(--mdui-color-on-surface)}:host([full-width]){display:flex;flex-wrap:nowrap}input,select{position:absolute;width:100%;height:100%;padding:0;opacity:0;pointer-events:none}`;
+export const segmentedButtonGroupStyle = css `:host{--shape-corner:var(--mdui-shape-corner-full);position:relative;display:inline-flex;vertical-align:middle;height:2.5rem;font-size:var(--mdui-typescale-label-large-size);font-weight:var(--mdui-typescale-label-large-weight);letter-spacing:var(--mdui-typescale-label-large-tracking);line-height:var(--mdui-typescale-label-large-line-height);color:rgb(var(--mdui-color-on-surface));--mdui-comp-ripple-state-layer-color:var(--mdui-color-on-surface)}:host([full-width]){display:flex;flex-wrap:nowrap}input,select{position:absolute;width:100%;height:100%;padding:0;opacity:0;pointer-events:none}`;

package/components/segmented-button/segmented-button-group.d.ts

@@ -1,6 +1,6 @@
-import { LitElement } from 'lit';
 import '@mdui/jq/methods/find.js';
 import '@mdui/jq/methods/get.js';
+import { MduiElement } from '@mdui/shared/base/mdui-element.js';
 import type { FormControl } from '@mdui/jq/shared/form.js';
 import type { CSSResultGroup, TemplateResult } from 'lit';
 /**
@@ -21,7 +21,7 @@ import type { CSSResultGroup, TemplateResult } from 'lit';
  *
  * @cssprop --shape-corner - 组件的圆角大小。可以指定一个具体的像素值；但更推荐[引用设计令牌](/docs/2/styles/design-tokens#shape-corner)
  */
-export declare class SegmentedButtonGroup extends LitElement implements FormControl {
+export declare class SegmentedButtonGroup extends MduiElement<SegmentedButtonGroupEventMap> implements FormControl {
     static styles: CSSResultGroup;
     /**
      * 是否填满父元素宽度
@@ -121,6 +121,10 @@ export declare class SegmentedButtonGroup extends LitElement implements FormCont
     private setValue;
     private updateItems;
 }
+export interface SegmentedButtonGroupEventMap {
+    change: CustomEvent<void>;
+    invalid: CustomEvent<void>;
+}
 declare global {
     interface HTMLElementTagNameMap {
         'mdui-segmented-button-group': SegmentedButtonGroup;

package/components/segmented-button/segmented-button-group.js

@@ -1,5 +1,5 @@
 import { __decorate } from "tslib";
-import { html, LitElement } from 'lit';
+import { html } from 'lit';
 import { customElement, property, state } from 'lit/decorators.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
 import { map } from 'lit/directives/map.js';
@@ -9,13 +9,13 @@ import { $ } from '@mdui/jq/$.js';
 import '@mdui/jq/methods/find.js';
 import '@mdui/jq/methods/get.js';
 import { isString } from '@mdui/jq/shared/helper.js';
+import { MduiElement } from '@mdui/shared/base/mdui-element.js';
 import { DefinedController } from '@mdui/shared/controllers/defined.js';
 import { FormController, formResets } from '@mdui/shared/controllers/form.js';
 import { defaultValue } from '@mdui/shared/decorators/default-value.js';
 import { watch } from '@mdui/shared/decorators/watch.js';
 import { arraysEqualIgnoreOrder } from '@mdui/shared/helpers/array.js';
 import { booleanConverter } from '@mdui/shared/helpers/decorator.js';
-import { emit } from '@mdui/shared/helpers/event.js';
 import { componentStyle } from '@mdui/shared/lit-styles/component-style.js';
 import { segmentedButtonGroupStyle } from './segmented-button-group-style.js';
 /**
@@ -36,7 +36,7 @@ import { segmentedButtonGroupStyle } from './segmented-button-group-style.js';
  *
  * @cssprop --shape-corner - 组件的圆角大小。可以指定一个具体的像素值；但更推荐[引用设计令牌](/docs/2/styles/design-tokens#shape-corner)
  */
-let SegmentedButtonGroup = class SegmentedButtonGroup extends LitElement {
+let SegmentedButtonGroup = class SegmentedButtonGroup extends MduiElement {
     constructor() {
         super(...arguments);
         /**
@@ -138,7 +138,7 @@ let SegmentedButtonGroup = class SegmentedButtonGroup extends LitElement {
         const value = this.isMultiple ? values : values[0] || '';
         this.setValue(value);
         if (!this.isInitial) {
-            emit(this, 'change');
+            this.emit('change');
         }
     }
     async onValueChange() {
@@ -200,7 +200,7 @@ let SegmentedButtonGroup = class SegmentedButtonGroup extends LitElement {
     checkValidity() {
         const valid = this.inputRef.value.checkValidity();
         if (!valid) {
-            emit(this, 'invalid', {
+            this.emit('invalid', {
                 bubbles: false,
                 cancelable: true,
                 composed: false,
@@ -216,13 +216,13 @@ let SegmentedButtonGroup = class SegmentedButtonGroup extends LitElement {
     reportValidity() {
         this.invalid = !this.inputRef.value.reportValidity();
         if (this.invalid) {
-            const requestInvalid = emit(this, 'invalid', {
+            const eventProceeded = this.emit('invalid', {
                 bubbles: false,
                 cancelable: true,
                 composed: false,
             });
-            // 调用了 preventDefault() 时，隐藏默认的表单错误提示
-            if (requestInvalid.defaultPrevented) {
+            if (!eventProceeded) {
+                // 调用了 preventDefault() 时，隐藏默认的表单错误提示
                 this.inputRef.value.blur();
                 this.inputRef.value.focus();
             }
@@ -273,7 +273,7 @@ let SegmentedButtonGroup = class SegmentedButtonGroup extends LitElement {
         await this.definedController.whenDefined();
         const target = event.target;
         const item = target.closest('mdui-segmented-button');
-        if (item.disabled) {
+        if (!item || item.disabled) {
             return;
         }
         if (this.isSelectable && item.value) {

package/components/segmented-button/segmented-button.d.ts

@@ -30,7 +30,7 @@ import type { CSSResultGroup, TemplateResult } from 'lit';
  * @csspart label - 文本内容
  * @csspart loading - 加载中状态的 `<mdui-circular-progress>` 元素
  */
-export declare class SegmentedButton extends ButtonBase {
+export declare class SegmentedButton extends ButtonBase<SegmentedButtonEventMap> {
     static styles: CSSResultGroup;
     /**
      * 左侧的 Material Icons 图标名。也可以通过 `slot="icon"` 设置
@@ -66,6 +66,11 @@ export declare class SegmentedButton extends ButtonBase {
     private renderEndIcon;
     private renderInner;
 }
+export interface SegmentedButtonEventMap {
+    focus: FocusEvent;
+    blur: FocusEvent;
+    invalid: CustomEvent<void>;
+}
 declare global {
     interface HTMLElementTagNameMap {
         'mdui-segmented-button': SegmentedButton;

package/components/select/index.d.ts

@@ -1,11 +1,12 @@
-import { LitElement, PropertyValues } from 'lit';
+import { PropertyValues } from 'lit';
+import { MduiElement } from '@mdui/shared/base/mdui-element.js';
 import '../chip.js';
 import '../dropdown.js';
 import '../menu.js';
 import '../text-field.js';
 import type { FormControl } from '@mdui/jq/shared/form.js';
 import type { CSSResultGroup, TemplateResult } from 'lit';
-declare const Select_base: import("@open-wc/dedupe-mixin").Constructor<import("@mdui/shared/mixins/focusable.js").FocusableMixinInterface> & typeof LitElement;
+declare const Select_base: import("@open-wc/dedupe-mixin").Constructor<import("@mdui/shared/mixins/focusable.js").FocusableMixinInterface> & typeof MduiElement;
 /**
  * @summary 选择框组件。需与 `<mdui-menu-item>` 组件配合使用
  *
@@ -35,7 +36,7 @@ declare const Select_base: import("@open-wc/dedupe-mixin").Constructor<import("@
  * @csspart text-field - 文本框，即 [`<mdui-text-field>`](/docs/2/components/text-field) 元素
  * @csspart menu - 下拉菜单，即 [`<mdui-menu>`](/docs/2/components/menu) 元素
  */
-export declare class Select extends Select_base implements FormControl {
+export declare class Select extends Select_base<SelectEventMap> implements FormControl {
     static styles: CSSResultGroup;
     /**
      * 下拉框形状。可选值为：
@@ -192,6 +193,13 @@ export declare class Select extends Select_base implements FormControl {
      */
     private onTextFieldKeyDown;
 }
+export interface SelectEventMap {
+    focus: FocusEvent;
+    blur: FocusEvent;
+    change: CustomEvent<void>;
+    invalid: CustomEvent<void>;
+    clear: CustomEvent<void>;
+}
 declare global {
     interface HTMLElementTagNameMap {
         'mdui-select': Select;

package/components/select/index.js

@@ -1,17 +1,17 @@
 import { __decorate } from "tslib";
-import { html, LitElement, nothing } from 'lit';
+import { html, nothing } from 'lit';
 import { customElement, property, queryAssignedElements, state, } from 'lit/decorators.js';
 import { ifDefined } from 'lit/directives/if-defined.js';
 import { map } from 'lit/directives/map.js';
 import { createRef, ref } from 'lit/directives/ref.js';
 import { when } from 'lit/directives/when.js';
 import { isString } from '@mdui/jq/shared/helper.js';
+import { MduiElement } from '@mdui/shared/base/mdui-element.js';
 import { DefinedController } from '@mdui/shared/controllers/defined.js';
 import { FormController, formResets } from '@mdui/shared/controllers/form.js';
 import { HasSlotController } from '@mdui/shared/controllers/has-slot.js';
 import { defaultValue } from '@mdui/shared/decorators/default-value.js';
 import { booleanConverter } from '@mdui/shared/helpers/decorator.js';
-import { emit } from '@mdui/shared/helpers/event.js';
 import { observeResize } from '@mdui/shared/helpers/observeResize.js';
 import { componentStyle } from '@mdui/shared/lit-styles/component-style.js';
 import { FocusableMixin } from '@mdui/shared/mixins/focusable.js';
@@ -49,7 +49,7 @@ import { style } from './style.js';
  * @csspart text-field - 文本框，即 [`<mdui-text-field>`](/docs/2/components/text-field) 元素
  * @csspart menu - 下拉菜单，即 [`<mdui-menu>`](/docs/2/components/menu) 元素
  */
-let Select = class Select extends FocusableMixin(LitElement) {
+let Select = class Select extends FocusableMixin(MduiElement) {
     constructor() {
         super(...arguments);
         /**
@@ -164,7 +164,7 @@ let Select = class Select extends FocusableMixin(LitElement) {
     checkValidity() {
         const valid = this.hiddenInputRef.value.checkValidity();
         if (!valid) {
-            emit(this, 'invalid', {
+            this.emit('invalid', {
                 bubbles: false,
                 cancelable: true,
                 composed: false,
@@ -180,7 +180,7 @@ let Select = class Select extends FocusableMixin(LitElement) {
     reportValidity() {
         this.invalid = !this.hiddenInputRef.value.reportValidity();
         if (this.invalid) {
-            emit(this, 'invalid', {
+            this.emit('invalid', {
                 bubbles: false,
                 cancelable: true,
                 composed: false,

package/components/slider/index.d.ts

@@ -21,7 +21,7 @@ import type { CSSResultGroup, PropertyValues, TemplateResult } from 'lit';
  * @csspart label 提示文本
  * @csspart tickmark - 刻度标记
  */
-export declare class Slider extends SliderBase implements FormControl {
+export declare class Slider extends SliderBase<SliderEventMap> implements FormControl {
     static styles: CSSResultGroup;
     /**
      * 滑块的值，将于表单数据一起提交
@@ -46,6 +46,13 @@ export declare class Slider extends SliderBase implements FormControl {
     private updateStyle;
     private onInput;
 }
+export interface SliderEventMap {
+    focus: FocusEvent;
+    blur: FocusEvent;
+    change: CustomEvent<void>;
+    input: Event;
+    invalid: CustomEvent<void>;
+}
 declare global {
     interface HTMLElementTagNameMap {
         'mdui-slider': Slider;

package/components/slider/index.js

@@ -49,7 +49,8 @@ let Slider = class Slider extends SliderBase {
     get rippleElement() {
         return this.rippleRef.value;
     }
-    onValueChange() {
+    async onValueChange() {
+        this.value = this.fixValue(this.value);
         // reset 引起的值变更，不执行验证；直接修改值引起的变更，需要进行验证
         const form = this.formController.getForm();
         if (form && formResets.get(form)?.has(this)) {
@@ -57,20 +58,14 @@ let Slider = class Slider extends SliderBase {
             formResets.get(form).delete(this);
         }
         else {
+            await this.updateComplete;
             this.invalid = !this.inputRef.value.checkValidity();
         }
-        this.inputRef.value.value = this.value.toString();
-        this.value = parseFloat(this.inputRef.value.value);
         this.updateStyle();
     }
     connectedCallback() {
         super.connectedCallback();
-        if (this.value < this.min) {
-            this.value = this.min;
-        }
-        if (this.value > this.max) {
-            this.value = this.max;
-        }
+        this.value = this.fixValue(this.value);
     }
     firstUpdated(changedProperties) {
         super.firstUpdated(changedProperties);

package/components/slider/slider-base.d.ts

@@ -1,8 +1,8 @@
-import { LitElement } from 'lit';
+import { MduiElement } from '@mdui/shared/base/mdui-element.js';
 import type { CSSResultGroup, TemplateResult } from 'lit';
 import type { Ref } from 'lit/directives/ref.js';
-declare const SliderBase_base: import("@open-wc/dedupe-mixin").Constructor<import("../ripple/ripple-mixin.js").RippleMixinInterface> & import("@open-wc/dedupe-mixin").Constructor<import("@mdui/shared/mixins/focusable.js").FocusableMixinInterface> & typeof LitElement;
-export declare class SliderBase extends SliderBase_base {
+declare const SliderBase_base: import("@open-wc/dedupe-mixin").Constructor<import("../ripple/ripple-mixin.js").RippleMixinInterface> & import("@open-wc/dedupe-mixin").Constructor<import("@mdui/shared/mixins/focusable.js").FocusableMixinInterface> & typeof MduiElement;
+export declare class SliderBase<E> extends SliderBase_base<E> {
     static styles: CSSResultGroup;
     /**
      * 最小允许值，默认为 `0`
@@ -79,6 +79,10 @@ export declare class SliderBase extends SliderBase_base {
      * @param message 自定义的提示文本
      */
     setCustomValidity(message: string): void;
+    /**
+     * value 不在 min、max 或 step 的限制范围内时，修正 value 的值
+     */
+    protected fixValue(value: number): number;
     /**
      * 获取候选值组成的数组
      */

package/components/slider/slider-base.js

@@ -1,17 +1,17 @@
 import { __decorate } from "tslib";
-import { html, LitElement } from 'lit';
+import { html } from 'lit';
 import { property, state } from 'lit/decorators.js';
 import { classMap } from 'lit/directives/class-map.js';
 import { createRef } from 'lit/directives/ref.js';
 import { when } from 'lit/directives/when.js';
+import { MduiElement } from '@mdui/shared/base/mdui-element.js';
 import { watch } from '@mdui/shared/decorators/watch.js';
 import { booleanConverter } from '@mdui/shared/helpers/decorator.js';
-import { emit } from '@mdui/shared/helpers/event.js';
 import { componentStyle } from '@mdui/shared/lit-styles/component-style.js';
 import { FocusableMixin } from '@mdui/shared/mixins/focusable.js';
 import { RippleMixin } from '../ripple/ripple-mixin.js';
 import { sliderBaseStyle } from './slider-base-style.js';
-export class SliderBase extends RippleMixin(FocusableMixin(LitElement)) {
+export class SliderBase extends RippleMixin(FocusableMixin(MduiElement)) {
     constructor() {
         super(...arguments);
         /**
@@ -87,7 +87,8 @@ export class SliderBase extends RippleMixin(FocusableMixin(LitElement)) {
     checkValidity() {
         const valid = this.inputRef.value.checkValidity();
         if (!valid) {
-            emit(this, 'invalid', {
+            // @ts-ignore
+            this.emit('invalid', {
                 bubbles: false,
                 cancelable: true,
                 composed: false,
@@ -103,13 +104,14 @@ export class SliderBase extends RippleMixin(FocusableMixin(LitElement)) {
     reportValidity() {
         this.invalid = !this.inputRef.value.reportValidity();
         if (this.invalid) {
-            const requestInvalid = emit(this, 'invalid', {
+            // @ts-ignore
+            const eventProceeded = this.emit('invalid', {
                 bubbles: false,
                 cancelable: true,
                 composed: false,
             });
-            // 调用了 preventDefault() 时，隐藏默认的表单错误提示
-            if (requestInvalid.defaultPrevented) {
+            if (!eventProceeded) {
+                // 调用了 preventDefault() 时，隐藏默认的表单错误提示
                 this.blur();
                 this.focus();
             }
@@ -125,6 +127,22 @@ export class SliderBase extends RippleMixin(FocusableMixin(LitElement)) {
         this.inputRef.value.setCustomValidity(message);
         this.invalid = !this.inputRef.value.checkValidity();
     }
+    /**
+     * value 不在 min、max 或 step 的限制范围内时，修正 value 的值
+     */
+    fixValue(value) {
+        const { min, max, step } = this;
+        // 确保 value 在 min 和 max 范围内
+        value = Math.min(Math.max(value, min), max);
+        // 计算最接近 value 的 step 值
+        const steps = Math.round((value - min) / step);
+        let fixedValue = min + steps * step;
+        // 如果修正后的值超出最大值，则减去一个 step
+        if (fixedValue > max) {
+            fixedValue -= step;
+        }
+        return fixedValue;
+    }
     /**
      * 获取候选值组成的数组
      */
@@ -138,7 +156,8 @@ export class SliderBase extends RippleMixin(FocusableMixin(LitElement)) {
         return when(!this.nolabel, () => html `<div part="label" class="label ${classMap({ 'label-visible': this.labelVisible })}">${this.labelFormatter(value)}</div>`);
     }
     onChange() {
-        emit(this, 'change');
+        // @ts-ignore
+        this.emit('change');
     }
 }
 SliderBase.styles = [