Skip to content
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

fix: [IOCOM-2088] Handling of <br /> tags on IOMarkdown #6679

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
+45 −6
Draft

fix: [IOCOM-2088] Handling of <br /> tags on IOMarkdown #6679

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
14 changes: 14 additions & 0 deletions ts/components/IOMarkdown/markdownRenderer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ export const isTxtLinkNode = (node: TxtNode): node is TxtLinkNode =>
node.type === "Link";
export const isTxtStrNode = (node: TxtNode): node is TxtStrNode =>
node.type === "Str";
export const isTxtParagraphNode = (node: TxtNode): node is TxtParagraphNode =>
node.type === "Paragraph";

export type LinkData = {
text: string;
Expand Down Expand Up @@ -204,3 +206,15 @@ export const extractLinkDataFromRootNode = (
extractLinkDataFromRootNode(node, links);
}
});

export const isParagraphNodeInHierarchy = (
input: TxtNode | undefined
): boolean => {
if (input == null || input.parent == null) {
return false;
} else if (isTxtParagraphNode(input)) {
return true;
}

return isParagraphNodeInHierarchy(input.parent);
};
15 changes: 13 additions & 2 deletions ts/components/IOMarkdown/renderRules.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,11 @@ import I18n from "../../i18n";
import { openWebUrl } from "../../utils/url";
import { isAndroid } from "../../utils/platform";
import { IOMarkdownRenderRules, Renderer } from "./types";
import { extractAllLinksFromRootNode, LinkData } from "./markdownRenderer";
import {
extractAllLinksFromRootNode,
isParagraphNodeInHierarchy,
LinkData
} from "./markdownRenderer";

const BULLET_ITEM_FULL = "\u2022";
const BULLET_ITEM_EMPTY = "\u25E6";
Expand Down Expand Up @@ -441,7 +445,14 @@ export const DEFAULT_RULES: IOMarkdownRenderRules = {
const [, value] = val;

if (value === "br") {
return <Fragment key={getTxtNodeKey(html)}>{"\n"}</Fragment>;
const hasAParentParagraphNode = isParagraphNodeInHierarchy(html.parent);
return hasAParentParagraphNode ? (
<Fragment key={getTxtNodeKey(html)}>{"\n"}</Fragment>
) : (
<Body key={getTxtNodeKey(html)}>
<Fragment>{"\n"}</Fragment>
</Body>
);
}

return null;
Expand Down
14 changes: 12 additions & 2 deletions ts/features/common/components/IOMarkdown/customRules.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import { Fragment } from "react";
import { TxtHeaderNode, TxtLinkNode } from "@textlint/ast-node-types";
import {
TxtHeaderNode,
TxtHtmlNode,
TxtLinkNode
} from "@textlint/ast-node-types";
import { Body, IOToast, MdH1, MdH2, MdH3 } from "@pagopa/io-app-design-system";
import { isIoInternalLink } from "../../../../components/ui/Markdown/handlers/link";
import { handleInternalLink } from "../../../../utils/internalLink";
Expand Down Expand Up @@ -73,5 +77,11 @@ export const generateMessagesAndServicesRules = (
{link.children.map(render)}
</Body>
);
}
},
Html: (_html: TxtHtmlNode) => undefined
});

export const generatePreconditionsRules =
(): Partial<IOMarkdownRenderRules> => ({
Html: (_html: TxtHtmlNode) => undefined
});
8 changes: 6 additions & 2 deletions ts/features/messages/components/Home/PreconditionsContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import {
import { trackDisclaimerLoadError } from "../../analytics";
import IOMarkdown from "../../../../components/IOMarkdown";
import { isIOMarkdownEnabledOnMessagesAndServicesSelector } from "../../../common/store/reducers";
import { generatePreconditionsRules } from "../../../common/components/IOMarkdown/customRules";
import { PreconditionsFeedback } from "./PreconditionsFeedback";

export const PreconditionsContent = () => {
Expand Down Expand Up @@ -68,12 +69,15 @@ const PreconditionsContentMarkdown = () => {
},
[dispatch, store]
);

if (!markdown) {
return null;
}
return useIOMarkdown ? (
<IOMarkdown content={markdown} onError={onErrorCallback} />
<IOMarkdown
content={markdown}
onError={onErrorCallback}
rules={generatePreconditionsRules()}
/>
) : (
<MessageMarkdown
loadingLines={7}
Expand Down
Loading