pixuireactcomponents 1.3.90 → 1.3.92

package/index.d.ts

@@ -15,4 +15,4 @@ export { frameAnimationJs } from "./src/components/js/frameAnimationJs/frameAnim
 export { ScrollBar } from "./src/components/react/app/scrollBar/ScrollBar";
 export { tools } from "./src/components/tools/tools";
 export { Slider, SliderProps } from "./src/components/react/app/slider/Slider";
-export { ImgPreLoader, PreLoadPic } from "./src/components/tools/ImgPreLoader";
+export { ImgPreLoader_base64, PreLoadPic_base64 } from "./src/components/tools/ImgPreLoader";

package/index.js

@@ -11,7 +11,7 @@ export { GradientText } from './src/components/react/base/gradient/GradientText'
 export { PVideo } from './src/components/react/base/pixVideo/PixVideo';
 export { OutlineText } from './src/components/react/base/outlinetext/OutlineText';
 export { FrameAnimation } from './src/components/react/app/frameAnimation/FrameAnimation';
-export { ImgPreLoader, PreLoadPic } from './src/components/tools/ImgPreLoader';
+export { ImgPreLoader_base64, PreLoadPic_base64 } from './src/components/tools/ImgPreLoader';
 export { AsyncTaskProcessor } from './src/components/tools/AsyncTaskProcessor';
 export { assetCache } from './src/components/tools/assetCache';
 export { frameAnimationJs } from './src/components/js/frameAnimationJs/frameAnimationJs';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "pixuireactcomponents",
-    "version": "1.3.90",
+    "version": "1.3.92",
     "description": "pixui react components",
     "main": "index.js",
     "scripts": {

package/src/components/react/app/preloadImg/PreloadImg.d.ts

@@ -0,0 +1,2 @@
+import { h } from 'preact';
+export declare const PreloadImg: (props: h.JSX.HTMLAttributes<HTMLImageElement>) => h.JSX.Element;

package/src/components/react/app/preloadImg/PreloadImg.js

@@ -0,0 +1,36 @@
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+import { useEffect, useState } from 'preact/hooks';
+import { h } from 'preact';
+import { GameletAPI } from 'gamelet-pixui-frame';
+import { assetCache } from 'src/components/tools/assetCache';
+export var PreloadImg = function (props) {
+    var src = props.src;
+    var _a = useState(''), realSrc = _a[0], setRealSrc = _a[1];
+    useEffect(function () {
+        if (src) {
+            if (isJssdkEnv()) {
+                assetCache.cache(src).then(function (localSrc) {
+                    setRealSrc(localSrc);
+                    console.log('使用预加载图片', src, ' -> ', localSrc);
+                });
+            }
+            else {
+                setRealSrc(src);
+            }
+        }
+    }, [src]);
+    return h("img", __assign({}, props, { src: realSrc }));
+};
+var isJssdkEnv = function () {
+    return GameletAPI.getRuntimeEnv() == 'jssdk-appwindow' || GameletAPI.getRuntimeEnv() == 'jssdk-preprocessor';
+};

package/src/components/tools/ImgPreLoader.d.ts

@@ -1,9 +1,9 @@
 import { h } from 'preact';
-export declare function ImgPreLoader(): void;
-export declare namespace ImgPreLoader {
+export declare function ImgPreLoader_base64(): void;
+export declare namespace ImgPreLoader_base64 {
     var preLoadUrl: (url: string) => Promise<void>;
 }
-export declare let PreLoadPic: (props: {
+export declare let PreLoadPic_base64: (props: {
     url: string;
     className: string;
     onClick: any;

package/src/components/tools/ImgPreLoader.js

@@ -38,11 +38,11 @@ import { h } from 'preact';
 import { useState, useEffect, useRef } from 'preact/hooks';
 import { tools } from './tools';
 import { TaskProcessor } from './AsyncTaskProcessor';
-export function ImgPreLoader() { }
+export function ImgPreLoader_base64() { }
 /**
  * 预加载一个png，jpg的url
  */
-ImgPreLoader.preLoadUrl = function (url) { return __awaiter(void 0, void 0, void 0, function () {
+ImgPreLoader_base64.preLoadUrl = function (url) { return __awaiter(void 0, void 0, void 0, function () {
     var post, fileName_1, stashed, xhr_1;
     return __generator(this, function (_a) {
         switch (_a.label) {
@@ -85,7 +85,7 @@ ImgPreLoader.preLoadUrl = function (url) { return __awaiter(void 0, void 0, void
 /**
  * 判断一个url是否已经预加载过，如果预加载过，返回base64，否则返回原url
  */
-var getPreLoadUrl = function (url) { return __awaiter(void 0, void 0, void 0, function () {
+var getPreLoadUrl_base64 = function (url) { return __awaiter(void 0, void 0, void 0, function () {
     var res;
     return __generator(this, function (_a) {
         switch (_a.label) {
@@ -103,7 +103,7 @@ var getPreLoadUrl = function (url) { return __awaiter(void 0, void 0, void 0, fu
         }
     });
 }); };
-export var PreLoadPic = function (props) {
+export var PreLoadPic_base64 = function (props) {
     var _a, _b;
     var url = props.url, className = props.className, onClick = props.onClick, usePreload = props.usePreload, width = props.width, height = props.height;
     var _url = (_a = useState(url), _a[0]), setUrl = _a[1];
@@ -113,7 +113,7 @@ export var PreLoadPic = function (props) {
     useEffect(function () {
         if (usePreload) {
             _TaskProcessor.enqueueTask(function () {
-                return getPreLoadUrl(url).then(function (__url) {
+                return getPreLoadUrl_base64(url).then(function (__url) {
                     if (!loaded) {
                         console.log('PicComp-- 没有onload,使用cookie结果', url, __url.substring(0, 1000));
                         setUrl(__url);

package/src/components/tools/assetCache.d.ts

@@ -16,5 +16,5 @@ export declare namespace assetCache {
      * @param retryTimes 重试次数
      * @returns 下载成功是，返回xhr.response，否则返回空字符串
      */
-    const download: (url: string, responseType: 'arraybuffer' | 'json' | 'text', retryTimes?: number) => Promise<string>;
+    const request: (url: string, responseType: 'arraybuffer' | 'json' | 'text', retryTimes?: number) => Promise<string>;
 }

package/src/components/tools/assetCache.js

@@ -141,9 +141,9 @@ export var assetCache;
      * @param retryTimes 重试次数
      * @returns 下载成功是，返回xhr.response，否则返回空字符串
      */
-    assetCache.download = function (url, responseType, retryTimes) {
+    assetCache.request = function (url, responseType, retryTimes) {
         if (retryTimes === void 0) { retryTimes = 3; }
-        console.log('download---', url);
+        console.log('request---', url);
         return new Promise(function (resolve, reject) {
             var xhr = new XMLHttpRequest();
             xhr.open('GET', url, true);
@@ -157,7 +157,7 @@ export var assetCache;
                         console.warn('cacheAsset xhr statue!=200', xhr.status);
                         if (retryTimes > 0) {
                             console.log('retry cacheAsset', retryTimes);
-                            assetCache.download(url, responseType, retryTimes - 1).then(resolve, reject);
+                            assetCache.request(url, responseType, retryTimes - 1).then(resolve, reject);
                         }
                         else {
                             reject('');
@@ -170,7 +170,7 @@ export var assetCache;
                 console.warn('cacheAsset XHR error', xhr.status);
                 if (retryTimes > 0) {
                     console.log('retry cacheAsset', retryTimes);
-                    assetCache.download(url, responseType, retryTimes - 1).then(resolve, reject);
+                    assetCache.request(url, responseType, retryTimes - 1).then(resolve, reject);
                 }
                 else {
                     reject('');