@mjhls/mjh-framework 1.0.199 → 1.0.200

package/dist/index.js

@@ -7,7 +7,7 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 var React = require('react');
 var React__default = _interopDefault(React);
 var PropTypes = _interopDefault(require('prop-types'));
-var reactDom = _interopDefault(require('react-dom'));
+var require$$1 = _interopDefault(require('react-dom'));
 var Container = _interopDefault(require('react-bootstrap/Container'));
 var Row = _interopDefault(require('react-bootstrap/Row'));
 var Col = _interopDefault(require('react-bootstrap/Col'));
@@ -7194,7 +7194,7 @@ var InfiniteScroll = /** @class */ (function (_super) {
 
 var visibilitySensor = createCommonjsModule(function (module, exports) {
 (function webpackUniversalModuleDefinition(root, factory) {
-	module.exports = factory(React__default, reactDom);
+	module.exports = factory(React__default, require$$1);
 })(commonjsGlobal, function(__WEBPACK_EXTERNAL_MODULE__1__, __WEBPACK_EXTERNAL_MODULE__2__) {
 return /******/ (function(modules) { // webpackBootstrap
 /******/ 	// The module cache
@@ -8502,7 +8502,7 @@ var _react2 = _interopRequireDefault(React__default);
 
 
 
-var _reactDom2 = _interopRequireDefault(reactDom);
+var _reactDom2 = _interopRequireDefault(require$$1);
 
 
 
@@ -12153,15 +12153,18 @@ var GridContent = function (_React$Component) {
       };
       var posts = [];
       if (showBI) {
-        var interval = brandInsight.interval;
         var data = this.state.data;
         posts = data;
-        var i = 1;
-        for (var pos = interval; pos <= posts.length;) {
+        var interval = posts.some(function (post) {
+          return post._type === 'feature';
+        }) ? brandInsight.interval + 1 : brandInsight.interval;
+        var pos = interval;
+        for (var i = 1; pos <= posts.length; ++i) {
           brandInsight.targeting.pos = 'article' + i;
           posts = insert(posts, pos, brandInsight);
-          pos += interval + 1;
-          i++;
+          pos += posts.some(function (post) {
+            return post._type === 'feature';
+          }) ? interval : interval + 1;
         }
       } else {
         posts = this.state.data;
@@ -15564,10 +15567,10 @@ var PageFilter = function PageFilter(props) {
   if (filters.length) {
     return React__default.createElement(
       reactBootstrap.Dropdown,
-      null,
+      { alignRight: true },
       React__default.createElement(
         reactBootstrap.Dropdown.Toggle,
-        { id: 'filter-dropdown' },
+        { className: 'filter-dropdown', id: 'filter-dropdown' },
         filter || defaultFilter
       ),
       React__default.createElement(
@@ -15586,7 +15589,7 @@ var PageFilter = function PageFilter(props) {
       React__default.createElement(
         'style',
         { jsx: 'true' },
-        '\n          .select-dropdown > a {\n            color: #8e8c84;\n          }\n        '
+        '\n          .filter-dropdown {\n            float: right;\n          }\n          .select-dropdown > a {\n            color: #8e8c84;\n          }\n        '
       )
     );
   }
@@ -15644,7 +15647,7 @@ var Column3 = function Column3(props) {
       React__default.createElement(
         'style',
         { jsx: 'true' },
-        '\n            .filter-box {\n              padding-top: 6px;\n              padding-right: 18px;\n            }\n            @media only screen and (min-width: 768px) {\n              .title-wrap {\n                display: flex;\n                justify-content: space-between;\n              }\n            }\n            @media only screen and (max-width: 767px) {\n              .filter-box {\n                float: right;\n                display: flex;\n                justify-content: flex-end;\n              }\n              .title-wrap {\n                display: flex;\n                flex-direction: column;\n                margin-bottom: 10px;\n              }\n            }\n          '
+        '\n            .filter-box {\n              float: right;\n              padding-top: 6px;\n              padding-right: 18px;\n            }\n            @media only screen and (min-width: 768px) {\n              .title-wrap {\n                display: flex;\n                justify-content: space-between;\n              }\n            }\n            @media only screen and (max-width: 767px) {\n              /* .filter-box {\n                float: right;\n                display: flex;\n                justify-content: flex-end;\n              } */\n              .title-wrap {\n                display: flex;\n                flex-direction: column;\n                margin-bottom: 10px;\n              }\n            }\n          '
       ),
       (!main_36 || showRightAd) && React__default.createElement(
         Col,