feat(split-button): add split-button pattern

adobe · Aug 29, 2020 · 012b7f8 · 012b7f8
1 parent b806665
commit 012b7f8
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/packages/split-button/stories/split-button.stories.ts b/packages/split-button/stories/split-button.stories.ts
@@ -119,7 +119,11 @@ moreCta.story = {
 export const moreCtaOpen = (options = {}): TemplateResult => {
     return html`
         <div>
+<<<<<<< HEAD
             <sp-split-button type="more" open>
+=======
+            <sp-split-button open>
+>>>>>>> feat(split-button): add split-button pattern
                 ${menu(options)}
             </sp-split-button>
         </div>

diff --git a/packages/split-button/test/split-button.test.ts b/packages/split-button/test/split-button.test.ts
@@ -78,7 +78,6 @@ describe('Splitbutton', () => {
         expect(((el as unknown) as TestableSplitButton).isShiftTabbing).to.be
             .true;
         await nextFrame();
-        await nextFrame();
 
         trigger.focus();