TreeGrid: Convert to TypeScript

packages/components/src/tree-grid/README.md

@@ -10,7 +10,7 @@ This feature is still experimental. “Experimental” means this is an early im
 
 ## Development guidelines
 
-`TreeGrid`, `TreeGridRow`, and `TreeGridCell` are components used to create a tree hierarchy. They're not visually styled components, but instead help with adding keyboard navigation and roving tab index behaviors to tree grid structures.
+`TreeGrid`, `TreeGridRow`, and `TreeGridCell` are components used to create a tree hierarchy. They're not visually styled components, but instead help with adding keyboard navigation and roving tabindex behaviors to tree grid structures.
 
 A tree grid is a hierarchical 2 dimensional UI component, for example it could be used to implement a file system browser.
 
@@ -31,69 +31,36 @@ function TreeMenu() {
 			<TreeGridRow level={ 1 } positionInSet={ 1 } setSize={ 2 }>
 				<TreeGridCell>
 					{ ( props ) => (
-						<Button onClick={ onSelect } { ...props }>
-							Select
-						</Button>
+						<Button onClick={ onSelect } { ...props }>Select</Button>
 					) }
 				</TreeGridCell>
 				<TreeGridCell>
 					{ ( props ) => (
-						<Button onClick={ onMoveUp } { ...props }>
-							Move Up
-						</Button>
-					) }
-				</TreeGridCell>
-				<TreeGridCell>
-					{ ( props ) => (
-						<Button onClick={ onMoveDown } { ...props }>
-							Move Down
-						</Button>
+						<Button onClick={ onMove } { ...props }>Move</Button>
 					) }
 				</TreeGridCell>
 			</TreeGridRow>
 			<TreeGridRow level={ 1 } positionInSet={ 2 } setSize={ 2 }>
 				<TreeGridCell>
 					{ ( props ) => (
-						<Button onClick={ onSelect } { ...props }>
-							Select
-						</Button>
-					) }
-				</TreeGridCell>
-				<TreeGridCell>
-					{ ( props ) => (
-						<Button onClick={ onMoveUp } { ...props }>
-							Move Up
-						</Button>
+						<Button onClick={ onSelect } { ...props }>Select</Button>
 					) }
 				</TreeGridCell>
 				<TreeGridCell>
 					{ ( props ) => (
-						<Button onClick={ onMoveDown } { ...props }>
-							Move Down
-						</Button>
+						<Button onClick={ onMove } { ...props }>Move</Button>
 					) }
 				</TreeGridCell>
 			</TreeGridRow>
 			<TreeGridRow level={ 2 } positionInSet={ 1 } setSize={ 1 }>
 				<TreeGridCell>
 					{ ( props ) => (
-						<Button onClick={ onSelect } { ...props }>
-							Select
-						</Button>
-					) }
-				</TreeGridCell>
-				<TreeGridCell>
-					{ ( props ) => (
-						<Button onClick={ onMoveUp } { ...props }>
-							Move Up
-						</Button>
+						<Button onClick={ onSelect } { ...props }>Select</Button>
 					) }
 				</TreeGridCell>
 				<TreeGridCell>
 					{ ( props ) => (
-						<Button onClick={ onMoveDown } { ...props }>
-							Move Down
-						</Button>
+						<Button onClick={ onMove } { ...props }>Move</Button>
 					) }
 				</TreeGridCell>
 			</TreeGridRow>
@@ -112,7 +79,7 @@ Aside from the documented callback functions, any props specified will be passed
 
 `TreeGrid` should always have children.
 
-###### onFocusRow( event: Event, startRow: HTMLElement, destinationRow: HTMLElement )
+###### onFocusRow( event: KeyboardEvent, startRow: Element, destinationRow: Element )
 
 Callback that fires when focus is shifted from one row to another via the Up and Down keys. Callback is also fired on Home and End keys which move focus from the beginning row to the end row.
 The callback is passed the event, the start row element that the focus was on originally, and
@@ -121,14 +88,14 @@ the destination row element after the focus has moved.
 -   Type: `Function`
 -   Required: No
 
-###### onCollapseRow( row: HTMLElement )
+###### onCollapseRow( row: Element )
 
 A callback that passes in the row element to be collapsed.
 
 -   Type: `Function`
 -   Required: No
 
-###### onExpandRow( row: HTMLElement )
+###### onExpandRow( row: Element )
 
 A callback that passes in the row element to be expanded.
 
@@ -157,7 +124,7 @@ An integer value that represents the position in the set. A set is the count of
 
 ###### setSize
 
-An integer value that represents the total number of items in the set ... that is the total number of items at this specific level of the hierarchy.
+An integer value that represents the total number of items in the set, at this specific level of the hierarchy.
 
 -   Type: `Number`
 -   Required: Yes
@@ -182,14 +149,14 @@ An optional value that designates whether a row is expanded or collapsed. Curren
 ```jsx
 <TreeGridCell>
 	{ ( props ) => (
-		<Button onClick={ onMoveDown } { ...props }>
-			Move Down
+		<Button onClick={ doSomething } { ...props }>
+			Do something
 		</Button>
 	) }
 </TreeGridCell>
 ```
 
-Props passed as an argument to the render prop must be passed to the child focusable component/element within the cell. If a component is used, it must correctly handle the `onFocus`, `tabIndex`, and `ref` props, passing these to the element it renders. These props are used to handle the roving tab index functionality of the tree grid.
+Props passed as an argument to the render prop must be passed to the child focusable component/element within the cell. If a component is used, it must correctly handle the `onFocus`, `tabIndex`, and `ref` props, passing these to the element it renders. These props are used to handle the roving tabindex functionality of the tree grid.
 
 ## Related components
 

packages/components/src/tree-grid/cell.tsx

@@ -0,0 +1,41 @@
+/**
+ * WordPress dependencies
+ */
+import { forwardRef } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import TreeGridItem from './item';
+import type { WordPressComponentProps } from '../ui/context';
+import type { TreeGridCellProps } from './types';
+
+function UnforwardedTreeGridCell(
+	{
+		children,
+		withoutGridItem = false,
+		...props
+	}: WordPressComponentProps< TreeGridCellProps, 'td', false >,
+	ref: React.ForwardedRef< any >
+) {
+	return (
+		<td { ...props } role="gridcell">
+			{ withoutGridItem ? (
+				<>{ children }</>
+			) : (
+				<TreeGridItem ref={ ref }>{ children }</TreeGridItem>
+			) }
+		</td>
+	);
+}
+
+/**
+ * `TreeGridCell` is used to create a tree hierarchy.
+ * It is not a visually styled component, but instead helps with adding
+ * keyboard navigation and roving tab index behaviors to tree grid structures.
+ *
+ * @see {@link https://www.w3.org/TR/wai-aria-practices/examples/treegrid/treegrid-1.html}
+ */
+export const TreeGridCell = forwardRef( UnforwardedTreeGridCell );
+
+export default TreeGridCell;