Merge pull request #2337 from openedx/vrusakov/sync-alpha

sync: alpha with master
openedx · Aug 5, 2024 · 2cf913b · 2cf913b
1 parent 5a1461c
commit 2cf913b
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 4 deletions.
diff --git a/src/Card/tests/__snapshots__/CardGrid.test.jsx.snap b/src/Card/tests/__snapshots__/CardGrid.test.jsx.snap
@@ -19,6 +19,7 @@ exports[`<CardGrid /> Controlled Rendering renders with controlled columnSizes 1
         >
           <img
             className="pgn__card-image-cap"
+            loading="eager"
             onError={[Function]}
             onLoad={[Function]}
             src="http://fake.image"

diff --git a/src/Menu/SelectMenu.test.jsx b/src/Menu/SelectMenu.test.jsx
@@ -69,6 +69,11 @@ describe('correct rendering', () => {
     expect(wrapper.find(Button).prop('variant')).toEqual('brand');
     expect(wrapper.find('button').hasClass('btn-brand')).toEqual(true);
   });
+  it('rendering with Brand button variant', () => {
+    const wrapper = mount(<DefaultSelectMenu variant="brand" />);
+    expect(wrapper.find(Button).prop('variant')).toEqual('brand');
+    expect(wrapper.find('button').hasClass('btn-brand')).toEqual(true);
+  });
 });
 
 describe('mouse behavior & keyboard behavior', () => {
@@ -115,7 +120,6 @@ describe('keyboard Interactions', () => {
     await userEvent.keyboard('[arrowdown]');
     expect(menuItems[1]).toHaveFocus();
   });
-
   it('should focus the next item after ArrowRight keyDown', async () => {
     const { getByRole, getAllByRole } = render(defaultSelectMenu());
     const menuTrigger = getByRole('button', { expanded: false });

diff --git a/src/Tabs/Tabs.test.jsx b/src/Tabs/Tabs.test.jsx
@@ -122,6 +122,12 @@ describe('<Tabs />', () => {
       wrapper.find('.dropdown-item').at(0).simulate('keyPress', { key: 'Enter' });
       expect(wrapper.find('[data-rb-event-key="tab_2"]').at(0).hasClass('active')).toEqual(true);
     });
+    it('select dropdown item after pressing Enter', () => {
+      const wrapper = mount(<TabsTestComponent />);
+      wrapper.find('#pgn__tab-toggle').at(0).at(0).simulate('click');
+      wrapper.find('.dropdown-item').at(0).simulate('keyPress', { key: 'Enter' });
+      expect(wrapper.find('[data-rb-event-key="tab_2"]').at(0).hasClass('active')).toEqual(true);
+    });
     it('invalid child does not render', () => {
       const { getByRole } = render(
         <Tabs>

diff --git a/www/src/components/LeaveFeedback.tsx b/www/src/components/LeaveFeedback.tsx
@@ -24,9 +24,11 @@ function LeaveFeedback({ isNavLink, ...props }: LeaveFeedbackProps) {
                 {...props}
             >
                 {leaveFeedbackLinkTitle}
-            </Nav.Link>
-        );
-    }
+    <Nav.Link onClick={handleLinkFeedbackClick} href={FEEDBACK_URL} target="_blank" {...props}>
+      Leave feedback
+    </Nav.Link>
+  );
+}
 
     return (
         <Button

diff --git a/www/src/components/PageLayout.tsx b/www/src/components/PageLayout.tsx
@@ -149,6 +149,9 @@ function Layout({
           <Nav.Item>
             <LeaveFeedback />
           </Nav.Item>
+          <Nav.Item>
+            <LeaveFeedback />
+          </Nav.Item>
           <Nav.Item>
             <LeaveFeedback className="muted-link" isNavLink />
           </Nav.Item>