rsuite 4.10.0 → 4.10.1

package/es/Overlay/OverlayTrigger.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { AnimationEventProps, StandardProps, TypeAttributes } from '../@types/common';
 
-export type OverlayTriggerTrigger = 'click' | 'hover' | 'focus' | 'active' | 'none';
+export type OverlayTriggerTrigger = 'click' | 'contextMenu' | 'hover' | 'focus' | 'active' | 'none';
 
 export interface TriggerProps extends AnimationEventProps, StandardProps {
   /** Triggering events */

package/es/Overlay/OverlayTrigger.js

@@ -49,7 +49,7 @@ function (_React$Component) {
       var trigger = _this.props.trigger;
       _this.mouseEnteredToSpeaker = false;
 
-      if (!isOneOf('click', trigger) && !isOneOf('active', trigger)) {
+      if (!isOneOf('click', trigger) && !isOneOf('active', trigger) && !isOneOf('contextMenu', trigger)) {
         _this.hideWithCheck();
       }
     };
@@ -113,6 +113,10 @@ function (_React$Component) {
       }
     };
 
+    _this.preventDefault = function (event) {
+      event.preventDefault();
+    };
+
     _this.handleDelayedShow = function () {
       var _this$props2 = _this.props,
           delayShow = _this$props2.delayShow,
@@ -216,6 +220,8 @@ function (_React$Component) {
 
     if (isOneOf('click', trigger)) {
       overlayProps.onHide = createChainedFunction(this.hide, onHide);
+    } else if (isOneOf('contextMenu', trigger)) {
+      overlayProps.onHide = createChainedFunction(this.hide, onHide);
     } else if (isOneOf('active', trigger)) {
       overlayProps.onHide = createChainedFunction(this.hide, onHide);
     }
@@ -245,6 +251,7 @@ function (_React$Component) {
         children = _this$props5.children,
         speaker = _this$props5.speaker,
         onClick = _this$props5.onClick,
+        onContextMenu = _this$props5.onContextMenu,
         trigger = _this$props5.trigger,
         onMouseOver = _this$props5.onMouseOver,
         onMouseOut = _this$props5.onMouseOut,
@@ -264,6 +271,10 @@ function (_React$Component) {
         props.onClick = createChainedFunction(this.toggleHideAndShow, props.onClick);
       }
 
+      if (isOneOf('contextMenu', trigger)) {
+        props.onContextMenu = createChainedFunction(this.preventDefault, this.toggleHideAndShow, triggerProps.onContextMenu, onContextMenu);
+      }
+
       if (isOneOf('active', trigger)) {
         props.onClick = createChainedFunction(this.handleDelayedShow, props.onClick);
       }

package/lib/Overlay/OverlayTrigger.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { AnimationEventProps, StandardProps, TypeAttributes } from '../@types/common';
 
-export type OverlayTriggerTrigger = 'click' | 'hover' | 'focus' | 'active' | 'none';
+export type OverlayTriggerTrigger = 'click' | 'contextMenu' | 'hover' | 'focus' | 'active' | 'none';
 
 export interface TriggerProps extends AnimationEventProps, StandardProps {
   /** Triggering events */

package/lib/Overlay/OverlayTrigger.js

@@ -70,7 +70,7 @@ function (_React$Component) {
       var trigger = _this.props.trigger;
       _this.mouseEnteredToSpeaker = false;
 
-      if (!(0, _isOneOf.default)('click', trigger) && !(0, _isOneOf.default)('active', trigger)) {
+      if (!(0, _isOneOf.default)('click', trigger) && !(0, _isOneOf.default)('active', trigger) && !(0, _isOneOf.default)('contextMenu', trigger)) {
         _this.hideWithCheck();
       }
     };
@@ -134,6 +134,10 @@ function (_React$Component) {
       }
     };
 
+    _this.preventDefault = function (event) {
+      event.preventDefault();
+    };
+
     _this.handleDelayedShow = function () {
       var _this$props2 = _this.props,
           delayShow = _this$props2.delayShow,
@@ -236,6 +240,8 @@ function (_React$Component) {
 
     if ((0, _isOneOf.default)('click', trigger)) {
       overlayProps.onHide = (0, _createChainedFunction.default)(this.hide, onHide);
+    } else if ((0, _isOneOf.default)('contextMenu', trigger)) {
+      overlayProps.onHide = (0, _createChainedFunction.default)(this.hide, onHide);
     } else if ((0, _isOneOf.default)('active', trigger)) {
       overlayProps.onHide = (0, _createChainedFunction.default)(this.hide, onHide);
     }
@@ -265,6 +271,7 @@ function (_React$Component) {
         children = _this$props5.children,
         speaker = _this$props5.speaker,
         onClick = _this$props5.onClick,
+        onContextMenu = _this$props5.onContextMenu,
         trigger = _this$props5.trigger,
         onMouseOver = _this$props5.onMouseOver,
         onMouseOut = _this$props5.onMouseOut,
@@ -284,6 +291,10 @@ function (_React$Component) {
         props.onClick = (0, _createChainedFunction.default)(this.toggleHideAndShow, props.onClick);
       }
 
+      if ((0, _isOneOf.default)('contextMenu', trigger)) {
+        props.onContextMenu = (0, _createChainedFunction.default)(this.preventDefault, this.toggleHideAndShow, triggerProps.onContextMenu, onContextMenu);
+      }
+
       if ((0, _isOneOf.default)('active', trigger)) {
         props.onClick = (0, _createChainedFunction.default)(this.handleDelayedShow, props.onClick);
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rsuite",
-  "version": "4.10.0",
+  "version": "4.10.1",
   "description": "A suite of react components",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -63,7 +63,7 @@
     "react-lifecycles-compat": "^3.0.4",
     "react-virtualized": "^9.21.0",
     "recompose": "^0.30.0",
-    "rsuite-table": "^3.14.6",
+    "rsuite-table": "^3.15.1",
     "schema-typed": "^1.5.1"
   },
   "peerDependencies": {

package/src/Overlay/OverlayTrigger.d.ts

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { AnimationEventProps, StandardProps, TypeAttributes } from '../@types/common';
 
-export type OverlayTriggerTrigger = 'click' | 'hover' | 'focus' | 'active' | 'none';
+export type OverlayTriggerTrigger = 'click' | 'contextMenu' | 'hover' | 'focus' | 'active' | 'none';
 
 export interface TriggerProps extends AnimationEventProps, StandardProps {
   /** Triggering events */

package/src/Overlay/OverlayTrigger.tsx

@@ -26,6 +26,7 @@ interface TriggerProps {
   onMouseOut?: React.MouseEventHandler;
   onBlur?: React.MouseEventHandler;
   onClick?: React.MouseEventHandler;
+  onContextMenu?: React.MouseEventHandler;
   onFocus?: React.MouseEventHandler;
 }
 
@@ -81,7 +82,11 @@ class OverlayTrigger extends React.Component<OverlayTriggerProps, OverlayTrigger
   handleSpeakerMouseLeave = () => {
     const { trigger } = this.props;
     this.mouseEnteredToSpeaker = false;
-    if (!isOneOf('click', trigger) && !isOneOf('active', trigger)) {
+    if (
+      !isOneOf('click', trigger) &&
+      !isOneOf('active', trigger) &&
+      !isOneOf('contextMenu', trigger)
+    ) {
       this.hideWithCheck();
     }
   };
@@ -130,6 +135,10 @@ class OverlayTrigger extends React.Component<OverlayTriggerProps, OverlayTrigger
     }
   };
 
+  preventDefault = (event: React.MouseEvent<Element, MouseEvent>) => {
+    event.preventDefault();
+  };
+
   handleDelayedShow = () => {
     const { delayShow, enterable } = this.props;
     const delay = isNil(delayShow) ? this.props.delay : delayShow;
@@ -197,6 +206,8 @@ class OverlayTrigger extends React.Component<OverlayTriggerProps, OverlayTrigger
 
     if (isOneOf('click', trigger)) {
       overlayProps.onHide = createChainedFunction(this.hide, onHide);
+    } else if (isOneOf('contextMenu', trigger)) {
+      overlayProps.onHide = createChainedFunction(this.hide, onHide);
     } else if (isOneOf('active', trigger)) {
       overlayProps.onHide = createChainedFunction(this.hide, onHide);
     }
@@ -228,6 +239,7 @@ class OverlayTrigger extends React.Component<OverlayTriggerProps, OverlayTrigger
       children,
       speaker,
       onClick,
+      onContextMenu,
       trigger,
       onMouseOver,
       onMouseOut,
@@ -254,6 +266,15 @@ class OverlayTrigger extends React.Component<OverlayTriggerProps, OverlayTrigger
         props.onClick = createChainedFunction(this.toggleHideAndShow, props.onClick);
       }
 
+      if (isOneOf('contextMenu', trigger)) {
+        props.onContextMenu = createChainedFunction(
+          this.preventDefault,
+          this.toggleHideAndShow,
+          triggerProps.onContextMenu,
+          onContextMenu
+        );
+      }
+
       if (isOneOf('active', trigger)) {
         props.onClick = createChainedFunction(this.handleDelayedShow, props.onClick);
       }

package/src/Overlay/test/OverlayTriggerSpec.js

@@ -0,0 +1,155 @@
+import React from 'react';
+import ReactTestUtils from 'react-dom/test-utils';
+import { getDOMNode } from '@test/testUtils';
+
+import OverlayTrigger from '../OverlayTrigger';
+import Tooltip from '../../Tooltip';
+
+describe('OverlayTrigger', () => {
+  it('Should create Whisper element', () => {
+    const instance = getDOMNode(
+      <OverlayTrigger speaker={<Tooltip>tooltip</Tooltip>}>
+        <button type="button">button</button>
+      </OverlayTrigger>
+    );
+    assert.equal(instance.nodeName, 'BUTTON');
+  });
+
+  it('Should maintain overlay classname when trigger click', () => {
+    const whisper = getDOMNode(
+      <OverlayTrigger
+        trigger="click"
+        speaker={<Tooltip className="test-whisper_click">test</Tooltip>}
+      >
+        <button>button</button>
+      </OverlayTrigger>
+    );
+    ReactTestUtils.Simulate.click(whisper);
+    assert.equal(document.getElementsByClassName('test-whisper_click').length, 1);
+  });
+
+  it('Should maintain overlay classname when trigger contextMenu', () => {
+    const whisper = getDOMNode(
+      <OverlayTrigger
+        trigger="contextMenu"
+        speaker={<Tooltip className="test-whisper_context-menu">test</Tooltip>}
+      >
+        <button>button</button>
+      </OverlayTrigger>
+    );
+    ReactTestUtils.Simulate.contextMenu(whisper);
+    assert.equal(document.getElementsByClassName('test-whisper_context-menu').length, 1);
+  });
+
+  it('Should maintain overlay classname when trigger focus', () => {
+    const whisper = getDOMNode(
+      <OverlayTrigger
+        trigger="focus"
+        speaker={<Tooltip className="test-whisper_focus">test</Tooltip>}
+      >
+        <button>button</button>
+      </OverlayTrigger>
+    );
+
+    ReactTestUtils.Simulate.focus(whisper);
+    assert.equal(document.getElementsByClassName('test-whisper_focus').length, 1);
+  });
+
+  it('Should maintain overlay classname when trigger mouseOver and setting [trigger="hover"]', () => {
+    const whisper = getDOMNode(
+      <OverlayTrigger
+        trigger="hover"
+        speaker={<Tooltip className="test-whisper_hover">test</Tooltip>}
+      >
+        <button>button</button>
+      </OverlayTrigger>
+    );
+
+    ReactTestUtils.Simulate.mouseOver(whisper);
+    assert.equal(document.getElementsByClassName('test-whisper_hover').length, 1);
+  });
+
+  it('Should maintain overlay classname when trigger click and setting [trigger="active"]  ', () => {
+    const whisper = getDOMNode(
+      <OverlayTrigger
+        trigger="active"
+        speaker={<Tooltip className="test-whisper_active">test</Tooltip>}
+      >
+        <button>button</button>
+      </OverlayTrigger>
+    );
+
+    ReactTestUtils.Simulate.click(whisper);
+    assert.equal(document.getElementsByClassName('test-whisper_active').length, 1);
+  });
+
+  it('Should call onClick callback', done => {
+    const doneOp = () => {
+      done();
+    };
+
+    const whisper = getDOMNode(
+      <OverlayTrigger onClick={doneOp} trigger="click" speaker={<Tooltip />}>
+        <button>button</button>
+      </OverlayTrigger>
+    );
+
+    ReactTestUtils.Simulate.click(whisper);
+  });
+
+  it('Should call onContextMenu callback', done => {
+    const doneOp = () => {
+      done();
+    };
+
+    const whisper = getDOMNode(
+      <OverlayTrigger onContextMenu={doneOp} trigger="contextMenu" speaker={<Tooltip />}>
+        <button>button</button>
+      </OverlayTrigger>
+    );
+
+    ReactTestUtils.Simulate.contextMenu(whisper);
+  });
+
+  it('Should call onFocus callback', done => {
+    const doneOp = () => {
+      done();
+    };
+
+    const whisper = getDOMNode(
+      <OverlayTrigger onFocus={doneOp} trigger="focus" speaker={<Tooltip />}>
+        <button>button</button>
+      </OverlayTrigger>
+    );
+
+    ReactTestUtils.Simulate.focus(whisper);
+  });
+
+  it('Should call onMouseOver callback', done => {
+    const doneOp = () => {
+      done();
+    };
+
+    const whisper = getDOMNode(
+      <OverlayTrigger onMouseOver={doneOp} trigger="hover" speaker={<Tooltip />}>
+        <button>button</button>
+      </OverlayTrigger>
+    );
+
+    ReactTestUtils.Simulate.mouseOver(whisper);
+  });
+
+  it('Should call onMouseOut callback', done => {
+    const doneOp = () => {
+      done();
+    };
+
+    const whisper = getDOMNode(
+      <OverlayTrigger onMouseOut={doneOp} trigger="hover" speaker={<Tooltip />}>
+        <button>button</button>
+      </OverlayTrigger>
+    );
+
+    ReactTestUtils.Simulate.mouseOut(whisper);
+  });
+});