@whitesev/pops 3.1.0 → 3.1.2

package/dist/types/src/PopsCore.d.ts

@@ -1,27 +1,19 @@
-interface PopsCoreOption {
+declare const PopsCoreDefaultEnv: {
     document: Document;
-    window: Window;
+    window: Window & typeof globalThis;
     globalThis: typeof globalThis;
-    self: typeof globalThis;
-    setTimeout: Window["setTimeout"];
-    setInterval: Window["setInterval"];
-    clearTimeout: Window["clearTimeout"];
-    clearInterval: Window["clearInterval"];
-}
+    self: Window & typeof globalThis;
+};
 declare const PopsCore: {
-    init(option?: PopsCoreOption): void;
+    init(option?: typeof PopsCoreDefaultEnv): void;
     readonly document: Document;
-    readonly window: Window;
+    readonly window: Window & typeof globalThis;
     readonly globalThis: typeof globalThis;
-    readonly self: typeof globalThis;
-    readonly setTimeout: (handler: TimerHandler, timeout?: number, ...arguments: any[]) => number;
-    readonly setInterval: (handler: TimerHandler, timeout?: number, ...arguments: any[]) => number;
-    readonly clearTimeout: (id: number | undefined) => void;
-    readonly clearInterval: (id: number | undefined) => void;
+    readonly self: Window & typeof globalThis;
 };
 declare const OriginPrototype: {
     Object: {
         defineProperty: <T>(o: T, p: PropertyKey, attributes: PropertyDescriptor & ThisType<any>) => T;
     };
 };
-export { PopsCoreOption, PopsCore, OriginPrototype };
+export { PopsCore, OriginPrototype };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@whitesev/pops",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "description": "弹窗库，包含了alert、confirm、prompt、drawer、loading、iframe、rightClickMenu等组件",
   "type": "module",
   "homepage": "https://github.com/WhiteSevs/TamperMonkeyScript/tree/master/lib/pops#readme",

package/src/PopsCore.ts

@@ -1,29 +1,14 @@
-interface PopsCoreOption {
-  document: Document;
-  window: Window;
-  globalThis: typeof globalThis;
-  self: typeof globalThis;
-  setTimeout: Window["setTimeout"];
-  setInterval: Window["setInterval"];
-  clearTimeout: Window["clearTimeout"];
-  clearInterval: Window["clearInterval"];
-}
-
-const PopsCoreDefaultEnv: PopsCoreOption = {
+const PopsCoreDefaultEnv = {
   document: document,
   window: window,
   globalThis: globalThis,
   self: self,
-  setTimeout: globalThis.setTimeout.bind(globalThis),
-  setInterval: globalThis.setInterval.bind(globalThis),
-  clearTimeout: globalThis.clearTimeout.bind(globalThis),
-  clearInterval: globalThis.clearInterval.bind(globalThis),
 };
 
-const PopsCoreEnv: PopsCoreOption = Object.assign({}, PopsCoreDefaultEnv);
+const PopsCoreEnv = Object.assign({}, PopsCoreDefaultEnv);
 
 const PopsCore = {
-  init(option?: PopsCoreOption) {
+  init(option?: typeof PopsCoreDefaultEnv) {
     if (!option) {
       option = Object.assign({}, PopsCoreDefaultEnv);
     }
@@ -41,18 +26,6 @@ const PopsCore = {
   get self() {
     return PopsCoreEnv.self;
   },
-  get setTimeout() {
-    return PopsCoreEnv.setTimeout;
-  },
-  get setInterval() {
-    return PopsCoreEnv.setInterval;
-  },
-  get clearTimeout() {
-    return PopsCoreEnv.clearTimeout;
-  },
-  get clearInterval() {
-    return PopsCoreEnv.clearInterval;
-  },
 };
 
 const OriginPrototype = {
@@ -61,4 +34,4 @@ const OriginPrototype = {
   },
 };
 
-export { PopsCoreOption, PopsCore, OriginPrototype };
+export { PopsCore, OriginPrototype };

package/src/components/panel/index.css

@@ -907,6 +907,7 @@ section.pops-panel-container .pops-panel-slider input[type="range"]::-moz-range-
   border: 0;
 }
 .pops-panel-select select {
+  width: 100%;
   height: 32px;
   line-height: normal;
   align-content: center;

package/src/utils/PopsUtils.ts

@@ -359,7 +359,7 @@ class PopsUtils {
     try {
       return WorkerSetTimeout(callback, timeout);
     } catch {
-      return PopsCore.setTimeout(callback, timeout);
+      return setTimeout(callback, timeout);
     }
   }
   /**
@@ -373,7 +373,7 @@ class PopsUtils {
     } catch {
       // TODO
     } finally {
-      PopsCore.clearTimeout(timeId);
+      clearTimeout(timeId);
     }
   }
   /**
@@ -383,7 +383,7 @@ class PopsUtils {
     try {
       return WorkerSetInterval(callback, timeout);
     } catch {
-      return PopsCore.setInterval(callback, timeout);
+      return setInterval(callback, timeout);
     }
   }
   /**
@@ -397,7 +397,7 @@ class PopsUtils {
     } catch {
       // 忽略
     } finally {
-      PopsCore.clearInterval(timeId);
+      clearInterval(timeId);
     }
   }
   /**