chore(@clayui/core): Revert "feat(@clayui/core): adds support for fla…

…t items with dynamic content" This reverts commit 19e2816.
liferay · Sep 6, 2021 · f02986c · f02986c
1 parent 7507259
commit f02986c
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 86 deletions.
diff --git a/packages/clay-core/src/tree-view/Collection.tsx b/packages/clay-core/src/tree-view/Collection.tsx
@@ -5,15 +5,13 @@
 
 import React from 'react';
 
-import {useTreeViewContext} from './context';
 import {ItemContextProvider, useItem} from './useItem';
 
 export type ChildrenFunction<T> = (item: T) => React.ReactElement;
 
 export interface ICollectionProps<T> {
 	children: React.ReactNode | ChildrenFunction<T>;
-	items?: Array<T> | Record<string, T>;
-	rootItem?: string;
+	items?: Array<T>;
 }
 
 function getKey(index: number, key?: React.Key | null, parentKey?: React.Key) {
@@ -29,27 +27,14 @@ function getKey(index: number, key?: React.Key | null, parentKey?: React.Key) {
 
 export function Collection<T extends Record<any, any>>({
 	children,
-	items: compoundItems,
-	rootItem,
+	items,
 }: ICollectionProps<T>) {
 	const {key: parentKey} = useItem();
-	const {items: rootItems} = useTreeViewContext();
-
-	const items =
-		typeof compoundItems === 'object' &&
-		!Array.isArray(compoundItems) &&
-		rootItem
-			? [compoundItems[rootItem]]
-			: (compoundItems as Array<T>);
 
 	return (
 		<>
 			{typeof children === 'function' && items
 				? items.map((item, index) => {
-						if (typeof item === 'string') {
-							item = (rootItems as Record<string, T>)[item];
-						}
-
 						const child = children(item);
 
 						const key = getKey(

diff --git a/packages/clay-core/src/tree-view/TreeView.tsx b/packages/clay-core/src/tree-view/TreeView.tsx
@@ -40,7 +40,6 @@ export function TreeView<T>({
 	nestedKey,
 	onExpandedChange,
 	onSelectionChange,
-	rootItem,
 	selectedKeys,
 	showExpanderOnHover = true,
 	...otherProps
@@ -58,7 +57,6 @@ export function TreeView<T>({
 				? (children as ChildrenFunction<Object>)
 				: undefined,
 		expanderIcons,
-		items,
 		nestedKey,
 		showExpanderOnHover,
 		...state,
@@ -74,9 +72,7 @@ export function TreeView<T>({
 			role="tree"
 		>
 			<TreeViewContext.Provider value={context}>
-				<Collection<T> items={items} rootItem={rootItem}>
-					{children}
-				</Collection>
+				<Collection<T> items={items}>{children}</Collection>
 			</TreeViewContext.Provider>
 		</ul>
 	);

diff --git a/packages/clay-core/src/tree-view/context.ts b/packages/clay-core/src/tree-view/context.ts
@@ -5,7 +5,6 @@
 
 import React, {useContext} from 'react';
 
-import type {ICollectionProps} from './Collection';
 import type {ITreeState} from './useTree';
 
 export type Icons = {
@@ -17,7 +16,6 @@ export interface ITreeViewContext extends ITreeState {
 	childrenRoot?: (item: Object) => React.ReactElement;
 	expanderIcons?: Icons;
 	nestedKey?: string;
-	items?: ICollectionProps<unknown>['items'];
 	showExpanderOnHover?: boolean;
 }
 

diff --git a/packages/clay-core/stories/TreeView.stories.tsx b/packages/clay-core/stories/TreeView.stories.tsx
@@ -23,15 +23,6 @@ interface IItem {
 	type?: string;
 }
 
-const TYPES_TO_SYMBOLS = {
-	container: 'container',
-	editable: 'text',
-	'fragment-image': 'picture',
-	'fragment-text': 'h1',
-	paragraph: 'paragraph',
-	row: 'table',
-} as Record<string, string>;
-
 const ITEMS_DRIVE = [
 	{
 		children: [
@@ -291,6 +282,15 @@ storiesOf('Components|ClayTreeView', module)
 		</Provider>
 	))
 	.add('page elements', () => {
+		const TYPES_TO_SYMBOLS = {
+			container: 'container',
+			editable: 'text',
+			'fragment-image': 'picture',
+			'fragment-text': 'h1',
+			paragraph: 'paragraph',
+			row: 'table',
+		} as Record<string, string>;
+
 		const items = [
 			{
 				children: [
@@ -442,56 +442,4 @@ storiesOf('Components|ClayTreeView', module)
 				</TreeView>
 			</Provider>
 		);
-	})
-	.add('flat items', () => (
-		<Provider spritemap={spritemap} theme="cadmin">
-			<TreeView
-				items={{
-					ab7146d1: {
-						children: ['p659d51e', 'q8a7c550'],
-						id: 'ab7146d1',
-						name: 'Grid',
-						type: 'row',
-					},
-					fd5768d1: {
-						children: ['ab7146d1'],
-						id: 'fd5768d1',
-						name: 'Container',
-						type: 'container',
-					},
-					p659d51e: {
-						id: 'p659d51e',
-						name: 'Module',
-					},
-					q8a7c550: {
-						id: 'q8a7c550',
-						name: 'Module',
-					},
-				}}
-				nestedKey="children"
-				rootItem="fd5768d1"
-				showExpanderOnHover={false}
-			>
-				{(item) => (
-					<TreeView.Item>
-						<TreeView.ItemStack>
-							{item.type && (
-								<Icon symbol={TYPES_TO_SYMBOLS[item.type]} />
-							)}
-							{item.name}
-						</TreeView.ItemStack>
-						<TreeView.Group items={item.children}>
-							{(item: any) => (
-								<TreeView.Item>
-									<Icon
-										symbol={TYPES_TO_SYMBOLS[item.type]}
-									/>
-									{item.name}
-								</TreeView.Item>
-							)}
-						</TreeView.Group>
-					</TreeView.Item>
-				)}
-			</TreeView>
-		</Provider>
-	));
+	});