Skip to content

Fix bugs in Themes #509

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
merged 6 commits into from
Aug 14, 2025
Merged

Fix bugs in Themes #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5690ab7
Content card (#4)
yangyansong-adbe Jul 29, 2025
d0db4e2
Tutorial and bug fix (#5)
yangyansong-adbe Jul 30, 2025
5cd5b0d
bug fix: actionUrl should not affect the functionality of the dismiss…
yangyansong-adbe Aug 4, 2025
dfba2a5
fetch latest changes
yangyansong-adbe Aug 8, 2025
1543377
Theme colors should override the color created in the style object;
yangyansong-adbe Aug 11, 2025
6c393a0
Merge commit '1915342f081c2fd95105617aaa19b127c46de1df' into more_fea…
yangyansong-adbe Aug 11, 2025
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
117 changes: 71 additions & 46 deletions apps/AEPSampleAppNewArchEnabled/app/ContentCardView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,13 +66,13 @@ const ContentCardView = () => {
};

useEffect(() => {
Messaging.updatePropositionsForSurfaces(["rn/ios/small_image"]);
Messaging.updatePropositionsForSurfaces(["rn/ios/remote_image"]);
// Note:
// - Call above to update the propositions and cache the content locally
// - Customers may call this function when launching the app
// MobileCore.trackAction("xyz");
// const provider = new ContentProvider("card/ms");
const provider = new ContentProvider("rn/ios/small_image");
const provider = new ContentProvider("rn/ios/remote_image");
provider
.getContent()
.then((content) => {
Expand Down Expand Up @@ -246,7 +246,7 @@ const ContentCardView = () => {
},
}}
>
<ContentView
<ContentView
key="1"
cardHeight={160}
data={SMALL_IMAGE_CONTENT_ALL_FIELDS}
Expand Down Expand Up @@ -474,7 +474,7 @@ const ContentCardView = () => {
},
}}
>
<ContentView
<ContentView
key="7"
cardHeight={160}
data={LARGE_IMAGE_CONTENT_DARK_URL}
Expand All @@ -491,39 +491,52 @@ const ContentCardView = () => {
{selectedView === "ImageOnly" && (
<View>
{renderStyledText("1. All fields")}
<ContentView
key="1"
<ContentView
key="1"
data={IMAGE_ONLY_CONTENT_ALL_FIELDS}
listener={(event, identifier) => {
console.log("Event triggered: - for imageOnly image 1", event, identifier);
console.log(
"Event triggered: - for imageOnly image 1",
event,
identifier
);
}}
/>

{renderStyledText("2. Images with Action url, dismiss style simple - card height 800")}
<ContentView
key="2"

{renderStyledText(
"2. Images with Action url, dismiss style simple - card height 800"
)}
<ContentView
key="2"
data={IMAGE_ONLY_CONTENT_WITH_ACTION_URL}
cardHeight={500}
listener={(event, identifier) => {
console.log("Event triggered: - for imageOnly image 2", event, identifier);
console.log(
"Event triggered: - for imageOnly image 2",
event,
identifier
);
}}
/>

{renderStyledText("3.Adobe default image, dismiss style circle - card height 400")}
<ContentView
key="3"
{renderStyledText(
"3.Adobe default image, dismiss style circle - card height 400"
)}
<ContentView
key="3"
data={IMAGE_ONLY_CONTENT_DISMISS_BUTTON_CIRCLE}
cardHeight={400}
listener={(event, identifier) => {
console.log("Event triggered: - for imageOnly image 3", event, identifier);
console.log(
"Event triggered: - for imageOnly image 3",
event,
identifier
);
}}
/>

{renderStyledText("4. No dismiss button - no card height")}
<ContentView
key="4"
data={IMAGE_ONLY_CONTENT_NO_DISMISS_BUTTON}
/>
<ContentView key="4" data={IMAGE_ONLY_CONTENT_NO_DISMISS_BUTTON} />

{renderStyledText("5. [image] Invalid")}
<ContentView
Expand All @@ -532,7 +545,6 @@ const ContentCardView = () => {
cardHeight={200}
/>


{renderStyledText("6.[action] No actionUrl")}
<ContentView
key="6"
Expand All @@ -548,30 +560,36 @@ const ContentCardView = () => {
styleOverrides={{
imageOnlyStyle: {
image: {
aspectRatio: 1/ 1,
aspectRatio: 1 / 1,
},
},
}}
listener={(event, identifier) => {
console.log("Event triggered: - for imageOnly image 7", event, identifier);
console.log(
"Event triggered: - for imageOnly image 7",
event,
identifier
);
}}
/>

{renderStyledText("8.[style] Custom height (150)")}
<ContentView
key="8"
data={IMAGE_ONLY_CONTENT_ALL_FIELDS}
cardHeight={400}
styleOverrides={{
imageOnlyStyle: {
image: {
height: 150,
},
key="8"
data={IMAGE_ONLY_CONTENT_ALL_FIELDS}
cardHeight={400}
styleOverrides={{
imageOnlyStyle: {
image: {
height: 150,
},
}}
/>
},
}}
/>

{renderStyledText("9. [style] Custom width (80%), set image container backgroud color")}
{renderStyledText(
"9. [style] Custom width (80%), set image container backgroud color"
)}
<ContentView
key="9"
data={IMAGE_ONLY_CONTENT_ALL_FIELDS}
Expand Down Expand Up @@ -599,9 +617,9 @@ const ContentCardView = () => {
borderRadius: 80,
margin: 30,
},
image: {
width: '50%',
resizeMode: 'stretch'
image: {
width: "50%",
resizeMode: "stretch",
},
},
}}
Expand All @@ -620,7 +638,7 @@ const ContentCardView = () => {
borderColor: "#FF69B4",
maxHeight: 100,
},
image: {
image: {
resizeMode: "center",
backgroundColor: "#79f4bbff",
},
Expand Down Expand Up @@ -657,7 +675,9 @@ const ContentCardView = () => {
cardHeight={200}
/>

{renderStyledText("1.[image] No Light Mode (only dark mode) - no actionUrl")}
{renderStyledText(
"1.[image] No Light Mode (only dark mode) - no actionUrl"
)}
<ContentView
key="15"
data={IMAGE_ONLY_CONTENT_NO_LIGHT_MODE}
Expand Down Expand Up @@ -1161,7 +1181,8 @@ const IMAGE_ONLY_CONTENT_ALL_FIELDS: ContentTemplate = {
actionUrl: "https://www.adobe.com/",
image: {
url: "https://t4.ftcdn.net/jpg/13/35/40/27/240_F_1335402728_gCAPzivq5VytTJVCEcfIB2eX3ZCdE8cc.jpg",
darkUrl: "https://hips.hearstapps.com/hmg-prod/images/golden-retriever-dog-royalty-free-image-505534037-1565105327.jpg",
darkUrl:
"https://hips.hearstapps.com/hmg-prod/images/golden-retriever-dog-royalty-free-image-505534037-1565105327.jpg",
alt: "flight offer",
},
dismissBtn: {
Expand All @@ -1177,7 +1198,8 @@ const IMAGE_ONLY_CONTENT_NO_DISMISS_BUTTON: ContentTemplate = {
actionUrl: "https://google.com",
image: {
url: "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRT8gAa1wUx9Ox2M6cZNwUJe32xE-l_4oqPVA&s",
darkUrl: "https://hips.hearstapps.com/hmg-prod/images/golden-retriever-dog-royalty-free-image-505534037-1565105327.jpg",
darkUrl:
"https://hips.hearstapps.com/hmg-prod/images/golden-retriever-dog-royalty-free-image-505534037-1565105327.jpg",
alt: "flight offer",
},
},
Expand All @@ -1190,7 +1212,8 @@ const IMAGE_ONLY_CONTENT_DISMISS_BUTTON_CIRCLE: ContentTemplate = {
actionUrl: "https://google.com",
image: {
url: "https://i.ibb.co/0X8R3TG/Messages-24.png",
darkUrl: "https://hips.hearstapps.com/hmg-prod/images/golden-retriever-dog-royalty-free-image-505534037-1565105327.jpg?crop=0.760xw:1.00xh;0.204xw,0&resize=980:*",
darkUrl:
"https://hips.hearstapps.com/hmg-prod/images/golden-retriever-dog-royalty-free-image-505534037-1565105327.jpg?crop=0.760xw:1.00xh;0.204xw,0&resize=980:*",
alt: "flight offer",
},
dismissBtn: {
Expand All @@ -1215,14 +1238,14 @@ const IMAGE_ONLY_CONTENT_INVALID_IMAGE: ContentTemplate = {
},
};


const IMAGE_ONLY_CONTENT_NO_ACTION: ContentTemplate = {
id: "image-only-no-action",
type: TemplateType.IMAGE_ONLY,
imageOnlyData: {
image: {
url: "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcRT8gAa1wUx9Ox2M6cZNwUJe32xE-l_4oqPVA&s",
darkUrl: "https://hips.hearstapps.com/hmg-prod/images/golden-retriever-dog-royalty-free-image-505534037-1565105327.jpg",
darkUrl:
"https://hips.hearstapps.com/hmg-prod/images/golden-retriever-dog-royalty-free-image-505534037-1565105327.jpg",
alt: "non-clickable image",
},
dismissBtn: {
Expand Down Expand Up @@ -1252,7 +1275,8 @@ const IMAGE_ONLY_CONTENT_NO_LIGHT_MODE: ContentTemplate = {
imageOnlyData: {
image: {
url: "",
darkUrl: "https://hips.hearstapps.com/hmg-prod/images/golden-retriever-dog-royalty-free-image-505534037-1565105327.jpg?crop=0.760xw:1.00xh;0.204xw,0&resize=980:*",
darkUrl:
"https://hips.hearstapps.com/hmg-prod/images/golden-retriever-dog-royalty-free-image-505534037-1565105327.jpg?crop=0.760xw:1.00xh;0.204xw,0&resize=980:*",
alt: "basketball icon",
},
dismissBtn: {
Expand All @@ -1268,7 +1292,8 @@ const IMAGE_ONLY_CONTENT_WITH_ACTION_URL: ContentTemplate = {
actionUrl: "https://google.com",
image: {
url: "https://t4.ftcdn.net/jpg/13/35/40/27/240_F_1335402728_gCAPzivq5VytTJVCEcfIB2eX3ZCdE8cc.jpg",
darkUrl: "https://hips.hearstapps.com/hmg-prod/images/golden-retriever-dog-royalty-free-image-505534037-1565105327.jpg?crop=0.760xw:1.00xh;0.204xw,0&resize=980:*",
darkUrl:
"https://hips.hearstapps.com/hmg-prod/images/golden-retriever-dog-royalty-free-image-505534037-1565105327.jpg?crop=0.760xw:1.00xh;0.204xw,0&resize=980:*",
alt: "with action URL - Google Images",
},
dismissBtn: {
Expand Down
32 changes: 21 additions & 11 deletions packages/authoring-ui/src/common/ContentView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,11 @@ const renderViewComponent = (
onEvent?: (eventName: ContentViewEvent, interactId?: string) => void
): React.ReactElement => {
const style = { ...component.style };
const viewStyle = {
const viewStyle: ViewStyle = {
...(style as ViewStyle),
backgroundColor: theme.colors.background,
...(theme.colors.background != null
? { backgroundColor: theme.colors.background }
: {}),
};

return (
Expand Down Expand Up @@ -144,9 +146,11 @@ const renderTextComponent = (
theme: Theme
): React.ReactElement => {
const style = { ...component.style };
const textStyle = {
const textStyle: ComponentTextStyle = {
...(style as ComponentTextStyle),
color: theme.colors.text_primary,
...(theme.colors.text_primary != null
? { color: theme.colors.text_primary }
: {}),
};

return (
Expand All @@ -172,9 +176,11 @@ const renderTitleComponent = (
theme: Theme
): React.ReactElement => {
const style = { ...component.style };
const titleStyle = {
const titleStyle: ComponentTextStyle = {
...(style as ComponentTextStyle),
color: theme.colors.text_primary,
...(theme.colors.text_primary != null
? { color: theme.colors.text_primary }
: {}),
};

return (
Expand All @@ -200,9 +206,11 @@ const renderBodyComponent = (
theme: Theme
): React.ReactElement => {
const style = { ...component.style };
const bodyStyle = {
const bodyStyle: ComponentTextStyle = {
...(style as ComponentTextStyle),
color: theme.colors.text_secondary,
...(theme.colors.text_secondary != null
? { color: theme.colors.text_secondary }
: {}),
};

return (
Expand Down Expand Up @@ -236,9 +244,11 @@ const renderImageComponent = (
? component.darkUrl
: component.url;

const imageStyle = {
const imageStyle: ImageStyle = {
...(style as ImageStyle),
backgroundColor: theme.colors.image_placeholder,
...(theme.colors.image_placeholder != null
? { backgroundColor: theme.colors.image_placeholder }
: {}),
};

return (
Expand Down Expand Up @@ -276,7 +286,7 @@ const renderButtonComponent = (
<View style={style as ButtonStyle}>
<Button
title={component.content || ""}
color={theme.colors.button_text_color}
color={theme.colors.button_text_color ?? undefined}
onPress={handleButtonPress}
/>
</View>
Expand Down
2 changes: 0 additions & 2 deletions packages/authoring-ui/src/common/Theme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ export interface Colors {
background?: string;
text_primary?: string;
text_secondary?: string;
title_background?: string;
body_background?: string;
image_placeholder?: string;
button_text_color?: string;
}
4 changes: 0 additions & 4 deletions packages/authoring-ui/src/common/ThemeProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ const defaultTheme: Themes = {
background: "#FFFFFF",
text_primary: "#000000",
text_secondary: "#8E8E93",
title_background: "#F2F2F7",
body_background: "#FFFFFF",
image_placeholder: "#C7C7CC",
button_text_color: "dodgerblue",
},
Expand All @@ -44,8 +42,6 @@ const defaultTheme: Themes = {
background: "#262626",
text_primary: "#FFFFFF",
text_secondary: "#8E8E93",
title_background: "#1C1C1E",
body_background: "#262626",
image_placeholder: "#48484A",
button_text_color: "dodgerblue",
},
Expand Down
Loading