Skip to content

fix: ignore content model checks for XmlNode component #5268

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 2 commits into from
Jun 11, 2025
Merged

fix: ignore content model checks for XmlNode component #5268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7cd21a6
fix: ignore content model checks for XmlNode component
TrySound Jun 11, 2025
6aaf375
Check XmlNode instead of category
TrySound Jun 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
16 changes: 16 additions & 0 deletions apps/builder/app/shared/content-model.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,6 +505,22 @@ test("support video > source", () => {
).toBeTruthy();
});

test("support xml node with tags", () => {
expect(
isTreeSatisfyingContentModel({
...renderData(
<ws.element ws:tag="body" ws:id="bodyId">
<$.XmlNode tag="url">
<$.XmlNode tag="loc"></$.XmlNode>
</$.XmlNode>
</ws.element>
),
metas: defaultMetas,
instanceSelector: ["bodyId"],
})
).toBeTruthy();
});

describe("component content model", () => {
test("restrict children with specific component", () => {
expect(
Expand Down
4 changes: 4 additions & 0 deletions apps/builder/app/shared/content-model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ const getTag = ({
metas: Metas;
props: Props;
}) => {
// ignore tag property on xml nodes
if (instance.component === "XmlNode") {
return;
}
const meta = metas.get(instance.component);
const metaTag = Object.keys(meta?.presetStyle ?? {}).at(0);
return instance.tag ?? getTagByInstanceId(props).get(instance.id) ?? metaTag;
Expand Down