@whitesev/pops 2.5.5 → 2.6.1

package/src/types/button.d.ts

@@ -1,4 +1,4 @@
-import type { PopsEventDetails, PopsHandlerEventDetails } from "./event";
+import type { PopsEventConfig, PopsHandlerEventConfig } from "./event";
 import type { PopsIconType } from "./icon";
 import type { PopsType } from "./main";
 
@@ -110,7 +110,7 @@ export interface PopsButtonDetails<T = object> {
    *
    * 如果传入该值，那么将不会自动关闭弹窗
    */
-  callback(eventDetails: PopsHandlerEventDetails & T, event: PointerEvent | MouseEvent): void;
+  callback(eventConfig: PopsHandlerEventConfig & T, event: PointerEvent | MouseEvent): void;
 }
 
 /**
@@ -127,7 +127,7 @@ export type PopsButtonDetailsAnyType<T = object> = Omit<PopsButtonDetails<T>, "t
 /** prompt的点击回调 */
 export interface PopsPromptButtonDetails extends PopsButtonDetails {
   callback(
-    eventDetails: PopsHandlerEventDetails & {
+    eventConfig: PopsHandlerEventConfig & {
       text: string;
     },
     event: PointerEvent | MouseEvent
@@ -183,5 +183,5 @@ export interface PopsHeaderCloseButtonDetails {
    *
    * 如果传入该值，那么将不会自动关闭弹窗
    */
-  callback?: (details: PopsEventDetails, event: PointerEvent | MouseEvent) => void;
+  callback?: (details: PopsEventConfig, event: PointerEvent | MouseEvent) => void;
 }

package/src/types/event.d.ts

@@ -4,7 +4,7 @@ import type { PopsType } from "./main";
 /**
  * 事件配置
  */
-export interface PopsIframeEventDetails {
+export interface PopsIframeEventConfig {
   /**
    * 唯一id
    */
@@ -33,19 +33,19 @@ export interface PopsIframeEventDetails {
 /**
  * 事件配置
  */
-export interface PopsEventDetails {
+export interface PopsEventConfig {
   /** 最外层包裹的元素 */
   $shadowContainer: HTMLDivElement;
   /** ShadowRoot */
   $shadowRoot: ShadowRoot | HTMLElement;
   /** -> 动画层 */
-  element: HTMLDivElement;
+  $el: HTMLDivElement;
   /** 动画层 */
-  animElement: HTMLDivElement;
+  $anim: HTMLDivElement;
   /** 主元素 */
-  popsElement: HTMLDivElement;
+  $pops: HTMLDivElement;
   /** 遮罩层 */
-  maskElement?: HTMLDivElement;
+  $mask?: HTMLDivElement;
   /** 当前弹窗类型 */
   mode: PopsType;
   guid: string;
@@ -57,7 +57,7 @@ export interface PopsEventDetails {
 /**
  * 处理过的事件配置
  */
-export interface PopsHandlerEventDetails extends PopsEventDetails {
+export interface PopsHandlerEventConfig extends PopsEventConfig {
   /** 当前按钮类型 */
   type: "cancel" | "close" | "ok" | "other";
 }

package/src/utils/PopsInstanceUtils.ts

@@ -217,13 +217,10 @@ export const PopsInstanceUtils = {
    * @param instConfigList
    * @param guid
    * @param config
-   * @param animElement
-   * @param maskElement
+   * @param $anim
+   * @param $mask
    */
   hide(
-    popsType: PopsInstStoreType,
-    instConfigList: PopsInstCommonConfig[],
-    guid: string,
     config:
       | PopsAlertDetails
       | PopsDrawerDetails
@@ -233,15 +230,20 @@ export const PopsInstanceUtils = {
       | PopsLoadingDetails
       | PopsPanelDetails
       | PopsFolderDetails,
-    animElement: HTMLElement,
-    maskElement: HTMLElement
+    popsType: PopsInstStoreType,
+    instConfigList: PopsInstCommonConfig[],
+    guid: string,
+    $anim: HTMLElement,
+    $mask?: HTMLElement
   ) {
     return new Promise<void>((resolve) => {
-      const popsElement = animElement.querySelector<HTMLDivElement>(".pops[type-value]")!;
+      const popsElement = $anim.querySelector<HTMLDivElement>(".pops[type-value]")!;
       if (popsType === "drawer") {
         const drawerConfig = config as Required<PopsDrawerDetails>;
         popsUtils.setTimeout(() => {
-          maskElement.style.setProperty("display", "none");
+          if ($mask) {
+            popsDOMUtils.css($mask, "display", "none");
+          }
           if (["top", "bottom"].includes(drawerConfig.direction)) {
             popsElement.style.setProperty("height", "0");
           } else if (["left", "right"].includes(drawerConfig.direction)) {
@@ -303,13 +305,10 @@ export const PopsInstanceUtils = {
    * @param instConfigList
    * @param guid
    * @param config
-   * @param animElement
-   * @param maskElement
+   * @param $anim
+   * @param $mask
    */
   show(
-    popsType: PopsInstStoreType,
-    instConfigList: PopsInstCommonConfig[],
-    guid: string,
     config:
       | PopsAlertDetails
       | PopsDrawerDetails
@@ -319,15 +318,20 @@ export const PopsInstanceUtils = {
       | PopsLoadingDetails
       | PopsPanelDetails
       | PopsFolderDetails,
-    animElement: HTMLElement,
-    maskElement?: HTMLElement
+    popsType: PopsInstStoreType,
+    instConfigList: PopsInstCommonConfig[],
+    guid: string,
+    $anim: HTMLElement,
+    $mask?: HTMLElement
   ) {
     return new Promise<void>((resolve) => {
-      const popsElement = animElement.querySelector<HTMLDivElement>(".pops[type-value]")!;
+      const popsElement = $anim.querySelector<HTMLDivElement>(".pops[type-value]")!;
       if (popsType === "drawer") {
         const drawerConfig = config as PopsDrawerDetails;
         popsUtils.setTimeout(() => {
-          popsDOMUtils.css(maskElement!, "display", "");
+          if ($mask) {
+            popsDOMUtils.css($mask, "display", "");
+          }
           const direction = drawerConfig.direction!;
           const size = drawerConfig.size!.toString();
           if (["top", "bottom"].includes(direction)) {
@@ -389,12 +393,9 @@ export const PopsInstanceUtils = {
    * @param instConfigList
    * @param guid
    * @param config
-   * @param animElement
+   * @param $anim
    */
   close(
-    popsType: string,
-    instConfigList: PopsInstCommonConfig[],
-    guid: string,
     config:
       | PopsAlertDetails
       | PopsDrawerDetails
@@ -404,10 +405,13 @@ export const PopsInstanceUtils = {
       | PopsLoadingDetails
       | PopsPanelDetails
       | PopsFolderDetails,
-    animElement: HTMLElement
+    popsType: string,
+    instConfigList: PopsInstCommonConfig[],
+    guid: string,
+    $anim: HTMLElement
   ) {
     return new Promise<void>((resolve) => {
-      const popsElement = animElement.querySelector<HTMLDivElement>(".pops[type-value]")!;
+      const popsElement = $anim.querySelector<HTMLDivElement>(".pops[type-value]")!;
       const drawerConfig = config as Required<PopsDrawerDetails>;
       /**
        * 动画结束事件