From 00c5e5d4e981e62073512482ca803e4969bfc2a8 Mon Sep 17 00:00:00 2001
From: Anderson Martins <anderson@publishpress.com>
Date: Fri, 15 Dec 2023 11:48:49 -0300
Subject: [PATCH] Fix the selected item on select boxes in the calendar, #1508

---
 modules/calendar/lib/async-calendar/js/Select.jsx   | 3 ++-
 modules/calendar/lib/async-calendar/js/index.min.js | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/calendar/lib/async-calendar/js/Select.jsx b/modules/calendar/lib/async-calendar/js/Select.jsx
index fff0870e..5f2dd303 100644
--- a/modules/calendar/lib/async-calendar/js/Select.jsx
+++ b/modules/calendar/lib/async-calendar/js/Select.jsx
@@ -86,7 +86,7 @@ export default function Select(props) {
 
     if (props.options) {
         options = props.options.map(option => {
-            return <option key={`select-option-${option.value}`} value={option.value} selected={option.value === props.value}>{option.text}</option>
+            return <option key={`select-option-${option.value}`} value={option.value}>{option.text}</option>
         });
     }
 
@@ -98,6 +98,7 @@ export default function Select(props) {
     className += props.metadata ? 'pp-calendar-form-metafied ' + props.post_types : '';
     return (
             <select className={className}
+                    defaultValue={props.value}
                     type="select"
                     name={props.name}
                     id={props.id}
diff --git a/modules/calendar/lib/async-calendar/js/index.min.js b/modules/calendar/lib/async-calendar/js/index.min.js
index a790a8ca..36a5d9b6 100644
--- a/modules/calendar/lib/async-calendar/js/index.min.js
+++ b/modules/calendar/lib/async-calendar/js/index.min.js
@@ -214,7 +214,7 @@ eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) *
 /***/ (function(module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
-eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"default\", function() { return Select; });\nvar $ = jQuery;\nfunction Select(props) {\n  var selectRef = React.useRef(null);\n\n  var getAllowClearProp = function getAllowClearProp() {\n    if (typeof props.allowClear !== 'undefined' && props.allowClear !== null) {\n      return props.allowClear;\n    }\n\n    return true;\n  };\n\n  var initSelect2 = function initSelect2() {\n    var params = {\n      placeholder: props.placeholder || false,\n      tags: true,\n      allowClear: getAllowClearProp()\n    };\n\n    if (props.ajaxUrl && props.ajaxAction) {\n      params.ajax = {\n        delay: 250,\n        url: props.ajaxUrl,\n        dataType: 'json',\n        data: function data(params) {\n          var args = {\n            q: params.term,\n            action: props.ajaxAction,\n            nonce: props.nonce\n          };\n\n          if (props.ajaxArgs) {\n            for (var arg in props.ajaxArgs) {\n              if (props.ajaxArgs.hasOwnProperty(arg)) {\n                args[arg] = props.ajaxArgs[arg];\n              }\n            }\n          }\n\n          return args;\n        },\n        processResults: function processResults(data) {\n          return {\n            results: data\n          };\n        }\n      };\n    }\n\n    $(selectRef.current).pp_select2(params).on('select2:select', function (e) {\n      if (typeof props.onSelect === 'function') {\n        props.onSelect(e, selectRef.current, $(selectRef.current).pp_select2('data'));\n      }\n    }).on('select2:clear', function (e) {\n      if (typeof props.onClear === 'function') {\n        props.onClear(e, selectRef.current);\n      }\n    });\n    return function () {\n      $(selectRef.current).pp_select2('destroy');\n    };\n  };\n\n  var blankOption = function blankOption() {\n    if (props.placeholder) {\n      return /*#__PURE__*/React.createElement(\"option\", {\n        value: \"\"\n      }, props.placeholder);\n    }\n\n    return /*#__PURE__*/React.createElement(React.Fragment, null);\n  };\n\n  React.useEffect(initSelect2, []);\n  var options;\n\n  if (props.options) {\n    options = props.options.map(function (option) {\n      return /*#__PURE__*/React.createElement(\"option\", {\n        key: \"select-option-\".concat(option.value),\n        value: option.value,\n        selected: option.value === props.value\n      }, option.text);\n    });\n  }\n\n  var className = 'pp_select2';\n\n  if (props.className) {\n    className += ' ' + props.className;\n  }\n\n  className += props.metadata ? 'pp-calendar-form-metafied ' + props.post_types : '';\n  return /*#__PURE__*/React.createElement(\"select\", {\n    className: className,\n    type: \"select\",\n    name: props.name,\n    id: props.id,\n    multiple: props.multiple,\n    ref: selectRef\n  }, blankOption(), options);\n}\n\n//# sourceURL=webpack:///./modules/calendar/lib/async-calendar/js/Select.jsx?");
+eval("__webpack_require__.r(__webpack_exports__);\n/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, \"default\", function() { return Select; });\nvar $ = jQuery;\nfunction Select(props) {\n  var selectRef = React.useRef(null);\n\n  var getAllowClearProp = function getAllowClearProp() {\n    if (typeof props.allowClear !== 'undefined' && props.allowClear !== null) {\n      return props.allowClear;\n    }\n\n    return true;\n  };\n\n  var initSelect2 = function initSelect2() {\n    var params = {\n      placeholder: props.placeholder || false,\n      tags: true,\n      allowClear: getAllowClearProp()\n    };\n\n    if (props.ajaxUrl && props.ajaxAction) {\n      params.ajax = {\n        delay: 250,\n        url: props.ajaxUrl,\n        dataType: 'json',\n        data: function data(params) {\n          var args = {\n            q: params.term,\n            action: props.ajaxAction,\n            nonce: props.nonce\n          };\n\n          if (props.ajaxArgs) {\n            for (var arg in props.ajaxArgs) {\n              if (props.ajaxArgs.hasOwnProperty(arg)) {\n                args[arg] = props.ajaxArgs[arg];\n              }\n            }\n          }\n\n          return args;\n        },\n        processResults: function processResults(data) {\n          return {\n            results: data\n          };\n        }\n      };\n    }\n\n    $(selectRef.current).pp_select2(params).on('select2:select', function (e) {\n      if (typeof props.onSelect === 'function') {\n        props.onSelect(e, selectRef.current, $(selectRef.current).pp_select2('data'));\n      }\n    }).on('select2:clear', function (e) {\n      if (typeof props.onClear === 'function') {\n        props.onClear(e, selectRef.current);\n      }\n    });\n    return function () {\n      $(selectRef.current).pp_select2('destroy');\n    };\n  };\n\n  var blankOption = function blankOption() {\n    if (props.placeholder) {\n      return /*#__PURE__*/React.createElement(\"option\", {\n        value: \"\"\n      }, props.placeholder);\n    }\n\n    return /*#__PURE__*/React.createElement(React.Fragment, null);\n  };\n\n  React.useEffect(initSelect2, []);\n  var options;\n\n  if (props.options) {\n    options = props.options.map(function (option) {\n      return /*#__PURE__*/React.createElement(\"option\", {\n        key: \"select-option-\".concat(option.value),\n        value: option.value\n      }, option.text);\n    });\n  }\n\n  var className = 'pp_select2';\n\n  if (props.className) {\n    className += ' ' + props.className;\n  }\n\n  className += props.metadata ? 'pp-calendar-form-metafied ' + props.post_types : '';\n  return /*#__PURE__*/React.createElement(\"select\", {\n    className: className,\n    defaultValue: props.value,\n    type: \"select\",\n    name: props.name,\n    id: props.id,\n    multiple: props.multiple,\n    ref: selectRef\n  }, blankOption(), options);\n}\n\n//# sourceURL=webpack:///./modules/calendar/lib/async-calendar/js/Select.jsx?");
 
 /***/ }),