@tarojs/components 3.5.0-canary.0 → 3.5.0-theta.1

package/dist/collection/components/video/utils.js

@@ -1,109 +1,95 @@
-export const formatTime = time => {
-  if (time == null) return ''
-  const sec = Math.round(time % 60)
-  const min = Math.round((time - sec) / 60)
-  return `${min < 10 ? `0${min}` : min}:${sec < 10 ? `0${sec}` : sec}`
-}
-
-export const calcDist = (x, y) => {
-  return Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2))
-}
-
-export const normalizeNumber = number => {
-  return Math.max(-1, Math.min(number, 1))
-}
-
-export const throttle = (fn, threshhold) => {
-  let lastTime = 0
-  return function () {
-    const now = Date.now()
-    if (now - lastTime > threshhold) {
-      fn.apply(this, arguments)
-      lastTime = now
-    }
-  }
-}
-
-/**
- * @returns: {requestFullscreen: 'requestFullscreen', exitFullscreen: 'exitFullscreen', ...}
- */
-export const screenFn = (function () {
-  let val
-  const fnMap = [
-    [
-      'requestFullscreen',
-      'exitFullscreen',
-      'fullscreenElement',
-      'fullscreenEnabled',
-      'fullscreenchange',
-      'fullscreenerror'
-    ],
-    // New WebKit
-    [
-      'webkitRequestFullscreen',
-      'webkitExitFullscreen',
-      'webkitFullscreenElement',
-      'webkitFullscreenEnabled',
-      'webkitfullscreenchange',
-      'webkitfullscreenerror'
-    ],
-    // Old WebKit
-    [
-      'webkitRequestFullScreen',
-      'webkitCancelFullScreen',
-      'webkitCurrentFullScreenElement',
-      'webkitCancelFullScreen',
-      'webkitfullscreenchange',
-      'webkitfullscreenerror'
-    ],
-    [
-      'mozRequestFullScreen',
-      'mozCancelFullScreen',
-      'mozFullScreenElement',
-      'mozFullScreenEnabled',
-      'mozfullscreenchange',
-      'mozfullscreenerror'
-    ],
-    [
-      'msRequestFullscreen',
-      'msExitFullscreen',
-      'msFullscreenElement',
-      'msFullscreenEnabled',
-      'MSFullscreenChange',
-      'MSFullscreenError'
-    ]
-  ]
-  var defaultIOSMap = [
-    'webkitEnterFullscreen',
-    'webkitExitFullscreen',
-    'webkitFullscreenElement',
-    'webkitFullscreenEnabled',
-    'webkitfullscreenchange',
-    'webkitfullscreenerror'
-  ]
-  let i = 0
-  const l = fnMap.length
-  const ret = {}
-  // This for loop essentially checks the current document object for the property/methods above.
-  for (; i < l; i++) {
-    val = fnMap[i]
-    if (val && val[1] in document) {
-      for (i = 0; i < val.length; i++) {
-        ret[fnMap[0][i]] = val[i]
-      }
-      return ret
-    }
-  }
-  if (!ret[fnMap[0][0]]) {
-    // when there is no any APIs be set.
-
-    // In IOS, there is no 'webkitEnterFullscreen' property `in document` but video can use it for fullscreen.
-    // ref: https://developer.apple.com/documentation/webkitjs/htmlvideoelement/1633500-webkitenterfullscreen
-    for (i = 0; i < defaultIOSMap.length; i++) {
-      ret[fnMap[0][i]] = defaultIOSMap[i]
-    }
-  }
-  // If it doesn't find any of them, this whole function returns {}
-  // and the fn variable is set to this returned value.
-  return ret
-})()
+export const formatTime = (time) => {
+  if (!time)
+    return '';
+  const sec = Math.round(time % 60);
+  const min = Math.round((time - sec) / 60);
+  return `${min < 10 ? `0${min}` : min}:${sec < 10 ? `0${sec}` : sec}`;
+};
+export const calcDist = (x, y) => {
+  return Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2));
+};
+export const normalizeNumber = (number) => {
+  return Math.max(-1, Math.min(number, 1));
+};
+export let scene = 'default';
+export const screenFn = (function () {
+  let val;
+  const fnMap = [
+    [
+      'requestFullscreen',
+      'exitFullscreen',
+      'fullscreenElement',
+      'fullscreenEnabled',
+      'fullscreenchange',
+      'fullscreenerror'
+    ],
+    // New WebKit
+    [
+      'webkitRequestFullscreen',
+      'webkitExitFullscreen',
+      'webkitFullscreenElement',
+      'webkitFullscreenEnabled',
+      'webkitfullscreenchange',
+      'webkitfullscreenerror'
+    ],
+    // Old WebKit
+    [
+      'webkitRequestFullScreen',
+      'webkitCancelFullScreen',
+      'webkitCurrentFullScreenElement',
+      'webkitCancelFullScreen',
+      'webkitfullscreenchange',
+      'webkitfullscreenerror'
+    ],
+    [
+      'mozRequestFullScreen',
+      'mozCancelFullScreen',
+      'mozFullScreenElement',
+      'mozFullScreenEnabled',
+      'mozfullscreenchange',
+      'mozfullscreenerror'
+    ],
+    [
+      'msRequestFullscreen',
+      'msExitFullscreen',
+      'msFullscreenElement',
+      'msFullscreenEnabled',
+      'MSFullscreenChange',
+      'MSFullscreenError'
+    ]
+  ];
+  var defaultIOSMap = [
+    'webkitEnterFullscreen',
+    'webkitExitFullscreen',
+    'webkitCurrentFullScreenElement',
+    'webkitSupportsFullscreen',
+    'fullscreenchange',
+    'fullscreenerror'
+  ];
+  let i = 0;
+  const l = fnMap.length;
+  const ret = {};
+  // This for loop essentially checks the current document object for the property/methods above.
+  for (; i < l; i++) {
+    val = fnMap[i];
+    if (val && val[1] in document) {
+      for (i = 0; i < val.length; i++) {
+        ret[fnMap[0][i]] = val[i];
+      }
+      return ret;
+    }
+  }
+  if (!ret[fnMap[0][0]]) {
+    scene = 'iOS';
+    // when there is no any APIs be set.
+    // In IOS, there is no 'webkitEnterFullscreen' property `in document` but video can use it for fullscreen.
+    // ref: https://developer.apple.com/documentation/webkitjs/htmlvideoelement/1633500-webkitenterfullscreen
+    for (i = 0; i < defaultIOSMap.length; i++) {
+      ret[fnMap[0][i]] = defaultIOSMap[i];
+    }
+  }
+  // If it doesn't find any of them, this whole function returns {}
+  // and the fn variable is set to this returned value.
+  return ret;
+})();
+export const isHls = url => /\.(m3u8)($|\?)/i.test(url);

package/dist/collection/components/video/video-control.js

@@ -15,15 +15,15 @@ export class VideoControl {
     this.visible = false;
     this.isDraggingProgressBall = false;
     this.percentage = 0;
-    this.progressDimentions = {
+    this.progressDimensions = {
       left: 0,
       width: 0
     };
     this.calcPercentage = (pageX) => {
-      let pos = pageX - this.progressDimentions.left;
+      let pos = pageX - this.progressDimensions.left;
       pos = Math.max(pos, 0);
-      pos = Math.min(pos, this.progressDimentions.width);
-      return pos / this.progressDimentions.width;
+      pos = Math.min(pos, this.progressDimensions.width);
+      return pos / this.progressDimensions.width;
     };
     this.onDragProgressBallStart = () => {
       this.isDraggingProgressBall = true;
@@ -68,10 +68,10 @@ export class VideoControl {
             this.toggleVisibility(false);
           }, 2000);
         }
-        this.controlsRef.style.visibility = 'visible';
+        this.el.style.visibility = 'visible';
       }
       else {
-        this.controlsRef.style.visibility = 'hidden';
+        this.el.style.visibility = 'hidden';
       }
       this.visible = !!visible;
     });
@@ -108,8 +108,8 @@ export class VideoControl {
               if (!ref)
                 return;
               const rect = ref.getBoundingClientRect();
-              this.progressDimentions.left = rect.left;
-              this.progressDimentions.width = rect.width;
+              this.progressDimensions.left = rect.left;
+              this.progressDimensions.width = rect.width;
             } },
             h("div", { class: 'taro-video-progress-buffered', style: { width: '100%' } }),
             h("div", { class: 'taro-video-ball', ref: dom => (this.progressBallRef = dom), onTouchStart: this.onDragProgressBallStart, style: {
@@ -344,7 +344,7 @@ export class VideoControl {
       }
     }
   }; }
-  static get elementRef() { return "controlsRef"; }
+  static get elementRef() { return "el"; }
   static get listeners() { return [{
       "name": "touchmove",
       "method": "onDocumentTouchMove",

package/dist/collection/components/video/video.js

@@ -10,7 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import { Component, h, Prop, State, Event, Host, Watch, Listen, Element, Method } from '@stencil/core';
 import classNames from 'classnames';
-import { formatTime, calcDist, normalizeNumber, throttle, screenFn } from './utils';
+import Hls from 'hls.js';
+import { throttle } from '../../utils';
+import { formatTime, calcDist, normalizeNumber, screenFn, isHls, scene } from './utils';
 export class Video {
   constructor() {
     this.currentTime = 0;
@@ -91,7 +93,7 @@ export class Video {
     this.isFullScreen = false;
     this.fullScreenTimestamp = new Date().getTime();
     this.isMute = false;
-    this.analyseGesture = (e) => {
+    this.analyzeGesture = (e) => {
       var _a;
       const obj = {
         type: 'none'
@@ -133,6 +135,37 @@ export class Video {
       obj.dataY = normalizeNumber(distY / 200);
       return obj;
     };
+    this.loadNativePlayer = () => {
+      if (this.videoRef) {
+        this.videoRef.src = this.src;
+        this.videoRef.load();
+      }
+    };
+    this.init = () => {
+      const { src, videoRef } = this;
+      if (isHls(src)) {
+        if (Hls.isSupported()) {
+          if (this.hls) {
+            this.hls.destroy();
+          }
+          this.hls = new Hls();
+          this.hls.loadSource(src);
+          this.hls.attachMedia(videoRef);
+          this.hls.on(Hls.Events.MANIFEST_PARSED, () => {
+            this.autoplay && this.play();
+          });
+        }
+        else if (videoRef.canPlayType('application/vnd.apple.mpegurl')) {
+          this.loadNativePlayer();
+        }
+        else {
+          console.error('该浏览器不支持 HLS 播放');
+        }
+      }
+      else {
+        this.loadNativePlayer();
+      }
+    };
     this.handlePlay = () => {
       this.isPlaying = true;
       this.isFirst = false;
@@ -229,7 +262,7 @@ export class Video {
       }
     };
     this.toggleFullScreen = (isFullScreen = !this.isFullScreen) => {
-      this.isFullScreen = isFullScreen;
+      this.isFullScreen = isFullScreen; // this.videoRef?.['webkitDisplayingFullscreen']
       this.controlsRef.toggleVisibility(true);
       this.fullScreenTimestamp = new Date().getTime();
       this.onFullScreenChange.emit({
@@ -238,7 +271,7 @@ export class Video {
       });
       if (this.isFullScreen && !document[screenFn.fullscreenElement]) {
         setTimeout(() => {
-          this.videoRef[screenFn.requestFullscreen]({ navigationUI: 'show' });
+          this.videoRef[screenFn.requestFullscreen]({ navigationUI: 'auto' });
         }, 0);
       }
     };
@@ -258,6 +291,7 @@ export class Video {
     this._enableDanmu = this.enableDanmu;
   }
   componentDidLoad() {
+    this.init();
     if (this.initialTime) {
       this.videoRef.currentTime = this.initialTime;
     }
@@ -266,6 +300,10 @@ export class Video {
     if (document.addEventListener) {
       document.addEventListener(screenFn.fullscreenchange, this.handleFullScreenChange);
     }
+    if (this.videoRef && scene === 'iOS') {
+      // NOTE: iOS 场景下 fullscreenchange 并不会在退出全屏状态下触发，仅 webkitpresentationmodechanged 与 webkitendfullscreen 可替代
+      this.videoRef.addEventListener('webkitendfullscreen', this.handleFullScreenChange);
+    }
   }
   componentDidRender() {
   }
@@ -273,17 +311,23 @@ export class Video {
     if (document.removeEventListener) {
       document.removeEventListener(screenFn.fullscreenchange, this.handleFullScreenChange);
     }
+    if (this.videoRef && scene === 'iOS') {
+      this.videoRef.removeEventListener('webkitendfullscreen', this.handleFullScreenChange);
+    }
   }
   watchEnableDanmu(newVal) {
     this._enableDanmu = newVal;
   }
+  watchSrc() {
+    this.init();
+  }
   onDocumentTouchMove(e) {
     return __awaiter(this, void 0, void 0, function* () {
       if (this.lastTouchScreenX === undefined || this.lastTouchScreenY === undefined)
         return;
       if (yield this.controlsRef.getIsDraggingProgressBall())
         return;
-      const gestureObj = this.analyseGesture(e);
+      const gestureObj = this.analyzeGesture(e);
       if (gestureObj.type === 'adjustVolume') {
         this.toastVolumeRef.style.visibility = 'visible';
         const nextVolume = Math.max(Math.min(this.lastVolume - gestureObj.dataY, 1), 0);
@@ -356,8 +400,9 @@ export class Video {
     });
   }
   render() {
-    const { src, controls, autoplay, loop, muted, poster, objectFit, isFirst, isMute, isFullScreen, duration, _duration, showCenterPlayBtn, isPlaying, _enableDanmu, showMuteBtn, danmuBtn, showFullscreenBtn, nativeProps } = this;
-    const durationTime = formatTime(duration || _duration || null);
+    const { controls, autoplay, loop, muted, poster, objectFit, isFirst, isMute, isFullScreen, showCenterPlayBtn, isPlaying, _enableDanmu, showMuteBtn, danmuBtn, showFullscreenBtn, nativeProps } = this;
+    const duration = this.duration || this._duration;
+    const durationTime = formatTime(duration);
     return (h(Host, { class: classNames('taro-video-container', {
         'taro-video-type-fullscreen': isFullScreen
       }), onTouchStart: this.onTouchStartContainer, onClick: this.onClickContainer },
@@ -367,7 +412,7 @@ export class Video {
           if (dom) {
             this.videoRef = dom;
           }
-        }, src: src, autoplay: autoplay, loop: loop, muted: muted, poster: controls ? poster : undefined, playsinline: true, "webkit-playsinline": true, onPlay: this.handlePlay, onPause: this.handlePause, onEnded: this.handleEnded, onTimeUpdate: this.handleTimeUpdate, onError: this.handleError, onDurationChange: this.handleDurationChange, onProgress: this.handleProgress, onLoadedMetaData: this.handleLoadedMetaData }, nativeProps), "\u6682\u65F6\u4E0D\u652F\u6301\u64AD\u653E\u8BE5\u89C6\u9891"),
+        }, autoplay: autoplay, loop: loop, muted: muted, poster: controls ? poster : undefined, playsinline: true, "webkit-playsinline": true, onPlay: this.handlePlay, onPause: this.handlePause, onEnded: this.handleEnded, onTimeUpdate: this.handleTimeUpdate, onError: this.handleError, onDurationChange: this.handleDurationChange, onProgress: this.handleProgress, onLoadedMetaData: this.handleLoadedMetaData }, nativeProps), "\u6682\u65F6\u4E0D\u652F\u6301\u64AD\u653E\u8BE5\u89C6\u9891"),
       h("taro-video-danmu", { ref: dom => {
           if (dom) {
             this.danmuRef = dom;
@@ -380,7 +425,7 @@ export class Video {
           if (dom) {
             this.controlsRef = dom;
           }
-        }, controls: controls, currentTime: this.currentTime, duration: this.duration || this._duration || undefined, isPlaying: this.isPlaying, pauseFunc: this._pause, playFunc: this._play, seekFunc: this._seek, showPlayBtn: this.showPlayBtn, showProgress: this.showProgress },
+        }, controls: controls, currentTime: this.currentTime, duration: duration, isPlaying: this.isPlaying, pauseFunc: this._pause, playFunc: this._play, seekFunc: this._seek, showPlayBtn: this.showPlayBtn, showProgress: this.showProgress },
         showMuteBtn && (h("div", { class: classNames('taro-video-mute', {
             'taro-video-type-mute': isMute
           }), onClick: this.toggleMute })),
@@ -1047,6 +1092,9 @@ export class Video {
   static get watchers() { return [{
       "propName": "enableDanmu",
       "methodName": "watchEnableDanmu"
+    }, {
+      "propName": "src",
+      "methodName": "watchSrc"
     }]; }
   static get listeners() { return [{
       "name": "touchmove",

package/dist/collection/components/view/style/index.css

@@ -1,9 +1,7 @@
-body, html {
-  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+body,
+html {
   user-select: none;
-  -moz-user-select: none;
-  -webkit-user-select: none;
-  -ms-user-select: none;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
 }
 
 taro-view-core {

package/dist/collection/components/view/view.js

@@ -43,8 +43,8 @@ export class View {
   componentDidRender() {
     const el = this.el;
     el.childNodes.forEach(item => {
-      if (item.nodeType === document.COMMENT_NODE)
-        el.removeChild(item);
+      if (item.nodeType === document.COMMENT_NODE && item["s-cn"])
+        item["s-cn"] = false;
     });
   }
   render() {

package/dist/collection/components/voip-room/voip-room.js

@@ -0,0 +1,11 @@
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import { Component, h, Host } from '@stencil/core';
+export class VoipRoom {
+  componentDidLoad() {
+    console.error('H5 暂不支持 VoipRoom 组件！');
+  }
+  render() {
+    return (h(Host, null));
+  }
+  static get is() { return "taro-voip-room-core"; }
+}

package/dist/collection/components/web-view/style/index.css

@@ -6,7 +6,7 @@ iframe {
   position: fixed;
   top: 0;
   bottom: 0;
+  z-index: 999;
   width: 100%;
   height: 100%;
-  z-index: 999;
 }

package/dist/collection/utils/index.js

@@ -1,105 +1,31 @@
-export function throttle (fn, threshhold, scope) {
-  threshhold || (threshhold = 250)
-  let last, deferTimer
-  return function () {
-    const context = scope || this
-
-    const now = +new Date()
-    // eslint-disable-next-line prefer-rest-params
-    const args = arguments
-    if (last && now < last + threshhold) {
-      clearTimeout(deferTimer)
-      deferTimer = setTimeout(() => {
-        last = now
-        fn.apply(context, args)
-      }, threshhold)
-    } else {
-      last = now
-      fn.apply(context, args)
-    }
-  }
-}
-
-export const normalizePath = url => {
-  let _isRelative
-  let _leadingParents = ''
-  let _parent, _pos
-
-  // handle relative paths
-  if (url.charAt(0) !== '/') {
-    _isRelative = true
-    url = '/' + url
-  }
-
-  // handle relative files (as opposed to directories)
-  if (url.substring(-3) === '/..' || url.slice(-2) === '/.') {
-    url += '/'
-  }
-
-  // resolve simples
-  url = url.replace(/(\/(\.\/)+)|(\/\.$)/g, '/').replace(/\/{2,}/g, '/')
-
-  // remember leading parents
-  if (_isRelative) {
-    _leadingParents = url.substring(1).match(/^(\.\.\/)+/) || ''
-    if (_leadingParents) {
-      _leadingParents = _leadingParents[0]
+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;
     }
-  }
-
-  // resolve parents
-  while (true) {
-    _parent = url.search(/\/\.\.(\/|$)/)
-    if (_parent === -1) {
-      // no more ../ to resolve
-      break
-    } else if (_parent === 0) {
-      // top level cannot be relative, skip it
-      url = url.substring(3)
-      continue
-    }
-
-    _pos = url.substring(0, _parent).lastIndexOf('/')
-    if (_pos === -1) {
-      _pos = _parent
+    else {
+      clearTimeout(deferTimer);
+      deferTimer = setTimeout(() => {
+        lastTime = now;
+        fn.apply(context, args);
+      }, threshold);
     }
-    url = url.substring(0, _pos) + url.substring(_parent + 3)
-  }
-
-  // revert to relative
-  if (_isRelative) {
-    url = _leadingParents + url.substring(1)
-  }
-
-  return url
-}
-
-export const splitUrl = _url => {
-  let url = _url || ''
-  let pos
-  const res = {
-    path: null,
-    query: null,
-    fragment: null
-  }
-
-  pos = url.indexOf('#')
-  if (pos > -1) {
-    res.fragment = url.substring(pos + 1)
-    url = url.substring(0, pos)
-  }
-
-  pos = url.indexOf('?')
-  if (pos > -1) {
-    res.query = url.substring(pos + 1)
-    url = url.substring(0, pos)
-  }
-
-  res.path = url
-
-  return res
+  };
 }
-
-export const isNumber = obj => {
-  return typeof obj === 'number'
+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);
+  };
 }
+export * from './style';
+export * from './url';

package/dist/collection/utils/style.js

@@ -0,0 +1,10 @@
+export function convertStyle(style) {
+  if (style) {
+    const regex = /([\w-]*)\s*:\s*([^;]*)/g;
+    const properties = {};
+    let match;
+    while ((match = regex.exec(style)))
+      properties[`${match[1]}`] = match[2].trim();
+    return properties;
+  }
+}

package/dist/collection/utils/url.js

@@ -0,0 +1,67 @@
+export const normalizePath = url => {
+  let _isRelative;
+  let _leadingParents = '';
+  let _parent, _pos;
+  // handle relative paths
+  if (url.charAt(0) !== '/') {
+    _isRelative = true;
+    url = '/' + url;
+  }
+  // handle relative files (as opposed to directories)
+  if (url.substring(-3) === '/..' || url.slice(-2) === '/.') {
+    url += '/';
+  }
+  // resolve simples
+  url = url.replace(/(\/(\.\/)+)|(\/\.$)/g, '/').replace(/\/{2,}/g, '/');
+  // remember leading parents
+  if (_isRelative) {
+    _leadingParents = url.substring(1).match(/^(\.\.\/)+/) || '';
+    if (_leadingParents) {
+      _leadingParents = _leadingParents[0];
+    }
+  }
+  // resolve parents
+  while (true) {
+    _parent = url.search(/\/\.\.(\/|$)/);
+    if (_parent === -1) {
+      // no more ../ to resolve
+      break;
+    }
+    else if (_parent === 0) {
+      // top level cannot be relative, skip it
+      url = url.substring(3);
+      continue;
+    }
+    _pos = url.substring(0, _parent).lastIndexOf('/');
+    if (_pos === -1) {
+      _pos = _parent;
+    }
+    url = url.substring(0, _pos) + url.substring(_parent + 3);
+  }
+  // revert to relative
+  if (_isRelative) {
+    url = _leadingParents + url.substring(1);
+  }
+  return url;
+};
+export const splitUrl = _url => {
+  let url = _url || '';
+  let pos;
+  const res = {
+    path: null,
+    query: null,
+    fragment: null
+  };
+  pos = url.indexOf('#');
+  if (pos > -1) {
+    res.fragment = url.substring(pos + 1);
+    url = url.substring(0, pos);
+  }
+  pos = url.indexOf('?');
+  if (pos > -1) {
+    res.query = url.substring(pos + 1);
+    url = url.substring(0, pos);
+  }
+  res.path = url;
+  return res;
+};