mdui 2.0.1 → 2.0.2

package/components/navigation-drawer/index.js

@@ -6,7 +6,8 @@ import { when } from 'lit/directives/when.js';
 import { $ } from '@mdui/jq/$.js';
 import '@mdui/jq/methods/css.js';
 import '@mdui/jq/methods/innerWidth.js';
-import { isNull } from '@mdui/jq/shared/helper.js';
+import { isFunction, isNull } from '@mdui/jq/shared/helper.js';
+import { DefinedController } from '@mdui/shared/controllers/defined.js';
 import { watch } from '@mdui/shared/decorators/watch.js';
 import { animateTo, stopAnimations } from '@mdui/shared/helpers/animate.js';
 import { breakpoint } from '@mdui/shared/helpers/breakpoint.js';
@@ -42,7 +43,7 @@ import { style } from './style.js';
  * @cssprop --shape-corner - 组件的圆角大小。可以指定一个具体的像素值；但更推荐[引用设计令牌](/docs/2/styles/design-tokens#shape-corner)
  * @cssprop --z-index - 组件的 CSS 的 `z-index` 值
  */
-export let NavigationDrawer = class NavigationDrawer extends LayoutItemBase {
+let NavigationDrawer = class NavigationDrawer extends LayoutItemBase {
     constructor() {
         super(...arguments);
         /**
@@ -81,6 +82,9 @@ export let NavigationDrawer = class NavigationDrawer extends LayoutItemBase {
         this.mobile = false;
         this.overlayRef = createRef();
         this.panelRef = createRef();
+        this.definedController = new DefinedController(this, {
+            needDomReady: true,
+        });
     }
     get layoutPlacement() {
         return this.placement;
@@ -94,11 +98,9 @@ export let NavigationDrawer = class NavigationDrawer extends LayoutItemBase {
         return this.mobile || this.modal;
     }
     // contained 变更后，修改监听尺寸变化的元素。为 true 时，监听父元素；为 false 时，监听 body
-    onContainedChange() {
-        var _a;
-        if (this.hasUpdated) {
-            (_a = this.observeResize) === null || _a === void 0 ? void 0 : _a.unobserve();
-        }
+    async onContainedChange() {
+        await this.definedController.whenDefined();
+        this.observeResize?.unobserve();
         this.observeResize = observeResize(this.contained ? this.parentElement : document.body, () => {
             const target = this.contained ? this.parentElement : undefined;
             this.mobile = breakpoint(target).down('md');
@@ -115,11 +117,24 @@ export let NavigationDrawer = class NavigationDrawer extends LayoutItemBase {
             this.layoutManager.updateLayout(this);
         }
     }
+    async onMobileChange() {
+        if (!this.open || this.isParentLayout || this.contained) {
+            return;
+        }
+        await this.definedController.whenDefined();
+        if (this.isModal) {
+            lockScreen(this, this.lockTarget);
+            await this.getLockTargetAnimate(false, 0);
+        }
+        else {
+            unlockScreen(this, this.lockTarget);
+            await this.getLockTargetAnimate(true, 0);
+        }
+    }
     async onOpenChange() {
         let panel = this.panelRef.value;
         let overlay = this.overlayRef.value;
         const isRight = this.placement === 'right';
-        const paddingPropName = isRight ? 'paddingRight' : 'paddingLeft';
         const easingLinear = getEasing(this, 'linear');
         const easingEmphasized = getEasing(this, 'emphasized');
         // 在当前 drawer 位于 layout 中时，设置所有 layout-item 和 layout-main 元素的 transition 样式
@@ -152,11 +167,14 @@ export let NavigationDrawer = class NavigationDrawer extends LayoutItemBase {
                     return;
                 }
             }
+            await this.definedController.whenDefined();
             this.style.display = 'block';
             this.originalTrigger = document.activeElement;
             if (this.isModal) {
                 this.modalHelper.activate();
-                lockScreen(this, this.lockTarget);
+                if (!this.contained) {
+                    lockScreen(this, this.lockTarget);
+                }
             }
             await stopOldAnimations();
             // 设置聚焦
@@ -180,14 +198,7 @@ export let NavigationDrawer = class NavigationDrawer extends LayoutItemBase {
             }
             // 不位于 layout 中，父元素 padding 变化的动画
             else if (!this.isParentLayout) {
-                animations.push(animateTo(this.lockTarget, [
-                    { [paddingPropName]: 0 },
-                    { [paddingPropName]: $(panel).innerWidth() + 'px' },
-                ], {
-                    duration: hasUpdated ? duration : 0,
-                    easing: easingEmphasized,
-                    fill: 'forwards',
-                }));
+                animations.push(this.getLockTargetAnimate(true, hasUpdated ? duration : 0));
             }
             // 若位于 layout 中，则 layout-main 的 padding 变化需要有和 drawer 相同的动画
             // 但首次渲染不执行动画
@@ -210,14 +221,14 @@ export let NavigationDrawer = class NavigationDrawer extends LayoutItemBase {
             if (hasUpdated) {
                 emit(this, 'opened');
             }
-            return;
         }
-        // 关闭
-        if (!this.open && this.hasUpdated) {
+        else if (this.hasUpdated) {
+            // 关闭
             const requestClose = emit(this, 'close', { cancelable: true });
             if (requestClose.defaultPrevented) {
                 return;
             }
+            await this.definedController.whenDefined();
             if (this.isModal) {
                 this.modalHelper.deactivate();
             }
@@ -233,14 +244,7 @@ export let NavigationDrawer = class NavigationDrawer extends LayoutItemBase {
             }
             // 不位于 layout 中，父元素 padding 变化的动画
             else if (!this.isParentLayout) {
-                animations.push(animateTo(this.lockTarget, [
-                    { [paddingPropName]: $(panel).innerWidth() + 'px' },
-                    { [paddingPropName]: 0 },
-                ], {
-                    duration,
-                    easing: easingEmphasized,
-                    fill: 'forwards',
-                }));
+                animations.push(this.getLockTargetAnimate(false, duration));
             }
             // 若位于 layout 中，则 layout-main 的 padding 变化需要有和 drawer 相同的动画
             if (this.isParentLayout) {
@@ -260,21 +264,28 @@ export let NavigationDrawer = class NavigationDrawer extends LayoutItemBase {
                 setLayoutTransition(null);
             }
             this.style.display = 'none';
-            if (this.isModal) {
+            if (this.isModal && !this.contained) {
                 unlockScreen(this, this.lockTarget);
             }
             // 抽屉导航关闭后，恢复焦点到原有的元素上
             const trigger = this.originalTrigger;
-            if (typeof (trigger === null || trigger === void 0 ? void 0 : trigger.focus) === 'function') {
+            if (isFunction(trigger?.focus)) {
                 setTimeout(() => trigger.focus());
             }
             emit(this, 'closed');
-            return;
         }
     }
     connectedCallback() {
         super.connectedCallback();
         this.modalHelper = new Modal(this);
+    }
+    disconnectedCallback() {
+        super.disconnectedCallback();
+        unlockScreen(this, this.lockTarget);
+        this.observeResize?.unobserve();
+    }
+    firstUpdated(_changedProperties) {
+        super.firstUpdated(_changedProperties);
         this.addEventListener('keydown', (event) => {
             if (this.open &&
                 this.closeOnEsc &&
@@ -285,21 +296,26 @@ export let NavigationDrawer = class NavigationDrawer extends LayoutItemBase {
             }
         });
     }
-    disconnectedCallback() {
-        var _a;
-        super.disconnectedCallback();
-        unlockScreen(this, this.lockTarget);
-        (_a = this.observeResize) === null || _a === void 0 ? void 0 : _a.unobserve();
-    }
     render() {
         return html `${when(this.isModal, () => html `<div ${ref(this.overlayRef)} part="overlay" class="overlay" @click="${this.onOverlayClick}"></div>`)}<slot ${ref(this.panelRef)} part="panel" class="panel" tabindex="0"></slot>`;
     }
     onOverlayClick() {
         emit(this, 'overlay-click');
-        if (!this.closeOnOverlayClick) {
-            return;
+        if (this.closeOnOverlayClick) {
+            this.open = false;
         }
-        this.open = false;
+    }
+    getLockTargetAnimate(open, duration) {
+        const paddingName = this.placement === 'right' ? 'paddingRight' : 'paddingLeft';
+        const panelWidth = $(this.panelRef.value).innerWidth() + 'px';
+        return animateTo(this.lockTarget, [
+            { [paddingName]: open ? 0 : panelWidth },
+            { [paddingName]: open ? panelWidth : 0 },
+        ], {
+            duration,
+            easing: getEasing(this, 'emphasized'),
+            fill: 'forwards',
+        });
     }
 };
 NavigationDrawer.styles = [componentStyle, style];
@@ -355,11 +371,16 @@ __decorate([
     watch('contained')
 ], NavigationDrawer.prototype, "onContainedChange", null);
 __decorate([
-    watch('placement')
+    watch('placement', true)
 ], NavigationDrawer.prototype, "onPlacementChange", null);
+__decorate([
+    watch('mobile', true),
+    watch('modal', true)
+], NavigationDrawer.prototype, "onMobileChange", null);
 __decorate([
     watch('open')
 ], NavigationDrawer.prototype, "onOpenChange", null);
 NavigationDrawer = __decorate([
     customElement('mdui-navigation-drawer')
 ], NavigationDrawer);
+export { NavigationDrawer };

package/components/navigation-rail/navigation-rail-item-style.js

@@ -1,2 +1,2 @@
 import { css } from 'lit';
-export const navigationRailItemStyle = css `:host{--shape-corner-indicator:var(--mdui-shape-corner-full);position:relative;z-index:0;width:100%;--mdui-comp-ripple-state-layer-color:var(--mdui-color-on-surface-variant)}.container{display:flex;flex-direction:column;align-items:center;justify-content:center;text-decoration:none;cursor:pointer;-webkit-user-select:none;user-select:none;-webkit-tap-highlight-color:transparent;transition:padding var(--mdui-motion-duration-short4) var(--mdui-motion-easing-standard);height:3.5rem}mdui-ripple{z-index:1;width:3.5rem;height:2rem;border-radius:var(--mdui-shape-corner-full)}.container:not(.has-label)+mdui-ripple{height:3.5rem}.indicator{position:relative;display:flex;align-items:center;justify-content:center;background-color:transparent;border-radius:var(--shape-corner-indicator);transition:background-color var(--mdui-motion-duration-short1) var(--mdui-motion-easing-standard),width var(--mdui-motion-duration-short4) var(--mdui-motion-easing-standard),height var(--mdui-motion-duration-short4) var(--mdui-motion-easing-standard);height:2rem;width:2rem}::slotted([slot=badge]){position:absolute;transform:translate(50%,-50%)}:host([placement=right]) ::slotted([slot=badge]){transform:translate(-50%,-50%)}::slotted([slot=badge][variant=small]){transform:translate(.5625rem,-.5625rem)}:host([placement=right]) ::slotted([slot=badge][variant=small]){transform:translate(-.5625rem,-.5625rem)}.active-icon,.icon{color:rgb(var(--mdui-color-on-surface-variant));font-size:1.5rem}.active-icon mdui-icon,.icon mdui-icon,::slotted([slot=active-icon]),::slotted([slot=icon]){font-size:inherit}.icon{display:flex}.active-icon{display:none}.label{display:flex;align-items:center;transition:opacity var(--mdui-motion-duration-short4) var(--mdui-motion-easing-linear);height:1rem;color:rgb(var(--mdui-color-on-surface-variant));margin-top:.25rem;margin-bottom:.25rem;font-size:var(--mdui-typescale-label-medium-size);font-weight:var(--mdui-typescale-label-medium-weight);letter-spacing:var(--mdui-typescale-label-medium-tracking);line-height:var(--mdui-typescale-label-medium-line-height)}:host([active]){--mdui-comp-ripple-state-layer-color:var(--mdui-color-on-surface)}:host([active]) .indicator{width:3.5rem;background-color:rgb(var(--mdui-color-secondary-container))}:host([active]) :not(.has-label) .indicator{height:3.5rem}:host([active]) .active-icon,:host([active]) .icon{color:rgb(var(--mdui-color-on-secondary-container))}:host([active]) .has-active-icon .active-icon{display:flex}:host([active]) .has-active-icon .icon{display:none}:host([active]) .label{color:rgb(var(--mdui-color-on-surface))}`;
+export const navigationRailItemStyle = css `:host{--shape-corner-indicator:var(--mdui-shape-corner-full);position:relative;z-index:0;width:100%;--mdui-comp-ripple-state-layer-color:var(--mdui-color-on-surface-variant)}.container{display:flex;flex-direction:column;align-items:center;justify-content:center;text-decoration:none;cursor:pointer;-webkit-user-select:none;user-select:none;-webkit-tap-highlight-color:transparent;height:3.5rem}.container:not(.initial){transition:padding var(--mdui-motion-duration-short4) var(--mdui-motion-easing-standard)}mdui-ripple{z-index:1;width:3.5rem;height:2rem;border-radius:var(--mdui-shape-corner-full)}.container:not(.has-label)+mdui-ripple{height:3.5rem}.indicator{position:relative;display:flex;align-items:center;justify-content:center;background-color:transparent;border-radius:var(--shape-corner-indicator);height:2rem;width:2rem}:not(.initial) .indicator{transition:background-color var(--mdui-motion-duration-short1) var(--mdui-motion-easing-standard),width var(--mdui-motion-duration-short4) var(--mdui-motion-easing-standard),height var(--mdui-motion-duration-short4) var(--mdui-motion-easing-standard)}::slotted([slot=badge]){position:absolute;transform:translate(50%,-50%)}.placement-right::slotted([slot=badge]){transform:translate(-50%,-50%)}::slotted([slot=badge][variant=small]){transform:translate(.5625rem,-.5625rem)}.placement-right::slotted([slot=badge][variant=small]){transform:translate(-.5625rem,-.5625rem)}.active-icon,.icon{color:rgb(var(--mdui-color-on-surface-variant));font-size:1.5rem}.active-icon mdui-icon,.icon mdui-icon,::slotted([slot=active-icon]),::slotted([slot=icon]){font-size:inherit}.icon{display:flex}.active-icon{display:none}.label{display:flex;align-items:center;height:1rem;color:rgb(var(--mdui-color-on-surface-variant));margin-top:.25rem;margin-bottom:.25rem;font-size:var(--mdui-typescale-label-medium-size);font-weight:var(--mdui-typescale-label-medium-weight);letter-spacing:var(--mdui-typescale-label-medium-tracking);line-height:var(--mdui-typescale-label-medium-line-height)}:not(.initial) .label{transition:opacity var(--mdui-motion-duration-short4) var(--mdui-motion-easing-linear)}:host([active]){--mdui-comp-ripple-state-layer-color:var(--mdui-color-on-surface)}:host([active]) .indicator{width:3.5rem;background-color:rgb(var(--mdui-color-secondary-container))}:host([active]) :not(.has-label) .indicator{height:3.5rem}:host([active]) .active-icon,:host([active]) .icon{color:rgb(var(--mdui-color-on-secondary-container))}:host([active]) .has-active-icon .active-icon{display:flex}:host([active]) .has-active-icon .icon{display:none}:host([active]) .label{color:rgb(var(--mdui-color-on-surface))}`;

package/components/navigation-rail/navigation-rail-item.d.ts

@@ -46,11 +46,15 @@ export declare class NavigationRailItem extends NavigationRailItem_base {
      */
     value?: string;
     /**
-     * 是否为激活状态，由 `navigation-rail` 组件控制该参数
+     * 是否为激活状态，由 `<mdui-navigation-rail>` 组件控制该参数
      */
     protected active: boolean;
     /**
-     * 导航栏的位置，由 `navigation-rail` 组件控制该参数
+     * 是否是初始状态，不显示动画。由 `<mdui-navigation-rail>` 组件控制该参数
+     */
+    protected isInitial: boolean;
+    /**
+     * 导航栏的位置，由 `<mdui-navigation-rail>` 组件控制该参数
      */
     protected placement: 'left' | 'right';
     private disabled;

package/components/navigation-rail/navigation-rail-item.js

@@ -1,6 +1,7 @@
 import { __decorate } from "tslib";
 import { html, LitElement, nothing } 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 cc from 'classcat';
 import { HasSlotController } from '@mdui/shared/controllers/has-slot.js';
@@ -41,20 +42,24 @@ import { navigationRailItemStyle } from './navigation-rail-item-style.js';
  *
  * @cssprop --shape-corner-indicator - 指示器的圆角大小。可以指定一个具体的像素值；但更推荐[引用设计令牌](/docs/2/styles/design-tokens#shape-corner)
  */
-export let NavigationRailItem = class NavigationRailItem extends AnchorMixin(RippleMixin(FocusableMixin(LitElement))) {
+let NavigationRailItem = class NavigationRailItem extends AnchorMixin(RippleMixin(FocusableMixin(LitElement))) {
     constructor() {
         super(...arguments);
         /**
-         * 是否为激活状态，由 `navigation-rail` 组件控制该参数
+         * 是否为激活状态，由 `<mdui-navigation-rail>` 组件控制该参数
          */
         this.active = false;
         /**
-         * 导航栏的位置，由 `navigation-rail` 组件控制该参数
+         * 是否是初始状态，不显示动画。由 `<mdui-navigation-rail>` 组件控制该参数
+         */
+        this.isInitial = true;
+        /**
+         * 导航栏的位置，由 `<mdui-navigation-rail>` 组件控制该参数
          */
         this.placement = 'left';
         // 是否禁用该元素，该组件没有禁用状态
         this.disabled = false;
-        // 每一个 `navigation-rail-item` 元素都添加一个唯一的 key
+        // 每一个 `<mdui-navigation-rail-item>` 元素都添加一个唯一的 key
         this.key = uniqueId();
         this.rippleRef = createRef();
         this.hasSlotController = new HasSlotController(this, '[default]', 'active-icon');
@@ -66,8 +71,7 @@ export let NavigationRailItem = class NavigationRailItem extends AnchorMixin(Rip
         return this.disabled;
     }
     get focusElement() {
-        var _a;
-        return this.href ? (_a = this.renderRoot) === null || _a === void 0 ? void 0 : _a.querySelector('._a') : this;
+        return this.href ? this.renderRoot?.querySelector('._a') : this;
     }
     get focusDisabled() {
         return this.disabled;
@@ -78,6 +82,7 @@ export let NavigationRailItem = class NavigationRailItem extends AnchorMixin(Rip
             container: true,
             'has-label': hasDefaultSlot,
             'has-active-icon': this.activeIcon || this.hasSlotController.test('active-icon'),
+            initial: this.isInitial,
         });
         return html `${this.href
             ? this.renderAnchor({
@@ -88,7 +93,10 @@ export let NavigationRailItem = class NavigationRailItem extends AnchorMixin(Rip
             : html `<div part="container" class="${className}">${this.renderInner(hasDefaultSlot)}</div>`}<mdui-ripple .noRipple="${!this.active || this.noRipple}" ${ref(this.rippleRef)}></mdui-ripple>`;
     }
     renderInner(hasDefaultSlot) {
-        return html `<div part="indicator" class="indicator"><slot name="badge" part="badge" class="badge"></slot><slot name="active-icon" part="active-icon" class="active-icon">${this.activeIcon
+        return html `<div part="indicator" class="indicator"><slot name="badge" part="badge" class="${classMap({
+            badge: true,
+            'placement-right': this.placement === 'right',
+        })}"></slot><slot name="active-icon" part="active-icon" class="active-icon">${this.activeIcon
             ? html `<mdui-icon name="${this.activeIcon}"></mdui-icon>`
             : nothingTemplate}</slot><slot name="icon" part="icon" class="icon">${this.icon
             ? html `<mdui-icon name="${this.icon}"></mdui-icon>`
@@ -118,7 +126,10 @@ __decorate([
     })
 ], NavigationRailItem.prototype, "active", void 0);
 __decorate([
-    property({ reflect: true })
+    state()
+], NavigationRailItem.prototype, "isInitial", void 0);
+__decorate([
+    state()
 ], NavigationRailItem.prototype, "placement", void 0);
 __decorate([
     state()
@@ -126,3 +137,4 @@ __decorate([
 NavigationRailItem = __decorate([
     customElement('mdui-navigation-rail-item')
 ], NavigationRailItem);
+export { NavigationRailItem };

package/components/navigation-rail/navigation-rail.d.ts

@@ -1,6 +1,4 @@
 import '@mdui/jq/methods/css.js';
-import '@mdui/jq/methods/find.js';
-import '@mdui/jq/methods/get.js';
 import '@mdui/jq/methods/innerWidth.js';
 import { LayoutItemBase } from '../layout/layout-item-base.js';
 import type { LayoutPlacement } from '../layout/helper.js';
@@ -62,10 +60,11 @@ export declare class NavigationRail extends LayoutItemBase {
      */
     divider: boolean;
     private activeKey;
+    private readonly items;
     private readonly hasSlotController;
-    private hasSetDefaultValue;
+    private readonly definedController;
+    private isInitial;
     protected get layoutPlacement(): LayoutPlacement;
-    private get items();
     private get parentTarget();
     private get isRight();
     private get paddingValue();
@@ -77,7 +76,7 @@ export declare class NavigationRail extends LayoutItemBase {
     disconnectedCallback(): void;
     protected render(): TemplateResult;
     private onClick;
-    private updateActive;
+    private updateItems;
     private onSlotChange;
 }
 declare global {

package/components/navigation-rail/navigation-rail.js

@@ -1,12 +1,11 @@
 import { __decorate } from "tslib";
 import { html } from 'lit';
-import { customElement, property, state } from 'lit/decorators.js';
+import { customElement, property, queryAssignedElements, state, } from 'lit/decorators.js';
 import { when } from 'lit/directives/when.js';
 import { $ } from '@mdui/jq/$.js';
 import '@mdui/jq/methods/css.js';
-import '@mdui/jq/methods/find.js';
-import '@mdui/jq/methods/get.js';
 import '@mdui/jq/methods/innerWidth.js';
+import { DefinedController } from '@mdui/shared/controllers/defined.js';
 import { HasSlotController } from '@mdui/shared/controllers/has-slot.js';
 import { watch } from '@mdui/shared/decorators/watch.js';
 import { booleanConverter } from '@mdui/shared/helpers/decorator.js';
@@ -38,7 +37,7 @@ import { navigationRailStyle } from './navigation-rail-style.js';
  * @cssprop --shape-corner - 组件的圆角大小。可以指定一个具体的像素值；但更推荐[引用设计令牌](/docs/2/styles/design-tokens#shape-corner)
  * @cssprop --z-index - 组件的 CSS 的 `z-index` 值
  */
-export let NavigationRail = class NavigationRail extends LayoutItemBase {
+let NavigationRail = class NavigationRail extends LayoutItemBase {
     constructor() {
         super(...arguments);
         /**
@@ -70,18 +69,15 @@ export let NavigationRail = class NavigationRail extends LayoutItemBase {
         // 因为 navigation-rail-item 的 value 可能会重复，所以在每个 navigation-rail-item 元素上都添加了一个唯一的 key，通过 activeKey 来记录激活状态的 key
         this.activeKey = 0;
         this.hasSlotController = new HasSlotController(this, 'top', 'bottom');
-        // 是否已完成初始 value 的设置。首次设置初始值时，不触发 change 事件
-        this.hasSetDefaultValue = false;
+        this.definedController = new DefinedController(this, {
+            relatedElements: ['mdui-navigation-rail-item'],
+        });
+        // 是否是初始状态，初始状态不触发事件，不执行动画
+        this.isInitial = true;
     }
     get layoutPlacement() {
         return this.placement;
     }
-    // 所有的子项元素
-    get items() {
-        return $(this)
-            .find('mdui-navigation-rail-item')
-            .get();
-    }
     get parentTarget() {
         return this.contained || this.isParentLayout
             ? this.parentElement
@@ -95,28 +91,27 @@ export let NavigationRail = class NavigationRail extends LayoutItemBase {
             ? this.offsetWidth
             : undefined;
     }
-    onActiveKeyChange() {
+    async onActiveKeyChange() {
+        await this.definedController.whenDefined();
         // 根据 activeKey 读取对应 navigation-rail-item 的值
         const item = this.items.find((item) => item.key === this.activeKey);
-        this.value = item === null || item === void 0 ? void 0 : item.value;
-        if (this.hasSetDefaultValue) {
+        this.value = item?.value;
+        if (!this.isInitial) {
             emit(this, 'change');
         }
-        else {
-            this.hasSetDefaultValue = true;
-        }
     }
-    onValueChange() {
-        var _a;
+    async onValueChange() {
+        this.isInitial = !this.hasUpdated;
+        await this.definedController.whenDefined();
         const item = this.items.find((item) => item.value === this.value);
-        this.activeKey = (_a = item === null || item === void 0 ? void 0 : item.key) !== null && _a !== void 0 ? _a : 0;
-        this.updateActive();
+        this.activeKey = item?.key ?? 0;
+        this.updateItems();
     }
-    // 首次渲染在 @watch('placement') 中已经执行，这里跳过
-    onContainedChange() {
+    async onContainedChange() {
         if (this.isParentLayout) {
             return;
         }
+        await this.definedController.whenDefined();
         $(document.body).css({
             paddingLeft: this.contained || this.isRight ? null : this.paddingValue,
             paddingRight: this.contained || !this.isRight ? null : this.paddingValue,
@@ -126,32 +121,33 @@ export let NavigationRail = class NavigationRail extends LayoutItemBase {
             paddingRight: this.contained && this.isRight ? this.paddingValue : null,
         });
     }
-    onPlacementChange() {
-        var _a;
-        (_a = this.layoutManager) === null || _a === void 0 ? void 0 : _a.updateLayout(this);
+    async onPlacementChange() {
+        await this.definedController.whenDefined();
+        this.layoutManager?.updateLayout(this);
         this.items.forEach((item) => {
             item.placement = this.placement;
         });
-        if (this.isParentLayout) {
-            return;
+        if (!this.isParentLayout) {
+            $(this.parentTarget).css({
+                paddingLeft: this.isRight ? null : this.paddingValue,
+                paddingRight: this.isRight ? this.paddingValue : null,
+            });
         }
-        $(this.parentTarget).css({
-            paddingLeft: this.isRight ? null : this.paddingValue,
-            paddingRight: this.isRight ? this.paddingValue : null,
-        });
     }
     connectedCallback() {
         super.connectedCallback();
         if (!this.isParentLayout) {
-            $(this.parentTarget).css({
-                paddingLeft: this.isRight ? null : this.paddingValue,
-                paddingRight: this.isRight ? this.paddingValue : null,
+            this.definedController.whenDefined().then(() => {
+                $(this.parentTarget).css({
+                    paddingLeft: this.isRight ? null : this.paddingValue,
+                    paddingRight: this.isRight ? this.paddingValue : null,
+                });
             });
         }
     }
     disconnectedCallback() {
         super.disconnectedCallback();
-        if (!this.isParentLayout) {
+        if (!this.isParentLayout && this.definedController.isDefined()) {
             $(this.parentTarget).css({
                 paddingLeft: this.isRight ? undefined : null,
                 paddingRight: this.isRight ? null : undefined,
@@ -171,16 +167,20 @@ export let NavigationRail = class NavigationRail extends LayoutItemBase {
         const target = event.target;
         const item = target.closest('mdui-navigation-rail-item');
         this.activeKey = item.key;
-        this.updateActive();
+        this.isInitial = false;
+        this.updateItems();
     }
-    updateActive() {
-        this.items.forEach((item) => (item.active = this.activeKey === item.key));
-    }
-    onSlotChange() {
+    updateItems() {
         this.items.forEach((item) => {
+            item.active = this.activeKey === item.key;
             item.placement = this.placement;
+            item.isInitial = this.isInitial;
         });
     }
+    async onSlotChange() {
+        await this.definedController.whenDefined();
+        this.updateItems();
+    }
 };
 NavigationRail.styles = [
     componentStyle,
@@ -214,7 +214,13 @@ __decorate([
     state()
 ], NavigationRail.prototype, "activeKey", void 0);
 __decorate([
-    watch('activeKey')
+    queryAssignedElements({
+        selector: 'mdui-navigation-rail-item',
+        flatten: true,
+    })
+], NavigationRail.prototype, "items", void 0);
+__decorate([
+    watch('activeKey', true)
 ], NavigationRail.prototype, "onActiveKeyChange", null);
 __decorate([
     watch('value')
@@ -223,8 +229,9 @@ __decorate([
     watch('contained', true)
 ], NavigationRail.prototype, "onContainedChange", null);
 __decorate([
-    watch('placement')
+    watch('placement', true)
 ], NavigationRail.prototype, "onPlacementChange", null);
 NavigationRail = __decorate([
     customElement('mdui-navigation-rail')
 ], NavigationRail);
+export { NavigationRail };

package/components/radio/radio-group.d.ts

@@ -52,8 +52,10 @@ export declare class RadioGroup extends LitElement implements FormControl {
      * 是否验证未通过
      */
     private invalid;
+    private isInitial;
     private readonly inputRef;
     private readonly formController;
+    private readonly definedController;
     /**
      * 表单验证状态对象
      */
@@ -62,11 +64,10 @@ export declare class RadioGroup extends LitElement implements FormControl {
      * 表单验证的错误提示信息
      */
     get validationMessage(): string;
-    private get radios();
-    private get radiosEnabled();
+    private get items();
+    private get itemsEnabled();
     private onValueChange;
     private onInvalidChange;
-    private onDisabledChange;
     /**
      * 检查表单字段是否验证通过。若未通过则返回 `false`，并触发 `invalid` 事件；若验证通过，则返回 `true`
      */
@@ -85,7 +86,7 @@ export declare class RadioGroup extends LitElement implements FormControl {
     setCustomValidity(message: string): void;
     protected render(): TemplateResult;
     private updateRadioFocusable;
-    private onRadioClick;
+    private onClick;
     /**
      * 在内部的 `<mdui-radio>` 上按下按键时，在 `<mdui-radio>` 之间切换焦点
      */
@@ -95,6 +96,7 @@ export declare class RadioGroup extends LitElement implements FormControl {
      * slot 中的 mdui-radio 的 checked 变更时触发的事件
      */
     private onCheckedChange;
+    private updateItems;
 }
 declare global {
     interface HTMLElementTagNameMap {