Update constraints

Author: laktyushin

bundle/jsx/dataManager.jsx

@@ -323,12 +323,12 @@ loop:
                     error = 'Composition should not include any Texts';
                     break;
                 }
-                if (layers[i].hasMask === true || layers[i].masksProperties != null) {
-                    error = 'Composition should not include any Masks';
+                if (layers[i].ty === 9) {
+                    error = 'Composition should not include any Videos';
                     break;
                 }
-                if (layers[i].tt != null) {
-                    error = 'Composition should not include any Mattes';
+                if (layers[i].hasMask === true || layers[i].masksProperties != null) {
+                    error = 'Composition should not include any Masks';
                     break;
                 }
                 if (layers[i].ao === 1) {
@@ -364,18 +364,22 @@ loop:
         var string = JSON.stringify(data);
         string = string.replace(/\n/g, '');
 
+        var error = null;
+
         var frameRate = data.fr;
-        var totalFrames = data.op - data.ip;
+        if (frameRate != 30.0 && frameRate != 60.0) {
+            error = 'Composition framerate must be exactly 30 or 60 FPS';
+        }
 
-        var error = null;
+        var totalFrames = data.op - data.ip;
 
         var duration = totalFrames / frameRate;
-        if (duration > 3.0) {
+        if (error == null && duration > 3.0) {
             error = 'Composition duration must be not greater than 3 seconds';
         }
 
-        if (error == null && (data.w != 512 || data.h != 512)) {
-            error = 'Composition dimensions should be exactly 512x512px';
+        if (error == null && !((data.w == 100 && data.h == 100) || (data.w == 512 && data.h >= 512 && data.h <= 832 && data.h % 16 == 0) || (data.h == 512 && data.w >= 512 && data.w <= 832 && data.w % 16 == 0))) {
+           error = 'Composition dimensions should be exactly 512x512px (or 100x100px for sticker set thumbnail)';
         }
 
         if (error == null && data.ddd != null && data.ddd != 0) {

bundle/jsx/renderManager.jsx

@@ -250,18 +250,28 @@ $.__bodymovin.bm_renderManager = (function () {
     }
 
     function clearNames(layers) {
-        if (hasExpressionsFlag) {
-            return;
-        }
         var i, len = layers.length;
         for (i = 0; i < len; i += 1) {
             layers[i].nm = null;
             delete layers[i].nm;
             if (layers[i].ty === layerTypes.precomp && layers[i].layers) {
                 clearNames(layers[i].layers);
             }
+            if (layers[i].shapes) {
+                clearShapeNames(layers[i].shapes)
+            }
+        }
+    }
+
+    function clearShapeNames(shapes) {
+        var i, len = shapes.length;
+        for (i = 0; i < len; i += 1) {
+            shapes[i].nm = null;
+            delete shapes[i].nm;
+            if (shapes[i].it) {
+                clearShapeNames(shapes[i].it)
+            }            
         }
-        
     }
 
     function removeExtraData() {
@@ -387,7 +397,8 @@ $.__bodymovin.bm_renderManager = (function () {
     }
 
     function shouldSkipDefaultProperties() {
-        return currentCompSettings.skip_default_properties;
+        return true;
+        //return currentCompSettings.skip_default_properties;
     }
 
     function shouldIncludeNotSupportedProperties() {

src/redux/reducers/compositions.js

@@ -22,8 +22,8 @@ let defaultComposition = {
         standalone: false,
         demo: false,
         avd: false,
-        glyphs: true,
-        hiddens: true,
+        glyphs: false,
+        hiddens: false,
         original_names: false,
         should_encode_images: false,
         should_compress: false,
@@ -33,7 +33,7 @@ let defaultComposition = {
             active: false,
             list:[]
         },
-        guideds: true,
+        guideds: false,
         ignore_expression_properties: false,
         export_old_format: false,
         skip_default_properties: false,