@king-design/react 2.0.17-beta.0 → 2.1.1

package/__tests__/components/cascader.spec.tsx

@@ -0,0 +1,53 @@
+import React, {createRef, useState} from 'react';
+import * as ReactDOM from 'react-dom';
+import {Cascader} from '../../';
+import {Component} from 'intact-react';
+import {getElement, wait, dispatchEvent} from '../../../../test/utils';
+
+describe('Cascader', () => {
+    let container: HTMLDivElement;
+    beforeEach(() => {
+        container = document.createElement('div');
+        document.body.appendChild(container);
+    });
+    afterEach(() => {
+        ReactDOM.unmountComponentAtNode(container);
+        document.body.removeChild(container);
+    });
+
+    it('should hide all menu on selected', async () => {
+        function App() {
+            const [value, setValue] = useState<string[][]>([]);
+            return (
+                <div>
+                    <Cascader
+                        data={[{value: 'a', label: 'a', children: [{value: 'b', label: 'b'}]}]}
+                        value={value}
+                        multiple
+                        filterable
+                        onChangeValue={(v) => {
+                            setValue(v!);
+                        }}
+                    />
+                </div>
+            );
+        }
+
+        ReactDOM.render(<App />, container);
+
+        const select = container.querySelector('.k-cascader') as HTMLElement;
+        select.click();
+        await wait();
+        const dropdown1 = getElement('.k-cascader-menu')!;
+        const [item1] = dropdown1.querySelectorAll<HTMLElement>(':scope > .k-dropdown-item');
+        item1.click();
+        await wait();
+        const dropdown2 = getElement('.k-cascader-menu')!;
+        const [item11] = dropdown2.querySelectorAll<HTMLElement>(':scope > .k-dropdown-item');
+        item11.click();
+        await wait(500);
+        // should hide all menu
+        expect(dropdown1.style.display).to.eql('none');
+        expect(dropdown2.style.display).to.eql('none');
+    });
+})

package/components/cascader/index.d.ts

@@ -1,28 +1,39 @@
 import { TypeDefs } from 'intact-react';
 import { BaseSelect, BaseSelectProps, BaseSelectEvents, BaseSelectBlocks } from '../select/base';
-export interface CascaderProps<V = any, Multipe extends boolean = boolean> extends BaseSelectProps<V[], Multipe> {
-    data?: CascaderData<V>[];
+export interface CascaderProps<V = any, Multipe extends boolean = boolean, Data extends BaseCascaderData = CascaderData<V>> extends BaseSelectProps<V[], Multipe> {
+    data?: Data[];
     trigger?: 'click' | 'hover';
     changeOnSelect?: boolean;
     format?: (labels: string[]) => string;
-    loadData?: (data: CascaderData<V>) => any;
-    filter?: (keywords: string, data: CascaderData<V>) => boolean;
+    loadData?: (data: Data) => any;
+    filter?: (keywords: string, data: Data) => boolean;
+    fields?: CascaderFields<Data>;
 }
-export declare type CascaderData<V> = {
+export declare type CascaderFields<Data> = {
+    value?: keyof Data;
+    label?: keyof Data;
+    children?: keyof Data;
+    disabled?: keyof Data;
+};
+export interface BaseCascaderData {
+    loaded?: boolean;
+    [key: string]: any;
+}
+export interface CascaderData<V> extends BaseCascaderData {
     value: V;
     label: string;
-    disabled?: boolean;
-    loaded?: boolean;
     children?: CascaderData<V>[];
-};
+    disabled?: boolean;
+}
 export interface CascaderEvents extends BaseSelectEvents {
 }
 export interface CascaderBlocks<V> extends BaseSelectBlocks<V> {
 }
-export declare class Cascader<V = any, Multipe extends boolean = false> extends BaseSelect<CascaderProps<V, Multipe>, CascaderEvents, CascaderBlocks<V>> {
+export declare class Cascader<V = any, Multipe extends boolean = false, Data extends BaseCascaderData = CascaderData<V>> extends BaseSelect<CascaderProps<V, Multipe, Data>, CascaderEvents, CascaderBlocks<V>> {
     static template: string | import("intact").Template<any>;
-    static typeDefs: Required<TypeDefs<CascaderProps<any, boolean>>>;
-    static defaults: () => Partial<CascaderProps<any, boolean>>;
+    static typeDefs: Required<TypeDefs<CascaderProps<any, boolean, CascaderData<any>>>>;
+    static defaults: () => Partial<CascaderProps<any, boolean, CascaderData<any>>>;
+    private fields;
     private value;
     private label;
     private load;

package/components/cascader/index.js

@@ -1,6 +1,5 @@
 import _inheritsLoose from "@babel/runtime-corejs3/helpers/inheritsLoose";
 import _extends from "@babel/runtime-corejs3/helpers/extends";
-import _includesInstanceProperty from "@babel/runtime-corejs3/core-js/instance/includes";
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js/instance/concat";
 import template from './index.vdt';
 import { BaseSelect } from '../select/base';
@@ -10,6 +9,7 @@ import { useValue } from './useValue';
 import { useLabel } from './useLabel';
 import { useLoad } from './useLoad';
 import { useFilterable } from './useFilterable';
+import { useFields } from './useFields';
 
 var typeDefs = _extends({}, BaseSelect.typeDefs, {
   data: Array,
@@ -17,7 +17,8 @@ var typeDefs = _extends({}, BaseSelect.typeDefs, {
   changeOnSelect: Boolean,
   format: Function,
   loadData: Function,
-  filter: Function
+  filter: Function,
+  fields: Object
 });
 
 var defaults = function defaults() {
@@ -26,11 +27,6 @@ var defaults = function defaults() {
     trigger: 'click',
     format: function format(labels) {
       return labels.join(' / ');
-    },
-    filter: function filter(keywords, data) {
-      var _context;
-
-      return _includesInstanceProperty(_context = data.label).call(_context, keywords);
     }
   });
 };
@@ -39,7 +35,7 @@ export var Cascader = /*#__PURE__*/function (_BaseSelect) {
   _inheritsLoose(Cascader, _BaseSelect);
 
   function Cascader() {
-    var _context2;
+    var _context;
 
     var _this;
 
@@ -47,11 +43,12 @@ export var Cascader = /*#__PURE__*/function (_BaseSelect) {
       args[_key] = arguments[_key];
     }
 
-    _this = _BaseSelect.call.apply(_BaseSelect, _concatInstanceProperty(_context2 = [this]).call(_context2, args)) || this;
+    _this = _BaseSelect.call.apply(_BaseSelect, _concatInstanceProperty(_context = [this]).call(_context, args)) || this;
+    _this.fields = useFields();
     _this.value = useValue();
-    _this.label = useLabel();
-    _this.load = useLoad();
-    _this.filterable = useFilterable(_this.input.keywords, _this.value.setValue);
+    _this.label = useLabel(_this.fields);
+    _this.load = useLoad(_this.fields);
+    _this.filterable = useFilterable(_this.input.keywords, _this.value.setValue, _this.fields);
     _this.positionObj = {
       my: 'left top',
       at: 'right top',

package/components/cascader/index.spec.js

@@ -366,4 +366,85 @@ describe('Cascader', function () {
       }
     }, _callee8);
   })));
+  it('specify fields', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee9() {
+    var Demo, _mount8, instance, element, select, dropdown1, _dropdown1$querySelec5, item1, dropdown2, _dropdown2$querySelec4, item11;
+
+    return _regeneratorRuntime.wrap(function _callee9$(_context11) {
+      while (1) {
+        switch (_context11.prev = _context11.next) {
+          case 0:
+            Demo = /*#__PURE__*/function (_Component2) {
+              _inheritsLoose(Demo, _Component2);
+
+              function Demo() {
+                var _context10;
+
+                var _this2;
+
+                for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+                  args[_key2] = arguments[_key2];
+                }
+
+                _this2 = _Component2.call.apply(_Component2, _concatInstanceProperty(_context10 = [this]).call(_context10, args)) || this;
+                _this2.Cascader = Cascader;
+                return _this2;
+              }
+
+              Demo.defaults = function defaults() {
+                return {
+                  value: [],
+                  data: [{
+                    v: 'beijing',
+                    l: '北京',
+                    c: [{
+                      v: 'haidian',
+                      l: '海淀区'
+                    }]
+                  }, {
+                    v: 'hunan',
+                    l: '湖南',
+                    c: [{
+                      v: 'haidian',
+                      l: '海淀区'
+                    }]
+                  }]
+                };
+              };
+
+              return Demo;
+            }(Component);
+
+            Demo.template = "\n                const {Cascader} = this;\n                <Cascader data={this.get('data')}\n                    v-model=\"value\"\n                    fields={{value: 'v', label: 'l', children: 'c'}}\n                />\n            ";
+            _mount8 = mount(Demo), instance = _mount8[0], element = _mount8[1];
+            select = element;
+            select.click();
+            _context11.next = 7;
+            return wait();
+
+          case 7:
+            dropdown1 = getElement('.k-cascader-menu');
+            _dropdown1$querySelec5 = dropdown1.querySelectorAll(':scope > .k-dropdown-item'), item1 = _dropdown1$querySelec5[0];
+            item1.click();
+            _context11.next = 12;
+            return wait();
+
+          case 12:
+            expect(dropdown1.innerHTML).to.matchSnapshot();
+            dropdown2 = getElement('.k-cascader-menu');
+            _dropdown2$querySelec4 = dropdown2.querySelectorAll(':scope > .k-dropdown-item'), item11 = _dropdown2$querySelec4[0];
+            item11.click();
+            _context11.next = 18;
+            return wait();
+
+          case 18:
+            expect(element.innerHTML).to.matchSnapshot();
+            expect(instance.get('value')).to.eql(['beijing', 'haidian']);
+
+          case 20:
+          case "end":
+            return _context11.stop();
+        }
+      }
+    }, _callee9);
+  })));
 });

package/components/cascader/index.vdt.js

@@ -27,12 +27,14 @@ export default function ($props, $blocks, $__proto__) {
   var _this$get = this.get(),
       data = _this$get.data,
       trigger = _this$get.trigger,
-      filterable = _this$get.filterable;
+      filterable = _this$get.filterable,
+      fields = _this$get.fields;
 
   var baseMenuStyles = makeMenuStyles();
   var classNameObj = (_classNameObj = {
     'k-cascader-menu': true
   }, _classNameObj[baseMenuStyles] = true, _classNameObj);
+  var getField = this.fields;
 
   var _this$value = this.value,
       values = _valuesInstanceProperty(_this$value),
@@ -51,31 +53,31 @@ export default function ($props, $blocks, $__proto__) {
     }
 
     return _mapInstanceProperty(data).call(data, function (item, index) {
-      var value = item.value;
+      var value = getField(item, 'value');
       var showed = isShowed(value, level);
       var selected = parentSelected && isSelected(value, level);
-      var children = item.children;
+      var children = getField(item, 'children');
 
       var Item = function Item() {
         return _$cc(DropdownItem, {
-          'disabled': item.disabled,
+          'disabled': getField(item, 'disabled'),
           'className': _$cn({
             'k-cascader-option': true,
             'k-active': showed,
             'k-selected': selected
           }),
           'ev-select': onSelect.bind(null, value, level),
-          'children': [item.label, children ? _$cc(Icon, _$tmp1) : undefined]
+          'children': [getField(item, 'label'), children ? _$cc(Icon, _$tmp1) : undefined]
         });
       };
 
       return children ? _$cc(Dropdown, {
         'position': _this.positionObj,
         'of': 'parent',
-        'disabled': item.disabled,
+        'disabled': getField(item, 'disabled'),
         'trigger': trigger,
         'value': showed,
-        'ev-$changed:value': toggleShowedValue.bind(null, value, level),
+        'ev-$change:value': toggleShowedValue.bind(null, value, level),
         'ev-show': _this.load.bind(null, item),
         'children': [Item(), _$cc(DropdownMenu, {
           'className': _$cn(classNameObj),
@@ -116,7 +118,7 @@ export default function ($props, $blocks, $__proto__) {
               'children': function () {
                 // highlight keywords
                 var label = _mapInstanceProperty($value).call($value, function (item) {
-                  return item.label;
+                  return getField(item, 'label');
                 }).join(' / ');
 
                 var labels = label.split(keywords);

package/components/cascader/useFields.d.ts

@@ -0,0 +1,2 @@
+import type { CascaderData, BaseCascaderData } from './';
+export declare function useFields(): <Data extends BaseCascaderData = CascaderData<unknown>, Key extends keyof Data = keyof Data>(data: Data, key: Key) => Data[Key];

package/components/cascader/useFields.js

@@ -0,0 +1,18 @@
+import { useInstance } from 'intact-react';
+export function useFields() {
+  var instance = useInstance();
+  return function getField(data, key) {
+    var _instance$get = instance.get(),
+        fields = _instance$get.fields;
+
+    if (fields) {
+      var field = fields[key];
+
+      if (field) {
+        return data[field];
+      }
+    }
+
+    return data[key];
+  };
+}

package/components/cascader/useFilterable.d.ts

@@ -1,7 +1,8 @@
 import type { CascaderData } from './';
 import { State } from '../../hooks/useState';
 import type { Value } from './useValue';
-export declare function useFilterable(keywords: State<string>, setValue: (value: Value) => void): {
+import type { useFields } from './useFields';
+export declare function useFilterable(keywords: State<string>, setValue: (value: Value) => void, getField: ReturnType<typeof useFields>): {
     filter: () => CascaderData<any>[][];
     selectByFilter: (data: CascaderData<any>[]) => void;
     keywords: State<string>;

package/components/cascader/useFilterable.js

@@ -1,16 +1,25 @@
 import _filterInstanceProperty from "@babel/runtime-corejs3/core-js/instance/filter";
+import _includesInstanceProperty from "@babel/runtime-corejs3/core-js/instance/includes";
 import _sliceInstanceProperty from "@babel/runtime-corejs3/core-js/instance/slice";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js/instance/map";
 import { useInstance } from 'intact-react';
-export function useFilterable(keywords, setValue) {
+export function useFilterable(keywords, setValue, getField) {
   var instance = useInstance();
 
   function filter() {
+    var ret = [];
+
     var _instance$get = instance.get(),
         data = _instance$get.data,
         filter = _filterInstanceProperty(_instance$get);
 
-    var ret = [];
+    if (!filter) {
+      filter = function filter(keywords, data) {
+        var _context;
+
+        return _includesInstanceProperty(_context = getField(data, 'label')).call(_context, keywords);
+      };
+    }
 
     var loop = function loop(data, prefix, valid, disabled) {
       if (prefix === void 0) {
@@ -28,14 +37,16 @@ export function useFilterable(keywords, setValue) {
       data.forEach(function (item) {
         var _valid = valid || filter(keywords.value, item);
 
-        var _disabled = disabled || item.disabled;
+        var _disabled = disabled || getField(item, 'disabled');
 
         var _prefix = _sliceInstanceProperty(prefix).call(prefix, 0);
 
         _prefix.push(item);
 
-        if (item.children) {
-          loop(item.children, _prefix, _valid, _disabled);
+        var children = getField(item, 'children');
+
+        if (children) {
+          loop(children, _prefix, _valid, _disabled);
         } else if (_valid) {
           _prefix.disabled = _disabled;
           ret.push(_prefix);
@@ -49,7 +60,7 @@ export function useFilterable(keywords, setValue) {
 
   function selectByFilter(data) {
     var value = _mapInstanceProperty(data).call(data, function (item) {
-      return item.value;
+      return getField(item, 'value');
     });
 
     setValue(value);

package/components/cascader/useLabel.d.ts

@@ -1,3 +1,4 @@
-export declare function useLabel(): {
+import type { useFields } from './useFields';
+export declare function useLabel(getField: ReturnType<typeof useFields>): {
     getLabel: () => import('intact-react').Children;
 };

package/components/cascader/useLabel.js

@@ -1,6 +1,6 @@
 import { useInstance } from 'intact-react';
 import { useBaseLabel } from '../select/useBaseLabel';
-export function useLabel() {
+export function useLabel(getField) {
   var instance = useInstance();
 
   function findLabel(data, value) {
@@ -16,9 +16,9 @@ export function useLabel() {
       for (var i = 0; i < data.length; i++) {
         var item = data[i];
 
-        if (item.value === value[level]) {
-          labels.push(item.label);
-          var children = item.children;
+        if (getField(item, 'value') === value[level]) {
+          labels.push(getField(item, 'label'));
+          var children = getField(item, 'children');
 
           if (children) {
             loop(children, level + 1);

package/components/cascader/useLoad.d.ts

@@ -1,2 +1,3 @@
 import type { CascaderData } from './';
-export declare function useLoad(): (item: CascaderData<any>) => Promise<void>;
+import type { useFields } from './useFields';
+export declare function useLoad(getField: ReturnType<typeof useFields>): (item: CascaderData<any>) => Promise<void>;

package/components/cascader/useLoad.js

@@ -1,7 +1,7 @@
 import _asyncToGenerator from "@babel/runtime-corejs3/helpers/asyncToGenerator";
 import _regeneratorRuntime from "@babel/runtime-corejs3/regenerator";
 import { useInstance } from 'intact-react';
-export function useLoad() {
+export function useLoad(getField) {
   var instance = useInstance();
 
   function loadData(_x) {
@@ -10,7 +10,7 @@ export function useLoad() {
 
   function _loadData() {
     _loadData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(item) {
-      var _instance$get, loadData;
+      var _instance$get, loadData, children;
 
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
@@ -26,19 +26,21 @@ export function useLoad() {
               return _context.abrupt("return");
 
             case 3:
-              if (!(item.children && !item.children.length && !item.loaded)) {
-                _context.next = 8;
+              children = getField(item, 'children');
+
+              if (!(children && !children.length && !item.loaded)) {
+                _context.next = 9;
                 break;
               }
 
-              _context.next = 6;
+              _context.next = 7;
               return loadData(item);
 
-            case 6:
+            case 7:
               item.loaded = true;
               instance.forceUpdate();
 
-            case 8:
+            case 9:
             case "end":
               return _context.stop();
           }

package/components/colorpicker/index.d.ts

@@ -1,6 +1,7 @@
 import { Component, TypeDefs } from 'intact-react';
 import { Sizes } from '../../styles/utils';
 import { Container } from '../portal';
+import { DropdownProps } from '../dropdown';
 export interface ColorpickerProps {
     value: string;
     presets?: string[];
@@ -8,6 +9,7 @@ export interface ColorpickerProps {
     disabled?: boolean;
     container?: Container;
     show?: boolean;
+    position?: DropdownProps['position'];
 }
 export interface ColorpickerEvents {
 }

package/components/colorpicker/index.js

@@ -2,6 +2,7 @@ import _inheritsLoose from "@babel/runtime-corejs3/helpers/inheritsLoose";
 import { Component } from 'intact-react';
 import template from './index.vdt';
 import { sizes } from '../../styles/utils';
+import { Dropdown } from '../dropdown';
 var typeDefs = {
   value: {
     type: String,
@@ -11,13 +12,17 @@ var typeDefs = {
   size: sizes,
   disabled: Boolean,
   container: [Function, String],
-  show: Boolean
+  show: Boolean,
+  position: Dropdown.typeDefs.position
 };
 
 var defaults = function defaults() {
   return {
     presets: ['#D0021B', '#F5A623', '#F8E71C', '#8B572A', '#7ED321', '#417505', '#BD10E0', '#9013FE', '#4A90E2', '#50E3C2', '#B8E986', '#000000', '#4A4A4A', '#9B9B9B', '#FFFFFF'],
-    size: 'default'
+    size: 'default',
+    position: {
+      collision: 'fit'
+    }
   };
 };
 

package/components/colorpicker/index.vdt.js

@@ -19,7 +19,8 @@ export default function ($props, $blocks, $__proto__) {
       value = _this$get.value,
       size = _this$get.size,
       disabled = _this$get.disabled,
-      container = _this$get.container;
+      container = _this$get.container,
+      position = _this$get.position;
 
   var classNameObj = (_classNameObj = {
     'k-colorpicker': true
@@ -27,11 +28,7 @@ export default function ($props, $blocks, $__proto__) {
   return _$cv('div', _extends({
     'className': _$cn(classNameObj)
   }, getRestProps(this)), _$cc(Dropdown, {
-    'position': {
-      my: 'left top+8',
-      at: 'left bottom',
-      collision: 'flip'
-    },
+    'position': position,
     'trigger': 'click',
     'disabled': disabled,
     'container': container,

package/components/dialog/index.spec.js

@@ -243,7 +243,7 @@ describe('Dialog', function () {
             return wait(500);
 
           case 20:
-            expect(document.body.getAttribute('style')).to.be.null;
+            expect(!!document.body.getAttribute('style')).to.be.false;
 
           case 21:
           case "end":
@@ -347,7 +347,7 @@ describe('Dialog', function () {
             return wait(500);
 
           case 18:
-            expect(document.body.getAttribute('style')).to.be.null;
+            expect(!!document.body.getAttribute('style')).to.be.false;
 
           case 19:
           case "end":

package/components/dropdown/dropdown.d.ts

@@ -3,6 +3,7 @@ import { Options, Feedback } from '../position';
 import { Portal, PortalProps } from '../portal';
 import { FeedbackCallback } from './usePosition';
 import type { Events } from '../types';
+import { Virtual } from '../virtual';
 export declare type Position = Options;
 export declare type PositionShorthand = 'left' | 'bottom' | 'right' | 'top';
 export declare const DROPDOWN = "Dropdown";
@@ -12,6 +13,7 @@ export interface DropdownProps {
     disabled?: boolean;
     value?: boolean;
     position?: Position | 'left' | 'bottom' | 'right' | 'top';
+    collison?: Position['collision'];
     of?: 'self' | 'parent' | Event;
     container?: PortalProps['container'];
 }
@@ -21,6 +23,8 @@ export interface DropdownEvents {
     hide: [];
     mouseenter: [MouseEvent];
     mouseleave: [MouseEvent];
+    click: [MouseEvent];
+    contextmenu: [MouseEvent];
     positioned: [Feedback];
 }
 export interface DropdownBlocks {
@@ -30,7 +34,7 @@ export declare class Dropdown<T extends DropdownProps = DropdownProps, E extends
     static typeDefs: Required<TypeDefs<DropdownProps>>;
     static defaults: () => Partial<DropdownProps>;
     static events: Events<DropdownEvents>;
-    static template: (this: Dropdown) => (VNode<import("intact").VNodeTag> | VNode<typeof Portal>)[];
+    static template: (this: Dropdown) => (VNode<typeof Virtual> | VNode<typeof Portal>)[];
     menuVNode: VNode | null;
     dropdown: Dropdown | null;
     rootDropdown: Dropdown | null;
@@ -41,8 +45,7 @@ export declare class Dropdown<T extends DropdownProps = DropdownProps, E extends
             value: boolean;
         };
     };
-    private timer;
-    private triggerProps;
+    protected timer: number | undefined;
     init(): void;
     show(shouldFocus?: boolean): void;
     hide(immediately?: boolean): void;
@@ -52,6 +55,4 @@ export declare class Dropdown<T extends DropdownProps = DropdownProps, E extends
     private onContextMenu;
     private onLeave;
     private initEventCallbacks;
-    private callOriginalCallback;
-    private normalizeTriggerProps;
 }