@mjhls/mjh-framework 1.0.1070 → 1.0.1071

package/dist/cjs/{index-4e9a219e.js → index-4c260728.js}

@@ -8709,12 +8709,18 @@ var Poll$1 = function Poll(_ref) {
       showAnswer = _useState4[0],
       setShowAnswer = _useState4[1];
 
+  var _useState5 = React.useState(false),
+      _useState6 = slicedToArray._slicedToArray(_useState5, 2),
+      showBorders = _useState6[0],
+      setShowBorders = _useState6[1];
+
   var choices = node.choices,
       question = node.question,
       response = node.response,
       _node$showResults = node.showResults,
-      showResults = _node$showResults === undefined ? false : _node$showResults;
+      showResults = _node$showResults === undefined ? '' : _node$showResults;
 
+  var inputRef = React.useRef([]);
 
   var onSubmitPoll = function onSubmitPoll(e, setShowAnswer) {
     e.preventDefault();
@@ -8723,7 +8729,8 @@ var Poll$1 = function Poll(_ref) {
   };
   React.useEffect(function () {
     if (showResults) {
-      setShowAnswer(showResults);
+      setShowAnswer(true);
+      setSelectedChoice(showResults);
     }
   }, [showResults]);
 
@@ -8735,9 +8742,32 @@ var Poll$1 = function Poll(_ref) {
       return acc;
     }
   }, 0);
+
+  React.useEffect(function () {
+    var tempArray = choices.filter(function (choice) {
+      if (choice.hasOwnProperty('choiceAnswer')) {
+        return choice;
+      }
+    });
+    setShowBorders(tempArray.length > 0);
+  }, [choices]);
+
+  function checkChoice(key) {
+    return key === selectedChoice;
+  }
+
+  var userChoiceSelection = function userChoiceSelection(e) {
+    if (inputRef.current[e.currentTarget.dataset['index']].checked) {
+      inputRef.current[e.currentTarget.dataset['index']].checked = false;
+    } else {
+      inputRef.current[e.currentTarget.dataset['index']].checked = true;
+      setSelectedChoice(inputRef.current[e.currentTarget.dataset['index']].value);
+    }
+  };
+
   return React__default["default"].createElement(
-    React__default["default"].Fragment,
-    null,
+    'div',
+    { className: 'pollHolder mb-3' },
     question && React__default["default"].createElement(
       'p',
       { className: 'font-weight-bold' },
@@ -8745,78 +8775,74 @@ var Poll$1 = function Poll(_ref) {
     ),
     !showAnswer && choices && choices.length > 0 && React__default["default"].createElement(
       'form',
-      { onSubmit: function onSubmit(e) {
+      { className: 'formPoll', onSubmit: function onSubmit(e) {
           return onSubmitPoll(e);
         } },
-      choices && choices.map(function (choice) {
+      choices && choices.map(function (choice, index) {
         return React__default["default"].createElement(
           'div',
-          { key: choice._key },
+          { key: choice._key, 'data-index': index, onClick: function onClick(e) {
+              return userChoiceSelection(e);
+            } },
           React__default["default"].createElement(
             'label',
             { className: 'pl-2' },
-            React__default["default"].createElement('input', { type: 'radio', id: 'male', name: choice._type, value: choice._key, onChange: function onChange(e) {
-                return setSelectedChoice(e.target.value);
-              } }),
+            React__default["default"].createElement('input', { ref: function ref(el) {
+                return inputRef.current[index] = el;
+              }, type: 'radio', id: 'male', name: choice._type, value: choice._key }),
             ' ' + choice.choiceText
           )
         );
       }),
       React__default["default"].createElement(
         reactBootstrap.Button,
-        { disabled: !selectedChoice, type: 'submit' },
+        { disabled: !selectedChoice, style: { width: '100%', borderRadius: '5px', fontWeight: 'bold  ' }, className: 'mt-3', type: 'submit' },
         'Vote'
       )
     ),
-    React__default["default"].createElement(
+    showAnswer && React__default["default"].createElement(
       'div',
-      { className: 'progress-container' },
+      { className: 'progress-container mb-3' },
       showAnswer && choices && choices.length > 0 && choices.map(function (choice) {
         var percentage = choicesTotalCount && choicesTotalCount > 0 ? choice.choiceCount ? Math.floor(choice.choiceCount * 100 / choicesTotalCount) : 0 : 0;
         return React__default["default"].createElement(
           'div',
-          { key: choice._key, className: 'mb-3' },
+          {
+            key: choice._key,
+            style: { border: showBorders ? choice.choiceAnswer === true ? '2px solid limegreen' : checkChoice(choice._key) ? '2px solid red' : '' : '' },
+            className: 'mb-3' },
           React__default["default"].createElement(
             'div',
             { className: 'correct-answer' },
+            React__default["default"].createElement(reactBootstrap.ProgressBar, { now: percentage }),
             React__default["default"].createElement(
               'div',
               null,
               choice.choiceText
             ),
-            choice.choiceAnswer === true && React__default["default"].createElement(
+            React__default["default"].createElement(
               'div',
-              null,
-              React__default["default"].createElement(
-                'span',
-                { style: { color: 'limegreen' } },
-                'Correct!'
-              )
+              { className: 'float-right' },
+              percentage,
+              '% (',
+              choice.choiceCount ? choice.choiceCount : 0,
+              ' Votes)'
             )
-          ),
-          React__default["default"].createElement(reactBootstrap.ProgressBar, { now: percentage }),
-          React__default["default"].createElement(
-            'span',
-            { className: 'float-right' },
-            percentage,
-            '% (',
-            choice.choiceCount ? choice.choiceCount : 0,
-            ' Votes)'
           )
         );
-      })
-    ),
-    showAnswer && React__default["default"].createElement(
-      'h4',
-      { className: 'text-center small p-3' },
-      'Total Votes: ',
-      choicesTotalCount
+      }),
+      showAnswer && React__default["default"].createElement(
+        'h4',
+        { className: 'text-center small p-3' },
+        'Total Votes: ',
+        choicesTotalCount
+      )
     ),
     showAnswer && response && React__default["default"].createElement(BlockContent.BlockContent, { blocks: response, serializers: getSerializers }),
     React__default["default"].createElement(
       'style',
       { jsx: 'true' },
-      '\n        .correct-answer {\n          display: flex;\n          justify-content: space-between;\n        }\n        .progress-bar {\n          color: #fff;\n        }\n      '
+      '\n        .formPoll > div {\n          box-shadow: 0 0 5px 2px #9b9b9b6b;\n          border-radius: 5px;\n          display: flex;\n          flex-direction: row;\n          align-items: center;\n          padding: 0.5rem 0;\n          text-align: left;\n          margin: 0.5rem 0;\n          cursor: pointer;\n        }\n        .formPoll > div:hover {\n          background-color: #cbcbcb;\n        }\n        .formPoll > div > label {\n          pointer-events: none;\n          margin-bottom: 0;\n        }\n        .pollHolder {\n          background-color: #eaeaea;\n          padding: 1rem;\n          border-radius: 5px;\n          box-shadow: 0 0 5px 2px #9b9b9b6b;\n        }\n        .progress-container > div {\n          position: relative;\n          font-weight: bold;\n          border-radius: 5px;\n          box-shadow: 0 0 5px 2px #9b9b9b6b;\n        }\n        .correct-answer {\n          display: flex;\n          justify-content: space-between;\n          flex-direction: row;\n          align-items: center;\n          background-color: darkgrey;\n          border-radius: 5px;\n        }\n        .float-right {\n          z-index: 2;\n          padding-right: 1rem;\n          color: #fff;\n        }\n        .progress {\n          align-self: flex-start;\n          display: contents;\n          border-radius: 5px;\n        }\n        .progress-bar {\n          width: 33%;\n          height: 100%;\n          position: absolute;\n          border-radius: 5px 0 0 5px;\n          background-color: var(--primary);\n        }\n        .correct-answer > div:nth-child(2) {\n          z-index: 1;\n          color: white;\n          padding-left: 0.5rem;\n          max-width: 75%;\n        }\n      '
     )
   );
 };
@@ -8830,62 +8856,75 @@ var Poll = function Poll(_ref) {
       _ref.showVotes;
       var getSerializers = _ref.getSerializers;
 
-  var _useState = React.useState(null),
+  var _useState = React.useState([]),
       _useState2 = slicedToArray._slicedToArray(_useState, 2),
       selectedChoice = _useState2[0],
       setSelectedChoice = _useState2[1];
 
-  var _useState3 = React.useState(false),
+  var _useState3 = React.useState(true),
       _useState4 = slicedToArray._slicedToArray(_useState3, 2),
-      showAnswer = _useState4[0],
-      setShowAnswer = _useState4[1];
+      disableVote = _useState4[0],
+      setDisableVote = _useState4[1];
+
+  var _useState5 = React.useState(false),
+      _useState6 = slicedToArray._slicedToArray(_useState5, 2),
+      showAnswer = _useState6[0],
+      setShowAnswer = _useState6[1];
+
+  var _useState7 = React.useState(false),
+      _useState8 = slicedToArray._slicedToArray(_useState7, 2),
+      showBorders = _useState8[0],
+      setShowBorders = _useState8[1];
 
   var choices = node.choices,
       question = node.question,
       response = node.response,
       _node$showResults = node.showResults,
-      showResults = _node$showResults === undefined ? false : _node$showResults;
+      showResults = _node$showResults === undefined ? '' : _node$showResults;
 
+  var inputRef = React.useRef([]);
 
-  var onSubmitPoll = function onSubmitPoll(e, setShowAnswer) {
+  var onSubmitPoll = function onSubmitPoll(e) {
     e.preventDefault();
-    var selections = [];
-    var _iteratorNormalCompletion = true;
-    var _didIteratorError = false;
-    var _iteratorError = undefined;
-
-    try {
-      for (var _iterator = slicedToArray._getIterator(_Object$values(e.currentTarget)), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-        var input = _step.value;
-
-        if (input.nodeName === 'INPUT' && input.checked) {
-          selections.push(input.value);
-        }
-      }
-    } catch (err) {
-      _didIteratorError = true;
-      _iteratorError = err;
-    } finally {
-      try {
-        if (!_iteratorNormalCompletion && _iterator.return) {
-          _iterator.return();
-        }
-      } finally {
-        if (_didIteratorError) {
-          throw _iteratorError;
-        }
-      }
-    }
-
-    onVote(node._key, selections.join(','));
+    // const selections = []
+    // for (let input of Object.values(e.currentTarget)) {
+    //   if (input.nodeName === 'INPUT' && input.checked) {
+    //     selections.push(input.value)
+    //   }
+    // }
+    onVote(node._key, selectedChoice.toString());
     //setShowAnswer(true)
   };
   React.useEffect(function () {
     if (showResults) {
-      setShowAnswer(showResults);
+      setShowAnswer(true);
+      setSelectedChoice(showResults.split(','));
     }
   }, [showResults]);
 
+  React.useEffect(function () {
+    if (selectedChoice.length > 0) {
+      setDisableVote(false);
+    } else {
+      setDisableVote(true);
+    }
+  }, [selectedChoice]);
+
+  React.useEffect(function () {
+    var tempArray = choices.filter(function (choice) {
+      if (choice.hasOwnProperty('choiceAnswer')) {
+        return choice;
+      }
+    });
+    setShowBorders(tempArray.length > 0);
+  }, [choices]);
+
+  function checkChoice(key) {
+    return selectedChoice.find(function (value) {
+      return value === key;
+    });
+  }
+
   var choicesTotalCount = choices && choices.reduce(function (acc, choice) {
     if (choice.choiceCount) {
       acc = acc + parseInt(choice.choiceCount);
@@ -8894,9 +8933,26 @@ var Poll = function Poll(_ref) {
       return acc;
     }
   }, 0);
+
+  var userChoiceSelection = function userChoiceSelection(e) {
+    if (inputRef.current[e.currentTarget.dataset['index']].checked) {
+      inputRef.current[e.currentTarget.dataset['index']].checked = false;
+      var updateChoices = selectedChoice.filter(function (choice) {
+        if (inputRef.current[e.currentTarget.dataset['index']].value !== choice) {
+          return choice;
+        }
+      });
+      setSelectedChoice(updateChoices);
+    } else {
+      inputRef.current[e.currentTarget.dataset['index']].checked = true;
+
+      setSelectedChoice([inputRef.current[e.currentTarget.dataset['index']].value].concat(toConsumableArray._toConsumableArray(selectedChoice)));
+    }
+  };
+
   return React__default["default"].createElement(
-    React__default["default"].Fragment,
-    null,
+    'div',
+    { className: 'pollHolder mb-3' },
     question && React__default["default"].createElement(
       'p',
       { className: 'font-weight-bold' },
@@ -8904,78 +8960,74 @@ var Poll = function Poll(_ref) {
     ),
     !showAnswer && choices && choices.length > 0 && React__default["default"].createElement(
       'form',
-      { onSubmit: function onSubmit(e) {
+      { className: 'multiChoicePoll', onSubmit: function onSubmit(e) {
           return onSubmitPoll(e);
         } },
-      choices && choices.map(function (choice) {
+      choices && choices.map(function (choice, index) {
         return React__default["default"].createElement(
           'div',
-          { key: choice._key },
+          { key: choice._key, 'data-index': index, onClick: function onClick(e) {
+              return userChoiceSelection(e);
+            } },
           React__default["default"].createElement(
             'label',
             { className: 'pl-2' },
-            React__default["default"].createElement('input', { type: 'checkbox', id: 'male', name: choice._type, value: choice._key, onChange: function onChange(e) {
-                return setSelectedChoice(e.target.value);
-              } }),
+            React__default["default"].createElement('input', { ref: function ref(el) {
+                return inputRef.current[index] = el;
+              }, type: 'checkbox', id: 'male', name: choice._type, value: choice._key }),
             ' ' + choice.choiceText
           )
         );
       }),
       React__default["default"].createElement(
         reactBootstrap.Button,
-        { disabled: !selectedChoice, type: 'submit' },
+        { disabled: disableVote, style: { width: '100%', borderRadius: '5px', fontWeight: 'bold  ' }, className: 'mt-3', type: 'submit' },
         'Vote'
       )
     ),
-    React__default["default"].createElement(
+    showAnswer && React__default["default"].createElement(
       'div',
-      { className: 'progress-container' },
+      { className: 'progress-container mb-3' },
       showAnswer && choices && choices.length > 0 && choices.map(function (choice) {
         var percentage = choicesTotalCount && choicesTotalCount > 0 ? choice.choiceCount ? Math.floor(choice.choiceCount * 100 / choicesTotalCount) : 0 : 0;
         return React__default["default"].createElement(
           'div',
-          { key: choice._key, className: 'mb-3' },
+          {
+            key: choice._key,
+            style: { border: showBorders ? choice.choiceAnswer === true ? '2px solid limegreen' : checkChoice(choice._key) ? '2px solid red' : '' : '' },
+            className: 'mb-3' },
           React__default["default"].createElement(
             'div',
             { className: 'correct-answer' },
+            React__default["default"].createElement(reactBootstrap.ProgressBar, { now: percentage }),
             React__default["default"].createElement(
               'div',
               null,
               choice.choiceText
             ),
-            choice.choiceAnswer === true && React__default["default"].createElement(
+            React__default["default"].createElement(
               'div',
-              null,
-              React__default["default"].createElement(
-                'span',
-                { style: { color: 'limegreen' } },
-                'Correct!'
-              )
+              { className: 'float-right' },
+              percentage,
+              '% (',
+              choice.choiceCount ? choice.choiceCount : 0,
+              ' Votes)'
             )
-          ),
-          React__default["default"].createElement(reactBootstrap.ProgressBar, { now: percentage }),
-          React__default["default"].createElement(
-            'span',
-            { className: 'float-right' },
-            percentage,
-            '% (',
-            choice.choiceCount ? choice.choiceCount : 0,
-            ' Votes)'
           )
         );
-      })
-    ),
-    showAnswer && React__default["default"].createElement(
-      'h4',
-      { className: 'text-center small p-3' },
-      'Total Votes: ',
-      choicesTotalCount
+      }),
+      showAnswer && React__default["default"].createElement(
+        'h4',
+        { className: 'text-center small p-3' },
+        'Total Votes: ',
+        choicesTotalCount
+      )
     ),
     showAnswer && response && React__default["default"].createElement(BlockContent.BlockContent, { blocks: response, serializers: getSerializers }),
     React__default["default"].createElement(
       'style',
       { jsx: 'true' },
-      '\n        .correct-answer {\n          width: 100%;\n          display: flex;\n          justify-content: space-between;\n          padding: 0 0.5rem;\n        }\n        .progress-bar {\n          color: #fff;\n        }\n      '
+      '\n        .multiChoicePoll > div {\n          box-shadow: 0 0 5px 2px #9b9b9b6b;\n          border-radius: 5px;\n          display: flex;\n          flex-direction: row;\n          align-items: center;\n          padding: 0.5rem 0;\n          text-align: left;\n          margin: 0.5rem 0;\n          cursor: pointer;\n        }\n        .multiChoicePoll > div:hover {\n          background-color: #cbcbcb;\n        }\n        .multiChoicePoll > div > label {\n          pointer-events: none;\n          margin-bottom: 0;\n        }\n        .pollHolder {\n          background-color: #eaeaea;\n          padding: 1rem;\n          border-radius: 5px;\n          box-shadow: 0 0 5px 2px #9b9b9b6b;\n        }\n        .progress-container > div {\n          position: relative;\n          font-weight: bold;\n          border-radius: 5px;\n          box-shadow: 0 0 5px 2px #9b9b9b6b;\n        }\n        .correct-answer {\n          display: flex;\n          justify-content: space-between;\n          flex-direction: row;\n          align-items: center;\n          background-color: darkgrey;\n          border-radius: 5px;\n        }\n        .float-right {\n          z-index: 2;\n          padding-right: 1rem;\n          color: #fff;\n        }\n        .progress {\n          align-self: flex-start;\n          display: contents;\n          border-radius: 5px;\n        }\n        .progress-bar {\n          width: 33%;\n          height: 100%;\n          position: absolute;\n          border-radius: 5px 0 0 5px;\n          background-color: var(--primary);\n        }\n        .correct-answer > div:nth-child(2) {\n          z-index: 1;\n          color: white;\n          padding-left: 0.5rem;\n          max-width: 75%;\n        }\n      '
     )
   );
 };

package/dist/cjs/{index-9ec837cc.js → index-50be6759.js}

@@ -35,9 +35,18 @@ function _objectWithoutPropertiesLoose(source, excluded) {
   return target;
 }
 
+function _setPrototypeOf(o, p) {
+  _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) {
+    o.__proto__ = p;
+    return o;
+  };
+
+  return _setPrototypeOf(o, p);
+}
+
 var classnames = _commonjsHelpers.createCommonjsModule(function (module) {
 /*!
-  Copyright (c) 2017 Jed Watson.
+  Copyright (c) 2018 Jed Watson.
   Licensed under the MIT License (MIT), see
   http://jedwatson.github.io/classnames
 */
@@ -47,7 +56,7 @@ var classnames = _commonjsHelpers.createCommonjsModule(function (module) {
 
 	var hasOwn = {}.hasOwnProperty;
 
-	function classNames () {
+	function classNames() {
 		var classes = [];
 
 		for (var i = 0; i < arguments.length; i++) {
@@ -58,16 +67,22 @@ var classnames = _commonjsHelpers.createCommonjsModule(function (module) {
 
 			if (argType === 'string' || argType === 'number') {
 				classes.push(arg);
-			} else if (Array.isArray(arg) && arg.length) {
-				var inner = classNames.apply(null, arg);
-				if (inner) {
-					classes.push(inner);
+			} else if (Array.isArray(arg)) {
+				if (arg.length) {
+					var inner = classNames.apply(null, arg);
+					if (inner) {
+						classes.push(inner);
+					}
 				}
 			} else if (argType === 'object') {
-				for (var key in arg) {
-					if (hasOwn.call(arg, key) && arg[key]) {
-						classes.push(key);
+				if (arg.toString === Object.prototype.toString) {
+					for (var key in arg) {
+						if (hasOwn.call(arg, key) && arg[key]) {
+							classes.push(key);
+						}
 					}
+				} else {
+					classes.push(arg.toString());
 				}
 			}
 		}
@@ -86,4 +101,5 @@ var classnames = _commonjsHelpers.createCommonjsModule(function (module) {
 
 exports._extends = _extends;
 exports._objectWithoutPropertiesLoose = _objectWithoutPropertiesLoose;
+exports._setPrototypeOf = _setPrototypeOf;
 exports.classnames = classnames;

package/dist/cjs/index.js

@@ -90,7 +90,7 @@ var VerticalHero = require('./VerticalHero.js');
 var YahooHero = require('./YahooHero.js');
 var GridHero = require('./GridHero.js');
 var ConferenceArticleCard = require('./ConferenceArticleCard.js');
-var getSerializers = require('./index-4e9a219e.js');
+var getSerializers = require('./index-4c260728.js');
 var Beam = require('./Beam.js');
 var Segment = require('./Segment.js');
 var KMTracker = require('./KMTracker.js');
@@ -156,7 +156,8 @@ require('./_object-to-array-9337ba83.js');
 require('react-bootstrap/Spinner');
 require('react-bootstrap/Form');
 require('./js.cookie-a511c430.js');
-require('./index-9ec837cc.js');
+require('./typeof-1358762e.js');
+require('./index-50be6759.js');
 require('./ConferenceBanner-213003ce.js');
 require('next/head');
 require('@mjhls/mjh-framework/dist/cjs/urlFor');
@@ -192,7 +193,8 @@ require('./SeriesSlider-086a8319.js');
 require('./style-inject.es-dcee06b6.js');
 require('disqus-react');
 require('react-twitter-embed');
-require('./ImageSlider-d65bc9c8.js');
+require('./ImageSlider-984a697b.js');
+require('./defineProperty-e0fb52c5.js');
 require('./VideoSeriesCard.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }

package/dist/cjs/typeof-1358762e.js

@@ -0,0 +1,33 @@
+'use strict';
+
+var _commonjsHelpers = require('./_commonjsHelpers-06173234.js');
+
+var _typeof_1 = _commonjsHelpers.createCommonjsModule(function (module) {
+function _typeof(obj) {
+  "@babel/helpers - typeof";
+
+  if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") {
+    module.exports = _typeof = function _typeof(obj) {
+      return typeof obj;
+    };
+
+    module.exports["default"] = module.exports, module.exports.__esModule = true;
+  } else {
+    module.exports = _typeof = function _typeof(obj) {
+      return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj;
+    };
+
+    module.exports["default"] = module.exports, module.exports.__esModule = true;
+  }
+
+  return _typeof(obj);
+}
+
+module.exports = _typeof;
+module.exports["default"] = module.exports, module.exports.__esModule = true;
+});
+
+var _typeof = _commonjsHelpers.unwrapExports(_typeof_1);
+
+exports._typeof = _typeof;
+exports._typeof_1 = _typeof_1;