@pisell/private-materials 6.7.6 → 6.7.8

package/lib/pro/priceKeyboard/components/cashKeyboard/CashKeyboardIntact.js

@@ -37,14 +37,14 @@ var import_antd = require("antd");
 var import_ahooks = require("ahooks");
 var import_lodash = require("lodash");
 var import_utils = require("@pisell/utils");
+var import_materials = require("@pisell/materials");
 var import_shortcuts = __toESM(require("../shortcuts"));
 var import_CashKeyboardSimple = __toESM(require("./CashKeyboardSimple"));
 var import_utils2 = require("../../utils");
 var import_index = require("./index.less");
 var import_decimal = __toESM(require("decimal.js"));
-var import_materials = require("@pisell/materials");
-var import_utils3 = require("@pisell/utils");
 var import_materials2 = require("@pisell/materials");
+var import_utils3 = require("@pisell/utils");
 var CashKeyboardIntact = (props) => {
   var _a, _b, _c;
   const {
@@ -59,8 +59,7 @@ var CashKeyboardIntact = (props) => {
     doneText,
     resetText,
     disabled,
-    hiddenChangeDue,
-    shortcutsSize
+    hiddenChangeDue
   } = props;
   const [internalValue, setInternalValue] = (0, import_ahooks.useControllableValue)(props);
   const [isShowModal, setIsShowModal] = (0, import_react.useState)(false);
@@ -130,8 +129,7 @@ var CashKeyboardIntact = (props) => {
         value: "pay",
         style: {
           color: "white",
-          backgroundColor: "#7F56DA",
-          gridColumn: "span 2"
+          backgroundColor: "#7F56DA"
         },
         onClick: () => {
           var _a2;
@@ -140,7 +138,7 @@ var CashKeyboardIntact = (props) => {
       }
     ];
     const userPresets = presets || [];
-    const maxUserPresets = 7 - defaultEndPresets.length;
+    const maxUserPresets = 8 - defaultEndPresets.length;
     const limitedUserPresets = userPresets.slice(0, maxUserPresets);
     return [...limitedUserPresets, ...defaultEndPresets];
   };
@@ -250,7 +248,7 @@ var CashKeyboardIntact = (props) => {
           )
         },
         /* @__PURE__ */ import_react.default.createElement(
-          import_materials.AutoResizeText,
+          import_materials2.AutoResizeText,
           {
             minFontSizePx: 10,
             maxFontSizePx: 18,
@@ -272,53 +270,57 @@ var CashKeyboardIntact = (props) => {
       {
         style: {
           ...getGridStyle(1),
-          padding: "0px 16px",
+          padding: "6px 16px",
           borderRadius: "8px",
           backgroundColor: "white",
-          boxShadow: "inset 0 2px 4px rgba(16, 24, 40, 0.08), inset 0 -2px 4px rgba(16, 24, 40, 0.08), inset 2px 0 4px rgba(16, 24, 40, 0.08), inset -2px 0 4px rgba(16, 24, 40, 0.08)",
+          boxShadow: "0px 1px 2px rgba(16, 24, 40, 0.06)",
           overflow: "hidden",
           maxWidth: 188,
-          cursor: "pointer",
-          border: "1px solid #7f56da",
-          borderBottom: "1px solid #7f56da"
+          cursor: "pointer"
         },
         onClick: () => {
           setIsShowModal(true);
         }
       },
       /* @__PURE__ */ import_react.default.createElement(
-        "div",
+        import_materials.VirtualInput,
         {
-          className: "pisell-cash-keyboard-intact-container-top",
-          style: { ...getGridStyle(0), overflow: "hidden", padding: "5px 0" }
-        },
-        /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-cash-keyboard-intact-container-top-label" }, mergedDisplayField.cashReceived.label),
-        /* @__PURE__ */ import_react.default.createElement(
-          "div",
-          {
-            className: "pisell-cash-keyboard-intact-container-top-value"
+          showCursor: false,
+          focused: true,
+          wrapperStyle: {
+            width: "100%"
           },
-          /* @__PURE__ */ import_react.default.createElement(
-            import_materials.AutoResizeText,
+          topContent: /* @__PURE__ */ import_react.default.createElement(
+            "div",
             {
-              minFontSizePx: 10,
-              maxFontSizePx: 18,
-              fontSizePrecisionPx: 0.5,
-              style: { color: "#7f56da", textDecoration: "underline", textUnderlineOffset: "3px" }
-            },
-            internalValue ? (0, import_utils3.formatAmountWithOptions)(
-              internalValue || "",
-              amountSymbol,
-              {
-                value: internalValue,
-                hideDecimalForWholeNumbers: false,
-                precision: 2,
-                showCurrencySymbol: true
+              style: {
+                fontSize: "14px",
+                color: "#667085"
               }
-            ) : ""
+            },
+            mergedDisplayField.cashReceived.label
           ),
-          /* @__PURE__ */ import_react.default.createElement(import_materials2.Iconfont, { type: "pisell2-edit-05", style: { color: "#7f56da", fontSize: "18px", marginLeft: "4px", marginTop: "4px" } })
-        )
+          value: internalValue ? (0, import_utils3.formatAmountWithOptions)(
+            internalValue || "",
+            amountSymbol,
+            {
+              value: internalValue,
+              hideDecimalForWholeNumbers: false,
+              precision: 2,
+              showCurrencySymbol: true
+            }
+          ) : "",
+          height: 30,
+          fontSize: 20,
+          placeholder,
+          style: {
+            fontSize: "24px",
+            fontWeight: "bold",
+            border: "none",
+            background: "transparent",
+            width: "100%"
+          }
+        }
       )
     ), ((_c = mergedDisplayField.changeDue) == null ? void 0 : _c.visible) && /* @__PURE__ */ import_react.default.createElement(
       "div",
@@ -342,7 +344,7 @@ var CashKeyboardIntact = (props) => {
           )
         },
         /* @__PURE__ */ import_react.default.createElement(
-          import_materials.AutoResizeText,
+          import_materials2.AutoResizeText,
           {
             minFontSizePx: 10,
             maxFontSizePx: 18,
@@ -363,7 +365,6 @@ var CashKeyboardIntact = (props) => {
     )), /* @__PURE__ */ import_react.default.createElement(
       import_shortcuts.default,
       {
-        size: shortcutsSize || "default",
         presets: getDefaultPresets(),
         onChange: setInternalValue,
         disabled

package/lib/pro/priceKeyboard/components/cashKeyboard/CashKeyboardSimple.d.ts

@@ -9,5 +9,5 @@ export interface CashKeyboardSimpleProps extends CashKeyboardBaseProps {
     };
     children?: React.ReactNode;
 }
-declare const CashKeyboardSimple: (props: CashKeyboardSimpleProps) => JSX.Element | null;
+declare const CashKeyboardSimple: (props: CashKeyboardSimpleProps) => React.JSX.Element | null;
 export default CashKeyboardSimple;

package/lib/pro/priceKeyboard/components/cashKeyboard/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import { CashKeyboardBaseProps } from './types';
 export interface CashKeyboardProps extends CashKeyboardBaseProps {
     containerProps?: {
@@ -7,7 +7,6 @@ export interface CashKeyboardProps extends CashKeyboardBaseProps {
         [key: string]: any;
     };
     variant?: 'intact' | 'simple';
-    shortcutsSize?: 'default' | 'large';
 }
-declare const CashKeyboard: (props: CashKeyboardProps) => JSX.Element;
+declare const CashKeyboard: (props: CashKeyboardProps) => React.JSX.Element;
 export default CashKeyboard;

package/lib/pro/priceKeyboard/components/cashKeyboard/index.js

@@ -48,7 +48,7 @@ var CashKeyboard = (props) => {
   );
   const { getData } = context.appHelper.utils;
   const amountSymbol = props.amountSymbol || (getData == null ? void 0 : getData("shop_symbol")) || "$";
-  const { variant = "intact", value, onChange, shortcutsSize, ...otherProps } = props;
+  const { variant = "intact", value, onChange, ...otherProps } = props;
   const [internalValue, setInternalValue] = (0, import_ahooks.useControllableValue)(props);
   if (variant === "intact") {
     return /* @__PURE__ */ import_react.default.createElement(
@@ -58,8 +58,7 @@ var CashKeyboard = (props) => {
         amountSymbol,
         value: internalValue,
         placeholder: `${amountSymbol}0`,
-        onChange: setInternalValue,
-        shortcutsSize
+        onChange: setInternalValue
       }
     );
   }

package/lib/pro/priceKeyboard/components/cashKeyboard/types.d.ts

@@ -94,5 +94,4 @@ export interface CashKeyboardBaseProps {
     keyboardButtonBackgroundColor?: string;
     keyboardButtonTextColor?: string;
     keyboardButtonHoverColor?: string;
-    shortcutsSize?: 'default' | 'large';
 }

package/lib/pro/priceKeyboard/components/discountKeyboard/index.d.ts

@@ -10,8 +10,8 @@ export interface DiscountKeyboardProps extends DiscountKeyboardBaseProps {
     children?: React.ReactNode;
 }
 declare const DiscountKeyboard: {
-    (props: DiscountKeyboardProps): JSX.Element | null;
-    InputNumber: (props: DiscountKeyboardInputNumberProps) => JSX.Element;
+    (props: DiscountKeyboardProps): React.JSX.Element | null;
+    InputNumber: (props: DiscountKeyboardInputNumberProps) => React.JSX.Element;
 };
 interface DiscountKeyboardInputNumberProps {
     value?: number;

package/lib/pro/priceKeyboard/components/discountKeyboard/index.js

@@ -55,7 +55,6 @@ var DiscountKeyboardBase = (props) => {
     defaultValue,
     originalValue,
     selectType = "light",
-    tips,
     resetText,
     doneText,
     onEnter,
@@ -345,13 +344,7 @@ var DiscountKeyboardBase = (props) => {
       )
     );
   };
-  const renderTipsContent = () => {
-    if (tips) {
-      return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-pro-price-keyboard-tips" }, tips);
-    }
-    return null;
-  };
-  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-pro-price-keyboard-discount" }, renderTipsContent(), /* @__PURE__ */ import_react.default.createElement(
+  return /* @__PURE__ */ import_react.default.createElement("div", { className: "pisell-pro-price-keyboard-discount" }, /* @__PURE__ */ import_react.default.createElement(
     import_antd.Segmented,
     {
       size: "large",

package/lib/pro/priceKeyboard/components/discountKeyboard/index.less

@@ -7,20 +7,6 @@
   gap: 10px;
   background-color: var(--pisell-pro-price-keyboard-bg-color, #ffffff);
 
-  .pisell-pro-price-keyboard-tips {
-    background-color: var(
-      --pisell-pro-price-keyboard-bg-color-gray-200,
-      #eaecf0
-    );
-    color: #ffffff;
-    font-size: 14px;
-    font-weight: 600;
-    height: 36px;
-    line-height: 36px;
-    text-align: center;
-    border-radius: 8px;
-  }
-
   .ellipsis {
     overflow: hidden;
     text-overflow: ellipsis;

package/lib/pro/priceKeyboard/components/paymentKeyboard/index.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 import { PaymentKeyboardBaseProps } from './types';
 import './index.less';
 interface PaymentKeyboardProps extends PaymentKeyboardBaseProps {
@@ -8,5 +8,5 @@ interface PaymentKeyboardProps extends PaymentKeyboardBaseProps {
         [key: string]: any;
     };
 }
-export declare const PaymentKeyboard: (props: PaymentKeyboardProps) => JSX.Element | null;
+export declare const PaymentKeyboard: (props: PaymentKeyboardProps) => React.JSX.Element | null;
 export default PaymentKeyboard;

package/lib/pro/priceKeyboard/components/shortcuts/index.d.ts

@@ -12,7 +12,6 @@ export interface ShortcutsProps {
     presets?: ShortcutsItem[];
     onChange?: (val: string) => void;
     disabled?: boolean;
-    size?: 'default' | 'large';
 }
 declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<ShortcutsProps & React.RefAttributes<HTMLDivElement>>>;
 export default _default;

package/lib/pro/priceKeyboard/components/shortcuts/index.js

@@ -36,7 +36,7 @@ var import_react = __toESM(require("react"));
 var import_classnames = __toESM(require("classnames"));
 var import_index = require("./index.less");
 var Shortcuts = (0, import_react.forwardRef)((props, ref) => {
-  const { presets, onChange, disabled, size = "default" } = props;
+  const { presets, onChange, disabled } = props;
   const handleItemClick = (item) => {
     if (disabled || item.disabled) {
       return;
@@ -65,8 +65,7 @@ var Shortcuts = (0, import_react.forwardRef)((props, ref) => {
         const itemProps = {
           key: index,
           className: (0, import_classnames.default)("pisell-virtual-keyboard-shortcut", {
-            disabled: item.disabled,
-            large: size === "large"
+            disabled: item.disabled
           }),
           style: item.style,
           onClick: () => handleItemClick(item)

package/lib/pro/priceKeyboard/components/shortcuts/index.less

@@ -28,10 +28,6 @@
     cursor: pointer;
     position: relative;
 
-    &.large {
-      height: 54px;
-    }
-
     &.disabled {
       cursor: not-allowed;
       pointer-events: none;

package/lib/pro/priceKeyboard/hooks/rightItems.d.ts

@@ -1,11 +1,11 @@
-/// <reference types="react" />
+import React from 'react';
 declare const useRightItems: (props: {
     rightItemsStyle?: any;
     doneText?: string;
     resetText?: string;
 }) => ({
     value: string;
-    label: JSX.Element;
+    label: React.JSX.Element;
     disabled: boolean;
     type: string;
     style: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pisell/private-materials",
-  "version": "6.7.6",
+  "version": "6.7.8",
   "main": "./lib/index.js",
   "module": "./es/index.js",
   "types": "./lib/index.d.ts",
@@ -62,9 +62,9 @@
     "@react-spring/web": "^9.6.1",
     "@use-gesture/react": "^10.3.1",
     "@pisell/utils": "3.0.2",
-    "@pisell/materials": "6.7.3",
     "@pisell/icon": "0.0.11",
-    "@pisell/date-picker": "3.0.7"
+    "@pisell/date-picker": "3.0.7",
+    "@pisell/materials": "6.7.4"
   },
   "peerDependencies": {
     "react": "^18.0.0",

package/es/components/eftposPay/payo/payment.d.ts

@@ -1,66 +0,0 @@
-interface RunApiParams {
-    [key: string]: any;
-}
-export declare enum ActionType {
-    Pay = "pay",
-    Refund = "refund",
-    Query = "query"
-}
-interface UsePaymentOptions {
-    /**
-     * 支付接口
-     */
-    payApi: (params: RunApiParams, options?: {
-        signal?: AbortSignal;
-    }) => Promise<any>;
-    /**
-     * 退款接口
-     */
-    refundApi?: (params: RunApiParams, options?: {
-        signal?: AbortSignal;
-    }) => Promise<any>;
-    /**
-     * 查询接口
-     */
-    checkApi: (params: {
-        number: string;
-    }, options?: {
-        signal?: AbortSignal;
-    }) => Promise<any>;
-    /**
-     * 检查是否应该继续处理结果（用于处理网络断开、组件卸载等情况）
-     */
-    shouldContinue?: () => boolean;
-}
-interface RunParams {
-    /** 支付类型 */
-    paymentType: ActionType;
-    /** 支付交易号 */
-    paymentNum: string;
-    /** 订单ID */
-    orderId?: string | number;
-    /** 设备ID */
-    deviceId?: string | number;
-    /** 支付参数 */
-    params: RunApiParams;
-    /** 回调方法 */
-    callbacks: RunCallbacks;
-}
-interface RunCallbacks {
-    /**
-     * 成功回调
-     */
-    onSuccess: (res: any) => void;
-    /**
-     * 失败回调
-     */
-    onError: (error: any) => void;
-}
-export declare const usePayment: (options: UsePaymentOptions) => {
-    run: (options: RunParams) => Promise<void>;
-    stop: () => void;
-    clean: (params?: {
-        clearCallbacks?: boolean;
-    }) => void;
-};
-export {};