Replace withAjvProps and remove categorization

Author: TheZoker

packages/vanilla-renderers/src/complex/categorization/CategorizationList.tsx

@@ -24,7 +24,6 @@
 */
 import React, { useMemo } from 'react';
 import {
-  Categorization,
   Category,
   deriveLabelForUISchemaElement,
   Translator,
@@ -37,7 +36,7 @@ const getCategoryClassName = (
 ): string => (selectedCategory === category ? 'selected' : '');
 
 export interface CategorizationProps {
-  categorization: Categorization;
+  filteredCategories: [Category];
   selectedCategory: Category;
   depth: number;
   onSelect: any;
@@ -47,8 +46,8 @@ export interface CategorizationProps {
 }
 
 export const CategorizationList = ({
-  categorization,
   selectedCategory,
+  filteredCategories,
   depth,
   onSelect,
   subcategoriesClassName,
@@ -57,22 +56,20 @@ export const CategorizationList = ({
 }: CategorizationProps) => {
   const categoryLabels = useMemo(
     () =>
-      categorization.elements.map((cat) =>
-        deriveLabelForUISchemaElement(cat, t)
-      ),
-    [categorization, t]
+      filteredCategories.map((cat) => deriveLabelForUISchemaElement(cat, t)),
+    [filteredCategories, t]
   );
 
   return (
     <ul className={subcategoriesClassName}>
-      {categorization.elements.map((category, idx) => {
+      {filteredCategories.map((category, idx) => {
         if (isCategorization(category)) {
           return (
             <li key={categoryLabels[idx]} className={groupClassName}>
               <span>{categoryLabels[idx]}</span>
               <CategorizationList
-                categorization={category}
                 selectedCategory={selectedCategory}
+                filteredCategories={filteredCategories}
                 depth={depth + 1}
                 onSelect={onSelect}
                 subcategoriesClassName={subcategoriesClassName}

packages/vanilla-renderers/src/complex/categorization/CategorizationRenderer.tsx

@@ -27,14 +27,14 @@ import type { Categorization, Category, LayoutProps } from '@jsonforms/core';
 import { isVisible } from '@jsonforms/core';
 import {
   TranslateProps,
+  useJsonForms,
   withJsonFormsLayoutProps,
   withTranslateProps,
 } from '@jsonforms/react';
 import { CategorizationList } from './CategorizationList';
 import { SingleCategory } from './SingleCategory';
 import { withVanillaControlProps } from '../../util';
 import type { AjvProps, VanillaRendererProps } from '../../index';
-import { withAjvProps } from '../../index';
 
 export interface CategorizationState {
   selectedCategory: Category;
@@ -55,14 +55,14 @@ export const CategorizationRenderer = ({
   visible,
   getStyleAsClassName,
   onChange,
-  ajv,
 }: LayoutProps &
   VanillaRendererProps &
   TranslateProps &
   CategorizationProps &
   AjvProps) => {
+  const ajv = useJsonForms().core.ajv;
   const categorization = uischema as Categorization;
-  const categories = useMemo(
+  const filteredCategories = useMemo(
     () =>
       categorization.elements.filter((category: Category) =>
         isVisible(category, data, undefined, ajv)
@@ -101,8 +101,8 @@ export const CategorizationRenderer = ({
     >
       <div className={masterClassNames}>
         <CategorizationList
-          categorization={categorization}
-          selectedCategory={categories[safeCategory]}
+          filteredCategories={filteredCategories}
+          selectedCategory={filteredCategories[safeCategory]}
           depth={0}
           onSelect={onCategorySelected}
           subcategoriesClassName={subcategoriesClassName}
@@ -112,7 +112,7 @@ export const CategorizationRenderer = ({
       </div>
       <div className={detailClassNames}>
         <SingleCategory
-          category={categories[safeCategory]}
+          category={filteredCategories[safeCategory]}
           schema={schema}
           path={path}
           key={safeCategory}
@@ -122,8 +122,6 @@ export const CategorizationRenderer = ({
   );
 };
 
-export default withAjvProps(
-  withVanillaControlProps(
-    withTranslateProps(withJsonFormsLayoutProps(CategorizationRenderer))
-  )
+export default withVanillaControlProps(
+  withTranslateProps(withJsonFormsLayoutProps(CategorizationRenderer))
 );