@tarojs/taro-h5 3.4.6 → 3.5.0-alpha.1

package/dist/api/ui/interaction/actionSheet.js

@@ -57,10 +57,7 @@ export default class ActionSheet {
             // style
             const { maskStyle, actionSheetStyle, menuStyle, cellStyle, cancelStyle } = this.style;
             // configuration
-            const config = {
-                ...this.options,
-                ...options
-            };
+            const config = Object.assign(Object.assign({}, this.options), options);
             this.lastConfig = config;
             // wrapper
             this.el = document.createElement('div');
@@ -75,10 +72,7 @@ export default class ActionSheet {
             this.actionSheet.setAttribute('style', inlineStyle(actionSheetStyle));
             // menu
             this.menu = document.createElement('div');
-            this.menu.setAttribute('style', inlineStyle({
-                ...menuStyle,
-                color: config.itemColor
-            }));
+            this.menu.setAttribute('style', inlineStyle(Object.assign(Object.assign({}, menuStyle), { color: config.itemColor })));
             // cells
             this.cells = config.itemList.map((item, index) => {
                 const cell = document.createElement('div');
@@ -121,10 +115,7 @@ export default class ActionSheet {
     }
     show(options = {}) {
         return new Promise((resolve) => {
-            const config = {
-                ...this.options,
-                ...options
-            };
+            const config = Object.assign(Object.assign({}, this.options), options);
             this.lastConfig = config;
             if (this.hideOpacityTimer)
                 clearTimeout(this.hideOpacityTimer);

package/dist/api/ui/interaction/index.js

@@ -1,3 +1,12 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 import Taro from '@tarojs/api';
 import { getParameterError, temporarilyNotSupport } from '../../utils';
 import { MethodHandler } from '../../utils/handler';
@@ -106,7 +115,7 @@ const hideLoading = ({ success, fail, complete } = {}) => {
     toast.hide(0, 'loading');
     return handle.success();
 };
-const showModal = async (options = {}) => {
+const showModal = (options = {}) => __awaiter(void 0, void 0, void 0, function* () {
     init(document);
     options = Object.assign({
         title: '',
@@ -186,21 +195,21 @@ const showModal = async (options = {}) => {
     options.showCancel = !!options.showCancel;
     let result = '';
     if (!modal.el) {
-        result = await modal.create(options);
+        result = yield modal.create(options);
     }
     else {
-        result = await modal.show(options);
+        result = yield modal.show(options);
     }
     const res = { cancel: !1, confirm: !1 };
     res[result] = !0;
     return handle.success(res);
-};
+});
 function hideModal() {
     if (!modal.el)
         return;
     modal.hide();
 }
-const showActionSheet = async (options = { itemList: [] }) => {
+const showActionSheet = (options = { itemList: [] }) => __awaiter(void 0, void 0, void 0, function* () {
     init(document);
     options = Object.assign({
         itemColor: '#000000',
@@ -246,10 +255,10 @@ const showActionSheet = async (options = { itemList: [] }) => {
     }
     let result = '';
     if (!actionSheet.el) {
-        result = await actionSheet.create(options);
+        result = yield actionSheet.create(options);
     }
     else {
-        result = await actionSheet.show(options);
+        result = yield actionSheet.show(options);
     }
     if (typeof result === 'string') {
         return handle.fail(({ errMsg: result }));
@@ -257,7 +266,7 @@ const showActionSheet = async (options = { itemList: [] }) => {
     else {
         return handle.success(({ tapIndex: result }));
     }
-};
+});
 Taro.eventCenter.on('__taroRouterChange', () => {
     hideToast();
     hideLoading();

package/dist/api/ui/interaction/modal.js

@@ -64,10 +64,7 @@ export default class Modal {
             // style
             const { maskStyle, modalStyle, titleStyle, textStyle, footStyle, btnStyle } = this.style;
             // configuration
-            const config = {
-                ...this.options,
-                ...options
-            };
+            const config = Object.assign(Object.assign({}, this.options), options);
             // wrapper
             this.el = document.createElement('div');
             this.el.className = 'taro__modal';
@@ -82,20 +79,13 @@ export default class Modal {
             modal.className = 'taro-modal__content';
             modal.setAttribute('style', inlineStyle(modalStyle));
             // title
-            const titleCSS = config.title ? titleStyle : {
-                ...titleStyle,
-                display: 'none'
-            };
+            const titleCSS = config.title ? titleStyle : Object.assign(Object.assign({}, titleStyle), { display: 'none' });
             this.title = document.createElement('div');
             this.title.className = 'taro-modal__title';
             this.title.setAttribute('style', inlineStyle(titleCSS));
             this.title.textContent = config.title;
             // text
-            const textCSS = config.title ? textStyle : {
-                ...textStyle,
-                padding: '40px 20px 26px',
-                color: '#353535'
-            };
+            const textCSS = config.title ? textStyle : Object.assign(Object.assign({}, textStyle), { padding: '40px 20px 26px', color: '#353535' });
             this.text = document.createElement('div');
             this.text.className = 'taro-modal__text';
             this.text.setAttribute('style', inlineStyle(textCSS));
@@ -105,11 +95,7 @@ export default class Modal {
             foot.className = 'taro-modal__foot';
             foot.setAttribute('style', inlineStyle(footStyle));
             // cancel button
-            const cancelCSS = {
-                ...btnStyle,
-                color: config.cancelColor,
-                display: config.showCancel ? 'block' : 'none'
-            };
+            const cancelCSS = Object.assign(Object.assign({}, btnStyle), { color: config.cancelColor, display: config.showCancel ? 'block' : 'none' });
             this.cancel = document.createElement('div');
             this.cancel.className = 'taro-model__btn taro-model__cancel';
             this.cancel.setAttribute('style', inlineStyle(cancelCSS));
@@ -143,10 +129,7 @@ export default class Modal {
     }
     show(options = {}) {
         return new Promise((resolve) => {
-            const config = {
-                ...this.options,
-                ...options
-            };
+            const config = Object.assign(Object.assign({}, this.options), options);
             if (this.hideOpacityTimer)
                 clearTimeout(this.hideOpacityTimer);
             if (this.hideDisplayTimer)
@@ -162,11 +145,7 @@ export default class Modal {
             else {
                 // block => none
                 this.title.style.display = 'none';
-                const textCSS = {
-                    ...textStyle,
-                    padding: '40px 20px 26px',
-                    color: '#353535'
-                };
+                const textCSS = Object.assign(Object.assign({}, textStyle), { padding: '40px 20px 26px', color: '#353535' });
                 this.text.setAttribute('style', inlineStyle(textCSS));
             }
             this.text.textContent = config.content || '';

package/dist/api/ui/interaction/toast.js

@@ -78,11 +78,7 @@ export default class Toast {
         // style
         const { maskStyle, toastStyle, successStyle, errrorStyle, loadingStyle, imageStyle, textStyle } = this.style;
         // configuration
-        const config = {
-            ...this.options,
-            ...options,
-            _type
-        };
+        const config = Object.assign(Object.assign(Object.assign({}, this.options), options), { _type });
         // wrapper
         this.el = document.createElement('div');
         this.el.className = 'taro__toast';
@@ -95,27 +91,18 @@ export default class Toast {
         // icon
         this.icon = document.createElement('p');
         if (config.image) {
-            this.icon.setAttribute('style', inlineStyle({
-                ...imageStyle,
-                'background-image': `url(${config.image})`
-            }));
+            this.icon.setAttribute('style', inlineStyle(Object.assign(Object.assign({}, imageStyle), { 'background-image': `url(${config.image})` })));
         }
         else {
             const iconStyle = config.icon === 'loading' ? loadingStyle : config.icon === 'error' ? errrorStyle : successStyle;
-            this.icon.setAttribute('style', inlineStyle({
-                ...iconStyle,
-                ...(config.icon === 'none' ? { display: 'none' } : {})
-            }));
+            this.icon.setAttribute('style', inlineStyle(Object.assign(Object.assign({}, iconStyle), (config.icon === 'none' ? { display: 'none' } : {}))));
         }
         // toast
         this.toast = document.createElement('div');
-        this.toast.setAttribute('style', inlineStyle({
-            ...toastStyle,
-            ...(config.icon === 'none' ? {
-                'min-height': '0',
-                padding: '10px 15px'
-            } : {})
-        }));
+        this.toast.setAttribute('style', inlineStyle(Object.assign(Object.assign({}, toastStyle), (config.icon === 'none' ? {
+            'min-height': '0',
+            padding: '10px 15px'
+        } : {}))));
         // title
         this.title = document.createElement('p');
         this.title.setAttribute('style', inlineStyle(textStyle));
@@ -134,11 +121,7 @@ export default class Toast {
         return '';
     }
     show(options = {}, _type = 'toast') {
-        const config = {
-            ...this.options,
-            ...options,
-            _type
-        };
+        const config = Object.assign(Object.assign(Object.assign({}, this.options), options), { _type });
         if (this.hideOpacityTimer)
             clearTimeout(this.hideOpacityTimer);
         if (this.hideDisplayTimer)
@@ -150,28 +133,19 @@ export default class Toast {
         // image
         const { toastStyle, successStyle, errrorStyle, loadingStyle, imageStyle } = this.style;
         if (config.image) {
-            this.icon.setAttribute('style', inlineStyle({
-                ...imageStyle,
-                'background-image': `url(${config.image})`
-            }));
+            this.icon.setAttribute('style', inlineStyle(Object.assign(Object.assign({}, imageStyle), { 'background-image': `url(${config.image})` })));
         }
         else {
             if (!config.image && config.icon) {
                 const iconStyle = config.icon === 'loading' ? loadingStyle : config.icon === 'error' ? errrorStyle : successStyle;
-                this.icon.setAttribute('style', inlineStyle({
-                    ...iconStyle,
-                    ...(config.icon === 'none' ? { display: 'none' } : {})
-                }));
+                this.icon.setAttribute('style', inlineStyle(Object.assign(Object.assign({}, iconStyle), (config.icon === 'none' ? { display: 'none' } : {}))));
             }
         }
         // toast
-        this.toast.setAttribute('style', inlineStyle({
-            ...toastStyle,
-            ...(config.icon === 'none' ? {
-                'min-height': '0',
-                padding: '10px 15px'
-            } : {})
-        }));
+        this.toast.setAttribute('style', inlineStyle(Object.assign(Object.assign({}, toastStyle), (config.icon === 'none' ? {
+            'min-height': '0',
+            padding: '10px 15px'
+        } : {}))));
         // show
         this.el.style.display = 'block';
         setTimeout(() => { this.el.style.opacity = '1'; }, 0);

package/dist/api/utils/animation.js

@@ -0,0 +1,14 @@
+/**
+ * ease-in-out的函数
+ * @param t 0-1的数字
+ */
+export const easeInOut = (t) => (t < 0.5 ? 4 * t * t * t : (t - 1) * (2 * t - 2) * (2 * t - 2) + 1);
+export const getTimingFunc = (easeFunc, frameCnt) => {
+    return x => {
+        if (frameCnt <= 1) {
+            return easeFunc(1);
+        }
+        const t = x / (frameCnt - 1);
+        return easeFunc(t);
+    };
+};

package/dist/api/utils/index.js

@@ -90,7 +90,7 @@ export function temporarilyNotSupport(apiName) {
 }
 export function weixinCorpSupport(apiName) {
     return () => {
-        const errMsg = `h5端仅在微信公众号中支持 API ${apiName}`;
+        const errMsg = `h5端当前仅在微信公众号JS-SDK环境下支持此 API ${apiName}`;
         if (process.env.NODE_ENV !== 'production') {
             console.error(errMsg);
             return Promise.reject({
@@ -122,51 +122,38 @@ export function permanentlyNotSupport(apiName) {
         }
     };
 }
-export function isFunction(obj) {
-    return typeof obj === 'function';
-}
-const VALID_COLOR_REG = /^#[0-9a-fA-F]{6}$/;
-export const isValidColor = (color) => {
-    return VALID_COLOR_REG.test(color);
-};
-export function processOpenApi(apiName, defaultOptions, formatResult = res => res, formatParams = options => options) {
-    // @ts-ignore
-    if (!window.wx) {
-        return weixinCorpSupport(apiName);
-    }
-    return options => {
-        options = options || {};
-        const obj = Object.assign({}, defaultOptions, options);
-        const p = new Promise((resolve, reject) => {
-            ['fail', 'success', 'complete'].forEach(k => {
-                obj[k] = oriRes => {
-                    const res = formatResult(oriRes);
-                    options[k] && options[k](res);
-                    if (k === 'success') {
-                        resolve(res);
-                    }
-                    else if (k === 'fail') {
-                        reject(res);
-                    }
-                };
+export function processOpenApi({ name, defaultOptions, standardMethod, formatOptions = options => options, formatResult = res => res }) {
+    const notSupported = weixinCorpSupport(name);
+    return (options = {}) => {
+        var _a;
+        // @ts-ignore
+        const targetApi = (_a = window === null || window === void 0 ? void 0 : window.wx) === null || _a === void 0 ? void 0 : _a[name];
+        const opts = formatOptions(Object.assign({}, defaultOptions, options));
+        if (typeof targetApi === 'function') {
+            return new Promise((resolve, reject) => {
+                ['fail', 'success', 'complete'].forEach(k => {
+                    opts[k] = preRef => {
+                        const res = formatResult(preRef);
+                        options[k] && options[k](res);
+                        if (k === 'success') {
+                            resolve(res);
+                        }
+                        else if (k === 'fail') {
+                            reject(res);
+                        }
+                    };
+                    return targetApi(opts);
+                });
             });
-            // @ts-ignore
-            wx[apiName](formatParams(obj));
-        });
-        return p;
-    };
-}
-/**
- * ease-in-out的函数
- * @param t 0-1的数字
- */
-export const easeInOut = (t) => t < 0.5 ? 4 * t * t * t : (t - 1) * (2 * t - 2) * (2 * t - 2) + 1;
-export const getTimingFunc = (easeFunc, frameCnt) => {
-    return x => {
-        if (frameCnt <= 1) {
-            return easeFunc(1);
         }
-        const t = x / (frameCnt - 1);
-        return easeFunc(t);
+        else if (typeof standardMethod === 'function') {
+            return standardMethod(opts);
+        }
+        else {
+            return notSupported();
+        }
     };
-};
+}
+export * from './animation';
+export * from './lodash';
+export * from './valid';

package/dist/api/utils/lodash.js

@@ -0,0 +1,29 @@
+export function throttle(fn, threshold = 250, scope) {
+    let lastTime = 0;
+    let deferTimer;
+    return function (...args) {
+        const context = scope || this;
+        const now = Date.now();
+        if (now - lastTime > threshold) {
+            fn.apply(this, args);
+            lastTime = now;
+        }
+        else {
+            clearTimeout(deferTimer);
+            deferTimer = setTimeout(() => {
+                lastTime = now;
+                fn.apply(context, args);
+            }, threshold);
+        }
+    };
+}
+export function debounce(fn, ms = 250, scope) {
+    let timer;
+    return function (...args) {
+        const context = scope || this;
+        clearTimeout(timer);
+        timer = setTimeout(function () {
+            fn.apply(context, args);
+        }, ms);
+    };
+}

package/dist/api/utils/valid.js

@@ -0,0 +1,7 @@
+export function isFunction(obj) {
+    return typeof obj === 'function';
+}
+const VALID_COLOR_REG = /^#[0-9a-fA-F]{6}$/;
+export const isValidColor = (color) => {
+    return VALID_COLOR_REG.test(color);
+};

package/dist/dist/api/device/scan.d.ts

@@ -1 +1,3 @@
-export declare const scanCode: (options: any) => Promise<unknown>;
+export declare const scanCode: (options?: Partial<{
+    needResult: number;
+}>) => Promise<any>;

package/dist/dist/api/location/getLocation.d.ts

@@ -0,0 +1,2 @@
+import Taro from '@tarojs/api';
+export declare const getLocation: (options?: Partial<Taro.getLocation.Option>) => Promise<Taro.getLocation.SuccessCallbackResult>;

package/dist/dist/api/location/index.d.ts

@@ -7,7 +7,9 @@ export declare const startLocationUpdateBackground: () => Promise<{
 export declare const startLocationUpdate: () => Promise<{
     errMsg: string;
 }>;
-export declare const openLocation: (options: any) => Promise<unknown>;
+export declare const openLocation: (options?: Partial<{
+    scale: number;
+}>) => Promise<any>;
 export declare const onLocationChangeError: () => Promise<{
     errMsg: string;
 }>;
@@ -20,8 +22,8 @@ export declare const offLocationChangeError: () => Promise<{
 export declare const offLocationChange: () => Promise<{
     errMsg: string;
 }>;
-export declare const getLocation: (options: any) => Promise<unknown>;
+export { getLocation } from './getLocation';
 export declare const choosePoi: () => Promise<{
     errMsg: string;
 }>;
-export * from './chooseLocation';
+export { chooseLocation } from './chooseLocation';

package/dist/dist/api/taro.d.ts

@@ -1,5 +1,5 @@
 import Taro from '@tarojs/api';
-import { history, createRouter } from '@tarojs/router';
+import { history } from '@tarojs/router';
 declare const Behavior: any, getEnv: any, ENV_TYPE: any, Link: any, interceptors: any, Current: any, options: any, eventCenter: any, Events: any, preload: any;
 declare const taro: typeof Taro;
 declare const initPxTransform: any;
@@ -9,4 +9,4 @@ declare const requirePlugin: () => Promise<{
 declare const pxTransform: (size: any) => string;
 declare const canIUseWebp: () => boolean;
 export default taro;
-export { Behavior, getEnv, ENV_TYPE, Link, interceptors, initPxTransform, Current, options, eventCenter, Events, preload, requirePlugin, pxTransform, canIUseWebp, history, createRouter };
+export { Behavior, getEnv, ENV_TYPE, Link, interceptors, initPxTransform, Current, options, eventCenter, Events, preload, requirePlugin, pxTransform, canIUseWebp, history };

package/dist/dist/api/utils/animation.d.ts

@@ -0,0 +1,6 @@
+/**
+ * ease-in-out的函数
+ * @param t 0-1的数字
+ */
+export declare const easeInOut: (t: number) => number;
+export declare const getTimingFunc: (easeFunc: any, frameCnt: any) => (x: any) => any;

package/dist/dist/api/utils/index.d.ts

@@ -26,13 +26,14 @@ export declare function weixinCorpSupport(apiName: any): () => Promise<{
 export declare function permanentlyNotSupport(apiName: any): () => Promise<{
     errMsg: string;
 }>;
-export declare function isFunction(obj: any): boolean;
-export declare const isValidColor: (color: any) => boolean;
-export declare function processOpenApi(apiName: string, defaultOptions?: Record<string, unknown>, formatResult?: (res: any) => any, formatParams?: (options: any) => any): (options: any) => Promise<unknown>;
-/**
- * ease-in-out的函数
- * @param t 0-1的数字
- */
-export declare const easeInOut: (t: number) => number;
-export declare const getTimingFunc: (easeFunc: any, frameCnt: any) => (x: any) => any;
-export {};
+interface IProcessOpenApi<TOptions = Record<string, unknown>, TResult extends TaroGeneral.CallbackResult = any> {
+    name: string;
+    defaultOptions?: TOptions;
+    standardMethod?: (opts: TOptions) => Promise<TResult>;
+    formatOptions?: (opts: TOptions) => TOptions;
+    formatResult?: (res: TResult) => TResult;
+}
+export declare function processOpenApi<TOptions = Record<string, unknown>, TResult extends TaroGeneral.CallbackResult = any>({ name, defaultOptions, standardMethod, formatOptions, formatResult }: IProcessOpenApi<TOptions, TResult>): (options?: Partial<TOptions>) => Promise<TResult>;
+export * from './animation';
+export * from './lodash';
+export * from './valid';

package/dist/dist/api/utils/lodash.d.ts

@@ -0,0 +1,2 @@
+export declare function throttle(fn: any, threshold?: number, scope?: any): (...args: any[]) => void;
+export declare function debounce(fn: any, ms?: number, scope?: any): (...args: any[]) => void;

package/dist/dist/api/utils/valid.d.ts

@@ -0,0 +1,2 @@
+export declare function isFunction(obj: any): boolean;
+export declare const isValidColor: (color: any) => boolean;