chore(react-aria): restructure folder organization (#24884)

microsoft · Sep 21, 2022 · ce5f1ec · ce5f1ec
1 parent 5ede3c8
commit ce5f1ec
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 7 deletions.
diff --git a/change/@fluentui-react-aria-01c1906f-a6a1-431d-b4a2-e8f0310c26eb.json b/change/@fluentui-react-aria-01c1906f-a6a1-431d-b4a2-e8f0310c26eb.json
@@ -0,0 +1,7 @@
+{
+  "type": "none",
+  "comment": "chore: restructure folder organization",
+  "packageName": "@fluentui/react-aria",
+  "email": "[email protected]",
+  "dependentChangeType": "none"
+}
diff --git a/...act-aria/src/hooks/useARIAButton/index.ts → ...components/react-aria/src/button/index.ts b/...act-aria/src/hooks/useARIAButton/index.ts → ...components/react-aria/src/button/index.ts
diff --git a/...act-aria/src/hooks/useARIAButton/types.ts → ...components/react-aria/src/button/types.ts b/...act-aria/src/hooks/useARIAButton/types.ts → ...components/react-aria/src/button/types.ts
diff --git a/...s/useARIAButton/useARIAButton.stories.tsx → ...aria/src/button/useARIAButton.stories.tsx b/...s/useARIAButton/useARIAButton.stories.tsx → ...aria/src/button/useARIAButton.stories.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { useARIAButtonShorthand } from '../useARIAButton';
-import type { ARIAButtonSlotProps } from '../useARIAButton';
+import { useARIAButtonShorthand } from '../button';
+import type { ARIAButtonSlotProps } from '../button';
 import { getSlots } from '@fluentui/react-components';
 import type { ComponentState, Slot } from '@fluentui/react-components';
 

diff --git a/...useARIAButton/useARIAButtonProps.test.tsx → ...ia/src/button/useARIAButtonProps.test.tsx b/...useARIAButton/useARIAButtonProps.test.tsx → ...ia/src/button/useARIAButtonProps.test.tsx
diff --git a/...hooks/useARIAButton/useARIAButtonProps.ts → ...act-aria/src/button/useARIAButtonProps.ts b/...hooks/useARIAButton/useARIAButtonProps.ts → ...act-aria/src/button/useARIAButtonProps.ts
diff --git a/...RIAButton/useARIAButtonShorthand.test.tsx → ...rc/button/useARIAButtonShorthand.test.tsx b/...RIAButton/useARIAButtonShorthand.test.tsx → ...rc/button/useARIAButtonShorthand.test.tsx
@@ -6,18 +6,18 @@ describe('useARIAButtonShorthands', () => {
     const {
       result: { current: buttonShorthand },
     } = renderHook(() => useARIAButtonShorthand({ as: 'button' }));
-    expect(buttonShorthand.as).toBe('button');
+    expect(buttonShorthand?.as).toBe('button');
     const {
       result: { current: buttonShorthand2 },
     } = renderHook(() => useARIAButtonShorthand({ as: undefined }));
     expect(buttonShorthand2.as).toBe(undefined);
     const {
       result: { current: anchorShorthand },
     } = renderHook(() => useARIAButtonShorthand({ as: 'a' }));
-    expect(anchorShorthand.as).toBe('a');
+    expect(anchorShorthand?.as).toBe('a');
     const {
       result: { current: divShorthand },
     } = renderHook(() => useARIAButtonShorthand({ as: 'div' }));
-    expect(divShorthand.as).toBe('div');
+    expect(divShorthand?.as).toBe('div');
   });
 });
diff --git a/...s/useARIAButton/useARIAButtonShorthand.ts → ...aria/src/button/useARIAButtonShorthand.ts b/...s/useARIAButton/useARIAButtonShorthand.ts → ...aria/src/button/useARIAButtonShorthand.ts
diff --git a/packages/react-components/react-aria/src/index.ts b/packages/react-components/react-aria/src/index.ts
@@ -1,9 +1,9 @@
-export { useARIAButtonShorthand, useARIAButtonProps } from './hooks/useARIAButton/index';
+export { useARIAButtonShorthand, useARIAButtonProps } from './button/index';
 export type {
   ARIAButtonSlotProps,
   ARIAButtonProps,
   ARIAButtonResultProps,
   ARIAButtonType,
   ARIAButtonElement,
   ARIAButtonElementIntersection,
-} from './hooks/useARIAButton/index';
+} from './button/index';