@fonixtree/magic-design 0.0.102 → 0.0.104

package/es/composite-comp/bol/components/ImageText/defaultJSON.js

@@ -9,12 +9,17 @@ var _uuid = require("uuid");
 
 var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
   var groupId = (0, _uuid.v4)();
+  var imageId = (0, _uuid.v4)();
+  var titleId = (0, _uuid.v4)();
+  var textId = (0, _uuid.v4)();
+  var buttonId = (0, _uuid.v4)();
+  var secButtonId = (0, _uuid.v4)();
   return {
     id: groupId,
     image: {
       parentId: groupId,
-      id: (0, _uuid.v4)(),
-      open: false,
+      id: imageId,
+      open: true,
       type: 'IMAGE',
       content: {
         h5Name: 'name2',
@@ -33,18 +38,17 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
     },
     title: {
       parentId: groupId,
-      id: (0, _uuid.v4)(),
+      id: titleId,
       open: true,
       type: 'TEXT',
       specialContent: [],
       text: 'Title of this group',
       content: {
-        sizeType: 'Headline 1',
+        sizeType: 'Customize font styles',
         fontFamily: 'Open Sans',
         fontWeight: 600,
         fontSize: 12,
-        color: '#232F46',
-        width: 0
+        color: '#232F46'
       },
       underline: {
         open: false,
@@ -55,25 +59,24 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
     },
     text: {
       parentId: groupId,
-      id: (0, _uuid.v4)(),
+      id: textId,
       open: true,
       type: 'TEXT',
       specialContent: [],
       text: 'Please enter a description',
       content: {
-        sizeType: 'Headline 1',
+        sizeType: 'Customize font styles',
         fontFamily: 'Open Sans',
         fontWeight: 400,
         fontSize: 10,
-        color: '#8493AF',
-        width: 0
+        color: '#8493AF'
       },
       underline: {},
       vertical: {}
     },
     button: {
       parentId: groupId,
-      id: (0, _uuid.v4)(),
+      id: buttonId,
       open: true,
       type: 'BUTTON',
       text: 'Button',
@@ -82,7 +85,7 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
         backgroundColor: '#2F54EB'
       },
       buttonText: {
-        sizeType: 'Headline 1',
+        sizeType: 'Customize font styles',
         fontFamily: 'Open Sans',
         fontWeight: 400,
         fontSize: 10,
@@ -98,13 +101,27 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
         iconUrl: '',
         layout: 'right'
       },
+      spacing: {
+        pc: {
+          paddingTop: 6,
+          paddingBottom: 6,
+          paddingLeft: 10,
+          paddingRight: 10
+        },
+        mobile: {
+          paddingTop: 6,
+          paddingBottom: 6,
+          paddingLeft: 10,
+          paddingRight: 10
+        }
+      },
       hover: {
         open: false,
         content: {
           backgroundColor: '#0d39ed'
         },
         buttonText: {
-          sizeType: 'Headline 1',
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 14,
@@ -120,15 +137,11 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
           iconUrl: '',
           layout: 'right'
         }
-      },
-      spacing: {
-        pc: {},
-        mobile: {}
       }
     },
     secondButton: {
       parentId: groupId,
-      id: (0, _uuid.v4)(),
+      id: secButtonId,
       open: true,
       type: 'BUTTON',
       text: 'More',
@@ -137,7 +150,7 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
         backgroundColor: '#fff'
       },
       buttonText: {
-        sizeType: 'Headline 1',
+        sizeType: 'Customize font styles',
         fontFamily: 'Open Sans',
         fontWeight: 400,
         fontSize: 10,
@@ -153,13 +166,27 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
         iconUrl: '',
         layout: 'right'
       },
+      spacing: {
+        pc: {
+          paddingTop: 6,
+          paddingBottom: 6,
+          paddingLeft: 10,
+          paddingRight: 10
+        },
+        mobile: {
+          paddingTop: 6,
+          paddingBottom: 6,
+          paddingLeft: 10,
+          paddingRight: 10
+        }
+      },
       hover: {
         open: false,
         content: {
           backgroundColor: '#E9F0FF'
         },
         buttonText: {
-          sizeType: 'Headline 1',
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 14,
@@ -175,10 +202,6 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
           iconUrl: '',
           layout: 'right'
         }
-      },
-      spacing: {
-        pc: {},
-        mobile: {}
       }
     },
     background: {
@@ -191,7 +214,7 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
       open: false,
       image: {
         parentId: groupId,
-        id: (0, _uuid.v4)(),
+        id: imageId,
         open: false,
         type: 'IMAGE',
         content: {
@@ -211,7 +234,7 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
       },
       title: {
         parentId: groupId,
-        id: (0, _uuid.v4)(),
+        id: titleId,
         open: true,
         type: 'TEXT',
         specialContent: [],
@@ -231,13 +254,13 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
         vertical: {}
       },
       text: {
-        id: (0, _uuid.v4)(),
+        id: textId,
         open: true,
         type: 'TEXT',
         specialContent: [],
         text: '',
         content: {
-          sizeType: 'Headline 1',
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 400,
           fontSize: 18,
@@ -248,7 +271,7 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
         vertical: {}
       },
       button: {
-        id: (0, _uuid.v4)(),
+        id: buttonId,
         open: true,
         type: 'BUTTON',
         text: 'Button',
@@ -257,7 +280,7 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
           backgroundColor: '#2F54EB'
         },
         buttonText: {
-          sizeType: 'Headline 1',
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 14,
@@ -279,7 +302,7 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
             backgroundColor: '#0d39ed'
           },
           buttonText: {
-            sizeType: 'Headline 1',
+            sizeType: 'Customize font styles',
             fontFamily: 'Open Sans',
             fontWeight: 600,
             fontSize: 14,
@@ -298,7 +321,7 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
         }
       },
       secondButton: {
-        id: (0, _uuid.v4)(),
+        id: secButtonId,
         open: true,
         type: 'BUTTON',
         text: 'More',
@@ -307,7 +330,7 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
           backgroundColor: '#fff'
         },
         buttonText: {
-          sizeType: 'Headline 1',
+          sizeType: 'Customize font styles',
           fontFamily: 'Open Sans',
           fontWeight: 600,
           fontSize: 14,
@@ -329,7 +352,7 @@ var ImageTextGroupSourceJSON = function ImageTextGroupSourceJSON() {
             backgroundColor: '#E9F0FF'
           },
           buttonText: {
-            sizeType: 'Headline 1',
+            sizeType: 'Customize font styles',
             fontFamily: 'Open Sans',
             fontWeight: 600,
             fontSize: 14,
@@ -363,151 +386,6 @@ var getDefaultJSON = function getDefaultJSON() {
   return {
     id: (0, _uuid.v4)(),
     type: 'IMAGE_TEXT',
-    // headline: {
-    //   id: uuidv4(),
-    //   open: true,
-    //   type: 'TEXT',
-    //   specialContent: [],
-    //   text: 'Digital Maturity',
-    //   content: {
-    //     sizeType: 'Headline 1',
-    //     fontFamily: 'Open Sans',
-    //     fontWeight: 600,
-    //     fontSize: 28,
-    //     color: '#232F46',
-    //     width: 0,
-    //   },
-    //   underline: {
-    //     open: false,
-    //     textDecorationColor: '',
-    //     textDecorationStyle: 'solid',
-    //   },
-    //   vertical: {
-    //   },
-    // },
-    // subtitle: {
-    //   id: uuidv4(),
-    //   open: true,
-    //   type: 'TEXT',
-    //   specialContent: [],
-    //   text: 'Freedom to innovate and create with ODA compliant B/OSS solutions',
-    //   content: {
-    //     sizeType: 'Headline 1',
-    //     fontFamily: 'Open Sans',
-    //     fontWeight: 400,
-    //     // textAlign: 'center',
-    //     fontSize: 16,
-    //     color: '#232F46',
-    //     width: 0,
-    //   },
-    //   underline: {
-    //     open: false,
-    //     textDecorationColor: '',
-    //     textDecorationStyle: 'solid',
-    //   },
-    //   vertical: {
-    //   },
-    // },
-    // button: {
-    //   id: uuidv4(),
-    //   open: true,
-    //   type: 'BUTTON',
-    //   text: 'Button',
-    //   content: {
-    //     url: '',
-    //     backgroundColor: '#2F54EB',
-    //   },
-    //   buttonText: {
-    //     sizeType: 'Headline 1',
-    //     fontFamily: 'Open Sans',
-    //     fontWeight: 600,
-    //     fontSize: 14,
-    //     fontStyle: 'normal',
-    //     color: '#fff',
-    //   },
-    //   buttonBorder: {
-    //     open: true,
-    //     borderColor: '',
-    //     borderRadius: 6,
-    //   },
-    //   buttonIcon: {
-    //     iconUrl: '',
-    //     layout: 'right',
-    //   },
-    //   hover: {
-    //     open: false,
-    //     content: {
-    //       backgroundColor: '#0d39ed',
-    //     },
-    //     buttonText: {
-    //       sizeType: 'Headline 1',
-    //       fontFamily: 'Open Sans',
-    //       fontWeight: 600,
-    //       fontSize: 14,
-    //       fontStyle: 'normal',
-    //       color: '#fff',
-    //     },
-    //     buttonBorder: {
-    //       open: true,
-    //       borderColor: '',
-    //       borderRadius: 6,
-    //     },
-    //     buttonIcon: {
-    //       iconUrl: '',
-    //       layout: 'right',
-    //     },
-    //   },
-    // },
-    // secondButton: {
-    //   id: uuidv4(),
-    //   open: false,
-    //   type: 'BUTTON',
-    //   text: 'Button',
-    //   content: {
-    //     url: '',
-    //     backgroundColor: '#FFFFFF',
-    //   },
-    //   buttonText: {
-    //     sizeType: 'Headline 1',
-    //     fontFamily: 'Open Sans',
-    //     fontWeight: 600,
-    //     fontSize: 14,
-    //     fontStyle: 'normal',
-    //     color: '#2F54EB',
-    //   },
-    //   buttonBorder: {
-    //     open: true,
-    //     borderColor: '#2F54EB',
-    //     borderRadius: 6,
-    //   },
-    //   buttonIcon: {
-    //     iconUrl: '',
-    //     layout: 'right',
-    //   },
-    //   hover: {
-    //     open: false,
-    //     content: {
-    //       backgroundColor: '#0d39ed',
-    //     },
-    //     buttonText: {
-    //       sizeType: 'Headline 1',
-    //       fontFamily: 'Open Sans',
-    //       fontWeight: 600,
-    //       fontSize: 14,
-    //       fontStyle: 'normal',
-    //       color: '#fff',
-    //     },
-    //     buttonBorder: {
-    //       open: true,
-    //       borderColor: '',
-    //       borderRadius: 6,
-    //     },
-    //     buttonIcon: {
-    //       iconUrl: '',
-    //       layout: 'right',
-    //     },
-    //   },
-    // },
     spacing: {
       pc: {
         paddingTop: 10,

package/es/composite-comp/bol/components/ImageText/mobile/index.js

@@ -15,8 +15,6 @@ var _AlignSelector = require("../../../../../common/AlignSelector");
 
 var _components = require("../../../../../meta-comp/components");
 
-var _businessUtil = require("../../../../../utils/businessUtil");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -104,10 +102,9 @@ function (_super) {
   ImageTextMobile.prototype.render = function () {
     var _this = this;
 
-    var data = this.props.data; // const { ready } = this.state;
-    // console.log('----imagetext mobile', data);
+    var data = this.props.data; // console.log('----imagetext mobile', data);
 
-    var wrapStyle = (0, _businessUtil.computeStyle)(data, window.magicDesign.device);
+    var wrapStyle = {};
     wrapStyle.textAlign = data.customize.align; // if (data.background.bgType === 'color') {
     //   wrapStyle.backgroundColor = data.background.color;
     //   wrapStyle.opacity = data.background.opacity ? data.background.opacity : 1;
@@ -126,6 +123,7 @@ function (_super) {
       cardBtnStyle.justifyContent = _AlignSelector.alignItemMap[data.customize.align];
     }
 
+    console.log('source', data);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('image-text-mobile', data.customize.layout.h5Layout),
       style: wrapStyle

package/es/composite-comp/bol/components/ImageText/mobile/index.less

@@ -59,8 +59,8 @@
         }
         .card-btn-wrap {
           display: flex;
-          .card-first-btn {
-            margin-right: 12px;
+          .card-second-btn {
+            margin-left: 12px;
           }
         }
       }
@@ -94,8 +94,8 @@
         }
         .card-btn-wrap {
           display: flex;
-          .card-first-btn {
-            margin-right: 12px;
+          .card-second-btn {
+            margin-left: 12px;
           }
         }
       }
@@ -135,8 +135,8 @@
         flex-direction: column;
       }
 
-      .card-second-btn {
-        margin-top: 8px;
+      .card-first-btn, .card-second-btn {
+        margin-bottom: 8px;
       }
     }
     .card-margin-bottom {
@@ -170,8 +170,8 @@
         }
         .card-btn-wrap {
           display: flex;
-          .card-first-btn {
-            margin-right: 12px;
+          .card-second-btn {
+            margin-left: 12px;
           }
         }
       }

package/es/composite-comp/bol/components/ImageText/pc/index.js

@@ -11,6 +11,8 @@ require("./index.less");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _lodash = require("lodash");
+
 var _AlignSelector = require("../../../../../common/AlignSelector");
 
 var _components = require("../../../../../meta-comp/components");
@@ -63,7 +65,7 @@ var __assign = void 0 && (void 0).__assign || function () {
 
 var maxWidthAndHeight = {
   normal: 410,
-  outside: 100,
+  outside: 86,
   center: 410
 };
 
@@ -76,17 +78,26 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {
-      hoverIndex: -1
-    }; // componentDidMount() {
-    //   this.distroy = autorun(() => {
-    //     this.setState({
-    //       clickedGroup: store.clickedGroup,
-    //     });
-    //   });
-    // }
-    // componentWillUnmount() {
-    //   this.distroy();
-    // }
+      hoverIndex: -1,
+      currentMaxWidth: 410
+    };
+
+    _this.listenCardWidth = function () {
+      var _a;
+
+      var data = _this.props.data;
+
+      try {
+        var cardWidth = ((_a = document.querySelector('.group-wrap .one-card')) === null || _a === void 0 ? void 0 : _a.offsetWidth) - 48;
+        var maxLayoutWidth = maxWidthAndHeight[data.customize.layout.pcLayout];
+
+        _this.setState({
+          currentMaxWidth: Math.min(cardWidth, maxLayoutWidth)
+        });
+      } catch (error) {
+        console.log(error);
+      }
+    };
 
     _this.calcWidth = function (num) {
       return (100 - (num - 1) * 2) / num + "%";
@@ -114,15 +125,32 @@ function (_super) {
     return _this;
   }
 
+  ImageTextPc.prototype.componentDidMount = function () {
+    var data = this.props.data;
+    this.layout = data.customize.layout.pcLayout;
+    this.listenCardWidth();
+    window.addEventListener('resize', (0, _lodash.debounce)(this.listenCardWidth));
+  };
+
+  ImageTextPc.prototype.componentWillUnmount = function () {
+    window.removeEventListener('resize', this.listenCardWidth);
+  };
+
+  ImageTextPc.prototype.componentWillReceiveProps = function (nextProps) {
+    if (nextProps.data.customize.layout.pcLayout !== this.layout) {
+      this.layout = nextProps.data.customize.layout.pcLayout;
+      this.listenCardWidth();
+    }
+  };
+
   ImageTextPc.prototype.render = function () {
     var _this = this;
 
     var data = this.props.data;
-    var hoverIndex = this.state.hoverIndex; // console.log('====================================');
-    // console.log(data);
-    // console.log('====================================');
-
-    var wrapStyle = (0, _businessUtil.computeStyle)(data, window.magicDesign.device);
+    var _a = this.state,
+        hoverIndex = _a.hoverIndex,
+        currentMaxWidth = _a.currentMaxWidth;
+    var wrapStyle = {};
     wrapStyle.alignItems = _AlignSelector.alignItemMap[data.customize.align];
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('image-text-pc', data.customize.layout.pcLayout),
@@ -156,7 +184,7 @@ function (_super) {
         data: hoverIndex == i ? source.hover.image : source.image,
         limitWidthHeight: true,
         maxHeight: maxWidthAndHeight[data.customize.layout.pcLayout],
-        maxWidth: maxWidthAndHeight[data.customize.layout.pcLayout],
+        maxWidth: currentMaxWidth,
         scale: 0.5
       })), (source.title.open && data.customize.layout.pcLayout !== 'center' && hoverIndex != i || hoverIndex == i && source.hover.title.open && data.customize.layout.pcLayout !== 'center') && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
         className: "card-title",

package/es/composite-comp/bol/components/ImageText/pc/index.less

@@ -45,9 +45,11 @@
         width: fit-content;
         display: flex;
         .card-first-btn {
+          cursor: pointer;
           margin-right: 12px;
         }
         .card-second-btn {
+          cursor: pointer;
           margin-top: 0;
         }
       }

package/es/composite-comp/bol/components/Newsletter/defaultJSON.js

@@ -30,7 +30,7 @@ var getDefaultMetaTextJson = function getDefaultMetaTextJson() {
   return {
     id: (0, _uuid.v4)(),
     open: true,
-    type: 'Text',
+    type: 'TEXT',
     specialContent: [],
     text: 'Thank you for you subscription',
     content: {
@@ -111,12 +111,12 @@ var getDefaultJSON = function getDefaultJSON() {
       pc: {
         paddingTop: 10,
         paddingBottom: 10,
-        marginBottom: 0
+        marginBottom: window.magicDesign.compSpacing * 1.5
       },
       mobile: {
         paddingTop: 10,
         paddingBottom: 10,
-        marginBottom: 0
+        marginBottom: window.magicDesign.compSpacing
       }
     },
     customize: {