diff --git a/src/core/plugins/json-schema-2020-12/components/JSONSchema/JSONSchema.jsx b/src/core/plugins/json-schema-2020-12/components/JSONSchema/JSONSchema.jsx
index 937403eb..b4533b62 100644
--- a/src/core/plugins/json-schema-2020-12/components/JSONSchema/JSONSchema.jsx
+++ b/src/core/plugins/json-schema-2020-12/components/JSONSchema/JSONSchema.jsx
@@ -9,7 +9,6 @@ import * as propTypes from "../../prop-types"
import {
useComponent,
useLevel,
- useConfig,
useFn,
useIsEmbedded,
useIsExpandedDeeply,
@@ -24,7 +23,6 @@ import {
const JSONSchema = forwardRef(({ schema, name }, ref) => {
const fn = useFn()
- const config = useConfig()
const isExpandedDeeply = useIsExpandedDeeply()
const [expanded, setExpanded] = useState(isExpandedDeeply)
const [expandedDeeply, setExpandedDeeply] = useState(false)
@@ -127,7 +125,7 @@ const JSONSchema = forwardRef(({ schema, name }, ref) => {
"json-schema-2020-12-body--collapsed": !expanded,
})}
>
- {!expanded && config.optimizeExpansion ? null : (
+ {expanded && (
<>
{!isCircular && isExpandable && (
diff --git a/src/core/plugins/json-schema-2020-12/components/keywords/$defs.jsx b/src/core/plugins/json-schema-2020-12/components/keywords/$defs.jsx
index d109b556..dc09a1b5 100644
--- a/src/core/plugins/json-schema-2020-12/components/keywords/$defs.jsx
+++ b/src/core/plugins/json-schema-2020-12/components/keywords/$defs.jsx
@@ -5,12 +5,11 @@ import React, { useCallback, useState } from "react"
import classNames from "classnames"
import { schema } from "../../prop-types"
-import { useConfig, useComponent, useIsExpandedDeeply } from "../../hooks"
+import { useComponent, useIsExpandedDeeply } from "../../hooks"
import { JSONSchemaDeepExpansionContext } from "../../context"
const $defs = ({ schema }) => {
const $defs = schema?.$defs || {}
- const config = useConfig()
const isExpandedDeeply = useIsExpandedDeeply()
const [expanded, setExpanded] = useState(isExpandedDeeply)
const [expandedDeeply, setExpandedDeeply] = useState(false)
@@ -51,7 +50,7 @@ const $defs = ({ schema }) => {
"json-schema-2020-12-keyword__children--collapsed": !expanded,
})}
>
- {!expanded && config.optimizeExpansion ? null : (
+ {expanded && (
<>
{Object.entries($defs).map(([schemaName, schema]) => (
diff --git a/src/core/plugins/json-schema-2020-12/components/keywords/AllOf.jsx b/src/core/plugins/json-schema-2020-12/components/keywords/AllOf.jsx
index de4cbd75..c38e9445 100644
--- a/src/core/plugins/json-schema-2020-12/components/keywords/AllOf.jsx
+++ b/src/core/plugins/json-schema-2020-12/components/keywords/AllOf.jsx
@@ -5,18 +5,12 @@ import React, { useCallback, useState } from "react"
import classNames from "classnames"
import { schema } from "../../prop-types"
-import {
- useFn,
- useConfig,
- useComponent,
- useIsExpandedDeeply,
-} from "../../hooks"
+import { useFn, useComponent, useIsExpandedDeeply } from "../../hooks"
import { JSONSchemaDeepExpansionContext } from "../../context"
const AllOf = ({ schema }) => {
const allOf = schema?.allOf || []
const fn = useFn()
- const config = useConfig()
const isExpandedDeeply = useIsExpandedDeeply()
const [expanded, setExpanded] = useState(isExpandedDeeply)
const [expandedDeeply, setExpandedDeeply] = useState(false)
@@ -58,7 +52,7 @@ const AllOf = ({ schema }) => {
"json-schema-2020-12-keyword__children--collapsed": !expanded,
})}
>
- {!expanded && config.optimizeExpansion ? null : (
+ {expanded && (
<>
{allOf.map((schema, index) => (
diff --git a/src/core/plugins/json-schema-2020-12/components/keywords/AnyOf.jsx b/src/core/plugins/json-schema-2020-12/components/keywords/AnyOf.jsx
index 28462bce..634e6c25 100644
--- a/src/core/plugins/json-schema-2020-12/components/keywords/AnyOf.jsx
+++ b/src/core/plugins/json-schema-2020-12/components/keywords/AnyOf.jsx
@@ -5,18 +5,12 @@ import React, { useCallback, useState } from "react"
import classNames from "classnames"
import { schema } from "../../prop-types"
-import {
- useFn,
- useConfig,
- useComponent,
- useIsExpandedDeeply,
-} from "../../hooks"
+import { useFn, useComponent, useIsExpandedDeeply } from "../../hooks"
import { JSONSchemaDeepExpansionContext } from "../../context"
const AnyOf = ({ schema }) => {
const anyOf = schema?.anyOf || []
const fn = useFn()
- const config = useConfig()
const isExpandedDeeply = useIsExpandedDeeply()
const [expanded, setExpanded] = useState(isExpandedDeeply)
const [expandedDeeply, setExpandedDeeply] = useState(false)
@@ -58,7 +52,7 @@ const AnyOf = ({ schema }) => {
"json-schema-2020-12-keyword__children--collapsed": !expanded,
})}
>
- {!expanded && config.optimizeExpansion ? null : (
+ {expanded && (
<>
{anyOf.map((schema, index) => (
diff --git a/src/core/plugins/json-schema-2020-12/components/keywords/DependentSchemas.jsx b/src/core/plugins/json-schema-2020-12/components/keywords/DependentSchemas.jsx
index cc06399b..d4f41fb7 100644
--- a/src/core/plugins/json-schema-2020-12/components/keywords/DependentSchemas.jsx
+++ b/src/core/plugins/json-schema-2020-12/components/keywords/DependentSchemas.jsx
@@ -5,12 +5,11 @@ import React, { useCallback, useState } from "react"
import classNames from "classnames"
import { schema } from "../../prop-types"
-import { useConfig, useComponent, useIsExpandedDeeply } from "../../hooks"
+import { useComponent, useIsExpandedDeeply } from "../../hooks"
import { JSONSchemaDeepExpansionContext } from "../../context"
const DependentSchemas = ({ schema }) => {
const dependentSchemas = schema?.dependentSchemas || []
- const config = useConfig()
const isExpandedDeeply = useIsExpandedDeeply()
const [expanded, setExpanded] = useState(isExpandedDeeply)
const [expandedDeeply, setExpandedDeeply] = useState(false)
@@ -50,7 +49,7 @@ const DependentSchemas = ({ schema }) => {
"json-schema-2020-12-keyword__children--collapsed": !expanded,
})}
>
- {!expanded && config.optimizeExpansion ? null : (
+ {expanded && (
<>
{Object.entries(dependentSchemas).map(([schemaName, schema]) => (
diff --git a/src/core/plugins/json-schema-2020-12/components/keywords/OneOf.jsx b/src/core/plugins/json-schema-2020-12/components/keywords/OneOf.jsx
index 56e1f477..6ad7b824 100644
--- a/src/core/plugins/json-schema-2020-12/components/keywords/OneOf.jsx
+++ b/src/core/plugins/json-schema-2020-12/components/keywords/OneOf.jsx
@@ -5,18 +5,12 @@ import React, { useCallback, useState } from "react"
import classNames from "classnames"
import { schema } from "../../prop-types"
-import {
- useFn,
- useConfig,
- useComponent,
- useIsExpandedDeeply,
-} from "../../hooks"
+import { useFn, useComponent, useIsExpandedDeeply } from "../../hooks"
import { JSONSchemaDeepExpansionContext } from "../../context"
const OneOf = ({ schema }) => {
const oneOf = schema?.oneOf || []
const fn = useFn()
- const config = useConfig()
const isExpandedDeeply = useIsExpandedDeeply()
const [expanded, setExpanded] = useState(isExpandedDeeply)
const [expandedDeeply, setExpandedDeeply] = useState(false)
@@ -58,7 +52,7 @@ const OneOf = ({ schema }) => {
"json-schema-2020-12-keyword__children--collapsed": !expanded,
})}
>
- {!expanded && config.optimizeExpansion ? null : (
+ {expanded && (
<>
{oneOf.map((schema, index) => (
diff --git a/src/core/plugins/json-schema-2020-12/components/keywords/PrefixItems.jsx b/src/core/plugins/json-schema-2020-12/components/keywords/PrefixItems.jsx
index f91804d3..798a40a8 100644
--- a/src/core/plugins/json-schema-2020-12/components/keywords/PrefixItems.jsx
+++ b/src/core/plugins/json-schema-2020-12/components/keywords/PrefixItems.jsx
@@ -5,18 +5,12 @@ import React, { useCallback, useState } from "react"
import classNames from "classnames"
import { schema } from "../../prop-types"
-import {
- useFn,
- useConfig,
- useComponent,
- useIsExpandedDeeply,
-} from "../../hooks"
+import { useFn, useComponent, useIsExpandedDeeply } from "../../hooks"
import { JSONSchemaDeepExpansionContext } from "../../context"
const PrefixItems = ({ schema }) => {
const prefixItems = schema?.prefixItems || []
const fn = useFn()
- const config = useConfig()
const isExpandedDeeply = useIsExpandedDeeply()
const [expanded, setExpanded] = useState(isExpandedDeeply)
const [expandedDeeply, setExpandedDeeply] = useState(false)
@@ -58,7 +52,7 @@ const PrefixItems = ({ schema }) => {
"json-schema-2020-12-keyword__children--collapsed": !expanded,
})}
>
- {!expanded && config.optimizeExpansion ? null : (
+ {expanded && (
<>
{prefixItems.map((schema, index) => (
diff --git a/src/core/plugins/json-schema-2020-12/hoc.jsx b/src/core/plugins/json-schema-2020-12/hoc.jsx
index 584cee75..365d3e3f 100644
--- a/src/core/plugins/json-schema-2020-12/hoc.jsx
+++ b/src/core/plugins/json-schema-2020-12/hoc.jsx
@@ -97,14 +97,6 @@ export const withJSONSchemaContext = (Component, overrides = {}) => {
* 3 -> [0]...(3)
*/
defaultExpandedLevels: 0, // 2 = 0...2
- /**
- * Can be turned on for complex and extensive schemas.
- * Child schemas are not rendered until parent schema is expanded.
- *
- * By default, entire schema tree is rendered and collapsed parts of the
- * tree are hidden with css.
- */
- optimizeExpansion: true,
...overrides.config,
},
fn: {