Updated html markup for CTA card frontend rendering #1442
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -38,6 +38,8 @@ describe('CallToActionNode', function () { | |
| backgroundColor: 'none', | ||
| hasImage: true, | ||
| imageUrl: 'http://blog.com/image1.jpg', | ||
| imageWidth: 200, | ||
| imageHeight: 100, | ||
| href: '' | ||
| }; | ||
| exportOptions = { | ||
|
|
@@ -69,11 +71,12 @@ describe('CallToActionNode', function () { | |
| callToActionNode.imageUrl.should.equal(dataset.imageUrl); | ||
| callToActionNode.visibility.should.deepEqual(utils.visibility.buildDefaultVisibility()); | ||
| callToActionNode.href.should.equal(dataset.href); | ||
| callToActionNode.imageHeight.should.equal(dataset.imageHeight); | ||
| callToActionNode.imageWidth.should.equal(dataset.imageWidth); | ||
| })); | ||
|
|
||
| it('has setters for all properties', editorTest(function () { | ||
| const callToActionNode = new CallToActionNode(); | ||
| callToActionNode.layout.should.equal('minimal'); | ||
| callToActionNode.layout = 'compact'; | ||
| callToActionNode.layout.should.equal('compact'); | ||
|
|
@@ -122,6 +125,14 @@ describe('CallToActionNode', function () { | |
| callToActionNode.imageUrl = 'http://blog.com/image1.jpg'; | ||
| callToActionNode.imageUrl.should.equal('http://blog.com/image1.jpg'); | ||
|
|
||
| should(callToActionNode.imageHeight).be.null(); | ||
| callToActionNode.imageHeight = 100; | ||
| callToActionNode.imageHeight.should.equal(100); | ||
|
|
||
| should(callToActionNode.imageWidth).be.null(); | ||
| callToActionNode.imageWidth = 200; | ||
| callToActionNode.imageWidth.should.equal(200); | ||
|
|
||
| callToActionNode.href.should.equal(''); | ||
| callToActionNode.href = 'http://blog.com/post1'; | ||
| callToActionNode.href.should.equal('http://blog.com/post1'); | ||
|
|
@@ -208,7 +219,7 @@ describe('CallToActionNode', function () { | |
|
|
||
| const html = element.outerHTML.toString(); | ||
| html.should.containEql('data-layout="minimal"'); | ||
| html.should.containEql('kg-cta-bg-green'); | ||
|
There was a problem hiding this comment. 🛠️ Refactor suggestion Add test coverage for color validation. The test suite should include cases for color validation, including:
it('validates buttonColor format', editorTest(function () {
const testCases = [
{input: '#123', expected: '#123'},
{input: '#123456', expected: '#123456'},
{input: 'invalid<script>', expected: 'accent'},
{input: undefined, expected: 'accent'}
];
testCases.forEach(({input, expected}) => {
const node = new CallToActionNode({...dataset, buttonColor: input});
const {element} = node.exportDOM(exportOptions);
if (expected === 'accent') {
element.outerHTML.should.containEql('kg-style-accent');
} else {
element.outerHTML.should.containEql(`background-color: ${expected}`);
}
});
})); |
||
| html.should.containEql('background-color: #F0F0F0'); | ||
| html.should.containEql('Get access now'); | ||
| html.should.containEql('http://someblog.com/somepost'); | ||
|
|
@@ -238,8 +249,7 @@ describe('CallToActionNode', function () { | |
| const {element} = callToActionNode.exportDOM(exportOptions); | ||
|
|
||
| const html = element.outerHTML.toString(); | ||
| html.should.containEql('kg-cta-bg-green'); | ||
| html.should.containEql('background-color: #F0F0F0'); | ||
| html.should.containEql('Get access now'); | ||
| html.should.containEql('http://someblog.com/somepost'); | ||
|
|
@@ -311,6 +321,8 @@ describe('CallToActionNode', function () { | |
| hasSponsorLabel: true, | ||
| sponsorLabel: '<p>This post is brought to you by our sponsors</p>', | ||
| imageUrl: '/content/images/2022/11/koenig-lexical.jpg', | ||
| imageWidth: 200, | ||
| imageHeight: 100, | ||
| layout: 'minimal', | ||
| showButton: true, | ||
| textValue: '<p><span style="white-space: pre-wrap;">This is a new CTA Card.</span></p>', | ||
|
|
@@ -331,6 +343,8 @@ describe('CallToActionNode', function () { | |
| hasSponsorLabel: true, | ||
| sponsorLabel: '<p>This post is brought to you by our sponsors</p>', | ||
| imageUrl: '/content/images/2022/11/koenig-lexical.jpg', | ||
| imageWidth: 200, | ||
| imageHeight: 100, | ||
| layout: 'minimal', | ||
| showButton: true, | ||
| textValue: '<p><span style="white-space: pre-wrap;">This is a new CTA Card.</span></p>', | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -7,6 +7,7 @@ import {CallToActionCard} from '../components/ui/cards/CallToActionCard.jsx'; | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| import {LinkInput} from '../components/ui/LinkInput'; | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| import {SnippetActionToolbar} from '../components/ui/SnippetActionToolbar.jsx'; | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| import {ToolbarMenu, ToolbarMenuItem, ToolbarMenuSeparator} from '../components/ui/ToolbarMenu.jsx'; | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| import {getImageDimensions} from '../utils/getImageDimensions'; | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| import {useLexicalComposerContext} from '@lexical/react/LexicalComposerContext'; | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| import {useVisibilityToggle} from '../hooks/useVisibilityToggle.js'; | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
@@ -91,12 +92,16 @@ export const CallToActionNodeComponent = ({ | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| }; | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| const handleImageChange = async (files) => { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| const imgPreviewUrl = URL.createObjectURL(files[0]); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| const {width, height} = await getImageDimensions(imgPreviewUrl); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| const result = await imageUploader.upload(files); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| // reset original src so it can be replaced with preview and upload progress | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| editor.update(() => { | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| const node = $getNodeByKey(nodeKey); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| node.imageUrl = result?.[0].url; | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| node.hasImage = true; | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| node.imageWidth = width; | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| node.imageHeight = height; | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| }); | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| }; | ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
There was a problem hiding this comment. 🛠️ Refactor suggestion Add cleanup for the preview URL to prevent memory leaks. The preview URL created with Apply this diff to add cleanup: const handleImageChange = async (files) => {
const imgPreviewUrl = URL.createObjectURL(files[0]);
- const {width, height} = await getImageDimensions(imgPreviewUrl);
- const result = await imageUploader.upload(files);
- // reset original src so it can be replaced with preview and upload progress
- editor.update(() => {
- const node = $getNodeByKey(nodeKey);
- node.imageUrl = result?.[0].url;
- node.hasImage = true;
- node.imageWidth = width;
- node.imageHeight = height;
- });
+ try {
+ const {width, height} = await getImageDimensions(imgPreviewUrl);
+ const result = await imageUploader.upload(files);
+ // reset original src so it can be replaced with preview and upload progress
+ editor.update(() => {
+ const node = $getNodeByKey(nodeKey);
+ node.imageUrl = result?.[0].url;
+ node.hasImage = true;
+ node.imageWidth = width;
+ node.imageHeight = height;
+ });
+ } finally {
+ URL.revokeObjectURL(imgPreviewUrl);
+ }
};📝 Committable suggestion
Suggested change
There was a problem hiding this comment. Would be good to add this in, ObjectURLs will stick around in memory and can use quite a bit when storing large images There was a problem hiding this comment. @kevinansfield Thanks for confirming! I'll make sure to flag this in future reviews where ObjectURLs are used without proper cleanup. ✏️ Learnings added
If you found this review helpful, would you consider giving us a shout-out on X? |
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this can be removed now 😄