Skip to content

fix(google-docs): improve highlight styling and consistency across view/edit mode [INTEG-3861] #10949

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

Merged
Harika Kondur (harikakondur) merged 9 commits into from
Apr 29, 2026
Merged

fix(google-docs): improve highlight styling and consistency across view/edit mode [INTEG-3861] #10949

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2e29c62
Apply edit-mode highlight and hover styles to view mode
harikakondur Apr 29, 2026
2dfca97
fix highlight and border styles in mapping components for consistency
harikakondur Apr 29, 2026
fbf67d0
Hide image edit button in view mode
harikakondur Apr 29, 2026
0becd9d
Show inline span outlines for partial text mappings
harikakondur Apr 29, 2026
6733e3a
Use background colour alone for doc highlight treatment
harikakondur Apr 29, 2026
3dab529
Align image highlight hover treatment with text spans
harikakondur Apr 29, 2026
f32c8e1
add hovering tip
harikakondur Apr 29, 2026
8a01b8f
fix missing import
harikakondur Apr 29, 2026
67cc2c6
Remove unused isViewMode prop from TableRenderer component
harikakondur Apr 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/google-docs/src/locations/Page/components/review/mapping/MappingCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export const MappingCard = ({
insetInlineStart: 0,
insetInlineEnd: 0,
top,
border: `${isHovered ? 2 : 1}px solid ${isHovered ? tokens.green600 : tokens.green500}`,
border: `${isHovered ? 2 : 1}px solid`,
borderRadius: tokens.borderRadiusMedium,
padding: tokens.spacing2Xs,
backgroundColor: tokens.green100,
Expand Down
184 changes: 52 additions & 132 deletions apps/google-docs/src/locations/Page/components/review/mapping/MappingView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import type {
TableTextSourceRef,
} from '@types';
import { isBlockImageSourceRef, isTableImageSourceRef, isTableTextSourceRef } from '@types';
import { FileTextIcon } from '@contentful/f36-icons';
import { FileTextIcon, LightbulbIcon } from '@contentful/f36-icons';
import { useReviewTextSelection } from '@hooks/useReviewTextSelection';
import { getEntryTitleFromFieldMappings } from '../../../../../utils/getEntryTitle';
import { resolveMarkerOffsets } from './resolveMappingCardOffsets';
Expand All @@ -42,7 +42,7 @@ import { buildSourceRefKey } from './sourceRefUtils';
import { MappingEntryCards } from './MappingEntryCards';
import { NormalizedDocumentSection } from './NormalizedDocumentSection';
import { buildMappingDisplayGroups } from './buildMappingDisplayGroups';
import { type ViewMappingCardEntry } from './ViewMappingRail';
import { ViewMappingRail, type ViewMappingCardEntry } from './ViewMappingRail';
import { ViewMappingCard } from './ViewMappingCard';
Copy link

Copilot AI Apr 29, 2026

Choose a reason for hiding this comment

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

ViewMappingCard is imported but no longer used after switching view mode rendering to ViewMappingRail. This will fail linting/TS checks in many setups; remove the unused import (or use it directly if still needed).

Suggested change
import { ViewMappingCard } from './ViewMappingCard';

Copilot uses AI. Check for mistakes.
import {
applyImageExclusionToEntryBlockGraph,
Expand Down Expand Up @@ -110,12 +110,6 @@ function rangeIntersectsNode(range: Range, node: Node): boolean {
}
}

const EMPTY_HIGHLIGHT_INDEX: MappingHighlightIndex = {
blockHighlights: {},
tablePartHighlights: {},
tableHighlights: {},
};

export const MappingView = ({
payload,
entryBlockGraph,
Expand Down Expand Up @@ -763,30 +757,40 @@ export const MappingView = ({
gap="spacingS"
style={{ marginTop: tokens.spacingM }}>
{selectedEntryRow && (
<Box
<Flex
gap="spacingM"
alignItems="flex-end"
style={{
borderBottom: `1px solid ${tokens.gray200}`,
paddingBottom: tokens.spacingXs,
}}>
<Text
as="p"
fontSize="fontSizeS"
fontWeight="fontWeightMedium"
marginBottom="spacing2Xs">
Currently viewing:
</Text>
<Text as="p" marginBottom="none">
<Text as="span" fontWeight="fontWeightDemiBold">
{selectedEntryRow.contentTypeName}
<Box style={{ flex: 2 }}>
<Text
as="p"
fontSize="fontSizeS"
fontWeight="fontWeightMedium"
marginBottom="spacing2Xs">
Currently viewing:
</Text>
{selectedEntryRow.entryTitle ? (
<Text as="span" fontColor="gray600">
{' '}
({selectedEntryRow.entryTitle})
<Text as="p" marginBottom="none">
<Text as="span" fontWeight="fontWeightDemiBold">
{selectedEntryRow.contentTypeName}
</Text>
) : null}
</Text>
</Box>
{selectedEntryRow.entryTitle ? (
<Text as="span" fontColor="gray600">
{' '}
({selectedEntryRow.entryTitle})
</Text>
) : null}
</Text>
</Box>
<Flex alignItems="center" gap="spacing2Xs" style={{ flex: '0 0 280px', maxWidth: 280 }}>
<LightbulbIcon size="tiny" style={{ color: tokens.gray600, flexShrink: 0 }} />
<Text as="span" fontSize="fontSizeS" fontColor="gray600">
Tip: hover over a card to highlight its content
</Text>
</Flex>
</Flex>
)}
{tabs.map((tab) => (
<Box key={tab.id}>
Expand All @@ -799,98 +803,9 @@ export const MappingView = ({

<Flex flexDirection="column" gap="spacingS">
{(groupsByTab[tab.id] ?? []).map((group) => {
const activeHighlightIndex = isViewMode ? EMPTY_HIGHLIGHT_INDEX : highlightIndex;
const isGroupHovered = group.mappingCards.some((card) =>
card.mappingKeys.some((key) => hoveredMappingKeys.includes(key))
);
const activeHighlightIndex = highlightIndex;
const showSurface = group.showGroupedSurface;

if (isViewMode) {
const viewCards = viewCardsByGroup[group.id] ?? [];
const isTableGroup = group.segments.every((s) => s.kind === 'table');
return (
<Box
key={group.id}
data-testid={`display-group-layout-${group.id}`}
ref={setGroupLayoutRef(group.id)}>
<Flex gap="spacingM" alignItems="flex-start">
<Box
style={{ flex: 2, position: 'relative' }}
onMouseEnter={
!isTableGroup && viewCards.length === 1
? () => setHoveredMappingKeys(viewCards[0]!.mappingKeys)
: undefined
}
onMouseLeave={
!isTableGroup ? () => setHoveredMappingKeys([]) : undefined
}>
<Flex
flexDirection="column"
gap="spacing2Xs"
style={{ padding: tokens.spacing2Xs }}>
{group.segments.map((segment) => (
<NormalizedDocumentSection
key={segment.id}
segment={segment}
highlightIndex={activeHighlightIndex}
fullHighlightIndex={highlightIndex}
imageById={imageById}
listMarkers={listMarkers}
excludedSourceRefs={entryBlockGraph.excludedSourceRefs}
selectedEntryIndex={selectedEntryIndex}
hoveredMappingKeys={hoveredMappingKeys}
onSetHoveredMappingKeys={setHoveredMappingKeys}
isViewMode={true}
onEditImage={handleEditImage}
/>
))}
</Flex>
{!isTableGroup &&
viewCards.map((card) => {
const isCardHovered = card.mappingKeys.some((k) =>
hoveredMappingKeys.includes(k)
);
return (
<Box
key={card.key}
style={{
position: 'absolute',
inset: 0,
border: `${isCardHovered ? 2 : 1}px solid ${
isCardHovered ? tokens.green600 : tokens.green500
}`,
borderRadius: tokens.borderRadiusMedium,
pointerEvents: 'none',
transition: 'border-color 120ms ease, border-width 120ms ease',
}}
/>
);
})}
</Box>
<Flex
flexDirection="column"
gap="spacing2Xs"
style={{ flex: '0 0 280px', maxWidth: 280 }}>
{viewCards.map((card) => {
const isCardHovered = card.mappingKeys.some((k) =>
hoveredMappingKeys.includes(k)
);
return (
<ViewMappingCard
key={card.key}
card={card}
isHovered={isCardHovered}
onMouseEnter={() => setHoveredMappingKeys(card.mappingKeys)}
onMouseLeave={() => setHoveredMappingKeys([])}
/>
);
})}
</Flex>
</Flex>
</Box>
);
}

return (
<Box key={group.id}>
<Flex
Expand All @@ -902,15 +817,10 @@ export const MappingView = ({
{showSurface ? (
<Box
data-testid={`mapping-group-surface-${group.id}`}
data-hovered={isGroupHovered ? 'true' : 'false'}
style={{
border: `${isGroupHovered ? 2 : 1}px solid ${
isGroupHovered ? tokens.green600 : tokens.green500
}`,
borderRadius: tokens.borderRadiusMedium,
backgroundColor: tokens.green100,
padding: tokens.spacing2Xs,
transition: 'border-color 120ms ease, border-width 120ms ease',
}}>
<Flex flexDirection="column" gap="spacing2Xs">
{group.segments.map((segment) => (
Expand All @@ -924,7 +834,7 @@ export const MappingView = ({
selectedEntryIndex={selectedEntryIndex}
hoveredMappingKeys={hoveredMappingKeys}
onSetHoveredMappingKeys={setHoveredMappingKeys}
onEditImage={handleEditImage}
onEditImage={isViewMode ? undefined : handleEditImage}
/>
))}
</Flex>
Expand All @@ -942,21 +852,31 @@ export const MappingView = ({
selectedEntryIndex={selectedEntryIndex}
hoveredMappingKeys={hoveredMappingKeys}
onSetHoveredMappingKeys={setHoveredMappingKeys}
onEditImage={handleEditImage}
onEditImage={isViewMode ? undefined : handleEditImage}
/>
))}
</Flex>
)}
</Box>
<MappingEntryCards
groupId={group.id}
mappingCards={group.mappingCards}
cardOffsetsByGroup={cardOffsetsByGroup}
cardHeightsByGroup={cardHeightsByGroup}
hoveredMappingKeys={hoveredMappingKeys}
onSetHoveredMappingKeys={setHoveredMappingKeys}
setCardWrapperRef={setCardWrapperRef}
/>

{isViewMode ? (
<ViewMappingRail
segmentId={group.id}
cards={viewCardsByGroup[group.id] ?? []}
hoveredMappingKeys={hoveredMappingKeys}
onSetHoveredMappingKeys={setHoveredMappingKeys}
/>
) : (
<MappingEntryCards
groupId={group.id}
mappingCards={group.mappingCards}
cardOffsetsByGroup={cardOffsetsByGroup}
cardHeightsByGroup={cardHeightsByGroup}
hoveredMappingKeys={hoveredMappingKeys}
onSetHoveredMappingKeys={setHoveredMappingKeys}
setCardWrapperRef={setCardWrapperRef}
/>
)}
</Flex>
</Box>
);
Expand Down
5 changes: 1 addition & 4 deletions apps/google-docs/src/locations/Page/components/review/mapping/NormalizedDocumentSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,7 @@ interface ReviewDocumentBodyProps {
selectedEntryIndex: number | null;
hoveredMappingKeys: string[];
onSetHoveredMappingKeys: (keys: string[]) => void;
isViewMode?: boolean;
onEditImage: (sourceRef: ImageSourceRef, label: string) => void;
onEditImage?: (sourceRef: ImageSourceRef, label: string) => void;
}
Comment thread
harikakondur marked this conversation as resolved.

export const NormalizedDocumentSection = ({
Expand All @@ -31,7 +30,6 @@ export const NormalizedDocumentSection = ({
selectedEntryIndex,
hoveredMappingKeys,
onSetHoveredMappingKeys,
isViewMode = false,
onEditImage,
}: ReviewDocumentBodyProps): JSX.Element => {
return (
Expand All @@ -54,7 +52,6 @@ export const NormalizedDocumentSection = ({
selectedEntryIndex={selectedEntryIndex}
hoveredMappingKeys={hoveredMappingKeys}
onSetHoveredMappingKeys={onSetHoveredMappingKeys}
isViewMode={isViewMode}
onEditImage={onEditImage}
/>
) : (
Expand Down
41 changes: 21 additions & 20 deletions apps/google-docs/src/locations/Page/components/review/mapping/ReviewImageAssetCard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export interface ReviewImageAssetCardProps {
size?: 'small' | 'default';
onMouseEnter?: () => void;
onMouseLeave?: () => void;
onEdit: () => void;
onEdit?: () => void;
}

export function getNormalizedImageDisplayName(image: NormalizedDocumentImage): string {
Expand All @@ -37,14 +37,11 @@ export function ReviewImageAssetCard({

const imageHeight = size === 'small' ? '180px' : '280px';

const borderColor =
isExcluded && !isHighlighted
? tokens.gray300
: !isHighlighted
? tokens.gray300
: hovered
? tokens.green600
: tokens.green500;
const backgroundColor = isHighlighted
? hovered
? tokens.green300
: tokens.green100
: tokens.gray100;

return (
<Box
Expand All @@ -57,23 +54,27 @@ export function ReviewImageAssetCard({
maxWidth: '100%',
verticalAlign: 'top',
borderRadius: tokens.borderRadiusMedium,
border: `1px solid ${borderColor}`,
backgroundColor: isHighlighted ? tokens.green100 : tokens.gray100,
transition: 'border-color 120ms ease',
border: `1px solid ${isHighlighted ? 'transparent' : tokens.gray300}`,
backgroundColor,
transition: 'background-color 120ms ease',
overflow: 'hidden',
boxSizing: 'border-box',
padding: tokens.spacingXs,
}}>
<Card
ariaLabel={title}
actions={[
<MenuItem key="edit" onClick={onEdit}>
<Flex alignItems="center" gap="spacing2Xs">
<PencilSimpleIcon size="tiny" />
<Text>Edit content mapping</Text>
</Flex>
</MenuItem>,
]}>
actions={
onEdit
? [
<MenuItem key="edit" onClick={onEdit}>
<Flex alignItems="center" gap="spacing2Xs">
<PencilSimpleIcon size="tiny" />
<Text>Edit content mapping</Text>
</Flex>
</MenuItem>,
]
: undefined
}>
<Splitter />
<Box padding="spacingS">
<Image
Expand Down
2 changes: 1 addition & 1 deletion apps/google-docs/src/locations/Page/components/review/mapping/ViewMappingRail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ export const ViewMappingRail = ({
<ViewMappingCard
key={card.key}
card={card}
isHovered={card.mappingKeys.some((k) => hoveredMappingKeys.includes(k))}
isHovered={card.mappingKeys.some((key) => hoveredMappingKeys.includes(key))}
onMouseEnter={() => onSetHoveredMappingKeys(card.mappingKeys)}
onMouseLeave={() => onSetHoveredMappingKeys([])}
/>
Expand Down
Loading
Loading