@rpg-engine/long-bow 0.8.121 → 0.8.123

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpg-engine/long-bow",
-  "version": "0.8.121",
+  "version": "0.8.123",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

package/src/components/Friends/FriendList.tsx

@@ -1,9 +1,11 @@
-import React, { useEffect, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import styled from 'styled-components';
 import { uiColors } from '../../constants/uiColors';
-import { Button, ButtonTypes } from '../Button';
+import { uiFonts } from '../../constants/uiFonts';
+import { InternalTabs } from '../InternalTabs/InternalTabs';
 
 import { ICharacter } from '@rpg-engine/shared';
+import { debounce } from 'lodash';
 import {
   ActionButtons,
   Table,
@@ -12,7 +14,6 @@ import {
   TableRow,
   UserActionLink,
 } from '../Table/Table';
-import { SearchFriend } from './SearchFriend';
 export type IFriend = Pick<ICharacter, 'name' | '_id' | 'isOnline'>;
 interface IFriendListProps {
   scale?: number;
@@ -47,83 +48,189 @@ export const FriendList: React.FC<IFriendListProps> = ({
   onAddFriend,
   onBackFriendList,
 }) => {
-  const [isAddFriendUI, setIsAddFriendUI] = useState(false);
+  const [characterName, setCharacterName] = useState('');
+  const [activeTab, setActiveTab] = useState('friends');
 
   useEffect(() => {
-    if (isAddFriendUI) {
+    if (activeTab === 'search') {
       onAddFriend?.();
     } else {
       onBackFriendList?.();
     }
-  }, [isAddFriendUI]);
+  }, [activeTab]);
 
-  return (
-    <ListWrapper>
-      {isAddFriendUI ? (
-        <SearchFriend
-          searchedCharacters={searchedCharacters}
-          onSendFriendRequest={onSendFriendRequest}
-          onAcceptRequest={onAcceptRequest}
-          onRejectRequest={onRejectRequest}
-          friendRequests={friendRequests}
-          onSearch={onSearch}
-          onBlur={onBlur}
+  const debouncedSearch = useCallback(
+    debounce((name: string) => {
+      onSearch(name);
+    }, 300),
+    []
+  );
+
+  const handleInputChange = (e: React.ChangeEvent<HTMLInputElement>) => {
+    const name = e.target.value;
+    setCharacterName(name);
+    debouncedSearch(name);
+  };
+
+  const handleSubmit = (event: React.SyntheticEvent<HTMLFormElement>) => {
+    event.preventDefault();
+    if (characterName.trim()) {
+      onSearch(characterName);
+    }
+  };
+
+  const friendsTabContent = (
+    <ScrollableArea>
+      <Table>
+        <thead>
+          <TableRow>
+            <TableHeader>Online</TableHeader>
+            <TableHeader>Name</TableHeader>
+            <TableHeader>Actions</TableHeader>
+          </TableRow>
+        </thead>
+        <tbody>
+          {friends.map(friend => (
+            <TableRow key={friend._id}>
+              <TableCell>
+                <IsOnlineBadge $isOnline={friend.isOnline} />
+              </TableCell>
+              <TableCell>{friend.name}</TableCell>
+              <TableCell>
+                <ActionButtons>
+                  <UserActionLink
+                    color={uiColors.white}
+                    onClick={() => onOpenPrivateMessage(friend)}
+                  >
+                    Chat
+                  </UserActionLink>
+                  <UserActionLink
+                    color={uiColors.red}
+                    onClick={() => onRemoveFriend(friend)}
+                  >
+                    Remove
+                  </UserActionLink>
+                </ActionButtons>
+              </TableCell>
+            </TableRow>
+          ))}
+        </tbody>
+      </Table>
+    </ScrollableArea>
+  );
+
+  const searchTabContent = (
+    <ListContainer>
+      <SearchForm onSubmit={handleSubmit}>
+        <SearchInput
+          value={characterName}
+          id="characterName"
+          name="characterName"
+          onChange={handleInputChange}
+          type="text"
+          autoComplete="off"
           onFocus={onFocus}
+          onBlur={onBlur}
+          onPointerDown={onFocus}
+          placeholder="Search for a character..."
         />
-      ) : (
-        <>
-          <ScrollableArea>
-            <Table>
-              <thead>
-                <TableRow>
-                  <TableHeader>Online</TableHeader>
-                  <TableHeader>Name</TableHeader>
-                  <TableHeader>Actions</TableHeader>
-                </TableRow>
-              </thead>
-              <tbody>
-                {friends.map(friend => (
-                  <TableRow key={friend._id}>
-                    <TableCell>
-                      <IsOnlineBadge $isOnline={friend.isOnline} />
-                    </TableCell>
-                    <TableCell>{friend.name}</TableCell>
-                    <TableCell>
-                      <ActionButtons>
-                        <UserActionLink
-                          color={uiColors.white}
-                          onClick={() => onOpenPrivateMessage(friend)}
-                        >
-                          Chat
-                        </UserActionLink>
-                        <UserActionLink
-                          color={uiColors.red}
-                          onClick={() => onRemoveFriend(friend)}
-                        >
-                          Remove
-                        </UserActionLink>
-                      </ActionButtons>
-                    </TableCell>
-                  </TableRow>
-                ))}
-              </tbody>
-            </Table>
-          </ScrollableArea>
-        </>
-      )}
-
-      <ButtonContainer>
-        <Button
-          buttonType={ButtonTypes.RPGUIButton}
-          onClick={() => setIsAddFriendUI(prev => !prev)}
-        >
-          {isAddFriendUI ? 'Back' : 'Add New Friend'}
-        </Button>
-      </ButtonContainer>
+      </SearchForm>
+      <CharacterList
+        characters={searchedCharacters}
+        onAction={onSendFriendRequest}
+        actionLabel="Add Friend"
+      />
+    </ListContainer>
+  );
+
+  const requestsTabContent = (
+    <ListContainer>
+      <FriendRequestSection
+        friendRequests={friendRequests}
+        onAccept={onAcceptRequest}
+        onReject={onRejectRequest}
+      />
+    </ListContainer>
+  );
+
+  const tabs = [
+    { id: 'friends', title: `Friends (${friends.length})`, content: friendsTabContent },
+    { id: 'search', title: 'Search', content: searchTabContent },
+    {
+      id: 'requests',
+      title: `Requests (${friendRequests.length})`,
+      content: requestsTabContent,
+    },
+  ];
+
+  return (
+    <ListWrapper>
+      <InternalTabs
+        tabs={tabs}
+        activeTab={activeTab}
+        onTabChange={setActiveTab}
+        activeTextColor="#000"
+        inactiveColor="#777"
+        borderColor="#f59e0b"
+      />
     </ListWrapper>
   );
 };
 
+const CharacterList: React.FC<{
+  characters: IFriend[];
+  onAction: (character: IFriend) => void;
+  actionLabel: string;
+}> = ({ characters, onAction, actionLabel }) => (
+  <ListContainer>
+    {characters.map(character => (
+      <ListItem key={character._id}>
+        <CharacterName>{character.name}</CharacterName>
+        <UserActionLink
+          color={uiColors.lightGreen}
+          onClick={() => onAction(character)}
+        >
+          {actionLabel}
+        </UserActionLink>
+      </ListItem>
+    ))}
+  </ListContainer>
+);
+
+const FriendRequestSection: React.FC<{
+  friendRequests: IFriend[];
+  onAccept: (character: IFriend) => void;
+  onReject: (character: IFriend) => void;
+}> = ({ friendRequests, onAccept, onReject }) => (
+  <>
+    {friendRequests.length > 0 ? (
+      <ListContainer>
+        {friendRequests.map(character => (
+          <ListItem key={character._id}>
+            <CharacterName>{character.name}</CharacterName>
+            <AcceptRejectActions>
+              <UserActionLink
+                color={uiColors.lightGreen}
+                onClick={() => onAccept(character)}
+              >
+                Accept
+              </UserActionLink>
+              <UserActionLink
+                color={uiColors.red}
+                onClick={() => onReject(character)}
+              >
+                Reject
+              </UserActionLink>
+            </AcceptRejectActions>
+          </ListItem>
+        ))}
+      </ListContainer>
+    ) : (
+      <EmptyMessage>No pending friend requests</EmptyMessage>
+    )}
+  </>
+);
+
 // Styled components for FriendList UI
 const ListWrapper = styled.div`
   margin-top: 1rem;
@@ -134,7 +241,7 @@ const ListWrapper = styled.div`
 
 const ScrollableArea = styled.div`
   overflow-y: auto;
-  max-height: 300px; /* Adjust this value based on your layout */
+  max-height: 300px;
 `;
 
 const IsOnlineBadge = styled.div<{ $isOnline: boolean }>`
@@ -146,10 +253,55 @@ const IsOnlineBadge = styled.div<{ $isOnline: boolean }>`
   margin-right: 1rem;
 `;
 
-const ButtonContainer = styled.div`
+const SearchForm = styled.form`
   display: flex;
-  justify-content: center;
   align-items: center;
   width: 100%;
   margin-top: 1rem;
 `;
+
+const SearchInput = styled.input`
+  width: 100%;
+  background-color: rgba(0, 0, 0, 0.25);
+  border: none;
+  padding: 0.5rem;
+  font-size: ${uiFonts.size.small};
+`;
+
+const ListContainer = styled.ul`
+  list-style: none;
+  padding: 0;
+  margin: 0;
+  width: 100%;
+  max-height: 50vh;
+  overflow-y: auto;
+
+  @media (max-width: 768px) {
+    max-height: 90vh;
+  }
+`;
+
+const ListItem = styled.li`
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  padding: 0.5rem;
+  border-bottom: 1px solid rgba(255, 255, 255, 0.1);
+`;
+
+const CharacterName = styled.p`
+  font-size: ${uiFonts.size.small};
+  margin: 0;
+`;
+
+const AcceptRejectActions = styled.div`
+  display: flex;
+  gap: 0.5rem;
+`;
+
+const EmptyMessage = styled.p`
+  text-align: center;
+  color: #888;
+  padding: 1rem;
+  font-size: ${uiFonts.size.small};
+`;

package/src/components/InternalTabs/InternalTabs.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState } from 'react';
 import styled from 'styled-components';
 import { UI_BREAKPOINT_MOBILE } from '../../constants/uiBreakpoints';
 
@@ -29,7 +29,13 @@ export const InternalTabs: React.FC<TableTabProps> = ({
   onTabChange,
   activeTab: externalActiveTab,
 }) => {
-  const activeTabId = externalActiveTab ?? tabs[0].id;
+  const [internalActiveTab, setInternalActiveTab] = useState(tabs[0]?.id);
+  const activeTabId = externalActiveTab ?? internalActiveTab;
+
+  const handleTabClick = (tabId: string): void => {
+    setInternalActiveTab(tabId);
+    onTabChange?.(tabId);
+  };
 
   return (
     <TableWrapper>
@@ -43,7 +49,7 @@ export const InternalTabs: React.FC<TableTabProps> = ({
             inactiveColor={inactiveColor}
             borderColor={borderColor}
             hoverColor={hoverColor}
-            onClick={() => onTabChange?.(tab.id)}
+            onClick={() => handleTabClick(tab.id)}
           >
             {tab.title}
           </TabButton>