Conversation
|
Hello, I'm the AEM Code Sync Bot and I will run some actions to deploy your branch.
|
|
|
||
| canvasBus.mergeConflictsState.subscribe((detail) => { | ||
| header.hasUnresolvedMergeConflicts = detail?.hasMergeConflicts ?? false; | ||
| if (header.hasUnresolvedMergeConflicts) header.setEditorView('content'); |
There was a problem hiding this comment.
Same here as well, editorview should only be updated via the canvasbus
| colorOverlay.style.display = 'block'; | ||
| colorOverlay.className = 'loc-tabbed-color-overlay diff-bg-upstream'; | ||
| } else if (targetTab === 'diff') { | ||
| colorOverlay.style.display = 'none'; |
There was a problem hiding this comment.
Would be good to do this via a class instead
| host.style.setProperty('--diff-label-upstream', `'${labels.upstream}'`); | ||
| } | ||
|
|
||
| function getDiffHost(view) { |
There was a problem hiding this comment.
Think this still has the same underlying shape as earlier though. Would it be worth computing the host once when each editor initializes and passing it down explicitly instead - the same way onMergeConflictsChange already gets threaded through initProse? EW already has this/this.shadowRoot available before initProse() is called, so it wouldn't need to be derived from view at all.
| super.disconnectedCallback(); | ||
| } | ||
|
|
||
| _reloadIframe() { |
There was a problem hiding this comment.
Why do we do this explicitly here? Also this raises another question - since merge conflicts are contained to doc mode and layout mode is disabled until conflicts are resolved, why do we need explicit reload and checks in wyswyg mode? Wouldn't resolving conflicts cause an update within the doc and wouldn't this in turn by default update the wyswyg mode content?
There was a problem hiding this comment.
It is redundant. Removed it.
4 participants
Description
Currently, the file diff view is only supported in the DA editor. Implemented the same feature for EW as well. Layout and split views will be disabled when a file has merge conflicts to prevent a broken layout for content authors.
Related Issue
#1144
Motivation and Context
How Has This Been Tested?
Screenshots (if appropriate):
Types of changes
Checklist: