Skip to content

convert to typescript, add comment tag, text node #39

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

Open
wongchichong wants to merge 12 commits into
base: master
Choose a base branch
from
Open

convert to typescript, add comment tag, text node #39

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a66f7bb
to typescript, add comment tag
wongchichong Mar 1, 2023
854c251
add svg test case
wongchichong Mar 1, 2023
f4afdee
add text node
wongchichong Mar 1, 2023
2a69170
update voby-via-demo
wongchichong Mar 13, 2023
97c5fcc
apr 2023
wongchichong May 1, 2023
6439e48
some updates
wongchichong May 24, 2023
3fc2555
some updates
wongchichong May 24, 2023
4b3c8c9
sync check
wongchichong Dec 7, 2023
27e2963
\Bump version\
wongchichong Apr 15, 2024
0077150
2.2.2
wongchichong Apr 15, 2024
d4d6716
Bump version
wongchichong Apr 15, 2024
2d839d5
Bump version
wongchichong Apr 15, 2024
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
Prev Previous commit
Next Next commit
update voby-via-demo
  • Loading branch information
@wongchichong
wongchichong committed Mar 13, 2023
commit 2a69170c48d26870f57a31f3d6ff2c61e8f6eda0
6 changes: 3 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"amdName": "vhtml",
"version": "2.2.1",
"description": "Hyperscript reviver that constructs a sanitized HTML string.",
"main": "dist/vhtml.js",
"minified:main": "dist/vhtml.min.js",
"jsnext:main": "src/vhtml.js",
"main": "./dist/vhtml.js",
"minified:main": "./dist/vhtml.umd.js",
"jsnext:main": "./src/vhtml.ts",
"scripts": {
"preinstall": "npx only-allow pnpm",
"build": "vite build && tsc --declaration && pnpm size",
Expand Down
30 changes: 12 additions & 18 deletions src/vhtml.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,32 +26,26 @@ export default function h(name: string | Function | null, attrs: any, ..._args:
// return name(attrs, stack.reverse());
}

const loopAttr = () => {
if (attrs) for (let i in attrs) {
if (attrs[i] !== false && attrs[i] != null && i !== setInnerHTMLAttr) {
//@ts-ignore
s += ` ${DOMAttributeNames[i] ? DOMAttributeNames[i] : esc(i)}="${esc(attrs[i])}"`
}
}
}

if (name) {
if (name === '!') {
s += '<!-- '
if (attrs) for (let i in attrs) {
if (attrs[i] !== false && attrs[i] != null && i !== setInnerHTMLAttr) {
//@ts-ignore
s += ` ${DOMAttributeNames[i] ? DOMAttributeNames[i] : esc(i)}="${esc(attrs[i])}"`
}
}
loopAttr()
}
else if (name === 'text') {
if (attrs) for (let i in attrs) {
if (attrs[i] !== false && attrs[i] != null && i !== setInnerHTMLAttr) {
//@ts-ignore
s += ` ${DOMAttributeNames[i] ? DOMAttributeNames[i] : esc(i)}="${esc(attrs[i])}"`
}
}
loopAttr()
}
else {
s += '<' + name
if (attrs) for (let i in attrs) {
if (attrs[i] !== false && attrs[i] != null && i !== setInnerHTMLAttr) {
//@ts-ignore
s += ` ${DOMAttributeNames[i] ? DOMAttributeNames[i] : esc(i)}="${esc(attrs[i])}"`
}
}
loopAttr()
s += '>'
}
}
Expand Down
8 changes: 8 additions & 0 deletions test/vhtml.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,14 @@ describe('vhtml', () => {
)
})

// it('should sanitize function', () => {
// expect(
// <div onClick={() => alert('hello')} />
// ).to.equal(
// `<div onclick="&amp;&lt;&gt;&quot;&apos;"></div>`
// )
// })

it('should not sanitize the "dangerouslySetInnerHTML" attribute, and directly set its `__html` property as innerHTML', () => {
expect(
<div dangerouslySetInnerHTML={{ __html: "<span>Injected HTML</span>" }} />
Expand Down