tplus-components-touch 3.29.1 → 3.31.2

package/dist/components/touchScroll/index.js

@@ -131,7 +131,8 @@ var TouchScroll = (_temp = _class = function (_Component) {
             { className: 'swiper-slide' },
             children
           )
-        )
+        ),
+        _react2.default.createElement('div', { className: 'swiper-scrollbar' })
       );
     }
   }]);
@@ -168,7 +169,10 @@ var TouchScroll = (_temp = _class = function (_Component) {
     if (height < 10 || width < 10) return;
     (parentElement.style || {}).overflow = 'hidden';
 
-    var onScrollProgress = scrollProgress ? { watchSlidesProgress: true, on: { progress: scrollProgress } } : {};
+    var onScrollProgress = scrollProgress ? { mousewheel: true, scrollbar: {
+        el: '.swiper-scrollbar',
+        hide: true
+      }, watchSlidesProgress: true, on: { progress: scrollProgress } } : {};
     _this3.touchScroll = new _swiper2.default(_this3.container, (0, _extends3.default)({
       height: height,
       width: width,

package/dist/components/touchScroll/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["tplus-components-touch/components/touchScroll/index.js"],"names":["envIsElectron","env","platform","TouchScroll","props","isElectron","width","height","createScroll","touchScroll","update","destroy","undefined","children","className","container","ref","Component","propTypes","PropTypes","bool","string","number","direction","scrollProgress","func","parentElement","clientHeight","clientWidth","parseInt","style","overflow","onScrollProgress","watchSlidesProgress","on","progress","Swiper","slidesPerView","freeMode"],"mappings":"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","file":"index.js","sourcesContent":["/**\r\n * Created by hzy on 2019/7/30.\r\n *\r\n * @className className\r\n * @isElectron 设置为isElectron环境\r\n * @height 滚动区高度\r\n * @width  滚动区宽度\r\n * @direction  horizontal or undefined\r\n * @scrollProgress  滚动进度\r\n */\r\nimport React, { Component } from 'react';\r\nimport PropTypes, {oneOfType} from 'prop-types';\r\nimport Swiper from 'swiper/dist/js/swiper.js';\r\nimport {env} from 'mutants-microfx';\r\nimport 'swiper/dist/css/swiper.min.css';\r\n\r\nconst envIsElectron = env.platform === 'electron';\r\n\r\nexport default class TouchScroll extends Component {\r\n  static propTypes = {\r\n    isElectron: PropTypes.bool,\r\n    height: oneOfType([\r\n      PropTypes.string,\r\n      PropTypes.number\r\n    ]),\r\n    width: oneOfType([\r\n      PropTypes.string,\r\n      PropTypes.number\r\n    ]),\r\n    direction: PropTypes.string,\r\n    scrollProgress: PropTypes.func,\r\n  };\r\n  constructor(props){\r\n    super(props);\r\n    const {isElectron, width, height} = this.props;\r\n    this.isElectron = isElectron || envIsElectron;\r\n  }\r\n\r\n  componentDidMount() {\r\n    if (!this.isElectron) return;\r\n\r\n    this.createScroll();\r\n  }\r\n\r\n  componentDidUpdate() {\r\n    if (!this.isElectron) return;\r\n\r\n    if (this.touchScroll) {\r\n      this.touchScroll.update();\r\n    } else {\r\n      this.createScroll();\r\n    }\r\n  }\r\n\r\n  componentWillUnmount() {\r\n    if (!this.isElectron) return;\r\n\r\n    this.touchScroll && this.touchScroll.destroy(false);\r\n    this.touchScroll = undefined;\r\n  }\r\n\r\n  createScroll = () => {\r\n    let {height, width, direction, scrollProgress} = this.props;\r\n    const parentElement = this.container.parentElement || {};\r\n    const clientHeight = parentElement.clientHeight;\r\n    const clientWidth = parentElement.clientWidth;\r\n\r\n    if (typeof height !== 'undefined' || typeof width !== 'undefined') {\r\n      height = typeof height === 'string' ? parseInt(height) : height;\r\n      width = typeof width === 'string' ? parseInt(width) : width;\r\n    } else if (!direction && clientHeight) {\r\n      height = clientHeight;\r\n    } else if (direction && clientWidth) {\r\n      width = clientWidth;\r\n    }\r\n\r\n    if (height < 10 || width < 10) return;\r\n    (parentElement.style || {}).overflow = 'hidden';\r\n\r\n    const onScrollProgress = scrollProgress ? {watchSlidesProgress : true, on: {progress: scrollProgress}} : {};\r\n    this.touchScroll = new Swiper(this.container, {\r\n      height,\r\n      width,\r\n      direction: direction || 'vertical',\r\n      slidesPerView: 'auto',\r\n      freeMode: true,\r\n      ...onScrollProgress\r\n    });\r\n  }\r\n\r\n  render() {\r\n    const {children, className = ''} = this.props;\r\n    if (!this.isElectron) return children;\r\n\r\n    return (<div className={className} ref={ref => this.container = ref}>\r\n      <div className=\"swiper-wrapper\">\r\n        <div className=\"swiper-slide\">{children}</div>\r\n      </div>\r\n    </div>);\r\n  }\r\n}\r\n"]}
+{"version":3,"sources":["tplus-components-touch/components/touchScroll/index.js"],"names":["envIsElectron","env","platform","TouchScroll","props","isElectron","width","height","createScroll","touchScroll","update","destroy","undefined","children","className","container","ref","Component","propTypes","PropTypes","bool","string","number","direction","scrollProgress","func","parentElement","clientHeight","clientWidth","parseInt","style","overflow","onScrollProgress","mousewheel","scrollbar","el","hide","watchSlidesProgress","on","progress","Swiper","slidesPerView","freeMode"],"mappings":"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","file":"index.js","sourcesContent":["/**\r\n * Created by hzy on 2019/7/30.\r\n *\r\n * @className className\r\n * @isElectron 设置为isElectron环境\r\n * @height 滚动区高度\r\n * @width  滚动区宽度\r\n * @direction  horizontal or undefined\r\n * @scrollProgress  滚动进度\r\n */\r\nimport React, { Component } from 'react';\r\nimport PropTypes, {oneOfType} from 'prop-types';\r\nimport Swiper from 'swiper/dist/js/swiper.js';\r\nimport {env} from 'mutants-microfx';\r\nimport 'swiper/dist/css/swiper.min.css';\r\n\r\nconst envIsElectron = env.platform === 'electron';\r\n\r\nexport default class TouchScroll extends Component {\r\n  static propTypes = {\r\n    isElectron: PropTypes.bool,\r\n    height: oneOfType([\r\n      PropTypes.string,\r\n      PropTypes.number\r\n    ]),\r\n    width: oneOfType([\r\n      PropTypes.string,\r\n      PropTypes.number\r\n    ]),\r\n    direction: PropTypes.string,\r\n    scrollProgress: PropTypes.func,\r\n  };\r\n  constructor(props){\r\n    super(props);\r\n    const {isElectron, width, height} = this.props;\r\n    this.isElectron = isElectron || envIsElectron;\r\n  }\r\n\r\n  componentDidMount() {\r\n    if (!this.isElectron) return;\r\n\r\n    this.createScroll();\r\n  }\r\n\r\n  componentDidUpdate() {\r\n    if (!this.isElectron) return;\r\n\r\n    if (this.touchScroll) {\r\n      this.touchScroll.update();\r\n    } else {\r\n      this.createScroll();\r\n    }\r\n  }\r\n\r\n  componentWillUnmount() {\r\n    if (!this.isElectron) return;\r\n\r\n    this.touchScroll && this.touchScroll.destroy(false);\r\n    this.touchScroll = undefined;\r\n  }\r\n\r\n  createScroll = () => {\r\n    let {height, width, direction, scrollProgress} = this.props;\r\n    const parentElement = this.container.parentElement || {};\r\n    const clientHeight = parentElement.clientHeight;\r\n    const clientWidth = parentElement.clientWidth;\r\n\r\n    if (typeof height !== 'undefined' || typeof width !== 'undefined') {\r\n      height = typeof height === 'string' ? parseInt(height) : height;\r\n      width = typeof width === 'string' ? parseInt(width) : width;\r\n    } else if (!direction && clientHeight) {\r\n      height = clientHeight;\r\n    } else if (direction && clientWidth) {\r\n      width = clientWidth;\r\n    }\r\n\r\n    if (height < 10 || width < 10) return;\r\n    (parentElement.style || {}).overflow = 'hidden';\r\n\r\n    const onScrollProgress = scrollProgress ? {mousewheel: true, scrollbar: {\r\n      el: '.swiper-scrollbar',\r\n      hide: true,\r\n    }, watchSlidesProgress : true, on: {progress: scrollProgress}} : {};\r\n    this.touchScroll = new Swiper(this.container, {\r\n      height,\r\n      width,\r\n      direction: direction || 'vertical',\r\n      slidesPerView: 'auto',\r\n      freeMode: true,\r\n      ...onScrollProgress\r\n    });\r\n  }\r\n\r\n  render() {\r\n    const {children, className = ''} = this.props;\r\n    if (!this.isElectron) return children;\r\n\r\n    return (<div className={className} ref={ref => this.container = ref}>\r\n      <div className=\"swiper-wrapper\">\r\n        <div className=\"swiper-slide\">{children}</div>\r\n      </div>\r\n      <div className=\"swiper-scrollbar\" />\r\n    </div>);\r\n  }\r\n}\r\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "tplus-components-touch",
-    "version": "3.29.1",
+    "version": "3.31.2",
     "description": "",
     "main": "dist/index.js",
     "scripts": {
@@ -22,7 +22,7 @@
         "mutants-devtools": "^1.0.0",
         "mutants-microfx": "^1.0.0",
         "tplus-api": "~5.0.1",
-        "tplus-components": "~3.29.1"
+        "tplus-components": "~3.31.1"
     },
     "dependencies": {
         "antd": "4.10.3",