@king-design/react 3.5.2 → 3.6.0

package/components/scrollSelect/index.spec.js

@@ -3,14 +3,12 @@ import _asyncToGenerator from "@babel/runtime-corejs3/helpers/asyncToGenerator";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js/instance/concat";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js/instance/map";
 import _regeneratorRuntime from "@babel/runtime-corejs3/regenerator";
-import { mount, unmount, dispatchEvent, wait } from '../../test/utils';
+import { mount, dispatchEvent, wait } from '../../test/utils';
 import BasicDemo from '~/components/scrollSelect/demos/basic';
 import { ScrollSelect } from './';
 import { Component } from 'intact-react';
 describe('ScrollSelect', function () {
-  afterEach(function () {
-    return unmount();
-  });
+  // afterEach(() => unmount());
   it('should select by scroll', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
     var _mount, instance, element;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -18,14 +16,14 @@ describe('ScrollSelect', function () {
         case 0:
           _mount = mount(BasicDemo), instance = _mount[0], element = _mount[1]; // scroll
           dispatchEvent(element.firstElementChild, 'wheel', {
-            deltaY: 1
+            deltaY: 30
           });
           _context.next = 4;
           return wait(100);
         case 4:
           expect(instance.get('value')).to.eql(1);
           dispatchEvent(element.firstElementChild, 'wheel', {
-            deltaY: -1
+            deltaY: -30
           });
           _context.next = 8;
           return wait(100);

package/components/scrollSelect/useMouseEvents.js

@@ -12,6 +12,7 @@ export function useMouseEvents(translate, list) {
   var y;
   var itemHeight;
   var deltaY;
+  var wheelDeltaY = 0;
   var _useDraggable = useDraggable({
       onStart: function onStart(e) {
         dragged = false;
@@ -21,11 +22,11 @@ export function useMouseEvents(translate, list) {
         deltaY = meta.deltaY;
       },
       onMove: function onMove(e) {
-        var deltaY = e.clientY - y;
+        var deltaY = (e.clientY - y) * 0.8;
         dragged = !!deltaY;
         y = e.clientY;
         var _deltaY = y - initY;
-        var offsetIndex = Math.floor(Math.abs(_deltaY) / itemHeight);
+        var offsetIndex = Math.floor(Math.abs(_deltaY) / itemHeight * 1.2);
         if (offsetIndex) {
           if (_deltaY < 0) {
             offsetIndex = -offsetIndex;
@@ -60,24 +61,36 @@ export function useMouseEvents(translate, list) {
   function onWheel(e) {
     e.preventDefault();
     itemHeight = getItemHeight();
-    if (e.deltaY > 0) {
-      // down
-      setByRelativeIndex(1, null, true);
-    } else {
-      setByRelativeIndex(-1, null, true);
+    var threshold = itemHeight * 0.6;
+    wheelDeltaY += e.deltaY;
+    if (Math.abs(wheelDeltaY) >= threshold) {
+      if (wheelDeltaY > 0) {
+        setByRelativeIndex(1, null, true);
+      } else {
+        setByRelativeIndex(-1, null, true);
+      }
+      wheelDeltaY = 0;
     }
   }
   // throttle onWheel
-  var _onWheel = throttle(onWheel, 0, function (e) {
+  var _onWheel = throttle(onWheel, 50, function (e) {
     return e.preventDefault();
   });
   function onClick(item, index) {
-    // if _dragged, do not trigger click event, #123
+    var _context2;
+    // if dragged, do not trigger click event
     if (dragged) return;
     var _instance$get = instance.get(),
       count = _instance$get.count;
     var half = Math.floor(count / 2);
     var itemHeight = getItemHeight();
+    var currentIndex = _findIndexInstanceProperty(_context2 = list.data.value).call(_context2, function (v) {
+      return v.value === list.value.value;
+    });
+    var targetOffset = index - half;
+    if (currentIndex + targetOffset < 0 || currentIndex + targetOffset >= list.data.value.length) {
+      return;
+    }
     translate.set(translate.value - itemHeight * (index - half));
     marginTop.set(marginTop.value + itemHeight * (index - half));
     list.setValue(item.value, true);

package/components/select/base.d.ts

@@ -67,7 +67,7 @@ export declare abstract class BaseSelect<T extends BaseSelectProps<any> = BaseSe
     position(): void;
     show(): void;
     hide(): void;
-    resetKeywords(keywords: State<string>): void;
+    resetKeywords(): void;
     protected hasValue(): any;
     private delete;
     protected clear(e: MouseEvent): void;

package/components/select/base.js

@@ -90,8 +90,8 @@ export var BaseSelect = /*#__PURE__*/function (_Component) {
   _proto.hide = function hide() {
     this.set('show', false);
   };
-  _proto.resetKeywords = function resetKeywords(keywords) {
-    keywords.set('');
+  _proto.resetKeywords = function resetKeywords() {
+    this.input.keywords.set('');
   };
   _proto.hasValue = function hasValue() {
     var _this$get = this.get(),
@@ -142,5 +142,6 @@ BaseSelect.events = events;
 __decorate([bind], BaseSelect.prototype, "position", null);
 __decorate([bind], BaseSelect.prototype, "show", null);
 __decorate([bind], BaseSelect.prototype, "hide", null);
+__decorate([bind], BaseSelect.prototype, "resetKeywords", null);
 __decorate([bind], BaseSelect.prototype, "clear", null);
 __decorate([bind], BaseSelect.prototype, "onKeydown", null);

package/components/select/base.vdt.js

@@ -44,7 +44,8 @@ export default function ($props, $blocks, $__proto__) {
     position = _this$get.position,
     flat = _flatInstanceProperty(_this$get),
     nowrap = _this$get.nowrap,
-    draggable = _this$get.draggable;
+    draggable = _this$get.draggable,
+    range = _this$get.range;
   var k = this.config.k;
   var classNameObj = (_classNameObj = {}, _classNameObj[k + "-select"] = true, _classNameObj[k + "-disabled"] = disabled, _classNameObj[k + "-" + size] = size !== 'default', _classNameObj[k + "-fluid"] = fluid, _classNameObj[k + "-inline"] = inline, _classNameObj[k + "-flat"] = flat, _classNameObj[k + "-nowrap"] = nowrap, _classNameObj[className] = className, _classNameObj[$props.className] = $props.className, _classNameObj[makeStyles(k)] = true, _classNameObj);
   var placeholder = this.getPlaceholder();
@@ -86,6 +87,7 @@ export default function ($props, $blocks, $__proto__) {
           'disabled': disabled,
           'container': container,
           'position': position,
+          'alwaysShowOnClick': $props.alwaysShowOnClick,
           'children': [_$cv('div', _extends({}, getRestProps(_this), {
             'className': _$cn(classNameObj),
             'tabindex': disabled ? '-1' : '0',
@@ -94,7 +96,8 @@ export default function ($props, $blocks, $__proto__) {
             'style': !isNullOrUndefined(width) ? addStyle(style, {
               width: width + "px"
             }) : style,
-            'ref': triggerRef
+            'ref': triggerRef,
+            'ev-click': $props.onClick
           }), [$blocks.prefix ? _$ce(2, 'div', (_$blocks['prefix'] = function ($super) {
             return null;
           }, __$blocks['prefix'] = function ($super, data) {