Skip to content

[Documents] Keep EditableOverlay root stable to avoid duplicated editables on highlight #3812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ValeriaMaltseva wants to merge 5 commits into
base: 2025.4
Choose a base branch
from
Open

[Documents] Keep EditableOverlay root stable to avoid duplicated editables on highlight #3812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4eaf73e
fixed the bug
ValeriaMaltseva Jun 26, 2026
df32d4b
Automatic frontend build
ValeriaMaltseva Jun 26, 2026
90fde8a
merged changes from the main branch
ValeriaMaltseva Jun 30, 2026
5e9e232
Automatic frontend build
ValeriaMaltseva Jun 30, 2026
d66a25b
Merge branch '2025.4' into 3390-fix-bug
Copilot Jun 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
11 changes: 1 addition & 10 deletions ...amic-types/definitions/document/editable/components/editable-overlay/editable-overlay.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* @license Pimcore Open Core License (POCL)
*/

import React, { useRef } from 'react'
import React from 'react'
import { Dropdown } from 'antd'
import cn from 'classnames'
import { Icon } from '@Pimcore/components/icon/icon'
Expand Down Expand Up @@ -48,19 +48,10 @@ export const EditableOverlay = ({
const highlightEditables = useHighlightEditables()
const { inheritanceMenuItems, inheritanceTooltip } = useInheritanceMenu({ onOverwrite })

const wasEverInheritedRef = useRef(isInherited)

@markus-moser markus-moser Jun 29, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm... But isn't then the inheritance overlay case also editable? I guess we need to find another solution?

if (isInherited && !wasEverInheritedRef.current) {
wasEverInheritedRef.current = true
}

if (isNil(children)) {
return null
}

if (!wasEverInheritedRef.current && !highlightEditables) {
return <>{children}</>
}

return (
<div
className={ cn(
Expand Down
23 changes: 23 additions & 0 deletions public/build/16241ae4-f90e-44fc-b057-b86e0e2ee230/entrypoints.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions public/build/16241ae4-f90e-44fc-b057-b86e0e2ee230/exposeRemote.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions public/build/16241ae4-f90e-44fc-b057-b86e0e2ee230/index.html
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

807 changes: 807 additions & 0 deletions public/build/16241ae4-f90e-44fc-b057-b86e0e2ee230/manifest.json
View file
Open in desktop

Large diffs are not rendered by default.

Loading