@basic-ui/core 0.0.35 → 0.0.38

package/src/Tabs/Tab.story.tsx

@@ -1,9 +1,10 @@
 import { useState } from 'react';
 import { Tab, TabPanel, TabPanels, Tabs, TabList } from './';
-import { storiesOf } from '@storybook/react';
 import './styles.css';
 
-const stories = storiesOf('Components/Tab', module);
+export default {
+  title: 'components/Tab',
+};
 
 export const ExampleHorizontal = ({ manualActivation = false }) => {
   const [index, setIndex] = useState(0);
@@ -67,12 +68,12 @@ export const ExampleVertical = ({ manualActivation = false }) => {
   );
 };
 
-stories.add('horizontal, controlled', () => <ExampleHorizontal />);
-stories.add('horizontal, controlled, manual activation', () => (
+export const HorizontalControlled = () => <ExampleHorizontal />;
+export const HorizontalControlledManualActivation = () => (
   <ExampleHorizontal manualActivation={true} />
-));
+);
 
-stories.add('vertical, controlled', () => <ExampleVertical />);
-stories.add('vertical, controlled, manual activation', () => (
+export const VerticalControlled = () => <ExampleVertical />;
+export const VerticalControlledManualActivation = () => (
   <ExampleVertical manualActivation={true} />
-));
+);

package/src/Tabs/TabList.tsx

@@ -1,7 +1,14 @@
-import { forwardRef, useRef, useEffect, Children, cloneElement } from 'react';
+import {
+  forwardRef,
+  useRef,
+  useEffect,
+  Children,
+  cloneElement,
+  useId,
+} from 'react';
 import type * as React from 'react';
 import { TabListProvider, useTabsContext } from './context';
-import { useScope, useId } from '../hooks';
+import { useScope } from '../hooks';
 import { assignMultipleRefs } from '../utils';
 
 export interface TabListProps extends React.HTMLAttributes<HTMLDivElement> {

package/src/Tooltip/Tooltip.story.tsx

@@ -1,10 +1,13 @@
 import React, { useRef, forwardRef } from 'react';
 import { Tooltip } from './';
-import { storiesOf } from '@storybook/react';
 import { Popper } from '../Popper/Popper';
 import { InjectedTooltipProps } from './useTooltip';
 import './styles.css';
 
+export default {
+  title: 'components/Tooltip',
+};
+
 const StyledTooltip = forwardRef<HTMLDivElement, InjectedTooltipProps>(
   ({ children, anchorEl, ...props }, ref) => {
     return (
@@ -53,7 +56,5 @@ const ExampleWithHidingButton = () => {
   );
 };
 
-const stories = storiesOf('Components/Tooltip', module);
-
-stories.add('controlled', () => <Example />);
-stories.add('with hiding button', () => <ExampleWithHidingButton />);
+export const Controlled = () => <Example />;
+export const WithHidingButton = () => <ExampleWithHidingButton />;

package/src/Tooltip/useTooltip.ts

@@ -1,7 +1,6 @@
-import React, { useRef, RefAttributes, useEffect, useState } from 'react';
+import { useRef, RefAttributes, useEffect, useState, useId } from 'react';
 import { assignMultipleRefs } from '../utils/assignRef';
 import { wrapEvent } from '../utils/wrapEvent';
-import { useId } from '../hooks/useId';
 import {
   send,
   state,
@@ -43,7 +42,7 @@ export function useTooltip(
   } = childProps;
   const anchorEl = useRef<HTMLElement>(null);
   const [visible, setVisible] = useState(false);
-  const id = useId('');
+  const id = useId();
 
   useEffect(() => {
     subscription.subscribe(() => {

package/src/hooks/index.ts

@@ -3,7 +3,6 @@ export * from './useControlledState';
 export * from './useChildrenCounter';
 export * from './useFocusReturn';
 export * from './useFocusState';
-export * from './useId';
 export * from './useOnClickOutside';
 export * from './useOnKeyDown';
 export * from './useReducerMachine';

package/src/hooks/useAutoFocus.ts

@@ -1,4 +1,5 @@
 import { useEffect } from 'react';
+import { focusOnChildNode } from '../FocusLock/tabUtils';
 
 export function useAutoFocus(
   open: boolean,
@@ -6,7 +7,13 @@ export function useAutoFocus(
 ) {
   useEffect(() => {
     if (open) {
-      elementRef.current && elementRef.current.focus();
+      // We will only autoFocus on the first child if the currently active element isn't already trapped inside the modal
+      if (
+        elementRef.current &&
+        !elementRef.current.contains(document.activeElement)
+      ) {
+        focusOnChildNode(elementRef.current, 0);
+      }
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [open]);

package/src/hooks/useFocusReturn.ts

@@ -1,23 +1,42 @@
-import { useEffect, useRef } from 'react';
+import { MutableRefObject, useEffect, useRef } from 'react';
 
-export function useFocusReturn(open: boolean) {
-  const previousFocusRef = useRef<Element | null>(null);
+export function useFocusReturn(
+  open: boolean,
+  rootEl: MutableRefObject<HTMLElement | null>
+) {
+  const previousFocusRef = useRef<HTMLElement | null>(
+    (() => {
+      if (
+        open &&
+        typeof document !== 'undefined' &&
+        document.activeElement instanceof HTMLElement
+      ) {
+        return document.activeElement;
+      }
+      return null;
+    })()
+  );
 
   useEffect(() => {
     if (open) {
       // once opened, keep track of the element that triggered
       // the Modal opening
-      previousFocusRef.current = document.activeElement;
-    }
+      if (
+        !previousFocusRef.current &&
+        document.activeElement instanceof HTMLElement &&
+        !rootEl.current?.contains(document.activeElement)
+      ) {
+        previousFocusRef.current = document.activeElement;
+      }
 
-    return () => {
-      // on unmount, return focus to that element
-      const previousFocus = previousFocusRef.current;
-      requestAnimationFrame(() => {
-        if (previousFocus) {
-          (previousFocus as HTMLElement).focus();
+      const rootElement = rootEl.current;
+      const previousElement = previousFocusRef.current;
+      return () => {
+        // on unmount, return focus to that element
+        if (previousElement && !rootElement?.contains(document.activeElement)) {
+          previousElement.focus({ preventScroll: true });
         }
-      });
-    };
-  }, [open]);
+      };
+    }
+  }, [open, rootEl]);
 }

package/src/hooks/useRemoveBodyScroll.ts

@@ -1,37 +1,29 @@
 import { useEffect } from 'react';
 
+let scrollBodyCount = 0;
 export function useRemoveBodyScroll(open: boolean) {
   useEffect(() => {
     if (open) {
-      const locksCount = ((window as any).__SCROLL_BODY_COUNT__ || 0) + 1;
+      scrollBodyCount += 1;
 
       // calculate scrollbar width if mounting the first scroll lock
       let scrollBarWidth = 0;
-      if (locksCount === 1) {
+      if (scrollBodyCount === 1) {
         scrollBarWidth = window.innerWidth - document.body.clientWidth;
       }
 
       document.body.style.overflow = 'hidden';
       if (scrollBarWidth > 0) {
-        document.body.style.paddingRight = `${scrollBarWidth}px`;
+        document.body.style.marginRight = `${scrollBarWidth}px`;
       }
 
-      // save current lock count in global object
-      (window as any).__SCROLL_BODY_COUNT__ = locksCount;
-    }
-
-    return () => {
-      if (open) {
-        const locksCount = (window as any).__SCROLL_BODY_COUNT__ - 1;
-
-        if (locksCount === 0) {
+      return () => {
+        scrollBodyCount -= 1;
+        if (scrollBodyCount === 0) {
           document.body.style.overflow = '';
-          document.body.style.paddingRight = '';
+          document.body.style.marginRight = '';
         }
-
-        // save current lock count in global object
-        (window as any).__SCROLL_BODY_COUNT__ = locksCount;
-      }
-    };
+      };
+    }
   }, [open]);
 }

package/src/hooks/useId.ts

@@ -1,18 +0,0 @@
-import { useEffect, useState } from 'react';
-
-// Could use UUID but if we hit 9,007,199,254,740,991 unique components over
-// the lifetime of the app before it gets reloaded, I mean ... come on.
-// I don't even know what xillion that is.
-// /me googles
-// Oh duh, quadrillion. Nine quadrillion components. I think we're okay.
-let id = 0;
-const genId = () => `${++id}`;
-
-export function useId(): string | undefined;
-export function useId(preferredId: string): string;
-export function useId(preferredId: string | undefined): string | undefined;
-export function useId(preferredId?: string): string | undefined {
-  const [id, setId] = useState<string | undefined>(preferredId);
-  useEffect(() => setId(genId()), []);
-  return id;
-}