fix: dont ignore offset on offset modifier on tooltip.js (#814)

fixes #376
floating-ui · Aug 22, 2019 · f1f4874 · f1f4874
1 parent 9e94c98
commit f1f4874
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/packages/tooltip/src/index.js b/packages/tooltip/src/index.js
@@ -231,7 +231,9 @@ export default class Tooltip {
       },
       offset: {
         ...(this._popperOptions.modifiers && this._popperOptions.modifiers.offset),
-        offset: options.offset,
+        offset: options.offset ||
+          this._popperOptions.modifiers && this._popperOptions.modifiers.offset && this._popperOptions.modifiers.offset.offset ||
+          options.offset,
       },
     };
 

diff --git a/packages/tooltip/tests/functional/tooltip.js b/packages/tooltip/tests/functional/tooltip.js
@@ -549,12 +549,12 @@ describe('[tooltip.js]', () => {
       });
 
       spyOn(instance, '_show');
-      
+
       expect(document.querySelector('.tooltip')).toBeNull();
 
       then(() => reference.dispatchEvent(new CustomEvent('mouseenter')), hoverTime);
       then(() => reference.dispatchEvent(new CustomEvent('mouseleave')), delay * 2);
-      
+
       then(() => {
         expect(instance._show).not.toHaveBeenCalled();
         done()
@@ -592,6 +592,17 @@ describe('[tooltip.js]', () => {
       done();
     });
 
+    it('should proxy a `offset` modifier to the Popper.js instance', done => {
+      instance = new Tooltip(reference, {
+        title: 'test',
+        popperOptions: {
+          modifiers: { offset: { offset: 10 } },
+        },
+      }).show();
+      expect(instance._popperOptions.modifiers.offset.offset).toBe(10);
+      done();
+    });
+
     it('should hide on click outside with `options.closeOnClickOutside`', done => {
       instance = new Tooltip(reference, {
         title: 'foobar',