Merge pull request smartxworks#720 from smartxworks/fix/conditions

fix: the data passed to shouldRender should be evaled
Clarence5 · Aug 30, 2023 · 32713c8 · 32713c8
2 parents 8e6be11 9fd9a90
commit 32713c8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/packages/editor-sdk/src/components/Widgets/CategoryWidget.tsx b/packages/editor-sdk/src/components/Widgets/CategoryWidget.tsx
@@ -97,7  97,10 @@ export const CategoryWidget: React.FC<WidgetProps<CategoryWidgetType>> = props =
             if (typeof propertySpec === 'boolean') {
               return null;
             }
-            return shouldRender(propertySpec.conditions || [], value) ? (
             return shouldRender(
               propertySpec.conditions || [],
               services.stateManager.deepEval(value)
             ) ? (
               <SpecWidget
                 key={name}
                 component={component}

diff --git a/packages/editor-sdk/src/components/Widgets/ObjectField.tsx b/packages/editor-sdk/src/components/Widgets/ObjectField.tsx
@@ -35,7  35,10 @@ export const ObjectField: React.FC<WidgetProps<ObjectFieldType>> = props => {
           return null;
         }
 
-        return shouldRender(subSpec.conditions || [], value) ? (
         return shouldRender(
           subSpec.conditions || [],
           services.stateManager.deepEval(value)
         ) ? (
           <SpecWidget
             component={component}
             key={name   component.id}