updated array modal renderer to use schema instead of old apis

Author: jzeltman

packages/spectrum/src/complex/ArrayModal/SpectrumArrayModalControl/AddDialog.tsx

@@ -15,7 +15,7 @@ interface ArrayModalControlAddDialogProps {
   uischema: any;
   handleClose: any;
   selectedIndex: any;
-  oneOfRenderInfos: any;
+  schema: any;
   handleOnConfirm: any;
   open: boolean;
   setSelectedIndex: any;
@@ -25,7 +25,7 @@ export default function AddDialog({
   uischema,
   handleClose,
   selectedIndex,
-  oneOfRenderInfos,
+  schema,
   handleOnConfirm,
   open,
   setSelectedIndex,
@@ -65,18 +65,18 @@ export default function AddDialog({
                   selectedKey={String(selectedIndex)}
                   width='calc(100% - size-200)'
                 >
-                  {oneOfRenderInfos.map(
-                    (oneOfRenderInfo: any, oneOfIndex: number) => (
-                      <Item key={oneOfIndex}>{oneOfRenderInfo.label}</Item>
-                    )
-                  )}
+                  {schema?.oneOf?.map((item: any, index: number) => (
+                    <Item key={index}>
+                      {item.title ?? `One Of Item ${index}`}
+                    </Item>
+                  ))}
                 </Picker>
               </>
             ) : (
               <>
                 <ListBox
                   aria-label='Select'
-                  items={oneOfRenderInfos}
+                  items={schema}
                   margin='size-100'
                   onSelectionChange={(selected) =>
                     handleListBoxChange(selected)
@@ -86,11 +86,11 @@ export default function AddDialog({
                   width='calc(100% - size-200)'
                   maxHeight='size-2400'
                 >
-                  {oneOfRenderInfos.map(
-                    (oneOfRenderInfo: any, oneOfIndex: number) => (
-                      <Item key={oneOfIndex}>{oneOfRenderInfo.label}</Item>
-                    )
-                  )}
+                  {schema?.oneOf?.map((item: any, index: number) => (
+                    <Item key={index}>
+                      {item.title ?? `One Of Item ${index}`}
+                    </Item>
+                  ))}
                 </ListBox>
               </>
             )}

packages/spectrum/src/complex/ArrayModal/SpectrumArrayModalControl/index.tsx

@@ -25,15 +25,12 @@
   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
   THE SOFTWARE.
 */
-import React, { useCallback, useState, useMemo } from 'react';
+import React, { useCallback, useState } from 'react';
 import {
   ArrayControlProps,
   CombinatorProps,
-  JsonSchema,
   OwnPropsOfControl,
-  createCombinatorRenderInfos,
   createDefaultValue,
-  resolveSubSchemas,
 } from '@jsonforms/core';
 import { Button, Flex, Heading, Text, View } from '@adobe/react-spectrum';
 import SpectrumArrayModalItem from '../SpectrumArrayModalItem';
@@ -47,7 +44,6 @@ export interface OwnOneOfProps extends OwnPropsOfControl {
   indexOfFittingSchema?: number;
 }
 
-const oneOf = 'oneOf';
 export const SpectrumArrayModalControl = React.memo(
   ({
     addItem,
@@ -61,23 +57,6 @@ export const SpectrumArrayModalControl = React.memo(
     uischema,
     uischemas,
   }: ArrayControlProps & CombinatorProps) => {
-    const _schema = useMemo(
-      () => resolveSubSchemas(schema, rootSchema, oneOf),
-      [schema, rootSchema, oneOf]
-    );
-    const oneOfRenderInfos = useMemo(
-      () =>
-        createCombinatorRenderInfos(
-          (_schema as JsonSchema).oneOf,
-          rootSchema,
-          oneOf,
-          uischema,
-          path,
-          uischemas
-        ),
-      [_schema, rootSchema, oneOf, uischema, uischemas, path]
-    );
-
     const [selectedIndex, setSelectedIndex] = useState(0);
     const [open, setOpen] = useState(false);
     const handleClose = () => setOpen(false);
@@ -132,7 +111,7 @@ export const SpectrumArrayModalControl = React.memo(
             uischema={uischema}
             handleClose={handleClose}
             selectedIndex={selectedIndex}
-            oneOfRenderInfos={oneOfRenderInfos}
+            schema={schema}
             setSelectedIndex={setSelectedIndex}
             handleOnConfirm={handleOnConfirm}
             open={open}
@@ -172,7 +151,7 @@ export const SpectrumArrayModalControl = React.memo(
                       schema={schema}
                       uischema={uischema}
                       uischemas={uischemas}
-                    ></SpectrumArrayModalItem>
+                    />
                     {uischema.options?.showSortButtons && (
                       <SortButtons
                         data={data}