Merge pull request #82 from vtex-apps/fix/reorder-schema

Reorder schema
vtex-apps · Aug 5, 2019 · fa39906 · fa39906
2 parents 47897d2 + 4f1630f
commit fa39906
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 34 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+### Changed
+- Change order of `Carousel`'s schema properties to improve UX in Site Editor.
+
 ## [2.10.0] - 2019-07-29
 ### Added
 - Autoplay configuration on the Storefront.

diff --git a/react/Carousel.tsx b/react/Carousel.tsx
@@ -51,19 +51,6 @@ export default class Carousel extends Component<Props, State> {
     showDots: true,
   }
 
-  public static uiSchema = {
-    banners: {
-      items: {
-        image: {
-          'ui:widget': 'image-uploader',
-        },
-        mobileImage: {
-          'ui:widget': 'image-uploader',
-        },
-      },
-    },
-  }
-
   public static propTypes = {
     /** Should change images automatically */
     autoplay: PropTypes.bool.isRequired,
@@ -118,6 +105,7 @@ export default class Carousel extends Component<Props, State> {
       },
     }
 
+    // tslint:disable:object-literal-sort-keys
     return {
       description: 'admin/editor.carousel.description',
       dependencies: {
@@ -133,32 +121,16 @@ export default class Carousel extends Component<Props, State> {
                   isLayout: false,
                   title: 'admin/editor.carousel.autoplaySpeed.title',
                   type: 'string',
-                }
-              }
-            }
-          ]
-        }
+                },
+              },
+            },
+          ],
+        },
       },
       properties: {
-        // tslint:disable-line
         banners: {
           items: {
-            // tslint:disable-line
             properties: {
-              // tslint:disable-line
-              description: {
-                default: '',
-                title: 'admin/editor.carousel.banner.description.title',
-                type: 'string',
-              },
-              externalRoute: {
-                default: false,
-                isLayout: false,
-                title: 'admin/editor.carousel.banner.externalRoute.title',
-                type: 'boolean',
-              },
-              ...externalRouteSchema,
-              ...internalRouteSchema,
               image: {
                 default: '',
                 title: 'admin/editor.carousel.banner.image.title',
@@ -175,6 +147,19 @@ export default class Carousel extends Component<Props, State> {
                   'ui:widget': 'image-uploader',
                 },
               },
+              description: {
+                default: '',
+                title: 'admin/editor.carousel.banner.description.title',
+                type: 'string',
+              },
+              externalRoute: {
+                default: false,
+                isLayout: false,
+                title: 'admin/editor.carousel.banner.externalRoute.title',
+                type: 'boolean',
+              },
+              ...externalRouteSchema,
+              ...internalRouteSchema,
             },
             title: 'admin/editor.carousel.banner.title',
             type: 'object',
@@ -212,6 +197,7 @@ export default class Carousel extends Component<Props, State> {
       title: 'admin/editor.carousel.title',
       type: 'object',
     }
+    // tslint:enable
   }
 
   public state = {