Skip to content

fix: falsy bookmark prop values rendering #3142

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
diegomura merged 1 commit into from
Sep 23, 2025
Merged

fix: falsy bookmark prop values rendering #3142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 packages/layout/src/steps/resolveBookmarks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ const resolveBookmarks = (node: DocumentNode) => {

let parent = element.parent;

if (child.props && 'bookmark' in child.props) {
if (child.props && 'bookmark' in child.props && child.props.bookmark) {
const bookmark = getBookmarkValue(child.props.bookmark);
const ref = refs++;
const newHierarchy = { ref, parent: parent?.ref, ...bookmark };
Expand Down
67 changes: 66 additions & 1 deletion packages/layout/tests/steps/resolveBookmarks.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,72 @@ describe('layout resolveBookmarks', () => {

const result = resolveBookmarks(root);

expect(result).toEqual(root);
expect(result).toEqual({
Copy link
Contributor Author

@EvHaus EvHaus Apr 5, 2025

Choose a reason for hiding this comment

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

Unrelated to the fix, but updated this test to test against a new variable instance. The previous test would always pass because the original root variable would get mutated.

type: 'DOCUMENT',
props: {},
children: [
{
type: 'PAGE',
children: [{ type: 'VIEW', props: {} }],
},
],
});
});

test('should keep nodes the same if an undefined bookmark passed', () => {
const root = {
type: 'DOCUMENT',
props: {},
children: [
{
type: 'PAGE',
props: { bookmark: undefined },
children: [{ type: 'VIEW', props: {} }],
},
],
} as DocumentNode;

const result = resolveBookmarks(root);

expect(result).toEqual({
type: 'DOCUMENT',
props: {},
children: [
{
type: 'PAGE',
props: { bookmark: undefined },
children: [{ type: 'VIEW', props: {} }],
},
],
});
});

test('should keep nodes the same if a null bookmark passed', () => {
const root = {
type: 'DOCUMENT',
props: {},
children: [
{
type: 'PAGE',
props: { bookmark: null },
children: [{ type: 'VIEW', props: {} }],
},
],
} as DocumentNode;

const result = resolveBookmarks(root);

expect(result).toEqual({
type: 'DOCUMENT',
props: {},
children: [
{
type: 'PAGE',
props: { bookmark: null },
children: [{ type: 'VIEW', props: {} }],
},
],
});
});

test('should resolve bookmark in page node', () => {
Expand Down