@king-design/vue 2.1.0 → 2.1.2

package/components/tooltip/index.spec.js

@@ -12,7 +12,10 @@ import ContentDemo from '~/components/tooltip/demos/content';
 import ConfirmDemo from '~/components/tooltip/demos/confirm';
 import AlwaysDemo from '~/components/tooltip/demos/always';
 import { Tooltip } from './';
+import { Dialog } from '../dialog';
 import { mount, unmount, dispatchEvent, getElement, wait } from '../../test/utils';
+import { tooltip as tooltipTheme } from './styles';
+import { Select, Option } from '../select';
 describe('Tooltip', function () {
   afterEach(function (done) {
     unmount();
@@ -577,4 +580,166 @@ describe('Tooltip', function () {
       }
     }, _callee9);
   })));
+  it('should add className', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee10() {
+    var Demo, _mount10, instance, element, trigger, dropdown;
+
+    return _regeneratorRuntime.wrap(function _callee10$(_context13) {
+      while (1) {
+        switch (_context13.prev = _context13.next) {
+          case 0:
+            Demo = /*#__PURE__*/function (_Component3) {
+              _inheritsLoose(Demo, _Component3);
+
+              function Demo() {
+                var _context12;
+
+                var _this3;
+
+                for (var _len3 = arguments.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+                  args[_key3] = arguments[_key3];
+                }
+
+                _this3 = _Component3.call.apply(_Component3, _concatInstanceProperty(_context12 = [this]).call(_context12, args)) || this;
+                _this3.Tooltip = Tooltip;
+                return _this3;
+              }
+
+              return Demo;
+            }(Component);
+
+            Demo.template = "\n                const Tooltip = this.Tooltip;\n                <div>\n                    <Tooltip content=\"hello\" class=\"a\">\n                        <div ref=\"test\" class=\"b\">test</div>\n                    </Tooltip>\n                </div>\n            ";
+            _mount10 = mount(Demo), instance = _mount10[0], element = _mount10[1];
+            trigger = instance.refs.test;
+            expect(trigger.className).to.eql('b a');
+            dispatchEvent(trigger, 'mouseenter');
+            _context13.next = 8;
+            return wait();
+
+          case 8:
+            dropdown = getElement('.k-tooltip-content');
+            expect(dropdown.classList.contains('a')).to.be.true;
+
+          case 10:
+          case "end":
+            return _context13.stop();
+        }
+      }
+    }, _callee10);
+  })));
+  it('should fix the width in small container', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee11() {
+    var Demo, _mount11, instance, element, trigger, expecedWidth, content, width, newWidth;
+
+    return _regeneratorRuntime.wrap(function _callee11$(_context15) {
+      while (1) {
+        switch (_context15.prev = _context15.next) {
+          case 0:
+            Demo = /*#__PURE__*/function (_Component4) {
+              _inheritsLoose(Demo, _Component4);
+
+              function Demo() {
+                var _context14;
+
+                var _this4;
+
+                for (var _len4 = arguments.length, args = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
+                  args[_key4] = arguments[_key4];
+                }
+
+                _this4 = _Component4.call.apply(_Component4, _concatInstanceProperty(_context14 = [this]).call(_context14, args)) || this;
+                _this4.Tooltip = Tooltip;
+                _this4.Dialog = Dialog;
+                return _this4;
+              }
+
+              return Demo;
+            }(Component);
+
+            Demo.template = "\n                const {Tooltip, Dialog} = this;\n                <div style=\"text-align: right; position: relative; width: 300px;\">\n                    <Tooltip content=\"\u8FD9\u662F\u4E00\u6BB5\u5F88\u957F\u7684\u63CF\u8FF0\u6587\u5B57\uFF0C\u8FD9\u662F\u4E00\u6BB5\u5F88\u957F\u7684\u63CF\u8FF0\u6587\u5B57\" container={dom => dom}>\n                        <span class=\"trigger\">test</span>\n                    </Tooltip>\n                </div>\n            ";
+            _mount11 = mount(Demo), instance = _mount11[0], element = _mount11[1];
+            trigger = element.querySelector('.trigger');
+            expecedWidth = parseInt(tooltipTheme.maxWidth);
+            dispatchEvent(trigger, 'mouseenter');
+            _context15.next = 8;
+            return wait();
+
+          case 8:
+            content = getElement('.k-tooltip-content');
+            width = content.offsetWidth;
+            expect(width).to.eql(expecedWidth);
+            dispatchEvent(trigger, 'mouseleave');
+            _context15.next = 14;
+            return wait();
+
+          case 14:
+            dispatchEvent(trigger, 'mouseenter');
+            _context15.next = 17;
+            return wait();
+
+          case 17:
+            newWidth = content.offsetWidth;
+            expect(newWidth).to.eql(width);
+
+          case 19:
+          case "end":
+            return _context15.stop();
+        }
+      }
+    }, _callee11);
+  })));
+  it('should not impact select when wrap select with tooltip', /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee12() {
+    var Demo, _mount12, instance, element, menu;
+
+    return _regeneratorRuntime.wrap(function _callee12$(_context17) {
+      while (1) {
+        switch (_context17.prev = _context17.next) {
+          case 0:
+            Demo = /*#__PURE__*/function (_Component5) {
+              _inheritsLoose(Demo, _Component5);
+
+              function Demo() {
+                var _context16;
+
+                var _this5;
+
+                for (var _len5 = arguments.length, args = new Array(_len5), _key5 = 0; _key5 < _len5; _key5++) {
+                  args[_key5] = arguments[_key5];
+                }
+
+                _this5 = _Component5.call.apply(_Component5, _concatInstanceProperty(_context16 = [this]).call(_context16, args)) || this;
+                _this5.Tooltip = Tooltip;
+                _this5.Select = Select;
+                _this5.Option = Option;
+                return _this5;
+              }
+
+              return Demo;
+            }(Component);
+
+            Demo.template = "\n                const {Tooltip, Select, Option} = this;\n                <Tooltip>\n                    <Select>\n                        <Option value=\"1\">Option 1</Option>\n                        <Option value=\"2\">Option 2</Option>\n                    </Select>\n                </Tooltip>\n            ";
+            _mount12 = mount(Demo), instance = _mount12[0], element = _mount12[1];
+            dispatchEvent(element, 'mouseenter');
+            _context17.next = 6;
+            return wait();
+
+          case 6:
+            dispatchEvent(element, 'click');
+            _context17.next = 9;
+            return wait();
+
+          case 9:
+            menu = getElement(".k-select-menu");
+            dispatchEvent(element, 'mouseleave');
+            _context17.next = 13;
+            return wait(500);
+
+          case 13:
+            expect(menu.style.display).to.eql('');
+
+          case 14:
+          case "end":
+            return _context17.stop();
+        }
+      }
+    }, _callee12);
+  })));
 });

package/components/tooltip/styles.d.ts

@@ -1,4 +1,26 @@
 import '../../styles/global';
+declare const defaults: {
+    padding: string;
+    readonly color: string;
+    bgColor: string;
+    lineHeight: number;
+    maxWidth: string;
+    arrow: {
+        borderColor: string;
+        width: string;
+    };
+    confirm: {
+        gaps: string;
+    };
+    dark: {
+        readonly bgColor: string;
+        color: string;
+        readonly arrowBorderColor: string;
+    };
+    smallPadding: string;
+};
+export declare let tooltip: typeof defaults;
 export declare type Theme = 'dark' | 'light';
 export declare const themes: Theme[];
 export default function makeStyles(): string;
+export {};

package/components/tooltip/styles.js

@@ -38,7 +38,7 @@ var defaults = {
   },
   smallPadding: '4px'
 };
-var tooltip;
+export var tooltip;
 setDefault(function () {
   tooltip = deepDefaults(theme, {
     tooltip: defaults

package/components/tooltip/tooltip.d.ts

@@ -23,5 +23,6 @@ export declare class Tooltip<T extends TooltipProps = TooltipProps, E extends To
     static typeDefs: Required<TypeDefs<TooltipProps>>;
     static defaults: () => Partial<TooltipProps>;
     static events: Events<TooltipEvents>;
+    show(shouldFocus?: boolean): void;
     hide(immediately: boolean): void;
 }

package/components/tooltip/tooltip.js

@@ -25,6 +25,7 @@ var defaults = function defaults() {
       at: 'center top',
       collision: 'flipfit'
     },
+    collison: 'flipfit',
     hoverable: false,
     always: false,
     confirm: false,
@@ -48,12 +49,26 @@ export var Tooltip = /*#__PURE__*/function (_Dropdown) {
 
   var _proto = Tooltip.prototype;
 
+  _proto.show = function show(shouldFocus) {
+    if (shouldFocus === void 0) {
+      shouldFocus = false;
+    }
+
+    if (this.get('disabled')) return;
+    clearTimeout(this.timer);
+    this.set('value', true);
+  };
+
   _proto.hide = function hide(immediately) {
     if (this.get('always')) return;
 
     if (this.get('hoverable')) {
       return _Dropdown.prototype.hide.call(this, immediately);
-    }
+    } // tooltip can show any number sub-tooltips, we should not close the showed tooltip
+    // #885
+
+
+    this.showedDropdown = null;
 
     _Dropdown.prototype.hide.call(this, true);
   };

package/components/virtual.d.ts

@@ -0,0 +1,8 @@
+import { Component, VNode } from 'intact-vue-next';
+export declare class Virtual extends Component<any> {
+    static template(this: Virtual): VNode<import("intact").VNodeTag>;
+    private vNodeProps;
+    private getVNodeProps;
+    private getEventProps;
+    private callEvent;
+}

package/components/virtual.js

@@ -0,0 +1,126 @@
+import _extends from "@babel/runtime-corejs3/helpers/extends";
+import _objectWithoutPropertiesLoose from "@babel/runtime-corejs3/helpers/objectWithoutPropertiesLoose";
+import _inheritsLoose from "@babel/runtime-corejs3/helpers/inheritsLoose";
+var _excluded = ["children"];
+import _concatInstanceProperty from "@babel/runtime-corejs3/core-js/instance/concat";
+import _startsWithInstanceProperty from "@babel/runtime-corejs3/core-js/instance/starts-with";
+import { Component, directClone, createVNode } from 'intact-vue-next';
+import { isTextChildren } from './utils';
+import { EMPTY_OBJ, isFunction, hasOwn } from 'intact-shared';
+import { cx } from '@emotion/css';
+var reactEventReg = /on[A-Z]/;
+export var Virtual = /*#__PURE__*/function (_Component) {
+  _inheritsLoose(Virtual, _Component);
+
+  function Virtual() {
+    var _context;
+
+    var _this;
+
+    for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    _this = _Component.call.apply(_Component, _concatInstanceProperty(_context = [this]).call(_context, args)) || this;
+    _this.vNodeProps = null;
+    return _this;
+  }
+
+  Virtual.template = function template() {
+    var _cx;
+
+    var _this$get = this.get(),
+        children = _this$get.children,
+        props = _objectWithoutPropertiesLoose(_this$get, _excluded);
+
+    if (process.env.NODE_ENV !== 'production') {
+      if (!children || Array.isArray(children) && children.length !== 1) {
+        throw new Error('Component must receive one children');
+      }
+    }
+
+    var vNode = Array.isArray(children) ? children[0] : children;
+    var clonedVNode = isTextChildren(vNode) ? createVNode('span', null, vNode) : directClone(vNode);
+    var vNodeProps = this.vNodeProps = this.getVNodeProps(clonedVNode.props || EMPTY_OBJ);
+    var eventProps = this.getEventProps(); //  merge className 
+
+    var className = clonedVNode.className || vNodeProps.className;
+    className = cx((_cx = {}, _cx[className] = !!className, _cx[props.className] = !!props.className, _cx));
+    clonedVNode.props = _extends({}, props, vNodeProps, eventProps, {
+      className: className
+    });
+    clonedVNode.className = className;
+    return clonedVNode;
+  };
+
+  var _proto = Virtual.prototype;
+
+  _proto.getVNodeProps = function getVNodeProps(props) {
+    var vnode = props.vnode;
+    if (!vnode) return props; // maybe we render the intact component in react slot property, in this case
+    // the $isReact is false. so use the vnode $$typeof field as gauge
+
+    if (vnode.$$typeof || vnode.__v_isVNode
+    /* vue3 vnode */
+    ) {
+      var _props = vnode.props;
+      if (!_props) return props;
+      var events = {};
+
+      for (var key in _props) {
+        if (reactEventReg.test(key)) {
+          events["ev-" + key.substring(2).toLowerCase()] = _props[key];
+        }
+      }
+
+      return _extends({}, props, events, {
+        className: _props.className || _props.class
+        /* vue-next */
+
+      });
+    } else if (hasOwn.call(vnode, 'componentOptions')
+    /* vue2 vnode */
+    ) {
+      var data = vnode.data;
+      var on = data && data.on || EMPTY_OBJ;
+      var _events = {};
+
+      for (var _key2 in on) {
+        _events["ev-" + _key2] = on[_key2];
+      }
+
+      return _extends({}, props, _events);
+    }
+
+    return props;
+  };
+
+  _proto.getEventProps = function getEventProps() {
+    var _this2 = this;
+
+    var props = {};
+
+    var _loop = function _loop(prop) {
+      if (_startsWithInstanceProperty(prop).call(prop, 'ev-')) {
+        props[prop] = function (e) {
+          return _this2.callEvent(prop, e);
+        };
+      }
+    };
+
+    for (var prop in this.get()) {
+      _loop(prop);
+    }
+
+    return props;
+  };
+
+  _proto.callEvent = function callEvent(name, e) {
+    var callback = this.vNodeProps[name];
+    var callbackOnVirtual = this.get(name);
+    if (isFunction(callback)) callback(e);
+    if (isFunction(callbackOnVirtual)) callbackOnVirtual(e);
+  };
+
+  return Virtual;
+}(Component);

package/index.d.ts

@@ -1,5 +1,5 @@
 /*!
- * @king-design v2.1.0
+ * @king-design v2.1.2
  *
  * Copyright (c) Kingsoft Cloud
  * Released under the MIT License
@@ -57,7 +57,7 @@ export * from './components/tree';
 export * from './components/treeSelect';
 export * from './components/upload';
 export * from './components/wave';
-export declare const version = "2.1.0";
+export declare const version = "2.1.2";
 
 
 export {normalize} from 'intact-vue-next';

package/index.js

@@ -1,5 +1,5 @@
 /*!
- * @king-design v2.1.0
+ * @king-design v2.1.2
  *
  * Copyright (c) Kingsoft Cloud
  * Released under the MIT License
@@ -59,7 +59,7 @@ export * from './components/tree';
 export * from './components/treeSelect';
 export * from './components/upload';
 export * from './components/wave';
-export var version = '2.1.0';
+export var version = '2.1.2';
 /* generate end */
 
 export {normalize} from 'intact-vue-next';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@king-design/vue",
-  "version": "2.1.0",
+  "version": "2.1.2",
   "description": "King-Design UI components for Vue3.0.",
   "keywords": [
     "component",
@@ -38,7 +38,7 @@
     "dayjs": "^1.10.7",
     "downloadjs": "^1.4.7",
     "enquire.js": "^2.1.6",
-    "intact-vue-next": "^3.0.18",
+    "intact-vue-next": "3.0.19",
     "monaco-editor": "^0.26.1",
     "mxgraphx": "^4.0.7",
     "resize-observer-polyfill": "^1.5.1",