fix: bail if aria-expanded attribute is present onCreate

resolves #690
atomiks · Jan 31, 2020 · d87392b · d87392b
1 parent 129366b
commit d87392b
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/src/createTippy.ts b/src/createTippy.ts
@@ -152,6 +152,9 @@ export default function createTippy(
   popper._tippy = instance;
 
   const pluginsHooks = plugins.map(plugin => plugin.fn(instance));
+  const hadAriaExpandedAttributeOnCreate = reference.hasAttribute(
+    'aria-expanded',
+  );
 
   addListenersToTriggerTarget();
   handleAriaExpandedAttribute();
@@ -265,6 +268,13 @@ export default function createTippy(
   }
 
   function handleAriaExpandedAttribute(): void {
+    // If the user has specified `aria-expanded` on their reference when the
+    // instance was created, we have to assume they're controlling it externally
+    // themselves
+    if (hadAriaExpandedAttributeOnCreate) {
+      return;
+    }
+
     const nodes = normalizeToArray(instance.props.triggerTarget || reference);
 
     nodes.forEach(node => {

diff --git a/test/integration/createTippy.test.js b/test/integration/createTippy.test.js
@@ -170,6 +170,13 @@ describe('createTippy', () => {
 
     expect(instance.plugins).toEqual([animateFill]);
   });
+
+  it('does not remove an existing `aria-expanded` attribute', () => {
+    const ref = h('div', {'aria-expanded': 'true'});
+    instance = createTippy(ref, {interactive: false});
+
+    expect(ref.hasAttribute('aria-expanded')).toBe(true);
+  });
 });
 
 describe('instance.destroy()', () => {