From 10ed6673d4e6f5f498d7a7b665bdf72c7ad0b530 Mon Sep 17 00:00:00 2001 From: Bill Date: Wed, 30 Mar 2022 12:46:48 -0400 Subject: [PATCH] Rename hooks --- .../page/widgets/CatalogBadgeSelectorWidgetView.tsx | 4 ++-- src/components/inventory/InventoryView.tsx | 6 +++--- .../inventory/views/InventoryBadgeView.tsx | 6 +++--- src/components/inventory/views/InventoryBotView.tsx | 6 +++--- .../inventory/views/InventoryFurnitureView.tsx | 6 +++--- src/components/inventory/views/InventoryPetView.tsx | 6 +++--- .../inventory/views/InventoryTradeView.tsx | 4 ++-- src/components/toolbar/ToolbarView.tsx | 4 ++-- src/hooks/inventory/index.ts | 12 ++++++------ ...haredInventoryBadges.ts => useInventoryBadges.ts} | 6 +++--- ...useSharedInventoryBots.ts => useInventoryBots.ts} | 10 +++++----- ...eSharedInventoryFurni.ts => useInventoryFurni.ts} | 10 +++++----- ...useSharedInventoryPets.ts => useInventoryPets.ts} | 10 +++++----- ...eSharedInventoryTrade.ts => useInventoryTrade.ts} | 8 ++++---- ...UnseenTracker.ts => useInventoryUnseenTracker.ts} | 4 ++-- 15 files changed, 51 insertions(+), 51 deletions(-) rename src/hooks/inventory/{useSharedInventoryBadges.ts => useInventoryBadges.ts} (98%) rename src/hooks/inventory/{useSharedInventoryBots.ts => useInventoryBots.ts} (96%) rename src/hooks/inventory/{useSharedInventoryFurni.ts => useInventoryFurni.ts} (97%) rename src/hooks/inventory/{useSharedInventoryPets.ts => useInventoryPets.ts} (94%) rename src/hooks/inventory/{useSharedInventoryTrade.ts => useInventoryTrade.ts} (97%) rename src/hooks/inventory/{useSharedInventoryUnseenTracker.ts => useInventoryUnseenTracker.ts} (96%) diff --git a/src/components/catalog/views/page/widgets/CatalogBadgeSelectorWidgetView.tsx b/src/components/catalog/views/page/widgets/CatalogBadgeSelectorWidgetView.tsx index 732dfad2..6ea24b66 100644 --- a/src/components/catalog/views/page/widgets/CatalogBadgeSelectorWidgetView.tsx +++ b/src/components/catalog/views/page/widgets/CatalogBadgeSelectorWidgetView.tsx @@ -1,7 +1,7 @@ import { StringDataType } from '@nitrots/nitro-renderer'; import { FC, useEffect, useMemo, useState } from 'react'; import { AutoGrid, AutoGridProps, LayoutBadgeImageView, LayoutGridItem } from '../../../../../common'; -import { useSharedInventoryBadges } from '../../../../../hooks'; +import { useInventoryBadges } from '../../../../../hooks'; import { useCatalogContext } from '../../../CatalogContext'; const EXCLUDED_BADGE_CODES: string[] = []; @@ -16,7 +16,7 @@ export const CatalogBadgeSelectorWidgetView: FC(null); const { currentOffer = null, setPurchaseOptions = null } = useCatalogContext(); - const { badgeCodes = [] } = useSharedInventoryBadges(); + const { badgeCodes = [] } = useInventoryBadges(); const previewStuffData = useMemo(() => { diff --git a/src/components/inventory/InventoryView.tsx b/src/components/inventory/InventoryView.tsx index 09b958a4..b85736be 100644 --- a/src/components/inventory/InventoryView.tsx +++ b/src/components/inventory/InventoryView.tsx @@ -3,7 +3,7 @@ import { FC, useCallback, useEffect, useState } from 'react'; import { AddEventLinkTracker, GetLocalization, GetRoomEngine, LocalizeText, RemoveLinkEventTracker, UnseenItemCategory } from '../../api'; import { isObjectMoverRequested, setObjectMoverRequested } from '../../api/inventory/InventoryUtilities'; import { NitroCardContentView, NitroCardHeaderView, NitroCardTabsItemView, NitroCardTabsView, NitroCardView } from '../../common'; -import { UseMessageEventHook, UseRoomEngineEvent, UseRoomSessionManagerEvent, useSharedInventoryTrade, useSharedInventoryUnseenTracker } from '../../hooks'; +import { useInventoryTrade, useInventoryUnseenTracker, UseMessageEventHook, UseRoomEngineEvent, UseRoomSessionManagerEvent } from '../../hooks'; import { InventoryBadgeView } from './views/InventoryBadgeView'; import { InventoryBotView } from './views/InventoryBotView'; import { InventoryFurnitureView } from './views/InventoryFurnitureView'; @@ -23,8 +23,8 @@ export const InventoryView: FC<{}> = props => const [ currentTab, setCurrentTab ] = useState(TABS[0]); const [ roomSession, setRoomSession ] = useState(null); const [ roomPreviewer, setRoomPreviewer ] = useState(null); - const { isTrading = false, stopTrading = null } = useSharedInventoryTrade(); - const { getCount = null, resetCategory = null } = useSharedInventoryUnseenTracker(); + const { isTrading = false, stopTrading = null } = useInventoryTrade(); + const { getCount = null, resetCategory = null } = useInventoryUnseenTracker(); const close = () => { diff --git a/src/components/inventory/views/InventoryBadgeView.tsx b/src/components/inventory/views/InventoryBadgeView.tsx index b1dea24d..c74aed37 100644 --- a/src/components/inventory/views/InventoryBadgeView.tsx +++ b/src/components/inventory/views/InventoryBadgeView.tsx @@ -1,12 +1,12 @@ import { FC, useEffect } from 'react'; import { LocalizeBadgeName, LocalizeText, UnseenItemCategory } from '../../../api'; import { AutoGrid, Button, Column, Flex, Grid, LayoutBadgeImageView, LayoutGridItem, Text } from '../../../common'; -import { useSharedInventoryBadges, useSharedInventoryUnseenTracker } from '../../../hooks'; +import { useInventoryBadges, useInventoryUnseenTracker } from '../../../hooks'; export const InventoryBadgeView: FC<{}> = props => { - const { badgeCodes = [], activeBadgeCodes = [], selectedBadgeCode = null, isWearingBadge = null, canWearBadges = null, toggleBadge = null, selectBadge = null, getBadgeId = null } = useSharedInventoryBadges(); - const { getCount = null, resetCategory = null, isUnseen = null, removeUnseen = null } = useSharedInventoryUnseenTracker(); + const { badgeCodes = [], activeBadgeCodes = [], selectedBadgeCode = null, isWearingBadge = null, canWearBadges = null, toggleBadge = null, selectBadge = null, getBadgeId = null } = useInventoryBadges(); + const { getCount = null, resetCategory = null, isUnseen = null, removeUnseen = null } = useInventoryUnseenTracker(); useEffect(() => { diff --git a/src/components/inventory/views/InventoryBotView.tsx b/src/components/inventory/views/InventoryBotView.tsx index 7d3905fb..254a739f 100644 --- a/src/components/inventory/views/InventoryBotView.tsx +++ b/src/components/inventory/views/InventoryBotView.tsx @@ -2,7 +2,7 @@ import { IRoomSession, MouseEventType, RoomObjectVariable, RoomPreviewer } from import { FC, MouseEvent, useEffect, useState } from 'react'; import { attemptBotPlacement, GetRoomEngine, IBotItem, LocalizeText, UnseenItemCategory } from '../../../api'; import { AutoGrid, Button, Column, Grid, LayoutAvatarImageView, LayoutGridItem, LayoutRoomPreviewerView, Text } from '../../../common'; -import { useSharedInventoryBots, useSharedInventoryUnseenTracker } from '../../../hooks'; +import { useInventoryBots, useInventoryUnseenTracker } from '../../../hooks'; import { InventoryCategoryEmptyView } from './InventoryCategoryEmptyView'; interface InventoryBotViewProps @@ -14,8 +14,8 @@ interface InventoryBotViewProps export const InventoryBotView: FC = props => { const { roomSession = null, roomPreviewer = null } = props; - const { botItems = [], selectedBot = null, selectBot = null } = useSharedInventoryBots(); - const { getCount = null, resetCategory = null, isUnseen = null, removeUnseen = null } = useSharedInventoryUnseenTracker(); + const { botItems = [], selectedBot = null, selectBot = null } = useInventoryBots(); + const { getCount = null, resetCategory = null, isUnseen = null, removeUnseen = null } = useInventoryUnseenTracker(); useEffect(() => { diff --git a/src/components/inventory/views/InventoryFurnitureView.tsx b/src/components/inventory/views/InventoryFurnitureView.tsx index d6c1a689..faa52af4 100644 --- a/src/components/inventory/views/InventoryFurnitureView.tsx +++ b/src/components/inventory/views/InventoryFurnitureView.tsx @@ -2,7 +2,7 @@ import { IRoomSession, MouseEventType, RoomObjectVariable, RoomPreviewer, Vector import { FC, MouseEvent, useEffect, useState } from 'react'; import { attemptItemPlacement, FurniCategory, GetRoomEngine, GetSessionDataManager, GroupItem, LocalizeText, UnseenItemCategory } from '../../../api'; import { AutoGrid, Button, Column, Grid, LayoutGridItem, LayoutLimitedEditionCompactPlateView, LayoutRarityLevelView, LayoutRoomPreviewerView, Text } from '../../../common'; -import { useSharedInventoryFurni, useSharedInventoryUnseenTracker } from '../../../hooks'; +import { useInventoryFurni, useInventoryUnseenTracker } from '../../../hooks'; import { attemptPlaceMarketplaceOffer } from '../../../hooks/inventory/common'; import { InventoryCategoryEmptyView } from './InventoryCategoryEmptyView'; import { InventoryFurnitureSearchView } from './InventoryFurnitureSearchView'; @@ -16,9 +16,9 @@ interface InventoryFurnitureViewProps export const InventoryFurnitureView: FC = props => { const { roomSession = null, roomPreviewer = null } = props; - const { groupItems = [], selectedItem = null, selectItem = null } = useSharedInventoryFurni(); + const { groupItems = [], selectedItem = null, selectItem = null } = useInventoryFurni(); const [ filteredGroupItems, setFilteredGroupItems ] = useState(groupItems); - const { getCount = null, resetCategory = null } = useSharedInventoryUnseenTracker(); + const { getCount = null, resetCategory = null } = useInventoryUnseenTracker(); useEffect(() => { diff --git a/src/components/inventory/views/InventoryPetView.tsx b/src/components/inventory/views/InventoryPetView.tsx index 7bd264d1..5d9727f1 100644 --- a/src/components/inventory/views/InventoryPetView.tsx +++ b/src/components/inventory/views/InventoryPetView.tsx @@ -2,7 +2,7 @@ import { IRoomSession, MouseEventType, RoomObjectVariable, RoomPreviewer } from import { FC, MouseEvent, useEffect, useState } from 'react'; import { attemptPetPlacement, GetRoomEngine, IPetItem, LocalizeText, UnseenItemCategory } from '../../../api'; import { AutoGrid, Button, Column, Grid, LayoutGridItem, LayoutPetImageView, LayoutRoomPreviewerView, Text } from '../../../common'; -import { useSharedInventoryPets, useSharedInventoryUnseenTracker } from '../../../hooks'; +import { useInventoryPets, useInventoryUnseenTracker } from '../../../hooks'; import { InventoryCategoryEmptyView } from './InventoryCategoryEmptyView'; interface InventoryPetViewProps @@ -14,8 +14,8 @@ interface InventoryPetViewProps export const InventoryPetView: FC = props => { const { roomSession = null, roomPreviewer = null } = props; - const { petItems = null, selectedPet = null, selectPet = null } = useSharedInventoryPets(); - const { getCount = null, resetCategory = null, isUnseen = null, removeUnseen = null } = useSharedInventoryUnseenTracker(); + const { petItems = null, selectedPet = null, selectPet = null } = useInventoryPets(); + const { getCount = null, resetCategory = null, isUnseen = null, removeUnseen = null } = useInventoryUnseenTracker(); useEffect(() => { diff --git a/src/components/inventory/views/InventoryTradeView.tsx b/src/components/inventory/views/InventoryTradeView.tsx index 99086a93..0614436b 100644 --- a/src/components/inventory/views/InventoryTradeView.tsx +++ b/src/components/inventory/views/InventoryTradeView.tsx @@ -3,7 +3,7 @@ import { IObjectData, TradingListAddItemComposer, TradingListAddItemsComposer } import { FC, useEffect, useState } from 'react'; import { FurniCategory, GroupItem, IFurnitureItem, LocalizeText, NotificationAlertType, NotificationUtilities, SendMessageComposer, TradeState } from '../../../api'; import { AutoGrid, Base, Button, Column, Flex, Grid, LayoutGridItem, Text } from '../../../common'; -import { useSharedInventoryTrade } from '../../../hooks'; +import { useInventoryTrade } from '../../../hooks'; import { getGuildFurniType } from '../../../hooks/inventory/common/TradingUtilities'; import { InventoryFurnitureSearchView } from './InventoryFurnitureSearchView'; @@ -22,7 +22,7 @@ export const InventoryTradeView: FC = props => const [ otherGroupItem, setOtherGroupItem ] = useState(null); const [ filteredGroupItems, setFilteredGroupItems ] = useState(null); const [ countdownTick, setCountdownTick ] = useState(3); - const { ownUser = null, otherUser = null, groupItems = [], tradeState = TradeState.TRADING_STATE_READY, progressTrade = null, removeItem = null, setTradeState = null } = useSharedInventoryTrade(); + const { ownUser = null, otherUser = null, groupItems = [], tradeState = TradeState.TRADING_STATE_READY, progressTrade = null, removeItem = null, setTradeState = null } = useInventoryTrade(); const canTradeItem = (isWallItem: boolean, spriteId: number, category: number, groupable: boolean, stuffData: IObjectData) => { diff --git a/src/components/toolbar/ToolbarView.tsx b/src/components/toolbar/ToolbarView.tsx index a9992d73..c502baed 100644 --- a/src/components/toolbar/ToolbarView.tsx +++ b/src/components/toolbar/ToolbarView.tsx @@ -3,7 +3,7 @@ import { FC, useCallback, useState } from 'react'; import { CreateLinkEvent, GetSessionDataManager, GetUserProfile, OpenMessengerChat, VisitDesktop } from '../../api'; import { Base, Flex, LayoutAvatarImageView, LayoutItemCountView, TransitionAnimation, TransitionAnimationTypes } from '../../common'; import { AchievementsUIUnseenCountEvent, FriendsEvent, FriendsMessengerIconEvent, FriendsRequestCountEvent, GuideToolEvent, ModToolsEvent, UserSettingsUIEvent } from '../../events'; -import { BatchUpdates, DispatchUiEvent, UseMessageEventHook, UseRoomEngineEvent, useSharedInventoryUnseenTracker, UseUiEvent } from '../../hooks'; +import { BatchUpdates, DispatchUiEvent, useInventoryUnseenTracker, UseMessageEventHook, UseRoomEngineEvent, UseUiEvent } from '../../hooks'; import { ToolbarViewItems } from './common/ToolbarViewItems'; import { ToolbarMeView } from './ToolbarMeView'; @@ -27,7 +27,7 @@ export const ToolbarView: FC = props => const [ chatIconType, setChatIconType ] = useState(CHAT_ICON_HIDDEN); const [ unseenAchievementCount, setUnseenAchievementCount ] = useState(0); const [ unseenFriendRequestCount, setFriendRequestCount ] = useState(0); - const { getFullCount = null } = useSharedInventoryUnseenTracker(); + const { getFullCount = null } = useInventoryUnseenTracker(); const isMod = GetSessionDataManager().isModerator; const onUserInfoEvent = useCallback((event: UserInfoEvent) => diff --git a/src/hooks/inventory/index.ts b/src/hooks/inventory/index.ts index 81022bad..0d082803 100644 --- a/src/hooks/inventory/index.ts +++ b/src/hooks/inventory/index.ts @@ -1,7 +1,7 @@ export * from './common'; -export * from './useSharedInventoryBadges'; -export * from './useSharedInventoryBots'; -export * from './useSharedInventoryFurni'; -export * from './useSharedInventoryPets'; -export * from './useSharedInventoryTrade'; -export * from './useSharedInventoryUnseenTracker'; +export * from './useInventoryBadges'; +export * from './useInventoryBots'; +export * from './useInventoryFurni'; +export * from './useInventoryPets'; +export * from './useInventoryTrade'; +export * from './useInventoryUnseenTracker'; diff --git a/src/hooks/inventory/useSharedInventoryBadges.ts b/src/hooks/inventory/useInventoryBadges.ts similarity index 98% rename from src/hooks/inventory/useSharedInventoryBadges.ts rename to src/hooks/inventory/useInventoryBadges.ts index e9c2593a..373a520a 100644 --- a/src/hooks/inventory/useSharedInventoryBadges.ts +++ b/src/hooks/inventory/useInventoryBadges.ts @@ -5,7 +5,7 @@ import { BatchUpdates, UseMessageEventHook } from '..'; import { GetConfiguration, SendMessageComposer } from '../../api'; import { useSharedVisibility } from '../useSharedVisibility'; -const useInventoryBadges = () => +const useInventoryBadgesState = () => { const [ isVisible, setIsVisible ] = useState(false); const [ needsUpdate, setNeedsUpdate ] = useState(true); @@ -138,9 +138,9 @@ const useInventoryBadges = () => return { badgeCodes, activeBadgeCodes, selectedBadgeCode, isWearingBadge, canWearBadges, toggleBadge, selectBadge, getBadgeId, setIsVisible }; } -export const useSharedInventoryBadges = () => +export const useInventoryBadges = () => { - const { setIsVisible, ...rest } = useBetween(useInventoryBadges); + const { setIsVisible, ...rest } = useBetween(useInventoryBadgesState); const { isVisible = false, activate = null, deactivate = null } = useSharedVisibility(); useEffect(() => diff --git a/src/hooks/inventory/useSharedInventoryBots.ts b/src/hooks/inventory/useInventoryBots.ts similarity index 96% rename from src/hooks/inventory/useSharedInventoryBots.ts rename to src/hooks/inventory/useInventoryBots.ts index ae38bcad..31e82b32 100644 --- a/src/hooks/inventory/useSharedInventoryBots.ts +++ b/src/hooks/inventory/useInventoryBots.ts @@ -1,18 +1,18 @@ import { BotAddedToInventoryEvent, BotData, BotInventoryMessageEvent, BotRemovedFromInventoryEvent, GetBotInventoryComposer } from '@nitrots/nitro-renderer'; import { useCallback, useEffect, useState } from 'react'; import { useBetween } from 'use-between'; -import { useSharedInventoryUnseenTracker } from '.'; +import { useInventoryUnseenTracker } from '.'; import { UseMessageEventHook } from '..'; import { cancelRoomObjectPlacement, CreateLinkEvent, getPlacingItemId, IBotItem, SendMessageComposer, UnseenItemCategory } from '../../api'; import { useSharedVisibility } from '../useSharedVisibility'; -const useInventoryBots = () => +const useInventoryBotsState = () => { const [ isVisible, setIsVisible ] = useState(false); const [ needsUpdate, setNeedsUpdate ] = useState(true); const [ botItems, setBotItems ] = useState([]); const [ selectedBot, setSelectedBot ] = useState(null); - const { isUnseen = null } = useSharedInventoryUnseenTracker(); + const { isUnseen = null } = useInventoryUnseenTracker(); const selectBot = (bot: IBotItem) => setSelectedBot(bot); @@ -151,9 +151,9 @@ const useInventoryBots = () => return { botItems, selectedBot, selectBot, setIsVisible }; } -export const useSharedInventoryBots = () => +export const useInventoryBots = () => { - const { setIsVisible, ...rest } = useBetween(useInventoryBots); + const { setIsVisible, ...rest } = useBetween(useInventoryBotsState); const { isVisible = false, activate = null, deactivate = null } = useSharedVisibility(); useEffect(() => diff --git a/src/hooks/inventory/useSharedInventoryFurni.ts b/src/hooks/inventory/useInventoryFurni.ts similarity index 97% rename from src/hooks/inventory/useSharedInventoryFurni.ts rename to src/hooks/inventory/useInventoryFurni.ts index a3d5c1b1..427c5de5 100644 --- a/src/hooks/inventory/useSharedInventoryFurni.ts +++ b/src/hooks/inventory/useInventoryFurni.ts @@ -1,7 +1,7 @@ import { FurnitureListAddOrUpdateEvent, FurnitureListComposer, FurnitureListEvent, FurnitureListInvalidateEvent, FurnitureListItemParser, FurnitureListRemovedEvent, FurniturePostItPlacedEvent } from '@nitrots/nitro-renderer'; import { useCallback, useEffect, useState } from 'react'; import { useBetween } from 'use-between'; -import { useSharedInventoryUnseenTracker } from '.'; +import { useInventoryUnseenTracker } from '.'; import { UseMessageEventHook } from '..'; import { attemptItemPlacement, cancelRoomObjectPlacement, CloneObject, CreateLinkEvent, FurnitureItem, getPlacingItemId, GroupItem, SendMessageComposer, UnseenItemCategory } from '../../api'; import { useSharedVisibility } from '../useSharedVisibility'; @@ -9,13 +9,13 @@ import { addFurnitureItem, getAllItemIds, mergeFurniFragments } from './common'; let furniMsgFragments: Map[] = null; -const useInventoryFurni = () => +const useInventoryFurniState = () => { const [ isVisible, setIsVisible ] = useState(false); const [ needsUpdate, setNeedsUpdate ] = useState(true); const [ groupItems, setGroupItems ] = useState([]); const [ selectedItem, setSelectedItem ] = useState(null); - const { isUnseen = null, removeUnseen = null, resetCategory = null, getCount = null } = useSharedInventoryUnseenTracker(); + const { isUnseen = null, removeUnseen = null, resetCategory = null, getCount = null } = useInventoryUnseenTracker(); const selectItem = (item: GroupItem) => { @@ -253,9 +253,9 @@ const useInventoryFurni = () => return { groupItems, setGroupItems, selectedItem, selectItem, setIsVisible }; } -export const useSharedInventoryFurni = () => +export const useInventoryFurni = () => { - const { setIsVisible, ...rest } = useBetween(useInventoryFurni); + const { setIsVisible, ...rest } = useBetween(useInventoryFurniState); const { isVisible = false, activate = null, deactivate = null } = useSharedVisibility(); useEffect(() => diff --git a/src/hooks/inventory/useSharedInventoryPets.ts b/src/hooks/inventory/useInventoryPets.ts similarity index 94% rename from src/hooks/inventory/useSharedInventoryPets.ts rename to src/hooks/inventory/useInventoryPets.ts index 6feacb26..b60b65bf 100644 --- a/src/hooks/inventory/useSharedInventoryPets.ts +++ b/src/hooks/inventory/useInventoryPets.ts @@ -1,7 +1,7 @@ import { PetAddedToInventoryEvent, PetData, PetInventoryEvent, PetRemovedFromInventory, RequestPetsComposer } from '@nitrots/nitro-renderer'; import { useCallback, useEffect, useState } from 'react'; import { useBetween } from 'use-between'; -import { useSharedInventoryUnseenTracker } from '.'; +import { useInventoryUnseenTracker } from '.'; import { UseMessageEventHook } from '..'; import { SendMessageComposer } from '../../api'; import { IPetItem } from '../../api/inventory/IPetItem'; @@ -10,13 +10,13 @@ import { addSinglePetItem, mergePetFragments, processPetFragment, removePetItemB let petMsgFragments: Map[] = null; -const useInventoryPets = () => +const useInventoryPetsState = () => { const [ isVisible, setIsVisible ] = useState(false); const [ needsUpdate, setNeedsUpdate ] = useState(true); const [ petItems, setPetItems ] = useState([]); const [ selectedPet, setSelectedPet ] = useState(null); - const { isUnseen = null } = useSharedInventoryUnseenTracker(); + const { isUnseen = null } = useInventoryUnseenTracker(); const selectPet = (pet: IPetItem) => setSelectedPet(pet); @@ -104,9 +104,9 @@ const useInventoryPets = () => return { petItems, selectedPet, selectPet, setIsVisible }; } -export const useSharedInventoryPets = () => +export const useInventoryPets = () => { - const { setIsVisible, ...rest } = useBetween(useInventoryPets); + const { setIsVisible, ...rest } = useBetween(useInventoryPetsState); const { isVisible = false, activate = null, deactivate = null } = useSharedVisibility(); useEffect(() => diff --git a/src/hooks/inventory/useSharedInventoryTrade.ts b/src/hooks/inventory/useInventoryTrade.ts similarity index 97% rename from src/hooks/inventory/useSharedInventoryTrade.ts rename to src/hooks/inventory/useInventoryTrade.ts index 37a7b80c..e2b6c158 100644 --- a/src/hooks/inventory/useSharedInventoryTrade.ts +++ b/src/hooks/inventory/useInventoryTrade.ts @@ -1,19 +1,19 @@ import { AdvancedMap, TradingAcceptComposer, TradingAcceptEvent, TradingCancelComposer, TradingCloseComposer, TradingCloseEvent, TradingCloseParser, TradingCompletedEvent, TradingConfirmationComposer, TradingConfirmationEvent, TradingListItemEvent, TradingListItemRemoveComposer, TradingNotOpenEvent, TradingOpenComposer, TradingOpenEvent, TradingOpenFailedEvent, TradingOpenFailedParser, TradingOtherNotAllowedEvent, TradingUnacceptComposer, TradingYouAreNotAllowedEvent } from '@nitrots/nitro-renderer'; import { useCallback, useState } from 'react'; import { useBetween } from 'use-between'; -import { useSharedInventoryFurni } from '.'; +import { useInventoryFurni } from '.'; import { BatchUpdates, UseMessageEventHook } from '..'; import { CloneObject, GetRoomSession, GetSessionDataManager, GroupItem, LocalizeText, NotificationUtilities, SendMessageComposer, TradeState, TradeUserData, TradingNotificationMessage, TradingNotificationType } from '../../api'; import { InventoryTradeRequestEvent } from '../../events'; import { UseUiEvent } from '../events'; import { parseTradeItems } from './common'; -const useInventoryTrade = () => +const useInventoryTradeState = () => { const [ ownUser, setOwnUser ] = useState(null); const [ otherUser, setOtherUser ] = useState(null); const [ tradeState, setTradeState ] = useState(TradeState.TRADING_STATE_READY); - const { groupItems = [], setGroupItems = null } = useSharedInventoryFurni(); + const { groupItems = [], setGroupItems = null } = useInventoryFurni(); const isTrading = (tradeState >= TradeState.TRADING_STATE_RUNNING); const progressTrade = () => @@ -322,4 +322,4 @@ const useInventoryTrade = () => return { ownUser, otherUser, tradeState, setTradeState, isTrading, groupItems, progressTrade, removeItem, stopTrading }; } -export const useSharedInventoryTrade = () => useBetween(useInventoryTrade); +export const useInventoryTrade = () => useBetween(useInventoryTradeState); diff --git a/src/hooks/inventory/useSharedInventoryUnseenTracker.ts b/src/hooks/inventory/useInventoryUnseenTracker.ts similarity index 96% rename from src/hooks/inventory/useSharedInventoryUnseenTracker.ts rename to src/hooks/inventory/useInventoryUnseenTracker.ts index 71613edd..5f011ab5 100644 --- a/src/hooks/inventory/useSharedInventoryUnseenTracker.ts +++ b/src/hooks/inventory/useInventoryUnseenTracker.ts @@ -7,7 +7,7 @@ import { SendMessageComposer } from '../../api'; const sendResetCategoryMessage = (category: number) => SendMessageComposer(new UnseenResetCategoryComposer(category)); const sendResetItemsMessage = (category: number, itemIds: number[]) => SendMessageComposer(new UnseenResetItemsComposer(category, ...itemIds)); -const useInventoryUnseenTracker = () => +const useInventoryUnseenTrackerState = () => { const [ unseenItems, setUnseenItems ] = useState>(new Map()); const getIds = (category: number) => unseenItems.get(category); @@ -138,4 +138,4 @@ const useInventoryUnseenTracker = () => return { getIds, getCount, getFullCount, resetCategory, resetCategoryIfEmpty, resetItems, isUnseen, removeUnseen }; } -export const useSharedInventoryUnseenTracker = () => useBetween(useInventoryUnseenTracker); +export const useInventoryUnseenTracker = () => useBetween(useInventoryUnseenTrackerState);