symplify how we determine that the object renderer should be used when the mixed renderer selected object type

Author: kchobantonov

packages/vue-vuetify/src/complex/MixedRenderer.vue

@@ -114,8 +114,8 @@ import {
 } from 'vuetify/components';
 import { DisabledIconFocus } from '../controls';
 import {
-  useCombinatorTranslations,
   IsDynamicPropertyContext,
+  useCombinatorTranslations,
   useIcons,
   useJsonForms,
   useTranslator,
@@ -264,17 +264,25 @@ const createMixedRenderInfos = (
           scope: control.scope,
         };
 
+    const uischema = findUISchema(
+      uischemas,
+      schema,
+      control.scope,
+      path,
+      () => createControlElement(control.scope ?? '#'),
+      schemaControl,
+      rootSchema,
+    );
+
+    if (uischema.type === 'Control' && schema.type === 'object') {
+      // override to specify exact type since the isObjectControl will check for empty scope
+      // which in this case the scope is not empty
+      uischema.type = 'Object';
+    }
+
     return {
       schema,
-      uischema: findUISchema(
-        uischemas,
-        schema,
-        control.scope,
-        path,
-        () => createControlElement(control.scope),
-        schemaControl,
-        rootSchema,
-      ),
+      uischema,
       label: `${schema.type}`,
     };
   });

packages/vue-vuetify/src/complex/ObjectRenderer.entry.ts

@@ -1,8 +1,6 @@
 import {
-  isControl,
   isObjectControl,
   rankWith,
-  resolveSchema,
   type JsonFormsRendererRegistryEntry,
   type JsonSchema,
   type Scopable,
@@ -20,21 +18,8 @@ export const entry: JsonFormsRendererRegistryEntry = {
       uischema: UISchemaElement & Scopable,
       schema: JsonSchema,
       context: TesterContext,
-    ) => {
-      return (
-        isObjectControl(uischema, schema, context) ||
-        // schemaMatches that is used inside the isObjectControl uses a resolve of the current schema which when the schema is provided as resolved for the MixedRender then there is no need for further resolve
-        (isControl(uischema) &&
-          !isEmpty(uischema.scope) &&
-          schema?.type === 'object' &&
-          Array.isArray(
-            resolveSchema(
-              context.rootSchema,
-              uischema.scope,
-              context.rootSchema,
-            )?.type,
-          ))
-      );
-    },
+    ) =>
+      isObjectControl(uischema, schema, context) ||
+      (uischema.type === 'Object' && !isEmpty(uischema.scope)),
   ),
 };

packages/vue-vuetify/src/complex/ObjectRenderer.vue

@@ -17,6 +17,7 @@
 </template>
 
 <script lang="ts">
+import { IsDynamicPropertyContext } from '@/util/inject';
 import {
   Generate,
   findUISchema,
@@ -33,10 +34,9 @@ import {
 import cloneDeep from 'lodash/cloneDeep';
 import isEmpty from 'lodash/isEmpty';
 import isObject from 'lodash/isObject';
-import { defineComponent, inject, provide } from 'vue';
+import { defineComponent, provide } from 'vue';
 import { useNested, useVuetifyControl } from '../util';
 import { AdditionalProperties } from './components';
-import { IsDynamicPropertyContext } from '@/util/inject';
 
 const controlRenderer = defineComponent({
   name: 'object-renderer',
@@ -52,8 +52,6 @@ const controlRenderer = defineComponent({
 
     const nested = useNested('object');
 
-    const isDynamic = inject<boolean>(IsDynamicPropertyContext, false);
-
     // do not use the default value but the undefind so that
     // the property is cleared when property clear action is executed
     provide(IsDynamicPropertyContext, false);
@@ -62,7 +60,6 @@ const controlRenderer = defineComponent({
       ...control,
       input: control,
       nested,
-      isDynamic,
     };
   },
   computed: {
@@ -86,7 +83,7 @@ const controlRenderer = defineComponent({
           undefined,
           this.control.rootSchema,
         );
-        if (isEmpty(this.control.path) || this.isDynamic) {
+        if (isEmpty(this.control.path)) {
           uiSchema.type = 'VerticalLayout';
         } else {
           (uiSchema as GroupLayout).label = this.control.label;