@aloudata/aloudata-design 3.1.0 → 3.1.1

package/dist/MemberPicker/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../../src/MemberPicker/index.tsx"],"sourcesContent":["import { usePrevious, useRequest } from 'ahooks';\nimport { cn } from '../lib/utils';\nimport _ from 'lodash';\nimport React, {\n  useCallback,\n  useContext,\n  useEffect,\n  useMemo,\n  useRef,\n  useState,\n} from 'react';\nimport Avatar from '../Avatar';\nimport ConfigProvider from '../ConfigProvider';\nimport './member-picker.css';\nimport {\n  EUserType,\n  IUser,\n  IUserGroup,\n  TUser,\n} from '../ConfigProvider/getUserList';\nimport { LocaleContext, getTranslator } from '../locale/default';\nimport message from '../message';\nimport Panel from './components/Panel';\nimport MemberPanel from './components/PanelWrapper';\nimport {\n  EMemberPicker,\n  IMemberPickerProps,\n  TUserGroupValue,\n  TUserValue,\n} from './interface';\nimport { isUser, isUserGroup } from './utils/getUsersWithUserId';\nimport Select from '../Select';\nimport { Mode } from '../Select/BaseSelect';\n\nconst DEFAULT_MULTIPLE_DROPDOWN_WIDTH = 480;\n\nconst Component: React.FC<IMemberPickerProps> = (props) => {\n  const { locale } = useContext(LocaleContext);\n  const t = getTranslator(locale);\n\n  const {\n    value,\n    type = EMemberPicker.USER,\n    onChange,\n    multiple,\n    dropdownWidth,\n    open,\n    onOpenChange,\n    placeholder = t.MemberPicker.select,\n    className,\n    allowClear,\n    disabled,\n    onClear,\n    size,\n    prefix: propPrefix,\n    lockedIds = [],\n    footer,\n    onCancel,\n    filterItem,\n    mode: propsMode,\n    renderItem,\n    renderSelectedTag,\n    'data-testid': dataTestId,\n    'aria-label': ariaLabel,\n    ...restProps\n  } = props;\n  const allowOverlap = props.allowOverlap ?? false;\n  const { getUsersByIds, getUsersByKeywords } = ConfigProvider.useGetUserList();\n  const [selectedUserList, setSelectedUserList] = useState<TUser>([]);\n  const prevValue = usePrevious(value);\n  const [searchUserList, setSearchUserList] = useState<TUser>([]);\n  const [searchString, setSearchString] = useState<string>('');\n  const [dropdownContentWidth, setDropdownContentWidth] =\n    useState(dropdownWidth);\n  // 单选默认浮窗跟触发器等宽（true），调用方传 dropdownWidth 时用具体数字；\n  // 多选默认 480，单条记录只有 头像+nickname 时触发器太窄装不下选中标签，故固定值。\n  const panelWidth: number | boolean =\n    dropdownWidth ?? (multiple ? DEFAULT_MULTIPLE_DROPDOWN_WIDTH : true);\n\n  const triggerRef = useRef<HTMLDivElement>(null);\n  const onSearchValueChange = useCallback((v: string) => {\n    setSearchString(v);\n  }, []);\n  const [dropdownOpen, setDropdownOpen] = useState<boolean>(!!open);\n  const queryByKeywords = useMemo(() => {\n    if (getUsersByKeywords) {\n      return getUsersByKeywords;\n    }\n\n    return (_params = {}) =>\n      Promise.reject({\n        message: t.MemberPicker.pleaseConfigGetUserByKeywordsMethod,\n      });\n  }, [getUsersByKeywords, t.MemberPicker.pleaseConfigGetUserByKeywordsMethod]);\n  const queryByIds = useMemo(() => {\n    if (getUsersByIds) {\n      return getUsersByIds;\n    }\n\n    return (_params = {}) =>\n      Promise.reject({\n        message: t.MemberPicker.pleaseConfigGetUserByIdsMethod,\n      });\n  }, [getUsersByIds, t.MemberPicker.pleaseConfigGetUserByIdsMethod]);\n  const { loading, run } = useRequest(() => queryByKeywords(searchString), {\n    refreshDeps: [searchString],\n    manual: true,\n    cacheKey: 'member-selector',\n    cacheTime: 1000 * 60 * 2, // 2分钟内不重复请求\n    onSuccess: (result) => {\n      setSearchUserList(result);\n    },\n    onError: (error) => {\n      message.error(error.message);\n    },\n  });\n\n  const totalUserList: TUser = useMemo(() => {\n    const totalUsers = searchUserList.concat(\n      selectedUserList.filter((item) => {\n        const name =\n          (item.type === EUserType.USER ? item.nickname : item.name) || '';\n\n        return name.toUpperCase().includes(searchString.trim().toUpperCase());\n      }),\n    );\n\n    return _.uniqBy(totalUsers, (data: IUser | IUserGroup) => {\n      if (data.type === EUserType.USER) return data.userId;\n\n      return data.groupId;\n    }).filter((item) => {\n      if (filterItem) {\n        return filterItem(item);\n      }\n\n      return true;\n    });\n  }, [filterItem, searchString, searchUserList, selectedUserList]);\n\n  useEffect(() => {\n    if (!dropdownOpen) return;\n    run();\n  }, [dropdownOpen, run, searchString]);\n\n  useEffect(() => {\n    if (_.isEqual(value, prevValue)) {\n      return;\n    }\n    if (Array.isArray(value) && (isUser(value[0]) || isUserGroup(value[0]))) {\n      setSelectedUserList(value as TUser);\n    } else if (isUser(value) || isUserGroup(value)) {\n      setSelectedUserList([value]);\n    } else {\n      let param: Array<TUserValue | TUserGroupValue> = [];\n      if (!value) return;\n      if (Array.isArray(value) && value.length === 0) {\n        setSelectedUserList([]);\n\n        return;\n      }\n      if (!Array.isArray(value)) {\n        param = [value];\n      } else {\n        param = value;\n      }\n      queryByIds(param).then((result) => {\n        // 如果用户已被删除，则需要展示出id\n        const valueNotInResult: TUser = param\n          .filter((item) => {\n            if (item.type === EUserType.USER) {\n              return result\n                .filter(isUser)\n                .every((user) => user.userId !== item.userId);\n            }\n\n            return result\n              .filter(isUserGroup)\n              .every((user) => user.groupId !== item.groupId);\n          })\n          .map((item) => {\n            if (item.type === EUserType.USER) {\n              return {\n                type: EUserType.USER,\n                userId: item.userId,\n              } as IUser;\n            }\n\n            return {\n              type: EUserType.USER_GROUP,\n              groupId: item.groupId,\n            } as IUserGroup;\n          });\n\n        setSelectedUserList([...result, ...valueNotInResult]);\n      });\n    }\n  }, [value, queryByIds, prevValue]);\n\n  const onSelectedChange = useCallback(\n    (users: TUser) => {\n      if (multiple) {\n        setSelectedUserList(users);\n        onChange?.(users);\n      } else {\n        setSelectedUserList(users);\n        onChange?.(users[0]);\n      }\n      setDropdownOpen(false);\n    },\n    [multiple, onChange, setDropdownOpen],\n  );\n\n  useEffect(() => {\n    if (typeof open === 'boolean') {\n      setDropdownOpen(open);\n    }\n  }, [open]);\n\n  useEffect(() => {\n    if (!dropdownContentWidth) {\n      const resizeEle = triggerRef.current;\n      if (!resizeEle) return;\n      const resizeObserver = new ResizeObserver((entries) => {\n        for (const entry of entries) {\n          const { width } = entry.contentRect;\n          setDropdownContentWidth(width);\n        }\n      });\n      resizeObserver.observe(resizeEle);\n\n      return () => {\n        resizeObserver.unobserve(resizeEle);\n      };\n    }\n  }, [triggerRef, dropdownContentWidth]);\n  const onDropdownOpenChange = useCallback(\n    (open: boolean) => {\n      setDropdownOpen(open);\n      onOpenChange?.(open);\n    },\n    [onOpenChange],\n  );\n  const panelKey = useMemo(() => {\n    if (dropdownOpen) {\n      return _.sampleSize('abcdefghijklmnopqrstuvwxyz0123456789', 8).join('');\n    }\n  }, [dropdownOpen]);\n  const mode = useMemo(() => {\n    if (multiple === true) {\n      if (typeof propsMode === 'object')\n        return {\n          ...(propsMode || {}),\n          type: 'multiple',\n          responsive: _.isNil(propsMode.responsive)\n            ? true\n            : propsMode.responsive,\n        } as Mode;\n      return {\n        type: 'multiple',\n        responsive: true,\n      } as Mode;\n    }\n\n    return multiple ? (multiple as Mode) : propsMode;\n  }, [multiple, propsMode]);\n\n  const selectOpen = typeof open === 'boolean' ? open : dropdownOpen;\n\n  return (\n    <Select\n      prefix={propPrefix}\n      {...restProps}\n      data-testid={dataTestId}\n      aria-label={ariaLabel}\n      size={size}\n      className={cn('ald-member-picker-select', className)}\n      value={selectedUserList.map((item) => {\n        if (item.type === EUserType.USER_GROUP) {\n          return item.groupId;\n        } else {\n          return item.userId;\n        }\n      })}\n      onChange={(value) => {\n        if (_.isEmpty(value)) {\n          setSelectedUserList([]);\n          if (multiple) {\n            onChange?.([]);\n          } else {\n            onChange?.();\n          }\n        } else {\n          const valueList = Array.isArray(value) ? value : [value];\n          if (multiple) {\n            const users = valueList\n              .map((item) => {\n                const user = totalUserList.find((user) => {\n                  if (user.type === EUserType.USER) {\n                    return user.userId === item;\n                  }\n\n                  return user.groupId === item;\n                });\n\n                return user;\n              })\n              .filter(Boolean) as TUser;\n            setSelectedUserList(users);\n            onChange?.(users);\n          } else {\n            const user = totalUserList.find((user) => {\n              if (user.type === EUserType.USER) {\n                return user.userId === value;\n              }\n\n              return user.groupId === value;\n            });\n            if (user) {\n              setSelectedUserList([user]);\n              onChange?.(user);\n            } else {\n              setSelectedUserList([]);\n              onChange?.();\n            }\n          }\n        }\n      }}\n      disabled={disabled}\n      allowClear={allowClear}\n      onClear={() => {\n        setSelectedUserList([]);\n        if (multiple) {\n          onChange?.([]);\n        } else {\n          onChange?.();\n        }\n        onClear?.();\n      }}\n      popupClassName={cn(\n        'ald-member-picker-popup',\n        allowOverlap && 'ald-member-picker-popup-adaptive',\n        props.popupClassName,\n      )}\n      mode={mode}\n      options={selectedUserList.map((item) => {\n        if (item.type === EUserType.USER_GROUP)\n          return {\n            label: item.name || item.groupId,\n            value: item.groupId,\n            tag: (\n              <div className={'ald-member-picker-tag'}>\n                <Avatar type=\"team\" size={20}>\n                  {item.name || item.groupId}\n                </Avatar>\n                {item.name || item.groupId}\n              </div>\n            ),\n          };\n\n        return {\n          label: item.nickname || item.name || item.userId,\n          value: item.userId,\n          tag: (\n            <div className={'ald-member-picker-tag'}>\n              <Avatar\n                size={20}\n                src={item.photo}\n                type={item.type === EUserType.USER ? 'user' : 'team'}\n              >\n                {item.nickname || item.name || item.userId}\n              </Avatar>\n              {item.nickname || item.name || item.userId}\n            </div>\n          ),\n        };\n      })}\n      optionLabelProp={multiple ? 'label' : 'tag'}\n      open={selectOpen}\n      onOpenChange={onDropdownOpenChange}\n      popupMatchSelectWidth={panelWidth}\n      allowOverlap={allowOverlap}\n      placeholder={placeholder}\n      dropdownRender={() => {\n        return (\n          <div\n            ref={triggerRef}\n            className={cn({\n              'ald-member-picker-popup-body': allowOverlap,\n            })}\n          >\n            <Panel\n              type={type}\n              footer={footer}\n              value={selectedUserList}\n              dataList={totalUserList}\n              lockedIds={lockedIds}\n              multiple={!!multiple}\n              key={panelKey}\n              loading={loading}\n              dropdownWidth={dropdownContentWidth}\n              onSearchValueChange={onSearchValueChange}\n              onChange={onSelectedChange}\n              onCancel={() => {\n                onCancel?.();\n                setDropdownOpen(false);\n              }}\n              renderItem={renderItem}\n              renderSelectedTag={renderSelectedTag}\n            ></Panel>\n          </div>\n        );\n      }}\n    ></Select>\n  );\n};\n\nconst MemberSelector = Component as React.FC<IMemberPickerProps> & {\n  MemberPanel: typeof MemberPanel;\n};\n\nMemberSelector.MemberPanel = MemberPanel;\nexport default MemberSelector;\n"],"mappings":"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"}
+{"version":3,"file":"index.js","names":[],"sources":["../../src/MemberPicker/index.tsx"],"sourcesContent":["import { usePrevious, useRequest } from 'ahooks';\nimport { cn } from '../lib/utils';\nimport _ from 'lodash';\nimport React, {\n  useCallback,\n  useContext,\n  useEffect,\n  useMemo,\n  useRef,\n  useState,\n} from 'react';\nimport Avatar from '../Avatar';\nimport ConfigProvider from '../ConfigProvider';\nimport './member-picker.css';\nimport {\n  EUserType,\n  IUser,\n  IUserGroup,\n  TUser,\n} from '../ConfigProvider/getUserList';\nimport { LocaleContext, getTranslator } from '../locale/default';\nimport message from '../message';\nimport Panel from './components/Panel';\nimport MemberPanel from './components/PanelWrapper';\nimport {\n  EMemberPicker,\n  IMemberPickerProps,\n  TUserGroupValue,\n  TUserValue,\n} from './interface';\nimport { getId } from './utils';\nimport { isUser, isUserGroup } from './utils/getUsersWithUserId';\nimport Select from '../Select';\nimport { Mode } from '../Select/BaseSelect';\n\nconst DEFAULT_MULTIPLE_DROPDOWN_WIDTH = 480;\n\nconst Component: React.FC<IMemberPickerProps> = (props) => {\n  const { locale } = useContext(LocaleContext);\n  const t = getTranslator(locale);\n\n  const {\n    value,\n    type = EMemberPicker.USER,\n    onChange,\n    multiple,\n    dropdownWidth,\n    open,\n    onOpenChange,\n    placeholder = t.MemberPicker.select,\n    className,\n    allowClear,\n    disabled,\n    onClear,\n    size,\n    prefix: propPrefix,\n    lockedIds = [],\n    footer,\n    onCancel,\n    filterItem,\n    mode: propsMode,\n    renderItem,\n    renderSelectedTag,\n    'data-testid': dataTestId,\n    'aria-label': ariaLabel,\n    ...restProps\n  } = props;\n  const allowOverlap = props.allowOverlap ?? false;\n  const { getUsersByIds, getUsersByKeywords } = ConfigProvider.useGetUserList();\n  const [selectedUserList, setSelectedUserList] = useState<TUser>([]);\n  const prevValue = usePrevious(value);\n  const [searchUserList, setSearchUserList] = useState<TUser>([]);\n  const [searchString, setSearchString] = useState<string>('');\n  const [dropdownContentWidth, setDropdownContentWidth] =\n    useState(dropdownWidth);\n  const selectOwnerRef = useRef<HTMLDivElement>(null);\n  // 单选默认浮窗跟触发器等宽（true），调用方传 dropdownWidth 时用具体数字；\n  // 多选默认 480，单条记录只有 头像+nickname 时触发器太窄装不下选中标签，故固定值。\n  const panelWidth: number | boolean =\n    dropdownWidth ?? (multiple ? DEFAULT_MULTIPLE_DROPDOWN_WIDTH : true);\n\n  const triggerRef = useRef<HTMLDivElement>(null);\n  const onSearchValueChange = useCallback((v: string) => {\n    setSearchString(v);\n  }, []);\n  const [dropdownOpen, setDropdownOpen] = useState<boolean>(!!open);\n  const queryByKeywords = useMemo(() => {\n    if (getUsersByKeywords) {\n      return getUsersByKeywords;\n    }\n\n    return (_params = {}) =>\n      Promise.reject({\n        message: t.MemberPicker.pleaseConfigGetUserByKeywordsMethod,\n      });\n  }, [getUsersByKeywords, t.MemberPicker.pleaseConfigGetUserByKeywordsMethod]);\n  const queryByIds = useMemo(() => {\n    if (getUsersByIds) {\n      return getUsersByIds;\n    }\n\n    return (_params = {}) =>\n      Promise.reject({\n        message: t.MemberPicker.pleaseConfigGetUserByIdsMethod,\n      });\n  }, [getUsersByIds, t.MemberPicker.pleaseConfigGetUserByIdsMethod]);\n  const { loading, run } = useRequest(() => queryByKeywords(searchString), {\n    refreshDeps: [searchString],\n    manual: true,\n    cacheKey: 'member-selector',\n    cacheTime: 1000 * 60 * 2, // 2分钟内不重复请求\n    onSuccess: (result) => {\n      setSearchUserList(result);\n    },\n    onError: (error) => {\n      message.error(error.message);\n    },\n  });\n\n  const totalUserList: TUser = useMemo(() => {\n    const totalUsers = searchUserList.concat(\n      selectedUserList.filter((item) => {\n        const name =\n          (item.type === EUserType.USER ? item.nickname : item.name) || '';\n\n        return name.toUpperCase().includes(searchString.trim().toUpperCase());\n      }),\n    );\n\n    return _.uniqBy(totalUsers, (data: IUser | IUserGroup) => {\n      if (data.type === EUserType.USER) return data.userId;\n\n      return data.groupId;\n    }).filter((item) => {\n      if (filterItem) {\n        return filterItem(item);\n      }\n\n      return true;\n    });\n  }, [filterItem, searchString, searchUserList, selectedUserList]);\n\n  useEffect(() => {\n    if (!dropdownOpen) return;\n    run();\n  }, [dropdownOpen, run, searchString]);\n\n  useEffect(() => {\n    if (_.isEqual(value, prevValue)) {\n      return;\n    }\n    if (Array.isArray(value) && (isUser(value[0]) || isUserGroup(value[0]))) {\n      setSelectedUserList(value as TUser);\n    } else if (isUser(value) || isUserGroup(value)) {\n      setSelectedUserList([value]);\n    } else {\n      let param: Array<TUserValue | TUserGroupValue> = [];\n      if (!value) return;\n      if (Array.isArray(value) && value.length === 0) {\n        setSelectedUserList([]);\n\n        return;\n      }\n      if (!Array.isArray(value)) {\n        param = [value];\n      } else {\n        param = value;\n      }\n      queryByIds(param).then((result) => {\n        // 如果用户已被删除，则需要展示出id\n        const valueNotInResult: TUser = param\n          .filter((item) => {\n            if (item.type === EUserType.USER) {\n              return result\n                .filter(isUser)\n                .every((user) => user.userId !== item.userId);\n            }\n\n            return result\n              .filter(isUserGroup)\n              .every((user) => user.groupId !== item.groupId);\n          })\n          .map((item) => {\n            if (item.type === EUserType.USER) {\n              return {\n                type: EUserType.USER,\n                userId: item.userId,\n              } as IUser;\n            }\n\n            return {\n              type: EUserType.USER_GROUP,\n              groupId: item.groupId,\n            } as IUserGroup;\n          });\n\n        setSelectedUserList([...result, ...valueNotInResult]);\n      });\n    }\n  }, [value, queryByIds, prevValue]);\n\n  const onSelectedChange = useCallback(\n    (users: TUser) => {\n      if (multiple) {\n        setSelectedUserList(users);\n        onChange?.(users);\n      } else {\n        setSelectedUserList(users);\n        onChange?.(users[0]);\n      }\n      setDropdownOpen(false);\n    },\n    [multiple, onChange, setDropdownOpen],\n  );\n\n  useEffect(() => {\n    if (typeof open === 'boolean') {\n      setDropdownOpen(open);\n    }\n  }, [open]);\n\n  useEffect(() => {\n    if (!dropdownContentWidth) {\n      const resizeEle = triggerRef.current;\n      if (!resizeEle) return;\n      const resizeObserver = new ResizeObserver((entries) => {\n        for (const entry of entries) {\n          const { width } = entry.contentRect;\n          setDropdownContentWidth(width);\n        }\n      });\n      resizeObserver.observe(resizeEle);\n\n      return () => {\n        resizeObserver.unobserve(resizeEle);\n      };\n    }\n  }, [triggerRef, dropdownContentWidth]);\n  const onDropdownOpenChange = useCallback(\n    (open: boolean) => {\n      setDropdownOpen(open);\n      onOpenChange?.(open);\n    },\n    [onOpenChange],\n  );\n  const mode = useMemo(() => {\n    if (multiple === true) {\n      if (typeof propsMode === 'object')\n        return {\n          ...(propsMode || {}),\n          type: 'multiple',\n          responsive: _.isNil(propsMode.responsive)\n            ? true\n            : propsMode.responsive,\n        } as Mode;\n      return {\n        type: 'multiple',\n        responsive: true,\n      } as Mode;\n    }\n\n    return multiple ? (multiple as Mode) : propsMode;\n  }, [multiple, propsMode]);\n\n  const selectOpen = typeof open === 'boolean' ? open : dropdownOpen;\n  const listboxId = `ald-member-picker-listbox-${React.useId().replace(\n    /:/g,\n    '',\n  )}`;\n  const activeMember = totalUserList[0];\n  const activeMemberId = activeMember\n    ? `ald-member-picker-option-${getId(activeMember)}`\n    : undefined;\n\n  useEffect(() => {\n    const owner = selectOwnerRef.current?.querySelector<HTMLElement>(\n      '[role=\"combobox\"], input',\n    );\n    if (!owner) return;\n    owner.setAttribute('aria-controls', listboxId);\n    if (selectOpen && activeMemberId) {\n      owner.setAttribute('aria-activedescendant', activeMemberId);\n    } else {\n      owner.removeAttribute('aria-activedescendant');\n    }\n  }, [activeMemberId, listboxId, selectOpen]);\n\n  return (\n    <div ref={selectOwnerRef} style={{ display: 'contents' }}>\n      <Select\n        prefix={propPrefix}\n        {...restProps}\n        data-testid={dataTestId}\n        aria-label={ariaLabel}\n        showSearch\n        searchValue={searchString}\n        onSearch={onSearchValueChange}\n        aria-controls={listboxId}\n        aria-activedescendant={selectOpen ? activeMemberId : undefined}\n        size={size}\n        className={cn('ald-member-picker-select', className)}\n        value={selectedUserList.map((item) => {\n          if (item.type === EUserType.USER_GROUP) {\n            return item.groupId;\n          } else {\n            return item.userId;\n          }\n        })}\n        onChange={(value) => {\n          if (_.isEmpty(value)) {\n            setSelectedUserList([]);\n            if (multiple) {\n              onChange?.([]);\n            } else {\n              onChange?.();\n            }\n          } else {\n            const valueList = Array.isArray(value) ? value : [value];\n            if (multiple) {\n              const users = valueList\n                .map((item) => {\n                  const user = totalUserList.find((user) => {\n                    if (user.type === EUserType.USER) {\n                      return user.userId === item;\n                    }\n\n                    return user.groupId === item;\n                  });\n\n                  return user;\n                })\n                .filter(Boolean) as TUser;\n              setSelectedUserList(users);\n              onChange?.(users);\n            } else {\n              const user = totalUserList.find((user) => {\n                if (user.type === EUserType.USER) {\n                  return user.userId === value;\n                }\n\n                return user.groupId === value;\n              });\n              if (user) {\n                setSelectedUserList([user]);\n                onChange?.(user);\n              } else {\n                setSelectedUserList([]);\n                onChange?.();\n              }\n            }\n          }\n        }}\n        disabled={disabled}\n        allowClear={allowClear}\n        onClear={() => {\n          setSelectedUserList([]);\n          if (multiple) {\n            onChange?.([]);\n          } else {\n            onChange?.();\n          }\n          onClear?.();\n        }}\n        popupClassName={cn(\n          'ald-member-picker-popup',\n          allowOverlap && 'ald-member-picker-popup-adaptive',\n          props.popupClassName,\n        )}\n        mode={mode}\n        options={selectedUserList.map((item) => {\n          if (item.type === EUserType.USER_GROUP)\n            return {\n              label: item.name || item.groupId,\n              value: item.groupId,\n              tag: (\n                <div className={'ald-member-picker-tag'}>\n                  <Avatar type=\"team\" size={20}>\n                    {item.name || item.groupId}\n                  </Avatar>\n                  {item.name || item.groupId}\n                </div>\n              ),\n            };\n\n          return {\n            label: item.nickname || item.name || item.userId,\n            value: item.userId,\n            tag: (\n              <div className={'ald-member-picker-tag'}>\n                <Avatar\n                  size={20}\n                  src={item.photo}\n                  type={item.type === EUserType.USER ? 'user' : 'team'}\n                >\n                  {item.nickname || item.name || item.userId}\n                </Avatar>\n                {item.nickname || item.name || item.userId}\n              </div>\n            ),\n          };\n        })}\n        optionLabelProp={multiple ? 'label' : 'tag'}\n        open={selectOpen}\n        onOpenChange={onDropdownOpenChange}\n        popupMatchSelectWidth={panelWidth}\n        allowOverlap={allowOverlap}\n        placeholder={placeholder}\n        dropdownRender={() => {\n          return (\n            <div\n              ref={triggerRef}\n              id={listboxId}\n              role=\"group\"\n              aria-label=\"Member selection results\"\n              className={cn({\n                'ald-member-picker-popup-body': allowOverlap,\n              })}\n            >\n              <Panel\n                type={type}\n                footer={footer}\n                value={selectedUserList}\n                dataList={totalUserList}\n                lockedIds={lockedIds}\n                multiple={!!multiple}\n                loading={loading}\n                dropdownWidth={dropdownContentWidth}\n                onSearchValueChange={onSearchValueChange}\n                onChange={onSelectedChange}\n                onCancel={() => {\n                  onCancel?.();\n                  setDropdownOpen(false);\n                }}\n                renderItem={renderItem}\n                renderSelectedTag={renderSelectedTag}\n                searchValue={searchString}\n              ></Panel>\n            </div>\n          );\n        }}\n      ></Select>\n    </div>\n  );\n};\n\nconst MemberSelector = Component as React.FC<IMemberPickerProps> & {\n  MemberPanel: typeof MemberPanel;\n};\n\nMemberSelector.MemberPanel = MemberPanel;\nexport default MemberSelector;\n"],"mappings":"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"}

package/dist/Menu/index.d.ts

@@ -6,6 +6,12 @@ export interface MenuProps {
     items: MenuItemType[];
     selectedKeys?: string[];
     menuStyle?: React.CSSProperties;
+    /** Accessible name for the command menu when its context is not otherwise clear. */
+    ariaLabel?: string;
+    /** @internal Requested initial keyboard position when the popup opens. */
+    initialFocus?: 'first' | 'last';
+    /** @internal Requests that the owning popup close, including on Escape. */
+    onRequestClose?: (reason: 'click' | 'cancel' | 'blur' | 'scroll') => void;
     rootClosing?: boolean;
     /** @internal 由 Dropdown 注入，禁用内部定位/overflow 计算。不支持含 SubMenu 的菜单 */
     externalOverflow?: boolean;
@@ -24,6 +30,7 @@ export interface ItemType {
     danger?: boolean;
     disabled?: boolean;
     className?: string;
+    ariaLabel?: string;
 }
 export interface MenuDividerType {
     key?: string;
@@ -41,6 +48,7 @@ export interface SubMenuType {
     icon?: React.ReactNode;
     popupClassName?: string;
     disabled?: boolean;
+    ariaLabel?: string;
 }
 export interface MenuInfo {
     key: string;

package/dist/Menu/index.js

@@ -2,14 +2,38 @@ import { cn } from "../lib/utils.js";
 import Memo from "../Icon/components/CheckLightLine.js";
 import Memo$1 from "../Icon/components/ChevronRightLine.js";
 /* empty css     */
-import { useRef } from "react";
+import { useCallback, useMemo, useRef } from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import _ from "lodash";
 import { ControlledMenu, MenuDivider, MenuHeader, MenuItem, SubMenu } from "@szhsin/react-menu";
 //#region src/Menu/index.tsx
 function Menu(props) {
-	const { className, items, onClick: onMenuClick, onBeforeLeafItemClick, selectedKeys, menuStyle, rootClosing = false, externalOverflow } = props;
+	const { className, items, onClick: onMenuClick, onBeforeLeafItemClick, selectedKeys, menuStyle, ariaLabel, initialFocus = "first", onRequestClose, rootClosing = false, externalOverflow } = props;
 	const selectedKeySet = new Set(selectedKeys || []);
+	const typeaheadRef = useRef({
+		query: "",
+		timestamp: 0
+	});
+	const menuItemFocus = useMemo(() => ({ position: initialFocus }), [initialFocus]);
+	const onMenuKeyDown = useCallback((event) => {
+		if (event.defaultPrevented || event.altKey || event.ctrlKey || event.metaKey || event.key.length !== 1) return;
+		const now = Date.now();
+		const previous = typeaheadRef.current;
+		const query = `${now - previous.timestamp > 500 ? "" : previous.query}${event.key}`.toLocaleLowerCase();
+		typeaheadRef.current = {
+			query,
+			timestamp: now
+		};
+		const menuItems = Array.from(event.currentTarget.querySelectorAll("[role=\"menuitem\"]:not([aria-hidden=\"true\"]):not([aria-disabled=\"true\"])"));
+		const activeIndex = menuItems.indexOf(document.activeElement);
+		const match = [...menuItems.slice(activeIndex + 1), ...menuItems.slice(0, activeIndex + 1)].find((item) => {
+			return (item.getAttribute("aria-label") || item.textContent || "").trim().toLocaleLowerCase().startsWith(query);
+		});
+		if (match) {
+			event.preventDefault();
+			match.focus();
+		}
+	}, []);
 	const hasDirectSelectedItem = (items) => items.some((item) => {
 		if (isSubMenuItem(item)) return selectedKeySet.has(item.key);
 		if (isHeaderMenuItem(item) || isDivideMenuItem(item)) return false;
@@ -46,6 +70,7 @@ function Menu(props) {
 						]
 					}),
 					disabled: item.disabled,
+					"aria-label": item.ariaLabel || titleStr || void 0,
 					itemProps: { className: isLeafSubMenu ? "ald-menu-submenu-leaf-trigger" : void 0 },
 					align: "start",
 					direction: "right",
@@ -64,6 +89,7 @@ function Menu(props) {
 					"ald-menu-item-selected": isSelected
 				}),
 				disabled: item.disabled,
+				"aria-label": item.ariaLabel || titleStr || void 0,
 				onClick: ({ syntheticEvent }) => {
 					onBeforeLeafItemClick?.();
 					const menuInfo = {
@@ -117,7 +143,11 @@ function Menu(props) {
 		anchorRef: ref,
 		className: cn(className, "ald-menu", isLeafRootMenu && !externalOverflow && "ald-menu-leaf", !isLeafRootMenu && menuStyle?.maxHeight !== void 0 && !externalOverflow && "ald-menu-scrollable"),
 		position: externalOverflow ? "initial" : "auto",
-		captureFocus: false,
+		"aria-label": ariaLabel,
+		captureFocus: true,
+		menuItemFocus,
+		onKeyDown: onMenuKeyDown,
+		onClose: ({ reason }) => onRequestClose?.(reason),
 		viewScroll: externalOverflow ? "initial" : "auto",
 		overflow: externalOverflow ? "visible" : menuOverflow,
 		children: getMenuItems(items || [])

package/dist/Menu/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":[],"sources":["../../src/Menu/index.tsx"],"sourcesContent":["import {\n  ControlledMenu,\n  MenuDivider,\n  MenuHeader,\n  MenuItem,\n  SubMenu,\n} from '@szhsin/react-menu';\nimport { cn } from '../lib/utils';\nimport _ from 'lodash';\nimport React, { useRef } from 'react';\nimport { CheckLightLine, ChevronRightLine } from '../Icon';\nimport './menu.css';\n\nexport interface MenuProps {\n  onClick?: (info: MenuInfo) => void;\n  onBeforeLeafItemClick?: () => void;\n  className?: string;\n  items: MenuItemType[];\n  selectedKeys?: string[];\n  menuStyle?: React.CSSProperties;\n  rootClosing?: boolean;\n  /** @internal 由 Dropdown 注入，禁用内部定位/overflow 计算。不支持含 SubMenu 的菜单 */\n  externalOverflow?: boolean;\n}\n\nexport default function Menu(props: MenuProps) {\n  const {\n    className,\n    items,\n    onClick: onMenuClick,\n    onBeforeLeafItemClick,\n    selectedKeys,\n    menuStyle,\n    rootClosing = false,\n    externalOverflow,\n  } = props;\n  const selectedKeySet = new Set(selectedKeys || []);\n\n  const hasDirectSelectedItem = (items: MenuItemType[]): boolean =>\n    items.some((item) => {\n      if (isSubMenuItem(item)) {\n        return selectedKeySet.has(item.key);\n      }\n      if (isHeaderMenuItem(item) || isDivideMenuItem(item)) {\n        return false;\n      }\n      return selectedKeySet.has(item.key);\n    });\n\n  const getMenuItems = (items: MenuItemType[], parentPath: string[] = []) => {\n    const isSelectableGroup = hasDirectSelectedItem(items);\n\n    return items.map((item, index) => {\n      if (isDivideMenuItem(item)) {\n        return <MenuDivider key={`divider_${index}`} />;\n      }\n      if (isHeaderMenuItem(item)) {\n        return <MenuHeader key={`header_${index}`}>{item.label}</MenuHeader>;\n      }\n      const currPath = [...parentPath, item.key];\n      const titleStr = _.isString(item.label) ? item.label : '';\n      const isSelected = selectedKeys?.includes(item.key);\n\n      if (isSubMenuItem(item)) {\n        const isLeafSubMenu = isLeafMenu(item.children);\n        const subMenuOverflow =\n          isLeafSubMenu || menuStyle?.maxHeight !== undefined\n            ? 'auto'\n            : undefined;\n        const subMenuItemLabel = (\n          <div className=\"ald-menu-item-label\" title={titleStr}>\n            {item.icon ? (\n              <div className=\"ald-menu-item-label-icon\">{item.icon}</div>\n            ) : null}\n            <div className=\"ald-menu-item-label-text tw-text-typography-body-dense\">\n              {item.label}\n            </div>\n            <div className=\"ald-menu-item-right\">\n              {isSelectableGroup ? (\n                <div className=\"ald-menu-item-selection-slot\" />\n              ) : null}\n              <ChevronRightLine size={16} />\n            </div>\n          </div>\n        );\n\n        return (\n          <SubMenu\n            key={item.key}\n            label={subMenuItemLabel}\n            disabled={item.disabled}\n            itemProps={{\n              className: isLeafSubMenu\n                ? 'ald-menu-submenu-leaf-trigger'\n                : undefined,\n            }}\n            align=\"start\"\n            direction=\"right\"\n            gap={-8}\n            position=\"anchor\"\n            shift={0}\n            menuStyle={{\n              ...menuStyle,\n            }}\n            menuClassName={cn(\n              'ald-menu-submenu-popup',\n              isLeafSubMenu && 'ald-menu-submenu-popup-leaf',\n              !isLeafSubMenu &&\n                menuStyle?.maxHeight !== undefined &&\n                'ald-menu-submenu-popup-scrollable',\n              item.popupClassName,\n              rootClosing && 'ald-menu-submenu-popup-root-closing',\n            )}\n            overflow={subMenuOverflow}\n          >\n            {getMenuItems(item.children, currPath)}\n          </SubMenu>\n        );\n      }\n\n      return (\n        <MenuItem\n          key={item.key}\n          className={cn(item.className, {\n            'ald-menu-item-danger': item.danger,\n            'ald-menu-item-selected': isSelected,\n          })}\n          disabled={item.disabled}\n          onClick={({ syntheticEvent }) => {\n            onBeforeLeafItemClick?.();\n            const menuInfo = {\n              key: item.key,\n              keyPath: currPath,\n              domEvent: syntheticEvent,\n            };\n            if (item.onClick) {\n              item.onClick(menuInfo);\n            }\n            if (onMenuClick) {\n              onMenuClick(menuInfo);\n            }\n          }}\n        >\n          <div className=\"ald-menu-item-label\" title={titleStr}>\n            {item.icon ? (\n              <div className=\"ald-menu-item-label-icon\">{item.icon}</div>\n            ) : null}\n            <div className=\"ald-menu-item-label-text tw-text-typography-body-dense\">\n              {item.label}\n            </div>\n            {isSelectableGroup ? (\n              <div className=\"ald-menu-item-right\">\n                <div\n                  className={cn(\n                    'ald-menu-item-selection-slot',\n                    isSelected &&\n                      'ald-menu-item-selection-slot-selected ald-menu-item-selected-icon',\n                  )}\n                >\n                  {isSelected ? <CheckLightLine /> : null}\n                </div>\n              </div>\n            ) : null}\n          </div>\n        </MenuItem>\n      );\n    });\n  };\n\n  const ref = useRef(null);\n\n  const isLeafRootMenu = isLeafMenu(items);\n  const menuOverflow =\n    isLeafRootMenu || menuStyle?.maxHeight !== undefined ? 'auto' : undefined;\n\n  return (\n    <>\n      <div style={{ display: 'none' }} ref={ref} />\n      <ControlledMenu\n        state=\"open\"\n        transition={{ open: true, close: true }}\n        transitionTimeout={200}\n        submenuOpenDelay={0}\n        submenuCloseDelay={0}\n        menuStyle={{\n          ...menuStyle,\n        }}\n        anchorRef={ref}\n        className={cn(\n          className,\n          'ald-menu',\n          isLeafRootMenu && !externalOverflow && 'ald-menu-leaf',\n          !isLeafRootMenu &&\n            menuStyle?.maxHeight !== undefined &&\n            !externalOverflow &&\n            'ald-menu-scrollable',\n        )}\n        position={externalOverflow ? 'initial' : 'auto'}\n        captureFocus={false}\n        viewScroll={externalOverflow ? 'initial' : 'auto'}\n        overflow={externalOverflow ? 'visible' : menuOverflow}\n      >\n        {getMenuItems(items || [])}\n      </ControlledMenu>\n    </>\n  );\n}\n\nexport function isHeaderMenuItem(\n  menuItem: MenuItemType,\n): menuItem is MenuHeaderType {\n  return 'type' in menuItem && menuItem.type === 'header';\n}\n\nexport function isDivideMenuItem(\n  menuItem: MenuItemType,\n): menuItem is MenuDividerType {\n  return 'type' in menuItem && menuItem.type === 'divider';\n}\n\nexport function isSubMenuItem(menuItem: MenuItemType): menuItem is SubMenuType {\n  return 'children' in menuItem && !!menuItem.children;\n}\n\nexport function isLeafMenu(menuItems: MenuItemType[]) {\n  return !_.some(menuItems, (item) => isSubMenuItem(item));\n}\n\nexport type MenuItemType =\n  | ItemType\n  | MenuDividerType\n  | SubMenuType\n  | MenuHeaderType;\n\nexport interface ItemType {\n  key: string;\n  label: React.ReactNode;\n  icon?: React.ReactNode;\n  onClick?: (info: MenuInfo) => void;\n  danger?: boolean;\n  disabled?: boolean;\n  className?: string;\n}\n\nexport interface MenuDividerType {\n  key?: string;\n  type: 'divider';\n}\n\nexport interface MenuHeaderType {\n  key?: string;\n  type: 'header';\n  label: string;\n}\n\nexport interface SubMenuType {\n  children: MenuItemType[];\n  key: string;\n  label: React.ReactNode;\n  icon?: React.ReactNode;\n  popupClassName?: string;\n  disabled?: boolean;\n}\n\nexport interface MenuInfo {\n  key: string;\n  keyPath: string[];\n  domEvent: MouseEvent | KeyboardEvent;\n  // 阻止菜单关闭\n  keepOpen?: boolean;\n}\n"],"mappings":";;;;;;;;;AAyBA,SAAwB,KAAK,OAAkB;CAC7C,MAAM,EACJ,WACA,OACA,SAAS,aACT,uBACA,cACA,WACA,cAAc,OACd,qBACE;CACJ,MAAM,iBAAiB,IAAI,IAAI,gBAAgB,EAAE,CAAC;CAElD,MAAM,yBAAyB,UAC7B,MAAM,MAAM,SAAS;AACnB,MAAI,cAAc,KAAK,CACrB,QAAO,eAAe,IAAI,KAAK,IAAI;AAErC,MAAI,iBAAiB,KAAK,IAAI,iBAAiB,KAAK,CAClD,QAAO;AAET,SAAO,eAAe,IAAI,KAAK,IAAI;GACnC;CAEJ,MAAM,gBAAgB,OAAuB,aAAuB,EAAE,KAAK;EACzE,MAAM,oBAAoB,sBAAsB,MAAM;AAEtD,SAAO,MAAM,KAAK,MAAM,UAAU;AAChC,OAAI,iBAAiB,KAAK,CACxB,QAAO,oBAAC,aAAD,EAAwC,EAAtB,WAAW,QAAW;AAEjD,OAAI,iBAAiB,KAAK,CACxB,QAAO,oBAAC,YAAD,EAAA,UAAqC,KAAK,OAAmB,EAA5C,UAAU,QAAkC;GAEtE,MAAM,WAAW,CAAC,GAAG,YAAY,KAAK,IAAI;GAC1C,MAAM,WAAW,EAAE,SAAS,KAAK,MAAM,GAAG,KAAK,QAAQ;GACvD,MAAM,aAAa,cAAc,SAAS,KAAK,IAAI;AAEnD,OAAI,cAAc,KAAK,EAAE;IACvB,MAAM,gBAAgB,WAAW,KAAK,SAAS;IAC/C,MAAM,kBACJ,iBAAiB,WAAW,cAAc,SACtC,SACA;AAkBN,WACE,oBAAC,SAAD;KAEE,OAnBF,qBAAC,OAAD;MAAK,WAAU;MAAsB,OAAO;gBAA5C;OACG,KAAK,OACJ,oBAAC,OAAD;QAAK,WAAU;kBAA4B,KAAK;QAAW,CAAA,GACzD;OACJ,oBAAC,OAAD;QAAK,WAAU;kBACZ,KAAK;QACF,CAAA;OACN,qBAAC,OAAD;QAAK,WAAU;kBAAf,CACG,oBACC,oBAAC,OAAD,EAAK,WAAU,gCAAiC,CAAA,GAC9C,MACJ,oBAAC,QAAD,EAAkB,MAAM,IAAM,CAAA,CAC1B;;OACF;;KAOJ,UAAU,KAAK;KACf,WAAW,EACT,WAAW,gBACP,kCACA,QACL;KACD,OAAM;KACN,WAAU;KACV,KAAK;KACL,UAAS;KACT,OAAO;KACP,WAAW,EACT,GAAG,WACJ;KACD,eAAe,GACb,0BACA,iBAAiB,+BACjB,CAAC,iBACC,WAAW,cAAc,UACzB,qCACF,KAAK,gBACL,eAAe,sCAChB;KACD,UAAU;eAET,aAAa,KAAK,UAAU,SAAS;KAC9B,EA5BH,KAAK,IA4BF;;AAId,UACE,oBAAC,UAAD;IAEE,WAAW,GAAG,KAAK,WAAW;KAC5B,wBAAwB,KAAK;KAC7B,0BAA0B;KAC3B,CAAC;IACF,UAAU,KAAK;IACf,UAAU,EAAE,qBAAqB;AAC/B,8BAAyB;KACzB,MAAM,WAAW;MACf,KAAK,KAAK;MACV,SAAS;MACT,UAAU;MACX;AACD,SAAI,KAAK,QACP,MAAK,QAAQ,SAAS;AAExB,SAAI,YACF,aAAY,SAAS;;cAIzB,qBAAC,OAAD;KAAK,WAAU;KAAsB,OAAO;eAA5C;MACG,KAAK,OACJ,oBAAC,OAAD;OAAK,WAAU;iBAA4B,KAAK;OAAW,CAAA,GACzD;MACJ,oBAAC,OAAD;OAAK,WAAU;iBACZ,KAAK;OACF,CAAA;MACL,oBACC,oBAAC,OAAD;OAAK,WAAU;iBACb,oBAAC,OAAD;QACE,WAAW,GACT,gCACA,cACE,oEACH;kBAEA,aAAa,oBAAC,MAAD,EAAkB,CAAA,GAAG;QAC/B,CAAA;OACF,CAAA,GACJ;MACA;;IACG,EA1CJ,KAAK,IA0CD;IAEb;;CAGJ,MAAM,MAAM,OAAO,KAAK;CAExB,MAAM,iBAAiB,WAAW,MAAM;CACxC,MAAM,eACJ,kBAAkB,WAAW,cAAc,SAAY,SAAS;AAElE,QACE,qBAAA,UAAA,EAAA,UAAA,CACE,oBAAC,OAAD;EAAK,OAAO,EAAE,SAAS,QAAQ;EAAO;EAAO,CAAA,EAC7C,oBAAC,gBAAD;EACE,OAAM;EACN,YAAY;GAAE,MAAM;GAAM,OAAO;GAAM;EACvC,mBAAmB;EACnB,kBAAkB;EAClB,mBAAmB;EACnB,WAAW,EACT,GAAG,WACJ;EACD,WAAW;EACX,WAAW,GACT,WACA,YACA,kBAAkB,CAAC,oBAAoB,iBACvC,CAAC,kBACC,WAAW,cAAc,UACzB,CAAC,oBACD,sBACH;EACD,UAAU,mBAAmB,YAAY;EACzC,cAAc;EACd,YAAY,mBAAmB,YAAY;EAC3C,UAAU,mBAAmB,YAAY;YAExC,aAAa,SAAS,EAAE,CAAC;EACX,CAAA,CAChB,EAAA,CAAA;;AAIP,SAAgB,iBACd,UAC4B;AAC5B,QAAO,UAAU,YAAY,SAAS,SAAS;;AAGjD,SAAgB,iBACd,UAC6B;AAC7B,QAAO,UAAU,YAAY,SAAS,SAAS;;AAGjD,SAAgB,cAAc,UAAiD;AAC7E,QAAO,cAAc,YAAY,CAAC,CAAC,SAAS;;AAG9C,SAAgB,WAAW,WAA2B;AACpD,QAAO,CAAC,EAAE,KAAK,YAAY,SAAS,cAAc,KAAK,CAAC"}
+{"version":3,"file":"index.js","names":[],"sources":["../../src/Menu/index.tsx"],"sourcesContent":["import {\n  ControlledMenu,\n  MenuDivider,\n  MenuHeader,\n  MenuItem,\n  SubMenu,\n} from '@szhsin/react-menu';\nimport { cn } from '../lib/utils';\nimport _ from 'lodash';\nimport React, { useCallback, useMemo, useRef } from 'react';\nimport { CheckLightLine, ChevronRightLine } from '../Icon';\nimport './menu.css';\n\nexport interface MenuProps {\n  onClick?: (info: MenuInfo) => void;\n  onBeforeLeafItemClick?: () => void;\n  className?: string;\n  items: MenuItemType[];\n  selectedKeys?: string[];\n  menuStyle?: React.CSSProperties;\n  /** Accessible name for the command menu when its context is not otherwise clear. */\n  ariaLabel?: string;\n  /** @internal Requested initial keyboard position when the popup opens. */\n  initialFocus?: 'first' | 'last';\n  /** @internal Requests that the owning popup close, including on Escape. */\n  onRequestClose?: (reason: 'click' | 'cancel' | 'blur' | 'scroll') => void;\n  rootClosing?: boolean;\n  /** @internal 由 Dropdown 注入，禁用内部定位/overflow 计算。不支持含 SubMenu 的菜单 */\n  externalOverflow?: boolean;\n}\n\nexport default function Menu(props: MenuProps) {\n  const {\n    className,\n    items,\n    onClick: onMenuClick,\n    onBeforeLeafItemClick,\n    selectedKeys,\n    menuStyle,\n    ariaLabel,\n    initialFocus = 'first',\n    onRequestClose,\n    rootClosing = false,\n    externalOverflow,\n  } = props;\n  const selectedKeySet = new Set(selectedKeys || []);\n  const typeaheadRef = useRef({ query: '', timestamp: 0 });\n  const menuItemFocus = useMemo(\n    () => ({ position: initialFocus }),\n    [initialFocus],\n  );\n  const onMenuKeyDown = useCallback(\n    (event: React.KeyboardEvent<HTMLUListElement>) => {\n      if (\n        event.defaultPrevented ||\n        event.altKey ||\n        event.ctrlKey ||\n        event.metaKey ||\n        event.key.length !== 1\n      ) {\n        return;\n      }\n\n      const now = Date.now();\n      const previous = typeaheadRef.current;\n      const query = `${now - previous.timestamp > 500 ? '' : previous.query}${\n        event.key\n      }`.toLocaleLowerCase();\n      typeaheadRef.current = { query, timestamp: now };\n\n      const menuItems = Array.from(\n        event.currentTarget.querySelectorAll<HTMLElement>(\n          '[role=\"menuitem\"]:not([aria-hidden=\"true\"]):not([aria-disabled=\"true\"])',\n        ),\n      );\n      const activeIndex = menuItems.indexOf(\n        document.activeElement as HTMLElement,\n      );\n      const orderedItems = [\n        ...menuItems.slice(activeIndex + 1),\n        ...menuItems.slice(0, activeIndex + 1),\n      ];\n      const match = orderedItems.find((item) => {\n        const accessibleName =\n          item.getAttribute('aria-label') || item.textContent || '';\n        return accessibleName.trim().toLocaleLowerCase().startsWith(query);\n      });\n\n      if (match) {\n        event.preventDefault();\n        match.focus();\n      }\n    },\n    [],\n  );\n\n  const hasDirectSelectedItem = (items: MenuItemType[]): boolean =>\n    items.some((item) => {\n      if (isSubMenuItem(item)) {\n        return selectedKeySet.has(item.key);\n      }\n      if (isHeaderMenuItem(item) || isDivideMenuItem(item)) {\n        return false;\n      }\n      return selectedKeySet.has(item.key);\n    });\n\n  const getMenuItems = (items: MenuItemType[], parentPath: string[] = []) => {\n    const isSelectableGroup = hasDirectSelectedItem(items);\n\n    return items.map((item, index) => {\n      if (isDivideMenuItem(item)) {\n        return <MenuDivider key={`divider_${index}`} />;\n      }\n      if (isHeaderMenuItem(item)) {\n        return <MenuHeader key={`header_${index}`}>{item.label}</MenuHeader>;\n      }\n      const currPath = [...parentPath, item.key];\n      const titleStr = _.isString(item.label) ? item.label : '';\n      const isSelected = selectedKeys?.includes(item.key);\n\n      if (isSubMenuItem(item)) {\n        const isLeafSubMenu = isLeafMenu(item.children);\n        const subMenuOverflow =\n          isLeafSubMenu || menuStyle?.maxHeight !== undefined\n            ? 'auto'\n            : undefined;\n        const subMenuItemLabel = (\n          <div className=\"ald-menu-item-label\" title={titleStr}>\n            {item.icon ? (\n              <div className=\"ald-menu-item-label-icon\">{item.icon}</div>\n            ) : null}\n            <div className=\"ald-menu-item-label-text tw-text-typography-body-dense\">\n              {item.label}\n            </div>\n            <div className=\"ald-menu-item-right\">\n              {isSelectableGroup ? (\n                <div className=\"ald-menu-item-selection-slot\" />\n              ) : null}\n              <ChevronRightLine size={16} />\n            </div>\n          </div>\n        );\n\n        return (\n          <SubMenu\n            key={item.key}\n            label={subMenuItemLabel}\n            disabled={item.disabled}\n            aria-label={item.ariaLabel || titleStr || undefined}\n            itemProps={{\n              className: isLeafSubMenu\n                ? 'ald-menu-submenu-leaf-trigger'\n                : undefined,\n            }}\n            align=\"start\"\n            direction=\"right\"\n            gap={-8}\n            position=\"anchor\"\n            shift={0}\n            menuStyle={{\n              ...menuStyle,\n            }}\n            menuClassName={cn(\n              'ald-menu-submenu-popup',\n              isLeafSubMenu && 'ald-menu-submenu-popup-leaf',\n              !isLeafSubMenu &&\n                menuStyle?.maxHeight !== undefined &&\n                'ald-menu-submenu-popup-scrollable',\n              item.popupClassName,\n              rootClosing && 'ald-menu-submenu-popup-root-closing',\n            )}\n            overflow={subMenuOverflow}\n          >\n            {getMenuItems(item.children, currPath)}\n          </SubMenu>\n        );\n      }\n\n      return (\n        <MenuItem\n          key={item.key}\n          className={cn(item.className, {\n            'ald-menu-item-danger': item.danger,\n            'ald-menu-item-selected': isSelected,\n          })}\n          disabled={item.disabled}\n          aria-label={item.ariaLabel || titleStr || undefined}\n          onClick={({ syntheticEvent }) => {\n            onBeforeLeafItemClick?.();\n            const menuInfo = {\n              key: item.key,\n              keyPath: currPath,\n              domEvent: syntheticEvent,\n            };\n            if (item.onClick) {\n              item.onClick(menuInfo);\n            }\n            if (onMenuClick) {\n              onMenuClick(menuInfo);\n            }\n          }}\n        >\n          <div className=\"ald-menu-item-label\" title={titleStr}>\n            {item.icon ? (\n              <div className=\"ald-menu-item-label-icon\">{item.icon}</div>\n            ) : null}\n            <div className=\"ald-menu-item-label-text tw-text-typography-body-dense\">\n              {item.label}\n            </div>\n            {isSelectableGroup ? (\n              <div className=\"ald-menu-item-right\">\n                <div\n                  className={cn(\n                    'ald-menu-item-selection-slot',\n                    isSelected &&\n                      'ald-menu-item-selection-slot-selected ald-menu-item-selected-icon',\n                  )}\n                >\n                  {isSelected ? <CheckLightLine /> : null}\n                </div>\n              </div>\n            ) : null}\n          </div>\n        </MenuItem>\n      );\n    });\n  };\n\n  const ref = useRef(null);\n\n  const isLeafRootMenu = isLeafMenu(items);\n  const menuOverflow =\n    isLeafRootMenu || menuStyle?.maxHeight !== undefined ? 'auto' : undefined;\n\n  return (\n    <>\n      <div style={{ display: 'none' }} ref={ref} />\n      <ControlledMenu\n        state=\"open\"\n        transition={{ open: true, close: true }}\n        transitionTimeout={200}\n        submenuOpenDelay={0}\n        submenuCloseDelay={0}\n        menuStyle={{\n          ...menuStyle,\n        }}\n        anchorRef={ref}\n        className={cn(\n          className,\n          'ald-menu',\n          isLeafRootMenu && !externalOverflow && 'ald-menu-leaf',\n          !isLeafRootMenu &&\n            menuStyle?.maxHeight !== undefined &&\n            !externalOverflow &&\n            'ald-menu-scrollable',\n        )}\n        position={externalOverflow ? 'initial' : 'auto'}\n        aria-label={ariaLabel}\n        captureFocus\n        menuItemFocus={menuItemFocus}\n        onKeyDown={onMenuKeyDown}\n        onClose={({ reason }) => onRequestClose?.(reason)}\n        viewScroll={externalOverflow ? 'initial' : 'auto'}\n        overflow={externalOverflow ? 'visible' : menuOverflow}\n      >\n        {getMenuItems(items || [])}\n      </ControlledMenu>\n    </>\n  );\n}\n\nexport function isHeaderMenuItem(\n  menuItem: MenuItemType,\n): menuItem is MenuHeaderType {\n  return 'type' in menuItem && menuItem.type === 'header';\n}\n\nexport function isDivideMenuItem(\n  menuItem: MenuItemType,\n): menuItem is MenuDividerType {\n  return 'type' in menuItem && menuItem.type === 'divider';\n}\n\nexport function isSubMenuItem(menuItem: MenuItemType): menuItem is SubMenuType {\n  return 'children' in menuItem && !!menuItem.children;\n}\n\nexport function isLeafMenu(menuItems: MenuItemType[]) {\n  return !_.some(menuItems, (item) => isSubMenuItem(item));\n}\n\nexport type MenuItemType =\n  | ItemType\n  | MenuDividerType\n  | SubMenuType\n  | MenuHeaderType;\n\nexport interface ItemType {\n  key: string;\n  label: React.ReactNode;\n  icon?: React.ReactNode;\n  onClick?: (info: MenuInfo) => void;\n  danger?: boolean;\n  disabled?: boolean;\n  className?: string;\n  ariaLabel?: string;\n}\n\nexport interface MenuDividerType {\n  key?: string;\n  type: 'divider';\n}\n\nexport interface MenuHeaderType {\n  key?: string;\n  type: 'header';\n  label: string;\n}\n\nexport interface SubMenuType {\n  children: MenuItemType[];\n  key: string;\n  label: React.ReactNode;\n  icon?: React.ReactNode;\n  popupClassName?: string;\n  disabled?: boolean;\n  ariaLabel?: string;\n}\n\nexport interface MenuInfo {\n  key: string;\n  keyPath: string[];\n  domEvent: MouseEvent | KeyboardEvent;\n  // 阻止菜单关闭\n  keepOpen?: boolean;\n}\n"],"mappings":"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"}

package/dist/Modal/index.d.ts

@@ -27,6 +27,8 @@ export interface ModalProps {
     'data-testid'?: string;
     /** Pass through to the modal content root for accessibility and automated testing. */
     'aria-label'?: string;
+    /** Dialog semantic role. Use alertdialog only for explicitly urgent confirmation flows. */
+    role?: 'dialog' | 'alertdialog';
     /** Applied to the outer wrap layer (matches antd wrapClassName behavior) */
     wrapClassName?: string;
     style?: React.CSSProperties;
@@ -67,6 +69,8 @@ export interface ModalFuncProps {
     type?: 'info' | 'success' | 'error' | 'warn' | 'warning' | 'confirm';
     centered?: boolean;
     maskClosable?: boolean;
+    /** Dialog semantic role. Use alertdialog only for explicitly urgent confirmation flows. */
+    role?: 'dialog' | 'alertdialog';
 }
 declare function OriginModal(props: OriginModalProps): import("react/jsx-runtime").JSX.Element;
 type ModalFunc = (props: ModalFuncProps) => {

package/dist/Modal/index.js

@@ -7,9 +7,10 @@ import { FLOATING_LAYER_BASE_Z_INDEX, FloatingLayerProvider } from "../_utils/fl
 import { ModalLayerProvider, useModalLayer } from "../_utils/overlayCoordinator.js";
 import Button_default from "../Button/index.js";
 import { LocaleContext, getTranslator } from "../locale/default.js";
-import IconButton from "../IconButton/index.js";
+/* empty css                        */
 import ScrollArea_default from "../ScrollArea/index.js";
-import { useCallback, useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
+import { focusInitialDialogTarget, markDialogEscapeEvent, restoreDialogFocus, useDialogAccessibility } from "../_utils/dialogAccessibility.js";
+import React, { useCallback, useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
 import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import * as DialogPrimitive from "@radix-ui/react-dialog";
 import { hideOthers } from "aria-hidden";
@@ -17,10 +18,6 @@ import { createRoot } from "react-dom/client";
 //#region src/Modal/index.tsx
 var destroyFns = [];
 var DEFAULT_WIDTH = 552;
-var modalEscapeEvents = /* @__PURE__ */ new WeakSet();
-function shouldCancelTopModal(event) {
-	return !event.cancelBubble && (!event.defaultPrevented || modalEscapeEvents.has(event));
-}
 function ModalContentProviders({ layerId, floatingLevel, children }) {
 	return /* @__PURE__ */ jsx(ModalLayerProvider, {
 		id: layerId,
@@ -30,7 +27,7 @@ function ModalContentProviders({ layerId, floatingLevel, children }) {
 		})
 	});
 }
-var ModalTitle = ({ icon, title, subTitle }, type) => /* @__PURE__ */ jsxs("div", {
+var ModalTitle = ({ icon, title, subTitle, titleId, descriptionId }, type) => /* @__PURE__ */ jsxs("div", {
 	className: "ald-modal-title-container tw-flex tw-items-center tw-gap-4",
 	children: [icon && /* @__PURE__ */ jsx("div", {
 		className: cn("ald-modal-icon-container tw-grid tw-size-10 tw-shrink-0 tw-place-items-center tw-rounded-[var(--global-grid-250)]", type === "info" && "ald-modal-cion-info-container tw-bg-[var(--background-informative-muted)]", type === "success" && "ald-modal-cion-success-container tw-bg-[var(--background-positive-muted)]", type === "warning" && "ald-modal-cion-warning-container tw-bg-[var(--background-warning-muted)]", type === "warn" && "ald-modal-cion-warning-container tw-bg-[var(--background-warning-muted)]", type === "error" && "ald-modal-cion-error-container tw-bg-[var(--background-negative-muted)]", type === "confirm" && "ald-modal-cion-confirm-container tw-bg-[var(--background-brand-muted)]"),
@@ -38,9 +35,11 @@ var ModalTitle = ({ icon, title, subTitle }, type) => /* @__PURE__ */ jsxs("div"
 	}), /* @__PURE__ */ jsxs("div", {
 		className: "ald-modal-text-container",
 		children: [title && /* @__PURE__ */ jsx("div", {
+			id: titleId,
 			className: cn("ald-modal-text-title tw-text-lg tw-font-semibold tw-leading-7 tw-text-[var(--content-primary)]", !subTitle && "ald-modal-text-title-only tw-text-xl"),
 			children: title
 		}), subTitle && /* @__PURE__ */ jsx("div", {
+			id: descriptionId,
 			className: "ald-modal-text-sub-title tw-mt-1 tw-text-xs tw-leading-4 tw-text-[var(--content-secondary)]",
 			children: subTitle
 		})]
@@ -69,12 +68,22 @@ function getIcon(type) {
 function OriginModal(props) {
 	const { locale } = useContext(LocaleContext);
 	const t = getTranslator(locale);
-	const { className, "data-testid": dataTestId, "aria-label": ariaLabel, children, okType = "primary", width, closeIcon, subTitle, okButtonProps = {}, cancelButtonProps = {}, okText = t.Modal.sure, cancelText = t.Modal.cancel, icon, title, paddingLess, responsiveBounds, hideHeaderBottomBorder, virtualScrollBar, style, maskClosable = false, fullscreen, open = false, onOk, onCancel, footer, confirmLoading, closable = true, zIndex = 1e3, bodyStyle, keyboard = true, afterOpenChange, wrapClassName, _modalType, onTopChange } = props;
+	const { className, "data-testid": dataTestId, "aria-label": ariaLabel, role = "dialog", children, okType = "primary", width, closeIcon, subTitle, okButtonProps = {}, cancelButtonProps = {}, okText = t.Modal.sure, cancelText = t.Modal.cancel, icon, title, paddingLess, responsiveBounds, hideHeaderBottomBorder, virtualScrollBar, style, maskClosable = false, fullscreen, open = false, onOk, onCancel, footer, confirmLoading, closable = true, zIndex = 1e3, bodyStyle, keyboard = true, afterOpenChange, wrapClassName, _modalType, onTopChange } = props;
 	const prevOpenRef = useRef(open);
 	const contentRef = useRef(null);
 	const modalRef = useRef(null);
+	const generatedId = React.useId();
+	const titleId = `${generatedId}-title`;
+	const descriptionId = `${generatedId}-description`;
 	const { id: modalLayerId, maskZIndex, contentZIndex, isTop } = useModalLayer(open, zIndex);
 	const nextFloatingLevel = (maskZIndex - FLOATING_LAYER_BASE_Z_INDEX) / 10 + 1;
+	useDialogAccessibility({
+		open,
+		isTop,
+		keyboard,
+		containerRef: modalRef,
+		onEscape: () => onCancel?.({})
+	});
 	useLayoutEffect(() => {
 		onTopChange?.(isTop);
 	}, [isTop, onTopChange]);
@@ -88,44 +97,6 @@ function OriginModal(props) {
 		if (!open || !isTop || !contentRef.current) return;
 		return hideOthers(contentRef.current);
 	}, [isTop, open]);
-	useEffect(() => {
-		if (!open || !isTop || !contentRef.current) return;
-		const container = contentRef.current;
-		const handleKeyDown = (e) => {
-			if (e.key !== "Tab") return;
-			const focusable = container.querySelectorAll("a[href], button:not([disabled]), input:not([disabled]), select:not([disabled]), textarea:not([disabled]), [tabindex]:not([tabindex=\"-1\"]):not([disabled])");
-			if (focusable.length === 0) return;
-			const first = focusable[0];
-			const last = focusable[focusable.length - 1];
-			if (e.shiftKey) {
-				if (document.activeElement === first || !container.contains(document.activeElement)) {
-					e.preventDefault();
-					last.focus();
-				}
-			} else if (document.activeElement === last || !container.contains(document.activeElement)) {
-				e.preventDefault();
-				first.focus();
-			}
-		};
-		document.addEventListener("keydown", handleKeyDown);
-		return () => document.removeEventListener("keydown", handleKeyDown);
-	}, [isTop, open]);
-	useEffect(() => {
-		if (!open || !isTop || !keyboard) return;
-		const handleEscape = (event) => {
-			if (event.key !== "Escape") return;
-			queueMicrotask(() => {
-				if (shouldCancelTopModal(event)) onCancel?.({});
-			});
-		};
-		window.addEventListener("keydown", handleEscape, true);
-		return () => window.removeEventListener("keydown", handleEscape, true);
-	}, [
-		isTop,
-		keyboard,
-		onCancel,
-		open
-	]);
 	const responsiveBoundsStyle = useMemo(() => {
 		if (!responsiveBounds) return {};
 		return {
@@ -141,14 +112,16 @@ function OriginModal(props) {
 		loading: confirmLoading,
 		...okButtonProps
 	};
+	const headerBorderClassName = hideHeaderBottomBorder ? "!tw-border-0" : "tw-border-b tw-border-solid tw-border-[var(--border-default)] !tw-border-x-0 !tw-border-t-0";
 	const renderFooter = () => {
 		if (footer === null) return null;
+		const footerBorderClassName = "tw-border-t tw-border-solid tw-border-[var(--border-default)] !tw-border-x-0 !tw-border-b-0";
 		if (footer) return /* @__PURE__ */ jsx("div", {
-			className: "ald-modal-footer ant-modal-footer tw-flex tw-items-center tw-justify-end tw-gap-2 tw-border-t tw-border-solid tw-border-[var(--border-default)] tw-bg-[var(--background-default)] tw-px-6 tw-py-3 tw-text-right",
+			className: cn("ald-modal-footer ant-modal-footer tw-flex tw-items-center tw-justify-end tw-gap-2 tw-bg-[var(--background-default)] tw-px-6 tw-py-3 tw-text-right", footerBorderClassName),
 			children: footer
 		});
 		return /* @__PURE__ */ jsxs("div", {
-			className: "ald-modal-footer ant-modal-footer tw-flex tw-justify-end tw-gap-2 tw-border-t tw-border-solid tw-border-[var(--border-default)] tw-px-6 tw-py-4",
+			className: cn("ald-modal-footer ant-modal-footer tw-flex tw-justify-end tw-gap-2 tw-px-6 tw-py-4", footerBorderClassName),
 			children: [/* @__PURE__ */ jsx(Button_default, {
 				type: "secondary",
 				size: "middle",
@@ -182,9 +155,13 @@ function OriginModal(props) {
 			children: /* @__PURE__ */ jsx(DialogPrimitive.Content, {
 				ref: modalRef,
 				tabIndex: -1,
+				role,
 				"data-testid": dataTestId,
+				"aria-modal": isTop || void 0,
+				"aria-labelledby": title ? titleId : void 0,
+				"aria-describedby": subTitle ? descriptionId : void 0,
 				"aria-label": ariaLabel,
-				className: cn("ald-modal ant-modal tw-pointer-events-auto tw-box-border tw-flex tw-flex-col tw-overflow-hidden tw-bg-[var(--background-default)] tw-shadow-[var(--elevation-bottom-bottom-lg)] tw-outline-none", fullscreen ? "ald-modal-fullscreen tw-fixed tw-inset-0 tw-size-full tw-rounded-none" : "tw-rounded-r-75", !fullscreen && "tw-border tw-border-solid tw-border-[var(--border-default)]", paddingLess && "ald-modal-padding-less", virtualScrollBar && "ald-modal-virtual-scroll-bar", hideHeaderBottomBorder && "ald-modal-hide-header-bottom-border", responsiveBounds && "ald-modal-responsive-bounds", className),
+				className: cn("ald-modal ant-modal tw-pointer-events-auto tw-box-border tw-flex tw-flex-col tw-overflow-hidden tw-border-0 tw-bg-[var(--background-default)] tw-shadow-none tw-outline-none", fullscreen ? "ald-modal-fullscreen tw-fixed tw-inset-0 tw-size-full tw-rounded-none" : "tw-rounded-r-75", paddingLess && "ald-modal-padding-less", virtualScrollBar && "ald-modal-virtual-scroll-bar", hideHeaderBottomBorder && "ald-modal-hide-header-bottom-border", responsiveBounds && "ald-modal-responsive-bounds", className),
 				style: {
 					...fullscreen ? {} : {
 						width: responsiveBounds ? responsiveBoundsStyle.width : width || DEFAULT_WIDTH,
@@ -196,14 +173,11 @@ function OriginModal(props) {
 					event.preventDefault();
 					requestAnimationFrame(() => {
 						const modal = modalRef.current;
-						const activeElement = document.activeElement;
-						const activeOverlay = activeElement instanceof HTMLElement ? activeElement.closest("[role=\"dialog\"], [role=\"menu\"], [role=\"listbox\"]") : null;
-						if (!modal || activeOverlay && !activeOverlay.classList.contains("ald-modal") && activeOverlay !== modal && !modal.contains(activeOverlay)) return;
-						modal.focus({ preventScroll: true });
+						if (modal) focusInitialDialogTarget(modal);
 					});
 				},
 				onEscapeKeyDown: (event) => {
-					if (!event.defaultPrevented) modalEscapeEvents.add(event);
+					if (!event.defaultPrevented) markDialogEscapeEvent(event);
 					event.preventDefault();
 				},
 				onPointerDownOutside: (e) => {
@@ -214,13 +188,13 @@ function OriginModal(props) {
 					if (!maskClosable) e.preventDefault();
 				},
 				children: /* @__PURE__ */ jsx("div", {
-					className: "ant-modal-content tw-flex tw-h-full tw-flex-col",
+					className: "ant-modal-content tw-flex tw-h-full tw-flex-col !tw-rounded-none !tw-border-0 !tw-bg-transparent !tw-p-0 !tw-shadow-none",
 					children: /* @__PURE__ */ jsxs(ModalContentProviders, {
 						layerId: modalLayerId,
 						floatingLevel: nextFloatingLevel,
 						children: [
 							!fullscreen && /* @__PURE__ */ jsxs("div", {
-								className: cn("ald-modal-header ant-modal-header tw-flex tw-items-start tw-justify-between tw-bg-[var(--background-default)] tw-px-6 tw-py-4", !hideHeaderBottomBorder && "tw-border-b tw-border-solid tw-border-[var(--border-default)]"),
+								className: cn("ald-modal-header ant-modal-header tw-flex tw-items-start tw-justify-between tw-bg-[var(--background-default)] tw-px-6 tw-py-4", headerBorderClassName),
 								children: [/* @__PURE__ */ jsx(DialogPrimitive.Title, {
 									asChild: true,
 									children: /* @__PURE__ */ jsx("div", {
@@ -228,24 +202,39 @@ function OriginModal(props) {
 										children: ModalTitle({
 											icon,
 											title,
-											subTitle
+											subTitle,
+											titleId,
+											descriptionId
 										}, _modalType)
 									})
 								}), closable && /* @__PURE__ */ jsx(DialogPrimitive.Close, {
 									asChild: true,
-									children: /* @__PURE__ */ jsx("span", {
-										className: "ant-modal-close",
+									children: /* @__PURE__ */ jsx("button", {
+										type: "button",
+										className: "ant-modal-close ald-icon-button ald-icon-button-middle focus-visible:tw-outline focus-visible:tw-outline-2 focus-visible:tw-outline-offset-2 focus-visible:tw-outline-[var(--focus-ring)] forced-colors:focus-visible:tw-outline-[Highlight]",
+										"aria-label": "Close",
+										"data-overlay-close": "true",
 										onClick: onCancel,
-										children: closeIcon || /* @__PURE__ */ jsx(IconButton, {
-											icon: /* @__PURE__ */ jsx(Memo$2, { size: 20 }),
-											size: "middle"
+										children: /* @__PURE__ */ jsx("span", {
+											className: "ald-icon-button-wrap",
+											children: closeIcon || /* @__PURE__ */ jsx(Memo$2, { size: 20 })
 										})
 									})
 								})]
 							}),
 							fullscreen && /* @__PURE__ */ jsx(DialogPrimitive.Title, {
+								asChild: true,
+								children: /* @__PURE__ */ jsx("div", {
+									className: "tw-sr-only",
+									children: title && /* @__PURE__ */ jsx("span", {
+										id: titleId,
+										children: title
+									})
+								})
+							}),
+							subTitle && /* @__PURE__ */ jsx(DialogPrimitive.Description, {
 								className: "tw-sr-only",
-								children: title
+								children: subTitle
 							}),
 							/* @__PURE__ */ jsx("div", {
 								className: cn("ald-modal-body ant-modal-body tw-flex-1 tw-text-sm tw-leading-5", fullscreen ? "tw-h-full tw-overflow-auto tw-p-0" : "tw-min-h-[130px]", !fullscreen && (virtualScrollBar ? "tw-overflow-hidden tw-p-0" : "tw-overflow-auto"), !fullscreen && !responsiveBounds && !virtualScrollBar && "tw-max-h-[68vh]", !fullscreen && !paddingLess && !virtualScrollBar && "tw-p-6"),
@@ -280,9 +269,7 @@ function createStaticModal(type, props) {
 		container.remove();
 		const idx = destroyFns.indexOf(destroy);
 		if (idx >= 0) destroyFns.splice(idx, 1);
-		queueMicrotask(() => {
-			if (shouldRestoreFocus && focusTarget?.isConnected) focusTarget.focus();
-		});
+		if (shouldRestoreFocus) restoreDialogFocus(focusTarget);
 	};
 	const update = (newProps) => {
 		currentProps = {
@@ -317,6 +304,7 @@ function createStaticModal(type, props) {
 			className: cn("ald-modal", p.className),
 			closable: p.closable,
 			maskClosable: p.maskClosable,
+			role: p.role,
 			_modalType: type,
 			onTopChange: (nextIsTop) => {
 				isTop = nextIsTop;
@@ -408,6 +396,7 @@ function useModal() {
 			className: cn("ald-modal", m.props.className),
 			closable: m.props.closable,
 			maskClosable: m.props.maskClosable,
+			role: m.props.role,
 			_modalType: m.type,
 			footer: isConfirmType ? void 0 : /* @__PURE__ */ jsx(Button_default, {
 				type: "primary",