chore(react-tree): removes BaseTreeItem premature generalization (#26302

)
microsoft · Jan 12, 2023 · ca4ddc8 · ca4ddc8
1 parent e3377c2
commit ca4ddc8
Show file tree

Hide file tree

Showing 13 changed files with 86 additions and 265 deletions.
diff --git a/packages/react-components/react-tree/etc/react-tree.api.md b/packages/react-components/react-tree/etc/react-tree.api.md
@@ -17,29 +17,6 @@ import * as React_2 from 'react';
 import type { Slot } from '@fluentui/react-utilities';
 import type { SlotClassNames } from '@fluentui/react-utilities';
 
-// @public
-export const BaseTreeItem: ForwardRefComponent<BaseTreeItemProps>;
-
-// @public (undocumented)
-export const baseTreeItemClassNames: SlotClassNames<BaseTreeItemSlots>;
-
-// @public
-export type BaseTreeItemProps = ComponentProps<BaseTreeItemSlots>;
-
-// @public (undocumented)
-export type BaseTreeItemSlots = {
-    root: Slot<'div'>;
-};
-
-// @public
-export type BaseTreeItemState = ComponentState<BaseTreeItemSlots> & {
-    open: boolean;
-    isLeaf: boolean;
-};
-
-// @public
-export const renderBaseTreeItem_unstable: (state: BaseTreeItemState) => JSX.Element;
-
 // @public (undocumented)
 export const renderTree_unstable: (state: TreeState, contextValues: TreeContextValues) => JSX.Element;
 
@@ -70,10 +47,11 @@ export const TreeItem: ForwardRefComponent<TreeItemProps>;
 export const treeItemClassNames: SlotClassNames<TreeItemSlots>;
 
 // @public
-export type TreeItemProps = ComponentProps<Partial<TreeItemSlots>> & BaseTreeItemProps;
+export type TreeItemProps = ComponentProps<Partial<TreeItemSlots>>;
 
 // @public (undocumented)
-export type TreeItemSlots = BaseTreeItemSlots & {
+export type TreeItemSlots = {
+    root: Slot<'div'>;
     expandIcon?: Slot<'span'>;
     iconBefore?: Slot<'span'>;
     iconAfter?: Slot<'span'>;
@@ -83,7 +61,9 @@ export type TreeItemSlots = BaseTreeItemSlots & {
 };
 
 // @public
-export type TreeItemState = ComponentState<TreeItemSlots> & BaseTreeItemState & {
+export type TreeItemState = ComponentState<TreeItemSlots> & {
+    open: boolean;
+    isLeaf: boolean;
     keepActionsOpen: boolean;
 };
 
@@ -109,12 +89,6 @@ export type TreeState = ComponentState<TreeSlots> & TreeContextValue & {
     open: boolean;
 };
 
-// @public
-export const useBaseTreeItem_unstable: (props: BaseTreeItemProps, ref: React_2.Ref<HTMLDivElement>) => BaseTreeItemState;
-
-// @public
-export const useBaseTreeItemStyles_unstable: (state: BaseTreeItemState) => BaseTreeItemState;
-
 // @public
 export const useTree_unstable: (props: TreeProps, ref: React_2.Ref<HTMLElement>) => TreeState;
 

diff --git a/packages/react-components/react-tree/src/BaseTreeItem.ts b/packages/react-components/react-tree/src/BaseTreeItem.ts
diff --git a/packages/react-components/react-tree/src/components/BaseTreeItem/BaseTreeItem.test.tsx b/packages/react-components/react-tree/src/components/BaseTreeItem/BaseTreeItem.test.tsx
diff --git a/packages/react-components/react-tree/src/components/BaseTreeItem/BaseTreeItem.tsx b/packages/react-components/react-tree/src/components/BaseTreeItem/BaseTreeItem.tsx
diff --git a/packages/react-components/react-tree/src/components/BaseTreeItem/BaseTreeItem.types.ts b/packages/react-components/react-tree/src/components/BaseTreeItem/BaseTreeItem.types.ts
diff --git a/...omponents/react-tree/src/components/BaseTreeItem/__snapshots__/BaseTreeItem.test.tsx.snap b/...omponents/react-tree/src/components/BaseTreeItem/__snapshots__/BaseTreeItem.test.tsx.snap
diff --git a/packages/react-components/react-tree/src/components/BaseTreeItem/index.ts b/packages/react-components/react-tree/src/components/BaseTreeItem/index.ts
diff --git a/packages/react-components/react-tree/src/components/BaseTreeItem/renderBaseTreeItem.tsx b/packages/react-components/react-tree/src/components/BaseTreeItem/renderBaseTreeItem.tsx
diff --git a/packages/react-components/react-tree/src/components/BaseTreeItem/useBaseTreeItem.ts b/packages/react-components/react-tree/src/components/BaseTreeItem/useBaseTreeItem.ts
diff --git a/packages/react-components/react-tree/src/components/BaseTreeItem/useBaseTreeItemStyles.ts b/packages/react-components/react-tree/src/components/BaseTreeItem/useBaseTreeItemStyles.ts
diff --git a/packages/react-components/react-tree/src/components/TreeItem/TreeItem.types.ts b/packages/react-components/react-tree/src/components/TreeItem/TreeItem.types.ts
@@ -1,7 +1,7 @@
 import type { ComponentProps, ComponentState, Slot } from '@fluentui/react-utilities';
-import { BaseTreeItemProps, BaseTreeItemSlots, BaseTreeItemState } from '../BaseTreeItem/index';
 
-export type TreeItemSlots = BaseTreeItemSlots & {
+export type TreeItemSlots = {
+  root: Slot<'div'>;
   /**
    * Expand icon slot,
    * by default renders a chevron icon to indicate opening and closing
@@ -30,15 +30,16 @@ export type TreeItemSlots = BaseTreeItemSlots & {
 /**
  * TreeItem Props
  */
-export type TreeItemProps = ComponentProps<Partial<TreeItemSlots>> & BaseTreeItemProps;
+export type TreeItemProps = ComponentProps<Partial<TreeItemSlots>>;
 
 /**
  * State used in rendering TreeItem
  */
-export type TreeItemState = ComponentState<TreeItemSlots> &
-  BaseTreeItemState & {
-    /**
-     * boolean indicating that actions should remain open due to focus on some portal
-     */
-    keepActionsOpen: boolean;
-  };
+export type TreeItemState = ComponentState<TreeItemSlots> & {
+  open: boolean;
+  isLeaf: boolean;
+  /**
+   * boolean indicating that actions should remain open due to focus on some portal
+   */
+  keepActionsOpen: boolean;
+};