@whitesev/pops 2.6.1 → 3.0.1

package/src/types/button.d.ts

@@ -1,6 +1,5 @@
 import type { PopsEventConfig, PopsHandlerEventConfig } from "./event";
 import type { PopsIconType } from "./icon";
-import type { PopsType } from "./main";
 
 /**
  * 按钮类型
@@ -24,56 +23,10 @@ export type PopsButtonStyleType =
  */
 export type PopsButtonSize = "large" | "small";
 
-/**
- * 按钮的点击回调参数event
- */
-export interface PopsBtnCallBackEvent {
-  /**
-   * 元素
-   */
-  element: HTMLElement;
-  /**
-   * 动画元素（包裹着弹窗元素）
-   */
-  animElement: HTMLElement;
-  /**
-   * 弹窗元素
-   */
-  popsElement: HTMLElement;
-  /**
-   * 遮罩层元素
-   */
-  maskElement: HTMLElement | undefined;
-  /**
-   * 按钮调用类型
-   */
-  type: PopsButtonType;
-  /**
-   * 调用的方法
-   */
-  mode: PopsType;
-  /**
-   * 唯一id
-   */
-  guid: string;
-  /**
-   * 关闭弹窗
-   */
-  close(): void;
-  /**
-   * 隐藏弹窗
-   */
-  hide(): void;
-  /**
-   * 显示弹窗
-   */
-  show(): void;
-}
-
 /**
  * 按钮配置
  */
-export interface PopsButtonDetails<T = object> {
+export interface PopsGlobalButtonConfig<T = object> {
   /**
    * 是否启用按钮
    */
@@ -116,7 +69,7 @@ export interface PopsButtonDetails<T = object> {
 /**
  * 按钮配置（匹配任意类型）
  */
-export type PopsButtonDetailsAnyType<T = object> = Omit<PopsButtonDetails<T>, "type"> & {
+export type PopsButtonConfigAnyType<T = object> = Omit<PopsGlobalButtonConfig<T>, "type"> & {
   /**
    * 按钮样式类型
    * @default "default"
@@ -124,56 +77,10 @@ export type PopsButtonDetailsAnyType<T = object> = Omit<PopsButtonDetails<T>, "t
   type: string;
 };
 
-/** prompt的点击回调 */
-export interface PopsPromptButtonDetails extends PopsButtonDetails {
-  callback(
-    eventConfig: PopsHandlerEventConfig & {
-      text: string;
-    },
-    event: PointerEvent | MouseEvent
-  ): void;
-}
-/**
- * 右上角关闭按钮点击回调的配置
- */
-export interface PopsHeaderCloseButtonClickCallBackEvent {
-  /**
-   * 动画元素（包裹着弹窗元素）
-   */
-  animElement: HTMLElement;
-  /**
-   * 遮罩层元素，如果未设置，那么不存在
-   */
-  maskElement?: HTMLElement;
-  /**
-   * 按钮调用类型
-   */
-  type: string;
-  /**
-   * 唯一id
-   */
-  guid: string;
-  /**
-   * 关闭弹窗
-   */
-  close(): void;
-  /**
-   * 隐藏弹窗
-   */
-  hide(): void;
-  /**
-   * 显示弹窗
-   */
-  show(): void;
-  /**
-   * 输入的内容
-   */
-  text: string;
-}
 /**
  * 顶部关闭按钮配置
  */
-export interface PopsHeaderCloseButtonDetails {
+export interface PopsHeaderCloseButtonConfig {
   /**
    * 是否启用按钮
    */
@@ -183,5 +90,5 @@ export interface PopsHeaderCloseButtonDetails {
    *
    * 如果传入该值，那么将不会自动关闭弹窗
    */
-  callback?: (details: PopsEventConfig, event: PointerEvent | MouseEvent) => void;
+  callback?: (eventConfig: PopsEventConfig, event: PointerEvent | MouseEvent) => void;
 }

package/src/types/components.d.ts

@@ -1,7 +1,7 @@
 import type { PopsAnimation } from "./animation";
 import type { PopsPosition, PopsTextAlign, PopsJustifyContent } from "./position";
-import type { PopsButtonDetails, PopsButtonDetailsAnyType, PopsHeaderCloseButtonDetails } from "./button";
-import type { PopsMaskDetails } from "./mask";
+import type { PopsGlobalButtonConfig, PopsButtonConfigAnyType, PopsHeaderCloseButtonConfig } from "./button";
+import type { PopsMaskConfig } from "./mask";
 
 /**
  * 标题配置
@@ -62,7 +62,7 @@ export interface PopsButtonConfig {
     /**
      * 右上角的关闭按钮
      */
-    close?: PopsHeaderCloseButtonDetails;
+    close?: PopsHeaderCloseButtonConfig;
   };
 }
 /**
@@ -88,15 +88,15 @@ export interface PopsMoreButtonConfig<T = object> {
     /**
      * 确定按钮
      */
-    ok?: Partial<PopsButtonDetails<T> | PopsButtonDetailsAnyType<T>>;
+    ok?: Partial<PopsGlobalButtonConfig<T> | PopsButtonConfigAnyType<T>>;
     /**
      * 取消按钮
      */
-    cancel?: Partial<PopsButtonDetails<T> | PopsButtonDetailsAnyType<T>>;
+    cancel?: Partial<PopsGlobalButtonConfig<T> | PopsButtonConfigAnyType<T>>;
     /**
      * 其他按钮
      */
-    other?: Partial<PopsButtonDetails<T> | PopsButtonDetailsAnyType<T>>;
+    other?: Partial<PopsGlobalButtonConfig<T> | PopsButtonConfigAnyType<T>>;
   };
 }
 /**
@@ -136,7 +136,7 @@ export interface PopsDragConfig {
 /**
  * 通用配置
  */
-export interface PopsCommonConfig {
+export interface PopsGeneralConfig {
   /**
    * 是否使用shadowRoot
    *
@@ -188,7 +188,7 @@ export interface PopsCommonConfig {
   /**
    * 遮罩层
    */
-  mask?: PopsMaskDetails;
+  mask?: PopsMaskConfig;
   /**
    * 是否禁用页面滚动
    *

package/src/types/event.d.ts

@@ -1,35 +1,5 @@
-import type { PopsIframeDetails } from "../components/iframe/types";
 import type { PopsType } from "./main";
 
-/**
- * 事件配置
- */
-export interface PopsIframeEventConfig {
-  /**
-   * 唯一id
-   */
-  guid: string;
-  /**
-   * 当前弹窗类型
-   */
-  mode: PopsType;
-  /**
-   * 动画层
-   */
-  animElement: HTMLElement;
-  /**
-   * 主元素
-   */
-  popsElement: HTMLElement;
-  /**
-   * 遮罩层
-   */
-  maskElement: HTMLElement;
-  /**
-   * 当前配置
-   */
-  config: PopsIframeDetails;
-}
 /**
  * 事件配置
  */

package/src/types/global.d.ts

@@ -25,3 +25,7 @@ declare type DeepRequired<T> = T extends any[]
             [K in keyof T]-?: DeepRequired<T[K]>;
           }
       : T;
+
+declare type IPromise<T> = T | Promise<T>;
+
+declare type IFunction<T> = T | (() => T);

package/src/types/inst.d.ts

@@ -5,20 +5,20 @@ export interface PopsInstConfig {
   /** 固定id */
   guid: string;
   /** 动画元素 */
-  animElement: HTMLDivElement;
+  $anim: HTMLDivElement;
   /** 主元素 */
-  popsElement: HTMLDivElement;
+  $pops: HTMLDivElement;
   /** 遮罩层元素 */
-  maskElement?: HTMLDivElement;
+  $mask?: HTMLDivElement;
 }
 /**
  * config实例通用配置
  */
-export interface PopsInstCommonConfig extends PopsInstConfig {
+export interface PopsInstGeneralConfig extends PopsInstConfig {
   /** shadow容器 */
   $shadowContainer: HTMLDivElement;
   /** shadow容器的shandowRoot */
   $shadowRoot: ShadowRoot | HTMLElement;
   /** 移除实例前的回调函数 */
-  beforeRemoveCallBack?: (instCommonConfig: PopsInstCommonConfig) => void;
+  beforeRemoveCallBack?: (instCommonConfig: PopsInstGeneralConfig) => void;
 }

package/src/types/main.d.ts

@@ -1,111 +1,66 @@
-import type { PopsAlertDetails } from "../components/alert/types";
-import type { PopsConfirmDetails } from "../components/confirm/types";
-import type { PopsDrawerDetails } from "../components/drawer/types";
-import type { PopsFolderDetails } from "../components/folder/types";
-import type { PopsIframeDetails } from "../components/iframe/types";
-import type { PopsLoadingDetails } from "../components/loading/types";
-import type { PopsPanelButtonDetails } from "../components/panel/types/components-button";
-import type { PopsPanelDeepMenuDetails } from "../components/panel/types/components-deepMenu";
-import type { PopsPanelDetails } from "../components/panel/types";
-import type { PopsPanelInputDetails } from "../components/panel/types/components-input";
-import type { PopsPanelOwnDetails } from "../components/panel/types/components-own";
-import type { PopsPanelSelectDetails } from "../components/panel/types/components-select";
-import type { PopsPanelSliderDetails } from "../components/panel/types/components-slider";
-import type { PopsPanelSwitchDetails } from "../components/panel/types/components-switch";
-import type { PopsPanelTextAreaDetails } from "../components/panel/types/components-textarea";
-import type { PopsPromptDetails } from "../components/prompt/types/index";
-import type { PopsRightClickMenuDetails } from "../components/rightClickMenu/types";
-import type { PopsToolTipDetails } from "../components/tooltip/types/index";
-import type { PopsSearchSuggestionDetails } from "../components/searchSuggestion/types";
+import type { PopsAlertConfig } from "../components/alert/types";
+import type { PopsConfirmConfig } from "../components/confirm/types";
+import type { PopsDrawerConfig } from "../components/drawer/types";
+import type { PopsFolderConfig } from "../components/folder/types";
+import type { PopsIframeConfig } from "../components/iframe/types";
+import type { PopsLoadingConfig } from "../components/loading/types";
+import type { PopsPanelConfig } from "../components/panel/types";
+import type { PopsPromptConfig } from "../components/prompt/types/index";
+import type { PopsRightClickMenuConfig } from "../components/rightClickMenu/types";
+import type { PopsToolTipConfig } from "../components/tooltip/types/index";
+import type { PopsSearchSuggestionConfig } from "../components/searchSuggestion/types";
 
 export interface PopsUtilsOwnObject<V> {
   [key: string]: V | PopsUtilsOwnObject<V>;
 }
 
 /** pops所有的类型配置 11个*/
-export interface PopsDetails {
-  alert: PopsAlertDetails;
-  confirm: PopsConfirmDetails;
-  prompt: PopsPromptDetails;
-  loading: PopsLoadingDetails;
-  iframe: PopsIframeDetails;
-  tooltip: PopsToolTipDetails;
-  drawer: PopsDrawerDetails;
-  folder: PopsFolderDetails;
-  panel: PopsPanelDetails;
-  rightClickMenu: PopsRightClickMenuDetails;
-  searchSuggestion: PopsSearchSuggestionDetails;
+export interface PopsConfig {
+  alert: PopsAlertConfig;
+  confirm: PopsConfirmConfig;
+  prompt: PopsPromptConfig;
+  loading: PopsLoadingConfig;
+  iframe: PopsIframeConfig;
+  tooltip: PopsToolTipConfig;
+  drawer: PopsDrawerConfig;
+  folder: PopsFolderConfig;
+  panel: PopsPanelConfig;
+  rightClickMenu: PopsRightClickMenuConfig;
+  searchSuggestion: PopsSearchSuggestionConfig;
 }
 
 /** pops的类型 */
-export type PopsType = keyof PopsDetails;
+export type PopsType = keyof PopsConfig;
 
 /** pops中支持only的配置 */
-export type PopsSupportOnlyDetails = Omit<PopsDetails, "searchSuggestion">;
+export type PopsSupportOnlyConfig = Omit<PopsConfig, "searchSuggestion">;
 
 /** 存储实例的类型 */
-export type PopsInstStoreType = keyof Omit<PopsDetails, "searchSuggestion">;
+export type PopsInstStoreType = keyof Omit<PopsConfig, "searchSuggestion">;
 
 /** pops弹窗支持动画元素的配置 8个 */
-export type PopsSupportAnimDetails = Omit<PopsDetails, "tooltip" | "rightClickMenu" | "searchSuggestion">;
+export type PopsSupportAnimConfig = Omit<PopsConfig, "tooltip" | "rightClickMenu" | "searchSuggestion">;
 
 /** pops弹窗支持动画元素的类型 */
-export type PopsSupportAnimDetailsType = keyof PopsSupportAnimDetails;
+export type PopsSupportAnimConfigType = keyof PopsSupportAnimConfig;
 
 /** pops弹窗支持标题栏的配置 */
-export type PopsSupportHeaderTitleDetails = Pick<
-  PopsDetails,
+export type PopsSupportHeaderTitleConfig = Pick<
+  PopsConfig,
   "alert" | "confirm" | "prompt" | "iframe" | "drawer" | "folder" | "panel"
 >;
 
 /** pops弹窗支持标题栏的类型 */
-export type PopsSupportHeaderTitleDetailsType = keyof PopsSupportHeaderTitleDetails;
+export type PopsSupportHeaderTitleConfigType = keyof PopsSupportHeaderTitleConfig;
 
 /** pops支持底部按钮的配置 */
-export type PopsSupportBottomBtnDetails = Pick<PopsDetails, "alert" | "confirm" | "prompt" | "drawer">;
+export type PopsSupportBottomButtonConfig = Pick<PopsConfig, "alert" | "confirm" | "prompt" | "drawer">;
 
 /** pops支持底部按钮的类型 */
-export type PopsSupportBottomBtnDetailsType = keyof PopsSupportHeaderTitleDetails;
+export type PopsSupportBottomButtonConfigType = keyof PopsSupportHeaderTitleConfig;
 
 /** pops支持中间内容的配置 */
-export type PopsSupportContentDetails = Pick<PopsDetails, "alert" | "confirm" | "prompt" | "drawer" | "loading">;
+export type PopsSupportContentConfig = Pick<PopsConfig, "alert" | "confirm" | "prompt" | "drawer" | "loading">;
 
 /** pops支持中间内容的类型 */
-export type PopsSupportContentDetailsType = keyof PopsSupportContentDetails;
-
-/** panel的各种类型的配置项 */
-export type PopsPanelFormsTotalDetails =
-  | PopsPanelSwitchDetails
-  | PopsPanelSliderDetails
-  | PopsPanelInputDetails
-  | PopsPanelTextAreaDetails
-  | PopsPanelSelectDetails<any>
-  | PopsPanelButtonDetails
-  | PopsPanelDeepMenuDetails
-  | PopsPanelOwnDetails;
-
-/**
- * pops.xxx的调用返回值
- */
-export interface PopsCallResult {
-  /** 唯一标识id */
-  guid: string;
-  /** 影子元素 */
-  $shadowContainer: HTMLDivElement;
-  /** 影子元素的根节点 */
-  $shadowRoot: ShadowRoot | HTMLElement;
-  /** 元素 */
-  element: HTMLDivElement;
-  /** 动画层元素 */
-  animElement: HTMLDivElement;
-  /** pops元素 */
-  popsElement: HTMLDivElement;
-  /** 遮罩层元素 */
-  maskElement?: HTMLDivElement;
-  /** 关闭弹窗 */
-  close(): void;
-  /** 隐藏弹窗 */
-  hide(): void;
-  /** 显示弹窗 */
-  show(): void;
-}
+export type PopsSupportContentConfigType = keyof PopsSupportContentConfig;

package/src/types/mask.d.ts

@@ -1,20 +1,23 @@
-import type { PopsAlertDetails } from "../components/alert/types";
-import type { PopsDrawerDetails } from "../components/drawer/types";
-import type { PopsFolderDetails } from "../components/folder/types";
-import type { PopsIframeDetails } from "../components/iframe/types";
-import type { PopsLoadingDetails } from "../components/loading/types";
-import type { PopsPanelDetails } from "../components/panel/types";
-import type { PopsPromptDetails } from "../components/prompt/types/index";
+import type { PopsAlertConfig } from "../components/alert/types";
+import type { PopsDrawerConfig } from "../components/drawer/types";
+import type { PopsFolderConfig } from "../components/folder/types";
+import type { PopsIframeConfig } from "../components/iframe/types";
+import type { PopsLoadingConfig } from "../components/loading/types";
+import type { PopsPanelConfig } from "../components/panel/types";
+import type { PopsPromptConfig } from "../components/prompt/types/index";
 
 /**
  * 遮罩层配置
  */
-export interface PopsMaskDetails {
+export interface PopsMaskConfig {
   /**
    * 是否启用遮罩层，默认false
    * @default false
    */
   enable?: boolean;
+  /**
+   * 点击事件
+   */
   clickEvent?: {
     /**
      * 点击遮罩层是否触发关闭事件
@@ -36,13 +39,13 @@ export interface PopsMaskDetails {
     | ((
         originalRun: () => void | Promise<void>,
         config:
-          | PopsAlertDetails
-          | PopsDrawerDetails
-          | PopsIframeDetails
-          | PopsPromptDetails
-          | PopsFolderDetails
-          | PopsLoadingDetails
-          | PopsPanelDetails
+          | PopsAlertConfig
+          | PopsDrawerConfig
+          | PopsIframeConfig
+          | PopsPromptConfig
+          | PopsFolderConfig
+          | PopsLoadingConfig
+          | PopsPanelConfig
       ) => void)
     | undefined
     | null;