Merge branch '2025.4' into 2026.1

Author: Corepex

assets/js/src/core/components/form/localisation/localized-fields/form-item/types/form-control-with-element-context.tsx

@@ -62,7 +62,7 @@ export const FormControlWithElementContext = ({ children, ...props }: KeyedFormI
     <Component
       { ...Child.props }
       { ...props }
-      disabled={ props.disabled !== true ? isDisabled : false }
+      disabled={ Child.props.disabled === true || (props.disabled !== true ? isDisabled : false) }
     />
   ), [Child, props])
 }

assets/js/src/core/components/select/select.styles.ts

@@ -8,6 +8,7 @@
  *  @license    Pimcore Open Core License (POCL)
  */
 
+/* eslint-disable max-lines */
 import { createStyles } from 'antd-style'
 import { isEmptyValue } from '@Pimcore/utils/type-utils'
 import { type SelectTheme } from './select'
@@ -167,7 +168,21 @@ export const useStyles = createStyles(({ css, token }, props: StylesProps) => {
             padding: 2px ${token.controlPaddingHorizontal}px 2px ${token.paddingXXS}px !important;
           }
         }
-        
+
+        // The !important padding above skews Ant Design's JS mirror width measurement,
+        // causing the search input to clip typed text. flex: 1 (= flex: 1 1 0%) overrides
+        // the JS-set width via flex-basis precedence and grows to fill the remaining row
+        // space without wrapping to a new line (unlike flex-basis: 100%).
+        .ant-select-selection-overflow-item-suffix {
+          flex: 1 !important;
+        }
+        .ant-select-selection-search {
+          width: 100% !important;
+        }
+        .ant-select-selection-search-input {
+          width: 100% !important;
+        }
+
         &:hover {
           .ant-select-selection-item {
             .ant-select-selection-item-content {

assets/js/src/core/modules/element/dynamic-types/definitions/objects/data-related/components/many-to-many-object-relation/components/combo-field/combo-field-ui.styles.ts

@@ -0,0 +1,25 @@
+/**
+ * This source file is available under the terms of the
+ * Pimcore Open Core License (POCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (https://www.pimcore.com)
+ *  @license    Pimcore Open Core License (POCL)
+ */
+
+import { createStyles } from 'antd-style'
+
+export const useStyles = createStyles(({ css, token }) => ({
+  loadingRow: css`
+    padding: ${token.paddingXXS}px ${token.paddingSM}px;
+  `,
+
+  dropdownFooter: css`
+    padding: ${token.paddingXXS}px ${token.paddingSM}px;
+    font-size: ${token.fontSizeSM}px;
+    color: ${token.colorTextDescription};
+    border-top: 1px solid ${token.colorBorderSecondary};
+    text-align: right;
+  `
+}))

assets/js/src/core/modules/element/dynamic-types/definitions/objects/data-related/components/many-to-many-object-relation/components/combo-field/combo-field-ui.tsx

@@ -0,0 +1,56 @@
+/**
+ * This source file is available under the terms of the
+ * Pimcore Open Core License (POCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (https://www.pimcore.com)
+ *  @license    Pimcore Open Core License (POCL)
+ */
+
+import React from 'react'
+import { Skeleton } from 'antd'
+import { useTranslation } from 'react-i18next'
+import { Flex } from '@Pimcore/components/flex/flex'
+import { useStyles } from './combo-field-ui.styles'
+
+const SKELETON_ROW_KEYS = ['skeleton-0', 'skeleton-1', 'skeleton-2']
+
+export const LoadingRows = (): React.JSX.Element => {
+  const { styles } = useStyles()
+  return (
+    <>
+      { SKELETON_ROW_KEYS.map(key => (
+        <Flex
+          align="center"
+          className={ styles.loadingRow }
+          key={ key }
+        >
+          <Skeleton.Input
+            active
+            block
+            size="small"
+          />
+        </Flex>
+      )) }
+    </>
+  )
+}
+
+interface DropdownFooterProps {
+  loaded: number
+  total: number | undefined
+  allLoaded: boolean
+  backgroundMode: boolean
+}
+
+export const DropdownFooter = ({ loaded, total, allLoaded, backgroundMode }: DropdownFooterProps): React.JSX.Element | null => {
+  const { t } = useTranslation()
+  const { styles } = useStyles()
+  if (loaded === 0 || allLoaded || backgroundMode || total === undefined) return null
+  return (
+    <div className={ styles.dropdownFooter }>
+      { t('pagination.showing-x-of-y', { loaded, total }) }
+    </div>
+  )
+}

assets/js/src/core/modules/element/dynamic-types/definitions/objects/data-related/components/many-to-many-object-relation/components/combo-field/combo-field-utils.ts

@@ -0,0 +1,58 @@
+/**
+ * This source file is available under the terms of the
+ * Pimcore Open Core License (POCL)
+ * Full copyright and license information is available in
+ * LICENSE.md which is distributed with this source code.
+ *
+ *  @copyright  Copyright (c) Pimcore GmbH (https://www.pimcore.com)
+ *  @license    Pimcore Open Core License (POCL)
+ */
+
+import { isArray, isEmpty, isNil, isPlainObject, isString } from 'lodash'
+import { type DataObjectGetSearchApiResponse } from '@Pimcore/modules/search/search-api-slice.gen'
+import { type ManyToManyRelationValueItem } from '@Pimcore/components/many-to-many-relation/hooks/use-value'
+import { type VisibleFieldDefinition } from '../../many-to-many-object-relation'
+
+export type SearchItem = NonNullable<DataObjectGetSearchApiResponse['items']>[number]
+
+const isBlankColumnValue = (v: unknown): boolean => {
+  if (isNil(v)) return true
+  if (isString(v)) return isEmpty(v) || v === 'null'
+  if (isArray(v) || isPlainObject(v)) return isEmpty(v)
+  return false
+}
+
+export const buildLabel = (item: SearchItem, resolvedVisibleDefs: VisibleFieldDefinition[]): string => {
+  const fullpath = item.columns?.find(c => c.key === 'fullpath')?.value as string ?? String(item.id)
+  if (resolvedVisibleDefs.length === 0) return fullpath
+
+  return resolvedVisibleDefs
+    .map(fd => {
+      const v = item.columns?.find(c => c.key === fd.key)?.value
+      if (isBlankColumnValue(v)) return '-'
+      return isArray(v) || isPlainObject(v) ? JSON.stringify(v) : String(v)
+    })
+    .join(', ')
+}
+
+export const processItems = (
+  items: SearchItem[],
+  resolvedVisibleDefs: VisibleFieldDefinition[],
+  itemMap: Map<number, ManyToManyRelationValueItem>
+): Map<number, string> => {
+  const newLabels = new Map<number, string>()
+  items.forEach(item => {
+    if (item.id === undefined) return
+    const fullpath = item.columns?.find(c => c.key === 'fullpath')?.value as string ?? String(item.id)
+    const classname = item.columns?.find(c => c.key === 'classname')?.value as string ?? 'object'
+    itemMap.set(item.id, {
+      id: item.id,
+      type: 'object',
+      subtype: classname,
+      fullPath: fullpath,
+      isPublished: null
+    })
+    newLabels.set(item.id, buildLabel(item, resolvedVisibleDefs))
+  })
+  return newLabels
+}