chore: commit save point

src/components/Column.js → source/components/Column.js

@@ -29,7 +29,9 @@ export default (domc, editor) => {
                 resizable: {
                     updateTarget: (el, rect, opt) => {
                         const selected = editor.getSelected();
-                        if(!selected){ return ; }
+                        if (!selected) {
+                            return;
+                        }
 
                         //compute the current screen size (bootstrap semantic)
                         const docWidth = el.getRootNode().body.offsetWidth;
@@ -98,8 +100,12 @@ export default (domc, editor) => {
                             } else {
                                 newSpan--;
                             }
-                            if(newSpan > 12){ newSpan = 12 ; }
-                            if(newSpan < 1){ newSpan = 1 ; }
+                            if (newSpan > 12) {
+                                newSpan = 12;
+                            }
+                            if (newSpan < 1) {
+                                newSpan = 1;
+                            }
 
                             let newClass = "col-" + currentSize + "-" + newSpan;
                             if (!currentSize) {
@@ -111,7 +117,7 @@ export default (domc, editor) => {
                                 selected.removeClass(oldClass);
                             }
                             //notify the corresponding trait to update its value accordingly
-                            selected.getTrait((currentSize||"xs")+"_width").view.postUpdate() ;
+                            //selected.getTrait((currentSize || "xs") + "_width").view.updateTrait()  //.postUpdate();
                         }
                     },
                     tl: 0,
@@ -127,94 +133,132 @@ export default (domc, editor) => {
                     {
                         id: "xs_width",
                         type: 'class_select',
+                        changeProp: true,
                         options: [
                             {value: 'col', name: 'Equal'},
                             {value: 'col-auto', name: 'Variable'},
-                            ... spans.map(function(i) { return {value: 'col-'+i, name: i+'/12'} })
+                            ...spans.map(function (i) {
+                                return {value: 'col-' + i, name: i + '/12'}
+                            })
                         ],
                         label: 'XS Width',
                     },
                     {
                         id: "sm_width",
                         type: 'class_select',
+                        changeProp: true,
                         options: [
                             {value: '', name: 'None'},
                             {value: 'col-sm', name: 'Equal'},
                             {value: 'col-sm-auto', name: 'Variable'},
-                            ... spans.map(function(i) { return {value: 'col-sm-'+i, name: i+'/12'} })
+                            ...spans.map(function (i) {
+                                return {value: 'col-sm-' + i, name: i + '/12'}
+                            })
                         ],
                         label: 'SM Width',
                     },
                     {
                         id: "md_width",
                         type: 'class_select',
+                        changeProp: true,
+
                         options: [
                             {value: '', name: 'None'},
                             {value: 'col-md', name: 'Equal'},
                             {value: 'col-md-auto', name: 'Variable'},
-                            ... spans.map(function(i) { return {value: 'col-md-'+i, name: i+'/12'} })
+                            ...spans.map(function (i) {
+                                return {value: 'col-md-' + i, name: i + '/12'}
+                            })
                         ],
                         label: 'MD Width',
                     },
                     {
                         id: "lg_width",
                         type: 'class_select',
+                        changeProp: true,
+
                         options: [
                             {value: '', name: 'None'},
                             {value: 'col-lg', name: 'Equal'},
                             {value: 'col-lg-auto', name: 'Variable'},
-                            ... spans.map(function(i) { return {value: 'col-lg-'+i, name: i+'/12'} })
+                            ...spans.map(function (i) {
+                                return {value: 'col-lg-' + i, name: i + '/12'}
+                            })
                         ],
                         label: 'LG Width',
                     },
                     {
                         id: "xl_width",
                         type: 'class_select',
+                        changeProp: true,
+
                         options: [
                             {value: '', name: 'None'},
                             {value: 'col-xl', name: 'Equal'},
                             {value: 'col-xl-auto', name: 'Variable'},
-                            ... spans.map(function(i) { return {value: 'col-xl-'+i, name: i+'/12'} })
+                            ...spans.map(function (i) {
+                                return {value: 'col-xl-' + i, name: i + '/12'}
+                            })
                         ],
                         label: 'XL Width',
                     },
                     {
                         type: 'class_select',
+                        changeProp: true,
+
                         options: [
                             {value: '', name: 'None'},
-                            ... spans.map(function(i) { return {value: 'offset-'+i, name: i+'/12'} })
+                            ...spans.map(function (i) {
+                                return {value: 'offset-' + i, name: i + '/12'}
+                            })
                         ],
                         label: 'XS Offset',
                     },
                     {
                         type: 'class_select',
+                        changeProp: true,
+
                         options: [
                             {value: '', name: 'None'},
-                            ... spans.map(function(i) { return {value: 'offset-sm-'+i, name: i+'/12'} })
+                            ...spans.map(function (i) {
+                                return {value: 'offset-sm-' + i, name: i + '/12'}
+                            })
                         ],
                         label: 'SM Offset',
                     },
                     {
                         type: 'class_select',
+                        changeProp: true,
+
                         options: [
                             {value: '', name: 'None'},
-                            ... spans.map(function(i) { return {value: 'offset-md-'+i, name: i+'/12'} })
+                            ...spans.map(function (i) {
+                                return {value: 'offset-md-' + i, name: i + '/12'}
+                            })
                         ],
                         label: 'MD Offset',
                     },
                     {
                         type: 'class_select',
+                        changeProp: true,
+
                         options: [
                             {value: '', name: 'None'},
-                            ... spans.map(function(i) { return {value: 'offset-lg-'+i, name: i+'/12'} })
+                            ...spans.map(function (i) {
+                                return {value: 'offset-lg-' + i, name: i + '/12'}
+                            })
                         ],
                         label: 'LG Offset',
                     },
                     {
                         type: 'class_select',
+                        changeProp: true,
+
                         options: [
                             {value: '', name: 'None'},
-                            ... spans.map(function(i) { return {value: 'offset-xl-'+i, name: i+'/12'} })
+                            ...spans.map(function (i) {
+                                return {value: 'offset-xl-' + i, name: i + '/12'}
+                            })
                         ],
                         label: 'XL Offset',
                     },

src/components/Form.js → source/components/Form.js

@@ -65,14 +65,31 @@ export default (dc, traits, config = {}) => {
             defaults: {
                 ...defaultModel.prototype.defaults,
                 droppable: ':not(form)',
-                draggable: ':not(form)',
+                draggable: function (obj, destination) {
+
+                    if (!destination?.cid) {
+                        return false;
+                    }
+
+                    const pf =destination.closest('form')
+                    
+                    if(pf?.cid) {
+                        return false
+                    }
+                    
+                    return true;
+
+                },
                 traits: [
                     {
                         type: 'select',
                         label: config.labels.trait_enctype,
                         name: 'enctype',
                         options: [
-                            {value: 'application/x-www-form-urlencoded', name: 'application/x-www-form-urlencoded (default)'},
+                            {
+                                value: 'application/x-www-form-urlencoded',
+                                name: 'application/x-www-form-urlencoded (default)'
+                            },
                             {value: 'multipart/form-data', name: 'multipart/form-data'},
                             {value: 'text/plain', name: 'text/plain'},
                         ]
@@ -162,7 +179,7 @@ export default (dc, traits, config = {}) => {
             },
         }, {
             isComponent(el) {
-                if (el.tagName === 'FORM') {
+                if (el && el.tagName === 'FORM') {
                     return {type: 'form'};
                 }
             },