@ecency/render-helper 2.3.13 → 2.3.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecency/render-helper",
-  "version": "2.3.13",
+  "version": "2.3.15",
   "description": "Markdown+Html Render helper",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/consts/allowed-attributes.const.ts

@@ -31,10 +31,10 @@ export const ALLOWED_ATTRIBUTES: XSSWhiteList = {
     'decoding',
     'itemprop'
   ],
-  'span': ['class', 'id'],
+  'span': ['class', 'id', 'data-align'],
   'iframe': ['src', 'class', 'frameborder', 'allowfullscreen', 'webkitallowfullscreen', 'mozallowfullscreen', 'sandbox'],
   'video': ['src', 'controls', 'poster'],
-  'div': ['class', 'id'],
+  'div': ['class', 'id', 'data-align'],
   'strong': [],
   'b': [],
   'i': [],
@@ -45,13 +45,13 @@ export const ALLOWED_ATTRIBUTES: XSSWhiteList = {
   'blockquote': ['class'],
   'sup': [],
   'sub': [],
-  'h1': ['dir', 'id'],
-  'h2': ['dir', 'id'],
-  'h3': ['dir', 'id'],
-  'h4': ['dir', 'id'],
-  'h5': ['dir', 'id'],
-  'h6': ['dir', 'id'],
-  'p': ['dir', 'id'],
+  'h1': ['dir', 'id', 'data-align'],
+  'h2': ['dir', 'id', 'data-align'],
+  'h3': ['dir', 'id', 'data-align'],
+  'h4': ['dir', 'id', 'data-align'],
+  'h5': ['dir', 'id', 'data-align'],
+  'h6': ['dir', 'id', 'data-align'],
+  'p': ['dir', 'id', 'data-align'],
   'center': [],
   'ul': [],
   'ol': [],

package/src/methods/a.method.ts

@@ -33,6 +33,27 @@ import { removeChildNodes } from './remove-child-nodes.method'
 import { extractYtStartTime, isValidPermlink, isValidUsername } from '../helper'
 import { createImageHTML } from "./img.method";
 
+const normalizeValue = (value?: string | null): string => (value ? value.trim() : '')
+
+const matchesHref = (href: string, value?: string | null): boolean => {
+  const normalizedHref = normalizeValue(href)
+  if (!normalizedHref) {
+    return false
+  }
+
+  return normalizeValue(value) === normalizedHref
+}
+
+const getInlineMeta = (el: HTMLElement, href: string) => {
+  const textMatches = matchesHref(href, el.textContent)
+  const titleMatches = matchesHref(href, el.getAttribute('title'))
+
+  return {
+    textMatches,
+    nonInline: textMatches || titleMatches
+  }
+}
+
 
 export function a(el: HTMLElement | null, forApp: boolean, webp: boolean): void {
   if (!el || !el.parentNode) {
@@ -107,11 +128,11 @@ export function a(el: HTMLElement | null, forApp: boolean, webp: boolean): void
 
     if (!isValidPermlink(permlink)) return;
 
-    let isInline = true;
-    if (el.textContent === href) {
+    const inlineMeta = getInlineMeta(el, href)
+    if (inlineMeta.textMatches) {
       el.textContent = `@${author}/${permlink}`
-      isInline = false;
     }
+    const isInline = !inlineMeta.nonInline
     if (forApp) {
       el.removeAttribute('href')
 
@@ -195,11 +216,11 @@ export function a(el: HTMLElement | null, forApp: boolean, webp: boolean): void
 
       if (!isValidPermlink(permlink)) return;
 
-      let isInline = true;
-      if (el.textContent === href) {
+      const inlineMeta = getInlineMeta(el, href)
+      if (inlineMeta.textMatches) {
         el.textContent = `@${author}/${permlink}`
-        isInline = false;
       }
+      const isInline = !inlineMeta.nonInline
       if (forApp) {
         el.removeAttribute('href')
 
@@ -274,12 +295,12 @@ export function a(el: HTMLElement | null, forApp: boolean, webp: boolean): void
 
       if (!isValidPermlink(permlink)) return;
 
-      let isInline = true;
+      const inlineMeta = getInlineMeta(el, href)
 
-      if (el.textContent === href) {
+      if (inlineMeta.textMatches) {
         el.textContent = `@${author}/${permlink}`
-        isInline = false;
       }
+      const isInline = !inlineMeta.nonInline
       if (forApp) {
         el.removeAttribute('href')
 
@@ -380,12 +401,12 @@ export function a(el: HTMLElement | null, forApp: boolean, webp: boolean): void
 
     if (!isValidPermlink(permlink)) return;
 
-    let isInline = true;
+    const inlineMeta = getInlineMeta(el, href)
 
-    if (el.textContent === href) {
+    if (inlineMeta.textMatches) {
       el.textContent = `@${author}/${permlink}`
-      isInline = false;
     }
+    const isInline = !inlineMeta.nonInline
     if (forApp) {
       el.removeAttribute('href')