@pisell/private-materials 3.0.212 → 3.0.213

package/es/components/eventBooking/components/bookingDetailModal/index.js

@@ -2,6 +2,11 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, defineProperty = Object.defineProperty || function (obj, key, desc) { obj[key] = desc.value; }, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return defineProperty(generator, "_invoke", { value: makeInvokeMethod(innerFn, self, context) }), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; defineProperty(this, "_invoke", { value: function value(method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; } function maybeInvokeDelegate(delegate, context) { var methodName = context.method, method = delegate.iterator[methodName]; if (undefined === method) return context.delegate = null, "throw" === methodName && delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method) || "return" !== methodName && (context.method = "throw", context.arg = new TypeError("The iterator does not provide a '" + methodName + "' method")), ContinueSentinel; var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, defineProperty(Gp, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), defineProperty(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (val) { var object = Object(val), keys = []; for (var key in object) keys.push(key); return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -46,6 +51,7 @@ var BookingDetailModal = function BookingDetailModal(props) {
     openCheckout = _useState6[0],
     setOpenCheckout = _useState6[1];
   var isUserClickRef = useRef(false); // 添加用户点击标记
+  var scrollTimeoutRef = useRef(null);
 
   /**
    * @title: 详情锚点
@@ -96,87 +102,120 @@ var BookingDetailModal = function BookingDetailModal(props) {
     }
   };
 
-  // 处理滚动监听
+  // 修改滚动处理逻辑
   useEffect(function () {
     if (!modalContentRef.current || !open) return;
     var handleScroll = function handleScroll() {
       if (isScrolling || isUserClickRef.current) return;
       var container = modalContentRef.current;
       if (!container) return;
-      var scrollTop = container.scrollTop;
-      var headerHeight = 58;
-      var containerHeight = container.clientHeight;
-      var scrollHeight = container.scrollHeight;
-      var lastOption = anchorOptions[anchorOptions.length - 1];
-
-      // 优先检查是否完全滚动到底部
-      var isExactBottom = Math.abs(scrollTop + containerHeight - scrollHeight) <= 1;
-      if (isExactBottom && activeTab !== lastOption.id) {
-        var _tabsRef$current;
-        setActiveTab(lastOption.id);
-        tabsRef === null || tabsRef === void 0 ? void 0 : (_tabsRef$current = tabsRef.current) === null || _tabsRef$current === void 0 ? void 0 : _tabsRef$current.scroll(lastOption.id);
-        return;
+      if (scrollTimeoutRef.current) {
+        clearTimeout(scrollTimeoutRef.current);
       }
+      scrollTimeoutRef.current = setTimeout(function () {
+        var scrollTop = container.scrollTop;
+        var headerHeight = 58;
+        var containerHeight = container.clientHeight;
+        var scrollHeight = container.scrollHeight;
+        var viewportMiddle = headerHeight + (containerHeight - headerHeight) / 2;
 
-      // 其次检查是否接近底部
-      var isNearBottom = scrollTop + containerHeight + 100 >= scrollHeight;
-      var lastElement = document.getElementById(lastOption.id);
-      if (isNearBottom && lastElement) {
-        var rect = lastElement.getBoundingClientRect();
-        if (rect.top < containerHeight && activeTab !== lastOption.id) {
-          var _tabsRef$current2;
-          setActiveTab(lastOption.id);
-          tabsRef === null || tabsRef === void 0 ? void 0 : (_tabsRef$current2 = tabsRef.current) === null || _tabsRef$current2 === void 0 ? void 0 : _tabsRef$current2.scroll(lastOption.id);
+        // 获取所有section的位置信息
+        var sectionPositions = anchorOptions.map(function (option) {
+          var element = document.getElementById(option.id);
+          if (!element) return null;
+          var rect = element.getBoundingClientRect();
+          return {
+            id: option.id,
+            top: rect.top,
+            bottom: rect.bottom,
+            height: rect.height,
+            // 添加可见度计算
+            visibleTop: Math.max(rect.top, headerHeight),
+            visibleBottom: Math.min(rect.bottom, containerHeight),
+            // 计算元素中点到视口中点的距离
+            distanceToCenter: Math.abs((rect.top + rect.bottom) / 2 - viewportMiddle)
+          };
+        }).filter(function (section) {
+          return section !== null;
+        });
+
+        // 特殊处理：检查是否在底部
+        var isAtBottom = Math.abs(scrollTop + containerHeight - scrollHeight) <= 2;
+        if (isAtBottom) {
+          var lastOption = anchorOptions[anchorOptions.length - 1];
+          if (activeTab !== lastOption.id) {
+            setActiveTab(lastOption.id);
+          }
           return;
         }
-      }
 
-      // 找到当前在视口中的所有元素
-      var visibleElements = anchorOptions.map(function (option) {
-        var element = document.getElementById(option.id);
-        if (!element) return null;
-        var rect = element.getBoundingClientRect();
-        var elementTop = rect.top;
-        var elementBottom = rect.bottom;
+        // 找到当前最合适的section
+        var bestSection = null;
 
-        // 元素顶部相对于视口顶部（考虑 header）的距离
-        var topDistance = Math.abs(elementTop - headerHeight);
+        // 计算每个section的可见比例和优先级
+        var sectionsWithPriority = sectionPositions.map(function (section) {
+          var visibleHeight = section.visibleBottom - section.visibleTop;
+          var visibilityRatio = visibleHeight / section.height;
 
-        // 元素是否在视口中
-        var isVisible = elementTop < containerHeight && elementBottom > headerHeight;
-        return {
-          id: option.id,
-          topDistance: topDistance,
-          isVisible: isVisible,
-          top: elementTop
-        };
-      }).filter(Boolean);
+          // 计算元素顶部到视口顶部的距离（考虑 header）
+          var topDistance = Math.abs(section.top - headerHeight);
 
-      // 找到最接近顶部且可见的元素
-      var currentElement = visibleElements.filter(function (el) {
-        return el.isVisible;
-      }).sort(function (a, b) {
-        // 如果两个元素都在 header 下方，选择最靠近 header 的
-        if (a.top > headerHeight && b.top > headerHeight) {
-          return a.top - b.top;
-        }
-        // 如果两个元素都在 header 上方，选择最靠近 header 的
-        if (a.top < headerHeight && b.top < headerHeight) {
-          return b.top - a.top;
+          // 新的优先级计算方式
+          var priority =
+          // 基础可见度权重
+          visibilityRatio * 0.6 + (
+          // 小内容区域补偿
+          section.height < 200 ? 0.3 : 0) +
+          // 距离权重（反比，越近权重越大）
+          0.4 * (1 - Math.min(topDistance / containerHeight, 1));
+          return _objectSpread(_objectSpread({}, section), {}, {
+            visibilityRatio: visibilityRatio,
+            topDistance: topDistance,
+            priority: priority
+          });
+        });
+
+        // 按优先级排序，但增加额外的判断条件
+        sectionsWithPriority.sort(function (a, b) {
+          // 如果两个section都有一定可见度，优先考虑顶部位置
+          if (a.visibilityRatio > 0.1 && b.visibilityRatio > 0.1) {
+            // 如果顶部距离相差不大，使用优先级
+            if (Math.abs(a.topDistance - b.topDistance) < 50) {
+              return b.priority - a.priority;
+            }
+            // 否则优先选择更靠近顶部的
+            return a.topDistance - b.topDistance;
+          }
+          // 其他情况使用优先级
+          return b.priority - a.priority;
+        });
+
+        // 选择最合适的section
+        bestSection = sectionsWithPriority[0];
+
+        // 更新激活的tab时增加更多判断条件
+        if (bestSection && activeTab !== bestSection.id) {
+          var currentSection = sectionPositions.find(function (s) {
+            return s.id === activeTab;
+          });
+
+          // 只有在满足以下条件之一时才切换：
+          // 1. 当前没有激活的section
+          // 2. 新section的优先级明显更高
+          // 3. 新section在视口中且更靠近顶部
+          if (!currentSection || bestSection.priority > (currentSection.priority || 0) + 0.2 || bestSection.visibilityRatio > 0.3 && bestSection.topDistance < currentSection.topDistance) {
+            setActiveTab(bestSection.id);
+          }
         }
-        // 优先选择在 header 下方的元素
-        return a.top > headerHeight ? -1 : 1;
-      })[0];
-      if (currentElement && activeTab !== currentElement.id) {
-        var _tabsRef$current3;
-        setActiveTab(currentElement.id);
-        tabsRef === null || tabsRef === void 0 ? void 0 : (_tabsRef$current3 = tabsRef.current) === null || _tabsRef$current3 === void 0 ? void 0 : _tabsRef$current3.scroll(currentElement.id);
-      }
+      }, 200);
     };
     var container = modalContentRef.current;
     container.addEventListener('scroll', handleScroll);
     return function () {
-      return container.removeEventListener('scroll', handleScroll);
+      container.removeEventListener('scroll', handleScroll);
+      if (scrollTimeoutRef.current) {
+        clearTimeout(scrollTimeoutRef.current);
+      }
     };
   }, [anchorOptions, activeTab, open, isScrolling]);
   var handleTabChange = function handleTabChange(key) {
@@ -294,15 +333,11 @@ var BookingDetailModal = function BookingDetailModal(props) {
     title: locales.getText('pisell2.event.details'),
     platform: isMobile() ? 'h5' : 'pc',
     bodyStyle: {
-      padding: 0,
-      overflow: 'hidden'
+      padding: 0
     },
     destroyOnClose: true,
-    mobileModalHeight: '80vh',
     className: "booking-detail-modal",
-    onCancel: function onCancel() {
-      return onCloseEventDetail();
-    },
+    onCancel: onCloseEventDetail,
     okText: locales.getText('pisell2.event.add.to.cart'),
     cancelVisible: false,
     onOk: handleOk,

package/es/components/eventBooking/components/bookingDetailModal/index.less

@@ -2,7 +2,7 @@
   .booking-detail-modal-content {
     display: flex;
     flex-direction: column;
-    height: calc(80vh - 140px);
+    height: 100%;
     overflow-y: auto;
     overflow-x: hidden;
     scroll-behavior: smooth;

package/es/components/eventBooking/components/selectHolder/index.js

@@ -82,11 +82,7 @@ var PisellSelectHolder = function PisellSelectHolder(_ref) {
     title: isMobile() ? '' : title,
     platform: isMobile() ? 'h5' : 'pc',
     okText: okText,
-    cancelVisible: false
-    // okButtonProps={{
-    //   disabled: disabled,
-    // }}
-    ,
+    cancelVisible: false,
     closable: showCancel,
     onCancel: onCancel,
     onOk: function onOk(e) {
@@ -98,7 +94,7 @@ var PisellSelectHolder = function PisellSelectHolder(_ref) {
     bodyStyle: {
       padding: isMobile() ? '0 16px 16px' : 20
     },
-    mobileModalHeight: '90%',
+    mobileModalHeight: 'auto',
     destroyOnClose: true,
     className: "select-holder-modal ".concat(isMobile() ? 'select-holder-modal-mobile' : ''),
     headerDivider: false

package/es/components/eventBooking/index.less

@@ -14,6 +14,8 @@
 }
 
 .event-booking-mobile-wrap {
+  background: #ffffff;
+  min-height: 100vh;
   .pisell-section-headers-content {
     width: 100%;
   }

package/es/components/tabProduct/tabs/index.less

@@ -108,9 +108,19 @@
         white-space: nowrap;
       }
 
-      &:hover {
-        .pisell-tabs-tab-content {
-          background-color: #f1f1f1;
+      @media (min-width: 769px) {
+        &:hover {
+          .pisell-tabs-tab-content {
+            background-color: #f1f1f1;
+          }
+        }
+      }
+
+      @media (max-width: 768px) {
+        &:hover {
+          .pisell-tabs-tab-content {
+            background-color: transparent;
+          }
         }
       }
 

package/lib/components/Sales/Checkout/index.js

@@ -71,6 +71,9 @@ var CheckoutProvider = ({
     onSuccess: (res) => {
       onPay(res.data);
       checkoutCallback.current({ success: true });
+    },
+    onError: (err) => {
+      checkoutCallback.current({ success: false, err });
     }
   });
   const onCheckBeforeBooking = (data2) => {

package/lib/components/eftposPay/hooks.d.ts

@@ -15,11 +15,11 @@ export declare const useStoreRef: <T extends {
     readonly numRef: React.MutableRefObject<string | number | undefined>;
     readonly orderIdRef: React.MutableRefObject<string | number>;
     readonly modeRef: React.MutableRefObject<ModeEnum>;
-    readonly statusRef: React.MutableRefObject<"loading" | "success" | "warn" | "fail" | "pedding" | "resove" | "reject" | "question">;
+    readonly statusRef: React.MutableRefObject<"success" | "warn" | "loading" | "fail" | "pedding" | "resove" | "reject" | "question">;
     readonly netRef: React.MutableRefObject<boolean | undefined>;
     readonly symbolRef: React.MutableRefObject<string>;
     readonly amountRef: React.MutableRefObject<string | number>;
-    readonly eftposRef: React.MutableRefObject<"payo" | "tyro" | "windcave" | "stripe">;
+    readonly eftposRef: React.MutableRefObject<"windcave" | "tyro" | "payo" | "stripe">;
     readonly clientRef: React.MutableRefObject<ClientEnum>;
     readonly dataRef: React.MutableRefObject<import("./store").State>;
 };

package/lib/components/eventBooking/components/Provider/Cart/ContinueButton/index.js

@@ -58,10 +58,15 @@ var ContinueButton = () => {
   const [openEmptyHolder, setOpenEmptyHolder] = (0, import_react.useState)(false);
   const { removeSessionStorage } = (0, import_Sales.useSales)();
   const handleCheckout = async () => {
+    var _a2;
     const value = (0, import_utils2.formatValues)(data);
     const result = await onCheckout(value);
     if (result == null ? void 0 : result.success) {
       removeSessionStorage();
+    } else {
+      (0, import_materials.PisellToast)({
+        content: ((_a2 = result == null ? void 0 : result.err) == null ? void 0 : _a2.message) || ""
+      });
     }
   };
   const handleNextStep = async () => {

package/lib/components/eventBooking/components/Provider/Cart/Item/Total.d.ts

@@ -1,4 +1,4 @@
 import React from 'react';
 import './index.less';
-declare const Total: () => React.JSX.Element;
+declare const Total: ({ className, isFooter }: any) => React.JSX.Element;
 export default Total;

package/lib/components/eventBooking/components/Provider/Cart/Item/Total.js

@@ -39,7 +39,7 @@ var import_Sales = require("../../../../../Sales");
 var import_useEngineContext = __toESM(require("../../../../../../hooks/useEngineContext"));
 var import_index = require("./index.less");
 var import_classnames = __toESM(require("classnames"));
-var Total = () => {
+var Total = ({ className, isFooter }) => {
   var _a, _b, _c, _d, _e, _f;
   const { taxTitle, totalTaxFee, isPriceIncludeTax, total } = (0, import_Sales.useSummary)();
   const context = (0, import_useEngineContext.default)();
@@ -51,25 +51,32 @@ var Total = () => {
     (_c = (_b = (_a = context == null ? void 0 : context.appHelper) == null ? void 0 : _a.utils) == null ? void 0 : _b.getSymbolic) == null ? void 0 : _c.call(_b),
     "wh97978"
   );
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "event-total-wrap" }, !isPriceIncludeTax && Number(totalTaxFee) > 0 ? /* @__PURE__ */ import_react.default.createElement("div", { className: "gst-wrap" }, /* @__PURE__ */ import_react.default.createElement("span", null, taxTitle), /* @__PURE__ */ import_react.default.createElement(import_materials.PisellText.Amount, { value: totalTaxFee, showCurrencySymbol: true })) : null, /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: `event-total-wrap ${className}` }, !isPriceIncludeTax && Number(totalTaxFee) > 0 ? /* @__PURE__ */ import_react.default.createElement("div", { className: "gst-wrap" }, /* @__PURE__ */ import_react.default.createElement("span", null, taxTitle, isFooter ? ": " : ""), /* @__PURE__ */ import_react.default.createElement(import_materials.PisellText.Amount, { value: totalTaxFee, showCurrencySymbol: true })) : null, /* @__PURE__ */ import_react.default.createElement(
     "div",
     {
       className: (0, import_classnames.default)("event-total", {
         [["total-gst-wrap"]]: !isPriceIncludeTax && Number(totalTaxFee) > 0
       })
     },
-    /* @__PURE__ */ import_react.default.createElement("div", { className: "left" }, /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.event.total")), isPriceIncludeTax && Number(totalTaxFee) > 0 ? /* @__PURE__ */ import_react.default.createElement("span", { className: "gst" }, import_utils.locales.getText("pisell2.event.total.gst")(
-      taxTitle,
+    /* @__PURE__ */ import_react.default.createElement("div", { className: "left" }, /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement("span", null, import_utils.locales.getText("pisell2.event.total"), isFooter ? ": " : ""), isFooter ? /* @__PURE__ */ import_react.default.createElement(
+      import_materials.PisellText.Amount,
+      {
+        value: total,
+        showCurrencySymbol: true,
+        className: "event-amount"
+      }
+    ) : null), isPriceIncludeTax && Number(totalTaxFee) > 0 ? /* @__PURE__ */ import_react.default.createElement("span", { className: "gst" }, import_utils.locales.getText("pisell2.event.total.gst")(
+      `${isFooter ? `${taxTitle}: ` : taxTitle}`,
       `${(_f = (_e = (_d = context == null ? void 0 : context.appHelper) == null ? void 0 : _d.utils) == null ? void 0 : _e.getSymbolic) == null ? void 0 : _f.call(_e)}${totalTaxFee}`
     )) : null),
-    /* @__PURE__ */ import_react.default.createElement(
+    !isFooter ? /* @__PURE__ */ import_react.default.createElement(
       import_materials.PisellText.Amount,
       {
         value: total,
         showCurrencySymbol: true,
         className: "event-amount"
       }
-    )
+    ) : null
   ));
 };
 var Total_default = Total;

package/lib/components/eventBooking/components/Provider/Cart/index.js

@@ -47,12 +47,8 @@ var Cart = ({ open, onCancel }) => {
       closable: true,
       onCancel: () => onCancel(),
       bodyStyle: {
-        padding: "20px",
-        display: "flex",
-        flexDirection: "column",
-        height: "100%"
+        padding: "20px"
       },
-      mobileModalHeight: "90%",
       destroyOnClose: true,
       className: `event-cart-modal`,
       footer: null

package/lib/components/eventBooking/components/Provider/Cart/index.less

@@ -1,4 +1,2 @@
 .event-cart-modal {
 }
-.event-cart-modal {
-}

package/lib/components/eventBooking/components/Provider/Content/index.js

@@ -63,6 +63,22 @@ var Layout = () => {
     let Com2 = components[key];
     return /* @__PURE__ */ import_react.default.createElement(Com2, null);
   }, [currentStepData == null ? void 0 : currentStepData.key]);
+  (0, import_react.useEffect)(() => {
+    var _a, _b;
+    if ((0, import_utils.isMobile)()) {
+      const header = document.querySelector(".event-progress-bar");
+      const footer = document.querySelector(".pisell-section-footers-wrapper");
+      const content = document.querySelector(".event-content-mobile-wrap");
+      const headerHeight = ((_a = header == null ? void 0 : header.getBoundingClientRect()) == null ? void 0 : _a.height) || 0;
+      const footerHeight = ((_b = footer == null ? void 0 : footer.getBoundingClientRect()) == null ? void 0 : _b.height) || 0;
+      const windowHeight = window.innerHeight;
+      const contentHeight = windowHeight - headerHeight - footerHeight;
+      if (content && (content == null ? void 0 : content.style)) {
+        content.style.height = `${contentHeight}px`;
+        content.style.overflowY = "auto";
+      }
+    }
+  }, [currentStepData == null ? void 0 : currentStepData.key]);
   return /* @__PURE__ */ import_react.default.createElement(
     "div",
     {

package/lib/components/eventBooking/components/Provider/Content/index.less

@@ -3,6 +3,7 @@
   display: flex;
   gap: 6px;
   // align-items: center;
+  flex: 1;
 
   .event-content-left {
     flex: 1;
@@ -19,10 +20,10 @@
 
 .event-content-mobile-wrap {
   width: 100%;
+  flex: none;
   .event-content-left {
-    background: #fff;
     width: 100%;
-    min-height: 100vh;
+    flex: none;
     .provider-information-wrap {
       width: 100%;
     }

package/lib/components/eventBooking/components/Provider/EmptyHolderModal/index.js

@@ -53,8 +53,7 @@ var EmptyHolderModal = (props) => {
       cancelText: import_utils.locales.getText("pisell2.event.empty.holder.go.back"),
       closable: true,
       onCancel: () => onCancel(),
-      onOk: () => onOk(),
-      mobileModalHeight: "80vh"
+      onOk: () => onOk()
     }
   );
 };

package/lib/components/eventBooking/components/Provider/Event/index.less

@@ -6,7 +6,7 @@
   .event-booking-service-list {
     flex: 1;
     background: #ffffff;
-    min-height: calc(100vh - 93px);
+    // min-height: calc(100vh - 93px);
   }
 }
 

package/lib/components/eventBooking/components/Provider/Footer/index.js

@@ -34,13 +34,13 @@ __export(Footer_exports, {
 module.exports = __toCommonJS(Footer_exports);
 var import_react = __toESM(require("react"));
 var import_materials = require("@pisell/materials");
-var import_utils = require("@pisell/utils");
 var import_react2 = require("react");
 var import_Sales = require("../../../../Sales");
 var import_SelectHolderModal = __toESM(require("../SelectHolderModal"));
 var import_ContinueButton = __toESM(require("../Cart/ContinueButton"));
 var import_shopping_cart = __toESM(require("../../../assets/shopping-cart.svg"));
 var import_Cart = __toESM(require("../Cart"));
+var import_Total = __toESM(require("../Cart/Item/Total"));
 var import_index = require("./index.less");
 var Footer = () => {
   var _a;
@@ -52,14 +52,17 @@ var Footer = () => {
     import_materials.SectionFooters,
     {
       className: "section-footer-wrap",
-      left: /* @__PURE__ */ import_react.default.createElement("div", { className: "section-footer-left" }, /* @__PURE__ */ import_react.default.createElement(import_materials.PisellText, null, import_utils.locales.getText("pisell2.event.total")), /* @__PURE__ */ import_react.default.createElement(
-        import_materials.PisellText.Amount,
-        {
-          value: total,
-          showCurrencySymbol: true,
-          className: "amount"
-        }
-      )),
+      left: (
+        // <div className="section-footer-left">
+        //   {/* <PisellText>{locales.getText('pisell2.event.total')}: </PisellText>
+        //   <PisellText.Amount
+        //     value={total}
+        //     showCurrencySymbol={true}
+        //     className="amount"
+        //   /> */}
+        // </div>
+        /* @__PURE__ */ import_react.default.createElement(import_Total.default, { className: "section-footer-left", isFooter: true })
+      ),
       right: /* @__PURE__ */ import_react.default.createElement("div", { className: "section-footer-right" }, /* @__PURE__ */ import_react.default.createElement(import_materials.Badge, { count: ((_a = cartData.cartItems) == null ? void 0 : _a.length) || 0 }, /* @__PURE__ */ import_react.default.createElement(
         import_materials.Button,
         {
@@ -67,8 +70,7 @@ var Footer = () => {
           onClick: () => onOpenCart(),
           className: "section-footer-btn"
         },
-        /* @__PURE__ */ import_react.default.createElement(import_materials.Image, { src: import_shopping_cart.default, preview: false }),
-        import_utils.locales.getText("pisell2.event.cart")
+        /* @__PURE__ */ import_react.default.createElement(import_materials.Image, { src: import_shopping_cart.default, preview: false })
       )), /* @__PURE__ */ import_react.default.createElement(import_ContinueButton.default, null))
     }
   ), /* @__PURE__ */ import_react.default.createElement(

package/lib/components/eventBooking/components/Provider/Footer/index.less

@@ -5,7 +5,7 @@
   display: flex;
   padding: 24px;
   justify-content: space-between;
-  align-items: flex-start;
+  align-items: center;
   align-self: stretch;
   background: #ffffff;
   border-top: 1px solid #eaecf0;
@@ -13,15 +13,30 @@
   .section-footer-left {
     display: flex;
     flex-direction: column;
-    color: var(--Text-Text_1, #1b1b1b);
-    font-size: 14px;
+    color: var(--Gray-900, #101828);
+    font-size: 16px;
     font-weight: 400;
-    line-height: 20px;
+    line-height: 24px;
+    > div {
+      justify-content: flex-start;
+    }
+
+    .gst-wrap {
+      color: var(--Gray-500, #667085);
+      font-size: 14px;
+      font-weight: 400;
+      line-height: 20px;
+    }
 
-    .amount {
+    .event-total {
+      padding: 0;
+    }
+
+    .event-amount {
       font-size: 16px;
       font-weight: 500;
       line-height: 24px;
+      color: var(--Gray-900, #101828) !important;
     }
   }
 
@@ -36,5 +51,14 @@
     display: flex;
     align-items: center;
     gap: 8px;
+    padding: 0;
+    width: 40px;
+    height: 40px;
+    justify-content: center;
+    .pisell-lowcode-image {
+      width: 20px;
+      height: 20px;
+      line-height: 20px;
+    }
   }
 }

package/lib/components/eventBooking/components/Provider/InformationOptionsModal/index.js

@@ -47,7 +47,7 @@ var InformationOptionsModal = (props) => {
       destroyOnClose: true,
       footer: null,
       onCancel,
-      mobileModalHeight: "200px",
+      mobileModalHeight: "auto",
       className: "information-option-modal",
       headerDivider: false
     },

package/lib/components/eventBooking/components/Provider/OrderProductModal/index.js

@@ -50,7 +50,6 @@ var OrderProductModal = (props) => {
       closable: true,
       onCancel: () => onCancel(),
       onOk: () => onCancel(),
-      mobileModalHeight: "80vh",
       zIndex: 1001
     }
   );

package/lib/components/eventBooking/components/Provider/SelectProduct/index.d.ts

@@ -0,0 +1,4 @@
+import React from 'react';
+import './index.less';
+declare const SelectProduct: React.FC;
+export default SelectProduct;