diff --git a/assets/dist/sdk/manifest.json b/assets/dist/sdk/manifest.json
index d1dab51be..ecf1e6dc4 100644
--- a/assets/dist/sdk/manifest.json
+++ b/assets/dist/sdk/manifest.json
@@ -22,7 +22,9 @@
"dist/../build/types/src/core/components/pagination/pagination.d.ts": "/dist/../build/types/src/core/components/pagination/pagination.d.ts",
"dist/../build/types/src/sdk/main.d.ts.map": "/dist/../build/types/src/sdk/main.d.ts.map",
"dist/../build/types/src/core/modules/icon-library/services/icon-library.d.ts": "/dist/../build/types/src/core/modules/icon-library/services/icon-library.d.ts",
+ "dist/../build/types/src/core/components/dropdown-menu/dropdown-menu.styles.d.ts": "/dist/../build/types/src/core/components/dropdown-menu/dropdown-menu.styles.d.ts",
"dist/../build/types/src/core/modules/widget-manager/hooks/use-widget-manager.d.ts": "/dist/../build/types/src/core/modules/widget-manager/hooks/use-widget-manager.d.ts",
+ "dist/../build/types/src/core/components/pagination/pagination.stories.d.ts": "/dist/../build/types/src/core/components/pagination/pagination.stories.d.ts",
"dist/../build/types/src/core/modules/asset/hooks/use-global-asset-context.d.ts": "/dist/../build/types/src/core/modules/asset/hooks/use-global-asset-context.d.ts",
"dist/../build/types/src/core/components/preview-card/preview-card.d.ts": "/dist/../build/types/src/core/components/preview-card/preview-card.d.ts",
"dist/../build/types/src/core/modules/element/editor/tab-manager/interface/IAssetEditorTabManager.d.ts": "/dist/../build/types/src/core/modules/element/editor/tab-manager/interface/IAssetEditorTabManager.d.ts",
@@ -67,6 +69,7 @@
"dist/../build/types/src/core/modules/asset/editor/image/tab-manager/tabs/preview/sidebar/tabs/details/details.styles.d.ts": "/dist/../build/types/src/core/modules/asset/editor/image/tab-manager/tabs/preview/sidebar/tabs/details/details.styles.d.ts",
"dist/../build/types/src/core/modules/asset/editor/image/tab-manager/tabs/preview/preview-container.d.ts": "/dist/../build/types/src/core/modules/asset/editor/image/tab-manager/tabs/preview/preview-container.d.ts",
"dist/../build/types/src/core/modules/element/editor/tab-manager/layouts/content-toolbar-sidebar-view.d.ts": "/dist/../build/types/src/core/modules/element/editor/tab-manager/layouts/content-toolbar-sidebar-view.d.ts",
+ "dist/../build/types/src/core/components/pagination/size-changer/size-changer.stories.d.ts": "/dist/../build/types/src/core/components/pagination/size-changer/size-changer.stories.d.ts",
"dist/../build/types/src/core/modules/asset/editor/folder/tab-manager/tabs/list/grid-container.d.ts": "/dist/../build/types/src/core/modules/asset/editor/folder/tab-manager/tabs/list/grid-container.d.ts",
"dist/../build/types/src/core/modules/asset/editor/folder/tab-manager/tabs/preview/flex-container.d.ts": "/dist/../build/types/src/core/modules/asset/editor/folder/tab-manager/tabs/preview/flex-container.d.ts",
"dist/../build/types/src/core/modules/app/app.stories.d.ts": "/dist/../build/types/src/core/modules/app/app.stories.d.ts",
@@ -77,11 +80,11 @@
"dist/../build/types/src/core/modules/widget-manager/widget-manager-view.styles.d.ts": "/dist/../build/types/src/core/modules/widget-manager/widget-manager-view.styles.d.ts",
"dist/../build/types/src/core/modules/asset/editor/services/component-registry.d.ts.map": "/dist/../build/types/src/core/modules/asset/editor/services/component-registry.d.ts.map",
"dist/../build/types/src/core/modules/asset/editor/image/tab-manager/tabs/preview/preview-view.styles.d.ts": "/dist/../build/types/src/core/modules/asset/editor/image/tab-manager/tabs/preview/preview-view.styles.d.ts",
- "dist/../build/types/src/core/components/dropdown-menu/dropdown-menu.styles.d.ts": "/dist/../build/types/src/core/components/dropdown-menu/dropdown-menu.styles.d.ts",
"dist/../build/types/src/core/modules/element/editor/layouts/tabs-toolbar-view.d.ts": "/dist/../build/types/src/core/modules/element/editor/layouts/tabs-toolbar-view.d.ts",
"dist/../build/types/src/core/components/tree/node/content/tree-node-content.d.ts": "/dist/../build/types/src/core/components/tree/node/content/tree-node-content.d.ts",
"dist/../build/types/src/core/components/icon/icon.stories.d.ts": "/dist/../build/types/src/core/components/icon/icon.stories.d.ts",
"dist/../build/types/src/core/components/image-zoom/image-zoom.d.ts": "/dist/../build/types/src/core/components/image-zoom/image-zoom.d.ts",
+ "dist/../build/types/src/core/components/pagination/inline-textfield/inline-textfield.stories.d.ts": "/dist/../build/types/src/core/components/pagination/inline-textfield/inline-textfield.stories.d.ts",
"dist/../build/types/src/core/modules/asset/editor/folder/tab-manager/tabs/preview/flex-container-view.d.ts": "/dist/../build/types/src/core/modules/asset/editor/folder/tab-manager/tabs/preview/flex-container-view.d.ts",
"dist/../build/types/src/core/app/plugin-system/plugin-system.d.ts.map": "/dist/../build/types/src/core/app/plugin-system/plugin-system.d.ts.map",
"dist/../build/types/src/core/modules/asset/editor/editor-container.stories.d.ts": "/dist/../build/types/src/core/modules/asset/editor/editor-container.stories.d.ts",
@@ -152,6 +155,7 @@
"dist/../build/types/src/core/components/background/background.styles.d.ts": "/dist/../build/types/src/core/components/background/background.styles.d.ts",
"dist/../build/types/src/core/components/pagination/pagination.styles.d.ts": "/dist/../build/types/src/core/components/pagination/pagination.styles.d.ts",
"dist/../build/types/src/core/modules/widget-manager/title/tab-title-view.styles.d.ts": "/dist/../build/types/src/core/modules/widget-manager/title/tab-title-view.styles.d.ts",
+ "dist/../build/types/src/core/components/pagination/size-changer/size-changer.styles.d.ts": "/dist/../build/types/src/core/components/pagination/size-changer/size-changer.styles.d.ts",
"dist/../build/types/src/core/main.d.ts": "/dist/../build/types/src/core/main.d.ts",
"dist/../build/types/src/core/components/modal/file-list/file-list.styles.d.ts": "/dist/../build/types/src/core/components/modal/file-list/file-list.styles.d.ts",
"dist/../build/types/src/core/components/modal/footer/modal-footer.styles.d.ts": "/dist/../build/types/src/core/components/modal/footer/modal-footer.styles.d.ts",
@@ -212,7 +216,6 @@
"dist/../build/types/src/core/modules/widget-manager/hooks/use-is-active-main-widget.d.ts": "/dist/../build/types/src/core/modules/widget-manager/hooks/use-is-active-main-widget.d.ts",
"dist/../build/types/src/core/components/logo/logo.d.ts": "/dist/../build/types/src/core/components/logo/logo.d.ts",
"dist/../build/types/src/core/app/module-system/module-system.d.ts.map": "/dist/../build/types/src/core/app/module-system/module-system.d.ts.map",
- "dist/../build/types/src/core/components/pagination/pagination.stories.d.ts": "/dist/../build/types/src/core/components/pagination/pagination.stories.d.ts",
"dist/../build/types/src/core/components/pagination/inline-textfield/inline-textfield.d.ts.map": "/dist/../build/types/src/core/components/pagination/inline-textfield/inline-textfield.d.ts.map",
"dist/../build/types/test-utils/test-utils.d.ts.map": "/dist/../build/types/test-utils/test-utils.d.ts.map",
"dist/../build/types/src/core/app/i18n/index.d.ts": "/dist/../build/types/src/core/app/i18n/index.d.ts",
@@ -266,8 +269,11 @@
"dist/../build/types/src/core/components/modal/footer/modal-footer.d.ts.map": "/dist/../build/types/src/core/components/modal/footer/modal-footer.d.ts.map",
"dist/../build/types/src/core/components/editor-tabs/editor-tabs.stories.d.ts.map": "/dist/../build/types/src/core/components/editor-tabs/editor-tabs.stories.d.ts.map",
"dist/../build/types/src/core/components/progressbar/progressbar.stories.d.ts.map": "/dist/../build/types/src/core/components/progressbar/progressbar.stories.d.ts.map",
+ "dist/../build/types/src/core/components/pagination/pagination.stories.d.ts.map": "/dist/../build/types/src/core/components/pagination/pagination.stories.d.ts.map",
"dist/../build/types/src/core/modules/app/translations/translations-loader-container.d.ts.map": "/dist/../build/types/src/core/modules/app/translations/translations-loader-container.d.ts.map",
+ "dist/../build/types/src/core/components/pagination/inline-textfield/inline-textfield.stories.d.ts.map": "/dist/../build/types/src/core/components/pagination/inline-textfield/inline-textfield.stories.d.ts.map",
"dist/../build/types/src/core/modules/widget-manager/widget-manager-container.stories.d.ts.map": "/dist/../build/types/src/core/modules/widget-manager/widget-manager-container.stories.d.ts.map",
+ "dist/../build/types/src/core/components/pagination/size-changer/size-changer.stories.d.ts.map": "/dist/../build/types/src/core/components/pagination/size-changer/size-changer.stories.d.ts.map",
"dist/../build/types/src/core/components/sidebar/sidebar.stories.d.ts.map": "/dist/../build/types/src/core/components/sidebar/sidebar.stories.d.ts.map",
"dist/../build/types/src/core/modules/widget-manager/utils/widget-manager-factory.d.ts.map": "/dist/../build/types/src/core/modules/widget-manager/utils/widget-manager-factory.d.ts.map",
"dist/../build/types/src/core/modules/asset/tree/search/search-container.d.ts.map": "/dist/../build/types/src/core/modules/asset/tree/search/search-container.d.ts.map",
@@ -283,11 +289,8 @@
"dist/../build/types/src/core/bootstrap.d.ts.map": "/dist/../build/types/src/core/bootstrap.d.ts.map",
"dist/../build/types/src/core/components/formatted-date/formatted-date.d.ts.map": "/dist/../build/types/src/core/components/formatted-date/formatted-date.d.ts.map",
"dist/../build/types/src/core/components/pimcore-image/pimcore-image.d.ts.map": "/dist/../build/types/src/core/components/pimcore-image/pimcore-image.d.ts.map",
- "dist/../build/types/src/core/components/pagination/pagination.stories.d.ts.map": "/dist/../build/types/src/core/components/pagination/pagination.stories.d.ts.map",
"dist/../build/types/src/core/modules/widget-manager/widget-manager-inner-container.d.ts.map": "/dist/../build/types/src/core/modules/widget-manager/widget-manager-inner-container.d.ts.map",
- "dist/../build/types/src/core/components/pagination/inline-textfield/inline-textfield.stories.d.ts.map": "/dist/../build/types/src/core/components/pagination/inline-textfield/inline-textfield.stories.d.ts.map",
"dist/../build/types/src/core/modules/asset/editor/folder/tab-manager/tabs/preview/preview-container.d.ts.map": "/dist/../build/types/src/core/modules/asset/editor/folder/tab-manager/tabs/preview/preview-container.d.ts.map",
- "dist/../build/types/src/core/components/pagination/size-changer/size-changer.stories.d.ts.map": "/dist/../build/types/src/core/components/pagination/size-changer/size-changer.stories.d.ts.map",
"dist/../build/types/src/core/components/pimcore-image/pimcore-image.stories.d.ts.map": "/dist/../build/types/src/core/components/pimcore-image/pimcore-image.stories.d.ts.map",
"dist/../build/types/src/core/modules/asset/tree/tree-container.stories.d.ts.map": "/dist/../build/types/src/core/modules/asset/tree/tree-container.stories.d.ts.map",
"dist/../build/types/src/core/modules/asset/editor/folder/tab-manager/tabs/list/list-container.d.ts.map": "/dist/../build/types/src/core/modules/asset/editor/folder/tab-manager/tabs/list/list-container.d.ts.map",
@@ -297,7 +300,6 @@
"dist/../build/types/src/core/modules/example/containers/asset-container.d.ts.map": "/dist/../build/types/src/core/modules/example/containers/asset-container.d.ts.map",
"dist/../build/types/src/core/modules/app/global-provider.d.ts.map": "/dist/../build/types/src/core/modules/app/global-provider.d.ts.map",
"dist/../build/types/src/core/modules/widget-manager/widget-manager-view.styles.d.ts.map": "/dist/../build/types/src/core/modules/widget-manager/widget-manager-view.styles.d.ts.map",
- "dist/../build/types/src/core/components/pagination/size-changer/size-changer.stories.d.ts": "/dist/../build/types/src/core/components/pagination/size-changer/size-changer.stories.d.ts",
"dist/../build/types/src/core/components/message/message.stories.d.ts.map": "/dist/../build/types/src/core/components/message/message.stories.d.ts.map",
"dist/../build/types/src/core/components/example/example.stories.d.ts.map": "/dist/../build/types/src/core/components/example/example.stories.d.ts.map",
"dist/../build/types/src/core/modules/asset/editor/image/tab-manager/tabs/preview/sidebar/tabs/details/details.d.ts.map": "/dist/../build/types/src/core/modules/asset/editor/image/tab-manager/tabs/preview/sidebar/tabs/details/details.d.ts.map",
@@ -322,7 +324,6 @@
"dist/../build/types/src/core/modules/asset/editor/image/tab-manager/tabs/workflow-container.d.ts.map": "/dist/../build/types/src/core/modules/asset/editor/image/tab-manager/tabs/workflow-container.d.ts.map",
"dist/../build/types/src/core/modules/asset/editor/image/tab-manager/tabs/preview/sidebar/index.d.ts.map": "/dist/../build/types/src/core/modules/asset/editor/image/tab-manager/tabs/preview/sidebar/index.d.ts.map",
"dist/../build/types/src/core/modules/asset/editor/folder/tab-manager/folder-tab-manager.d.ts.map": "/dist/../build/types/src/core/modules/asset/editor/folder/tab-manager/folder-tab-manager.d.ts.map",
- "dist/../build/types/src/core/components/pagination/inline-textfield/inline-textfield.stories.d.ts": "/dist/../build/types/src/core/components/pagination/inline-textfield/inline-textfield.stories.d.ts",
"dist/../build/types/src/core/modules/asset/editor/image/tab-manager/tabs/edit-container.d.ts.map": "/dist/../build/types/src/core/modules/asset/editor/image/tab-manager/tabs/edit-container.d.ts.map",
"dist/../build/types/src/core/modules/asset/editor/image/tab-manager/tabs/preview/sidebar/tabs/details/details.styles.d.ts.map": "/dist/../build/types/src/core/modules/asset/editor/image/tab-manager/tabs/preview/sidebar/tabs/details/details.styles.d.ts.map",
"dist/../build/types/src/core/modules/asset/editor/image/tab-manager/tabs/tags-container.d.ts.map": "/dist/../build/types/src/core/modules/asset/editor/image/tab-manager/tabs/tags-container.d.ts.map",
@@ -352,14 +353,15 @@
"dist/../build/types/src/core/modules/element/editor/layouts/tabs-toolbar-view.styles.d.ts.map": "/dist/../build/types/src/core/modules/element/editor/layouts/tabs-toolbar-view.styles.d.ts.map",
"dist/../build/types/src/core/modules/example/containers/example.d.ts.map": "/dist/../build/types/src/core/modules/example/containers/example.d.ts.map",
"dist/../build/types/src/core/modules/app/base-layout/right-sidebar-view.styles.d.ts.map": "/dist/../build/types/src/core/modules/app/base-layout/right-sidebar-view.styles.d.ts.map",
+ "dist/../build/types/src/core/components/pagination/size-changer/size-changer.styles.d.ts.map": "/dist/../build/types/src/core/components/pagination/size-changer/size-changer.styles.d.ts.map",
"dist/../build/types/src/core/modules/app/base-layout/left-sidebar-view.styles.d.ts.map": "/dist/../build/types/src/core/modules/app/base-layout/left-sidebar-view.styles.d.ts.map",
"dist/../build/types/src/core/modules/widget-manager/widget/title/title-view.styles.d.ts.map": "/dist/../build/types/src/core/modules/widget-manager/widget/title/title-view.styles.d.ts.map",
"dist/../build/types/src/core/modules/widget-manager/title/tab-title-view.styles.d.ts.map": "/dist/../build/types/src/core/modules/widget-manager/title/tab-title-view.styles.d.ts.map",
+ "dist/../build/types/src/core/components/dropdown-menu/dropdown-menu.styles.d.ts.map": "/dist/../build/types/src/core/components/dropdown-menu/dropdown-menu.styles.d.ts.map",
"dist/../build/types/src/core/modules/app/base-layout/base-layout-view.styles.d.ts.map": "/dist/../build/types/src/core/modules/app/base-layout/base-layout-view.styles.d.ts.map",
"dist/../build/types/src/core/modules/app/app-view.d.ts.map": "/dist/../build/types/src/core/modules/app/app-view.d.ts.map",
"dist/../build/types/src/core/components/grid/columns/views/image-view.styles.d.ts.map": "/dist/../build/types/src/core/components/grid/columns/views/image-view.styles.d.ts.map",
"dist/../build/types/src/core/modules/widget-manager/widget/widget-view.styles.d.ts.map": "/dist/../build/types/src/core/modules/widget-manager/widget/widget-view.styles.d.ts.map",
- "dist/../build/types/src/core/components/dropdown-menu/dropdown-menu.styles.d.ts.map": "/dist/../build/types/src/core/components/dropdown-menu/dropdown-menu.styles.d.ts.map",
"dist/../build/types/src/core/components/pimcore-image/pimcore-image.styles.d.ts.map": "/dist/../build/types/src/core/components/pimcore-image/pimcore-image.styles.d.ts.map",
"dist/../build/types/src/core/components/logo/logo.d.ts.map": "/dist/../build/types/src/core/components/logo/logo.d.ts.map",
"dist/../build/types/src/core/components/modal/footer/modal-footer.styles.d.ts.map": "/dist/../build/types/src/core/components/modal/footer/modal-footer.styles.d.ts.map",
@@ -373,7 +375,6 @@
"dist/../build/types/src/core/components/tree/list/tree-list.styles.d.ts.map": "/dist/../build/types/src/core/components/tree/list/tree-list.styles.d.ts.map",
"dist/../build/types/src/core/components/background/background.styles.d.ts.map": "/dist/../build/types/src/core/components/background/background.styles.d.ts.map",
"dist/../build/types/src/core/components/grid/resizer/resizer.styles.d.ts.map": "/dist/../build/types/src/core/components/grid/resizer/resizer.styles.d.ts.map",
- "dist/../build/types/src/core/components/pagination/size-changer/size-changer.styles.d.ts.map": "/dist/../build/types/src/core/components/pagination/size-changer/size-changer.styles.d.ts.map",
"dist/../build/types/src/core/components/tree/node/tree-node.styles.d.ts.map": "/dist/../build/types/src/core/components/tree/node/tree-node.styles.d.ts.map",
"dist/../build/types/src/core/components/toolbar/toolbar.styles.d.ts.map": "/dist/../build/types/src/core/components/toolbar/toolbar.styles.d.ts.map",
"dist/../build/types/src/core/components/example/example.styles.d.ts.map": "/dist/../build/types/src/core/components/example/example.styles.d.ts.map",
@@ -388,7 +389,6 @@
"dist/../build/types/src/core/app/config/services/index.d.ts.map": "/dist/../build/types/src/core/app/config/services/index.d.ts.map",
"dist/../build/types/src/core/app/api/pimcore/index.d.ts.map": "/dist/../build/types/src/core/app/api/pimcore/index.d.ts.map",
"dist/../build/types/src/core/modules/asset/editor/index.d.ts.map": "/dist/../build/types/src/core/modules/asset/editor/index.d.ts.map",
- "dist/../build/types/src/core/components/pagination/size-changer/size-changer.styles.d.ts": "/dist/../build/types/src/core/components/pagination/size-changer/size-changer.styles.d.ts",
"dist/../build/types/src/core/modules/asset/index.d.ts.map": "/dist/../build/types/src/core/modules/asset/index.d.ts.map",
"dist/../build/types/src/core/modules/asset/editor/folder/index.d.ts.map": "/dist/../build/types/src/core/modules/asset/editor/folder/index.d.ts.map",
"dist/../build/types/test-utils/jest-setup.d.ts.map": "/dist/../build/types/test-utils/jest-setup.d.ts.map",
diff --git a/assets/js/src/core/components/dropdown-menu/dropdown-menu.styles.tsx b/assets/js/src/core/components/dropdown-menu/dropdown-menu.styles.tsx
index 82be8d91b..1c86e03ad 100644
--- a/assets/js/src/core/components/dropdown-menu/dropdown-menu.styles.tsx
+++ b/assets/js/src/core/components/dropdown-menu/dropdown-menu.styles.tsx
@@ -15,18 +15,39 @@ import { createStyles } from 'antd-style'
export const useStyle = createStyles(({ token, css }) => {
return {
- 'menu-icon': css`
+ 'menu-icon-left': css`
.anticon& {
vertical-align: middle;
margin-right: ${token.marginXS}px;
}
`,
+
+ 'menu-icon': css`
+ .anticon& {
+ vertical-align: middle;
+ }
+ `,
+
label: css`
margin-right: ${token.marginXS}px;
`,
+
'flexbox-start-end': css`
- display: flex;
- justify-content: space-between;
- `
+ display: flex;
+ justify-content: space-between;
+ `,
+
+ flexbox: css`
+ display: flex;
+ `,
+
+ 'left-area': css`
+ margin-right: 22px;
+ `,
+
+ 'icon-placeholder': css`
+ width: 16px;
+ height: 16px;
+ `
}
}, { hashPriority: 'low' })
diff --git a/assets/js/src/core/components/dropdown-menu/dropdown-menu.tsx b/assets/js/src/core/components/dropdown-menu/dropdown-menu.tsx
index 800f1691c..f5d2d4c2f 100644
--- a/assets/js/src/core/components/dropdown-menu/dropdown-menu.tsx
+++ b/assets/js/src/core/components/dropdown-menu/dropdown-menu.tsx
@@ -47,6 +47,10 @@ export const DropdownMenu = ({
): React.JSX.Element => {
const items: MenuProps['items'] = []
+ const menuHasAnyIconRight = dropdownItems.find((item: DropdownMenuItemProps): boolean =>
+ item.iconRight !== null && item.iconRight !== undefined
+ ) !== undefined
+
dropdownItems.forEach((item: DropdownMenuItemProps, index: number): void => {
items.push(
{
@@ -55,6 +59,7 @@ export const DropdownMenu = ({