tg-core-components 6.3.11-3 → 6.3.11-5

package/es/widgets/ResponsibleGamingWidget/Timespan.js

@@ -246,8 +246,7 @@ var DefaultTimespan = function DefaultTimespan(_ref10) {
       messages = _ref10.messages,
       isTime = _ref10.isTime,
       valueType = _ref10.valueType,
-      setValueType = _ref10.setValueType,
-      setValueTransform = _ref10.setValueTransform;
+      setValueType = _ref10.setValueType;
 
   var _useState = useState(newLimit ? newLimit.Amount : currentLimit ? currentLimit.Amount : 0),
       _useState2 = _slicedToArray(_useState, 2),
@@ -314,12 +313,12 @@ var DefaultTimespan = function DefaultTimespan(_ref10) {
     setInputMode('select');
   };
 
-  var _onChange = function _onChange(value) {
+  var _onChange = function _onChange(value, isOther) {
     if (value === 'other') {
       setInputMode('input');
       setValue('');
     } else {
-      onChangeLimit(isNaN(parseInt(value)) ? getByPath(currentLimit, 'Amount') : parseInt(value));
+      onChangeLimit(isNaN(parseInt(value)) ? getByPath(currentLimit, 'Amount') : parseInt(value), isOther);
     }
   };
 
@@ -355,9 +354,8 @@ var DefaultTimespan = function DefaultTimespan(_ref10) {
           pattern: '\\d*',
           value: value,
           onChange: function onChange(e, value) {
-            var transformedValue = typeof setValueTransform === 'function' ? setValueTransform(parseInt(value), currentLimit, true) : value;
-            setValue(transformedValue);
-            if (transformedValue > 0) _onChange(transformedValue);
+            setValue(parseInt(value));
+            if (value > 0) _onChange(value, true);
           },
           autoFocus: !isIphone,
           min: validationState['limit-remove-blocked'] ? '1' : '0',

package/es/widgets/ResponsibleGamingWidget/index.js

@@ -88,8 +88,9 @@ var ResponsibleGaming = function ResponsibleGaming(_ref) {
     };
   };
 
-  var onSubmitLimits = function onSubmitLimits(type, product) {
+  var onSubmitLimits = function onSubmitLimits(type, product, transform) {
     return function (limits) {
+      console.log('Submitting limits', limits, type, product, transform);
       return typeof onSubmit === 'function' && onSubmit({
         type: type,
         product: product,
@@ -104,7 +105,7 @@ var ResponsibleGaming = function ResponsibleGaming(_ref) {
    * There can only be one limit with status "NewLimit" for each type/timespan
    */
   var onChangeLimit = function onChangeLimit(type, product) {
-    return function (timespan) {
+    return function (timespan, isOther) {
       return function (amount) {
         var newLimit = {
           Id: getByPath(normalizedLimits, '[' + type + '].timespans[' + timespan + '].currentLimit.Id'),
@@ -112,7 +113,8 @@ var ResponsibleGaming = function ResponsibleGaming(_ref) {
           Product: product,
           Timespan: timespan,
           Amount: amount,
-          Status: 'NewLimit'
+          Status: 'NewLimit',
+          IsOther: isOther
         };
         var limits = localLimits.filter(function (l) {
           return !(l.Type === newLimit.Type && l.Product === newLimit.Product && l.Timespan === newLimit.Timespan && l.Status === newLimit.Status);
@@ -139,7 +141,7 @@ var ResponsibleGaming = function ResponsibleGaming(_ref) {
             tooltipOpen: normalizedLimits.tooltipOpen
           }),
           React.createElement(LimitContent, _extends({
-            onSubmitLimits: onSubmitLimits(normalizedLimits.type, normalizedLimits.product),
+            onSubmitLimits: onSubmitLimits(normalizedLimits.type, normalizedLimits.product, normalizedLimits.setValueTransform),
             onChangeLimit: onChangeLimit(normalizedLimits.type, normalizedLimits.product),
             hideSubmit: hideSubmit,
             onConfirmLimit: onConfirmLimit,
@@ -181,7 +183,6 @@ var LimitContent = function LimitContent(_ref3) {
       values = _ref3.values,
       valueType = _ref3.valueType,
       setValueType = _ref3.setValueType,
-      setValueTransform = _ref3.setValueTransform,
       hideRemainingLimit = _ref3.hideRemainingLimit,
       showCurrentValue = _ref3.showCurrentValue,
       hideOther = _ref3.hideOther,
@@ -194,6 +195,7 @@ var LimitContent = function LimitContent(_ref3) {
   var alerts = getAlerts(Object.keys(timespans));
 
   var onSubmit = function onSubmit(e) {
+    console.log('Submitting form', timespans);
     e.preventDefault();
     var limits = Object.values(timespans).filter(function (t) {
       return !t.pendingDeleteLimit && !t.pendingActivateLimit;
@@ -246,7 +248,6 @@ var LimitContent = function LimitContent(_ref3) {
         values: values,
         valueType: valueType,
         setValueType: setValueType,
-        setValueTransform: setValueTransform,
         hideRemainingLimit: hideRemainingLimit,
         showCurrentValue: showCurrentValue,
         hideOther: hideOther

package/lib/widgets/ResponsibleGamingWidget/Timespan.js

@@ -277,8 +277,7 @@ var DefaultTimespan = function DefaultTimespan(_ref10) {
       messages = _ref10.messages,
       isTime = _ref10.isTime,
       valueType = _ref10.valueType,
-      setValueType = _ref10.setValueType,
-      setValueTransform = _ref10.setValueTransform;
+      setValueType = _ref10.setValueType;
 
   var _useState = (0, _react.useState)(newLimit ? newLimit.Amount : currentLimit ? currentLimit.Amount : 0),
       _useState2 = _slicedToArray(_useState, 2),
@@ -345,12 +344,12 @@ var DefaultTimespan = function DefaultTimespan(_ref10) {
     setInputMode('select');
   };
 
-  var _onChange = function _onChange(value) {
+  var _onChange = function _onChange(value, isOther) {
     if (value === 'other') {
       setInputMode('input');
       setValue('');
     } else {
-      onChangeLimit(isNaN(parseInt(value)) ? (0, _get2.default)(currentLimit, 'Amount') : parseInt(value));
+      onChangeLimit(isNaN(parseInt(value)) ? (0, _get2.default)(currentLimit, 'Amount') : parseInt(value), isOther);
     }
   };
 
@@ -386,9 +385,8 @@ var DefaultTimespan = function DefaultTimespan(_ref10) {
           pattern: '\\d*',
           value: value,
           onChange: function onChange(e, value) {
-            var transformedValue = typeof setValueTransform === 'function' ? setValueTransform(parseInt(value), currentLimit, true) : value;
-            setValue(transformedValue);
-            if (transformedValue > 0) _onChange(transformedValue);
+            setValue(parseInt(value));
+            if (value > 0) _onChange(value, true);
           },
           autoFocus: !isIphone,
           min: validationState['limit-remove-blocked'] ? '1' : '0',

package/lib/widgets/ResponsibleGamingWidget/index.js

@@ -130,8 +130,9 @@ var ResponsibleGaming = function ResponsibleGaming(_ref) {
     };
   };
 
-  var onSubmitLimits = function onSubmitLimits(type, product) {
+  var onSubmitLimits = function onSubmitLimits(type, product, transform) {
     return function (limits) {
+      console.log('Submitting limits', limits, type, product, transform);
       return typeof onSubmit === 'function' && onSubmit({
         type: type,
         product: product,
@@ -146,7 +147,7 @@ var ResponsibleGaming = function ResponsibleGaming(_ref) {
    * There can only be one limit with status "NewLimit" for each type/timespan
    */
   var onChangeLimit = function onChangeLimit(type, product) {
-    return function (timespan) {
+    return function (timespan, isOther) {
       return function (amount) {
         var newLimit = {
           Id: (0, _get2.default)(normalizedLimits, '[' + type + '].timespans[' + timespan + '].currentLimit.Id'),
@@ -154,7 +155,8 @@ var ResponsibleGaming = function ResponsibleGaming(_ref) {
           Product: product,
           Timespan: timespan,
           Amount: amount,
-          Status: 'NewLimit'
+          Status: 'NewLimit',
+          IsOther: isOther
         };
         var limits = localLimits.filter(function (l) {
           return !(l.Type === newLimit.Type && l.Product === newLimit.Product && l.Timespan === newLimit.Timespan && l.Status === newLimit.Status);
@@ -181,7 +183,7 @@ var ResponsibleGaming = function ResponsibleGaming(_ref) {
             tooltipOpen: normalizedLimits.tooltipOpen
           }),
           _react2.default.createElement(LimitContent, _extends({
-            onSubmitLimits: onSubmitLimits(normalizedLimits.type, normalizedLimits.product),
+            onSubmitLimits: onSubmitLimits(normalizedLimits.type, normalizedLimits.product, normalizedLimits.setValueTransform),
             onChangeLimit: onChangeLimit(normalizedLimits.type, normalizedLimits.product),
             hideSubmit: hideSubmit,
             onConfirmLimit: onConfirmLimit,
@@ -223,7 +225,6 @@ var LimitContent = function LimitContent(_ref3) {
       values = _ref3.values,
       valueType = _ref3.valueType,
       setValueType = _ref3.setValueType,
-      setValueTransform = _ref3.setValueTransform,
       hideRemainingLimit = _ref3.hideRemainingLimit,
       showCurrentValue = _ref3.showCurrentValue,
       hideOther = _ref3.hideOther,
@@ -236,6 +237,7 @@ var LimitContent = function LimitContent(_ref3) {
   var alerts = getAlerts(Object.keys(timespans));
 
   var onSubmit = function onSubmit(e) {
+    console.log('Submitting form', timespans);
     e.preventDefault();
     var limits = Object.values(timespans).filter(function (t) {
       return !t.pendingDeleteLimit && !t.pendingActivateLimit;
@@ -288,7 +290,6 @@ var LimitContent = function LimitContent(_ref3) {
         values: values,
         valueType: valueType,
         setValueType: setValueType,
-        setValueTransform: setValueTransform,
         hideRemainingLimit: hideRemainingLimit,
         showCurrentValue: showCurrentValue,
         hideOther: hideOther

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tg-core-components",
-  "version": "6.3.11-3",
+  "version": "6.3.11-5",
   "description": "tg-core-components",
   "main": "lib/index.js",
   "module": "es/index.js",