PR suggestions

ling1726 · ling1726 · commit aae1997c3aa4 · 2021-05-18T08:39:59.000+02:00
diff --git a/packages/react-popover/src/components/Popover/usePopover.ts b/packages/react-popover/src/components/Popover/usePopover.ts
@@ -36,7 +36,7 @@ export const usePopover = (props: PopoverProps, defaultProps?: PopoverProps): Po
 
   const { targetDocument } = useFluent();
   useOnClickOutside({
-    contains: (parent, target) => elementContains(parent, target),
+    contains: elementContains,
     element: targetDocument,
     callback: ev => state.setOpen(ev, false),
     refs: [state.triggerRef, state.contentRef],
diff --git a/packages/react-portal/README.md b/packages/react-portal/README.md
@@ -132,13 +132,12 @@ DOM output:
 <body>
   <div>
     {/* Virtual parent for outer portal*/}
-    <span aria-hidden>
-      {/* Virtual parent for inner portal*/}
-      <span aria-hidden />
-    </span>
+    <span aria-hidden></span>
   </div>
 
   <div id="portal-1" class="theme-provider-0">
+    {/* Virtual parent for inner portal*/}
+    <span aria-hidden />
     {children}
   </div>
   <div id="portal-2" class="theme-provider-0">
diff --git a/packages/react-portal/Spec.md b/packages/react-portal/Spec.md
@@ -208,13 +208,12 @@ DOM output:
 <body>
   <div>
     {/* Virtual parent for outer portal*/}
-    <span aria-hidden>
-      {/* Virtual parent for inner portal*/}
-      <span aria-hidden />
-    </span>
+    <span aria-hidden></span>
   </div>
 
   <div id="portal-1" class="theme-provider-0">
+    {/* Virtual parent for inner portal*/}
+    <span aria-hidden />
     {children}
   </div>
   <div id="portal-2" class="theme-provider-0">
diff --git a/packages/react-portal/src/components/Portal/Portal-node.test.tsx b/packages/react-portal/src/components/Portal/Portal-node.test.tsx
@@ -19,7 +19,7 @@ describe('Portal (node)', () => {
 
     expect(component.toJSON()).toMatchInlineSnapshot(`
       <span
-        aria-hidden={true}
+        hidden={true}
       />
     `);
   });
diff --git a/packages/react-portal/src/components/Portal/renderPortal.tsx b/packages/react-portal/src/components/Portal/renderPortal.tsx
@@ -7,7 +7,7 @@ import { PortalState } from './Portal.types';
  */
 export const renderPortal = (state: PortalState): React.ReactElement => {
   return (
-    <span aria-hidden ref={state.virtualParentRootRef}>
+    <span hidden ref={state.virtualParentRootRef}>
       {state.shouldRender && state.mountNode && ReactDOM.createPortal(state.children, state.mountNode)}
     </span>
   );
diff --git a/packages/react-portal/src/virtualParent/getParent.ts b/packages/react-portal/src/virtualParent/getParent.ts
@@ -2,12 +2,8 @@ import { getVirtualParent } from './getVirtualParent';
 
 /**
  * Gets the element which is the parent of a given element.
- * If `allowVirtuaParents` is `true`, this method prefers the virtual parent over
- * real DOM parent when present.
+ * This method prefers the virtual parent over real DOM parent when present.
  */
-export function getParent(child: HTMLElement, allowVirtualParents: boolean = true): HTMLElement | null {
-  return (
-    child &&
-    ((allowVirtualParents && getVirtualParent(child)) || (child.parentNode && (child.parentNode as HTMLElement)))
-  );
+export function getParent(child: HTMLElement | null): HTMLElement | null {
+  return (child && getVirtualParent(child)) || (child?.parentNode as HTMLElement | null);
 }
diff --git a/packages/react-portal/src/virtualParent/getVirtualParent.ts b/packages/react-portal/src/virtualParent/getVirtualParent.ts
@@ -4,7 +4,7 @@ import { isVirtualElement } from './isVirtualElement';
  */
 export function getVirtualParent(child: HTMLElement): HTMLElement | undefined {
   let parent: HTMLElement | undefined;
-  if (child && isVirtualElement(child)) {
+  if (isVirtualElement(child)) {
     parent = child._virtual.parent;
   }
   return parent;
diff --git a/packages/react-portal/src/virtualParent/index.ts b/packages/react-portal/src/virtualParent/index.ts
@@ -1,5 +1,5 @@
 export * from './elementContains';
-export * from './setVirtualParent';
-export * from './isVirtualElement';
 export * from './getParent';
 export * from './getVirtualParent';
+export * from './isVirtualElement';
+export * from './setVirtualParent';
diff --git a/packages/react-portal/src/virtualParent/setVirtualParent.ts b/packages/react-portal/src/virtualParent/setVirtualParent.ts
@@ -12,11 +12,10 @@ export function setVirtualParent(child: HTMLElement, parent?: HTMLElement): void
   }
 
   const virtualChild = <VirtualElement>child;
-  const virtualParent = <VirtualElement | null>parent;
 
   if (!virtualChild._virtual) {
     virtualChild._virtual = {};
   }
 
-  virtualChild._virtual.parent = virtualParent || undefined;
+  virtualChild._virtual.parent = parent || undefined;
 }
diff --git a/packages/react-portal/src/virtualParent/types.ts b/packages/react-portal/src/virtualParent/types.ts
@@ -1,5 +1,5 @@
 export interface VirtualElement extends HTMLElement {
   _virtual: {
-    parent?: VirtualElement;
+    parent?: HTMLElement;
   };
 }
diff --git a/packages/react-tooltip/src/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap b/packages/react-tooltip/src/components/Tooltip/__snapshots__/Tooltip.test.tsx.snap
@@ -8,7 +8,7 @@ exports[`Tooltip renders a description tooltip content always 1`] = `
       data-testid="the-target"
     />
     <span
-      aria-hidden="true"
+      hidden=""
     />
   </div>
   <div
@@ -49,7 +49,7 @@ exports[`Tooltip renders the content of a nontrivial tooltip 1`] = `
       data-testid="the-target"
     />
     <span
-      aria-hidden="true"
+      hidden=""
     />
   </div>
   <div

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import { isVirtualElement } from './isVirtualElement';`
`4`	`4`	`*/`
`5`	`5`	`export function getVirtualParent(child: HTMLElement): HTMLElement \| undefined {`
`6`	`6`	`let parent: HTMLElement \| undefined;`
`7`		`- if (child && isVirtualElement(child)) {`
	`7`	`+ if (isVirtualElement(child)) {`
`8`	`8`	`parent = child._virtual.parent;`
`9`	`9`	`}`
`10`	`10`	`return parent;`
Original file line number	Diff line number	Diff line change
`@@ -12,11 +12,10 @@ export function setVirtualParent(child: HTMLElement, parent?: HTMLElement): void`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`const virtualChild = <VirtualElement>child;`
`15`		`- const virtualParent = <VirtualElement \| null>parent;`
`16`	`15`
`17`	`16`	`if (!virtualChild._virtual) {`
`18`	`17`	`virtualChild._virtual = {};`
`19`	`18`	`}`
`20`	`19`
`21`		`- virtualChild._virtual.parent = virtualParent \|\| undefined;`
	`20`	`+ virtualChild._virtual.parent = parent \|\| undefined;`
`22`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`export interface VirtualElement extends HTMLElement {`
`2`	`2`	`_virtual: {`
`3`		`- parent?: VirtualElement;`
	`3`	`+ parent?: HTMLElement;`
`4`	`4`	`};`
`5`	`5`	`}`