Merge branch '2.x' into dev

2020-11-26 21:05:57 +08:00
parent ea44d636ba 1855cffeb2
commit 52fdf99c69
21 changed files with 240 additions and 62 deletions
@@ -19,6 +19,7 @@ export default createComponent({

  props: {
    show: Boolean,
+    trigger: String,
    overlay: Boolean,
    offset: {
      type: Array,
@@ -94,6 +95,12 @@ export default createComponent({
      emit('update:show', value);
    };

+    const onClickWrapper = () => {
+      if (props.trigger === 'click') {
+        toggle(!props.show);
+      }
+    };
+
    const onTouchstart = (event) => {
      event.stopPropagation();
      emit('touchstart', event);
@@ -142,7 +149,7 @@ export default createComponent({
    useClickAway(wrapperRef, onClickAway, { eventName: 'touchstart' });

    return () => (
-      <span ref={wrapperRef} class={bem('wrapper')}>
+      <span ref={wrapperRef} class={bem('wrapper')} onClick={onClickWrapper}>
        <Popup
          ref={popoverRef}
          show={props.show}