fix: fix getPopupContainer null error (#636)

* fix: fix getPopupContainer null error * chore: code clena * chore: code clean * chore: update snapshot
react-component · May 24, 2023 · cc25e98 · cc25e98
1 parent 5ce582c
commit cc25e98
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 24 deletions.
diff --git a/src/Menu.tsx b/src/Menu.tsx
@@ -479,8 +479,6 @@ const Menu = React.forwardRef<MenuRef, MenuProps>((props, ref) => {
     }
   });
 
-  const getInternalPopupContainer = useMemoCallback(getPopupContainer);
-
   // ==================== Accessibility =====================
   const triggerAccessibilityOpen = (key: string, open?: boolean) => {
     const nextOpen = open ?? !mergedOpenKeys.includes(key);
@@ -622,7 +620,7 @@ const Menu = React.forwardRef<MenuRef, MenuProps>((props, ref) => {
           forceSubMenuRender={forceSubMenuRender}
           builtinPlacements={builtinPlacements}
           triggerSubMenuAction={triggerSubMenuAction}
-          getPopupContainer={getInternalPopupContainer}
+          getPopupContainer={getPopupContainer}
           // Icon
           itemIcon={itemIcon}
           expandIcon={expandIcon}

diff --git a/tests/SubMenu.spec.tsx b/tests/SubMenu.spec.tsx
@@ -7,7 +7,7 @@ import { isActive, last } from './util';
 
 jest.mock('@rc-component/trigger', () => {
   const react  = require('react');
-  let Trigger = jest.requireActual('rc-trigger/lib/mock');
+  let Trigger = jest.requireActual('@rc-component/trigger/lib/mock');
   Trigger = Trigger.default || Trigger;
 
   return react.forwardRef((props, ref) => {

diff --git a/tests/__snapshots__/SubMenu.spec.tsx.snap b/tests/__snapshots__/SubMenu.spec.tsx.snap
@@ -81,28 +81,26 @@ HTMLCollection [
           class="rc-menu-submenu-arrow"
         />
       </div>
-      <div>
-        <div
-          class="rc-menu-submenu rc-menu-submenu-popup custom-className"
-          style="opacity: 0;"
+      <div
+        class="rc-menu-submenu rc-menu-submenu-popup custom-className rc-menu-submenu-placement-rightTop"
+        style="--arrow-x: 0px; --arrow-y: 0px; left: -1000vw; top: -1000vh; box-sizing: border-box;"
+      >
+        <ul
+          class="rc-menu rc-menu-sub rc-menu-vertical"
+          data-menu-list="true"
+          id="rc-menu-uuid-test-1-popup"
+          role="menu"
         >
-          <ul
-            class="rc-menu rc-menu-sub rc-menu-vertical"
-            data-menu-list="true"
-            id="rc-menu-uuid-test-1-popup"
-            role="menu"
+          <li
+            aria-selected="false"
+            class="rc-menu-item"
+            data-menu-id="rc-menu-uuid-test-1-1"
+            role="option"
+            tabindex="-1"
           >
-            <li
-              aria-selected="false"
-              class="rc-menu-item"
-              data-menu-id="rc-menu-uuid-test-1-1"
-              role="option"
-              tabindex="-1"
-            >
-              submenu7
-            </li>
-          </ul>
-        </div>
+            submenu7
+          </li>
+        </ul>
       </div>
     </li>
     <li