Skip to content

#69 Fix for empty root name #70

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 1 commit into from
Jun 12, 2024
Merged

#69 Fix for empty root name #70

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
6 changes: 3 additions & 3 deletions demo/src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ function App() {
)

useEffect(() => {
const rootName = demoData[selectedData].rootName
if (rootName) setRootName(rootName ?? 'data')
switch (selectedData) {
case 'editTheme':
return
Expand All @@ -81,9 +83,7 @@ function App() {
}, [selectedData, reset])

useEffect(() => {
if (selectedData === 'editTheme') setTheme(data)
const rootName = demoData[selectedData].rootName
setRootName(rootName ?? 'data')
if (selectedData === 'editTheme') setTheme(data as Theme)
}, [data])

const restrictEdit: FilterFunction | boolean = (() => {
Expand Down
4 changes: 2 additions & 2 deletions demo/src/_imports.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
*/

/* Installed package */
export * from 'json-edit-react'
// export * from 'json-edit-react'

/* Local src */
// export * from './json-edit-react/src'
export * from './json-edit-react/src'

/* Compiled local package */
// export * from './package/build'
5 changes: 2 additions & 3 deletions src/CollectionNode.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,13 +358,12 @@ export const CollectionNode: React.FC<CollectionNodeProps> = ({
onDoubleClick={() => canEditKey && setCurrentlyEditingElement(`key_${pathString}`)}
>
{name === '' ? (
<span className="jer-empty-string">
<span className={path.length > 0 ? 'jer-empty-string' : undefined}>
{/* display "<empty string>" using pseudo class CSS */}
</span>
) : (
name
`${name}:`
)}
:
</span>
)
)
Expand Down