@tarojs/taro-h5 3.4.8 → 3.5.0-alpha.10

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

@@ -1,4 +1,4 @@
-import { inlineStyle } from '../../utils';
+import { inlineStyle } from '../../../utils';
 export default class Modal {
     constructor() {
         this.options = {
@@ -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

@@ -1,4 +1,4 @@
-import { inlineStyle } from '../../utils';
+import { inlineStyle } from '../../../utils';
 export default class Toast {
     constructor() {
         this.options = {
@@ -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/ui/menu.js

@@ -1,3 +1,3 @@
-import { temporarilyNotSupport } from '../utils';
+import { temporarilyNotSupport } from '../../utils';
 // 菜单
 export const getMenuButtonBoundingClientRect = temporarilyNotSupport('getMenuButtonBoundingClientRect');

package/dist/api/ui/navigation-bar/index.js

@@ -1,5 +1,5 @@
-import { MethodHandler } from '../../utils/handler';
-import { getParameterError, shouldBeObject, temporarilyNotSupport } from '../../utils';
+import { MethodHandler } from '../../../utils/handler';
+import { getParameterError, shouldBeObject, temporarilyNotSupport } from '../../../utils';
 // 导航栏
 export const showNavigationBarLoading = temporarilyNotSupport('showNavigationBarLoading');
 export function setNavigationBarTitle(options) {

package/dist/api/ui/pull-down-refresh.js

@@ -1,5 +1,5 @@
 import Taro from '@tarojs/api';
-import { MethodHandler } from '../utils/handler';
+import { MethodHandler } from '../../utils/handler';
 /**
  * 开始下拉刷新。调用后触发下拉刷新动画，效果与用户手动下拉刷新一致。
  */

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

@@ -1,6 +1,6 @@
 import { Current } from '@tarojs/runtime';
-import { MethodHandler } from '../../utils/handler';
-import { getTimingFunc, easeInOut } from '../../utils';
+import { MethodHandler } from '../../../utils/handler';
+import { getTimingFunc, easeInOut } from '../../../utils';
 let timer;
 const FRAME_DURATION = 17;
 /**

package/dist/api/ui/sticky.js

@@ -1,3 +1,3 @@
-import { temporarilyNotSupport } from '../utils';
+import { temporarilyNotSupport } from '../../utils';
 // 置顶
 export const setTopBarText = temporarilyNotSupport('setTopBarText');

package/dist/api/ui/tab-bar.js

@@ -1,6 +1,6 @@
 import Taro from '@tarojs/api';
-import { shouldBeObject, getParameterError, isValidColor } from '../utils';
-import { MethodHandler } from '../utils/handler';
+import { shouldBeObject, getParameterError, isValidColor } from '../../utils';
+import { MethodHandler } from '../../utils/handler';
 let tabConf;
 export function initTabBarApis(config = {}) {
     tabConf = config.tabBar;

package/dist/api/ui/window.js

@@ -1,5 +1,5 @@
-import { temporarilyNotSupport } from '../utils';
-import { CallbackManager } from '../utils/handler';
+import { temporarilyNotSupport } from '../../utils';
+import { CallbackManager } from '../../utils/handler';
 const callbackManager = new CallbackManager();
 const resizeListener = () => {
     callbackManager.trigger({

package/dist/api/worker/index.js

@@ -1,3 +1,3 @@
-import { temporarilyNotSupport } from '../utils';
+import { temporarilyNotSupport } from '../../utils';
 // Worker
 export const createWorker = temporarilyNotSupport('createWorker');

package/dist/api/wxml/index.js

@@ -1,4 +1,4 @@
-import { temporarilyNotSupport } from '../utils';
+import { temporarilyNotSupport } from '../../utils';
 import { SelectorQuery } from './selectorQuery';
 export const createSelectorQuery = () => {
     return new SelectorQuery();

package/dist/api/wxml/selectorQuery.js

@@ -1,5 +1,5 @@
 import { CanvasContext } from '../canvas/CanvasContext';
-import { findDOM } from '../utils';
+import { findDOM } from '../../utils';
 import { NodesRef } from './nodesRef';
 function filter(fields, dom, selector) {
     if (!dom)