[TrapFocus] Migrate to unstyled

mui · Feb 16, 2021 · 4ed20ab · 4ed20ab
1 parent cdbc752
commit 4ed20ab
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 14 deletions.
diff --git a/docs/pages/api-docs/unstable-trap-focus.json b/docs/pages/api-docs/unstable-trap-focus.json
@@ -12,7 +12,7 @@
   "name": "Unstable_TrapFocus",
   "styles": { "classes": [], "globalClasses": {}, "name": null },
   "spread": false,
-  "filename": "/packages/material-ui/src/Unstable_TrapFocus/Unstable_TrapFocus.js",
+  "filename": "/packages/material-ui-unstyled/src/Unstable_TrapFocus/Unstable_TrapFocus.js",
   "inheritance": null,
   "demos": "<ul><li><a href=\"/components/trap-focus/\">Trap Focus</a></li></ul>",
   "styledComponent": true,

diff --git a/...nstable_TrapFocus/Unstable_TrapFocus.d.ts → ...nstable_TrapFocus/Unstable_TrapFocus.d.ts b/...nstable_TrapFocus/Unstable_TrapFocus.d.ts → ...nstable_TrapFocus/Unstable_TrapFocus.d.ts
diff --git a/.../Unstable_TrapFocus/Unstable_TrapFocus.js → .../Unstable_TrapFocus/Unstable_TrapFocus.js b/.../Unstable_TrapFocus/Unstable_TrapFocus.js → .../Unstable_TrapFocus/Unstable_TrapFocus.js
@@ -1,9 +1,12 @@
 /* eslint-disable @typescript-eslint/naming-convention, consistent-return, jsx-a11y/no-noninteractive-tabindex */
 import * as React from 'react';
 import PropTypes from 'prop-types';
-import { exactProp, elementAcceptingRef } from '@material-ui/utils';
-import ownerDocument from '../utils/ownerDocument';
-import useForkRef from '../utils/useForkRef';
+import {
+  exactProp,
+  elementAcceptingRef,
+  unstable_useForkRef as useForkRef,
+  unstable_ownerDocument as ownerDocument,
+} from '@material-ui/utils';
 
 // Inspired by https://github.com/focus-trap/tabbable
 const candidatesSelector = [

diff --git a/...able_TrapFocus/Unstable_TrapFocus.test.js → ...able_TrapFocus/Unstable_TrapFocus.test.js b/...able_TrapFocus/Unstable_TrapFocus.test.js → ...able_TrapFocus/Unstable_TrapFocus.test.js
diff --git a/packages/material-ui-unstyled/src/Unstable_TrapFocus/index.d.ts b/packages/material-ui-unstyled/src/Unstable_TrapFocus/index.d.ts
@@ -0,0 +1,2 @@
+export { default } from './Unstable_TrapFocus';
+export * from './Unstable_TrapFocus';
diff --git a/packages/material-ui-unstyled/src/Unstable_TrapFocus/index.js b/packages/material-ui-unstyled/src/Unstable_TrapFocus/index.js
@@ -0,0 +1 @@
+export { default } from './Unstable_TrapFocus';
diff --git a/packages/material-ui-unstyled/src/index.d.ts b/packages/material-ui-unstyled/src/index.d.ts
@@ -7,6 +7,9 @@ export * from './SliderUnstyled';
 export { default as Portal } from './Portal';
 export * from './Portal';
 
+export { default as Unstable_TrapFocus } from './Unstable_TrapFocus';
+export * from './Unstable_TrapFocus';
+
 export { default as generateUtilityClass } from './generateUtilityClass';
 export * from './generateUtilityClass';
 

diff --git a/packages/material-ui-unstyled/src/index.js b/packages/material-ui-unstyled/src/index.js
@@ -6,6 +6,8 @@ export * from './SliderUnstyled';
 
 export { default as Portal } from './Portal';
 
+export { default as Unstable_TrapFocus } from './Unstable_TrapFocus';
+
 export { default as generateUtilityClass } from './generateUtilityClass';
 
 export { default as generateUtilityClasses } from './generateUtilityClasses';

diff --git a/packages/material-ui/src/Unstable_TrapFocus/index.d.ts b/packages/material-ui/src/Unstable_TrapFocus/index.d.ts
@@ -1,2 +1,2 @@
-export { default } from './Unstable_TrapFocus';
-export * from './Unstable_TrapFocus';
+export { default } from '@material-ui/unstyled/Unstable_TrapFocus';
+export * from '@material-ui/unstyled/Unstable_TrapFocus';
diff --git a/packages/material-ui/src/Unstable_TrapFocus/index.js b/packages/material-ui/src/Unstable_TrapFocus/index.js
@@ -1 +1 @@
-export { default } from './Unstable_TrapFocus';
+export { default } from '@material-ui/unstyled/Unstable_TrapFocus';
diff --git a/packages/material-ui/src/index.d.ts b/packages/material-ui/src/index.d.ts
@@ -447,9 +447,6 @@ export * from './Tooltip';
 export { default as Typography } from './Typography';
 export * from './Typography';
 
-export { default as Unstable_TrapFocus } from './Unstable_TrapFocus';
-export * from './Unstable_TrapFocus';
-
 export { default as useMediaQuery } from './useMediaQuery';
 export * from './useMediaQuery';
 

diff --git a/packages/material-ui/src/index.js b/packages/material-ui/src/index.js
@@ -380,9 +380,6 @@ export * from './Tooltip';
 export { default as Typography } from './Typography';
 export * from './Typography';
 
-export { default as Unstable_TrapFocus } from './Unstable_TrapFocus';
-export * from './Unstable_TrapFocus';
-
 export { default as useMediaQuery } from './useMediaQuery';
 export * from './useMediaQuery';
 

diff --git a/test/utils/user-event/index.js b/test/utils/user-event/index.js
@@ -1,6 +1,6 @@
 import { fireEvent, getConfig } from '@testing-library/dom';
 // eslint-disable-next-line no-restricted-imports
-import { defaultGetTabbable as getTabbable } from '@material-ui/core/Unstable_TrapFocus/Unstable_TrapFocus';
+import { defaultGetTabbable as getTabbable } from '@material-ui/core/Unstable_TrapFocus';
 
 // Absolutely NO events fire on label elements that contain their control
 // if that control is disabled. NUTS!