fix(core-components-*): fix undefined refs

core-ds · Dec 8, 2020 · ea5dac0 · ea5dac0
1 parent 75b0e7a
commit ea5dac0
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/packages/fade/src/Component.tsx b/packages/fade/src/Component.tsx
@@ -59,7 +59,11 @@ export const Fade = forwardRef<Element, FadeProps>((props, ref) => {
     } = props;
 
     const nodeRef = React.useRef(null);
-    const foreignRef = useForkRef((children as { ref: React.Ref<typeof children> }).ref, ref);
+    // TODO: заменить на optional chaining
+    const foreignRef = useForkRef(
+        (children && (children as { ref: React.Ref<typeof children> }).ref) || null,
+        ref,
+    );
     const handleRef = useForkRef(nodeRef, foreignRef);
 
     const handleEnter = (node: HTMLElement, isAppearing: boolean) => {
@@ -103,7 +107,7 @@ export const Fade = forwardRef<Element, FadeProps>((props, ref) => {
             onExit={handleExit}
             onExited={handleExited}
         >
-            { (status: string) => (
+            {(status: string) => (
                 <div
                     className={cn(
                         styles.fade,
@@ -120,7 +124,7 @@ export const Fade = forwardRef<Element, FadeProps>((props, ref) => {
                         : children
                     }
                 </div>
-            ) }
+            )}
         </Transition>
     );
 });
diff --git a/packages/portal/src/Component.tsx b/packages/portal/src/Component.tsx
@@ -29,9 +29,14 @@ export type PortalProps = {
 export const Portal = forwardRef<Element, PortalProps>(
     ({ container = null, disablePortal, children }, ref) => {
         const [mountNode, setMountNode] = useState<Element | null>(null);
-        // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
-        // @ts-ignore
-        const handleRef = useForkRef(React.isValidElement(children) ? children.ref : null, ref);
+
+        // TODO: заменить на optional chaining
+        const handleRef = useForkRef(
+            // eslint-disable-next-line @typescript-eslint/ban-ts-ignore
+            // @ts-ignore
+            React.isValidElement(children) ? (children && children.ref) || null : null,
+            ref,
+        );
 
         useEffect(() => {
             if (!disablePortal) {

diff --git a/packages/trap-focus/src/Component.tsx b/packages/trap-focus/src/Component.tsx
@@ -71,8 +71,9 @@ export const TrapFocus: React.FC<TrapFocusProps> = props => {
         rootRef.current = ReactDOM.findDOMNode(instance) as HTMLElement;
     }, []);
 
+    // TODO: заменить на optional chaining
     const handleRef = useForkRef(
-        (children as { ref: React.Ref<typeof children> }).ref,
+        (children && (children as { ref: React.Ref<typeof children> }).ref) || null,
         handleOwnRef,
     );