Skip to content

Commit 4d77a70

Browse files
committed
revert component changes
1 parent b69b59a commit 4d77a70

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

packages/react/collection/src/collection.tsx

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,10 @@ type ItemMap<ItemElement extends HTMLElement, ItemData extends BaseItemData> = O
2727
ItemDataWithElement<ItemData, ItemElement>
2828
>;
2929

30-
function createCollection<ItemElement extends HTMLElement, ItemData extends {} = {}>(name: string) {
31-
type AllItemData = ItemData & BaseItemData;
32-
30+
function createCollection<
31+
ItemElement extends HTMLElement,
32+
ItemData extends BaseItemData = BaseItemData,
33+
>(name: string) {
3334
/* -----------------------------------------------------------------------------------------------
3435
* CollectionProvider
3536
* ---------------------------------------------------------------------------------------------*/
@@ -41,8 +42,8 @@ function createCollection<ItemElement extends HTMLElement, ItemData extends {} =
4142
collectionElement: CollectionElement | null;
4243
collectionRef: React.Ref<CollectionElement | null>;
4344
collectionRefObject: React.RefObject<CollectionElement | null>;
44-
itemMap: ItemMap<ItemElement, AllItemData>;
45-
setItemMap: React.Dispatch<React.SetStateAction<ItemMap<ItemElement, AllItemData>>>;
45+
itemMap: ItemMap<ItemElement, ItemData>;
46+
setItemMap: React.Dispatch<React.SetStateAction<ItemMap<ItemElement, ItemData>>>;
4647
};
4748

4849
const [CollectionContextProvider, useCollectionContext] = createCollectionContext<ContextValue>(
@@ -57,8 +58,8 @@ function createCollection<ItemElement extends HTMLElement, ItemData extends {} =
5758
);
5859

5960
type CollectionState = [
60-
ItemMap: ItemMap<ItemElement, AllItemData>,
61-
SetItemMap: React.Dispatch<React.SetStateAction<ItemMap<ItemElement, AllItemData>>>,
61+
ItemMap: ItemMap<ItemElement, ItemData>,
62+
SetItemMap: React.Dispatch<React.SetStateAction<ItemMap<ItemElement, ItemData>>>,
6263
];
6364

6465
const CollectionProvider: React.FC<{
@@ -168,7 +169,7 @@ function createCollection<ItemElement extends HTMLElement, ItemData extends {} =
168169
const ITEM_SLOT_NAME = name + 'CollectionItemSlot';
169170
const ITEM_DATA_ATTR = 'data-radix-collection-item';
170171

171-
type CollectionItemSlotProps = AllItemData & {
172+
type CollectionItemSlotProps = ItemData & {
172173
children: React.ReactNode;
173174
scope: any;
174175
};
@@ -198,12 +199,12 @@ function createCollection<ItemElement extends HTMLElement, ItemData extends {} =
198199
}
199200

200201
if (!map.has(element)) {
201-
map.set(element, { ...(itemData as unknown as AllItemData), element });
202+
map.set(element, { ...(itemData as unknown as ItemData), element });
202203
return map.toSorted(sortByDocumentPosition);
203204
}
204205

205206
return map
206-
.set(element, { ...(itemData as unknown as AllItemData), element })
207+
.set(element, { ...(itemData as unknown as ItemData), element })
207208
.toSorted(sortByDocumentPosition);
208209
});
209210

@@ -233,7 +234,7 @@ function createCollection<ItemElement extends HTMLElement, ItemData extends {} =
233234
* ---------------------------------------------------------------------------------------------*/
234235

235236
function useInitCollection() {
236-
return React.useState<ItemMap<ItemElement, AllItemData>>(new OrderedDict());
237+
return React.useState<ItemMap<ItemElement, ItemData>>(new OrderedDict());
237238
}
238239

239240
/* -----------------------------------------------------------------------------------------------

packages/react/direction/src/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
'use client';
21
export {
32
useDirection,
43
//

0 commit comments

Comments
 (0)