@plesk/ui-library 3.43.2 → 3.44.0

package/esm/components/List/ListAction.js

@@ -25,6 +25,7 @@ const ListAction = _ref => {
     }
     return /*#__PURE__*/_jsx(MenuItem, {
       tooltip: tooltip,
+      menuRole: "listbox",
       ...props,
       children: children
     });

package/esm/components/List/ListActions.js

@@ -69,6 +69,7 @@ const ListActions = _ref => {
     secondaryDropdown = /*#__PURE__*/_jsx(Dropdown, {
       className: `${baseClassName}__menu`,
       menu: /*#__PURE__*/_jsx(Menu, {
+        role: "listbox",
         children: secondaryItems
       }),
       menuPlacement: "bottom-end",

package/esm/components/List/ListEmptyView.js

@@ -2,7 +2,7 @@
 
 import classNames from 'classnames';
 import Heading from '../Heading';
-import Translate from '../Translate';
+import { InternalTranslate } from '../Translate';
 import empty from './images/default.png';
 import filtered from './images/filtered.png';
 import { CLS_PREFIX } from '../../constants';
@@ -27,12 +27,10 @@ const createImage = (baseClassName, image, reason) => {
 };
 const createTitle = (baseClassName, title, reason) => {
   if (title === undefined) {
-    title = reason === 'filtered' ? /*#__PURE__*/_jsx(Translate, {
-      content: "ListEmptyView.filteredTitle",
-      fallback: "Could not find any items matching the filter"
-    }) : /*#__PURE__*/_jsx(Translate, {
-      content: "ListEmptyView.emptyTitle",
-      fallback: "Looks like there's nothing here"
+    title = reason === 'filtered' ? /*#__PURE__*/_jsx(InternalTranslate, {
+      content: "ListEmptyView.filteredTitle"
+    }) : /*#__PURE__*/_jsx(InternalTranslate, {
+      content: "ListEmptyView.emptyTitle"
     });
   }
   return /*#__PURE__*/_jsx(Heading, {
@@ -46,9 +44,8 @@ const createDescription = (baseClassName, description, reason) => {
     return null;
   }
   if (description === undefined && reason === 'filtered') {
-    description = /*#__PURE__*/_jsx(Translate, {
-      content: "ListEmptyView.filteredDescription",
-      fallback: "Refine your query or remove some of the criteria from the filter and try again."
+    description = /*#__PURE__*/_jsx(InternalTranslate, {
+      content: "ListEmptyView.filteredDescription"
     });
   }
   return /*#__PURE__*/_jsx("div", {

package/esm/components/List/ListOperation.js

@@ -4,7 +4,7 @@ import { useContext, useState, useRef, cloneElement, isValidElement } from 'reac
 import { safeInvoke } from '../utils';
 import ListOperationContext from './ListOperationContext';
 import Popover from '../Popover';
-import Translate from '../Translate';
+import { InternalTranslate } from '../Translate';
 import Button from '../Button';
 import Media from '../Media';
 import Icon from '../Icon';
@@ -16,18 +16,9 @@ const toBold = value => value === undefined ? undefined : /*#__PURE__*/_jsx(Text
   children: value
 });
 const getDefaultText = key => {
-  let fallback;
-  switch (key) {
-    case 'cancelButton':
-      fallback = 'Cancel';
-      break;
-    default:
-      throw new Error('Unknown key');
-  }
   const content = `ListOperation.${key}`;
-  return /*#__PURE__*/_jsx(Translate, {
-    content: content,
-    fallback: fallback
+  return /*#__PURE__*/_jsx(InternalTranslate, {
+    content: content
   });
 };
 /**

package/esm/components/LocaleProvider/LocaleProvider.js

@@ -3,6 +3,9 @@ import _defineProperty from "@babel/runtime/helpers/defineProperty";
 
 import { PureComponent, isValidElement, cloneElement, createContext, useContext, useCallback, useMemo } from 'react';
 import PropTypes from 'prop-types';
+import { getLocaleMessages } from '../Translate';
+
+// eslint-disable-next-line max-params
 import { jsx as _jsx } from "react/jsx-runtime";
 const applyParams = function (message) {
   let params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
@@ -43,14 +46,18 @@ const getMessage = (fullKey, messages) => {
   return messages[fullKey];
 };
 const createTranslate = messages =>
-// eslint-disable-next-line default-param-last
+// eslint-disable-next-line default-param-last,max-params
 function (key) {
   let params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
   let fallback = arguments.length > 2 ? arguments[2] : undefined;
+  let defaultMessages = arguments.length > 3 ? arguments[3] : undefined;
   if (typeof key !== 'string') {
     return '';
   }
   let message = getMessage(key, messages);
+  if (typeof message !== 'string' && defaultMessages) {
+    message = getMessage(key, defaultMessages);
+  }
   if (typeof message !== 'string') {
     message = typeof fallback === 'string' ? fallback : `[${key}]`;
   }
@@ -88,18 +95,18 @@ _defineProperty(LocaleProvider, "childContextTypes", {
 export default LocaleProvider;
 export const useTranslate = namespace => {
   const context = useContext(LocaleContext);
-  return useCallback((key, params, fallback) => {
-    if (context) {
-      const {
-        locale: {
-          lmsg
-        }
-      } = context;
-      return lmsg(namespace ? `${namespace}.${key}` : key, params, fallback);
-    }
-    return typeof fallback === 'string' ? applyParams(fallback, params) : `[${key}]`;
+  return useCallback(
+  // eslint-disable-next-line max-params
+  (key, params, fallback, defaultMessages) => {
+    const lmsg = context?.locale.lmsg ?? createTranslate({});
+    return lmsg(namespace ? `${namespace}.${key}` : key, params, fallback, defaultMessages);
   }, [context, namespace]);
 };
+export const useInternalTranslate = namespace => {
+  const translate = useTranslate(namespace);
+  const defaultMessages = getLocaleMessages();
+  return (key, params, fallback) => translate(key, params, fallback, defaultMessages);
+};
 export const LocaleBetaProvider = _ref => {
   let {
     messages,

package/esm/components/Menu/Menu.js

@@ -35,6 +35,7 @@ const Menu = /*#__PURE__*/forwardRef(function Menu(_ref, ref) {
     onFocus,
     autoFocus,
     overlay = false,
+    role: menuRole = 'menu',
     baseClassName = `${CLS_PREFIX}menu`,
     ...props
   } = _ref;
@@ -44,7 +45,7 @@ const Menu = /*#__PURE__*/forwardRef(function Menu(_ref, ref) {
     focusPrev,
     focusFirst,
     focusLast
-  } = useMemo(() => createFocusManager(rootRef, node => (node.getAttribute('role') === 'menuitem' || node.getAttribute('role') === 'menuitemcheckbox') && node.getAttribute('aria-disabled') !== 'true'), []);
+  } = useMemo(() => createFocusManager(rootRef, node => (menuRole === 'menu' && (node.getAttribute('role') === 'menuitem' || node.getAttribute('role') === 'menuitemcheckbox') || menuRole === 'listbox' && node.getAttribute('role') === 'option') && node.getAttribute('aria-disabled') !== 'true'), [menuRole]);
   const handleKeyDown = e => {
     switch (e.key) {
       case 'ArrowUp':
@@ -79,26 +80,27 @@ const Menu = /*#__PURE__*/forwardRef(function Menu(_ref, ref) {
     if (! /*#__PURE__*/isValidElement(child)) {
       return child;
     }
-    const props = {
+    const itemProps = {
       tabIndex: -1
     };
     if (onItemClick) {
-      props.onClick = wrapFunction(child.props.onClick, onItemClick.bind(null, child, index));
+      itemProps.onClick = wrapFunction(child.props.onClick, onItemClick.bind(null, child, index));
     }
     if (!hasTabIndex && (child.type === MenuItem || child.type === MenuSelectableItem) && !child.props.disabled) {
-      props.tabIndex = 0;
+      itemProps.tabIndex = 0;
       hasTabIndex = true;
-    } else {
-      props.tabIndex = -1;
     }
-    return /*#__PURE__*/cloneElement(child, props);
+    if (menuRole === 'listbox' && (child.type === MenuItem || child.type === MenuSelectableItem)) {
+      itemProps.role = 'option';
+    }
+    return /*#__PURE__*/cloneElement(child, itemProps);
   });
   return /*#__PURE__*/_jsx("div", {
     className: classNames(baseClassName, className, {
       [`${baseClassName}--icons`]: hasIconItem(children),
       [`${baseClassName}--overlay`]: overlay
     }),
-    role: "menu",
+    role: menuRole,
     ...props,
     ref: el => {
       rootRef.current = el;

package/esm/components/Menu/MenuItem.js

@@ -19,6 +19,7 @@ const MenuItem = _ref => {
     icon,
     label,
     tooltip,
+    menuRole = 'menu',
     baseClassName = `${CLS_PREFIX}menu__item`,
     disabled = false,
     active = false,
@@ -34,7 +35,7 @@ const MenuItem = _ref => {
         onClick(e);
       }
     },
-    role: "menuitem",
+    role: menuRole === 'listbox' ? 'option' : 'menuitem',
     "aria-disabled": disabled ? 'true' : undefined,
     tabIndex: disabled ? -1 : 0,
     icon: icon,

package/esm/components/Overlay/Overlay.js

@@ -28,6 +28,7 @@ const OverlayCore = _ref => {
     canCloseOnBackdropClick = true,
     canCloseOnEscapePress = true,
     style = {},
+    containerProps = {},
     onAnimationExited,
     ...props
   } = _ref;
@@ -124,6 +125,7 @@ const OverlayCore = _ref => {
           ref: contentRef,
           role: "dialog",
           "aria-modal": "true",
+          ...containerProps,
           children: [/*#__PURE__*/_jsx("div", {
             className: `${baseClassName}__body`,
             children: children

package/esm/components/Pagination/Pagination.js

@@ -8,7 +8,7 @@ import Link from '../Link';
 import Popover from '../Popover';
 import SegmentedControl from '../SegmentedControl';
 import Text from '../Text';
-import Translate from '../Translate';
+import { InternalTranslate } from '../Translate';
 import { safeInvoke } from '../utils';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export const ITEMS_PER_PAGE_OPTIONS = [25, 100, 'all'];
@@ -58,9 +58,8 @@ const Pagination = _ref => {
           incrementIcon: "arrow-right",
           className: `${baseClassName}__input`
         })
-      }), /*#__PURE__*/_jsx(Translate, {
+      }), /*#__PURE__*/_jsx(InternalTranslate, {
         content: "Pagination.totalShort",
-        fallback: "of %%total%%",
         params: {
           total
         },
@@ -68,18 +67,16 @@ const Pagination = _ref => {
       })]
     }), onItemsPerPageChange ? /*#__PURE__*/_jsxs("div", {
       className: `${baseClassName}__options`,
-      children: [/*#__PURE__*/_jsx(Translate, {
+      children: [/*#__PURE__*/_jsx(InternalTranslate, {
         content: "Pagination.itemsPerPage",
-        fallback: "Items per page",
         className: `${baseClassName}__text`
       }), /*#__PURE__*/_jsx(SegmentedControl, {
         ghost: true,
         buttons: itemsPerPageOptions.map(value => {
           let title = value;
           if (value === 'all') {
-            title = /*#__PURE__*/_jsx(Translate, {
-              content: "Pagination.all",
-              fallback: "All"
+            title = /*#__PURE__*/_jsx(InternalTranslate, {
+              content: "Pagination.all"
             });
           }
           return {
@@ -99,9 +96,8 @@ const Pagination = _ref => {
         fontSize: "sm",
         component: Link,
         nowrap: true,
-        children: /*#__PURE__*/_jsx(Translate, {
+        children: /*#__PURE__*/_jsx(InternalTranslate, {
           content: "Pagination.total",
-          fallback: "Page %%current%% of %%total%%",
           params: {
             current,
             total

package/esm/components/Popover/Popover.js

@@ -137,7 +137,7 @@ class Popover extends Component {
         targetRef
       } = this.props;
       if (targetRef || this.targetRef.current) {
-        return [targetRef, this.targetRef];
+        return [targetRef?.current ?? null, this.targetRef.current ?? null];
       }
       return [findDOMNode(this)];
     });

package/esm/components/ProgressDialog/ProgressDialog.js

@@ -5,7 +5,7 @@ import { Component } from 'react';
 import classNames from 'classnames';
 import Dialog from '../Dialog';
 import { CLS_PREFIX } from '../../constants';
-import Translate from '../Translate';
+import { InternalTranslate } from '../Translate';
 import { safeInvoke } from '../utils';
 import { STATUS_DONE, STATUS_ERROR, STATUS_WARNING } from '../ProgressStep';
 import Progress from '../Progress';
@@ -118,12 +118,10 @@ class ProgressDialog extends Component {
     } = this.state;
     const canClose = isFinished || isFinishedWithWarnings || isFailed;
     const canCancel = cancelable && !canClose;
-    const cancelTitle = canClose ? /*#__PURE__*/_jsx(Translate, {
-      content: "ProgressDialog.closeButton",
-      fallback: "Close"
-    }) : /*#__PURE__*/_jsx(Translate, {
-      content: "ProgressDialog.cancelButton",
-      fallback: "Cancel"
+    const cancelTitle = canClose ? /*#__PURE__*/_jsx(InternalTranslate, {
+      content: "ProgressDialog.closeButton"
+    }) : /*#__PURE__*/_jsx(InternalTranslate, {
+      content: "ProgressDialog.cancelButton"
     });
     return /*#__PURE__*/_jsxs(Dialog, {
       className: classNames(baseClassName, className),

package/esm/components/Section/Section.js

@@ -1,244 +1,108 @@
-import _defineProperty from "@babel/runtime/helpers/defineProperty";
 // Copyright 1999-2025. WebPros International GmbH. All rights reserved.
 
 import classNames from 'classnames';
-import { Children, Component, isValidElement, useContext } from 'react';
-import Measure from 'react-measure';
+import { useContext, useMemo, useRef } from 'react';
 import { CLS_PREFIX } from '../../constants';
 import Button from '../Button';
-import FormContext from '../Form/FormContext';
 import InPlaceEdit from '../InPlaceEdit';
 import { isClickable } from '../utils';
-import VerticalContext, { VERTICAL_BREAKPOINT } from '../VerticalContext';
+import VerticalContext from '../VerticalContext';
+import SectionContext from './SectionContext';
+import { useCollapsed } from './useCollapsed';
+import { useVertical } from './useVertical';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const getErrorsForChildren = (form, children) => {
-  let errors = {};
-  Children.forEach(children, child => {
-    if (! /*#__PURE__*/isValidElement(child)) {
-      return;
-    }
-    if (child.props.name) {
-      errors = {
-        ...errors,
-        ...form.getErrors(child.props.name)
-      };
-    }
-    if (child.props.children) {
-      errors = {
-        ...errors,
-        ...getErrorsForChildren(form, child.props.children)
-      };
-    }
-  });
-  return errors;
-};
 export const SECTION_BASE_CLASS_NAME = `${CLS_PREFIX}section`;
-class Section extends Component {
-  constructor() {
-    super(...arguments);
-    _defineProperty(this, "state", {
-      vertical: false
-    });
-    _defineProperty(this, "handleResize", _ref => {
-      let {
-        bounds
-      } = _ref;
-      if (this.props.vertical !== undefined || !bounds) {
-        return;
-      }
-      this.setState({
-        vertical: bounds.width < VERTICAL_BREAKPOINT
-      });
-    });
-    _defineProperty(this, "handleCollapse", e => {
-      if (isClickable(e)) {
-        return;
-      }
-      this.setState(_ref2 => {
-        let {
-          collapsed
-        } = _ref2;
-        return {
-          collapsed: !collapsed
-        };
-      }, () => {
-        this.props.onToggle?.(this.state.collapsed ?? false);
-      });
-    });
-  }
-  static getDerivedStateFromProps(props, state) {
-    const {
-      collapsible,
-      collapsed,
-      form,
-      children
-    } = props;
-    const {
-      prevCollapsed,
-      prevErrors
-    } = state;
-    const nextState = {};
-    if (collapsed !== prevCollapsed) {
-      nextState.collapsed = collapsed;
-    }
-    nextState.prevCollapsed = collapsed;
-    if (collapsible && form) {
-      const errors = getErrorsForChildren(form, children);
-      if (JSON.stringify(errors) !== JSON.stringify(prevErrors) && Object.keys(errors).length > 0) {
-        nextState.collapsed = false;
-      }
-      nextState.prevErrors = errors;
-    }
-    return nextState;
-  }
-  renderCollapseButton(_ref3) {
-    let {
-      baseClassName,
-      collapsible
-    } = _ref3;
-    const {
-      collapsed
-    } = this.state;
-    return collapsible && /*#__PURE__*/_jsx(Button, {
-      ghost: true,
-      className: classNames(`${baseClassName}__control-button`, `${baseClassName}__control-button--collapse`),
-      icon: {
-        name: 'chevron-up',
-        flipVertical: collapsed
-      },
-      onClick: this.handleCollapse
-    });
-  }
-  renderCloseButton(_ref4) {
-    let {
-      baseClassName,
-      onClose,
-      buttons
-    } = _ref4;
-    return (onClose || buttons) && /*#__PURE__*/_jsxs("div", {
-      className: `${baseClassName}__header-buttons`,
-      children: [buttons, onClose && /*#__PURE__*/_jsx(Button, {
-        ghost: true,
-        className: classNames(`${baseClassName}__control-button`, `${baseClassName}__control-button--close`),
-        onClick: onClose,
-        icon: "cross-mark"
-      })]
-    });
-  }
-  renderTitle(_ref5) {
-    let {
-      baseClassName,
-      title,
-      onTitleChange
-    } = _ref5;
-    return title && /*#__PURE__*/_jsx(InPlaceEdit, {
-      className: `${baseClassName}__title`,
-      value: title,
-      onChange: onTitleChange,
-      onClick: e => {
-        const button = e.target?.closest(`.${baseClassName}__header`)?.querySelector(`.${baseClassName}__control-button`);
-        button?.click();
-      }
-    });
-  }
-  renderContent(_ref6) {
-    let {
-      collapsible,
-      children
-    } = _ref6;
-    const {
-      collapsed
-    } = this.state;
-    if (collapsible && collapsed) {
-      return null;
-    }
-    return children;
-  }
-  render() {
-    const {
-      baseClassName = SECTION_BASE_CLASS_NAME,
-      className,
-      intent,
-      collapsible = false,
-      title,
-      collapsed,
-      onTitleChange,
-      onClose,
-      onToggle,
-      buttons,
-      vertical: verticalProp,
-      children,
-      form,
-      ...props
-    } = this.props;
-    const vertical = verticalProp === undefined ? this.state.vertical : verticalProp;
-    return /*#__PURE__*/_jsx(VerticalContext.Provider, {
-      value: vertical,
-      children: /*#__PURE__*/_jsx(Measure, {
-        onResize: this.handleResize,
-        bounds: true,
-        children: _ref7 => {
-          let {
-            measureRef
-          } = _ref7;
-          return /*#__PURE__*/_jsxs("div", {
-            ref: measureRef,
-            className: classNames(baseClassName, {
-              [`${baseClassName}--${intent}`]: intent,
-              [`${baseClassName}--collapsible`]: collapsible,
-              [`${baseClassName}--collapsed`]: this.state.collapsed,
-              [`${baseClassName}--vertical`]: vertical
-            }, className),
-            ...props,
-            children: [title && /*#__PURE__*/_jsxs("div", {
-              className: `${baseClassName}__header`,
-              children: [this.renderCollapseButton({
-                baseClassName,
-                collapsible
-              }), this.renderTitle({
-                baseClassName,
-                title,
-                onTitleChange
-              }), this.renderCloseButton({
-                baseClassName,
-                onClose,
-                buttons
-              })]
-            }), this.renderContent({
-              collapsible,
-              children
-            })]
-          });
-        }
-      })
-    });
-  }
-}
 
 /**
  * `Section` component is used for dividing of complex content into groups for better readability
  * and comprehension of the presented information.
  * @since 0.0.54
  */
-const SectionWrapper = _ref8 => {
+const Section = _ref => {
   let {
-    collapsible = false,
-    collapsed = false,
     baseClassName = SECTION_BASE_CLASS_NAME,
+    className,
+    intent,
+    collapsible = false,
+    collapsed: externalCollapsed = false,
+    onToggle,
+    title,
+    onTitleChange,
+    onClose,
+    buttons,
+    vertical: externalVertical,
+    children,
     ...props
-  } = _ref8;
-  const form = useContext(FormContext);
-  const verticalContext = useContext(VerticalContext);
-  const vertical = props.vertical === undefined ? verticalContext : props.vertical;
-  return /*#__PURE__*/_jsx(Section, {
-    ...props,
-    form: form,
-    vertical: vertical,
-    collapsible: collapsible,
-    collapsed: collapsed,
-    baseClassName: baseClassName
+  } = _ref;
+  const containerRef = useRef(null);
+  const collapseButtonRef = useRef(null);
+  const vertical = useVertical(externalVertical, containerRef);
+  const [collapsed, setCollapsed] = useCollapsed(externalCollapsed);
+  const toggleCollapsed = () => {
+    setCollapsed(prevCollapsed => {
+      onToggle?.(!prevCollapsed);
+      return !prevCollapsed;
+    });
+  };
+  const parentSectionContext = useContext(SectionContext);
+  const sectionContextValue = useMemo(() => ({
+    expand: () => {
+      parentSectionContext?.expand();
+      setCollapsed(false);
+    }
+  }), [setCollapsed, parentSectionContext]);
+  return /*#__PURE__*/_jsx(SectionContext.Provider, {
+    value: sectionContextValue,
+    children: /*#__PURE__*/_jsx(VerticalContext.Provider, {
+      value: vertical,
+      children: /*#__PURE__*/_jsxs("div", {
+        ref: containerRef,
+        className: classNames(baseClassName, {
+          [`${baseClassName}--${intent}`]: intent,
+          [`${baseClassName}--collapsible`]: collapsible,
+          [`${baseClassName}--collapsed`]: collapsed,
+          [`${baseClassName}--vertical`]: vertical
+        }, className),
+        ...props,
+        children: [title && /*#__PURE__*/_jsxs("div", {
+          className: `${baseClassName}__header`,
+          children: [collapsible && /*#__PURE__*/_jsx(Button, {
+            ref: collapseButtonRef,
+            ghost: true,
+            className: classNames(`${baseClassName}__control-button`, `${baseClassName}__control-button--collapse`),
+            icon: {
+              name: 'chevron-up',
+              flipVertical: collapsed
+            },
+            onClick: toggleCollapsed,
+            "aria-expanded": !collapsed
+          }), /*#__PURE__*/_jsx(InPlaceEdit, {
+            className: `${baseClassName}__title`,
+            value: title,
+            onChange: onTitleChange,
+            onClick: e => {
+              if (!collapsible || isClickable(e)) {
+                return;
+              }
+              collapseButtonRef.current?.click();
+            }
+          }), (onClose || buttons) && /*#__PURE__*/_jsxs("div", {
+            className: `${baseClassName}__header-buttons`,
+            children: [buttons, onClose && /*#__PURE__*/_jsx(Button, {
+              ghost: true,
+              className: classNames(`${baseClassName}__control-button`, `${baseClassName}__control-button--close`),
+              onClick: onClose,
+              icon: "cross-mark"
+            })]
+          })]
+        }), /*#__PURE__*/_jsx("div", {
+          style: {
+            display: collapsed ? 'none' : undefined
+          },
+          children: children
+        })]
+      })
+    })
   });
 };
-SectionWrapper.displayName = 'Section';
-SectionWrapper.WrappedComponent = Section;
-export default SectionWrapper;
+export default Section;

package/esm/components/Section/SectionContext.js

@@ -0,0 +1,5 @@
+// Copyright 1999-2025. WebPros International GmbH. All rights reserved.
+
+import { createContext } from 'react';
+const SectionContext = /*#__PURE__*/createContext(null);
+export default SectionContext;

package/esm/components/Section/useCollapsed.js

@@ -0,0 +1,12 @@
+// Copyright 1999-2025. WebPros International GmbH. All rights reserved.
+
+import { useState } from 'react';
+export const useCollapsed = externalCollapsed => {
+  const [collapsed, setCollapsed] = useState(externalCollapsed ?? false);
+  const [prevExternalCollapsed, setPrevExternalCollapsed] = useState(externalCollapsed);
+  if (externalCollapsed !== prevExternalCollapsed) {
+    setPrevExternalCollapsed(externalCollapsed);
+    setCollapsed(externalCollapsed ?? false);
+  }
+  return [collapsed, setCollapsed];
+};