diff --git a/apps/client/src/widgets/buttons/global_menu.tsx b/apps/client/src/widgets/buttons/global_menu.tsx index 5b3cfe862..b6e850726 100644 --- a/apps/client/src/widgets/buttons/global_menu.tsx +++ b/apps/client/src/widgets/buttons/global_menu.tsx @@ -99,7 +99,7 @@ function SwitchToOptions() { } } -function MenuItem({ icon, text, title, command, disabled, active, outsideChildren }: MenuItemProps void)>) { +function MenuItem({ icon, text, title, command, disabled, active }: MenuItemProps void)>) { return {text} } @@ -115,8 +114,7 @@ function KeyboardActionMenuItem({ text, command, ...props }: MenuItemProps} + text={<>{text} } /> } @@ -177,7 +175,9 @@ function ZoomControls({ parentComponent }: { parentComponent?: Component | null + > + {t("global_menu.zoom")} + <>
  @@ -185,8 +185,8 @@ function ZoomControls({ parentComponent }: { parentComponent?: Component | null {zoomLevel}{t("units.percentage")}
- } - >{t("global_menu.zoom")}
+ + ) : ( ); diff --git a/apps/client/src/widgets/react/FormList.tsx b/apps/client/src/widgets/react/FormList.tsx index 8991dea00..eca945061 100644 --- a/apps/client/src/widgets/react/FormList.tsx +++ b/apps/client/src/widgets/react/FormList.tsx @@ -89,7 +89,6 @@ interface FormListItemOpts { description?: string; className?: string; rtl?: boolean; - outsideChildren?: ComponentChildren; } const TOOLTIP_CONFIG: Partial = { @@ -97,7 +96,7 @@ const TOOLTIP_CONFIG: Partial = { fallbackPlacements: [ "right" ] } -export function FormListItem({ className, icon, value, title, active, disabled, checked, onClick, selected, rtl, triggerCommand, outsideChildren, description, ...contentProps }: FormListItemOpts) { +export function FormListItem({ className, icon, value, title, active, disabled, checked, onClick, selected, rtl, triggerCommand, description, ...contentProps }: FormListItemOpts) { const itemRef = useRef(null); if (checked) { @@ -124,7 +123,6 @@ export function FormListItem({ className, icon, value, title, active, disabled, ) : ( )} - {outsideChildren} ); }