From ea185a441a36a187ff5e4742bcdef8cec03e2cff Mon Sep 17 00:00:00 2001 From: Bill Date: Wed, 27 Jul 2022 19:08:53 -0400 Subject: [PATCH] Rename all close functions to onClose --- .../accordion/NitroCardAccordionSetView.tsx | 6 ++-- .../layout/LayoutNotificationAlertView.tsx | 6 ++-- .../layout/LayoutNotificationBubbleView.tsx | 10 +++--- src/components/campaign/CalendarView.tsx | 6 ++-- src/components/campaign/CampaignView.tsx | 2 +- .../catalog/views/gift/CatalogGiftView.tsx | 12 +++---- .../groups/views/GroupCreatorView.tsx | 4 +-- .../groups/views/GroupManagerView.tsx | 2 +- src/components/help/HelpView.tsx | 4 +-- src/components/inventory/InventoryView.tsx | 6 ++-- .../views/NavigatorDoorStateView.tsx | 8 ++--- .../NavigatorRoomSettingsBasicTabView.tsx | 6 ++-- .../NavigatorRoomSettingsView.tsx | 6 ++-- .../views/alert-layouts/GetAlertLayout.tsx | 4 +-- .../alert-layouts/NitroSystemAlertView.tsx | 4 +-- .../NotificationDefaultAlertView.tsx | 10 +++--- .../NotificationSearchAlertView.tsx | 10 +++--- .../views/bubble-layouts/GetBubbleLayout.tsx | 4 +-- .../NotificationClubGiftBubbleView.tsx | 6 ++-- .../NotificationDefaultBubbleView.tsx | 4 +-- .../confirm-layouts/GetConfirmLayout.tsx | 4 +-- .../NotificationDefaultConfirmView.tsx | 8 ++--- .../AvatarInfoRentableBotChatView.tsx | 8 ++--- .../AvatarInfoUseProductConfirmView.tsx | 12 +++---- .../avatar-info/AvatarInfoUseProductView.tsx | 6 ++-- .../avatar-info/AvatarInfoWidgetView.tsx | 32 +++++++++---------- .../infostand/InfoStandWidgetBotView.tsx | 6 ++-- .../infostand/InfoStandWidgetFurniView.tsx | 6 ++-- .../infostand/InfoStandWidgetPetView.tsx | 6 ++-- .../InfoStandWidgetRentableBotView.tsx | 6 ++-- .../infostand/InfoStandWidgetUserView.tsx | 6 ++-- .../menu/AvatarInfoWidgetAvatarView.tsx | 8 ++--- .../menu/AvatarInfoWidgetDecorateView.tsx | 2 +- .../menu/AvatarInfoWidgetFurniView.tsx | 6 ++-- .../menu/AvatarInfoWidgetNameView.tsx | 6 ++-- .../menu/AvatarInfoWidgetOwnAvatarView.tsx | 8 ++--- .../menu/AvatarInfoWidgetOwnPetView.tsx | 8 ++--- .../menu/AvatarInfoWidgetPetView.tsx | 8 ++--- .../menu/AvatarInfoWidgetRentableBotView.tsx | 10 +++--- .../widgets/choosers/ChooserWidgetView.tsx | 6 ++-- .../choosers/FurniChooserWidgetView.tsx | 4 +-- .../choosers/UserChooserWidgetView.tsx | 4 +-- .../widgets/context-menu/ContextMenuView.tsx | 8 ++--- .../FurnitureBackgroundColorView.tsx | 4 +-- .../furniture/FurnitureBadgeDisplayView.tsx | 4 +-- .../widgets/furniture/FurnitureDimmerView.tsx | 4 +-- .../furniture/FurnitureExchangeCreditView.tsx | 4 +-- .../furniture/FurnitureExternalImageView.tsx | 4 +-- .../furniture/FurnitureFriendFurniView.tsx | 6 ++-- .../furniture/FurnitureGiftOpeningView.tsx | 4 +-- .../furniture/FurnitureMannequinView.tsx | 4 +-- .../furniture/FurnitureStackHeightView.tsx | 4 +-- .../furniture/FurnitureStickieView.tsx | 4 +-- .../widgets/furniture/FurnitureTrophyView.tsx | 4 +-- .../furniture/FurnitureYoutubeDisplayView.tsx | 4 +-- .../context-menu/EffectBoxConfirmView.tsx | 10 +++--- .../context-menu/FurnitureContextMenuView.tsx | 10 +++--- .../MonsterPlantSeedConfirmView.tsx | 14 ++++---- .../PurchasableClothingConfirmView.tsx | 14 ++++---- src/components/wired/views/WiredBaseView.tsx | 6 ++-- .../useFurnitureBackgroundColorWidget.ts | 6 ++-- .../useFurnitureBadgeDisplayWidget.ts | 6 ++-- .../useFurnitureContextMenuWidget.ts | 14 ++++---- .../furniture/useFurnitureExchangeWidget.ts | 8 ++--- .../useFurnitureExternalImageWidget.ts | 6 ++-- .../useFurnitureFriendFurniWidget.ts | 12 +++---- .../furniture/useFurnitureMannequinWidget.ts | 10 +++--- .../furniture/useFurniturePresentWidget.ts | 8 ++--- .../useFurnitureStackHeightWidget.ts | 6 ++-- .../furniture/useFurnitureStickieWidget.ts | 6 ++-- .../furniture/useFurnitureTrophyWidget.ts | 6 ++-- .../furniture/useFurnitureYoutubeWidget.ts | 6 ++-- .../rooms/widgets/useFurniChooserWidget.ts | 4 +-- .../rooms/widgets/useUserChooserWidget.ts | 4 +-- 74 files changed, 252 insertions(+), 252 deletions(-) diff --git a/src/common/card/accordion/NitroCardAccordionSetView.tsx b/src/common/card/accordion/NitroCardAccordionSetView.tsx index 0be64d08..86eda4cb 100644 --- a/src/common/card/accordion/NitroCardAccordionSetView.tsx +++ b/src/common/card/accordion/NitroCardAccordionSetView.tsx @@ -22,7 +22,7 @@ export const NitroCardAccordionSetView: FC = pro setIsOpen(prevValue => !prevValue); } - const close = useCallback(() => setIsOpen(false), []); + const onClose = useCallback(() => setIsOpen(false), []); const getClassNames = useMemo(() => { @@ -42,7 +42,7 @@ export const NitroCardAccordionSetView: FC = pro useEffect(() => { - const closeFunction = close; + const closeFunction = onClose; setClosers(prevValue => { @@ -66,7 +66,7 @@ export const NitroCardAccordionSetView: FC = pro return newClosers; }); } - }, [ close, setClosers ]); + }, [ onClose, setClosers ]); return ( diff --git a/src/common/layout/LayoutNotificationAlertView.tsx b/src/common/layout/LayoutNotificationAlertView.tsx index d4e56d82..8db771af 100644 --- a/src/common/layout/LayoutNotificationAlertView.tsx +++ b/src/common/layout/LayoutNotificationAlertView.tsx @@ -6,12 +6,12 @@ export interface LayoutNotificationAlertViewProps extends NitroCardViewProps { title?: string; type?: string; - close: () => void; + onClose: () => void; } export const LayoutNotificationAlertView: FC = props => { - const { title = '', close = null, classNames = [], children = null,type = NotificationAlertType.DEFAULT, ...rest } = props; + const { title = '', onClose = null, classNames = [], children = null,type = NotificationAlertType.DEFAULT, ...rest } = props; const getClassNames = useMemo(() => { @@ -26,7 +26,7 @@ export const LayoutNotificationAlertView: FC = return ( - + { children } diff --git a/src/common/layout/LayoutNotificationBubbleView.tsx b/src/common/layout/LayoutNotificationBubbleView.tsx index 5e5fdd9f..a4821664 100644 --- a/src/common/layout/LayoutNotificationBubbleView.tsx +++ b/src/common/layout/LayoutNotificationBubbleView.tsx @@ -6,12 +6,12 @@ export interface LayoutNotificationBubbleViewProps extends FlexProps { fadesOut?: boolean; timeoutMs?: number; - close: () => void; + onClose: () => void; } export const LayoutNotificationBubbleView: FC = props => { - const { fadesOut = true, timeoutMs = 8000, close = null, overflow = 'hidden', classNames = [], ...rest } = props; + const { fadesOut = true, timeoutMs = 8000, onClose = null, overflow = 'hidden', classNames = [], ...rest } = props; const [ isVisible, setIsVisible ] = useState(false); const getClassNames = useMemo(() => @@ -38,15 +38,15 @@ export const LayoutNotificationBubbleView: FC { setIsVisible(false); - setTimeout(() => close(), 300); + setTimeout(() => onClose(), 300); }, timeoutMs); return () => clearTimeout(timeout); - }, [ fadesOut, timeoutMs, close ]); + }, [ fadesOut, timeoutMs, onClose ]); return ( - + ); } diff --git a/src/components/campaign/CalendarView.tsx b/src/components/campaign/CalendarView.tsx index 48538fe3..e2961294 100644 --- a/src/components/campaign/CalendarView.tsx +++ b/src/components/campaign/CalendarView.tsx @@ -5,7 +5,7 @@ import { CalendarItemView } from './CalendarItemView'; interface CalendarViewProps { - close(): void; + onClose(): void; openPackage(id: number, asStaff: boolean): void; receivedProducts: Map; campaignName: string; @@ -19,7 +19,7 @@ const TOTAL_SHOWN_ITEMS = 5; export const CalendarView: FC = props => { - const { close = null, campaignName = null, currentDay = null, numDays = null, missedDays = null, openedDays = null, openPackage = null, receivedProducts = null } = props; + const { onClose = null, campaignName = null, currentDay = null, numDays = null, missedDays = null, openedDays = null, openPackage = null, receivedProducts = null } = props; const [ selectedDay, setSelectedDay ] = useState(currentDay); const [ index, setIndex ] = useState(Math.max(0, (selectedDay - 1))); @@ -97,7 +97,7 @@ export const CalendarView: FC = props => return ( - + diff --git a/src/components/campaign/CampaignView.tsx b/src/components/campaign/CampaignView.tsx index 6692beeb..230416e1 100644 --- a/src/components/campaign/CampaignView.tsx +++ b/src/components/campaign/CampaignView.tsx @@ -103,7 +103,7 @@ export const CampaignView: FC<{}> = props => return ( <> { (calendarData && isCalendarOpen) && - + } ) diff --git a/src/components/catalog/views/gift/CatalogGiftView.tsx b/src/components/catalog/views/gift/CatalogGiftView.tsx index 8034ef03..cf293529 100644 --- a/src/components/catalog/views/gift/CatalogGiftView.tsx +++ b/src/components/catalog/views/gift/CatalogGiftView.tsx @@ -26,7 +26,7 @@ export const CatalogGiftView: FC<{}> = props => const { catalogOptions = null } = useCatalog(); const { giftConfiguration = null } = catalogOptions; - const close = useCallback(() => + const onClose = useCallback(() => { setIsVisible(false); setPageId(0); @@ -46,12 +46,12 @@ export const CatalogGiftView: FC<{}> = props => switch(event.type) { case CatalogPurchasedEvent.PURCHASE_SUCCESS: - close(); + onClose(); return; case CatalogEvent.INIT_GIFT: const castedEvent = (event as CatalogInitGiftEvent); - close(); + onClose(); setPageId(castedEvent.pageId); setOfferId(castedEvent.offerId); @@ -59,7 +59,7 @@ export const CatalogGiftView: FC<{}> = props => setIsVisible(true); return; } - }, [ close ]); + }, [ onClose ]); useUiEvent(CatalogPurchasedEvent.PURCHASE_SUCCESS, onCatalogEvent); useUiEvent(CatalogEvent.INIT_GIFT, onCatalogEvent); @@ -158,7 +158,7 @@ export const CatalogGiftView: FC<{}> = props => return ( - + { LocalizeText('catalog.gift_wrapping.receiver') } @@ -216,7 +216,7 @@ export const CatalogGiftView: FC<{}> = props => - } - } @@ -99,7 +99,7 @@ export const NavigatorDoorStateView: FC<{}> = props => - diff --git a/src/components/navigator/views/room-settings/NavigatorRoomSettingsBasicTabView.tsx b/src/components/navigator/views/room-settings/NavigatorRoomSettingsBasicTabView.tsx index 8fb0d876..26eb4c04 100644 --- a/src/components/navigator/views/room-settings/NavigatorRoomSettingsBasicTabView.tsx +++ b/src/components/navigator/views/room-settings/NavigatorRoomSettingsBasicTabView.tsx @@ -14,13 +14,13 @@ interface NavigatorRoomSettingsTabViewProps { roomData: IRoomData; handleChange: (field: string, value: string | number | boolean) => void; - close: () => void; + onClose: () => void; } export const NavigatorRoomSettingsBasicTabView: FC = props => { - const { roomData = null, handleChange = null, close = null } = props; + const { roomData = null, handleChange = null, onClose = null } = props; const [ roomName, setRoomName ] = useState(''); const [ roomDescription, setRoomDescription ] = useState(''); const { showConfirm = null } = useNotification(); @@ -32,7 +32,7 @@ export const NavigatorRoomSettingsBasicTabView: FC = props => useMessageEvent(RoomSettingsDataEvent, onRoomSettingsEvent); - const close = () => + const onClose = () => { setRoomData(null); setCurrentTab(TABS[0]); @@ -181,7 +181,7 @@ export const NavigatorRoomSettingsView: FC<{}> = props => return ( - + { TABS.map(tab => { @@ -190,7 +190,7 @@ export const NavigatorRoomSettingsView: FC<{}> = props => { (currentTab === TABS[0]) && - } + } { (currentTab === TABS[1]) && } { (currentTab === TABS[2]) && diff --git a/src/components/notification-center/views/alert-layouts/GetAlertLayout.tsx b/src/components/notification-center/views/alert-layouts/GetAlertLayout.tsx index 6021b1b5..1c37e5a6 100644 --- a/src/components/notification-center/views/alert-layouts/GetAlertLayout.tsx +++ b/src/components/notification-center/views/alert-layouts/GetAlertLayout.tsx @@ -3,11 +3,11 @@ import { NitroSystemAlertView } from './NitroSystemAlertView'; import { NotificationDefaultAlertView } from './NotificationDefaultAlertView'; import { NotificationSeachAlertView } from './NotificationSearchAlertView'; -export const GetAlertLayout = (item: NotificationAlertItem, close: () => void) => +export const GetAlertLayout = (item: NotificationAlertItem, onClose: () => void) => { if(!item) return null; - const props = { key: item.id, item, close }; + const props = { key: item.id, item, onClose }; switch(item.alertType) { diff --git a/src/components/notification-center/views/alert-layouts/NitroSystemAlertView.tsx b/src/components/notification-center/views/alert-layouts/NitroSystemAlertView.tsx index b5cccaba..9855384e 100644 --- a/src/components/notification-center/views/alert-layouts/NitroSystemAlertView.tsx +++ b/src/components/notification-center/views/alert-layouts/NitroSystemAlertView.tsx @@ -9,10 +9,10 @@ interface NotificationDefaultAlertViewProps extends LayoutNotificationAlertViewP export const NitroSystemAlertView: FC = props => { - const { title = 'Nitro', close = null, ...rest } = props; + const { title = 'Nitro', onClose = null, ...rest } = props; return ( - +   diff --git a/src/components/notification-center/views/alert-layouts/NotificationDefaultAlertView.tsx b/src/components/notification-center/views/alert-layouts/NotificationDefaultAlertView.tsx index 73ba2ee0..38ae337b 100644 --- a/src/components/notification-center/views/alert-layouts/NotificationDefaultAlertView.tsx +++ b/src/components/notification-center/views/alert-layouts/NotificationDefaultAlertView.tsx @@ -9,7 +9,7 @@ interface NotificationDefaultAlertViewProps extends LayoutNotificationAlertViewP export const NotificationDefaultAlertView: FC = props => { - const { item = null, title = ((props.item && props.item.title) || ''), close = null, ...rest } = props; + const { item = null, title = ((props.item && props.item.title) || ''), onClose = null, ...rest } = props; const [ imageFailed, setImageFailed ] = useState(false) @@ -17,13 +17,13 @@ export const NotificationDefaultAlertView: FC { OpenUrl(item.clickUrl); - close(); - }, [ item, close ]); + onClose(); + }, [ item, onClose ]); const hasFrank = item.alertType === NotificationAlertType.DEFAULT; return ( - + { hasFrank && !item.imageUrl && } { item.imageUrl && !imageFailed && { @@ -47,7 +47,7 @@ export const NotificationDefaultAlertView: FC
{ !item.clickUrl && - } + } { item.clickUrl && (item.clickUrl.length > 0) && } } diff --git a/src/components/notification-center/views/alert-layouts/NotificationSearchAlertView.tsx b/src/components/notification-center/views/alert-layouts/NotificationSearchAlertView.tsx index 273a6aa6..508a142d 100644 --- a/src/components/notification-center/views/alert-layouts/NotificationSearchAlertView.tsx +++ b/src/components/notification-center/views/alert-layouts/NotificationSearchAlertView.tsx @@ -9,7 +9,7 @@ interface NotificationDefaultAlertViewProps extends LayoutNotificationAlertViewP export const NotificationSeachAlertView: FC = props => { - const { item = null, title = ((props.item && props.item.title) || ''), close = null, ...rest } = props; + const { item = null, title = ((props.item && props.item.title) || ''), onClose = null, ...rest } = props; const [ searchValue, setSearchValue ] = useState(''); const [ results, setResults ] = useState([]); @@ -18,8 +18,8 @@ export const NotificationSeachAlertView: FC = { OpenUrl(item.clickUrl); - close(); - }, [ item, close ]); + onClose(); + }, [ item, onClose ]); useEffect(() => { @@ -36,7 +36,7 @@ export const NotificationSeachAlertView: FC = const isAction = (item.clickUrl && item.clickUrl.startsWith('event:')); return ( - + updateSearchValue(event.target.value) } /> @@ -51,7 +51,7 @@ export const NotificationSeachAlertView: FC =
{ !isAction && !item.clickUrl && - } + } { item.clickUrl && (item.clickUrl.length > 0) && } diff --git a/src/components/notification-center/views/bubble-layouts/GetBubbleLayout.tsx b/src/components/notification-center/views/bubble-layouts/GetBubbleLayout.tsx index 6293f442..b22a2f61 100644 --- a/src/components/notification-center/views/bubble-layouts/GetBubbleLayout.tsx +++ b/src/components/notification-center/views/bubble-layouts/GetBubbleLayout.tsx @@ -2,11 +2,11 @@ import { NotificationBubbleItem, NotificationBubbleType } from '../../../../api' import { NotificationClubGiftBubbleView } from './NotificationClubGiftBubbleView'; import { NotificationDefaultBubbleView } from './NotificationDefaultBubbleView'; -export const GetBubbleLayout = (item: NotificationBubbleItem, close: () => void) => +export const GetBubbleLayout = (item: NotificationBubbleItem, onClose: () => void) => { if(!item) return null; - const props = { key: item.id, item, close }; + const props = { key: item.id, item, onClose }; switch(item.notificationType) { diff --git a/src/components/notification-center/views/bubble-layouts/NotificationClubGiftBubbleView.tsx b/src/components/notification-center/views/bubble-layouts/NotificationClubGiftBubbleView.tsx index c5bb304d..0ec73552 100644 --- a/src/components/notification-center/views/bubble-layouts/NotificationClubGiftBubbleView.tsx +++ b/src/components/notification-center/views/bubble-layouts/NotificationClubGiftBubbleView.tsx @@ -9,17 +9,17 @@ export interface NotificationClubGiftBubbleViewProps extends LayoutNotificationB export const NotificationClubGiftBubbleView: FC = props => { - const { item = null, close = null, ...rest } = props; + const { item = null, onClose = null, ...rest } = props; return ( - +
{ LocalizeText('notifications.text.club_gift') }
- { LocalizeText('notifications.button.later') } + { LocalizeText('notifications.button.later') }
); diff --git a/src/components/notification-center/views/bubble-layouts/NotificationDefaultBubbleView.tsx b/src/components/notification-center/views/bubble-layouts/NotificationDefaultBubbleView.tsx index 76041b45..91f00119 100644 --- a/src/components/notification-center/views/bubble-layouts/NotificationDefaultBubbleView.tsx +++ b/src/components/notification-center/views/bubble-layouts/NotificationDefaultBubbleView.tsx @@ -9,12 +9,12 @@ export interface NotificationDefaultBubbleViewProps extends LayoutNotificationBu export const NotificationDefaultBubbleView: FC = props => { - const { item = null, close = null, ...rest } = props; + const { item = null, onClose = null, ...rest } = props; const htmlText = item.message.replace(/\r\n|\r|\n/g, '
'); return ( - (item.linkUrl && item.linkUrl.length && OpenUrl(item.linkUrl)) } { ...rest }> + (item.linkUrl && item.linkUrl.length && OpenUrl(item.linkUrl)) } { ...rest }> { (item.iconUrl && item.iconUrl.length) && } diff --git a/src/components/notification-center/views/confirm-layouts/GetConfirmLayout.tsx b/src/components/notification-center/views/confirm-layouts/GetConfirmLayout.tsx index c2e97d77..fc3cfb4e 100644 --- a/src/components/notification-center/views/confirm-layouts/GetConfirmLayout.tsx +++ b/src/components/notification-center/views/confirm-layouts/GetConfirmLayout.tsx @@ -1,11 +1,11 @@ import { NotificationConfirmItem } from '../../../../api'; import { NotificationDefaultConfirmView } from './NotificationDefaultConfirmView'; -export const GetConfirmLayout = (item: NotificationConfirmItem, close: () => void) => +export const GetConfirmLayout = (item: NotificationConfirmItem, onClose: () => void) => { if(!item) return null; - const props = { key: item.id, item, close }; + const props = { key: item.id, item, onClose }; switch(item.confirmType) { diff --git a/src/components/notification-center/views/confirm-layouts/NotificationDefaultConfirmView.tsx b/src/components/notification-center/views/confirm-layouts/NotificationDefaultConfirmView.tsx index 48f41387..cb0351a0 100644 --- a/src/components/notification-center/views/confirm-layouts/NotificationDefaultConfirmView.tsx +++ b/src/components/notification-center/views/confirm-layouts/NotificationDefaultConfirmView.tsx @@ -9,25 +9,25 @@ export interface NotificationDefaultConfirmViewProps extends LayoutNotificationA export const NotificationDefaultConfirmView: FC = props => { - const { item = null, close = null, ...rest } = props; + const { item = null, onClose = null, ...rest } = props; const { message = null, onConfirm = null, onCancel = null, confirmText = null, cancelText = null, title = null } = item; const confirm = () => { if(onConfirm) onConfirm(); - close(); + onClose(); } const cancel = () => { if(onCancel) onCancel(); - close(); + onClose(); } return ( - + { message } diff --git a/src/components/room/widgets/avatar-info/AvatarInfoRentableBotChatView.tsx b/src/components/room/widgets/avatar-info/AvatarInfoRentableBotChatView.tsx index 9b24ccc0..524fa496 100644 --- a/src/components/room/widgets/avatar-info/AvatarInfoRentableBotChatView.tsx +++ b/src/components/room/widgets/avatar-info/AvatarInfoRentableBotChatView.tsx @@ -7,12 +7,12 @@ import { ContextMenuHeaderView } from '../context-menu/ContextMenuHeaderView'; interface AvatarInfoRentableBotChatViewProps { chatEvent: RoomWidgetUpdateRentableBotChatEvent; - close(): void; + onClose(): void; } export const AvatarInfoRentableBotChatView: FC = props => { - const { chatEvent = null, close = null } = props; + const { chatEvent = null, onClose = null } = props; // eslint-disable-next-line no-template-curly-in-string const [ newText, setNewText ] = useState(chatEvent.chat === '${bot.skill.chatter.configuration.text.placeholder}' ? '' : chatEvent.chat); const [ automaticChat, setAutomaticChat ] = useState(chatEvent.automaticChat); @@ -29,7 +29,7 @@ export const AvatarInfoRentableBotChatView: FC - + diff --git a/src/components/room/widgets/avatar-info/AvatarInfoUseProductConfirmView.tsx b/src/components/room/widgets/avatar-info/AvatarInfoUseProductConfirmView.tsx index 755b5687..e9d6718b 100644 --- a/src/components/room/widgets/avatar-info/AvatarInfoUseProductConfirmView.tsx +++ b/src/components/room/widgets/avatar-info/AvatarInfoUseProductConfirmView.tsx @@ -7,7 +7,7 @@ import { useRoom } from '../../../../hooks'; interface AvatarInfoUseProductConfirmViewProps { item: UseProductItem; - close: () => void; + onClose: () => void; } const _Str_5091: number = -1; @@ -21,7 +21,7 @@ const _Str_9653: number = 6; export const AvatarInfoUseProductConfirmView: FC = props => { - const { item = null, close = null } = props; + const { item = null, onClose = null } = props; const [ mode, setMode ] = useState(_Str_5091); const [ petData, setPetData ] = useState(null); const [ furniData, setFurniData ] = useState(null); @@ -38,8 +38,8 @@ export const AvatarInfoUseProductConfirmView: FC { @@ -223,7 +223,7 @@ export const AvatarInfoUseProductConfirmView: FC - + @@ -270,7 +270,7 @@ export const AvatarInfoUseProductConfirmView: FC } - + diff --git a/src/components/room/widgets/avatar-info/AvatarInfoUseProductView.tsx b/src/components/room/widgets/avatar-info/AvatarInfoUseProductView.tsx index b0c3f1fb..7b001801 100644 --- a/src/components/room/widgets/avatar-info/AvatarInfoUseProductView.tsx +++ b/src/components/room/widgets/avatar-info/AvatarInfoUseProductView.tsx @@ -10,7 +10,7 @@ interface AvatarInfoUseProductViewProps { item: UseProductItem; updateConfirmingProduct: (product: UseProductItem) => void; - close: () => void; + onClose: () => void; } const PRODUCT_PAGE_UKNOWN: number = 0; @@ -24,7 +24,7 @@ const PRODUCT_PAGE_FERTILIZE: number = 7; export const AvatarInfoUseProductView: FC = props => { - const { item = null, updateConfirmingProduct = null, close = null } = props; + const { item = null, updateConfirmingProduct = null, onClose = null } = props; const [ mode, setMode ] = useState(0); const { roomSession = null } = useRoom(); @@ -87,7 +87,7 @@ export const AvatarInfoUseProductView: FC = props }, [ item, updateConfirmingProduct ]); return ( - + { item.name } diff --git a/src/components/room/widgets/avatar-info/AvatarInfoWidgetView.tsx b/src/components/room/widgets/avatar-info/AvatarInfoWidgetView.tsx index 7f476b8f..410f515e 100644 --- a/src/components/room/widgets/avatar-info/AvatarInfoWidgetView.tsx +++ b/src/components/room/widgets/avatar-info/AvatarInfoWidgetView.tsx @@ -51,7 +51,7 @@ export const AvatarInfoWidgetView: FC<{}> = props => { if(!roomSession || isGameMode) return null; - if(activeNameBubble) return setActiveNameBubble(null) } />; + if(activeNameBubble) return setActiveNameBubble(null) } />; if(avatarInfo) { @@ -62,7 +62,7 @@ export const AvatarInfoWidgetView: FC<{}> = props => if(!isDecorating) return null; - return setAvatarInfo(null) } />; + return setAvatarInfo(null) } />; } case AvatarInfoUser.OWN_USER: case AvatarInfoUser.PEER: { @@ -74,20 +74,20 @@ export const AvatarInfoWidgetView: FC<{}> = props => { if(RoomEnterEffect.isRunning()) return null; - return setAvatarInfo(null) } />; + return setAvatarInfo(null) } />; } - return setAvatarInfo(null) } />; + return setAvatarInfo(null) } />; } case AvatarInfoPet.PET_INFO: { const info = (avatarInfo as AvatarInfoPet); - if(info.isOwner) return setAvatarInfo(null) } />; + if(info.isOwner) return setAvatarInfo(null) } />; - return setAvatarInfo(null) } />; + return setAvatarInfo(null) } />; } case AvatarInfoRentableBot.RENTABLE_BOT: { - return setAvatarInfo(null) } /> + return setAvatarInfo(null) } /> } } } @@ -102,16 +102,16 @@ export const AvatarInfoWidgetView: FC<{}> = props => switch(avatarInfo.type) { case AvatarInfoFurni.FURNI: - return setAvatarInfo(null) } />; + return setAvatarInfo(null) } />; case AvatarInfoUser.OWN_USER: case AvatarInfoUser.PEER: - return setAvatarInfo(null) } />; + return setAvatarInfo(null) } />; case AvatarInfoUser.BOT: - return setAvatarInfo(null) } />; + return setAvatarInfo(null) } />; case AvatarInfoRentableBot.RENTABLE_BOT: - return setAvatarInfo(null) } />; + return setAvatarInfo(null) } />; case AvatarInfoPet.PET_INFO: - return setAvatarInfo(null) } /> + return setAvatarInfo(null) } /> } } @@ -124,13 +124,13 @@ export const AvatarInfoWidgetView: FC<{}> = props => { getInfostandView() } } - { (nameBubbles.length > 0) && nameBubbles.map((name, index) => removeNameBubble(index) } />) } + { (nameBubbles.length > 0) && nameBubbles.map((name, index) => removeNameBubble(index) } />) } { (productBubbles.length > 0) && productBubbles.map((item, index) => { - return removeProductBubble(index) } />; + return removeProductBubble(index) } />; }) } - { rentableBotChatEvent && setRentableBotChatEvent(null) }/> } - { confirmingProduct && updateConfirmingProduct(null) } /> } + { rentableBotChatEvent && setRentableBotChatEvent(null) }/> } + { confirmingProduct && updateConfirmingProduct(null) } /> } ) } diff --git a/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetBotView.tsx b/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetBotView.tsx index a02bc918..7389cf34 100644 --- a/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetBotView.tsx +++ b/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetBotView.tsx @@ -6,12 +6,12 @@ import { Column, Flex, LayoutAvatarImageView, LayoutBadgeImageView, Text } from interface InfoStandWidgetBotViewProps { avatarInfo: AvatarInfoUser; - close: () => void; + onClose: () => void; } export const InfoStandWidgetBotView: FC = props => { - const { avatarInfo = null, close = null } = props; + const { avatarInfo = null, onClose = null } = props; if(!avatarInfo) return null; @@ -21,7 +21,7 @@ export const InfoStandWidgetBotView: FC = props => { avatarInfo.name } - +
diff --git a/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetFurniView.tsx b/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetFurniView.tsx index eaaf4483..98816a13 100644 --- a/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetFurniView.tsx +++ b/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetFurniView.tsx @@ -8,7 +8,7 @@ import { useMessageEvent, useRoom } from '../../../../../hooks'; interface InfoStandWidgetFurniViewProps { avatarInfo: AvatarInfoFurni; - close: () => void; + onClose: () => void; } const PICKUP_MODE_NONE: number = 0; @@ -17,7 +17,7 @@ const PICKUP_MODE_FULL: number = 2; export const InfoStandWidgetFurniView: FC = props => { - const { avatarInfo = null, close = null } = props; + const { avatarInfo = null, onClose = null } = props; const { roomSession = null } = useRoom(); const [ pickupMode, setPickupMode ] = useState(0); @@ -278,7 +278,7 @@ export const InfoStandWidgetFurniView: FC = props { avatarInfo.name } - +
diff --git a/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetPetView.tsx b/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetPetView.tsx index 648f2c1e..7847f439 100644 --- a/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetPetView.tsx +++ b/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetPetView.tsx @@ -6,12 +6,12 @@ import { Base, Column, Flex, LayoutPetImageView, Text, UserProfileIconView } fro interface InfoStandWidgetPetViewProps { avatarInfo: AvatarInfoPet; - close: () => void; + onClose: () => void; } export const InfoStandWidgetPetView: FC = props => { - const { avatarInfo = null, close = null } = props; + const { avatarInfo = null, onClose = null } = props; if(!avatarInfo) return null; @@ -21,7 +21,7 @@ export const InfoStandWidgetPetView: FC = props => { avatarInfo.name } - + { LocalizeText(`pet.breed.${ avatarInfo.petType }.${ avatarInfo.petBreed }`) }
diff --git a/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetRentableBotView.tsx b/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetRentableBotView.tsx index 667c4fdc..13aa9b62 100644 --- a/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetRentableBotView.tsx +++ b/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetRentableBotView.tsx @@ -7,12 +7,12 @@ import { Button, Column, Flex, LayoutAvatarImageView, LayoutBadgeImageView, Text interface InfoStandWidgetRentableBotViewProps { avatarInfo: AvatarInfoRentableBot; - close: () => void; + onClose: () => void; } export const InfoStandWidgetRentableBotView: FC = props => { - const { avatarInfo = null, close = null } = props; + const { avatarInfo = null, onClose = null } = props; const canPickup = useMemo(() => { @@ -34,7 +34,7 @@ export const InfoStandWidgetRentableBotView: FC { avatarInfo.name } - +
diff --git a/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetUserView.tsx b/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetUserView.tsx index d48eaf5e..a0e4086b 100644 --- a/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetUserView.tsx +++ b/src/components/room/widgets/avatar-info/infostand/InfoStandWidgetUserView.tsx @@ -10,12 +10,12 @@ interface InfoStandWidgetUserViewProps { avatarInfo: AvatarInfoUser; setAvatarInfo: Dispatch>; - close: () => void; + onClose: () => void; } export const InfoStandWidgetUserView: FC = props => { - const { avatarInfo = null, setAvatarInfo = null, close = null } = props; + const { avatarInfo = null, setAvatarInfo = null, onClose = null } = props; const [ motto, setMotto ] = useState(null); const [ isEditingMotto, setIsEditingMotto ] = useState(false); const [ relationships, setRelationships ] = useState(null); @@ -128,7 +128,7 @@ export const InfoStandWidgetUserView: FC = props = { avatarInfo.name } - +
diff --git a/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetAvatarView.tsx b/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetAvatarView.tsx index 792be669..e852bcb1 100644 --- a/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetAvatarView.tsx +++ b/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetAvatarView.tsx @@ -11,7 +11,7 @@ import { ContextMenuView } from '../../context-menu/ContextMenuView'; interface AvatarInfoWidgetAvatarViewProps { avatarInfo: AvatarInfoUser; - close: () => void; + onClose: () => void; } const MODE_NORMAL = 0; @@ -24,7 +24,7 @@ const MODE_RELATIONSHIP = 6; export const AvatarInfoWidgetAvatarView: FC = props => { - const { avatarInfo = null, close = null } = props; + const { avatarInfo = null, onClose = null } = props; const [ mode, setMode ] = useState(MODE_NORMAL); const [ respectsLeft, setRespectsLeft ] = useState(0); const { canRequestFriend = null } = useFriends(); @@ -197,7 +197,7 @@ export const AvatarInfoWidgetAvatarView: FC = p } } - if(hideMenu) close(); + if(hideMenu) onClose(); } useEffect(() => @@ -207,7 +207,7 @@ export const AvatarInfoWidgetAvatarView: FC = p }, [ avatarInfo ]); return ( - + GetUserProfile(avatarInfo.webID) }> { avatarInfo.name } diff --git a/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetDecorateView.tsx b/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetDecorateView.tsx index 672e0e4d..5ad5a680 100644 --- a/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetDecorateView.tsx +++ b/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetDecorateView.tsx @@ -18,7 +18,7 @@ export const AvatarInfoWidgetDecorateView: FC const { userId = -1, userName = '', roomIndex = -1, setIsDecorating = null } = props; return ( - + setIsDecorating(false) }> { LocalizeText('widget.avatar.stop_decorating') } diff --git a/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetFurniView.tsx b/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetFurniView.tsx index cb7a287e..62b9103c 100644 --- a/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetFurniView.tsx +++ b/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetFurniView.tsx @@ -10,12 +10,12 @@ import { ContextMenuView } from '../../context-menu/ContextMenuView'; interface AvatarInfoWidgetFurniViewProps { avatarInfo: AvatarInfoFurni; - close: () => void; + onClose: () => void; } export const AvatarInfoWidgetFurniView: FC = props => { - const { avatarInfo = null, close = null } = props; + const { avatarInfo = null, onClose = null } = props; const processAction = (name: string) => { @@ -42,7 +42,7 @@ export const AvatarInfoWidgetFurniView: FC = pro } return ( - + { avatarInfo.name } diff --git a/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetNameView.tsx b/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetNameView.tsx index 27500351..00e115bd 100644 --- a/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetNameView.tsx +++ b/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetNameView.tsx @@ -5,12 +5,12 @@ import { ContextMenuView } from '../../context-menu/ContextMenuView'; interface AvatarInfoWidgetNameViewProps { nameInfo: AvatarInfoName; - close: () => void; + onClose: () => void; } export const AvatarInfoWidgetNameView: FC = props => { - const { nameInfo = null, close = null } = props; + const { nameInfo = null, onClose = null } = props; const getClassNames = useMemo(() => { @@ -22,7 +22,7 @@ export const AvatarInfoWidgetNameView: FC = props }, [ nameInfo ]); return ( - +
{ nameInfo.name }
diff --git a/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetOwnAvatarView.tsx b/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetOwnAvatarView.tsx index e14aff74..a4de1a6a 100644 --- a/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetOwnAvatarView.tsx +++ b/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetOwnAvatarView.tsx @@ -14,7 +14,7 @@ interface AvatarInfoWidgetOwnAvatarViewProps avatarInfo: AvatarInfoUser; isDancing: boolean; setIsDecorating: Dispatch>; - close: () => void; + onClose: () => void; } const MODE_NORMAL = 0; @@ -25,7 +25,7 @@ const MODE_SIGNS = 4; export const AvatarInfoWidgetOwnAvatarView: FC = props => { - const { avatarInfo = null, isDancing = false, setIsDecorating = null, close = null } = props; + const { avatarInfo = null, isDancing = false, setIsDecorating = null, onClose = null } = props; const [ mode, setMode ] = useState((isDancing && HasHabboClub()) ? MODE_CLUB_DANCES : MODE_NORMAL); const { roomSession = null } = useRoom(); @@ -107,7 +107,7 @@ export const AvatarInfoWidgetOwnAvatarView: FC (avatarInfo.amIOwner || avatarInfo.amIAnyRoomController || (avatarInfo.roomControllerLevel > RoomControllerLevel.GUEST)); @@ -115,7 +115,7 @@ export const AvatarInfoWidgetOwnAvatarView: FC + GetUserProfile(avatarInfo.webID) }> { avatarInfo.name } diff --git a/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetOwnPetView.tsx b/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetOwnPetView.tsx index e69ce62a..107393b5 100644 --- a/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetOwnPetView.tsx +++ b/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetOwnPetView.tsx @@ -9,7 +9,7 @@ import { ContextMenuView } from '../../context-menu/ContextMenuView'; interface AvatarInfoWidgetOwnPetViewProps { avatarInfo: AvatarInfoPet; - close: () => void; + onClose: () => void; } const MODE_NORMAL: number = 0; @@ -19,7 +19,7 @@ const MODE_MONSTER_PLANT: number = 3; export const AvatarInfoWidgetOwnPetView: FC = props => { - const { avatarInfo = null, close = null } = props; + const { avatarInfo = null, onClose = null } = props; const [ mode, setMode ] = useState(MODE_NORMAL); const [ respectsLeft, setRespectsLeft ] = useState(0); const { roomSession = null } = useRoom(); @@ -118,7 +118,7 @@ export const AvatarInfoWidgetOwnPetView: FC = p } } - if(hideMenu) close(); + if(hideMenu) onClose(); } useEffect(() => @@ -136,7 +136,7 @@ export const AvatarInfoWidgetOwnPetView: FC = p }, [ avatarInfo ]); return ( - + { avatarInfo.name } diff --git a/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetPetView.tsx b/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetPetView.tsx index 08fd69cf..a4cc6721 100644 --- a/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetPetView.tsx +++ b/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetPetView.tsx @@ -9,7 +9,7 @@ import { ContextMenuView } from '../../context-menu/ContextMenuView'; interface AvatarInfoWidgetPetViewProps { avatarInfo: AvatarInfoPet; - close: () => void; + onClose: () => void; } const MODE_NORMAL: number = 0; @@ -19,7 +19,7 @@ const MODE_MONSTER_PLANT: number = 3; export const AvatarInfoWidgetPetView: FC = props => { - const { avatarInfo = null, close = null } = props; + const { avatarInfo = null, onClose = null } = props; const [ mode, setMode ] = useState(MODE_NORMAL); const [ respectsLeft, setRespectsLeft ] = useState(0); const { roomSession = null } = useRoom(); @@ -85,7 +85,7 @@ export const AvatarInfoWidgetPetView: FC = props = } } - if(hideMenu) close(); + if(hideMenu) onClose(); } useEffect(() => @@ -103,7 +103,7 @@ export const AvatarInfoWidgetPetView: FC = props = }, [ avatarInfo ]); return ( - + { avatarInfo.name } diff --git a/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetRentableBotView.tsx b/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetRentableBotView.tsx index 3f4ff04e..65e15132 100644 --- a/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetRentableBotView.tsx +++ b/src/components/room/widgets/avatar-info/menu/AvatarInfoWidgetRentableBotView.tsx @@ -10,7 +10,7 @@ import { ContextMenuView } from '../../context-menu/ContextMenuView'; interface AvatarInfoWidgetRentableBotViewProps { avatarInfo: AvatarInfoRentableBot; - close: () => void; + onClose: () => void; } const MODE_NORMAL = 0; @@ -19,7 +19,7 @@ const MODE_CHANGE_MOTTO = 2; export const AvatarInfoWidgetRentableBotView: FC = props => { - const { avatarInfo = null, close = null } = props; + const { avatarInfo = null, onClose = null } = props; const [ mode, setMode ] = useState(MODE_NORMAL); const [ newName, setNewName ] = useState(''); const [ newMotto, setNewMotto ] = useState(''); @@ -55,7 +55,7 @@ export const AvatarInfoWidgetRentableBotView: FC @@ -131,7 +131,7 @@ export const AvatarInfoWidgetRentableBotView: FC + { avatarInfo.name } diff --git a/src/components/room/widgets/choosers/ChooserWidgetView.tsx b/src/components/room/widgets/choosers/ChooserWidgetView.tsx index b424760b..12c5387f 100644 --- a/src/components/room/widgets/choosers/ChooserWidgetView.tsx +++ b/src/components/room/widgets/choosers/ChooserWidgetView.tsx @@ -8,12 +8,12 @@ interface ChooserWidgetViewProps title: string; items: RoomObjectItem[]; selectItem: (item: RoomObjectItem) => void; - close: () => void; + onClose: () => void; } export const ChooserWidgetView: FC = props => { - const { title = null, items = [], selectItem = null, close = null } = props; + const { title = null, items = [], selectItem = null, onClose = null } = props; const [ selectedItem, setSelectedItem ] = useState(null); const [ searchValue, setSearchValue ] = useState(''); const canSeeId = GetSessionDataManager().isModerator; @@ -45,7 +45,7 @@ export const ChooserWidgetView: FC = props => return ( - + setSearchValue(event.target.value) } /> diff --git a/src/components/room/widgets/choosers/FurniChooserWidgetView.tsx b/src/components/room/widgets/choosers/FurniChooserWidgetView.tsx index 2bd804ee..ae84e601 100644 --- a/src/components/room/widgets/choosers/FurniChooserWidgetView.tsx +++ b/src/components/room/widgets/choosers/FurniChooserWidgetView.tsx @@ -6,7 +6,7 @@ import { ChooserWidgetView } from './ChooserWidgetView'; export const FurniChooserWidgetView: FC<{}> = props => { - const { items = null, close = null, selectItem = null, populateChooser = null } = useFurniChooserWidget(); + const { items = null, onClose = null, selectItem = null, populateChooser = null } = useFurniChooserWidget(); useEffect(() => { @@ -27,5 +27,5 @@ export const FurniChooserWidgetView: FC<{}> = props => if(!items) return null; - return ; + return ; } diff --git a/src/components/room/widgets/choosers/UserChooserWidgetView.tsx b/src/components/room/widgets/choosers/UserChooserWidgetView.tsx index 53986117..f73e074f 100644 --- a/src/components/room/widgets/choosers/UserChooserWidgetView.tsx +++ b/src/components/room/widgets/choosers/UserChooserWidgetView.tsx @@ -6,7 +6,7 @@ import { ChooserWidgetView } from './ChooserWidgetView'; export const UserChooserWidgetView: FC<{}> = props => { - const { items = null, close = null, selectItem = null, populateChooser = null } = useUserChooserWidget(); + const { items = null, onClose = null, selectItem = null, populateChooser = null } = useUserChooserWidget(); useEffect(() => { @@ -27,5 +27,5 @@ export const UserChooserWidgetView: FC<{}> = props => if(!items) return null; - return ; + return ; } diff --git a/src/components/room/widgets/context-menu/ContextMenuView.tsx b/src/components/room/widgets/context-menu/ContextMenuView.tsx index b1c5c3d2..7b80bf80 100644 --- a/src/components/room/widgets/context-menu/ContextMenuView.tsx +++ b/src/components/room/widgets/context-menu/ContextMenuView.tsx @@ -10,7 +10,7 @@ interface ContextMenuViewProps extends BaseProps category: number; userType?: number; fades?: boolean; - close: () => void; + onClose: () => void; collapsable?: boolean; } @@ -27,7 +27,7 @@ let FADE_TIME = 1; export const ContextMenuView: FC = props => { - const { objectId = -1, category = -1, userType = -1, fades = false, close = null, position = 'absolute', classNames = [], style = {}, children = null, collapsable = false, ...rest } = props; + const { objectId = -1, category = -1, userType = -1, fades = false, onClose = null, position = 'absolute', classNames = [], style = {}, children = null, collapsable = false, ...rest } = props; const [ pos, setPos ] = useState<{ x: number, y: number }>({ x: null, y: null }); const [ opacity, setOpacity ] = useState(1); const [ isFading, setIsFading ] = useState(false); @@ -44,13 +44,13 @@ export const ContextMenuView: FC = props => if(newOpacity <= 0) { - close(); + onClose(); return false; } setOpacity(newOpacity); - }, [ isFading, close ]); + }, [ isFading, onClose ]); const updatePosition = useCallback((bounds: NitroRectangle, location: NitroPoint) => { diff --git a/src/components/room/widgets/furniture/FurnitureBackgroundColorView.tsx b/src/components/room/widgets/furniture/FurnitureBackgroundColorView.tsx index cd720f72..ce8e8a82 100644 --- a/src/components/room/widgets/furniture/FurnitureBackgroundColorView.tsx +++ b/src/components/room/widgets/furniture/FurnitureBackgroundColorView.tsx @@ -6,13 +6,13 @@ import { useFurnitureBackgroundColorWidget } from '../../../../hooks'; export const FurnitureBackgroundColorView: FC<{}> = props => { - const { objectId = -1, hue = 0, setHue = null, saturation = 0, setSaturation = null, lightness = 0, setLightness = null, applyToner = null, toggleToner = null, close = null } = useFurnitureBackgroundColorWidget(); + const { objectId = -1, hue = 0, setHue = null, saturation = 0, setSaturation = null, lightness = 0, setLightness = null, applyToner = null, toggleToner = null, onClose = null } = useFurnitureBackgroundColorWidget(); if(objectId === -1) return null; return ( - + diff --git a/src/components/room/widgets/furniture/FurnitureBadgeDisplayView.tsx b/src/components/room/widgets/furniture/FurnitureBadgeDisplayView.tsx index c36b58a4..6c449d2d 100644 --- a/src/components/room/widgets/furniture/FurnitureBadgeDisplayView.tsx +++ b/src/components/room/widgets/furniture/FurnitureBadgeDisplayView.tsx @@ -4,9 +4,9 @@ import { useFurnitureBadgeDisplayWidget } from '../../../../hooks'; export const FurnitureBadgeDisplayView: FC<{}> = props => { - const { objectId = -1, color = '1', badgeName = '', badgeDesc = '', date = '', senderName = '', close = null } = useFurnitureBadgeDisplayWidget(); + const { objectId = -1, color = '1', badgeName = '', badgeDesc = '', date = '', senderName = '', onClose = null } = useFurnitureBadgeDisplayWidget(); if(objectId === -1) return null; - return ; + return ; } diff --git a/src/components/room/widgets/furniture/FurnitureDimmerView.tsx b/src/components/room/widgets/furniture/FurnitureDimmerView.tsx index 9d3f6699..4b17e281 100644 --- a/src/components/room/widgets/furniture/FurnitureDimmerView.tsx +++ b/src/components/room/widgets/furniture/FurnitureDimmerView.tsx @@ -11,7 +11,7 @@ export const FurnitureDimmerView: FC<{}> = props => const [ isVisible, setIsVisible ] = useState(false); const { presets = [], dimmerState = 0, selectedPresetId = 0, color = 0xFFFFFF, brightness = 0xFF, effectId = 0, selectedColor = 0, setSelectedColor = null, selectedBrightness = 0, setSelectedBrightness = null, selectedEffectId = 0, setSelectedEffectId = null, selectPresetId = null, applyChanges } = useFurnitureDimmerWidget(); - const close = () => + const onClose = () => { FurnitureDimmerUtilities.previewDimmer(color, brightness, (effectId === 2)); @@ -33,7 +33,7 @@ export const FurnitureDimmerView: FC<{}> = props => return ( - + { (dimmerState === 1) && { presets.map(preset => selectPresetId(preset.id) }>{ LocalizeText(`widget.dimmer.tab.${ preset.id }`) }) } diff --git a/src/components/room/widgets/furniture/FurnitureExchangeCreditView.tsx b/src/components/room/widgets/furniture/FurnitureExchangeCreditView.tsx index 3cf28a9f..130646fe 100644 --- a/src/components/room/widgets/furniture/FurnitureExchangeCreditView.tsx +++ b/src/components/room/widgets/furniture/FurnitureExchangeCreditView.tsx @@ -5,13 +5,13 @@ import { useFurnitureExchangeWidget } from '../../../../hooks'; export const FurnitureExchangeCreditView: FC<{}> = props => { - const { objectId = -1, value = 0, close = null, redeem = null } = useFurnitureExchangeWidget(); + const { objectId = -1, value = 0, onClose = null, redeem = null } = useFurnitureExchangeWidget(); if(objectId === -1) return null; return ( - + diff --git a/src/components/room/widgets/furniture/FurnitureExternalImageView.tsx b/src/components/room/widgets/furniture/FurnitureExternalImageView.tsx index 1deb3241..c014d2c9 100644 --- a/src/components/room/widgets/furniture/FurnitureExternalImageView.tsx +++ b/src/components/room/widgets/furniture/FurnitureExternalImageView.tsx @@ -5,13 +5,13 @@ import { useFurnitureExternalImageWidget } from '../../../../hooks'; export const FurnitureExternalImageView: FC<{}> = props => { - const { objectId = -1, photoData = null, close = null } = useFurnitureExternalImageWidget(); + const { objectId = -1, photoData = null, onClose = null } = useFurnitureExternalImageWidget(); if((objectId === -1) || !photoData) return null; return ( - + { !photoData.w && diff --git a/src/components/room/widgets/furniture/FurnitureFriendFurniView.tsx b/src/components/room/widgets/furniture/FurnitureFriendFurniView.tsx index 546d89f3..96e3320c 100644 --- a/src/components/room/widgets/furniture/FurnitureFriendFurniView.tsx +++ b/src/components/room/widgets/furniture/FurnitureFriendFurniView.tsx @@ -5,7 +5,7 @@ import { useFurnitureFriendFurniWidget } from '../../../../hooks'; export const FurnitureFriendFurniView: FC<{}> = props => { - const { objectId = -1, type = 0, stage = 0, usernames = [], figures = [], date = null, close = null, respond = null } = useFurnitureFriendFurniWidget(); + const { objectId = -1, type = 0, stage = 0, usernames = [], figures = [], date = null, onClose = null, respond = null } = useFurnitureFriendFurniWidget(); if(objectId === -1) return null; @@ -13,7 +13,7 @@ export const FurnitureFriendFurniView: FC<{}> = props => { return ( - +
{ LocalizeText('friend.furniture.confirm.lock.subtitle') } @@ -37,7 +37,7 @@ export const FurnitureFriendFurniView: FC<{}> = props => return (
-
+
diff --git a/src/components/room/widgets/furniture/FurnitureGiftOpeningView.tsx b/src/components/room/widgets/furniture/FurnitureGiftOpeningView.tsx index 75e83dd4..d6a8c001 100644 --- a/src/components/room/widgets/furniture/FurnitureGiftOpeningView.tsx +++ b/src/components/room/widgets/furniture/FurnitureGiftOpeningView.tsx @@ -5,13 +5,13 @@ import { useFurniturePresentWidget } from '../../../../hooks'; export const FurnitureGiftOpeningView: FC<{}> = props => { - const { objectId = -1, classId = -1, itemType = null, text = null, isOwnerOfFurniture = false, senderName = null, senderFigure = null, placedItemId = -1, placedItemType = null, placedInRoom = false, imageUrl = null, openPresent = null, close = null } = useFurniturePresentWidget(); + const { objectId = -1, classId = -1, itemType = null, text = null, isOwnerOfFurniture = false, senderName = null, senderFigure = null, placedItemId = -1, placedItemType = null, placedInRoom = false, imageUrl = null, openPresent = null, onClose = null } = useFurniturePresentWidget(); if(objectId === -1) return null; return ( - + { (placedItemId === -1) && diff --git a/src/components/room/widgets/furniture/FurnitureMannequinView.tsx b/src/components/room/widgets/furniture/FurnitureMannequinView.tsx index 4e52a105..a5c3cedc 100644 --- a/src/components/room/widgets/furniture/FurnitureMannequinView.tsx +++ b/src/components/room/widgets/furniture/FurnitureMannequinView.tsx @@ -15,7 +15,7 @@ export const FurnitureMannequinView: FC<{}> = props => { const [ renderedFigure, setRenderedFigure ] = useState(null); const [ mode, setMode ] = useState(MODE_NONE); - const { objectId = -1, figure = null, gender = null, clubLevel = HabboClubLevelEnum.NO_CLUB, name = null, setName = null, saveFigure = null, wearFigure = null, saveName = null, close = null } = useFurnitureMannequinWidget(); + const { objectId = -1, figure = null, gender = null, clubLevel = HabboClubLevelEnum.NO_CLUB, name = null, setName = null, saveFigure = null, wearFigure = null, saveName = null, onClose = null } = useFurnitureMannequinWidget(); useEffect(() => { @@ -82,7 +82,7 @@ export const FurnitureMannequinView: FC<{}> = props => return ( - + diff --git a/src/components/room/widgets/furniture/FurnitureStackHeightView.tsx b/src/components/room/widgets/furniture/FurnitureStackHeightView.tsx index 08e6982d..f3a73b6c 100644 --- a/src/components/room/widgets/furniture/FurnitureStackHeightView.tsx +++ b/src/components/room/widgets/furniture/FurnitureStackHeightView.tsx @@ -7,13 +7,13 @@ import { useFurnitureStackHeightWidget } from '../../../../hooks'; export const FurnitureStackHeightView: FC<{}> = props => { - const { objectId = -1, height = 0, maxHeight = 40, close = null, updateHeight = null } = useFurnitureStackHeightWidget(); + const { objectId = -1, height = 0, maxHeight = 40, onClose = null, updateHeight = null } = useFurnitureStackHeightWidget(); if(objectId === -1) return null; return ( - + { LocalizeText('widget.custom.stack.height.text') } diff --git a/src/components/room/widgets/furniture/FurnitureStickieView.tsx b/src/components/room/widgets/furniture/FurnitureStickieView.tsx index e171bb69..f44b0182 100644 --- a/src/components/room/widgets/furniture/FurnitureStickieView.tsx +++ b/src/components/room/widgets/furniture/FurnitureStickieView.tsx @@ -17,7 +17,7 @@ const getStickieColorName = (color: string) => export const FurnitureStickieView: FC<{}> = props => { - const { objectId = -1, color = '0', text = '', canModify = false, updateColor = null, updateText = null, trash = null, close = null } = useFurnitureStickieWidget(); + const { objectId = -1, color = '0', text = '', canModify = false, updateColor = null, updateText = null, trash = null, onClose = null } = useFurnitureStickieWidget(); const [ isEditing, setIsEditing ] = useState(false); useEffect(() => @@ -41,7 +41,7 @@ export const FurnitureStickieView: FC<{}> = props => }) } }
-
+
{ !isEditing ?
setIsEditing(true) }>{ text }
: } diff --git a/src/components/room/widgets/furniture/FurnitureTrophyView.tsx b/src/components/room/widgets/furniture/FurnitureTrophyView.tsx index 1f6bf79e..7977097e 100644 --- a/src/components/room/widgets/furniture/FurnitureTrophyView.tsx +++ b/src/components/room/widgets/furniture/FurnitureTrophyView.tsx @@ -4,9 +4,9 @@ import { useFurnitureTrophyWidget } from '../../../../hooks'; export const FurnitureTrophyView: FC<{}> = props => { - const { objectId = -1, color = '1', senderName = '', date = '', message = '', close = null } = useFurnitureTrophyWidget(); + const { objectId = -1, color = '1', senderName = '', date = '', message = '', onClose = null } = useFurnitureTrophyWidget(); if(objectId === -1) return null; - return ; + return ; } diff --git a/src/components/room/widgets/furniture/FurnitureYoutubeDisplayView.tsx b/src/components/room/widgets/furniture/FurnitureYoutubeDisplayView.tsx index 0f967981..a235f25b 100644 --- a/src/components/room/widgets/furniture/FurnitureYoutubeDisplayView.tsx +++ b/src/components/room/widgets/furniture/FurnitureYoutubeDisplayView.tsx @@ -8,7 +8,7 @@ import { useFurnitureYoutubeWidget } from '../../../../hooks'; export const FurnitureYoutubeDisplayView: FC<{}> = props => { const [ player, setPlayer ] = useState(null); - const { objectId = -1, videoId = null, videoStart = 0, videoEnd = 0, currentVideoState = null, selectedVideo = null, playlists = [], close = null, previous = null, next = null, pause = null, play = null, selectVideo = null } = useFurnitureYoutubeWidget(); + const { objectId = -1, videoId = null, videoStart = 0, videoEnd = 0, currentVideoState = null, selectedVideo = null, playlists = [], onClose = null, previous = null, next = null, pause = null, play = null, selectVideo = null } = useFurnitureYoutubeWidget(); const onStateChange = useCallback((event: { target: YouTubePlayer; data: number }) => { @@ -69,7 +69,7 @@ export const FurnitureYoutubeDisplayView: FC<{}> = props => return ( - +
diff --git a/src/components/room/widgets/furniture/context-menu/EffectBoxConfirmView.tsx b/src/components/room/widgets/furniture/context-menu/EffectBoxConfirmView.tsx index 644ffd81..f7e35b91 100644 --- a/src/components/room/widgets/furniture/context-menu/EffectBoxConfirmView.tsx +++ b/src/components/room/widgets/furniture/context-menu/EffectBoxConfirmView.tsx @@ -6,30 +6,30 @@ import { useRoom } from '../../../../../hooks'; interface EffectBoxConfirmViewProps { objectId: number; - close: () => void; + onClose: () => void; } export const EffectBoxConfirmView: FC = props => { - const { objectId = -1, close = null } = props; + const { objectId = -1, onClose = null } = props; const { roomSession = null } = useRoom(); const useProduct = () => { roomSession.useMultistateItem(objectId); - close(); + onClose(); } return ( - + { LocalizeText('effectbox.header.description') } - + diff --git a/src/components/room/widgets/furniture/context-menu/FurnitureContextMenuView.tsx b/src/components/room/widgets/furniture/context-menu/FurnitureContextMenuView.tsx index 1c431643..4ea67733 100644 --- a/src/components/room/widgets/furniture/context-menu/FurnitureContextMenuView.tsx +++ b/src/components/room/widgets/furniture/context-menu/FurnitureContextMenuView.tsx @@ -16,18 +16,18 @@ const EFFECTBOX_OPEN: string = 'EFFECTBOX_OPEN'; export const FurnitureContextMenuView: FC<{}> = props => { - const { closeConfirm = null, processAction = null, objectId = -1, mode = null, confirmMode = null, confirmingObjectId = -1, groupData = null, isGroupMember = false } = useFurnitureContextMenuWidget(); + const { closeConfirm = null, processAction = null, onClose = null, objectId = -1, mode = null, confirmMode = null, confirmingObjectId = -1, groupData = null, isGroupMember = false } = useFurnitureContextMenuWidget(); return ( <> { (confirmMode === MONSTERPLANT_SEED_CONFIRMATION) && - } + } { (confirmMode === PURCHASABLE_CLOTHING_CONFIRMATION) && - } + } { (confirmMode === EFFECTBOX_OPEN) && - } + } { (objectId >= 0) && mode && - + { (mode === ContextMenuEnum.FRIEND_FURNITURE) && <> diff --git a/src/components/room/widgets/furniture/context-menu/MonsterPlantSeedConfirmView.tsx b/src/components/room/widgets/furniture/context-menu/MonsterPlantSeedConfirmView.tsx index 619b719c..b7163cc5 100644 --- a/src/components/room/widgets/furniture/context-menu/MonsterPlantSeedConfirmView.tsx +++ b/src/components/room/widgets/furniture/context-menu/MonsterPlantSeedConfirmView.tsx @@ -7,7 +7,7 @@ import { useRoom } from '../../../../../hooks'; interface MonsterPlantSeedConfirmViewProps { objectId: number; - close: () => void; + onClose: () => void; } const MODE_DEFAULT: number = -1; @@ -15,7 +15,7 @@ const MODE_MONSTERPLANT_SEED: number = 0; export const MonsterPlantSeedConfirmView: FC = props => { - const { objectId = -1, close = null } = props; + const { objectId = -1, onClose = null } = props; const [ furniData, setFurniData ] = useState(null); const [ mode, setMode ] = useState(MODE_DEFAULT); const { roomSession = null } = useRoom(); @@ -24,7 +24,7 @@ export const MonsterPlantSeedConfirmView: FC = { roomSession.useMultistateItem(objectId); - close(); + onClose(); } useEffect(() => @@ -48,19 +48,19 @@ export const MonsterPlantSeedConfirmView: FC = if(mode === MODE_DEFAULT) { - close(); + onClose(); return; } setMode(mode); - }, [ roomSession, objectId, close ]); + }, [ roomSession, objectId, onClose ]); if(mode === MODE_DEFAULT) return null; return ( - + @@ -74,7 +74,7 @@ export const MonsterPlantSeedConfirmView: FC = { LocalizeText('useproduct.widget.info.plant_seed') } - + diff --git a/src/components/room/widgets/furniture/context-menu/PurchasableClothingConfirmView.tsx b/src/components/room/widgets/furniture/context-menu/PurchasableClothingConfirmView.tsx index 60bbb2f9..d07d5e82 100644 --- a/src/components/room/widgets/furniture/context-menu/PurchasableClothingConfirmView.tsx +++ b/src/components/room/widgets/furniture/context-menu/PurchasableClothingConfirmView.tsx @@ -7,7 +7,7 @@ import { useRoom } from '../../../../../hooks'; interface PurchasableClothingConfirmViewProps { objectId: number; - close: () => void; + onClose: () => void; } const MODE_DEFAULT: number = -1; @@ -15,7 +15,7 @@ const MODE_PURCHASABLE_CLOTHING: number = 0; export const PurchasableClothingConfirmView: FC = props => { - const { objectId = -1, close = null } = props; + const { objectId = -1, onClose = null } = props; const [ mode, setMode ] = useState(MODE_DEFAULT); const [ gender, setGender ] = useState(FigureData.MALE); const [ newFigure, setNewFigure ] = useState(null); @@ -26,7 +26,7 @@ export const PurchasableClothingConfirmView: FC @@ -62,7 +62,7 @@ export const PurchasableClothingConfirmView: FC - + @@ -93,7 +93,7 @@ export const PurchasableClothingConfirmView: FC{ LocalizeText('useproduct.widget.info.bind_clothing') } - + diff --git a/src/components/wired/views/WiredBaseView.tsx b/src/components/wired/views/WiredBaseView.tsx index c18a0cea..6227c669 100644 --- a/src/components/wired/views/WiredBaseView.tsx +++ b/src/components/wired/views/WiredBaseView.tsx @@ -21,7 +21,7 @@ export const WiredBaseView: FC> = props => const [ needsSave, setNeedsSave ] = useState(false); const { trigger = null, setTrigger = null, setIntParams = null, setStringParam = null, setFurniIds = null, saveWired = null } = useWired(); - const close = () => setTrigger(null); + const onClose = () => setTrigger(null); const onSave = () => { @@ -85,7 +85,7 @@ export const WiredBaseView: FC> = props => return ( - + @@ -103,7 +103,7 @@ export const WiredBaseView: FC> = props => } - + diff --git a/src/hooks/rooms/widgets/furniture/useFurnitureBackgroundColorWidget.ts b/src/hooks/rooms/widgets/furniture/useFurnitureBackgroundColorWidget.ts index b9855daa..1e882e2d 100644 --- a/src/hooks/rooms/widgets/furniture/useFurnitureBackgroundColorWidget.ts +++ b/src/hooks/rooms/widgets/furniture/useFurnitureBackgroundColorWidget.ts @@ -17,7 +17,7 @@ const useFurnitureBackgroundColorWidgetState = () => const applyToner = () => SendMessageComposer(new ApplyTonerComposer(objectId, hue, saturation, lightness)); const toggleToner = () => roomSession.useMultistateItem(objectId); - const close = () => + const onClose = () => { DispatchUiEvent(new RoomWidgetUpdateBackgroundColorPreviewEvent(RoomWidgetUpdateBackgroundColorPreviewEvent.CLEAR_PREVIEW)); @@ -46,7 +46,7 @@ const useFurnitureBackgroundColorWidgetState = () => { if((event.id !== objectId) || (event.category !== category)) return; - close(); + onClose(); }); useEffect(() => @@ -56,7 +56,7 @@ const useFurnitureBackgroundColorWidgetState = () => DispatchUiEvent(new RoomWidgetUpdateBackgroundColorPreviewEvent(RoomWidgetUpdateBackgroundColorPreviewEvent.PREVIEW, hue, saturation, lightness)); }, [ objectId, category, hue, saturation, lightness ]); - return { objectId, hue, setHue, saturation, setSaturation, lightness, setLightness, applyToner, toggleToner, close }; + return { objectId, hue, setHue, saturation, setSaturation, lightness, setLightness, applyToner, toggleToner, onClose }; } export const useFurnitureBackgroundColorWidget = useFurnitureBackgroundColorWidgetState; diff --git a/src/hooks/rooms/widgets/furniture/useFurnitureBadgeDisplayWidget.ts b/src/hooks/rooms/widgets/furniture/useFurnitureBadgeDisplayWidget.ts index c8fb0185..5ef2bfc4 100644 --- a/src/hooks/rooms/widgets/furniture/useFurnitureBadgeDisplayWidget.ts +++ b/src/hooks/rooms/widgets/furniture/useFurnitureBadgeDisplayWidget.ts @@ -16,7 +16,7 @@ const useFurnitureBadgeDisplayWidgetState = () => const [ senderName, setSenderName ] = useState(''); const { simpleAlert = null } = useNotification(); - const close = () => + const onClose = () => { setObjectId(-1); setCategory(-1); @@ -66,10 +66,10 @@ const useFurnitureBadgeDisplayWidgetState = () => { if((event.id !== objectId) || (event.category !== category)) return; - close(); + onClose(); }); - return { objectId, category, color, badgeName, badgeDesc, date, senderName, close }; + return { objectId, category, color, badgeName, badgeDesc, date, senderName, onClose }; } export const useFurnitureBadgeDisplayWidget = useFurnitureBadgeDisplayWidgetState; diff --git a/src/hooks/rooms/widgets/furniture/useFurnitureContextMenuWidget.ts b/src/hooks/rooms/widgets/furniture/useFurnitureContextMenuWidget.ts index 4ff68913..8cd0cb30 100644 --- a/src/hooks/rooms/widgets/furniture/useFurnitureContextMenuWidget.ts +++ b/src/hooks/rooms/widgets/furniture/useFurnitureContextMenuWidget.ts @@ -19,7 +19,7 @@ const useFurnitureContextMenuWidgetState = () => const [ isGroupMember, setIsGroupMember ] = useState(false); const { roomSession = null } = useRoom(); - const close = useCallback(() => + const onClose = useCallback(() => { setObjectId(-1); setGroupData(null); @@ -63,7 +63,7 @@ const useFurnitureContextMenuWidgetState = () => } } - close(); + onClose(); } useRoomEngineEvent([ @@ -86,7 +86,7 @@ const useFurnitureContextMenuWidgetState = () => setConfirmingObjectId(object.id); setConfirmMode(MONSTERPLANT_SEED_CONFIRMATION); - close(); + onClose(); return; case RoomEngineTriggerWidgetEvent.REQUEST_EFFECTBOX_OPEN_DIALOG: if(!IsOwnerOfFurniture(object)) return; @@ -94,7 +94,7 @@ const useFurnitureContextMenuWidgetState = () => setConfirmingObjectId(object.id); setConfirmMode(EFFECTBOX_OPEN); - close(); + onClose(); return; case RoomEngineTriggerWidgetEvent.REQUEST_PURCHASABLE_CLOTHING_CONFIRMATION_DIALOG: if(!IsOwnerOfFurniture(object)) return; @@ -102,7 +102,7 @@ const useFurnitureContextMenuWidgetState = () => setConfirmingObjectId(object.id); setConfirmMode(PURCHASABLE_CLOTHING_CONFIRMATION); - close(); + onClose(); return; case RoomEngineTriggerWidgetEvent.OPEN_FURNI_CONTEXT_MENU: @@ -128,7 +128,7 @@ const useFurnitureContextMenuWidgetState = () => return; case RoomEngineTriggerWidgetEvent.CLOSE_FURNI_CONTEXT_MENU: - if(object.id === objectId) close(); + if(object.id === objectId) onClose(); return; } }); @@ -143,7 +143,7 @@ const useFurnitureContextMenuWidgetState = () => setMode(GROUP_FURNITURE); }); - return { objectId, mode, confirmMode, confirmingObjectId, groupData, isGroupMember, closeConfirm, processAction }; + return { objectId, mode, confirmMode, confirmingObjectId, groupData, isGroupMember, closeConfirm, processAction, onClose }; } export const useFurnitureContextMenuWidget = useFurnitureContextMenuWidgetState; diff --git a/src/hooks/rooms/widgets/furniture/useFurnitureExchangeWidget.ts b/src/hooks/rooms/widgets/furniture/useFurnitureExchangeWidget.ts index 2999d65c..5162607d 100644 --- a/src/hooks/rooms/widgets/furniture/useFurnitureExchangeWidget.ts +++ b/src/hooks/rooms/widgets/furniture/useFurnitureExchangeWidget.ts @@ -10,7 +10,7 @@ const useFurnitureExchangeWidgetState = () => const [ category, setCategory ] = useState(-1); const [ value, setValue ] = useState(0); - const close = useCallback(() => + const onClose = useCallback(() => { setObjectId(-1); setCategory(-1); @@ -21,7 +21,7 @@ const useFurnitureExchangeWidgetState = () => { GetRoomSession().connection.send(new FurnitureExchangeComposer(objectId)); - close(); + onClose(); } useRoomEngineEvent(RoomEngineTriggerWidgetEvent.REQUEST_CREDITFURNI, event => @@ -39,10 +39,10 @@ const useFurnitureExchangeWidgetState = () => { if((event.id !== objectId) || (event.category !== category)) return; - close(); + onClose(); }); - return { objectId, value, redeem, close }; + return { objectId, value, redeem, onClose }; } export const useFurnitureExchangeWidget = useFurnitureExchangeWidgetState; diff --git a/src/hooks/rooms/widgets/furniture/useFurnitureExternalImageWidget.ts b/src/hooks/rooms/widgets/furniture/useFurnitureExternalImageWidget.ts index e530bacc..5c6a6b17 100644 --- a/src/hooks/rooms/widgets/furniture/useFurnitureExternalImageWidget.ts +++ b/src/hooks/rooms/widgets/furniture/useFurnitureExternalImageWidget.ts @@ -10,7 +10,7 @@ const useFurnitureExternalImageWidgetState = () => const [ category, setCategory ] = useState(-1); const [ photoData, setPhotoData ] = useState(null); - const close = () => + const onClose = () => { setObjectId(-1); setCategory(-1); @@ -35,10 +35,10 @@ const useFurnitureExternalImageWidgetState = () => { if((event.id !== objectId) || (event.category !== category)) return; - close(); + onClose(); }); - return { objectId, photoData, close }; + return { objectId, photoData, onClose }; } export const useFurnitureExternalImageWidget = useFurnitureExternalImageWidgetState; diff --git a/src/hooks/rooms/widgets/furniture/useFurnitureFriendFurniWidget.ts b/src/hooks/rooms/widgets/furniture/useFurnitureFriendFurniWidget.ts index 52c96bce..e658189d 100644 --- a/src/hooks/rooms/widgets/furniture/useFurnitureFriendFurniWidget.ts +++ b/src/hooks/rooms/widgets/furniture/useFurnitureFriendFurniWidget.ts @@ -14,7 +14,7 @@ const useFurnitureFriendFurniWidgetState = () => const [ date, setDate ] = useState(null); const [ stage, setStage ] = useState(0); - const close = () => + const onClose = () => { setObjectId(-1); setCategory(-1); @@ -28,7 +28,7 @@ const useFurnitureFriendFurniWidgetState = () => { GetRoomSession().connection.send(new FriendFurniConfirmLockMessageComposer(objectId, flag)); - close(); + onClose(); } useMessageEvent(LoveLockFurniStartEvent, event => @@ -39,8 +39,8 @@ const useFurnitureFriendFurniWidgetState = () => setStage(parser.start ? 1 : 2); }); - useMessageEvent(LoveLockFurniFinishedEvent, event => close()); - useMessageEvent(LoveLockFurniFriendConfirmedEvent, event => close()); + useMessageEvent(LoveLockFurniFinishedEvent, event => onClose()); + useMessageEvent(LoveLockFurniFriendConfirmedEvent, event => onClose()); useRoomEngineEvent(RoomEngineTriggerWidgetEvent.REQUEST_FRIEND_FURNITURE_ENGRAVING, event => { @@ -66,10 +66,10 @@ const useFurnitureFriendFurniWidgetState = () => { if((event.id !== objectId) || (event.category !== category)) return; - close(); + onClose(); }); - return { objectId, type, usernames, figures, date, stage, close, respond }; + return { objectId, type, usernames, figures, date, stage, onClose, respond }; } export const useFurnitureFriendFurniWidget = useFurnitureFriendFurniWidgetState; diff --git a/src/hooks/rooms/widgets/furniture/useFurnitureMannequinWidget.ts b/src/hooks/rooms/widgets/furniture/useFurnitureMannequinWidget.ts index 0ecedf9b..60429757 100644 --- a/src/hooks/rooms/widgets/furniture/useFurnitureMannequinWidget.ts +++ b/src/hooks/rooms/widgets/furniture/useFurnitureMannequinWidget.ts @@ -13,7 +13,7 @@ const useFurnitureMannequinWidgetState = () => const [ clubLevel, setClubLevel ] = useState(HabboClubLevelEnum.NO_CLUB); const [ name, setName ] = useState(null); - const close = () => + const onClose = () => { setObjectId(-1); setCategory(-1); @@ -28,7 +28,7 @@ const useFurnitureMannequinWidgetState = () => SendMessageComposer(new FurnitureMannequinSaveLookComposer(objectId)); - close(); + onClose(); } const wearFigure = () => @@ -37,7 +37,7 @@ const useFurnitureMannequinWidgetState = () => SendMessageComposer(new FurnitureMultiStateComposer(objectId)); - close(); + onClose(); } const saveName = () => @@ -71,10 +71,10 @@ const useFurnitureMannequinWidgetState = () => { if((event.id !== objectId) || (event.category !== category)) return; - close(); + onClose(); }); - return { objectId, figure, gender, clubLevel, name, setName, saveFigure, wearFigure, saveName, close }; + return { objectId, figure, gender, clubLevel, name, setName, saveFigure, wearFigure, saveName, onClose }; } export const useFurnitureMannequinWidget = useFurnitureMannequinWidgetState; diff --git a/src/hooks/rooms/widgets/furniture/useFurniturePresentWidget.ts b/src/hooks/rooms/widgets/furniture/useFurniturePresentWidget.ts index 56f73be1..8342b512 100644 --- a/src/hooks/rooms/widgets/furniture/useFurniturePresentWidget.ts +++ b/src/hooks/rooms/widgets/furniture/useFurniturePresentWidget.ts @@ -25,7 +25,7 @@ const useFurniturePresentWidgetState = () => const [ imageUrl, setImageUrl ] = useState(null); const { roomSession = null } = useRoom(); - const close = () => + const onClose = () => { setObjectId(-1); setClassId(-1); @@ -199,7 +199,7 @@ const useFurniturePresentWidgetState = () => if(!roomObject) return null; - close(); + onClose(); setObjectId(event.objectId); setClassId(-1); @@ -211,7 +211,7 @@ const useFurniturePresentWidgetState = () => useFurniRemovedEvent((objectId !== -1), event => { - if(event.id === objectId) close(); + if(event.id === objectId) onClose(); if(event.id === placedItemId) { @@ -219,7 +219,7 @@ const useFurniturePresentWidgetState = () => } }); - return { objectId, classId, itemType, text, isOwnerOfFurniture, senderName, senderFigure, placedItemId, placedItemType, placedInRoom, imageUrl, openPresent, close }; + return { objectId, classId, itemType, text, isOwnerOfFurniture, senderName, senderFigure, placedItemId, placedItemType, placedInRoom, imageUrl, openPresent, onClose }; } export const useFurniturePresentWidget = useFurniturePresentWidgetState; diff --git a/src/hooks/rooms/widgets/furniture/useFurnitureStackHeightWidget.ts b/src/hooks/rooms/widgets/furniture/useFurnitureStackHeightWidget.ts index be5bb215..0ac47137 100644 --- a/src/hooks/rooms/widgets/furniture/useFurnitureStackHeightWidget.ts +++ b/src/hooks/rooms/widgets/furniture/useFurnitureStackHeightWidget.ts @@ -13,7 +13,7 @@ const useFurnitureStackHeightWidgetState = () => const [ height, setHeight ] = useState(0); const [ pendingHeight, setPendingHeight ] = useState(-1); - const close = () => + const onClose = () => { setObjectId(-1); setCategory(-1); @@ -61,7 +61,7 @@ const useFurnitureStackHeightWidgetState = () => { if((event.id !== objectId) || (event.category !== category)) return; - close(); + onClose(); }); useEffect(() => @@ -73,7 +73,7 @@ const useFurnitureStackHeightWidgetState = () => return () => clearTimeout(timeout); }, [ objectId, pendingHeight ]); - return { objectId, height, maxHeight: MAX_HEIGHT, close, updateHeight }; + return { objectId, height, maxHeight: MAX_HEIGHT, onClose, updateHeight }; } export const useFurnitureStackHeightWidget = useFurnitureStackHeightWidgetState; diff --git a/src/hooks/rooms/widgets/furniture/useFurnitureStickieWidget.ts b/src/hooks/rooms/widgets/furniture/useFurnitureStickieWidget.ts index f43109c8..f1e89134 100644 --- a/src/hooks/rooms/widgets/furniture/useFurnitureStickieWidget.ts +++ b/src/hooks/rooms/widgets/furniture/useFurnitureStickieWidget.ts @@ -12,7 +12,7 @@ const useFurnitureStickieWidgetState = () => const [ text, setText ] = useState(''); const [ canModify, setCanModify ] = useState(false); - const close = () => + const onClose = () => { setObjectId(-1); setCategory(-1); @@ -73,10 +73,10 @@ const useFurnitureStickieWidgetState = () => { if((event.id !== objectId) || (event.category !== category)) return; - close(); + onClose(); }); - return { objectId, color, text, canModify, updateColor, updateText, trash, close }; + return { objectId, color, text, canModify, updateColor, updateText, trash, onClose }; } export const useFurnitureStickieWidget = useFurnitureStickieWidgetState; diff --git a/src/hooks/rooms/widgets/furniture/useFurnitureTrophyWidget.ts b/src/hooks/rooms/widgets/furniture/useFurnitureTrophyWidget.ts index 8a3ee666..d5a1e331 100644 --- a/src/hooks/rooms/widgets/furniture/useFurnitureTrophyWidget.ts +++ b/src/hooks/rooms/widgets/furniture/useFurnitureTrophyWidget.ts @@ -13,7 +13,7 @@ const useFurnitureTrophyWidgetState = () => const [ date, setDate ] = useState(''); const [ message, setMessage ] = useState(''); - const close = () => + const onClose = () => { setObjectId(-1); setCategory(-1); @@ -54,10 +54,10 @@ const useFurnitureTrophyWidgetState = () => { if((event.id !== objectId) || (event.category !== category)) return; - close(); + onClose(); }); - return { objectId, color, senderName, date, message, close }; + return { objectId, color, senderName, date, message, onClose }; } export const useFurnitureTrophyWidget = useFurnitureTrophyWidgetState; diff --git a/src/hooks/rooms/widgets/furniture/useFurnitureYoutubeWidget.ts b/src/hooks/rooms/widgets/furniture/useFurnitureYoutubeWidget.ts index d433b0b8..79548e78 100644 --- a/src/hooks/rooms/widgets/furniture/useFurnitureYoutubeWidget.ts +++ b/src/hooks/rooms/widgets/furniture/useFurnitureYoutubeWidget.ts @@ -21,7 +21,7 @@ const useFurnitureYoutubeWidgetState = () => const [ playlists, setPlaylists ] = useState(null); const [ hasControl, setHasControl ] = useState(false); - const close = () => + const onClose = () => { setObjectId(-1); setCategory(-1); @@ -118,10 +118,10 @@ const useFurnitureYoutubeWidgetState = () => { if((event.id !== objectId) || (event.category !== category)) return; - close(); + onClose(); }); - return { objectId, videoId, videoStart, videoEnd, currentVideoState, selectedVideo, playlists, close, previous, next, pause, play, selectVideo }; + return { objectId, videoId, videoStart, videoEnd, currentVideoState, selectedVideo, playlists, onClose, previous, next, pause, play, selectVideo }; } export const useFurnitureYoutubeWidget = useFurnitureYoutubeWidgetState; diff --git a/src/hooks/rooms/widgets/useFurniChooserWidget.ts b/src/hooks/rooms/widgets/useFurniChooserWidget.ts index 5022e3e9..4542dbac 100644 --- a/src/hooks/rooms/widgets/useFurniChooserWidget.ts +++ b/src/hooks/rooms/widgets/useFurniChooserWidget.ts @@ -9,7 +9,7 @@ const useFurniChooserWidgetState = () => const [ items, setItems ] = useState(null); const { roomSession = null } = useRoom(); - const close = () => setItems(null); + const onClose = () => setItems(null); const selectItem = (item: RoomObjectItem) => item && GetRoomEngine().selectRoomObject(GetRoomSession().roomId, item.id, item.category); @@ -126,7 +126,7 @@ const useFurniChooserWidgetState = () => }); }); - return { items, close, selectItem, populateChooser }; + return { items, onClose, selectItem, populateChooser }; } export const useFurniChooserWidget = useFurniChooserWidgetState; diff --git a/src/hooks/rooms/widgets/useUserChooserWidget.ts b/src/hooks/rooms/widgets/useUserChooserWidget.ts index 511a3c1a..857922a2 100644 --- a/src/hooks/rooms/widgets/useUserChooserWidget.ts +++ b/src/hooks/rooms/widgets/useUserChooserWidget.ts @@ -9,7 +9,7 @@ const useUserChooserWidgetState = () => const [ items, setItems ] = useState(null); const { roomSession = null } = useRoom(); - const close = () => setItems(null); + const onClose = () => setItems(null); const selectItem = (item: RoomObjectItem) => item && GetRoomEngine().selectRoomObject(GetRoomSession().roomId, item.id, item.category); @@ -74,7 +74,7 @@ const useUserChooserWidgetState = () => }); }); - return { items, close, selectItem, populateChooser }; + return { items, onClose, selectItem, populateChooser }; } export const useUserChooserWidget = useUserChooserWidgetState;