fix: adjust controls visibility

ccontrols · Aug 8, 2020 · 74e6863 · 74e6863
1 parent ba9c936
commit 74e6863
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/ui/blocks/src/PropsTable/BasePropsTable.tsx b/ui/blocks/src/PropsTable/BasePropsTable.tsx
@@ -135,18 +135,16 @@ export const BasePropsTable: FC<BasePropsTableProps> = ({
         rows.unshift.apply(rows, controlsRows);
       }
       const groupProps: GroupingProps = {};
-      if (!flat) {
-        if (parents.size > 1) {
-          const firstRowWithParent = rows.find(row => row?.prop.parentName);
-          if (firstRowWithParent) {
-            groupProps.expanded = {
-              [`prop.parentName:${firstRowWithParent.prop.parentName}`]: true,
-            };
-          }
-          groupProps.groupBy = ['prop.parentName'];
-        } else {
-          groupProps.hiddenColumns = ['prop.parentName'];
+      if (parents.size > 1 && !flat) {
+        const firstRowWithParent = rows.find(row => row?.prop.parentName);
+        if (firstRowWithParent) {
+          groupProps.expanded = {
+            [`prop.parentName:${firstRowWithParent.prop.parentName}`]: true,
+          };
         }
+        groupProps.groupBy = ['prop.parentName'];
+      } else {
+        groupProps.hiddenColumns = ['prop.parentName'];
       }
       const columns = [
         {

diff --git a/ui/pages/src/ClassicPage/ClassicPage.tsx b/ui/pages/src/ClassicPage/ClassicPage.tsx
@@ -53,7 +53,7 @@ export const ClassicPage: FC = () => {
       <PropsTable
         of="."
         title={mixedControls ? 'Controls' : 'Properties'}
-        flat={propsCount <= threshold || mixedControls}
+        flat={propsCount <= threshold && !mixedControls}
         visibility={splitControls ? 'info' : 'all'}
       />
       <ComponentDeps id="." title="External dependencies" />