Skip to content

Applied suggestions provided by @troyalford to have the code from @elitebyte merged #1

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
frandevel wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Applied suggestions provided by @troyalford to have the code from @elitebyte merged #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89e5dbf
BUGFIX-256 switched to React 18 for the remote resources
frandevel Jun 21, 2024
22a41f1
BUGFIX-256 extracted to a new file and imported in the JsxParser.tsx
frandevel Jun 21, 2024
29ae50e
BUGFIX-256 implemented suggestions provided by @troyalford to @eliteb…
frandevel Jun 21, 2024
1a615df
Merge pull request #1
frandevel Jun 21, 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
6 changes: 6 additions & 0 deletions source/components/ForwardRef.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import * as React from 'react'

export const ForwardRef = React.forwardRef<any, any>((properties, ref) => {
const { component, lowerName, children, ...rest } = properties
return React.createElement(component || lowerName, { ...rest, ref }, children)
})
29 changes: 9 additions & 20 deletions source/components/JsxParser.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { canHaveChildren, canHaveWhitespace } from '../constants/specialTags'
import { randomHash } from '../helpers/hash'
import { parseStyle } from '../helpers/parseStyle'
import { resolvePath } from '../helpers/resolvePath'
import { ForwardRef } from './ForwardRef'

type ParsedJSX = React.ReactNode | boolean | string
type ParsedTree = ParsedJSX | ParsedJSX[] | null
Expand All @@ -30,15 +31,6 @@ export type TProps = {
}
type Scope = Record<string, any>

interface ForwardRefComponentProps {
[key: string]: any; // for the rest of the properties
}

const ForwardRefComponent = React.forwardRef<any, ForwardRefComponentProps>((properties, ref) => {
const { component, lowerName, children, ...rest } = properties
return React.createElement(component || lowerName, { ...rest, ref }, children)
})

/* eslint-disable consistent-return */
export default class JsxParser extends React.Component<TProps> {
static displayName = 'JsxParser'
Expand Down Expand Up @@ -273,7 +265,7 @@ export default class JsxParser extends React.Component<TProps> {

let children
const component = element.type === 'JSXElement'
? resolvePath(this.props.components, name)
? resolvePath(components, name)
: Fragment

if (component || canHaveChildren(name)) {
Expand Down Expand Up @@ -345,24 +337,21 @@ export default class JsxParser extends React.Component<TProps> {
children,
}

return React.createElement(ForwardRefComponent, componentProps)
// return React.createElement(component || lowerName, props, children)
return React.createElement(ForwardRef, componentProps)
}

render() {
const jsx = (this.props.jsx || '').trim().replace(/<!DOCTYPE([^>]*)>/g, '')
this.ParsedChildren = this.#parseJSX(jsx)
const className = [...new Set(['jsx-parser', ...String(this.props.className)
.split(' ')])].filter(Boolean).join(' ')

const classNames = 'jsx-parser'
const additionalClassNames : string[] = String(this.props.className).split(' ')
const uniqueClassNames: Set<string> = new Set([classNames, ...additionalClassNames])
const className = Array.from(uniqueClassNames).filter(Boolean).join(' ')

return (
this.props.renderInWrapper
? (
<div className={className}>{
React.createElement(React.Fragment, {}, this.ParsedChildren)
}
</div>
)
? (<div className={className}>{this.ParsedChildren}</div>)
: this.ParsedChildren
)
}
Expand Down
4 changes: 2 additions & 2 deletions source/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>react-jsx-parser demo</title>
<script crossorigin src="https://unpkg.com/react@16/umd/react.development.js"></script>
<script crossorigin src="https://unpkg.com/react-dom@16/umd/react-dom.development.js"></script>
<script crossorigin src="https://unpkg.com/react@18/umd/react.development.js"></script>
<script crossorigin src="https://unpkg.com/react-dom@18/umd/react-dom.development.js"></script>
<script defer src="react-jsx-parser-demo.min.js"></script>
</head>
<body>
Expand Down