@rpg-engine/long-bow 0.7.32 → 0.7.34

package/dist/stories/Features/chat/Chat.stories.d.ts

@@ -1,5 +1,5 @@
-import { IChatMessage } from '@rpg-engine/shared';
+import { ILocalChatMessage } from '@rpg-engine/shared';
 import { Meta } from '@storybook/react';
 declare const meta: Meta;
 export default meta;
-export declare const Default: import("@storybook/csf").AnnotatedStoryFn<import("@storybook/react").ReactFramework, IChatMessage>;
+export declare const Default: import("@storybook/csf").AnnotatedStoryFn<import("@storybook/react").ReactFramework, ILocalChatMessage>;

package/dist/stories/Features/chat/ChatDeprecated.stories.d.ts

@@ -1,5 +1,5 @@
-import { IChatMessage } from '@rpg-engine/shared';
+import { ILocalChatMessage } from '@rpg-engine/shared';
 import { Meta } from '@storybook/react';
 declare const meta: Meta;
 export default meta;
-export declare const Default: import("@storybook/csf").AnnotatedStoryFn<import("@storybook/react").ReactFramework, IChatMessage>;
+export declare const Default: import("@storybook/csf").AnnotatedStoryFn<import("@storybook/react").ReactFramework, ILocalChatMessage[]>;

package/dist/stories/Features/chat/ChatRevamp.stories.d.ts

@@ -3,6 +3,7 @@ import { IChatRevampProps } from '../../../components/ChatRevamp/types';
 declare const meta: Meta;
 export default meta;
 export declare const Default: import("@storybook/csf").AnnotatedStoryFn<import("@storybook/react").ReactFramework, IChatRevampProps>;
+export declare const Global: import("@storybook/csf").AnnotatedStoryFn<import("@storybook/react").ReactFramework, IChatRevampProps>;
 export declare const Private: import("@storybook/csf").AnnotatedStoryFn<import("@storybook/react").ReactFramework, IChatRevampProps>;
 export declare const Trade: import("@storybook/csf").AnnotatedStoryFn<import("@storybook/react").ReactFramework, IChatRevampProps>;
 export declare const Guild: import("@storybook/csf").AnnotatedStoryFn<import("@storybook/react").ReactFramework, IChatRevampProps>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpg-engine/long-bow",
-  "version": "0.7.32",
+  "version": "0.7.34",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -84,7 +84,7 @@
   "dependencies": {
     "@capacitor/core": "^6.1.0",
     "@rollup/plugin-image": "^2.1.1",
-    "@rpg-engine/shared": "^0.9.65",
+    "@rpg-engine/shared": "^0.9.74",
     "dayjs": "^1.11.2",
     "font-awesome": "^4.7.0",
     "fs-extra": "^10.1.0",

package/src/components/ChatRevamp/ChatContent.tsx

@@ -7,9 +7,11 @@ import { ChatMessage, PrivateChatCharacter } from './types';
 interface ChatContentProps {
   isPrivate: boolean;
   isTrade: boolean;
+  isGlobal: boolean;
   searchCharacterUI: boolean;
   chatMessages: ChatMessage[];
   onSendGlobalChatMessage: (message: string) => void;
+  onSendLocalChatMessage: (message: string) => void;
   onSendPrivateChatMessage: (message: string) => void;
   onSendTradeMessage: (message: string) => void;
   onCloseButton: () => void;
@@ -29,8 +31,10 @@ interface ChatContentProps {
 export const ChatContent: React.FC<ChatContentProps> = ({
   isPrivate,
   isTrade,
+  isGlobal,
   searchCharacterUI,
   chatMessages,
+  onSendLocalChatMessage,
   onSendGlobalChatMessage,
   onSendPrivateChatMessage,
   onSendTradeMessage,
@@ -58,8 +62,10 @@ export const ChatContent: React.FC<ChatContentProps> = ({
       onSendTradeMessage(message);
     } else if (isGuild) {
       onSendGuildChatMessage(message);
-    } else {
+    } else if (isGlobal) {
       onSendGlobalChatMessage(message);
+    } else {
+      onSendLocalChatMessage(message);
     }
   };
 

package/src/components/ChatRevamp/ChatRevamp.tsx

@@ -8,7 +8,7 @@ import { ExpandButton } from './ExpandButton';
 import { RecentChats } from './RecentChats';
 import { IChatRevampProps } from './types';
 
-export const ChatRevamp: React.FC<IChatRevampProps> = ({
+export const ChatRevamp = ({
   chatMessages,
   onSendGlobalChatMessage,
   onSendGuildChatMessage, // Add this new prop
@@ -34,11 +34,12 @@ export const ChatRevamp: React.FC<IChatRevampProps> = ({
   showSearchCharacterUI,
   minimizedByDefault = false,
   autoCloseOnSend,
-}) => {
+  onSendLocalChatMessage,
+}: IChatRevampProps) => {
   const isPrivate = activeTab === 'private';
   const isTrade = activeTab === 'trade';
   const isGuild = activeTab === 'guild';
-
+  const isGlobal = activeTab === 'global';
   const chatHook = useChat({
     minimizedByDefault,
     isPrivate,
@@ -91,12 +92,14 @@ export const ChatRevamp: React.FC<IChatRevampProps> = ({
                 isPrivate={isPrivate}
                 isTrade={isTrade}
                 isGuild={isGuild}
+                isGlobal={isGlobal}
                 searchCharacterUI={searchCharacterUI}
                 chatMessages={chatMessages}
                 onSendGlobalChatMessage={onSendGlobalChatMessage}
                 onSendPrivateChatMessage={onSendPrivateChatMessage}
                 onSendTradeMessage={onSendTradeMessage}
                 onSendGuildChatMessage={onSendGuildChatMessage}
+                onSendLocalChatMessage={onSendLocalChatMessage}
                 onCloseButton={onCloseButton}
                 styles={styles}
                 onFocus={onFocus}
@@ -114,7 +117,7 @@ export const ChatRevamp: React.FC<IChatRevampProps> = ({
           <CollapsedChatInput>
             <Chat
               chatMessages={[]}
-              onSendChatMessage={onSendGlobalChatMessage}
+              onSendChatMessage={onSendLocalChatMessage}
               sendMessage={true}
               onCloseButton={onCloseButton}
               styles={styles}

package/src/components/ChatRevamp/types.ts

@@ -1,6 +1,7 @@
 import {
   ICharacter,
-  IChatMessage,
+  IGlobalChatMessage,
+  ILocalChatMessage,
   IPrivateChatMessage,
   ITradeChatMessage,
 } from '@rpg-engine/shared';
@@ -9,9 +10,10 @@ import { IStyles } from '../Chat/Chat';
 export type PrivateChatCharacter = Pick<ICharacter, '_id' | 'name'>;
 
 export type ChatMessage =
-  | IChatMessage
+  | ILocalChatMessage
   | IPrivateChatMessage
-  | ITradeChatMessage;
+  | ITradeChatMessage
+  | IGlobalChatMessage;
 
 export interface IChatRevampProps {
   chatMessages: ChatMessage[];
@@ -40,4 +42,5 @@ export interface IChatRevampProps {
   autoCloseOnSend?: boolean;
   onSendGuildChatMessage: (message: string) => void;
   isInGuild: boolean;
+  onSendLocalChatMessage: (message: string) => void;
 }

package/src/components/Chatdeprecated/ChatDeprecated.tsx

@@ -1,4 +1,4 @@
-import { IChatMessage } from '@rpg-engine/shared';
+import { ILocalChatMessage } from '@rpg-engine/shared';
 import dayjs from 'dayjs';
 import React, { useEffect, useState } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
@@ -15,7 +15,7 @@ interface IEmitter {
   name: string;
 }
 export interface IChatDeprecatedProps {
-  chatMessages: IChatMessage[];
+  chatMessages: ILocalChatMessage[];
   onSendChatMessage: (message: string) => void;
   onCloseButton: () => void;
   onFocus?: () => void;
@@ -71,7 +71,7 @@ export const ChatDeprecated: React.FC<IChatDeprecatedProps> = ({
     } ${message}`;
   };
 
-  const onRenderChatMessages = (chatMessages: IChatMessage[]) => {
+  const onRenderChatMessages = (chatMessages: ILocalChatMessage[]) => {
     return chatMessages?.length ? (
       chatMessages?.map(({ _id, createdAt, emitter, message }, index) => (
         <MessageText key={`${_id}_${index}`}>

package/src/components/TimeWidget/TimeWidget.tsx

@@ -21,15 +21,10 @@ export const TimeWidget: React.FC<IClockWidgetProps> = ({
   scale,
 }) => {
   return (
-    <Draggable
-      scale={scale}
-      cancel=".time-widget-close,.time-widget-container,.time-widget-container *"
-    >
+    <Draggable scale={scale}>
       <WidgetContainer>
-        <CloseButton onPointerDown={onClose} className="time-widget-close">
-          X
-        </CloseButton>
-        <DayNightContainer className="time-widget-container">
+        <CloseButton onPointerDown={onClose}>X</CloseButton>
+        <DayNightContainer>
           <DayNightPeriod periodOfDay={periodOfDay} />
         </DayNightContainer>
         <Time>{TimeClock}</Time>

package/src/stories/Features/chat/Chat.stories.tsx

@@ -1,4 +1,4 @@
-import { ChatMessageType, IChatMessage } from '@rpg-engine/shared';
+import { ChatMessageType, ILocalChatMessage } from '@rpg-engine/shared';
 import { Meta, Story } from '@storybook/react';
 import React from 'react';
 import { Chat } from '../../../components/Chat/Chat';
@@ -19,7 +19,7 @@ const chatMessagesMock = [
       _id: 'someid',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -33,7 +33,7 @@ const chatMessagesMock = [
       _id: 'someid',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -47,7 +47,7 @@ const chatMessagesMock = [
       _id: 'someid',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -61,7 +61,7 @@ const chatMessagesMock = [
       _id: 'someid',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -75,7 +75,7 @@ const chatMessagesMock = [
       _id: 'someid',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -89,7 +89,7 @@ const chatMessagesMock = [
       _id: 'someid',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -103,7 +103,7 @@ const chatMessagesMock = [
       _id: 'someid',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -117,7 +117,7 @@ const chatMessagesMock = [
       _id: 'someid',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -131,7 +131,7 @@ const chatMessagesMock = [
       _id: 'someid',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -145,7 +145,7 @@ const chatMessagesMock = [
       _id: 'someid',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -159,7 +159,7 @@ const chatMessagesMock = [
       _id: 'someid',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -168,7 +168,7 @@ const chatMessagesMock = [
   },
 ];
 
-const Template: Story<IChatMessage> = args => (
+const Template: Story<ILocalChatMessage> = args => (
   <RPGUIRoot>
     <Chat
       onSendChatMessage={msg => console.log(msg)}

package/src/stories/Features/chat/ChatDeprecated.stories.tsx

@@ -1,4 +1,4 @@
-import { ChatMessageType, IChatMessage } from '@rpg-engine/shared';
+import { ChatMessageType, ILocalChatMessage } from '@rpg-engine/shared';
 import { Meta, Story } from '@storybook/react';
 import React from 'react';
 import { ChatDeprecated } from '../../../components/Chatdeprecated/ChatDeprecated';
@@ -19,7 +19,7 @@ const chatMessagesMock = [
       _id: 'someid',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -33,7 +33,7 @@ const chatMessagesMock = [
       _id: 'someid',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -47,7 +47,7 @@ const chatMessagesMock = [
       _id: 'someid',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -61,7 +61,7 @@ const chatMessagesMock = [
       _id: 'someid',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -75,7 +75,7 @@ const chatMessagesMock = [
       _id: 'someid',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -89,7 +89,7 @@ const chatMessagesMock = [
       _id: 'someid',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -103,7 +103,7 @@ const chatMessagesMock = [
       _id: 'someid',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -117,7 +117,7 @@ const chatMessagesMock = [
       _id: 'someid',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -131,7 +131,7 @@ const chatMessagesMock = [
       _id: 'someid',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -145,7 +145,7 @@ const chatMessagesMock = [
       _id: 'someid',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -154,7 +154,7 @@ const chatMessagesMock = [
   },
 ];
 
-const Template: Story<IChatMessage> = args => (
+const Template: Story<ILocalChatMessage[]> = args => (
   <RPGUIRoot>
     <ChatDeprecated
       onSendChatMessage={msg => console.log(msg)}

package/src/stories/Features/chat/ChatRevamp.stories.tsx

@@ -21,7 +21,7 @@ const chatMessagesMock = [
       _id: 'someid',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -35,7 +35,7 @@ const chatMessagesMock = [
       _id: 'someid1',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -49,7 +49,7 @@ const chatMessagesMock = [
       _id: 'someid2',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -63,7 +63,7 @@ const chatMessagesMock = [
       _id: 'someid3',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -77,7 +77,7 @@ const chatMessagesMock = [
       _id: 'someid4',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -91,7 +91,7 @@ const chatMessagesMock = [
       _id: 'someid5',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -105,7 +105,7 @@ const chatMessagesMock = [
       _id: 'someid6',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -119,7 +119,7 @@ const chatMessagesMock = [
       _id: 'someid7',
       name: 'Guilherme',
     },
-    type: ChatMessageType.Global,
+    type: ChatMessageType.Local,
     x: 128,
     y: 128,
     scene: 'MainScene',
@@ -129,10 +129,11 @@ const chatMessagesMock = [
 ];
 
 const tabsMock = [
+  { label: 'Local', id: 'local' },
   { label: 'Global', id: 'global' },
   { label: 'Private', id: 'private' },
   { label: 'Trade', id: 'trade' },
-  { label: 'Guild', id: 'guild' }, // Add the Guild tab
+  { label: 'Guild', id: 'guild' },
 ];
 
 const recentPrivateChatCharactersMock = [
@@ -148,114 +149,60 @@ const recentPrivateChatCharactersMock = [
   { _id: 'someid10', name: 'Guilherme2' },
 ];
 
+const defaultArgs = {
+  chatMessages: chatMessagesMock,
+  tabs: tabsMock,
+  privateChatCharacters: recentPrivateChatCharactersMock,
+  styles: { width: 'calc(100% - 0.5rem * 2)', height: '200px' },
+  onCloseButton: () => console.log('Closing chat...'),
+  onChangeTab: (tab: typeof tabsMock[number]['id']) =>
+    console.log('Changing tab to:', tab),
+};
+
 const Template: Story<IChatRevampProps> = args => (
   <RPGUIRoot>
     <ChatRevamp {...args} />
   </RPGUIRoot>
 );
 
+// Local
 export const Default = Template.bind({});
-
 Default.args = {
-  onSendGlobalChatMessage: value => {
-    console.log('Sending global chat message:', value);
-  },
-  onChangeCharacterName: value => {
-    console.log('Changing character name to:', value);
-  },
-  chatMessages: chatMessagesMock,
-  styles: { width: `calc(100% - 0.5rem * 2)`, height: '200px' },
-  onCloseButton: () => {
-    console.log('Closing chat...');
-  },
-  tabs: tabsMock,
-  privateChatCharacters: recentPrivateChatCharactersMock,
+  ...defaultArgs,
+  activeTab: 'local',
+  onSendLocalChatMessage: value =>
+    console.log('Sending local chat message:', value),
+};
+
+export const Global = Template.bind({});
+Global.args = {
+  ...defaultArgs,
   activeTab: 'global',
-  onChangeTab: tab => {
-    console.log('Changing tab to:', tab);
-  },
-  onSendPrivateChatMessage: value => {
-    console.log('Sending private chat message:', value);
-  },
-  onSendTradeMessage: value => {
-    console.log('Sending trade message:', value);
-  },
-  hideSearchCharacterUI: () => {
-    console.log('Hiding search character UI...');
-  },
-  onSendGuildChatMessage: value => {
-    console.log('Sending guild chat message:', value);
-  },
+  onSendGlobalChatMessage: value =>
+    console.log('Sending global chat message:', value),
 };
 
 export const Private = Template.bind({});
-
 Private.args = {
-  onSendGlobalChatMessage: () => {
-    console.log('Sending private chat message...');
-  },
-  onSendPrivateChatMessage: () => {
-    console.log('Sending private message...');
-  },
-  onChangeCharacterName: () => {},
-  chatMessages: chatMessagesMock,
-  styles: { width: `calc(100% - 0.5rem * 2)`, height: '200px' },
-  onCloseButton: () => {},
-  tabs: tabsMock,
-  privateChatCharacters: recentPrivateChatCharactersMock,
+  ...defaultArgs,
   activeTab: 'private',
-  onChangeTab: () => {
-    console.log('Changing tab...');
-  },
-  recentChatCharacters: recentPrivateChatCharactersMock,
   recentSelectedChatCharacterId: recentPrivateChatCharactersMock[0]._id,
   unseenMessageCharacterIds: [recentPrivateChatCharactersMock[0]._id],
-  onSendTradeMessage: () => {},
-  searchCharacterUI: false,
-  hideSearchCharacterUI: () => {},
+  onSendPrivateChatMessage: value =>
+    console.log('Sending private chat message:', value),
 };
 
 export const Trade = Template.bind({});
-
 Trade.args = {
-  onSendGlobalChatMessage: () => {
-    console.log('Sending global message...');
-  },
-  onSendPrivateChatMessage: () => {
-    console.log('Sending private message...');
-  },
-  onChangeCharacterName: () => {},
-  chatMessages: chatMessagesMock,
-  styles: { width: `calc(100% - 0.5rem * 2)`, height: '200px' },
-  onCloseButton: () => {},
-  tabs: tabsMock,
-  privateChatCharacters: recentPrivateChatCharactersMock,
+  ...defaultArgs,
   activeTab: 'trade',
-  onChangeTab: () => {},
-  onSendTradeMessage: () => {},
+  onSendTradeMessage: value => console.log('Sending trade message:', value),
 };
 
 export const Guild = Template.bind({});
-
 Guild.args = {
-  onSendGlobalChatMessage: () => {
-    console.log('Sending global message...');
-  },
-  onSendPrivateChatMessage: () => {
-    console.log('Sending private message...');
-  },
-  onSendTradeMessage: () => {
-    console.log('Sending trade message...');
-  },
-  onSendGuildChatMessage: value => {
-    console.log('Sending guild chat message:', value);
-  },
-  onChangeCharacterName: () => {},
-  chatMessages: chatMessagesMock,
-  styles: { width: `calc(100% - 0.5rem * 2)`, height: '200px' },
-  onCloseButton: () => {},
-  tabs: tabsMock,
-  privateChatCharacters: recentPrivateChatCharactersMock,
+  ...defaultArgs,
   activeTab: 'guild',
-  onChangeTab: () => {},
+  onSendGuildChatMessage: value =>
+    console.log('Sending guild chat message:', value),
 };