@pisell/private-materials 6.2.9 → 6.2.11

package/lib/components/eventBooking/components/scheduleCalendar/calendarItem.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CalendarDataItem } from '../../type';
 declare type CalendarItemProps = {
     month: string;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/Finish/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const StripePayment: () => JSX.Element;
 export default StripePayment;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/SDK.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const StripeSDK: ({ public_key, client_secret, children, lang, }: {
     public_key: string;
     client_secret?: string | undefined;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/StripeSDK/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const StripeSDK: ({ public_key, client_secret, children, lang, }: {
     public_key: string;
     client_secret?: string | undefined;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/PageLoading/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const PageLoading: () => JSX.Element;
 export default PageLoading;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/PaymentRequestForm.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const PaymentRequestForm: () => JSX.Element | null;
 export default PaymentRequestForm;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/components/SetupForm/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const SetupForm: ({ onReady, amount, order_id, payment_method, scene, }: any) => JSX.Element;
 export default SetupForm;

package/lib/components/pay/toC/PaymentMethods/StripePay/Stripe/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.module.less';
 declare const StripePayment: () => JSX.Element;
 export default StripePayment;

package/lib/components/pay/toC/WalletPassBlock/components/WalletUseList/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { WalletPassDataType } from '../../../PaymentMethods/WalletPass/serve';
 import './index.less';
 interface WalletUseListProps {

package/lib/components/pisellSelectCustomerModal/RightPanel/Add/PhoneField/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 declare const PhoneField: ({ value, onChange }: any) => JSX.Element;
 export default PhoneField;

package/lib/components/productExtension/fields/Actor/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 declare const Actor: ({ name }: {
     name: string;
 }) => JSX.Element;

package/lib/components/productExtension/fields/Forms/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 export interface InfoProps {
     relation_id: any;
     action: any;

package/lib/components/productSelect/components/TabProduct/index.js

@@ -39,7 +39,15 @@ var import_ahooks = require("ahooks");
 var import_utils = require("@pisell/utils");
 var import_tabs = __toESM(require("./tabs"));
 var import_productGroup = __toESM(require("../productGroup"));
-var io = null;
+var getOffsetTopRelativeToScrollContainer = (targetElement, scrollContainer) => {
+  if (!targetElement || !scrollContainer) return 0;
+  if (targetElement === scrollContainer) {
+    return 0;
+  }
+  const targetRect = targetElement.getBoundingClientRect();
+  const containerRect = scrollContainer.getBoundingClientRect();
+  return targetRect.top - containerRect.top + scrollContainer.scrollTop;
+};
 var TabProduct = (props) => {
   const {
     showTab = true,
@@ -48,6 +56,7 @@ var TabProduct = (props) => {
     onChange,
     amountSymbol = "$",
     scrollDom,
+    offsetDom,
     value: currentProductId,
     loading,
     emptyDescription,
@@ -55,6 +64,8 @@ var TabProduct = (props) => {
   } = props;
   const tabsRef = (0, import_react.useRef)();
   const [currentGroupId, setCurrentGroupId] = (0, import_react.useState)(1);
+  const tabLocatingRef = (0, import_react.useRef)(false);
+  const ioRef = (0, import_react.useRef)(null);
   (0, import_react.useEffect)(() => {
     if (list == null ? void 0 : list.length) {
       setCurrentGroupId(list[0].id);
@@ -62,6 +73,9 @@ var TabProduct = (props) => {
         handleObserver();
       });
     }
+    return () => {
+      handleUnobserver();
+    };
   }, [list]);
   const debouncedScroll = (0, import_ahooks.useDebounceFn)(
     (id) => {
@@ -75,18 +89,23 @@ var TabProduct = (props) => {
     const _marginTop = 270;
     const _marginBottom = window.innerHeight - 70 - 200 - 70;
     const _rootMargin = `${_marginTop * -1}px 0px ${_marginBottom * -1}px 0px`;
-    io = new IntersectionObserver(
+    ioRef.current = new IntersectionObserver(
       (entries) => {
-        var _a, _b;
+        var _a;
         const enteringEntries = entries.filter((entry) => entry.isIntersecting);
         if (enteringEntries.length > 0) {
           const topMostEntry = enteringEntries.reduce((top, current) => {
             return current.boundingClientRect.top < top.boundingClientRect.top ? current : top;
           });
-          const [name, id] = (_b = (_a = topMostEntry == null ? void 0 : topMostEntry.target) == null ? void 0 : _a.id) == null ? void 0 : _b.split("-");
-          const newGroupId = Number(id);
-          setCurrentGroupId(newGroupId);
-          debouncedScroll.run(id);
+          const targetId = (_a = topMostEntry == null ? void 0 : topMostEntry.target) == null ? void 0 : _a.id;
+          if (targetId) {
+            const [name, id] = targetId.split("-");
+            const newGroupId = Number(id);
+            if (!tabLocatingRef.current && !isNaN(newGroupId)) {
+              setCurrentGroupId(newGroupId);
+              debouncedScroll.run(id);
+            }
+          }
         }
       },
       {
@@ -94,24 +113,28 @@ var TabProduct = (props) => {
         rootMargin: _rootMargin
       }
     );
-    if (list == null ? void 0 : list.length) {
+    if ((list == null ? void 0 : list.length) && ioRef.current) {
       for (const item of list) {
         const _item = document.querySelector(`#list-${item.id}`);
         if (_item) {
-          io.observe(_item);
+          ioRef.current.observe(_item);
         }
       }
     }
   });
   const handleUnobserver = (0, import_ahooks.useMemoizedFn)(() => {
-    if ((list == null ? void 0 : list.length) && io) {
+    if ((list == null ? void 0 : list.length) && ioRef.current) {
       for (const item of list) {
         const _item = document.querySelector(`#list-${item.id}`);
         if (_item) {
-          io.unobserve(_item);
+          ioRef.current.unobserve(_item);
         }
       }
     }
+    if (ioRef.current) {
+      ioRef.current.disconnect();
+      ioRef.current = null;
+    }
   });
   const renderContent = () => {
     if (loading) {
@@ -126,7 +149,7 @@ var TabProduct = (props) => {
       );
     }
     return list.map((item, i) => {
-      return /* @__PURE__ */ import_react.default.createElement("div", { id: `list-${item.id}`, key: i }, /* @__PURE__ */ import_react.default.createElement(
+      return /* @__PURE__ */ import_react.default.createElement("div", { id: `list-${item.id}`, key: `list-${item.id}` }, /* @__PURE__ */ import_react.default.createElement(
         import_productGroup.default,
         {
           onSelectProduct: onChange,
@@ -148,7 +171,7 @@ var TabProduct = (props) => {
       }
     ), /* @__PURE__ */ import_react.default.createElement("div", { className: "booking-pisell-tabs-content" }, /* @__PURE__ */ import_react.default.createElement(import_antd.Skeleton.Button, { active: true, size: "large", shape: "round" })));
   }, []);
-  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, showTab ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-product-select-tabs-wrapper" }, loading ? tabSkeleton : /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, showTab && list && list.length > 1 ? /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-product-select-tabs-wrapper" }, loading ? tabSkeleton : /* @__PURE__ */ import_react.default.createElement(
     import_tabs.default,
     {
       ref: tabsRef,
@@ -157,33 +180,47 @@ var TabProduct = (props) => {
       tab: currentGroupId,
       onChange: (e) => {
         var _a;
-        let comWrapper = document.querySelector(
-          ".pisell-product-select-wrapper"
-        );
-        let categoryDom = document.querySelector(
-          ".pisell-product-select-tabs-wrapper"
-        );
-        let wrapperOffsetTop = comWrapper.offsetTop;
-        let top = 0;
-        if (categoryDom) {
-          top = categoryDom.offsetHeight;
-        }
-        const dom = document == null ? void 0 : document.querySelector("#list-" + e);
-        const main = document == null ? void 0 : document.querySelector(scrollDom);
-        if (dom && main) {
-          if (e === ((_a = list[0]) == null ? void 0 : _a.id)) {
-            main.scrollTop = 0;
-          } else {
-            main.scrollTop = dom.offsetTop - top - wrapperOffsetTop;
+        try {
+          const productSelectWrapper = document.querySelector(
+            ".pisell-product-select-wrapper"
+          );
+          const tabsWrapper = document.querySelector(
+            ".pisell-product-select-tabs-wrapper"
+          );
+          let tabsHeight = 0;
+          if (tabsWrapper) {
+            tabsHeight = tabsWrapper.offsetHeight;
+          }
+          const targetListElement = document == null ? void 0 : document.querySelector("#list-" + e);
+          const scrollContainer = scrollDom ? document == null ? void 0 : document.querySelector(scrollDom) : null;
+          const offsetElement = offsetDom ? document == null ? void 0 : document.querySelector(offsetDom) : null;
+          const extraOffset = offsetElement ? offsetElement.clientHeight : 0;
+          handleUnobserver();
+          tabLocatingRef.current = true;
+          if (targetListElement && scrollContainer) {
+            if (e === ((_a = list[0]) == null ? void 0 : _a.id)) {
+              if (productSelectWrapper) {
+                const wrapperOffsetTop = getOffsetTopRelativeToScrollContainer(productSelectWrapper, scrollContainer);
+                scrollContainer.scrollTop = wrapperOffsetTop - extraOffset;
+              }
+            } else {
+              const listOffsetTop = getOffsetTopRelativeToScrollContainer(targetListElement, scrollContainer);
+              scrollContainer.scrollTop = listOffsetTop - tabsHeight - extraOffset;
+            }
           }
+          setCurrentGroupId(e);
+          debouncedScroll.run(e);
+          setTimeout(() => {
+            tabLocatingRef.current = false;
+            handleObserver();
+          }, 500);
+        } catch (error) {
+          console.error("Tab onChange error:", error);
+          tabLocatingRef.current = false;
+          setCurrentGroupId(e);
         }
-        handleUnobserver();
-        setCurrentGroupId(e);
-        setTimeout(() => {
-          handleObserver();
-        }, 1e3);
       }
     }
-  )) : null, /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-product-select-product-list" }, renderContent()));
+  )) : /* @__PURE__ */ import_react.default.createElement("p", null, /* @__PURE__ */ import_react.default.createElement("br", null)), /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-product-select-product-list" }, renderContent()));
 };
 var TabProduct_default = TabProduct;

package/lib/components/productSelect/components/TabProduct/tabs/index.less

@@ -107,6 +107,7 @@
         text-overflow: ellipsis;
         overflow: hidden;
         white-space: nowrap;
+        user-select: none;
       }
 
       &:hover {

package/lib/components/productSelect/index.d.ts

@@ -14,6 +14,8 @@ interface ProductSelectProps {
     value?: number;
     loading?: boolean;
     scrollDom?: string;
+    /** 某些设置了固定头部的情况 */
+    offsetDom?: string;
     style?: React.CSSProperties;
     emptyDescription?: string;
     token?: Partial<ProductSelectToken>;

package/lib/components/schedules/calendar/calendarItem.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { CalendarDataItem } from "../type";
 declare type CalendarItemProps = {
     month: string;

package/lib/components/schedules/components/CurrentDay/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare type CurrentDayProps = {
     onClose: () => void;

package/lib/components/schedules/components/ScheduleList/RenderScheduleItem/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 import { ScheduleItem } from '../../../type';
 declare type Item = any;

package/lib/components/schedules/products/ProductDetailDrawer/ProductDetail/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const ProductDetail: ({ form, currentProduct, }: {
     form: any;

package/lib/components/schedules/products/ProductDetailDrawer/ProductDetailByDate/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const ProductDetailByDate: () => JSX.Element;
 export default ProductDetailByDate;

package/lib/components/schedules/products/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Products: () => JSX.Element;
 export default Products;

package/lib/components/schedules/resources/relationProduct/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import "./index.less";
 declare const RelationProduct: ({ value, onChange, }: {
     value?: any;

package/lib/components/schedules/utils.js

@@ -27,8 +27,8 @@ __export(utils_exports, {
 module.exports = __toCommonJS(utils_exports);
 var import_utils = require("@pisell/utils");
 var Request = class {
+  request = {};
   constructor() {
-    this.request = {};
   }
   setRequest(val) {
     this.request = val;

package/lib/components/shoppingCart/components/Cart/Product.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ProductProps } from '../../type';
 declare const Product: (props: ProductProps) => JSX.Element;
 export default Product;

package/lib/components/shoppingCart/components/Cart/Product.js

@@ -37,6 +37,7 @@ var import_materials = require("@pisell/materials");
 var import_useClearCart = __toESM(require("../../hooks/useClearCart"));
 var import_useContext = require("../../hooks/useContext");
 var import_useAddService = __toESM(require("../../hooks/useAddService"));
+var import_ahooks = require("ahooks");
 var Product = (props) => {
   const { id, lists, isAdd = true } = props;
   const { state, onAction, onChange } = (0, import_useContext.useContext)();
@@ -54,10 +55,10 @@ var Product = (props) => {
     isShowEditProduct
   } = state;
   const clearCart = (0, import_useClearCart.default)(id);
-  const handleChange = (item, type, other) => {
+  const handleChange = (0, import_ahooks.useMemoizedFn)((item, type, other) => {
     if (disabledEdit && !(other == null ? void 0 : other.disabled)) return;
     onChange(item, type, other);
-  };
+  });
   const productParams = (0, import_react.useMemo)(() => {
     return {
       isShowNote,
@@ -81,24 +82,33 @@ var Product = (props) => {
     isShowChangeHolder,
     isShowEditProduct
   ]);
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__shopping-cart-content" }, clearCart, lists == null ? void 0 : lists.map((item) => {
-    return /* @__PURE__ */ import_react.default.createElement(
-      import_materials.ProductCard,
-      {
-        key: item._id,
-        dataSource: item,
-        onAction: (e) => onAction == null ? void 0 : onAction(e),
-        onDelete: (e) => handleChange(e, "delete", item),
-        onNote: (e) => handleChange(e, "note", { note: e.note }),
-        onLike: (e) => handleChange(e, "like", { like_status: e.like_status }),
-        onEditProduct: (e) => handleChange == null ? void 0 : handleChange(e, "edit_product"),
-        onCard: (e) => handleChange == null ? void 0 : handleChange(e, "view"),
-        onChangeResource: (e) => handleChange(item, "change_resource", e),
-        onChangeHolder: (e) => handleChange(item, "change_holder", e),
-        onAddHolder: (e) => handleChange(item, "add_holder", e),
-        ...productParams
-      }
-    );
-  }), !hideAddBtn && platform !== "h5" && isAdd ? (0, import_useAddService.default)(id, "more") : null);
+  (0, import_ahooks.useTrackedEffect)(
+    (changes) => {
+      console.log("Index of changed dependencies: ", changes);
+    },
+    [clearCart, lists, productParams, hideAddBtn, isAdd, platform]
+  );
+  return (0, import_react.useMemo)(() => {
+    console.log("render cart");
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-lowcode__shopping-cart-content" }, clearCart, lists == null ? void 0 : lists.map((item) => {
+      return /* @__PURE__ */ import_react.default.createElement(
+        import_materials.ProductCard,
+        {
+          key: item._id,
+          dataSource: item,
+          onAction: (e) => onAction == null ? void 0 : onAction(e),
+          onDelete: (e) => handleChange(e, "delete", item),
+          onNote: (e) => handleChange(e, "note", { note: e.note }),
+          onLike: (e) => handleChange(e, "like", { like_status: e.like_status }),
+          onEditProduct: (e) => handleChange == null ? void 0 : handleChange(e, "edit_product"),
+          onCard: (e) => handleChange == null ? void 0 : handleChange(e, "view"),
+          onChangeResource: (e) => handleChange(item, "change_resource", e),
+          onChangeHolder: (e) => handleChange(item, "change_holder", e),
+          onAddHolder: (e) => handleChange(item, "add_holder", e),
+          ...productParams
+        }
+      );
+    }), !hideAddBtn && platform !== "h5" && isAdd ? (0, import_useAddService.default)(id, "more") : null);
+  }, [clearCart, lists, productParams, hideAddBtn, isAdd, platform]);
 };
 var Product_default = Product;

package/lib/components/shoppingCart/components/Cart/index.js

@@ -66,20 +66,23 @@ var Cart = () => {
       };
     });
   }, [carts, platform]);
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("pisell-lowcode__shopping-cart") }, isProductList ? /* @__PURE__ */ import_react.default.createElement(import_Product.default, { id: void 0, lists: state == null ? void 0 : state.products }) : /* @__PURE__ */ import_react.default.createElement(
-    import_materials.Collapse,
-    {
-      items: cartsMap,
-      showHeader: true,
-      panelBackground: "#ffffff",
-      collapsible: platform !== "shop" ? "disabled" : "-",
-      accordion: platform === "shop",
-      onChange: (key) => {
-        updateState({ activeKey: key });
-        onActiveKey(key);
-      },
-      ...collapseParams
-    }
-  ));
+  return (0, import_react.useMemo)(() => {
+    console.log("render cart 22222");
+    return /* @__PURE__ */ import_react.default.createElement("div", { className: (0, import_classnames.default)("pisell-lowcode__shopping-cart") }, isProductList ? /* @__PURE__ */ import_react.default.createElement(import_Product.default, { id: void 0, lists: state == null ? void 0 : state.products }) : /* @__PURE__ */ import_react.default.createElement(
+      import_materials.Collapse,
+      {
+        items: cartsMap,
+        showHeader: true,
+        panelBackground: "#ffffff",
+        collapsible: platform !== "shop" ? "disabled" : "-",
+        accordion: platform === "shop",
+        onChange: (key) => {
+          updateState({ activeKey: key });
+          onActiveKey(key);
+        },
+        ...collapseParams
+      }
+    ));
+  }, [isProductList, cartsMap, platform, collapseParams, state == null ? void 0 : state.products]);
 };
 var Cart_default = Cart;

package/lib/components/shoppingCart/components/Empty/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Empty: (props: any) => JSX.Element;
 export default Empty;

package/lib/components/shoppingCart/components/Render/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import './index.less';
 declare const Content: () => JSX.Element;
 export default Content;