diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index c51d7b9c..00000000 --- a/.eslintrc.js +++ /dev/null @@ -1,86 +0,0 @@ -module.exports = { - 'extends': [ - 'react-app', - 'react-app/jest' - ], - 'rules': { - 'linebreak-style': [ - 'off' - ], - 'quotes': [ - 'error', - 'single' - ], - 'brace-style': [ - 'error', - 'allman', - { - 'allowSingleLine': true - } - ], - 'object-curly-spacing': [ - 'error', - 'always' - ], - 'keyword-spacing': [ - 'error', - { - 'overrides': { - 'if': { - 'after': false - }, - 'for': { - 'after': false - }, - 'while': { - 'after': false - }, - 'switch': { - 'after': false - } - } - } - ], - '@typescript-eslint/no-explicit-any': [ - 'off' - ], - '@typescript-eslint/ban-ts-comment': [ - 'off' - ], - '@typescript-eslint/no-empty-function': [ - 'error', - { - 'allow': [ - 'functions', - 'arrowFunctions', - 'generatorFunctions', - 'methods', - 'generatorMethods', - 'constructors' - ] - } - ], - '@typescript-eslint/no-unused-vars': [ - 'off' - ], - '@typescript-eslint/ban-types': [ - 'error', - { - 'types': { - 'String': true, - 'Boolean': true, - 'Number': true, - 'Symbol': true, - '{}': false, - 'Object': false, - 'object': false, - 'Function': false - }, - 'extendDefaults': true - } - ], - 'no-switch-case-fall-through': [ - 'off' - ] - } - } diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 00000000..2891f80f --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,34 @@ +{ + "settings": { + "react": { + "pragma": "React", + "version": "17.0.2" + } + }, + "env": { + "browser": true, + "es2021": true + }, + "extends": [ + "plugin:react/recommended", + "plugin:react/jsx-runtime" + ], + "parser": "@typescript-eslint/parser", + "parserOptions": { + "ecmaFeatures": { + "jsx": true + }, + "ecmaVersion": "latest", + "sourceType": "module" + }, + "plugins": [ + "react", + "@typescript-eslint" + ], + "rules": { + "indent": ["error", 4, {"SwitchCase": 1}], + "array-bracket-spacing": ["error", "always"], + "brace-style": ["error", "allman"], + "react/prop-types": ["off"] + } +} diff --git a/.prettierignore b/.prettierignore deleted file mode 100644 index b14d30ec..00000000 --- a/.prettierignore +++ /dev/null @@ -1 +0,0 @@ -*.scss diff --git a/.vscode/settings.json b/.vscode/settings.json index abf4f847..0ac4ef4b 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -14,5 +14,7 @@ "files.insertFinalNewline": true, "files.trimFinalNewlines": true, "editor.wordWrap": "on", - "emmet.showExpandedAbbreviation": "never" + "emmet.showExpandedAbbreviation": "never", + "eslint.validate": [ "javascript", "javascriptreact", "html", "typescriptreact" ], + "eslint.workingDirectories": [ "./src" ] } diff --git a/package.json b/package.json index 22984611..9fedc429 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ "build": "cross-env GENERATE_SOURCEMAP=false IMAGE_INLINE_SIZE_LIMIT=100000 craco build", "build:prod": "npx browserslist@latest --update-db && yarn build", "test": "craco test", - "eject": "react-scripts eject" + "eject": "react-scripts eject", + "eslint": "eslint src --ext .ts,.tsx" }, "dependencies": { "@craco/craco": "^6.3.0", @@ -41,7 +42,13 @@ "@types/react-slider": "^1.3.1", "@types/react-transition-group": "^4.4.2", "@types/react-virtualized": "^9.21.13", - "@typescript-eslint/eslint-plugin": "^4.29.1", + "@typescript-eslint/eslint-plugin": "^5.17.0", + "@typescript-eslint/parser": "^5.17.0", + "eslint": "^8.12.0", + "eslint-plugin-import": "^2.25.4", + "eslint-plugin-jsx-a11y": "^6.5.1", + "eslint-plugin-react": "^7.29.4", + "eslint-plugin-react-hooks": "^4.4.0", "react-error-overlay": "6.0.9" } } diff --git a/src/App.tsx b/src/App.tsx index 9808b83e..c818be31 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -14,8 +14,8 @@ export const App: FC<{}> = props => { const [ isReady, setIsReady ] = useState(false); const [ isError, setIsError ] = useState(false); - const [message, setMessage] = useState('Getting Ready'); - const [percent, setPercent] = useState(0); + const [ message, setMessage ] = useState('Getting Ready'); + const [ percent, setPercent ] = useState(0); //@ts-ignore if(!NitroConfig) throw new Error('NitroConfig is not defined!'); @@ -68,24 +68,24 @@ export const App: FC<{}> = props => return; case NitroCommunicationDemoEvent.CONNECTION_HANDSHAKING: loadPercent(); - return; - case NitroCommunicationDemoEvent.CONNECTION_HANDSHAKE_FAILED: + return; + case NitroCommunicationDemoEvent.CONNECTION_HANDSHAKE_FAILED: setIsError(true); setMessage('Handshake Failed'); - return; - case NitroCommunicationDemoEvent.CONNECTION_AUTHENTICATED: + return; + case NitroCommunicationDemoEvent.CONNECTION_AUTHENTICATED: loadPercent(); GetNitroInstance().init(); if(LegacyExternalInterface.available) LegacyExternalInterface.call('legacyTrack', 'authentication', 'authok', []); - return; - case NitroCommunicationDemoEvent.CONNECTION_ERROR: + return; + case NitroCommunicationDemoEvent.CONNECTION_ERROR: setIsError(true); setMessage('Connection Error'); - return; - case NitroCommunicationDemoEvent.CONNECTION_CLOSED: - //if(GetNitroInstance().roomEngine) GetNitroInstance().roomEngine.dispose(); + return; + case NitroCommunicationDemoEvent.CONNECTION_CLOSED: + //if(GetNitroInstance().roomEngine) GetNitroInstance().roomEngine.dispose(); //setIsError(true); setMessage('Connection Error'); diff --git a/src/api/common/ProductImageUtility.ts b/src/api/common/ProductImageUtility.ts index 3dfd5ef7..460c8594 100644 --- a/src/api/common/ProductImageUtility.ts +++ b/src/api/common/ProductImageUtility.ts @@ -34,7 +34,7 @@ export class ProductImageUtility } break; case CatalogPageMessageProductData.E: - // fx_icon_furniClassId_png + // fx_icon_furniClassId_png break; } diff --git a/src/api/inventory/TradeUserData.ts b/src/api/inventory/TradeUserData.ts index b62b32f9..452c7ee5 100644 --- a/src/api/inventory/TradeUserData.ts +++ b/src/api/inventory/TradeUserData.ts @@ -10,5 +10,6 @@ export class TradeUserData public itemCount: number = 0, public creditsCount: number = 0, public accepts: boolean = false, - public canTrade: boolean = false) {} + public canTrade: boolean = false) + {} } diff --git a/src/api/nitro/room/widgets/handlers/FurniChooserWidgetHandler.ts b/src/api/nitro/room/widgets/handlers/FurniChooserWidgetHandler.ts index f08406e8..46c3f502 100644 --- a/src/api/nitro/room/widgets/handlers/FurniChooserWidgetHandler.ts +++ b/src/api/nitro/room/widgets/handlers/FurniChooserWidgetHandler.ts @@ -37,40 +37,40 @@ export class FurniChooserWidgetHandler extends RoomWidgetHandler const floorItems = GetRoomEngine().getRoomObjects(roomId, RoomObjectCategory.FLOOR); wallItems.forEach(roomObject => + { + let name = roomObject.type; + + if(name.startsWith('poster')) { - let name = roomObject.type; - - if(name.startsWith('poster')) - { - name = LocalizeText(`poster_${ name.replace('poster', '') }_name`); - } - else - { - const typeId = roomObject.model.getValue(RoomObjectVariable.FURNITURE_TYPE_ID); - const furniData = GetSessionDataManager().getWallItemData(typeId); - - if(furniData && furniData.name.length) name = furniData.name; - } - - items.push(new RoomObjectItem(roomObject.id, RoomObjectCategory.WALL, name)); - }); - - floorItems.forEach(roomObject => + name = LocalizeText(`poster_${ name.replace('poster', '') }_name`); + } + else { - let name = roomObject.type; - const typeId = roomObject.model.getValue(RoomObjectVariable.FURNITURE_TYPE_ID); - const furniData = GetSessionDataManager().getFloorItemData(typeId); + const furniData = GetSessionDataManager().getWallItemData(typeId); if(furniData && furniData.name.length) name = furniData.name; + } - items.push(new RoomObjectItem(roomObject.id, RoomObjectCategory.FLOOR, name)); - }); + items.push(new RoomObjectItem(roomObject.id, RoomObjectCategory.WALL, name)); + }); + + floorItems.forEach(roomObject => + { + let name = roomObject.type; + + const typeId = roomObject.model.getValue(RoomObjectVariable.FURNITURE_TYPE_ID); + const furniData = GetSessionDataManager().getFloorItemData(typeId); + + if(furniData && furniData.name.length) name = furniData.name; + + items.push(new RoomObjectItem(roomObject.id, RoomObjectCategory.FLOOR, name)); + }); items.sort((a, b) => - { - return (a.name < b.name) ? -1 : 1; - }); + { + return (a.name < b.name) ? -1 : 1; + }); this.container.eventDispatcher.dispatchEvent(new RoomWidgetChooserContentEvent(RoomWidgetChooserContentEvent.FURNI_CHOOSER_CONTENT, items)); } diff --git a/src/api/nitro/room/widgets/handlers/FurnitureInternalLinkHandler.ts b/src/api/nitro/room/widgets/handlers/FurnitureInternalLinkHandler.ts index 493f7052..8996cf38 100644 --- a/src/api/nitro/room/widgets/handlers/FurnitureInternalLinkHandler.ts +++ b/src/api/nitro/room/widgets/handlers/FurnitureInternalLinkHandler.ts @@ -43,7 +43,7 @@ export class FurnitureInternalLinkHandler extends RoomWidgetHandler public get eventTypes(): string[] { - return [RoomEngineTriggerWidgetEvent.REQUEST_INTERNAL_LINK]; + return [ RoomEngineTriggerWidgetEvent.REQUEST_INTERNAL_LINK ]; } public get messageTypes(): string[] diff --git a/src/api/nitro/room/widgets/handlers/FurnitureRoomLinkHandler.ts b/src/api/nitro/room/widgets/handlers/FurnitureRoomLinkHandler.ts index 9396ba27..2f0a74d1 100644 --- a/src/api/nitro/room/widgets/handlers/FurnitureRoomLinkHandler.ts +++ b/src/api/nitro/room/widgets/handlers/FurnitureRoomLinkHandler.ts @@ -49,7 +49,7 @@ export class FurnitureRoomLinkHandler extends RoomWidgetHandler public get eventTypes(): string[] { - return [RoomEngineTriggerWidgetEvent.REQUEST_ROOM_LINK]; + return [ RoomEngineTriggerWidgetEvent.REQUEST_ROOM_LINK ]; } public get messageTypes(): string[] diff --git a/src/api/nitro/room/widgets/handlers/PollWidgetHandler.ts b/src/api/nitro/room/widgets/handlers/PollWidgetHandler.ts index 65330784..99639167 100644 --- a/src/api/nitro/room/widgets/handlers/PollWidgetHandler.ts +++ b/src/api/nitro/room/widgets/handlers/PollWidgetHandler.ts @@ -63,11 +63,11 @@ export class PollWidgetHandler extends RoomWidgetHandler public get eventTypes(): string[] { - return [RoomSessionPollEvent.OFFER, RoomSessionPollEvent.ERROR, RoomSessionPollEvent.CONTENT]; + return [ RoomSessionPollEvent.OFFER, RoomSessionPollEvent.ERROR, RoomSessionPollEvent.CONTENT ]; } public get messageTypes(): string[] { - return [RoomWidgetPollMessage.ANSWER, RoomWidgetPollMessage.REJECT, RoomWidgetPollMessage.START]; + return [ RoomWidgetPollMessage.ANSWER, RoomWidgetPollMessage.REJECT, RoomWidgetPollMessage.START ]; } } diff --git a/src/api/nitro/room/widgets/handlers/RoomWidgetAvatarInfoHandler.ts b/src/api/nitro/room/widgets/handlers/RoomWidgetAvatarInfoHandler.ts index 5731ad1d..027e4e86 100644 --- a/src/api/nitro/room/widgets/handlers/RoomWidgetAvatarInfoHandler.ts +++ b/src/api/nitro/room/widgets/handlers/RoomWidgetAvatarInfoHandler.ts @@ -50,7 +50,7 @@ export class RoomWidgetAvatarInfoHandler extends RoomWidgetHandler this.processOwnCharacterInfo(); break; case RoomWidgetUserActionMessage.START_NAME_CHANGE: - // habbo help - start name change + // habbo help - start name change break; case RoomWidgetUserActionMessage.REQUEST_PET_UPDATE: break; diff --git a/src/api/nitro/room/widgets/handlers/RoomWidgetChatHandler.ts b/src/api/nitro/room/widgets/handlers/RoomWidgetChatHandler.ts index 45f895b8..0e2a3b88 100644 --- a/src/api/nitro/room/widgets/handlers/RoomWidgetChatHandler.ts +++ b/src/api/nitro/room/widgets/handlers/RoomWidgetChatHandler.ts @@ -101,7 +101,7 @@ export class RoomWidgetChatHandler extends RoomWidgetHandler implements IAvatarI text = LocalizeText('widget.chatbubble.pettreat', [ 'petname' ], [ username ]); break; case RoomSessionChatEvent.CHAT_TYPE_HAND_ITEM_RECEIVED: - text = LocalizeText('widget.chatbubble.handitem', [ 'username', 'handitem' ], [ username, LocalizeText(('handitem' + chatEvent.extraParam))]); + text = LocalizeText('widget.chatbubble.handitem', [ 'username', 'handitem' ], [ username, LocalizeText(('handitem' + chatEvent.extraParam)) ]); break; case RoomSessionChatEvent.CHAT_TYPE_MUTE_REMAINING: { const hours = ((chatEvent.extraParam > 0) ? Math.floor((chatEvent.extraParam / 3600)) : 0).toString(); diff --git a/src/api/nitro/room/widgets/handlers/RoomWidgetChatInputHandler.ts b/src/api/nitro/room/widgets/handlers/RoomWidgetChatInputHandler.ts index 55a9c5ff..31404de8 100644 --- a/src/api/nitro/room/widgets/handlers/RoomWidgetChatInputHandler.ts +++ b/src/api/nitro/room/widgets/handlers/RoomWidgetChatInputHandler.ts @@ -141,10 +141,10 @@ export class RoomWidgetChatInputHandler extends RoomWidgetHandler if(this.container.roomSession.isRoomOwner || GetSessionDataManager().isModerator) { NotificationUtilities.confirm(LocalizeText('room.confirm.pick_all'), () => - { - GetSessionDataManager().sendSpecialCommandMessage(':pickall'); - }, - null, null, null, LocalizeText('generic.alert.title')); + { + GetSessionDataManager().sendSpecialCommandMessage(':pickall'); + }, + null, null, null, LocalizeText('generic.alert.title')); } return null; diff --git a/src/api/nitro/room/widgets/handlers/UserChooserWidgetHandler.ts b/src/api/nitro/room/widgets/handlers/UserChooserWidgetHandler.ts index 67b00e06..44b2141b 100644 --- a/src/api/nitro/room/widgets/handlers/UserChooserWidgetHandler.ts +++ b/src/api/nitro/room/widgets/handlers/UserChooserWidgetHandler.ts @@ -35,13 +35,13 @@ export class UserChooserWidgetHandler extends RoomWidgetHandler const userItems = GetRoomEngine().getRoomObjects(roomId, RoomObjectCategory.UNIT); userItems.forEach(roomObject => - { - const userData = this.container.roomSession.userDataManager.getUserDataByIndex(roomObject.id); + { + const userData = this.container.roomSession.userDataManager.getUserDataByIndex(roomObject.id); - if(!userData) return; + if(!userData) return; - items.push(new RoomObjectItem(userData.roomIndex, RoomObjectCategory.UNIT, userData.name)); - }); + items.push(new RoomObjectItem(userData.roomIndex, RoomObjectCategory.UNIT, userData.name)); + }); items.sort((a, b) => { diff --git a/src/api/nitro/room/widgets/handlers/WordQuizWidgetHandler.ts b/src/api/nitro/room/widgets/handlers/WordQuizWidgetHandler.ts index df24b06e..d0ce01b0 100644 --- a/src/api/nitro/room/widgets/handlers/WordQuizWidgetHandler.ts +++ b/src/api/nitro/room/widgets/handlers/WordQuizWidgetHandler.ts @@ -64,7 +64,7 @@ export class WordQuizWidgetHandler extends RoomWidgetHandler public get eventTypes(): string[] { - return [RoomSessionWordQuizEvent.ANSWERED, RoomSessionWordQuizEvent.FINISHED, RoomSessionWordQuizEvent.QUESTION]; + return [ RoomSessionWordQuizEvent.ANSWERED, RoomSessionWordQuizEvent.FINISHED, RoomSessionWordQuizEvent.QUESTION ]; } public get messageTypes(): string[] diff --git a/src/api/nitro/room/widgets/messages/RoomWidgetDanceMessage.ts b/src/api/nitro/room/widgets/messages/RoomWidgetDanceMessage.ts index 72f5c0eb..7ed703bb 100644 --- a/src/api/nitro/room/widgets/messages/RoomWidgetDanceMessage.ts +++ b/src/api/nitro/room/widgets/messages/RoomWidgetDanceMessage.ts @@ -4,7 +4,7 @@ export class RoomWidgetDanceMessage extends RoomWidgetMessage { public static DANCE: string = 'RWDM_MESSAGE_DANCE'; public static NORMAL_STYLE: number = 0; - public static CLUB_STYLE: number[] = [2, 3, 4]; + public static CLUB_STYLE: number[] = [ 2, 3, 4 ]; private _style: number = 0; diff --git a/src/api/notification/NotificationUtilities.ts b/src/api/notification/NotificationUtilities.ts index d4de7aee..1c6c9fdd 100644 --- a/src/api/notification/NotificationUtilities.ts +++ b/src/api/notification/NotificationUtilities.ts @@ -157,7 +157,7 @@ export class NotificationUtilities public static handleHotelClosedMessage(open: number, minute: number, thrownOut: boolean): void { - this.simpleAlert( LocalizeText(('opening.hours.' + (thrownOut ? 'disconnected' : 'closed')), [ 'h', 'm'], [ this.getTimeZeroPadded(open), this.getTimeZeroPadded(minute) ]), NotificationAlertType.DEFAULT, null, null, LocalizeText('opening.hours.title')); + this.simpleAlert( LocalizeText(('opening.hours.' + (thrownOut ? 'disconnected' : 'closed')), [ 'h', 'm' ], [ this.getTimeZeroPadded(open), this.getTimeZeroPadded(minute) ]), NotificationAlertType.DEFAULT, null, null, LocalizeText('opening.hours.title')); } public static handleHotelMaintenanceMessage(minutesUntilMaintenance: number, duration: number): void diff --git a/src/api/utils/RoomChatFormatter.ts b/src/api/utils/RoomChatFormatter.ts index c20aa344..9c80de72 100644 --- a/src/api/utils/RoomChatFormatter.ts +++ b/src/api/utils/RoomChatFormatter.ts @@ -26,16 +26,16 @@ allowedColours.set('pink', 'pink'); function encodeHTML(str: string) { return str.replace(/([\u00A0-\u9999<>&])(.|$)/g, function(full, char, next) -{ - if(char !== '&' || next !== '#') -{ - if(/[\u00A0-\u9999<>&]/.test(next)) - next = '&#' + next.charCodeAt(0) + ';'; + { + if(char !== '&' || next !== '#') + { + if(/[\u00A0-\u9999<>&]/.test(next)) + next = '&#' + next.charCodeAt(0) + ';'; - return '&#' + char.charCodeAt(0) + ';' + next; - } + return '&#' + char.charCodeAt(0) + ';' + next; + } - return full; + return full; }); } diff --git a/src/common/card/accordion/NitroCardAccordionSetView.tsx b/src/common/card/accordion/NitroCardAccordionSetView.tsx index 05dde76b..0be64d08 100644 --- a/src/common/card/accordion/NitroCardAccordionSetView.tsx +++ b/src/common/card/accordion/NitroCardAccordionSetView.tsx @@ -45,26 +45,26 @@ export const NitroCardAccordionSetView: FC = pro const closeFunction = close; setClosers(prevValue => - { - const newClosers = [ ...prevValue ]; + { + const newClosers = [ ...prevValue ]; - newClosers.push(closeFunction); + newClosers.push(closeFunction); - return newClosers; - }); + return newClosers; + }); return () => { setClosers(prevValue => - { - const newClosers = [ ...prevValue ]; + { + const newClosers = [ ...prevValue ]; - const index = newClosers.indexOf(closeFunction); + const index = newClosers.indexOf(closeFunction); - if(index >= 0) newClosers.splice(index, 1); + if(index >= 0) newClosers.splice(index, 1); - return newClosers; - }); + return newClosers; + }); } }, [ close, setClosers ]); diff --git a/src/common/draggable-window/DraggableWindow.tsx b/src/common/draggable-window/DraggableWindow.tsx index 498c5878..254c6f58 100644 --- a/src/common/draggable-window/DraggableWindow.tsx +++ b/src/common/draggable-window/DraggableWindow.tsx @@ -261,8 +261,8 @@ export const DraggableWindow: FC = props => return ( createPortal( - - { children } - , document.getElementById('draggable-windows-container')) + + { children } + , document.getElementById('draggable-windows-container')) ); } diff --git a/src/common/layout/LayoutAvatarImageView.tsx b/src/common/layout/LayoutAvatarImageView.tsx index 814b201e..00a637be 100644 --- a/src/common/layout/LayoutAvatarImageView.tsx +++ b/src/common/layout/LayoutAvatarImageView.tsx @@ -67,7 +67,8 @@ export const LayoutAvatarImageView: FC = props => setRandomValue(Math.random()); }, - dispose: () => {}, + dispose: () => + {}, disposed: false }, null); diff --git a/src/common/layout/LayoutGiftTagView.tsx b/src/common/layout/LayoutGiftTagView.tsx index 0db589b0..8fcc405f 100644 --- a/src/common/layout/LayoutGiftTagView.tsx +++ b/src/common/layout/LayoutGiftTagView.tsx @@ -31,7 +31,7 @@ export const LayoutGiftTagView: FC = props => { editable && (onChange !== null) && } { userName && - { LocalizeText('catalog.gift_wrapping_new.message_from', ['name'], [userName]) } } + { LocalizeText('catalog.gift_wrapping_new.message_from', [ 'name' ], [ userName ]) } } diff --git a/src/common/layout/LayoutNotificationAlertView.tsx b/src/common/layout/LayoutNotificationAlertView.tsx index a4e0f52c..bc7894bc 100644 --- a/src/common/layout/LayoutNotificationAlertView.tsx +++ b/src/common/layout/LayoutNotificationAlertView.tsx @@ -15,7 +15,7 @@ export const LayoutNotificationAlertView: FC = const getClassNames = useMemo(() => { - const newClassNames: string[] = ['nitro-alert']; + const newClassNames: string[] = [ 'nitro-alert' ]; newClassNames.push('nitro-alert-' + type); diff --git a/src/common/layout/LayoutNotificationBubbleView.tsx b/src/common/layout/LayoutNotificationBubbleView.tsx index 59771e7e..5e5fdd9f 100644 --- a/src/common/layout/LayoutNotificationBubbleView.tsx +++ b/src/common/layout/LayoutNotificationBubbleView.tsx @@ -35,11 +35,11 @@ export const LayoutNotificationBubbleView: FC if(!fadesOut) return; const timeout = setTimeout(() => - { - setIsVisible(false); + { + setIsVisible(false); - setTimeout(() => close(), 300); - }, timeoutMs); + setTimeout(() => close(), 300); + }, timeoutMs); return () => clearTimeout(timeout); }, [ fadesOut, timeoutMs, close ]); diff --git a/src/common/layout/LayoutRoomPreviewerView.tsx b/src/common/layout/LayoutRoomPreviewerView.tsx index ff2caeb6..508ee08b 100644 --- a/src/common/layout/LayoutRoomPreviewerView.tsx +++ b/src/common/layout/LayoutRoomPreviewerView.tsx @@ -74,15 +74,15 @@ export const LayoutRoomPreviewerView: FC = props = GetNitroInstance().ticker.add(update); const resizeObserver = new ResizeObserver(() => - { - if(!roomPreviewer || !elementRef.current) return; + { + if(!roomPreviewer || !elementRef.current) return; - const width = elementRef.current.parentElement.offsetWidth; + const width = elementRef.current.parentElement.offsetWidth; - roomPreviewer.modifyRoomCanvas(width, height); + roomPreviewer.modifyRoomCanvas(width, height); - update(-1); - }); + update(-1); + }); resizeObserver.observe(elementRef.current); diff --git a/src/common/layout/limited-edition/LayoutLimitedEditionStyledNumberView.tsx b/src/common/layout/limited-edition/LayoutLimitedEditionStyledNumberView.tsx index 92e939d2..fe34ba41 100644 --- a/src/common/layout/limited-edition/LayoutLimitedEditionStyledNumberView.tsx +++ b/src/common/layout/limited-edition/LayoutLimitedEditionStyledNumberView.tsx @@ -8,15 +8,11 @@ interface LayoutLimitedEditionStyledNumberViewProps export const LayoutLimitedEditionStyledNumberView: FC = props => { const { value = 0 } = props; - const numbers = value.toString().split(''); return ( <> - { numbers.map((number, index) => - { - return ; - })} + { numbers.map((number, index) => ) } ); } diff --git a/src/components/achievements/AchievementsView.tsx b/src/components/achievements/AchievementsView.tsx index 6f868503..baa4bc36 100644 --- a/src/components/achievements/AchievementsView.tsx +++ b/src/components/achievements/AchievementsView.tsx @@ -22,50 +22,50 @@ export const AchievementsView: FC<{}> = props => const categoryName = achievement.category; setAchievementCategories(prevValue => + { + const newValue = [ ...prevValue ]; + const categoryIndex = newValue.findIndex(existing => (existing.code === categoryName)); + + if(categoryIndex === -1) { - const newValue = [ ...prevValue ]; - const categoryIndex = newValue.findIndex(existing => (existing.code === categoryName)); + const category = new AchievementCategory(categoryName); - if(categoryIndex === -1) + category.achievements.push(achievement); + + newValue.push(category); + } + else + { + const category = CloneObject(newValue[categoryIndex]); + const newAchievements = [ ...category.achievements ]; + const achievementIndex = newAchievements.findIndex(existing => (existing.achievementId === achievement.achievementId)); + let previousAchievement: AchievementData = null; + + if(achievementIndex === -1) { - const category = new AchievementCategory(categoryName); - - category.achievements.push(achievement); - - newValue.push(category); + newAchievements.push(achievement); } else { - const category = CloneObject(newValue[categoryIndex]); - const newAchievements = [ ...category.achievements ]; - const achievementIndex = newAchievements.findIndex(existing => (existing.achievementId === achievement.achievementId)); - let previousAchievement: AchievementData = null; + previousAchievement = newAchievements[achievementIndex]; - if(achievementIndex === -1) - { - newAchievements.push(achievement); - } - else - { - previousAchievement = newAchievements[achievementIndex]; - - newAchievements[achievementIndex] = achievement; - } - - if(!GetAchievementIsIgnored(achievement)) - { - achievement.unseen++; - - if(previousAchievement) achievement.unseen += previousAchievement.unseen; - } - - category.achievements = newAchievements; - - newValue[categoryIndex] = category; + newAchievements[achievementIndex] = achievement; } - return newValue; - }); + if(!GetAchievementIsIgnored(achievement)) + { + achievement.unseen++; + + if(previousAchievement) achievement.unseen += previousAchievement.unseen; + } + + category.achievements = newAchievements; + + newValue[categoryIndex] = category; + } + + return newValue; + }); }, []); UseMessageEventHook(AchievementEvent, onAchievementEvent); @@ -155,23 +155,23 @@ export const AchievementsView: FC<{}> = props => const setAchievementSeen = useCallback((code: string, achievementId: number) => { setAchievementCategories(prevValue => + { + const newValue = [ ...prevValue ]; + + for(const category of newValue) { - const newValue = [ ...prevValue ]; + if(category.code !== code) continue; - for(const category of newValue) + for(const achievement of category.achievements) { - if(category.code !== code) continue; + if(achievement.achievementId !== achievementId) continue; - for(const achievement of category.achievements) - { - if(achievement.achievementId !== achievementId) continue; - - achievement.unseen = 0; - } + achievement.unseen = 0; } + } - return newValue; - }); + return newValue; + }); }, []); const linkReceived = useCallback((url: string) => diff --git a/src/components/avatar-editor/AvatarEditorView.tsx b/src/components/avatar-editor/AvatarEditorView.tsx index 98aa2d81..06e08d2c 100644 --- a/src/components/avatar-editor/AvatarEditorView.tsx +++ b/src/components/avatar-editor/AvatarEditorView.tsx @@ -288,15 +288,15 @@ export const AvatarEditorView: FC<{}> = props => setIsVisible(false) } /> { categories && (categories.size > 0) && Array.from(categories.keys()).map(category => - { - const isActive = (activeCategory && (activeCategory.name === category)); + { + const isActive = (activeCategory && (activeCategory.name === category)); - return ( - selectCategory(category) }> - { LocalizeText(`avatareditor.category.${ category }`) } - - ); - })} + return ( + selectCategory(category) }> + { LocalizeText(`avatareditor.category.${ category }`) } + + ); + })} setIsWardrobeVisible(true) }> { LocalizeText('avatareditor.category.wardrobe') } diff --git a/src/components/avatar-editor/common/AvatarEditorGridPartItem.ts b/src/components/avatar-editor/common/AvatarEditorGridPartItem.ts index 285cbcad..dc583f38 100644 --- a/src/components/avatar-editor/common/AvatarEditorGridPartItem.ts +++ b/src/components/avatar-editor/common/AvatarEditorGridPartItem.ts @@ -5,7 +5,7 @@ import { FigureData } from './FigureData'; export class AvatarEditorGridPartItem implements IAvatarImageListener { private static ALPHA_FILTER: NitroAlphaFilter = new NitroAlphaFilter(0.2); - private static THUMB_DIRECTIONS: number[] = [2, 6, 0, 4, 3, 1]; + private static THUMB_DIRECTIONS: number[] = [ 2, 6, 0, 4, 3, 1 ]; private static DRAW_ORDER: string[] = [ AvatarFigurePartType.LEFT_HAND_ITEM, AvatarFigurePartType.LEFT_HAND, diff --git a/src/components/avatar-editor/common/FigureGenerator.ts b/src/components/avatar-editor/common/FigureGenerator.ts index fa4126ed..30ac1385 100644 --- a/src/components/avatar-editor/common/FigureGenerator.ts +++ b/src/components/avatar-editor/common/FigureGenerator.ts @@ -26,11 +26,11 @@ function getRandomPartSet(setType: SetType, gender: string, clubLevel: number = if(!setType) return null; const options = setType.partSets.getValues().filter(option => - { - if(!option.isSelectable || ((option.gender !== 'U') && (option.gender !== gender)) || (option.clubLevel > clubLevel) || (option.isSellable && (figureSetIds.indexOf(option.id) === -1))) return null; + { + if(!option.isSelectable || ((option.gender !== 'U') && (option.gender !== gender)) || (option.clubLevel > clubLevel) || (option.isSellable && (figureSetIds.indexOf(option.id) === -1))) return null; - return option; - }); + return option; + }); if(!options || !options.length) return null; @@ -42,11 +42,11 @@ function getRandomColors(palette: IPalette, partSet: IFigurePartSet, clubLevel: if(!palette) return []; const options = palette.colors.getValues().filter(option => - { - if(!option.isSelectable || (option.clubLevel > clubLevel)) return null; + { + if(!option.isSelectable || (option.clubLevel > clubLevel)) return null; - return option; - }); + return option; + }); if(!options || !options.length) return null; diff --git a/src/components/avatar-editor/views/model/AvatarEditorModelView.tsx b/src/components/avatar-editor/views/model/AvatarEditorModelView.tsx index c1d11164..ba0d2da7 100644 --- a/src/components/avatar-editor/views/model/AvatarEditorModelView.tsx +++ b/src/components/avatar-editor/views/model/AvatarEditorModelView.tsx @@ -68,15 +68,15 @@ export const AvatarEditorModelView: FC = props => } { !model.canSetGender && model.categories && (model.categories.size > 0) && Array.from(model.categories.keys()).map(name => - { - const category = model.categories.get(name); + { + const category = model.categories.get(name); - return ( - selectCategory(name) }> - - - ); - })} + return ( + selectCategory(name) }> + + + ); + })} diff --git a/src/components/avatar-editor/views/wardrobe/AvatarEditorWardrobeView.tsx b/src/components/avatar-editor/views/wardrobe/AvatarEditorWardrobeView.tsx index e050b57c..f480c900 100644 --- a/src/components/avatar-editor/views/wardrobe/AvatarEditorWardrobeView.tsx +++ b/src/components/avatar-editor/views/wardrobe/AvatarEditorWardrobeView.tsx @@ -47,25 +47,25 @@ export const AvatarEditorWardrobeView: FC = props const items: JSX.Element[] = []; savedFigures.forEach(([ figureContainer, gender ], index) => - { - let clubLevel = 0; + { + let clubLevel = 0; - if(figureContainer) clubLevel = GetAvatarRenderManager().getFigureClubLevel(figureContainer, gender); + if(figureContainer) clubLevel = GetAvatarRenderManager().getFigureClubLevel(figureContainer, gender); - items.push( - - { figureContainer && + items.push( + + { figureContainer && } - - { (clubLevel > 0) && } - - - { figureContainer && + + { (clubLevel > 0) && } + + + { figureContainer && } - - - ); - }); + + + ); + }); return items; }, [ savedFigures, saveFigureAtWardrobeIndex, wearFigureAtIndex ]); diff --git a/src/components/camera/CameraWidgetView.tsx b/src/components/camera/CameraWidgetView.tsx index aab9d341..89118329 100644 --- a/src/components/camera/CameraWidgetView.tsx +++ b/src/components/camera/CameraWidgetView.tsx @@ -70,13 +70,13 @@ export const CameraWidgetView: FC<{}> = props => return; case 'delete': setCameraRoll(prevValue => - { - const clone = [ ...prevValue ]; + { + const clone = [ ...prevValue ]; - clone.splice(selectedPictureIndex, 1); + clone.splice(selectedPictureIndex, 1); - return clone; - }); + return clone; + }); return; case 'editor_cancel': setMode(MODE_CAPTURE); @@ -106,10 +106,10 @@ export const CameraWidgetView: FC<{}> = props => return; case 'toggle': setMode(prevValue => - { - if(!prevValue) return MODE_CAPTURE; - else return MODE_NONE; - }); + { + if(!prevValue) return MODE_CAPTURE; + else return MODE_NONE; + }); return; } }, []); diff --git a/src/components/camera/common/CameraPicture.ts b/src/components/camera/common/CameraPicture.ts index 8d9401b6..fe8c2210 100644 --- a/src/components/camera/common/CameraPicture.ts +++ b/src/components/camera/common/CameraPicture.ts @@ -4,5 +4,6 @@ export class CameraPicture { constructor( public texture: NitroTexture, - public imageUrl: string) {} + public imageUrl: string) + {} } diff --git a/src/components/camera/common/CameraPictureThumbnail.ts b/src/components/camera/common/CameraPictureThumbnail.ts index d88f9dcd..cd126607 100644 --- a/src/components/camera/common/CameraPictureThumbnail.ts +++ b/src/components/camera/common/CameraPictureThumbnail.ts @@ -2,5 +2,6 @@ export class CameraPictureThumbnail { constructor( public effectName: string, - public thumbnailUrl: string) {} + public thumbnailUrl: string) + {} } diff --git a/src/components/camera/views/capture/CameraWidgetCaptureView.tsx b/src/components/camera/views/capture/CameraWidgetCaptureView.tsx index a7f16f60..07a3ded1 100644 --- a/src/components/camera/views/capture/CameraWidgetCaptureView.tsx +++ b/src/components/camera/views/capture/CameraWidgetCaptureView.tsx @@ -80,9 +80,9 @@ export const CameraWidgetCaptureView: FC = props = { (cameraRoll.length > 0) && { cameraRoll.map((picture, index) => - { - return setSelectedPictureIndex(index) } />; - }) } + { + return setSelectedPictureIndex(index) } />; + }) } } diff --git a/src/components/camera/views/editor/CameraWidgetEditorView.tsx b/src/components/camera/views/editor/CameraWidgetEditorView.tsx index e1b70a25..18f1da98 100644 --- a/src/components/camera/views/editor/CameraWidgetEditorView.tsx +++ b/src/components/camera/views/editor/CameraWidgetEditorView.tsx @@ -76,14 +76,14 @@ export const CameraWidgetEditorView: FC = props => if(index === -1) return; setSelectedEffects(prevValue => - { - const clone = [ ...prevValue ]; - const currentEffect = clone[index]; + { + const clone = [ ...prevValue ]; + const currentEffect = clone[index]; - clone[getCurrentEffectIndex] = new RoomCameraWidgetSelectedEffect(currentEffect.effect, alpha); + clone[getCurrentEffectIndex] = new RoomCameraWidgetSelectedEffect(currentEffect.effect, alpha); - return clone; - }); + return clone; + }); }, [ getCurrentEffectIndex, setSelectedEffects ]); const getCurrentPictureUrl = useMemo(() => @@ -117,9 +117,9 @@ export const CameraWidgetEditorView: FC = props => if(!effect) return; setSelectedEffects(prevValue => - { - return [ ...prevValue, new RoomCameraWidgetSelectedEffect(effect, 1) ]; - }); + { + return [ ...prevValue, new RoomCameraWidgetSelectedEffect(effect, 1) ]; + }); setSelectedEffectName(effect.name); return; @@ -130,13 +130,13 @@ export const CameraWidgetEditorView: FC = props => if(existingIndex === -1) return; setSelectedEffects(prevValue => - { - const clone = [ ...prevValue ]; + { + const clone = [ ...prevValue ]; - clone.splice(existingIndex, 1); + clone.splice(existingIndex, 1); - return clone; - }); + return clone; + }); if(selectedEffectName === effectName) setSelectedEffectName(null); return; @@ -177,9 +177,9 @@ export const CameraWidgetEditorView: FC = props => processAction('close') } /> { TABS.map(tab => - { - return processAction('change_tab', tab) }> - }) } + { + return processAction('change_tab', tab) }> + }) } diff --git a/src/components/camera/views/editor/effect-list/CameraWidgetEffectListView.tsx b/src/components/camera/views/editor/effect-list/CameraWidgetEffectListView.tsx index 3c007676..9d736664 100644 --- a/src/components/camera/views/editor/effect-list/CameraWidgetEffectListView.tsx +++ b/src/components/camera/views/editor/effect-list/CameraWidgetEffectListView.tsx @@ -20,12 +20,12 @@ export const CameraWidgetEffectListView: FC = p return ( { effects && (effects.length > 0) && effects.map((effect, index) => - { - const thumbnailUrl = (thumbnails.find(thumbnail => (thumbnail.effectName === effect.name))); - const isActive = (selectedEffects.findIndex(selectedEffect => (selectedEffect.effect.name === effect.name)) > -1); + { + const thumbnailUrl = (thumbnails.find(thumbnail => (thumbnail.effectName === effect.name))); + const isActive = (selectedEffects.findIndex(selectedEffect => (selectedEffect.effect.name === effect.name)) > -1); - return myLevel) } selectEffect={ () => processAction('select_effect', effect.name) } removeEffect={ () => processAction('remove_effect', effect.name) } /> - }) } + return myLevel) } selectEffect={ () => processAction('select_effect', effect.name) } removeEffect={ () => processAction('remove_effect', effect.name) } /> + }) } ); } diff --git a/src/components/campaign/CalendarView.tsx b/src/components/campaign/CalendarView.tsx index ba6e711e..48538fe3 100644 --- a/src/components/campaign/CalendarView.tsx +++ b/src/components/campaign/CalendarView.tsx @@ -104,7 +104,7 @@ export const CalendarView: FC = props => - { LocalizeText('campaign.calendar.heading.day', ['number'], [(selectedDay + 1).toString()]) } + { LocalizeText('campaign.calendar.heading.day', [ 'number' ], [ (selectedDay + 1).toString() ]) } { dayMessage(selectedDay) }
@@ -121,16 +121,16 @@ export const CalendarView: FC = props => - { [...Array(TOTAL_SHOWN_ITEMS)].map((e, i) => - { - const day = (index + i); + { [ ...Array(TOTAL_SHOWN_ITEMS) ].map((e, i) => + { + const day = (index + i); - return ( - - - - ); - }) } + return ( + + + + ); + }) } diff --git a/src/components/campaign/CampaignView.tsx b/src/components/campaign/CampaignView.tsx index f34af2d2..c3919755 100644 --- a/src/components/campaign/CampaignView.tsx +++ b/src/components/campaign/CampaignView.tsx @@ -34,25 +34,25 @@ export const CampaignView: FC<{}> = props => BatchUpdates(() => { setCalendarData(prev => - { - const copy = prev.clone(); - copy.openedDays.push(lastOpenAttempt); + { + const copy = prev.clone(); + copy.openedDays.push(lastOpenAttempt); - return copy; - }); + return copy; + }); - setReceivedProducts(prev => - { - const copy = new Map(prev); - copy.set(lastAttempt, new CalendarItem(parser.productName, parser.customImage,parser.furnitureClassName)); + setReceivedProducts(prev => + { + const copy = new Map(prev); + copy.set(lastAttempt, new CalendarItem(parser.productName, parser.customImage,parser.furnitureClassName)); - return copy; - }); + return copy; + }); }); } setLastOpenAttempt(-1); - }, [lastOpenAttempt]); + }, [ lastOpenAttempt ]); UseMessageEventHook(CampaignCalendarDoorOpenedMessageEvent, onCampaignCalendarDoorOpenedMessageEvent); @@ -71,7 +71,7 @@ export const CampaignView: FC<{}> = props => { SendMessageComposer(new OpenCampaignCalendarDoorComposer(calendarData.campaignName, id)); } - }, [calendarData]); + }, [ calendarData ]); const onCalendarClose = useCallback(() => { @@ -101,7 +101,7 @@ export const CampaignView: FC<{}> = props => { RemoveLinkEventTracker(linkTracker); } - }, [onLinkReceived]); + }, [ onLinkReceived ]); return ( <> diff --git a/src/components/catalog/CatalogMessageHandler.tsx b/src/components/catalog/CatalogMessageHandler.tsx index b149befa..eb404dcf 100644 --- a/src/components/catalog/CatalogMessageHandler.tsx +++ b/src/components/catalog/CatalogMessageHandler.tsx @@ -155,13 +155,13 @@ export const CatalogMessageHandler: FC<{}> = props => if(offer.product && (offer.product.productType === ProductTypeEnum.WALL)) { setPurchaseOptions(prevValue => - { - const newValue = { ...prevValue }; + { + const newValue = { ...prevValue }; - newValue.extraData =( offer.product.extraParam || null); + newValue.extraData =( offer.product.extraParam || null); - return newValue; - }); + return newValue; + }); } } @@ -174,27 +174,27 @@ export const CatalogMessageHandler: FC<{}> = props => const petPalette = new CatalogPetPalette(parser.productCode, parser.palettes.slice()); setCatalogOptions(prevValue => + { + const petPalettes = []; + + if(prevValue.petPalettes) petPalettes.push(...prevValue.petPalettes); + + for(let i = 0; i < petPalettes.length; i++) { - const petPalettes = []; + const palette = petPalettes[i]; - if(prevValue.petPalettes) petPalettes.push(...prevValue.petPalettes); - - for(let i = 0; i < petPalettes.length; i++) + if(palette.breed === petPalette.breed) { - const palette = petPalettes[i]; + petPalettes.splice(i, 1); - if(palette.breed === petPalette.breed) - { - petPalettes.splice(i, 1); - - break; - } + break; } + } - petPalettes.push(petPalette); + petPalettes.push(petPalette); - return { ...prevValue, petPalettes }; - }); + return { ...prevValue, petPalettes }; + }); }, [ setCatalogOptions ]); const onApproveNameMessageEvent = useCallback((event: ApproveNameMessageEvent) => @@ -214,11 +214,11 @@ export const CatalogMessageHandler: FC<{}> = props => const parser = event.getParser(); setCatalogOptions(prevValue => - { - const clubOffers = parser.offers; + { + const clubOffers = parser.offers; - return { ...prevValue, clubOffers }; - }); + return { ...prevValue, clubOffers }; + }); }, [ setCatalogOptions ]); const onGuildMembershipsMessageEvent = useCallback((event: GuildMembershipsMessageEvent) => @@ -226,11 +226,11 @@ export const CatalogMessageHandler: FC<{}> = props => const parser = event.getParser(); setCatalogOptions(prevValue => - { - const groups = parser.groups; + { + const groups = parser.groups; - return { ...prevValue, groups }; - }); + return { ...prevValue, groups }; + }); }, [ setCatalogOptions ]); const onUserSubscriptionEvent = useCallback((event: UserSubscriptionEvent) => @@ -238,16 +238,16 @@ export const CatalogMessageHandler: FC<{}> = props => const parser = event.getParser(); setCatalogOptions(prevValue => - { - const subscriptionInfo = new SubscriptionInfo( - Math.max(0, parser.daysToPeriodEnd), - Math.max(0, parser.periodsSubscribedAhead), - parser.isVip, - parser.pastClubDays, - parser.pastVipDays); + { + const subscriptionInfo = new SubscriptionInfo( + Math.max(0, parser.daysToPeriodEnd), + Math.max(0, parser.periodsSubscribedAhead), + parser.isVip, + parser.pastClubDays, + parser.pastVipDays); - return { ...prevValue, subscriptionInfo }; - }); + return { ...prevValue, subscriptionInfo }; + }); }, [ setCatalogOptions ]); const onGiftWrappingConfigurationEvent = useCallback((event: GiftWrappingConfigurationEvent) => @@ -255,11 +255,11 @@ export const CatalogMessageHandler: FC<{}> = props => const parser = event.getParser(); setCatalogOptions(prevValue => - { - const giftConfiguration = new GiftWrappingConfiguration(parser); + { + const giftConfiguration = new GiftWrappingConfiguration(parser); - return { ...prevValue, giftConfiguration }; - }); + return { ...prevValue, giftConfiguration }; + }); }, [ setCatalogOptions ]); const onMarketplaceMakeOfferResult = useCallback((event: MarketplaceMakeOfferResult) => @@ -288,11 +288,11 @@ export const CatalogMessageHandler: FC<{}> = props => const parser = event.getParser(); setCatalogOptions(prevValue => - { - const clubGifts = parser; + { + const clubGifts = parser; - return { ...prevValue, clubGifts }; - }); + return { ...prevValue, clubGifts }; + }); }, [ setCatalogOptions ]); UseMessageEventHook(CatalogPagesListEvent, onCatalogPagesListEvent); diff --git a/src/components/catalog/CatalogView.tsx b/src/components/catalog/CatalogView.tsx index 58c8aa2b..d38da044 100644 --- a/src/components/catalog/CatalogView.tsx +++ b/src/components/catalog/CatalogView.tsx @@ -183,31 +183,31 @@ export const CatalogView: FC<{}> = props => nodes.reverse(); setActiveNodes(prevValue => + { + const isActive = (prevValue.indexOf(targetNode) >= 0); + const isOpen = targetNode.isOpen; + + for(const existing of prevValue) { - const isActive = (prevValue.indexOf(targetNode) >= 0); - const isOpen = targetNode.isOpen; + existing.deactivate(); - for(const existing of prevValue) - { - existing.deactivate(); + if(nodes.indexOf(existing) === -1) existing.close(); + } - if(nodes.indexOf(existing) === -1) existing.close(); - } + for(const n of nodes) + { + n.activate(); - for(const n of nodes) - { - n.activate(); + if(n.parent) n.open(); - if(n.parent) n.open(); + if((n === targetNode.parent) && n.children.length) n.open(); + } - if((n === targetNode.parent) && n.children.length) n.open(); - } + if(isActive && isOpen) targetNode.close(); + else targetNode.open(); - if(isActive && isOpen) targetNode.close(); - else targetNode.open(); - - return nodes; - }); + return nodes; + }); if(targetNode.pageId > -1) loadCatalogPage(targetNode.pageId, offerId); }, [ setActiveNodes, loadCatalogPage ]); @@ -346,11 +346,11 @@ export const CatalogView: FC<{}> = props => return () => { setRoomPreviewer(prevValue => - { - prevValue.dispose(); + { + prevValue.dispose(); - return null; - }); + return null; + }); } }, []); @@ -415,23 +415,26 @@ export const CatalogView: FC<{}> = props => { isVisible && - { setIsVisible(false); } } /> + + { + setIsVisible(false); + } } /> { rootNode && (rootNode.children.length > 0) && rootNode.children.map(child => - { - if(!child.isVisible) return null; + { + if(!child.isVisible) return null; - return ( - - { - if(searchResult) setSearchResult(null); + return ( + + { + if(searchResult) setSearchResult(null); - activateNode(child); - } }> - { child.localization } - - ); - }) } + activateNode(child); + } }> + { child.localization } + + ); + }) } @@ -446,8 +449,8 @@ export const CatalogView: FC<{}> = props => } - - + + ); } diff --git a/src/components/catalog/common/CatalogPetPalette.ts b/src/components/catalog/common/CatalogPetPalette.ts index 7a7df4c2..d92c40dd 100644 --- a/src/components/catalog/common/CatalogPetPalette.ts +++ b/src/components/catalog/common/CatalogPetPalette.ts @@ -5,5 +5,6 @@ export class CatalogPetPalette constructor( public readonly breed: string, public readonly palettes: SellablePetPaletteData[] - ) {} + ) + {} } diff --git a/src/components/catalog/common/CatalogUtilities.ts b/src/components/catalog/common/CatalogUtilities.ts index f2655688..54319610 100644 --- a/src/components/catalog/common/CatalogUtilities.ts +++ b/src/components/catalog/common/CatalogUtilities.ts @@ -85,21 +85,21 @@ export function GetPetAvailableColors(petIndex: number, palettes: SellablePetPal switch(petIndex) { case 0: - return [[16743226], [16750435], [16764339], [0xF59500], [16498012], [16704690], [0xEDD400], [16115545], [16513201], [8694111], [11585939], [14413767], [6664599], [9553845], [12971486], [8358322], [10002885], [13292268], [10780600], [12623573], [14403561], [12418717], [14327229], [15517403], [14515069], [15764368], [16366271], [0xABABAB], [0xD4D4D4], [0xFFFFFF], [14256481], [14656129], [15848130], [14005087], [14337152], [15918540], [15118118], [15531929], [9764857], [11258085]]; + return [ [ 16743226 ], [ 16750435 ], [ 16764339 ], [ 0xF59500 ], [ 16498012 ], [ 16704690 ], [ 0xEDD400 ], [ 16115545 ], [ 16513201 ], [ 8694111 ], [ 11585939 ], [ 14413767 ], [ 6664599 ], [ 9553845 ], [ 12971486 ], [ 8358322 ], [ 10002885 ], [ 13292268 ], [ 10780600 ], [ 12623573 ], [ 14403561 ], [ 12418717 ], [ 14327229 ], [ 15517403 ], [ 14515069 ], [ 15764368 ], [ 16366271 ], [ 0xABABAB ], [ 0xD4D4D4 ], [ 0xFFFFFF ], [ 14256481 ], [ 14656129 ], [ 15848130 ], [ 14005087 ], [ 14337152 ], [ 15918540 ], [ 15118118 ], [ 15531929 ], [ 9764857 ], [ 11258085 ] ]; case 1: - return [[16743226], [16750435], [16764339], [0xF59500], [16498012], [16704690], [0xEDD400], [16115545], [16513201], [8694111], [11585939], [14413767], [6664599], [9553845], [12971486], [8358322], [10002885], [13292268], [10780600], [12623573], [14403561], [12418717], [14327229], [15517403], [14515069], [15764368], [16366271], [0xABABAB], [0xD4D4D4], [0xFFFFFF], [14256481], [14656129], [15848130], [14005087], [14337152], [15918540], [15118118], [15531929], [9764857], [11258085]]; + return [ [ 16743226 ], [ 16750435 ], [ 16764339 ], [ 0xF59500 ], [ 16498012 ], [ 16704690 ], [ 0xEDD400 ], [ 16115545 ], [ 16513201 ], [ 8694111 ], [ 11585939 ], [ 14413767 ], [ 6664599 ], [ 9553845 ], [ 12971486 ], [ 8358322 ], [ 10002885 ], [ 13292268 ], [ 10780600 ], [ 12623573 ], [ 14403561 ], [ 12418717 ], [ 14327229 ], [ 15517403 ], [ 14515069 ], [ 15764368 ], [ 16366271 ], [ 0xABABAB ], [ 0xD4D4D4 ], [ 0xFFFFFF ], [ 14256481 ], [ 14656129 ], [ 15848130 ], [ 14005087 ], [ 14337152 ], [ 15918540 ], [ 15118118 ], [ 15531929 ], [ 9764857 ], [ 11258085 ] ]; case 2: - return [[16579283], [15378351], [8830016], [15257125], [9340985], [8949607], [6198292], [8703620], [9889626], [8972045], [12161285], [13162269], [8620113], [12616503], [8628101], [0xD2FF00], [9764857]]; + return [ [ 16579283 ], [ 15378351 ], [ 8830016 ], [ 15257125 ], [ 9340985 ], [ 8949607 ], [ 6198292 ], [ 8703620 ], [ 9889626 ], [ 8972045 ], [ 12161285 ], [ 13162269 ], [ 8620113 ], [ 12616503 ], [ 8628101 ], [ 0xD2FF00 ], [ 9764857 ] ]; case 3: - return [[0xFFFFFF], [0xEEEEEE], [0xDDDDDD]]; + return [ [ 0xFFFFFF ], [ 0xEEEEEE ], [ 0xDDDDDD ] ]; case 4: - return [[0xFFFFFF], [16053490], [15464440], [16248792], [15396319], [15007487]]; + return [ [ 0xFFFFFF ], [ 16053490 ], [ 15464440 ], [ 16248792 ], [ 15396319 ], [ 15007487 ] ]; case 5: - return [[0xFFFFFF], [0xEEEEEE], [0xDDDDDD]]; + return [ [ 0xFFFFFF ], [ 0xEEEEEE ], [ 0xDDDDDD ] ]; case 6: - return [[0xFFFFFF], [0xEEEEEE], [0xDDDDDD], [16767177], [16770205], [16751331]]; + return [ [ 0xFFFFFF ], [ 0xEEEEEE ], [ 0xDDDDDD ], [ 16767177 ], [ 16770205 ], [ 16751331 ] ]; case 7: - return [[0xCCCCCC], [0xAEAEAE], [16751331], [10149119], [16763290], [16743786]]; + return [ [ 0xCCCCCC ], [ 0xAEAEAE ], [ 16751331 ], [ 10149119 ], [ 16763290 ], [ 16743786 ] ]; default: { const colors: number[][] = []; diff --git a/src/components/catalog/common/SearchResult.ts b/src/components/catalog/common/SearchResult.ts index 4083c699..419f3cf4 100644 --- a/src/components/catalog/common/SearchResult.ts +++ b/src/components/catalog/common/SearchResult.ts @@ -6,6 +6,6 @@ export class SearchResult constructor( public readonly searchValue: string, public readonly offers: IPurchasableOffer[], - public readonly filteredNodes: ICatalogNode[] - ) {} + public readonly filteredNodes: ICatalogNode[]) + {} } diff --git a/src/components/catalog/common/SubscriptionInfo.ts b/src/components/catalog/common/SubscriptionInfo.ts index 29d4b358..72d16e69 100644 --- a/src/components/catalog/common/SubscriptionInfo.ts +++ b/src/components/catalog/common/SubscriptionInfo.ts @@ -8,7 +8,8 @@ export class SubscriptionInfo public readonly clubPeriods: number = 0, public readonly isVip: boolean = false, public readonly pastDays: number = 0, - public readonly pastVipDays: number = 0) {} + public readonly pastVipDays: number = 0) + {} public get lastUpdated(): number { diff --git a/src/components/catalog/views/gift/CatalogGiftView.tsx b/src/components/catalog/views/gift/CatalogGiftView.tsx index 60450658..acf0db31 100644 --- a/src/components/catalog/views/gift/CatalogGiftView.tsx +++ b/src/components/catalog/views/gift/CatalogGiftView.tsx @@ -196,7 +196,7 @@ export const CatalogGiftView: FC<{}> = props => { LocalizeText(boxName) } - { LocalizeText(priceText, ['price'], [giftConfiguration.price.toString()]) } + { LocalizeText(priceText, [ 'price' ], [ giftConfiguration.price.toString() ]) } diff --git a/src/components/catalog/views/navigation/CatalogNavigationSetView.tsx b/src/components/catalog/views/navigation/CatalogNavigationSetView.tsx index 56122fdd..e1553631 100644 --- a/src/components/catalog/views/navigation/CatalogNavigationSetView.tsx +++ b/src/components/catalog/views/navigation/CatalogNavigationSetView.tsx @@ -14,11 +14,11 @@ export const CatalogNavigationSetView: FC = props return ( <> { node && (node.children.length > 0) && node.children.map((n, index) => - { - if(!n.isVisible) return null; + { + if(!n.isVisible) return null; - return - }) } + return + }) } ); } diff --git a/src/components/catalog/views/page/layout/CatalogLayoutBadgeDisplayView.tsx b/src/components/catalog/views/page/layout/CatalogLayoutBadgeDisplayView.tsx index 97860eeb..849fff8d 100644 --- a/src/components/catalog/views/page/layout/CatalogLayoutBadgeDisplayView.tsx +++ b/src/components/catalog/views/page/layout/CatalogLayoutBadgeDisplayView.tsx @@ -42,7 +42,7 @@ export const CatalogLayoutBadgeDisplayView: FC = props => { currentOffer.localizationName } - + diff --git a/src/components/catalog/views/page/layout/CatalogLayoutTrophiesView.tsx b/src/components/catalog/views/page/layout/CatalogLayoutTrophiesView.tsx index eb6c5ba7..1ecb9192 100644 --- a/src/components/catalog/views/page/layout/CatalogLayoutTrophiesView.tsx +++ b/src/components/catalog/views/page/layout/CatalogLayoutTrophiesView.tsx @@ -21,13 +21,13 @@ export const CatalogLayoutTrophiesView: FC = props => if(!currentOffer) return; setPurchaseOptions(prevValue => - { - const newValue = { ...prevValue }; + { + const newValue = { ...prevValue }; - newValue.extraData = trophyText; + newValue.extraData = trophyText; - return newValue; - }); + return newValue; + }); }, [ currentOffer, trophyText, setPurchaseOptions ]); return ( diff --git a/src/components/catalog/views/page/layout/CatalogLayoutVipBuyView.tsx b/src/components/catalog/views/page/layout/CatalogLayoutVipBuyView.tsx index 9d0a25ee..f32db617 100644 --- a/src/components/catalog/views/page/layout/CatalogLayoutVipBuyView.tsx +++ b/src/components/catalog/views/page/layout/CatalogLayoutVipBuyView.tsx @@ -140,28 +140,28 @@ export const CatalogLayoutVipBuyView: FC = props => { clubOffers && (clubOffers.length > 0) && clubOffers.map((offer, index) => - { - return ( - setOffer(offer) }> - - - { getOfferText(offer) } - - { (offer.priceCredits > 0) && + { + return ( + setOffer(offer) }> + + + { getOfferText(offer) } + + { (offer.priceCredits > 0) && { offer.priceCredits } } - { (offer.priceActivityPoints > 0) && + { (offer.priceActivityPoints > 0) && { offer.priceActivityPoints } } - - - - ); - }) } + + + + ); + }) } diff --git a/src/components/catalog/views/page/layout/GetCatalogLayout.tsx b/src/components/catalog/views/page/layout/GetCatalogLayout.tsx index 53b78265..78674428 100644 --- a/src/components/catalog/views/page/layout/GetCatalogLayout.tsx +++ b/src/components/catalog/views/page/layout/GetCatalogLayout.tsx @@ -64,7 +64,7 @@ export const GetCatalogLayout = (page: ICatalogPage, hideNavigation: () => void) case 'badge_display': return ; //case 'default_3x3_color_grouping': - //return ; + //return ; case 'bots': case 'default_3x3': default: diff --git a/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceItemView.tsx b/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceItemView.tsx index 77baecf2..841c0f8a 100644 --- a/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceItemView.tsx +++ b/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceItemView.tsx @@ -44,8 +44,8 @@ export const CatalogLayoutMarketplaceItemView: FC = pr text = hours + ' ' + LocalizeText('catalog.marketplace.offer.hours') + ' ' + text; } - return LocalizeText('catalog.marketplace.offer.time_left', ['time'], [text] ); - }, [offerData]); + return LocalizeText('catalog.marketplace.offer.time_left', [ 'time' ], [ text ] ); + }, [ offerData ]); return ( @@ -59,8 +59,8 @@ export const CatalogLayoutMarketplaceItemView: FC = pr } { (type === PUBLIC_OFFER) && <> - { LocalizeText('catalog.marketplace.offer.price_public_item', ['price', 'average'], [offerData.price.toString(), offerData.averagePrice.toString() ]) } - { LocalizeText('catalog.marketplace.offer_count', ['count'], [offerData.offerCount.toString()]) } + { LocalizeText('catalog.marketplace.offer.price_public_item', [ 'price', 'average' ], [ offerData.price.toString(), offerData.averagePrice.toString() ]) } + { LocalizeText('catalog.marketplace.offer_count', [ 'count' ], [ offerData.offerCount.toString() ]) } } diff --git a/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceOwnItemsView.tsx b/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceOwnItemsView.tsx index 2772c0d9..ff2de8a8 100644 --- a/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceOwnItemsView.tsx +++ b/src/components/catalog/views/page/layout/marketplace/CatalogLayoutMarketplaceOwnItemsView.tsx @@ -20,13 +20,13 @@ export const CatalogLayoutMarketplaceOwnItemsView: FC = prop if(!parser) return; const offers = parser.offers.map(offer => - { - const newOffer = new MarketplaceOfferData(offer.offerId, offer.furniId, offer.furniType, offer.extraData, offer.stuffData, offer.price, offer.status, offer.averagePrice, offer.offerCount); + { + const newOffer = new MarketplaceOfferData(offer.offerId, offer.furniId, offer.furniType, offer.extraData, offer.stuffData, offer.price, offer.status, offer.averagePrice, offer.offerCount); - newOffer.timeLeftMinutes = offer.timeLeftMinutes; + newOffer.timeLeftMinutes = offer.timeLeftMinutes; - return newOffer; - }); + return newOffer; + }); BatchUpdates(() => { @@ -91,7 +91,7 @@ export const CatalogLayoutMarketplaceOwnItemsView: FC = prop { (creditsWaiting > 0) && - { LocalizeText('catalog.marketplace.redeem.get_credits', ['count', 'credits'], [ soldOffers.length.toString(), creditsWaiting.toString() ]) } + { LocalizeText('catalog.marketplace.redeem.get_credits', [ 'count', 'credits' ], [ soldOffers.length.toString(), creditsWaiting.toString() ]) } { Array.from(Array(maxDisplayCount), (e, i) => - { - return ; - }) } + { + return ; + }) } diff --git a/src/components/friends/views/friends-list/FriendsListView.tsx b/src/components/friends/views/friends-list/FriendsListView.tsx index c0f81929..fc086979 100644 --- a/src/components/friends/views/friends-list/FriendsListView.tsx +++ b/src/components/friends/views/friends-list/FriendsListView.tsx @@ -43,29 +43,29 @@ export const FriendsListView: FC = props => } return LocalizeText('friendlist.removefriendconfirm.userlist', [ 'user_names' ], [ userNames.join(', ') ]); - }, [offlineFriends, onlineFriends, selectedFriendsIds]); + }, [ offlineFriends, onlineFriends, selectedFriendsIds ]); const selectFriend = useCallback((userId: number) => { if(userId < 0) return; setSelectedFriendsIds(prevValue => + { + const newValue = [ ...prevValue ]; + + const existingUserIdIndex: number = newValue.indexOf(userId); + + if(existingUserIdIndex > -1) { - const newValue = [ ...prevValue ]; + newValue.splice(existingUserIdIndex, 1) + } + else + { + newValue.push(userId); + } - const existingUserIdIndex: number = newValue.indexOf(userId); - - if(existingUserIdIndex > -1) - { - newValue.splice(existingUserIdIndex, 1) - } - else - { - newValue.push(userId); - } - - return newValue; - }); + return newValue; + }); }, [ setSelectedFriendsIds ]); const sendRoomInvite = (message: string) => @@ -81,11 +81,11 @@ export const FriendsListView: FC = props => if(selectedFriendsIds.length === 0) return; setSelectedFriendsIds(prevValue => - { - SendMessageComposer(new RemoveFriendComposer(...prevValue)); + { + SendMessageComposer(new RemoveFriendComposer(...prevValue)); - return []; - }); + return []; + }); setShowRemoveFriendsConfirmation(false); } diff --git a/src/components/friends/views/friends-list/FriendsRemoveConfirmationView.tsx b/src/components/friends/views/friends-list/FriendsRemoveConfirmationView.tsx index 479a9396..d01947b4 100644 --- a/src/components/friends/views/friends-list/FriendsRemoveConfirmationView.tsx +++ b/src/components/friends/views/friends-list/FriendsRemoveConfirmationView.tsx @@ -18,8 +18,8 @@ export const FriendsRemoveConfirmationView: FC -
{ removeFriendsText }
- +
{ removeFriendsText }
+ diff --git a/src/components/friends/views/friends-list/FriendsSearchView.tsx b/src/components/friends/views/friends-list/FriendsSearchView.tsx index 30079e1d..a3e04c31 100644 --- a/src/components/friends/views/friends-list/FriendsSearchView.tsx +++ b/src/components/friends/views/friends-list/FriendsSearchView.tsx @@ -59,20 +59,20 @@ export const FriendsSearchView: FC = props =>
{ friendResults.map(result => - { - return ( - - - -
{ result.avatarName }
- - - { result.isAvatarOnline && + { + return ( + + + +
{ result.avatarName }
+ + + { result.isAvatarOnline && OpenMessengerChat(result.avatarId) } title={ LocalizeText('friendlist.tip.im') } /> } - - - ) - }) } + + + ) + }) } } } @@ -86,20 +86,20 @@ export const FriendsSearchView: FC = props =>
{ otherResults.map(result => - { - return ( - - - -
{ result.avatarName }
- - - { canRequestFriend(result.avatarId) && + { + return ( + + + +
{ result.avatarName }
+ + + { canRequestFriend(result.avatarId) && requestFriend(result.avatarId, result.avatarName) } title={ LocalizeText('friendlist.tip.addfriend') } /> } - - - ) - }) } + + + ) + }) } } } diff --git a/src/components/friends/views/messenger/FriendsMessengerThreadGroup.tsx b/src/components/friends/views/messenger/FriendsMessengerThreadGroup.tsx index cea6edfc..37343c96 100644 --- a/src/components/friends/views/messenger/FriendsMessengerThreadGroup.tsx +++ b/src/components/friends/views/messenger/FriendsMessengerThreadGroup.tsx @@ -26,47 +26,47 @@ export const FriendsMessengerThreadGroup: FC = if( (group.type === GroupType.GROUP_CHAT) && (group.chats.length && getGroupChatData(group.chats[0].extraData).userId === GetSessionDataManager().userId)) return true; return false; - }, [group, thread]); + }, [ group, thread ]); if(!thread || !group) return null; if(!group.userId) { return ( - <> + <> { group.chats.map((chat, index) => - { - return ( -
- - { chat.type === MessengerThreadChat.SECURITY_NOTIFICATION && + { + return ( +
+ + { chat.type === MessengerThreadChat.SECURITY_NOTIFICATION && { chat.message } } - { chat.type === MessengerThreadChat.ROOM_INVITE && + { chat.type === MessengerThreadChat.ROOM_INVITE && - - {(LocalizeText('messenger.invitation') + ' ') }{ chat.message } - } - -
- ); - }) } + + {(LocalizeText('messenger.invitation') + ' ') }{ chat.message } + } + +
+ ); + }) } ); } return ( - + { (group.type === GroupType.PRIVATE_CHAT && !isOwnChat) && } { (group.type === GroupType.GROUP_CHAT && !isOwnChat) && } - + { (isOwnChat) && GetSessionDataManager().userName } diff --git a/src/components/friends/views/messenger/FriendsMessengerThreadView.tsx b/src/components/friends/views/messenger/FriendsMessengerThreadView.tsx index 98e34965..f0264586 100644 --- a/src/components/friends/views/messenger/FriendsMessengerThreadView.tsx +++ b/src/components/friends/views/messenger/FriendsMessengerThreadView.tsx @@ -14,9 +14,9 @@ export const FriendsMessengerThreadView: FC = p return ( <> { (thread.groups.length > 0) && thread.groups.map((group, index) => - { - return ; - }) } + { + return ; + }) } ); } diff --git a/src/components/friends/views/messenger/FriendsMessengerView.tsx b/src/components/friends/views/messenger/FriendsMessengerView.tsx index a7e10741..67c2a972 100644 --- a/src/components/friends/views/messenger/FriendsMessengerView.tsx +++ b/src/components/friends/views/messenger/FriendsMessengerView.tsx @@ -12,29 +12,29 @@ import { FriendsMessengerThreadView } from './FriendsMessengerThreadView'; export const FriendsMessengerView: FC<{}> = props => { - const [isVisible, setIsVisible] = useState(false); - const [messageThreads, setMessageThreads] = useState([]); - const [activeThreadIndex, setActiveThreadIndex] = useState(-1); - const [hiddenThreadIndexes, setHiddenThreadIndexes] = useState([]); - const [messageText, setMessageText] = useState(''); - const [updateValue, setUpdateValue] = useState({}); + const [ isVisible, setIsVisible ] = useState(false); + const [ messageThreads, setMessageThreads ] = useState([]); + const [ activeThreadIndex, setActiveThreadIndex ] = useState(-1); + const [ hiddenThreadIndexes, setHiddenThreadIndexes ] = useState([]); + const [ messageText, setMessageText ] = useState(''); + const [ updateValue, setUpdateValue ] = useState({}); const { friends = [] } = useFriendsContext(); const messagesBox = useRef(); const followFriend = useCallback(() => { SendMessageComposer(new FollowFriendMessageComposer(messageThreads[activeThreadIndex].participant.id)); - }, [messageThreads, activeThreadIndex]); + }, [ messageThreads, activeThreadIndex ]); const openProfile = useCallback(() => { GetUserProfile(messageThreads[activeThreadIndex].participant.id); - }, [messageThreads, activeThreadIndex]); + }, [ messageThreads, activeThreadIndex ]); const getFriend = useCallback((userId: number) => { return ((friends.find(friend => (friend.id === userId))) || null); - }, [friends]); + }, [ friends ]); const visibleThreads = useMemo(() => { @@ -44,7 +44,7 @@ export const FriendsMessengerView: FC<{}> = props => return true; }); - }, [messageThreads, hiddenThreadIndexes]); + }, [ messageThreads, hiddenThreadIndexes ]); const getMessageThreadWithIndex = useCallback<(userId: number) => [number, MessengerThread]>((userId: number) => { @@ -62,7 +62,7 @@ export const FriendsMessengerView: FC<{}> = props => { setHiddenThreadIndexes(prevValue => { - const newIndexes = [...prevValue]; + const newIndexes = [ ...prevValue ]; newIndexes.splice(hiddenIndex, 1); @@ -70,34 +70,34 @@ export const FriendsMessengerView: FC<{}> = props => }); } - return [i, thread]; + return [ i, thread ]; } } } const friend = getFriend(userId); - if(!friend) return [-1, null]; + if(!friend) return [ -1, null ]; const thread = new MessengerThread(friend); - const newThreads = [...messageThreads, thread]; + const newThreads = [ ...messageThreads, thread ]; setMessageThreads(newThreads); - return [(newThreads.length - 1), thread]; - }, [messageThreads, hiddenThreadIndexes, getFriend]); + return [ (newThreads.length - 1), thread ]; + }, [ messageThreads, hiddenThreadIndexes, getFriend ]); const onNewConsoleMessageEvent = useCallback((event: NewConsoleMessageEvent) => { const parser = event.getParser(); - const [threadIndex, thread] = getMessageThreadWithIndex(parser.senderId); + const [ threadIndex, thread ] = getMessageThreadWithIndex(parser.senderId); if((threadIndex === -1) || !thread) return; thread.addMessage(parser.senderId, parser.messageText, parser.secondsSinceSent, parser.extraData); - setMessageThreads(prevValue => [...prevValue]); - }, [getMessageThreadWithIndex]); + setMessageThreads(prevValue => [ ...prevValue ]); + }, [ getMessageThreadWithIndex ]); UseMessageEventHook(NewConsoleMessageEvent, onNewConsoleMessageEvent); @@ -105,14 +105,14 @@ export const FriendsMessengerView: FC<{}> = props => { const parser = event.getParser(); - const [threadIndex, thread] = getMessageThreadWithIndex(parser.senderId); + const [ threadIndex, thread ] = getMessageThreadWithIndex(parser.senderId); if((threadIndex === -1) || !thread) return; thread.addMessage(null, parser.messageText, 0, null, MessengerThreadChat.ROOM_INVITE); - setMessageThreads(prevValue => [...prevValue]); - }, [getMessageThreadWithIndex]); + setMessageThreads(prevValue => [ ...prevValue ]); + }, [ getMessageThreadWithIndex ]); UseMessageEventHook(RoomInviteEvent, onRoomInviteEvent); @@ -144,17 +144,17 @@ export const FriendsMessengerView: FC<{}> = props => BatchUpdates(() => { - setMessageThreads(prevValue => [...prevValue]); + setMessageThreads(prevValue => [ ...prevValue ]); setMessageText(''); }); - }, [messageThreads, activeThreadIndex, messageText]); + }, [ messageThreads, activeThreadIndex, messageText ]); const onKeyDown = useCallback((event: KeyboardEvent) => { if(event.key !== 'Enter') return; sendMessage(); - }, [sendMessage]); + }, [ sendMessage ]); const linkReceived = useCallback((url: string) => { @@ -169,7 +169,7 @@ export const FriendsMessengerView: FC<{}> = props => return; } - const [threadIndex] = getMessageThreadWithIndex(parseInt(parts[2])); + const [ threadIndex ] = getMessageThreadWithIndex(parseInt(parts[2])); if(threadIndex === -1) return; @@ -178,13 +178,13 @@ export const FriendsMessengerView: FC<{}> = props => setActiveThreadIndex(threadIndex); setIsVisible(true); }); - }, [getMessageThreadWithIndex]); + }, [ getMessageThreadWithIndex ]); const closeThread = useCallback((threadIndex: number) => { setHiddenThreadIndexes(prevValue => { - const values = [...prevValue]; + const values = [ ...prevValue ]; if(values.indexOf(threadIndex) === -1) values.push(threadIndex); @@ -202,19 +202,19 @@ export const FriendsMessengerView: FC<{}> = props => AddEventLinkTracker(linkTracker); return () => RemoveLinkEventTracker(linkTracker); - }, [linkReceived]); + }, [ linkReceived ]); useEffect(() => { if(!isVisible) return; if(activeThreadIndex === -1) setActiveThreadIndex(0); - }, [isVisible, activeThreadIndex]); + }, [ isVisible, activeThreadIndex ]); useEffect(() => { if(hiddenThreadIndexes.indexOf(activeThreadIndex) >= 0) setActiveThreadIndex(0); - }, [activeThreadIndex, hiddenThreadIndexes]); + }, [ activeThreadIndex, hiddenThreadIndexes ]); useEffect(() => { @@ -230,7 +230,7 @@ export const FriendsMessengerView: FC<{}> = props => activeThread.setRead(); setUpdateValue({}); } - }, [isVisible, messageThreads, activeThreadIndex]); + }, [ isVisible, messageThreads, activeThreadIndex ]); useEffect(() => { @@ -258,13 +258,13 @@ export const FriendsMessengerView: FC<{}> = props => if(isUnread) PlaySound(SoundNames.MESSENGER_MESSAGE_RECEIVED); DispatchUiEvent(new FriendsMessengerIconEvent(FriendsMessengerIconEvent.UPDATE_ICON, isUnread ? FriendsMessengerIconEvent.UNREAD_ICON : FriendsMessengerIconEvent.SHOW_ICON)); - }, [visibleThreads, updateValue]); + }, [ visibleThreads, updateValue ]); if(!isVisible) return null; return ( - setIsVisible(false)} /> + setIsVisible(false)} /> diff --git a/src/components/groups/views/GroupBadgeCreatorView.tsx b/src/components/groups/views/GroupBadgeCreatorView.tsx index 04d7b864..7ce204b1 100644 --- a/src/components/groups/views/GroupBadgeCreatorView.tsx +++ b/src/components/groups/views/GroupBadgeCreatorView.tsx @@ -34,33 +34,33 @@ export const GroupBadgeCreatorView: FC = props => return ( <> { ((selectedIndex < 0) && badgeParts && (badgeParts.length > 0)) && badgeParts.map((part, index) => - { - return ( - - setSelectedIndex(index) }> - { (badgeParts[index].code && (badgeParts[index].code.length > 0)) && + { + return ( + + setSelectedIndex(index) }> + { (badgeParts[index].code && (badgeParts[index].code.length > 0)) && } - { (!badgeParts[index].code || !badgeParts[index].code.length) && + { (!badgeParts[index].code || !badgeParts[index].code.length) && } - - { (part.type !== GroupBadgePart.BASE) && + + { (part.type !== GroupBadgePart.BASE) && { POSITIONS.map((position, posIndex) => - { - return setPartProperty(index, 'position', position) }> - }) } - } - - { (groupCustomize.badgePartColors.length > 0) && groupCustomize.badgePartColors.map((item, colorIndex) => { - return setPartProperty(index, 'color', (colorIndex + 1)) }> + return setPartProperty(index, 'position', position) }> }) } - - - ); - }) } + } + + { (groupCustomize.badgePartColors.length > 0) && groupCustomize.badgePartColors.map((item, colorIndex) => + { + return setPartProperty(index, 'color', (colorIndex + 1)) }> + }) } + + + ); + }) } { (selectedIndex >= 0) && { (badgeParts[selectedIndex].type === GroupBadgePart.SYMBOL) && @@ -70,13 +70,13 @@ export const GroupBadgeCreatorView: FC = props => } { ((badgeParts[selectedIndex].type === GroupBadgePart.BASE) ? groupCustomize.badgeBases : groupCustomize.badgeSymbols).map((item, index) => - { - return ( - setPartProperty(selectedIndex, 'key', item.id) }> - - - ); - }) } + { + return ( + setPartProperty(selectedIndex, 'key', item.id) }> + + + ); + }) } } ); diff --git a/src/components/groups/views/GroupCreatorView.tsx b/src/components/groups/views/GroupCreatorView.tsx index 56893477..a9b27f45 100644 --- a/src/components/groups/views/GroupCreatorView.tsx +++ b/src/components/groups/views/GroupCreatorView.tsx @@ -132,13 +132,13 @@ export const GroupCreatorView: FC = props => { TABS.map((tab, index) => - { - return ( - - { LocalizeText(`group.create.steplabel.${ tab }`) } - - ); - }) } + { + return ( + + { LocalizeText(`group.create.steplabel.${ tab }`) } + + ); + }) } diff --git a/src/components/groups/views/GroupInformationView.tsx b/src/components/groups/views/GroupInformationView.tsx index 124eb962..8624ee7f 100644 --- a/src/components/groups/views/GroupInformationView.tsx +++ b/src/components/groups/views/GroupInformationView.tsx @@ -26,11 +26,11 @@ export const GroupInformationView: FC = props => const leaveGroup = () => { NotificationUtilities.confirm(LocalizeText('group.leaveconfirm.desc'), () => - { - SendMessageComposer(new GroupRemoveMemberComposer(groupInformation.id, GetSessionDataManager().userId)); + { + SendMessageComposer(new GroupRemoveMemberComposer(groupInformation.id, GetSessionDataManager().userId)); - if(onClose) onClose(); - }, null); + if(onClose) onClose(); + }, null); } const getRoleIcon = () => @@ -126,7 +126,7 @@ export const GroupInformationView: FC = props => } - { LocalizeText('group.created', ['date', 'owner'], [groupInformation.createdAt, groupInformation.ownerName]) } + { LocalizeText('group.created', [ 'date', 'owner' ], [ groupInformation.createdAt, groupInformation.ownerName ]) } { groupInformation.description } diff --git a/src/components/groups/views/GroupManagerView.tsx b/src/components/groups/views/GroupManagerView.tsx index 3433ae48..565da645 100644 --- a/src/components/groups/views/GroupManagerView.tsx +++ b/src/components/groups/views/GroupManagerView.tsx @@ -20,11 +20,11 @@ export const GroupManagerView: FC<{}> = props => const close = () => { setCloseAction(prevValue => - { - if(prevValue && prevValue.action) prevValue.action(); + { + if(prevValue && prevValue.action) prevValue.action(); - return null; - }); + return null; + }); setGroupData(null); } @@ -43,16 +43,16 @@ export const GroupManagerView: FC<{}> = props => if(!groupData || (groupData.groupId !== parser.id)) return; setGroupData(prevValue => - { - const newValue = { ...prevValue }; + { + const newValue = { ...prevValue }; - newValue.groupName = parser.title; - newValue.groupDescription = parser.description; - newValue.groupState = parser.type; - newValue.groupCanMembersDecorate = parser.canMembersDecorate; + newValue.groupName = parser.title; + newValue.groupDescription = parser.description; + newValue.groupState = parser.type; + newValue.groupCanMembersDecorate = parser.canMembersDecorate; - return newValue; - }); + return newValue; + }); }, [ groupData ]); UseMessageEventHook(GroupInformationEvent, onGroupInformationEvent); @@ -94,11 +94,11 @@ export const GroupManagerView: FC<{}> = props => { TABS.map(tab => - { - return ( changeTab(tab) }> - { LocalizeText(`group.edit.tab.${tab}`) } - ); - }) } + { + return ( changeTab(tab) }> + { LocalizeText(`group.edit.tab.${tab}`) } + ); + }) } diff --git a/src/components/groups/views/GroupMembersView.tsx b/src/components/groups/views/GroupMembersView.tsx index 5bafa369..9a43c30c 100644 --- a/src/components/groups/views/GroupMembersView.tsx +++ b/src/components/groups/views/GroupMembersView.tsx @@ -91,11 +91,11 @@ export const GroupMembersView: FC<{}> = props => const parser = event.getParser(); NotificationUtilities.confirm(LocalizeText(((parser.furnitureCount > 0) ? 'group.kickconfirm.desc' : 'group.kickconfirm_nofurni.desc'), [ 'user', 'amount' ], [ removingMemberName, parser.furnitureCount.toString() ]), () => - { - SendMessageComposer(new GroupRemoveMemberComposer(membersData.groupId, parser.userId)); + { + SendMessageComposer(new GroupRemoveMemberComposer(membersData.groupId, parser.userId)); - refreshMembers(); - }, null); + refreshMembers(); + }, null); setRemovingMemberName(null); }, [ membersData, removingMemberName, refreshMembers ]); @@ -160,7 +160,7 @@ export const GroupMembersView: FC<{}> = props => return ( - setGroupId(-1) } /> + setGroupId(-1) } /> @@ -177,41 +177,41 @@ export const GroupMembersView: FC<{}> = props => { membersData.result.map((member, index) => - { - return ( - -
GetUserProfile(member.id) }> - -
- - GetUserProfile(member.id) }>{ member.name } - { (member.rank !== GroupRank.REQUESTED) && + { + return ( + +
GetUserProfile(member.id) }> + +
+ + GetUserProfile(member.id) }>{ member.name } + { (member.rank !== GroupRank.REQUESTED) && { LocalizeText('group.members.since', [ 'date' ], [ member.joinedAt ]) } } - - - { (member.rank !== GroupRank.REQUESTED) && + + + { (member.rank !== GroupRank.REQUESTED) && toggleAdmin(member) } /> } - { membersData.admin && (member.rank === GroupRank.REQUESTED) && + { membersData.admin && (member.rank === GroupRank.REQUESTED) && acceptMembership(member) }> } - { membersData.admin && (member.rank !== GroupRank.OWNER) && (member.id !== GetSessionDataManager().userId) && + { membersData.admin && (member.rank !== GroupRank.OWNER) && (member.id !== GetSessionDataManager().userId) && removeMemberOrDeclineMembership(member) }> } - - - ); - }) } + + + ); + }) } - { LocalizeText('group.members.pageinfo', ['amount', 'page', 'totalPages'], [membersData.totalMembersCount.toString(), (membersData.pageIndex + 1).toString(), totalPages.toString()]) } + { LocalizeText('group.members.pageinfo', [ 'amount', 'page', 'totalPages' ], [ membersData.totalMembersCount.toString(), (membersData.pageIndex + 1).toString(), totalPages.toString() ]) } - } + } } diff --git a/src/components/groups/views/tabs/GroupTabBadgeView.tsx b/src/components/groups/views/tabs/GroupTabBadgeView.tsx index 75d6214b..b26869a6 100644 --- a/src/components/groups/views/tabs/GroupTabBadgeView.tsx +++ b/src/components/groups/views/tabs/GroupTabBadgeView.tsx @@ -41,13 +41,13 @@ export const GroupTabBadgeView: FC = props => if(groupData.groupId <= 0) { setGroupData(prevValue => - { - const newValue = { ...prevValue }; + { + const newValue = { ...prevValue }; - newValue.groupBadgeParts = badgeParts; + newValue.groupBadgeParts = badgeParts; - return newValue; - }); + return newValue; + }); return true; } @@ -81,11 +81,11 @@ export const GroupTabBadgeView: FC = props => ]; setGroupData(prevValue => - { - const groupBadgeParts = badgeParts; + { + const groupBadgeParts = badgeParts; - return { ...prevValue, groupBadgeParts }; - }); + return { ...prevValue, groupBadgeParts }; + }); }, [ groupData.groupBadgeParts, groupCustomize, setGroupData ]); useEffect(() => diff --git a/src/components/groups/views/tabs/GroupTabColorsView.tsx b/src/components/groups/views/tabs/GroupTabColorsView.tsx index 416f975a..fb893fdf 100644 --- a/src/components/groups/views/tabs/GroupTabColorsView.tsx +++ b/src/components/groups/views/tabs/GroupTabColorsView.tsx @@ -29,13 +29,13 @@ export const GroupTabColorsView: FC = props => const selectColor = (colorIndex: number, colorId: number) => { setColors(prevValue => - { - const newColors = [ ...prevValue ]; + { + const newColors = [ ...prevValue ]; - newColors[colorIndex] = colorId; + newColors[colorIndex] = colorId; - return newColors; - }); + return newColors; + }); } const saveColors = useCallback(() => @@ -47,13 +47,13 @@ export const GroupTabColorsView: FC = props => if(groupData.groupId <= 0) { setGroupData(prevValue => - { - const newValue = { ...prevValue }; + { + const newValue = { ...prevValue }; - newValue.groupColors = [ ...colors ]; + newValue.groupColors = [ ...colors ]; - return newValue; - }); + return newValue; + }); return true; } @@ -70,9 +70,9 @@ export const GroupTabColorsView: FC = props => const groupColors = [ groupCustomize.groupColorsA[0].id, groupCustomize.groupColorsB[0].id ]; setGroupData(prevValue => - { - return { ...prevValue, groupColors }; - }); + { + return { ...prevValue, groupColors }; + }); }, [ groupCustomize, groupData.groupColors, setGroupData ]); useEffect(() => @@ -110,18 +110,18 @@ export const GroupTabColorsView: FC = props => { LocalizeText('group.edit.color.primary.color') } { groupData.groupColors && groupCustomize.groupColorsA && groupCustomize.groupColorsA.map((item, index) => - { - return
selectColor(0, item.id) }>
- }) } + { + return
selectColor(0, item.id) }>
+ }) } { LocalizeText('group.edit.color.secondary.color') } { groupData.groupColors && groupCustomize.groupColorsB && groupCustomize.groupColorsB.map((item, index) => - { - return
selectColor(1, item.id) }>
- }) } + { + return
selectColor(1, item.id) }>
+ }) } diff --git a/src/components/groups/views/tabs/GroupTabIdentityView.tsx b/src/components/groups/views/tabs/GroupTabIdentityView.tsx index 9934736f..dac7f184 100644 --- a/src/components/groups/views/tabs/GroupTabIdentityView.tsx +++ b/src/components/groups/views/tabs/GroupTabIdentityView.tsx @@ -27,11 +27,11 @@ export const GroupTabIdentityView: FC = props => if(!groupData || (groupData.groupId <= 0)) return; NotificationUtilities.confirm(LocalizeText('group.deleteconfirm.desc'), () => - { - SendMessageComposer(new GroupDeleteComposer(groupData.groupId)); + { + SendMessageComposer(new GroupDeleteComposer(groupData.groupId)); - if(close) close(); - }, null, null, null, LocalizeText('group.deleteconfirm.title')); + if(close) close(); + }, null, null, null, LocalizeText('group.deleteconfirm.title')); } const saveIdentity = useCallback(() => @@ -45,15 +45,15 @@ export const GroupTabIdentityView: FC = props => if(groupHomeroomId <= 0) return false; setGroupData(prevValue => - { - const newValue = { ...prevValue }; + { + const newValue = { ...prevValue }; - newValue.groupName = groupName; - newValue.groupDescription = groupDescription; - newValue.groupHomeroomId = groupHomeroomId; + newValue.groupName = groupName; + newValue.groupDescription = groupDescription; + newValue.groupHomeroomId = groupHomeroomId; - return newValue; - }); + return newValue; + }); return true; } diff --git a/src/components/groups/views/tabs/GroupTabSettingsView.tsx b/src/components/groups/views/tabs/GroupTabSettingsView.tsx index f9ba86fe..3dd8cbef 100644 --- a/src/components/groups/views/tabs/GroupTabSettingsView.tsx +++ b/src/components/groups/views/tabs/GroupTabSettingsView.tsx @@ -30,14 +30,14 @@ export const GroupTabSettingsView: FC = props => if(groupData.groupId <= 0) { setGroupData(prevValue => - { - const newValue = { ...prevValue }; + { + const newValue = { ...prevValue }; - newValue.groupState = groupState; - newValue.groupCanMembersDecorate = groupDecorate; + newValue.groupState = groupState; + newValue.groupCanMembersDecorate = groupDecorate; - return newValue; - }); + return newValue; + }); return true; } @@ -67,20 +67,20 @@ export const GroupTabSettingsView: FC = props => { STATES.map((state, index) => - { - return ( - - setGroupState(index) } /> - - - - { LocalizeText(`group.edit.settings.type.${ state }.label`) } - - { LocalizeText(`group.edit.settings.type.${ state }.help`) } - - - ); - }) } + { + return ( + + setGroupState(index) } /> + + + + { LocalizeText(`group.edit.settings.type.${ state }.label`) } + + { LocalizeText(`group.edit.settings.type.${ state }.help`) } + + + ); + }) } diff --git a/src/components/guide-tool/GuideToolView.tsx b/src/components/guide-tool/GuideToolView.tsx index b09dd692..abf00415 100644 --- a/src/components/guide-tool/GuideToolView.tsx +++ b/src/components/guide-tool/GuideToolView.tsx @@ -55,7 +55,7 @@ export const GuideToolView: FC<{}> = props => setNoCloseButton(true); break; case GuideSessionState.GUIDE_ONGOING: - setHeaderText(LocalizeText('guide.help.request.guide.ongoing.title', ['name'], [replacement])); + setHeaderText(LocalizeText('guide.help.request.guide.ongoing.title', [ 'name' ], [ replacement ])); setNoCloseButton(true); break; case GuideSessionState.USER_CREATE: @@ -67,7 +67,7 @@ export const GuideToolView: FC<{}> = props => setNoCloseButton(true); break; case GuideSessionState.USER_ONGOING: - setHeaderText(LocalizeText('guide.help.request.user.ongoing.title', ['name'], [replacement])); + setHeaderText(LocalizeText('guide.help.request.user.ongoing.title', [ 'name' ], [ replacement ])); setNoCloseButton(true); break; case GuideSessionState.USER_FEEDBACK: @@ -183,7 +183,7 @@ export const GuideToolView: FC<{}> = props => { const parser = event.getParser(); - const messageGroups = [...ongoingMessageGroups]; + const messageGroups = [ ...ongoingMessageGroups ]; let lastGroup = messageGroups[messageGroups.length - 1]; @@ -203,7 +203,7 @@ export const GuideToolView: FC<{}> = props => { const parser = event.getParser(); - const messageGroups = [...ongoingMessageGroups]; + const messageGroups = [ ...ongoingMessageGroups ]; let lastGroup = messageGroups[messageGroups.length - 1]; @@ -217,7 +217,7 @@ export const GuideToolView: FC<{}> = props => lastGroup.addChat(new GuideToolMessage(parser.roomName, parser.roomId)); setOngoingMessageGroups(messageGroups); - }, [isOnDuty, ongoingMessageGroups, ongoingUserId]); + }, [ isOnDuty, ongoingMessageGroups, ongoingUserId ]); UseMessageEventHook(GuideSessionInvitedToGuideRoomMessageEvent, onGuideSessionInvitedToGuideRoomMessageEvent); @@ -270,7 +270,7 @@ export const GuideToolView: FC<{}> = props => switch(parts[1]) { case 'tour': - //Create Tour Request + //Create Tour Request return; } }, []); @@ -299,15 +299,15 @@ export const GuideToolView: FC<{}> = props => case 'toggle_duty': if(!isHandlingBullyReports && !isHandlingGuideRequests && !isHandlingHelpRequests) { - DispatchUiEvent(new NotificationAlertEvent([LocalizeText('guide.help.guide.tool.noqueueselected.message')], null, null, null, LocalizeText('guide.help.guide.tool.noqueueselected.caption'), null)); + DispatchUiEvent(new NotificationAlertEvent([ LocalizeText('guide.help.guide.tool.noqueueselected.message') ], null, null, null, LocalizeText('guide.help.guide.tool.noqueueselected.caption'), null)); return; } setIsOnDuty(v => - { - SendMessageComposer(new GuideSessionOnDutyUpdateMessageComposer(!v, v ? false : isHandlingGuideRequests, v ? false : isHandlingHelpRequests, v ? false : isHandlingBullyReports)); - return !v; - }); + { + SendMessageComposer(new GuideSessionOnDutyUpdateMessageComposer(!v, v ? false : isHandlingGuideRequests, v ? false : isHandlingHelpRequests, v ? false : isHandlingBullyReports)); + return !v; + }); return; case 'forum_link': @@ -315,7 +315,7 @@ export const GuideToolView: FC<{}> = props => window.open(url); return; } - }, [isHandlingBullyReports, isHandlingGuideRequests, isHandlingHelpRequests]); + }, [ isHandlingBullyReports, isHandlingGuideRequests, isHandlingHelpRequests ]); if(!isVisible) return null; diff --git a/src/components/guide-tool/views/GuideToolAcceptView.tsx b/src/components/guide-tool/views/GuideToolAcceptView.tsx index 05f6f6fc..b9a9fcf7 100644 --- a/src/components/guide-tool/views/GuideToolAcceptView.tsx +++ b/src/components/guide-tool/views/GuideToolAcceptView.tsx @@ -24,8 +24,8 @@ export const GuideToolAcceptView: FC = props => + { LocalizeText('guide.help.request.guide.accept.accept.button') } + diff --git a/src/components/guide-tool/views/GuideToolOngoingView.tsx b/src/components/guide-tool/views/GuideToolOngoingView.tsx index 21ef8ce3..3bbf84d4 100644 --- a/src/components/guide-tool/views/GuideToolOngoingView.tsx +++ b/src/components/guide-tool/views/GuideToolOngoingView.tsx @@ -83,27 +83,27 @@ export const GuideToolOngoingView: FC = props => { messageGroups.map((group, index) => - { - return ( - - - { (!isOwnChat(group.userId)) && + { + return ( + + + { (!isOwnChat(group.userId)) && } - - - - { (isOwnChat(group.userId)) && GetSessionDataManager().userName } - { (!isOwnChat(group.userId)) && userName } - - { group.messages.map((chat, index) => { chat.message }) } - - { (isOwnChat(group.userId)) && + + + + { (isOwnChat(group.userId)) && GetSessionDataManager().userName } + { (!isOwnChat(group.userId)) && userName } + + { group.messages.map((chat, index) => { chat.message }) } + + { (isOwnChat(group.userId)) && } - - ); - }) } + + ); + }) } diff --git a/src/components/hc-center/HcCenterView.tsx b/src/components/hc-center/HcCenterView.tsx index 5697ed79..4a5fd5cc 100644 --- a/src/components/hc-center/HcCenterView.tsx +++ b/src/components/hc-center/HcCenterView.tsx @@ -90,7 +90,7 @@ export const HcCenterView: FC<{}> = props => setIsVisible(!isVisible); break; } - }, [isVisible]); + }, [ isVisible ]); UseUiEvent(HcCenterEvent.TOGGLE_HC_CENTER, onHcCenterEvent); @@ -169,7 +169,7 @@ export const HcCenterView: FC<{}> = props => AddEventLinkTracker(linkTracker); return () => RemoveLinkEventTracker(linkTracker); - }, [ linkReceived]); + }, [ linkReceived ]); useEffect(() => { @@ -201,14 +201,17 @@ export const HcCenterView: FC<{}> = props =>
{LocalizeText('hccenter.breakdown.title')}
-
{LocalizeText('hccenter.breakdown.creditsspent', ['credits'], [kickbackData.totalCreditsSpent.toString()])}
-
{LocalizeText('hccenter.breakdown.paydayfactor.percent', ['percent'], [(kickbackData.kickbackPercentage * 100).toString()])}
-
{LocalizeText('hccenter.breakdown.streakbonus', ['credits'], [kickbackData.creditRewardForStreakBonus.toString()])}
+
{LocalizeText('hccenter.breakdown.creditsspent', [ 'credits' ], [ kickbackData.totalCreditsSpent.toString() ])}
+
{LocalizeText('hccenter.breakdown.paydayfactor.percent', [ 'percent' ], [ (kickbackData.kickbackPercentage * 100).toString() ])}
+
{LocalizeText('hccenter.breakdown.streakbonus', [ 'credits' ], [ kickbackData.creditRewardForStreakBonus.toString() ])}
-
{LocalizeText('hccenter.breakdown.total', ['credits', 'actual'], [getHcPaydayAmount(), - ((((kickbackData.kickbackPercentage * kickbackData.totalCreditsSpent) + kickbackData.creditRewardForStreakBonus) * 100) / 100).toString()])}
-
{ CreateLinkEvent('habbopages/' + GetConfiguration('hc.center')['payday.habbopage']) }}>{ - LocalizeText('hccenter.special.infolink')} +
{LocalizeText('hccenter.breakdown.total', [ 'credits', 'actual' ], [ getHcPaydayAmount(), + ((((kickbackData.kickbackPercentage * kickbackData.totalCreditsSpent) + kickbackData.creditRewardForStreakBonus) * 100) / 100).toString() ])}
+
+ { + CreateLinkEvent('habbopages/' + GetConfiguration('hc.center')['payday.habbopage']) + }}>{ + LocalizeText('hccenter.special.infolink')}
@@ -221,7 +224,10 @@ export const HcCenterView: FC<{}> = props =>
- @@ -243,7 +249,10 @@ export const HcCenterView: FC<{}> = props =>

{LocalizeText('hccenter.special.title')}

{LocalizeText('hccenter.special.info')}
-
{ CreateLinkEvent('habbopages/' + GetConfiguration('hc.center')['payday.habbopage']) }}>{LocalizeText('hccenter.special.infolink')}
+
+ { + CreateLinkEvent('habbopages/' + GetConfiguration('hc.center')['payday.habbopage']) + }}>{LocalizeText('hccenter.special.infolink')}
{LocalizeText('hccenter.special.time.title')}
@@ -271,16 +280,22 @@ export const HcCenterView: FC<{}> = props =>

{LocalizeText('hccenter.gift.title')}

-
0 ? LocalizeText('hccenter.unclaimedgifts', ['unclaimedgifts'], [unclaimedGifts.toString()]) : LocalizeText('hccenter.gift.info') }}>
+
0 ? LocalizeText('hccenter.unclaimedgifts', [ 'unclaimedgifts' ], [ unclaimedGifts.toString() ]) : LocalizeText('hccenter.gift.info') }}>
- +
} {GetConfiguration('hc.center')['benefits.info'] &&
{LocalizeText('hccenter.general.title')}
- +
} diff --git a/src/components/hc-center/common/BadgeResolver.ts b/src/components/hc-center/common/BadgeResolver.ts index d61d66da..e334b6e8 100644 --- a/src/components/hc-center/common/BadgeResolver.ts +++ b/src/components/hc-center/common/BadgeResolver.ts @@ -2,7 +2,7 @@ export class BadgeResolver { public static default_badge: string = 'HC1'; - public static badges: string[] = ['ACH_VipHC1', 'ACH_VipHC2', 'ACH_VipHC3', 'ACH_VipHC4', 'ACH_VipHC5', 'HC1', 'HC2', 'HC3', 'HC4', 'HC5']; + public static badges: string[] = [ 'ACH_VipHC1', 'ACH_VipHC2', 'ACH_VipHC3', 'ACH_VipHC4', 'ACH_VipHC5', 'HC1', 'HC2', 'HC3', 'HC4', 'HC5' ]; public static getClubBadge(k: string[]): string diff --git a/src/components/help/HelpView.tsx b/src/components/help/HelpView.tsx index cae699cd..c9909cb5 100644 --- a/src/components/help/HelpView.tsx +++ b/src/components/help/HelpView.tsx @@ -104,7 +104,7 @@ export const HelpView: FC<{}> = props => } return null; - }, [helpReportState.currentStep]); + }, [ helpReportState.currentStep ]); return ( diff --git a/src/components/help/views/HelpIndexView.tsx b/src/components/help/views/HelpIndexView.tsx index c083572f..5123ab8d 100644 --- a/src/components/help/views/HelpIndexView.tsx +++ b/src/components/help/views/HelpIndexView.tsx @@ -15,7 +15,7 @@ export const HelpIndexView: FC<{}> = props => const reportState = Object.assign({}, helpReportState ); reportState.currentStep = 1; setHelpReportState(reportState); - },[helpReportState, setHelpReportState]); + },[ helpReportState, setHelpReportState ]); const onRequestMySanctionStatusClick = useCallback(() => { diff --git a/src/components/help/views/SanctionStatusView.tsx b/src/components/help/views/SanctionStatusView.tsx index 5c8e10ce..ab405c4d 100644 --- a/src/components/help/views/SanctionStatusView.tsx +++ b/src/components/help/views/SanctionStatusView.tsx @@ -39,11 +39,11 @@ export const SanctionSatusView:FC<{}> = props => if(length > 24) { localizationName = (localizationName + '.days'); - return LocalizeText(localizationName, ['days'], [(length / 24).toString()]); + return LocalizeText(localizationName, [ 'days' ], [ (length / 24).toString() ]); } } - return LocalizeText(localizationName, ['hours'], [length.toString()]); + return LocalizeText(localizationName, [ 'hours' ], [ length.toString() ]); }, []); if(!sanctionInfo) return null; diff --git a/src/components/help/views/SelectReportedChatsView.tsx b/src/components/help/views/SelectReportedChatsView.tsx index 099266e5..6a24704f 100644 --- a/src/components/help/views/SelectReportedChatsView.tsx +++ b/src/components/help/views/SelectReportedChatsView.tsx @@ -33,22 +33,22 @@ export const SelectReportedChatsView: FC<{}> = props => if(!selectedChats || (selectedChats.size <= 0)) return; setHelpReportState(prevValue => - { - const reportedChats = Array.from(selectedChats.values()); - const currentStep = 3; + { + const reportedChats = Array.from(selectedChats.values()); + const currentStep = 3; - return { ...prevValue, reportedChats, currentStep }; - }); + return { ...prevValue, reportedChats, currentStep }; + }); } const back = () => { setHelpReportState(prevValue => - { - const currentStep = (prevValue.currentStep - 1); + { + const currentStep = (prevValue.currentStep - 1); - return { ...prevValue, currentStep }; - }); + return { ...prevValue, currentStep }; + }); } return ( @@ -63,13 +63,13 @@ export const SelectReportedChatsView: FC<{}> = props => { (userChats.length > 0) && { userChats.map((chat, index) => - { - return ( - selectChat(chat) } itemActive={ selectedChats.has(chat.id) }> - { chat.message } - - ); - }) } + { + return ( + selectChat(chat) } itemActive={ selectedChats.has(chat.id) }> + { chat.message } + + ); + }) } } diff --git a/src/components/help/views/SelectReportedUserView.tsx b/src/components/help/views/SelectReportedUserView.tsx index 000b7f99..363efdc4 100644 --- a/src/components/help/views/SelectReportedUserView.tsx +++ b/src/components/help/views/SelectReportedUserView.tsx @@ -17,15 +17,15 @@ export const SelectReportedUserView: FC<{}> = props => const users: Map = new Map(); GetChatHistory().chats.forEach(chat => + { + if((chat.type === ChatEntryType.TYPE_CHAT) && (chat.entityType === RoomObjectType.USER) && (chat.entityId !== GetSessionDataManager().userId)) { - if((chat.type === ChatEntryType.TYPE_CHAT) && (chat.entityType === RoomObjectType.USER) && (chat.entityId !== GetSessionDataManager().userId)) + if(!users.has(chat.entityId)) { - if(!users.has(chat.entityId)) - { - users.set(chat.entityId, { id: chat.entityId, username: chat.name }) - } + users.set(chat.entityId, { id: chat.entityId, username: chat.name }) } - }); + } + }); return Array.from(users.values()); }, []); @@ -35,12 +35,12 @@ export const SelectReportedUserView: FC<{}> = props => if(selectedUserId <= 0) return; setHelpReportState(prevValue => - { - const reportedUserId = selectedUserId; - const currentStep = 2; + { + const reportedUserId = selectedUserId; + const currentStep = 2; - return { ...prevValue, reportedUserId, currentStep }; - }); + return { ...prevValue, reportedUserId, currentStep }; + }); } const selectUser = (userId: number) => @@ -52,11 +52,11 @@ export const SelectReportedUserView: FC<{}> = props => const back = () => { setHelpReportState(prevValue => - { - const currentStep = (prevValue.currentStep - 1); + { + const currentStep = (prevValue.currentStep - 1); - return { ...prevValue, currentStep }; - }); + return { ...prevValue, currentStep }; + }); } return ( @@ -72,13 +72,13 @@ export const SelectReportedUserView: FC<{}> = props => { (availableUsers.length > 0) && { availableUsers.map((user, index) => - { - return ( - selectUser(user.id) } itemActive={ (selectedUserId === user.id) }> - - - ); - }) } + { + return ( + selectUser(user.id) } itemActive={ (selectedUserId === user.id) }> + + + ); + }) } } diff --git a/src/components/help/views/SelectTopicView.tsx b/src/components/help/views/SelectTopicView.tsx index b2a95808..f38f8141 100644 --- a/src/components/help/views/SelectTopicView.tsx +++ b/src/components/help/views/SelectTopicView.tsx @@ -17,23 +17,23 @@ export const SelectTopicView: FC<{}> = props => if((selectedCategory < 0) || (selectedTopic < 0)) return; setHelpReportState(prevValue => - { - const cfhCategory = selectedCategory; - const cfhTopic = cfhCategories[selectedCategory].topics[selectedTopic].id; - const currentStep = 4; + { + const cfhCategory = selectedCategory; + const cfhTopic = cfhCategories[selectedCategory].topics[selectedTopic].id; + const currentStep = 4; - return { ...prevValue, cfhCategory, cfhTopic, currentStep }; - }); + return { ...prevValue, cfhCategory, cfhTopic, currentStep }; + }); } const back = () => { setHelpReportState(prevValue => - { - const currentStep = (prevValue.currentStep - 1); + { + const currentStep = (prevValue.currentStep - 1); - return { ...prevValue, currentStep }; - }); + return { ...prevValue, currentStep }; + }); } return ( diff --git a/src/components/help/views/name-change/NameChangeInitView.tsx b/src/components/help/views/name-change/NameChangeInitView.tsx index d995dc3c..8eb1e01e 100644 --- a/src/components/help/views/name-change/NameChangeInitView.tsx +++ b/src/components/help/views/name-change/NameChangeInitView.tsx @@ -9,7 +9,7 @@ export const NameChangeInitView:FC = props => return (
{ LocalizeText('tutorial.name_change.info.main') }
-
{ LocalizeText('tutorial.name_change.current', ['name'], [GetSessionDataManager().userName]) }
+
{ LocalizeText('tutorial.name_change.current', [ 'name' ], [ GetSessionDataManager().userName ]) }
diff --git a/src/components/help/views/name-change/NameChangeInputView.tsx b/src/components/help/views/name-change/NameChangeInputView.tsx index c394c6e0..e406c4df 100644 --- a/src/components/help/views/name-change/NameChangeInputView.tsx +++ b/src/components/help/views/name-change/NameChangeInputView.tsx @@ -83,8 +83,8 @@ export const NameChangeInputView:FC = props =>
{ !errorCode && !canProceed &&
{ LocalizeText('help.tutorial.name.info') }
} - { errorCode &&
{ LocalizeText(`help.tutorial.name.${errorCode}`, ['name'], [newUsername]) }
} - { canProceed &&
{ LocalizeText('help.tutorial.name.available', ['name'], [newUsername]) }
} + { errorCode &&
{ LocalizeText(`help.tutorial.name.${errorCode}`, [ 'name' ], [ newUsername ]) }
} + { canProceed &&
{ LocalizeText('help.tutorial.name.available', [ 'name' ], [ newUsername ]) }
} { suggestions &&
{ suggestions.map((suggestion, i) => diff --git a/src/components/help/views/name-change/NameChangeView.tsx b/src/components/help/views/name-change/NameChangeView.tsx index e7d33ce2..ecca6965 100644 --- a/src/components/help/views/name-change/NameChangeView.tsx +++ b/src/components/help/views/name-change/NameChangeView.tsx @@ -51,7 +51,7 @@ export const NameChangeView:FC<{}> = props => case INPUT: return 'tutorial.name_change.title.select'; case CONFIRMATION: return 'tutorial.name_change.title.confirm'; } - }, [layout]); + }, [ layout ]); if(!isVisible) return null; diff --git a/src/components/hotel-view/HotelView.tsx b/src/components/hotel-view/HotelView.tsx index e9f6835b..992782e6 100644 --- a/src/components/hotel-view/HotelView.tsx +++ b/src/components/hotel-view/HotelView.tsx @@ -6,7 +6,7 @@ import { BatchUpdates, UseMessageEventHook, UseRoomSessionManagerEvent } from '. import { WidgetSlotView } from './views/widgets/WidgetSlotView'; export const HotelView: FC<{}> = props => { - const [isVisible, setIsVisible] = useState(true); + const [ isVisible, setIsVisible ] = useState(true); const widgetSlotCount = 7; const [ userFigure, setUserFigure ] = useState(null); const [ userInfo, setUserInfo ] = useState(null); diff --git a/src/components/hotel-view/views/widgets/GetWidgetLayout.tsx b/src/components/hotel-view/views/widgets/GetWidgetLayout.tsx index ebd814b6..37b30b93 100644 --- a/src/components/hotel-view/views/widgets/GetWidgetLayout.tsx +++ b/src/components/hotel-view/views/widgets/GetWidgetLayout.tsx @@ -13,17 +13,17 @@ export interface GetWidgetLayoutProps export const GetWidgetLayout: FC = props => { - switch(props.widgetType) - { - case 'promoarticle': - return ; - case 'achievementcompetition_hall_of_fame': - return ; - case 'bonusrare': - return ; - case 'widgetcontainer': - return - default: - return null; - } + switch(props.widgetType) + { + case 'promoarticle': + return ; + case 'achievementcompetition_hall_of_fame': + return ; + case 'bonusrare': + return ; + case 'widgetcontainer': + return + default: + return null; + } } diff --git a/src/components/hotel-view/views/widgets/hall-of-fame-item/HallOfFameItemView.tsx b/src/components/hotel-view/views/widgets/hall-of-fame-item/HallOfFameItemView.tsx index 4c9b27c8..bd5bda1f 100644 --- a/src/components/hotel-view/views/widgets/hall-of-fame-item/HallOfFameItemView.tsx +++ b/src/components/hotel-view/views/widgets/hall-of-fame-item/HallOfFameItemView.tsx @@ -17,7 +17,7 @@ export const HallOfFameItemView: FC = props =>
- { level }. { data.userName } + { level }. { data.userName }
{ LocalizeText('landing.view.competition.hof.points', [ 'points' ], [ LocalizeFormattedNumber(data.currentScore).toString() ])}
diff --git a/src/components/hotel-view/views/widgets/hall-of-fame/HallOfFameWidgetView.tsx b/src/components/hotel-view/views/widgets/hall-of-fame/HallOfFameWidgetView.tsx index 64b0211e..2abee5a6 100644 --- a/src/components/hotel-view/views/widgets/hall-of-fame/HallOfFameWidgetView.tsx +++ b/src/components/hotel-view/views/widgets/hall-of-fame/HallOfFameWidgetView.tsx @@ -30,10 +30,10 @@ export const HallOfFameWidgetView: FC = props => return (
{ data.hof && (data.hof.length > 0) && data.hof.map((entry, index) => - { - return ; - } - )} + { + return ; + } + )}
); } diff --git a/src/components/hotel-view/views/widgets/promo-article/PromoArticleWidgetView.tsx b/src/components/hotel-view/views/widgets/promo-article/PromoArticleWidgetView.tsx index cbcc04ab..6153cb15 100644 --- a/src/components/hotel-view/views/widgets/promo-article/PromoArticleWidgetView.tsx +++ b/src/components/hotel-view/views/widgets/promo-article/PromoArticleWidgetView.tsx @@ -8,8 +8,8 @@ export interface PromoArticleWidgetViewProps export const PromoArticleWidgetView: FC = props => { - const [articles, setArticles] = useState(null); - const [index, setIndex] = useState(0); + const [ articles, setArticles ] = useState(null); + const [ index, setIndex ] = useState(0); const handleSelect = (selectedIndex) => { @@ -32,24 +32,24 @@ export const PromoArticleWidgetView: FC = props => if(!articles) return null; return ( -
-
- { LocalizeText('landing.view.promo.article.header') } +
+
+ { LocalizeText('landing.view.promo.article.header') }
-
+
- {articles && (articles.length > 0) && articles.map((article, ind) => -
handleSelect(ind)} /> - )} -
+ {articles && (articles.length > 0) && articles.map((article, ind) => +
handleSelect(ind)} /> + )} +
{articles && articles[index] &&
-
-

{articles[index].title}

- { articles[index].bodyText } - -
+
+

{articles[index].title}

+ { articles[index].bodyText } + +
}
diff --git a/src/components/main/MainView.tsx b/src/components/main/MainView.tsx index d87f677d..f7059685 100644 --- a/src/components/main/MainView.tsx +++ b/src/components/main/MainView.tsx @@ -90,7 +90,7 @@ export const MainView: FC<{}> = props => { RemoveLinkEventTracker(linkTracker); } - }, [onLinkReceived]); + }, [ onLinkReceived ]); return ( diff --git a/src/components/mod-tools/ModToolsMessageHandler.tsx b/src/components/mod-tools/ModToolsMessageHandler.tsx index efe77935..dd22dcea 100644 --- a/src/components/mod-tools/ModToolsMessageHandler.tsx +++ b/src/components/mod-tools/ModToolsMessageHandler.tsx @@ -34,7 +34,7 @@ export const ModToolsMessageHandler: FC<{}> = props => } }); - }, [dispatchModToolsState]); + }, [ dispatchModToolsState ]); const onIssueInfoMessageEvent = useCallback((event: IssueInfoMessageEvent) => { @@ -62,7 +62,7 @@ export const ModToolsMessageHandler: FC<{}> = props => } }); - }, [dispatchModToolsState, tickets]); + }, [ dispatchModToolsState, tickets ]); const onModeratorToolPreferencesEvent = useCallback((event: ModeratorToolPreferencesEvent) => { @@ -100,7 +100,7 @@ export const ModToolsMessageHandler: FC<{}> = props => tickets: newTickets } }); - }, [dispatchModToolsState, tickets]); + }, [ dispatchModToolsState, tickets ]); const onModeratorActionResultMessageEvent = useCallback((event: ModeratorActionResultMessageEvent) => { @@ -135,7 +135,7 @@ export const ModToolsMessageHandler: FC<{}> = props => SetCfhCategories(categories); - }, [dispatchModToolsState]); + }, [ dispatchModToolsState ]); const onCfhSanctionMessageEvent = useCallback((event: CfhSanctionMessageEvent) => { @@ -195,7 +195,7 @@ export const ModToolsMessageHandler: FC<{}> = props => dispatchModToolsState({ type: ModToolsActions.SET_OPEN_ROOMS, payload: { - openRooms: [...rooms, castedEvent.roomId] + openRooms: [ ...rooms, castedEvent.roomId ] } }); return; @@ -210,7 +210,7 @@ export const ModToolsMessageHandler: FC<{}> = props => dispatchModToolsState({ type: ModToolsActions.SET_OPEN_ROOM_CHATLOGS, payload: { - openRoomChatlogs: [...chatlogs, castedEvent.roomId] + openRoomChatlogs: [ ...chatlogs, castedEvent.roomId ] } }); return; @@ -225,7 +225,7 @@ export const ModToolsMessageHandler: FC<{}> = props => dispatchModToolsState({ type: ModToolsActions.SET_OPEN_USERINFO, payload: { - openUserInfo: [...userInfo, castedEvent.userId] + openUserInfo: [ ...userInfo, castedEvent.userId ] } }); return; @@ -240,13 +240,13 @@ export const ModToolsMessageHandler: FC<{}> = props => dispatchModToolsState({ type: ModToolsActions.SET_OPEN_USER_CHATLOGS, payload: { - openUserChatlogs: [...userChatlog, castedEvent.userId] + openUserChatlogs: [ ...userChatlog, castedEvent.userId ] } }); return; } } - }, [openRooms, dispatchModToolsState, openRoomChatlogs, openUserInfo, openUserChatlogs]); + }, [ openRooms, dispatchModToolsState, openRoomChatlogs, openUserInfo, openUserChatlogs ]); UseUiEvent(ModToolsEvent.OPEN_ROOM_INFO, onModToolsEvent); UseUiEvent(ModToolsEvent.OPEN_ROOM_CHATLOG, onModToolsEvent); diff --git a/src/components/mod-tools/ModToolsView.tsx b/src/components/mod-tools/ModToolsView.tsx index 022cc2bc..0a0e4d7c 100644 --- a/src/components/mod-tools/ModToolsView.tsx +++ b/src/components/mod-tools/ModToolsView.tsx @@ -17,7 +17,7 @@ import { ModToolsUserView } from './views/user/ModToolsUserView'; export const ModToolsView: FC<{}> = props => { const [ isVisible, setIsVisible ] = useState(false); - const [ selectedUser, setSelectedUser] = useState(null); + const [ selectedUser, setSelectedUser ] = useState(null); const [ isTicketsVisible, setIsTicketsVisible ] = useState(false); const [ modToolsState, dispatchModToolsState ] = useReducer(ModToolsReducer, initialModTools); const { currentRoomId = null, openRooms = null, openRoomChatlogs = null, openUserChatlogs = null, openUserInfo = null } = modToolsState; @@ -179,7 +179,7 @@ export const ModToolsView: FC<{}> = props => return; } } - }, [openRooms, currentRoomId, openRoomChatlogs, selectedUser, openUserInfo, openUserChatlogs]); + }, [ openRooms, currentRoomId, openRoomChatlogs, selectedUser, openUserInfo, openUserChatlogs ]); return ( @@ -192,35 +192,35 @@ export const ModToolsView: FC<{}> = props => Room Tool } { openRooms && openRooms.map(roomId => - { - return handleClick('close_room', roomId.toString()) } />; - }) + { + return handleClick('close_room', roomId.toString()) } />; + }) } { openRoomChatlogs && openRoomChatlogs.map(roomId => - { - return handleClick('close_room_chatlog', roomId.toString()) } />; - }) + { + return handleClick('close_room_chatlog', roomId.toString()) } />; + }) } { openUserInfo && openUserInfo.map(userId => - { - return handleClick('close_user_info', userId.toString())}/> - }) + { + return handleClick('close_user_info', userId.toString())}/> + }) } { openUserChatlogs && openUserChatlogs.map(userId => - { - return handleClick('close_user_chatlog', userId.toString())}/> - }) + { + return handleClick('close_user_chatlog', userId.toString())}/> + }) } { isTicketsVisible && setIsTicketsVisible(false) } /> } diff --git a/src/components/mod-tools/views/chatlog/ChatlogView.tsx b/src/components/mod-tools/views/chatlog/ChatlogView.tsx index 27b99b51..0018f187 100644 --- a/src/components/mod-tools/views/chatlog/ChatlogView.tsx +++ b/src/components/mod-tools/views/chatlog/ChatlogView.tsx @@ -98,7 +98,7 @@ export const ChatlogView: FC = props => } return count; - }, [records]); + }, [ records ]); const RoomInfo = (props: { roomId: number, roomName: string, uniqueKey: Key, style: CSSProperties }) => { @@ -137,20 +137,20 @@ export const ChatlogView: FC = props => { ({ height, width }) => - { - cache.clearAll(); + { + cache.clearAll(); - return ( - 1) ? getNumRowsForAdvanced() : records[0].chatlog.length } - rowHeight={ cache.rowHeight } - className={ 'log-entry-container' } - rowRenderer={ (records.length > 1) ? advancedRowRenderer : rowRenderer } - deferredMeasurementCache={ cache } /> - ); - } } + return ( + 1) ? getNumRowsForAdvanced() : records[0].chatlog.length } + rowHeight={ cache.rowHeight } + className={ 'log-entry-container' } + rowRenderer={ (records.length > 1) ? advancedRowRenderer : rowRenderer } + deferredMeasurementCache={ cache } /> + ); + } } } diff --git a/src/components/mod-tools/views/tickets/CfhChatlogView.tsx b/src/components/mod-tools/views/tickets/CfhChatlogView.tsx index a91a3f92..1163a79d 100644 --- a/src/components/mod-tools/views/tickets/CfhChatlogView.tsx +++ b/src/components/mod-tools/views/tickets/CfhChatlogView.tsx @@ -19,7 +19,7 @@ export const CfhChatlogView: FC = props => useEffect(() => { SendMessageComposer(new GetCfhChatlogMessageComposer(issueId)); - }, [issueId]); + }, [ issueId ]); const onCfhChatlogEvent = useCallback((event: CfhChatlogEvent) => { @@ -28,7 +28,7 @@ export const CfhChatlogView: FC = props => if(!parser || parser.data.issueId !== issueId) return; setChatlogData(parser.data); - }, [issueId]); + }, [ issueId ]); UseMessageEventHook(CfhChatlogEvent, onCfhChatlogEvent); @@ -36,7 +36,7 @@ export const CfhChatlogView: FC = props => - { chatlogData && } + { chatlogData && } ); diff --git a/src/components/mod-tools/views/tickets/ModToolsMyIssuesTabView.tsx b/src/components/mod-tools/views/tickets/ModToolsMyIssuesTabView.tsx index 1c3eb567..2db159b8 100644 --- a/src/components/mod-tools/views/tickets/ModToolsMyIssuesTabView.tsx +++ b/src/components/mod-tools/views/tickets/ModToolsMyIssuesTabView.tsx @@ -13,7 +13,7 @@ export const ModToolsMyIssuesTabView: FC = props = { const { myIssues = null, onIssueHandleClick = null } = props; - const onReleaseIssue = (issueId: number) => SendMessageComposer(new ReleaseIssuesMessageComposer([issueId])); + const onReleaseIssue = (issueId: number) => SendMessageComposer(new ReleaseIssuesMessageComposer([ issueId ])); return ( @@ -28,21 +28,21 @@ export const ModToolsMyIssuesTabView: FC = props = { myIssues && (myIssues.length > 0) && myIssues.map(issue => - { - return ( - - { issue.categoryId } - { issue.reportedUserName } - { new Date(Date.now() - issue.issueAgeInMilliseconds).toLocaleTimeString() } - - - - - - - - ); - }) } + { + return ( + + { issue.categoryId } + { issue.reportedUserName } + { new Date(Date.now() - issue.issueAgeInMilliseconds).toLocaleTimeString() } + + + + + + + + ); + }) } ); diff --git a/src/components/mod-tools/views/tickets/ModToolsOpenIssuesTabView.tsx b/src/components/mod-tools/views/tickets/ModToolsOpenIssuesTabView.tsx index 62dc543b..c328025b 100644 --- a/src/components/mod-tools/views/tickets/ModToolsOpenIssuesTabView.tsx +++ b/src/components/mod-tools/views/tickets/ModToolsOpenIssuesTabView.tsx @@ -12,7 +12,7 @@ export const ModToolsOpenIssuesTabView: FC = pro { const { openIssues = null } = props; - const onPickIssue = (issueId: number) => SendMessageComposer(new PickIssuesMessageComposer([issueId], false, 0, 'pick issue button')); + const onPickIssue = (issueId: number) => SendMessageComposer(new PickIssuesMessageComposer([ issueId ], false, 0, 'pick issue button')); return ( @@ -26,18 +26,18 @@ export const ModToolsOpenIssuesTabView: FC = pro { openIssues && (openIssues.length > 0) && openIssues.map(issue => - { - return ( - - { issue.categoryId } - { issue.reportedUserName } - { new Date(Date.now() - issue.issueAgeInMilliseconds).toLocaleTimeString() } - - - - - ); - }) } + { + return ( + + { issue.categoryId } + { issue.reportedUserName } + { new Date(Date.now() - issue.issueAgeInMilliseconds).toLocaleTimeString() } + + + + + ); + }) } ); diff --git a/src/components/mod-tools/views/tickets/ModToolsPickedIssuesTabView.tsx b/src/components/mod-tools/views/tickets/ModToolsPickedIssuesTabView.tsx index 6f155971..19b899bd 100644 --- a/src/components/mod-tools/views/tickets/ModToolsPickedIssuesTabView.tsx +++ b/src/components/mod-tools/views/tickets/ModToolsPickedIssuesTabView.tsx @@ -23,16 +23,16 @@ export const ModToolsPickedIssuesTabView: FC = { pickedIssues && (pickedIssues.length > 0) && pickedIssues.map(issue => - { - return ( - - { issue.categoryId } - { issue.reportedUserName } - { new Date(Date.now() - issue.issueAgeInMilliseconds).toLocaleTimeString() } - { issue.pickerUserName } - - ); - }) } + { + return ( + + { issue.categoryId } + { issue.reportedUserName } + { new Date(Date.now() - issue.issueAgeInMilliseconds).toLocaleTimeString() } + { issue.pickerUserName } + + ); + }) } ); diff --git a/src/components/mod-tools/views/tickets/ModToolsTicketsView.tsx b/src/components/mod-tools/views/tickets/ModToolsTicketsView.tsx index b5a10aac..74eb08f4 100644 --- a/src/components/mod-tools/views/tickets/ModToolsTicketsView.tsx +++ b/src/components/mod-tools/views/tickets/ModToolsTicketsView.tsx @@ -32,21 +32,21 @@ export const ModToolsTicketsView: FC = props => if(!tickets) return []; return tickets.filter(issue => issue.state === IssueMessageData.STATE_OPEN); - }, [tickets]); + }, [ tickets ]); const myIssues = useMemo(() => { if(!tickets) return []; return tickets.filter(issue => (issue.state === IssueMessageData.STATE_PICKED) && (issue.pickerUserId === GetSessionDataManager().userId)); - }, [tickets]); + }, [ tickets ]); const pickedIssues = useMemo(() => { if(!tickets) return []; return tickets.filter(issue => issue.state === IssueMessageData.STATE_PICKED); - }, [tickets]); + }, [ tickets ]); const onIssueInfoClosed = useCallback((issueId: number) => { @@ -57,7 +57,7 @@ export const ModToolsTicketsView: FC = props => const newValues = Array.from(issueInfoWindows); newValues.splice(indexOfValue, 1); setIssueInfoWindows(newValues); - }, [issueInfoWindows]); + }, [ issueInfoWindows ]); const onIssueHandleClicked = useCallback((issueId: number) => { @@ -71,7 +71,7 @@ export const ModToolsTicketsView: FC = props => { onIssueInfoClosed(issueId); } - }, [issueInfoWindows, onIssueInfoClosed]); + }, [ issueInfoWindows, onIssueInfoClosed ]); const CurrentTabComponent = useCallback(() => { @@ -82,20 +82,20 @@ export const ModToolsTicketsView: FC = props => case 2: return ; default: return null; } - }, [currentTab, myIssues, onIssueHandleClicked, openIssues, pickedIssues]); + }, [ currentTab, myIssues, onIssueHandleClicked, openIssues, pickedIssues ]); return ( <> - - { TABS.map((tab, index) => - { - return ( setCurrentTab(index) }> - { tab } - ); - }) } - + + { TABS.map((tab, index) => + { + return ( setCurrentTab(index) }> + { tab } + ); + }) } + diff --git a/src/components/mod-tools/views/user/ModToolsUserRoomVisitsView.tsx b/src/components/mod-tools/views/user/ModToolsUserRoomVisitsView.tsx index 5db63f83..93a7b7b5 100644 --- a/src/components/mod-tools/views/user/ModToolsUserRoomVisitsView.tsx +++ b/src/components/mod-tools/views/user/ModToolsUserRoomVisitsView.tsx @@ -43,7 +43,7 @@ export const ModToolsUserRoomVisitsView: FC = p useEffect(() => { SendMessageComposer(new GetRoomVisitsMessageComposer(userId)); - }, [userId]); + }, [ userId ]); if(!userId) return null; @@ -63,18 +63,18 @@ export const ModToolsUserRoomVisitsView: FC = p { roomVisitData && { ({ height, width }) => - { - return ( - - ); - } } + { + return ( + + ); + } } } diff --git a/src/components/mod-tools/views/user/ModToolsUserView.tsx b/src/components/mod-tools/views/user/ModToolsUserView.tsx index 322aee1a..bf35ddf9 100644 --- a/src/components/mod-tools/views/user/ModToolsUserView.tsx +++ b/src/components/mod-tools/views/user/ModToolsUserView.tsx @@ -115,19 +115,19 @@ export const ModToolsUserView: FC = props => { userProperties.map( (property, index) => - { + { - return ( - - - + + - - ); - }) } + + + ); + }) }
{ LocalizeText(property.localeKey) } - { property.value } - { property.showOnline && + return ( +
{ LocalizeText(property.localeKey) } + { property.value } + { property.showOnline && } -
diff --git a/src/components/navigator/NavigatorMessageHandler.tsx b/src/components/navigator/NavigatorMessageHandler.tsx index 9c5e8e02..d99a0cd7 100644 --- a/src/components/navigator/NavigatorMessageHandler.tsx +++ b/src/components/navigator/NavigatorMessageHandler.tsx @@ -44,14 +44,14 @@ export const NavigatorMessageHandler: FC<{}> = props => const parser = event.getParser(); setNavigatorData(prevValue => - { - const newValue = { ...prevValue }; + { + const newValue = { ...prevValue }; - newValue.eventMod = (parser.securityLevel >= SecurityLevel.MODERATOR); - newValue.roomPicker = (parser.securityLevel >= SecurityLevel.COMMUNITY); + newValue.eventMod = (parser.securityLevel >= SecurityLevel.MODERATOR); + newValue.roomPicker = (parser.securityLevel >= SecurityLevel.COMMUNITY); - return newValue; - }); + return newValue; + }); }, [ setNavigatorData ]); const onRoomForwardEvent = useCallback((event: RoomForwardEvent) => @@ -66,15 +66,15 @@ export const NavigatorMessageHandler: FC<{}> = props => const parser = event.getParser(); setNavigatorData(prevValue => - { - const newValue = { ...prevValue }; + { + const newValue = { ...prevValue }; - newValue.enteredGuestRoom = null; - newValue.currentRoomOwner = parser.isOwner; - newValue.currentRoomId = parser.roomId; + newValue.enteredGuestRoom = null; + newValue.currentRoomOwner = parser.isOwner; + newValue.currentRoomId = parser.roomId; - return newValue; - }); + return newValue; + }); // close room info // close room settings @@ -94,28 +94,28 @@ export const NavigatorMessageHandler: FC<{}> = props => setDoorData({ roomInfo: null, state: DoorStateType.NONE }); setNavigatorData(prevValue => + { + const newValue = { ...prevValue }; + + newValue.enteredGuestRoom = parser.data; + newValue.currentRoomIsStaffPick = parser.staffPick; + + const isCreated = (newValue.createdFlatId === parser.data.roomId); + + if(!isCreated && parser.data.displayRoomEntryAd) { - const newValue = { ...prevValue }; + if(GetConfiguration('roomenterad.habblet.enabled', false)) HabboWebTools.openRoomEnterAd(); + } - newValue.enteredGuestRoom = parser.data; - newValue.currentRoomIsStaffPick = parser.staffPick; + newValue.createdFlatId = 0; - const isCreated = (newValue.createdFlatId === parser.data.roomId); + if(newValue.enteredGuestRoom && (newValue.enteredGuestRoom.habboGroupId > 0)) + { + // close event info + } - if(!isCreated && parser.data.displayRoomEntryAd) - { - if(GetConfiguration('roomenterad.habblet.enabled', false)) HabboWebTools.openRoomEnterAd(); - } - - newValue.createdFlatId = 0; - - if(newValue.enteredGuestRoom && (newValue.enteredGuestRoom.habboGroupId > 0)) - { - // close event info - } - - return newValue; - }); + return newValue; + }); } else if(parser.roomForward) { @@ -125,25 +125,25 @@ export const NavigatorMessageHandler: FC<{}> = props => { case RoomDataParser.DOORBELL_STATE: setDoorData(prevValue => - { - const newValue = { ...prevValue }; + { + const newValue = { ...prevValue }; - newValue.roomInfo = parser.data; - newValue.state = DoorStateType.START_DOORBELL; + newValue.roomInfo = parser.data; + newValue.state = DoorStateType.START_DOORBELL; - return newValue; - }); + return newValue; + }); return; case RoomDataParser.PASSWORD_STATE: setDoorData(prevValue => - { - const newValue = { ...prevValue }; + { + const newValue = { ...prevValue }; - newValue.roomInfo = parser.data; - newValue.state = DoorStateType.START_PASSWORD; + newValue.roomInfo = parser.data; + newValue.state = DoorStateType.START_PASSWORD; - return newValue; - }); + return newValue; + }); return; } } @@ -155,14 +155,14 @@ export const NavigatorMessageHandler: FC<{}> = props => else { setNavigatorData(prevValue => - { - const newValue = { ...prevValue }; + { + const newValue = { ...prevValue }; - newValue.enteredGuestRoom = parser.data; - newValue.currentRoomIsStaffPick = parser.staffPick; + newValue.enteredGuestRoom = parser.data; + newValue.currentRoomIsStaffPick = parser.staffPick; - return newValue; - }); + return newValue; + }); } }, [ setNavigatorData, setDoorData ]); @@ -171,14 +171,14 @@ export const NavigatorMessageHandler: FC<{}> = props => const parser = event.getParser(); setNavigatorData(prevValue => - { - const newValue = { ...prevValue }; + { + const newValue = { ...prevValue }; - newValue.currentRoomRating = parser.totalLikes; - newValue.canRate = parser.canLike; + newValue.currentRoomRating = parser.totalLikes; + newValue.canRate = parser.canLike; - return newValue; - }); + return newValue; + }); }, [ setNavigatorData ]); const onRoomDoorbellEvent = useCallback((event: RoomDoorbellEvent) => @@ -188,13 +188,13 @@ export const NavigatorMessageHandler: FC<{}> = props => if(!parser.userName || (parser.userName.length === 0)) { setDoorData(prevValue => - { - const newValue = { ...prevValue }; + { + const newValue = { ...prevValue }; - newValue.state = DoorStateType.STATE_WAITING; + newValue.state = DoorStateType.STATE_WAITING; - return newValue; - }); + return newValue; + }); } }, [ setDoorData ]); @@ -205,13 +205,13 @@ export const NavigatorMessageHandler: FC<{}> = props => if(!parser.userName || (parser.userName.length === 0)) { setDoorData(prevValue => - { - const newValue = { ...prevValue }; + { + const newValue = { ...prevValue }; - newValue.state = DoorStateType.STATE_ACCEPTED; + newValue.state = DoorStateType.STATE_ACCEPTED; - return newValue; - }); + return newValue; + }); } }, [ setDoorData ]); @@ -222,13 +222,13 @@ export const NavigatorMessageHandler: FC<{}> = props => if(!parser.userName || (parser.userName.length === 0)) { setDoorData(prevValue => - { - const newValue = { ...prevValue }; + { + const newValue = { ...prevValue }; - newValue.state = DoorStateType.STATE_NO_ANSWER; + newValue.state = DoorStateType.STATE_NO_ANSWER; - return newValue; - }); + return newValue; + }); } }, [ setDoorData ]); @@ -240,13 +240,13 @@ export const NavigatorMessageHandler: FC<{}> = props => { case -100002: setDoorData(prevValue => - { - const newValue = { ...prevValue }; + { + const newValue = { ...prevValue }; - newValue.state = DoorStateType.STATE_WRONG_PASSWORD; + newValue.state = DoorStateType.STATE_WRONG_PASSWORD; - return newValue; - }); + return newValue; + }); return; case 4009: NotificationUtilities.simpleAlert(LocalizeText('navigator.alert.need.to.be.vip'), NotificationAlertType.DEFAULT, null, null, LocalizeText('generic.alert.title')); @@ -285,32 +285,32 @@ export const NavigatorMessageHandler: FC<{}> = props => BatchUpdates(() => { setTopLevelContext(prevValue => + { + let newValue = prevValue; + + if(!newValue) newValue = ((topLevelContexts && topLevelContexts.length && topLevelContexts[0]) || null); + + if(!newValue) return null; + + if((parser.result.code !== newValue.code) && topLevelContexts && topLevelContexts.length) { - let newValue = prevValue; - - if(!newValue) newValue = ((topLevelContexts && topLevelContexts.length && topLevelContexts[0]) || null); - - if(!newValue) return null; - - if((parser.result.code !== newValue.code) && topLevelContexts && topLevelContexts.length) - { - for(const context of topLevelContexts) - { - if(context.code !== parser.result.code) continue; - - newValue = context; - } - } - for(const context of topLevelContexts) { if(context.code !== parser.result.code) continue; newValue = context; } + } - return newValue; - }); + for(const context of topLevelContexts) + { + if(context.code !== parser.result.code) continue; + + newValue = context; + } + + return newValue; + }); setSearchResult(parser.result); }); @@ -337,16 +337,16 @@ export const NavigatorMessageHandler: FC<{}> = props => let prevSettingsReceived = false; setNavigatorData(prevValue => - { - prevSettingsReceived = prevValue.settingsReceived; + { + prevSettingsReceived = prevValue.settingsReceived; - const newValue = { ...prevValue }; + const newValue = { ...prevValue }; - newValue.homeRoomId = parser.homeRoomId; - newValue.settingsReceived = true; + newValue.homeRoomId = parser.homeRoomId; + newValue.settingsReceived = true; - return newValue; - }); + return newValue; + }); if(prevSettingsReceived) { diff --git a/src/components/navigator/NavigatorView.tsx b/src/components/navigator/NavigatorView.tsx index fa2740b6..2ed72805 100644 --- a/src/components/navigator/NavigatorView.tsx +++ b/src/components/navigator/NavigatorView.tsx @@ -229,13 +229,13 @@ export const NavigatorView: FC<{}> = props => setIsVisible(false) } /> { topLevelContexts && (topLevelContexts.length > 0) && topLevelContexts.map((context, index) => - { - return ( - sendSearch('', context.code) }> - { LocalizeText(('navigator.toplevelview.' + context.code)) } - - ); - }) } + { + return ( + sendSearch('', context.code) }> + { LocalizeText(('navigator.toplevelview.' + context.code)) } + + ); + }) } setCreatorOpen(true) }> diff --git a/src/components/navigator/views/NavigatorDoorStateView.tsx b/src/components/navigator/views/NavigatorDoorStateView.tsx index 26324a61..d9b4228e 100644 --- a/src/components/navigator/views/NavigatorDoorStateView.tsx +++ b/src/components/navigator/views/NavigatorDoorStateView.tsx @@ -26,13 +26,13 @@ export const NavigatorDoorStateView: FC<{}> = props => CreateRoomSession(doorData.roomInfo.roomId); setDoorData(prevValue => - { - const newValue = { ...prevValue }; + { + const newValue = { ...prevValue }; - newValue.state = DoorStateType.STATE_PENDING_SERVER; + newValue.state = DoorStateType.STATE_PENDING_SERVER; - return newValue; - }); + return newValue; + }); } const tryEntering = () => @@ -42,13 +42,13 @@ export const NavigatorDoorStateView: FC<{}> = props => CreateRoomSession(doorData.roomInfo.roomId, password); setDoorData(prevValue => - { - const newValue = { ...prevValue }; + { + const newValue = { ...prevValue }; - newValue.state = DoorStateType.STATE_PENDING_SERVER; + newValue.state = DoorStateType.STATE_PENDING_SERVER; - return newValue; - }); + return newValue; + }); } useEffect(() => diff --git a/src/components/navigator/views/NavigatorRoomCreatorView.tsx b/src/components/navigator/views/NavigatorRoomCreatorView.tsx index 77e6ada1..7238ed2d 100644 --- a/src/components/navigator/views/NavigatorRoomCreatorView.tsx +++ b/src/components/navigator/views/NavigatorRoomCreatorView.tsx @@ -68,18 +68,18 @@ export const NavigatorRoomCreatorView: FC<{}> = props => { LocalizeText('navigator.category') } { LocalizeText('navigator.maxvisitors') } @@ -94,15 +94,15 @@ export const NavigatorRoomCreatorView: FC<{}> = props => { RoomModels.map((model, index )=> - { - return ( selectModel(model, index) } itemActive={ (selectedModelName === model.name) } overflow="unset" gap={ 0 } className="p-1" disabled={ (GetClubMemberLevel() < model.clubLevel) }> - - - - { model.tileSize } { LocalizeText('navigator.createroom.tilesize') } - { model.clubLevel > HabboClubLevelEnum.NO_CLUB && } - ); - }) + { + return ( selectModel(model, index) } itemActive={ (selectedModelName === model.name) } overflow="unset" gap={ 0 } className="p-1" disabled={ (GetClubMemberLevel() < model.clubLevel) }> + + + + { model.tileSize } { LocalizeText('navigator.createroom.tilesize') } + { model.clubLevel > HabboClubLevelEnum.NO_CLUB && } + ); + }) } diff --git a/src/components/navigator/views/NavigatorRoomInfoView.tsx b/src/components/navigator/views/NavigatorRoomInfoView.tsx index 02e9b9f2..3526855a 100644 --- a/src/components/navigator/views/NavigatorRoomInfoView.tsx +++ b/src/components/navigator/views/NavigatorRoomInfoView.tsx @@ -70,7 +70,7 @@ export const NavigatorRoomInfoView: FC = props => case 'toggle_mute': setIsRoomMuted(value => !value); SendMessageComposer(new RoomMuteComposer()); - return; + return; case 'open_floorplan_editor': DispatchUiEvent(new FloorplanEditorEvent(FloorplanEditorEvent.TOGGLE_FLOORPLAN_EDITOR)); return; @@ -126,9 +126,9 @@ export const NavigatorRoomInfoView: FC = props => { (navigatorData.enteredGuestRoom.tags.length > 0) && { navigatorData.enteredGuestRoom.tags.map(tag => - { - return processAction('navigator_search_tag', tag) }>#{ tag } - }) } + { + return processAction('navigator_search_tag', tag) }>#{ tag } + }) } } @@ -142,20 +142,20 @@ export const NavigatorRoomInfoView: FC = props => processAction('open_group_info') }> - { LocalizeText('navigator.guildbase', ['groupName'], [navigatorData.enteredGuestRoom.groupName]) } + { LocalizeText('navigator.guildbase', [ 'groupName' ], [ navigatorData.enteredGuestRoom.groupName ]) } } - - { hasPermission('staff_pick') && + + { hasPermission('staff_pick') && } - - { hasPermission('settings') && + + { hasPermission('settings') && <> } - - } + + } diff --git a/src/components/navigator/views/room-settings/NavigatorRoomSettingsModTabView.tsx b/src/components/navigator/views/room-settings/NavigatorRoomSettingsModTabView.tsx index a5f4037c..3f06ab4c 100644 --- a/src/components/navigator/views/room-settings/NavigatorRoomSettingsModTabView.tsx +++ b/src/components/navigator/views/room-settings/NavigatorRoomSettingsModTabView.tsx @@ -30,15 +30,15 @@ export const NavigatorRoomSettingsModTabView: FC { setBannedUsers(prevValue => - { - const newValue = [ ...prevValue ]; + { + const newValue = [ ...prevValue ]; - const index = newValue.findIndex(value => (value.userId === userId)); + const index = newValue.findIndex(value => (value.userId === userId)); - if(index >= 0) newValue.splice(index, 1); + if(index >= 0) newValue.splice(index, 1); - return newValue; - }) + return newValue; + }) SendMessageComposer(new RoomUnbanUserComposer(userId, roomData.roomId)); @@ -57,14 +57,14 @@ export const NavigatorRoomSettingsModTabView: FC { bannedUsers && (bannedUsers.length > 0) && bannedUsers.map((user, index) => - { - return ( - - - setSelectedUserId(user.userId) }> { user.userName } - - ); - }) } + { + return ( + + + setSelectedUserId(user.userId) }> { user.userName } + + ); + }) } } - + { (!item.imageUrl || (item.imageUrl && imageFailed)) && <> diff --git a/src/components/notification-center/views/alert-layouts/NotificationSearchAlertView.tsx b/src/components/notification-center/views/alert-layouts/NotificationSearchAlertView.tsx index 0e1dabfb..db41e8cf 100644 --- a/src/components/notification-center/views/alert-layouts/NotificationSearchAlertView.tsx +++ b/src/components/notification-center/views/alert-layouts/NotificationSearchAlertView.tsx @@ -12,26 +12,26 @@ export const NotificationSeachAlertView: FC = const { item = null, title = ((props.item && props.item.title) || ''), close = null, ...rest } = props; const [ searchValue, setSearchValue ] = useState(''); - const [ results, setResults] = useState([]); + const [ results, setResults ] = useState([]); const visitUrl = useCallback(() => { NotificationUtilities.openUrl(item.clickUrl); close(); - }, [item, close]); + }, [ item, close ]); useEffect(() => { setResults(JSON.parse(item.messages[0])); - }, [item]) + }, [ item ]) const updateSearchValue = useCallback((value: string) => { let res = JSON.parse(item.messages[0]); setResults(res.filter((val: string) => val.includes(value))); setSearchValue(value); - },[item]) + },[ item ]) const isAction = (item.clickUrl && item.clickUrl.startsWith('event:')); diff --git a/src/components/purse/PurseView.tsx b/src/components/purse/PurseView.tsx index afe67380..eef8db1e 100644 --- a/src/components/purse/PurseView.tsx +++ b/src/components/purse/PurseView.tsx @@ -71,15 +71,15 @@ export const PurseView: FC<{}> = props => const parser = event.getParser(); setPurse(prevValue => - { - const newValue = Purse.from(prevValue as Purse); + { + const newValue = Purse.from(prevValue as Purse); - newValue.credits = parseFloat(parser.credits); + newValue.credits = parseFloat(parser.credits); - if(prevValue.credits !== newValue.credits) PlaySound(SoundNames.CREDITS); + if(prevValue.credits !== newValue.credits) PlaySound(SoundNames.CREDITS); - return newValue; - }); + return newValue; + }); }, []); UseMessageEventHook(UserCreditsEvent, onUserCreditsEvent); @@ -89,13 +89,13 @@ export const PurseView: FC<{}> = props => const parser = event.getParser(); setPurse(prevValue => - { - const newValue = Purse.from(prevValue as Purse); + { + const newValue = Purse.from(prevValue as Purse); - newValue.activityPoints = parser.currencies; + newValue.activityPoints = parser.currencies; - return newValue; - }); + return newValue; + }); }, []); UseMessageEventHook(UserCurrencyEvent, onUserCurrencyEvent); @@ -105,17 +105,17 @@ export const PurseView: FC<{}> = props => const parser = event.getParser(); setPurse(prevValue => - { - const newValue = Purse.from(prevValue as Purse); + { + const newValue = Purse.from(prevValue as Purse); - newValue.activityPoints = new Map(newValue.activityPoints); + newValue.activityPoints = new Map(newValue.activityPoints); - newValue.activityPoints.set(parser.type, parser.amount); + newValue.activityPoints.set(parser.type, parser.amount); - if(parser.type === 0) PlaySound(SoundNames.DUCKETS) + if(parser.type === 0) PlaySound(SoundNames.DUCKETS) - return newValue; - }); + return newValue; + }); }, []); UseMessageEventHook(ActivityPointNotificationMessageEvent, onActivityPointNotificationMessageEvent); @@ -128,20 +128,20 @@ export const PurseView: FC<{}> = props => if((productName !== 'club_habbo') && (productName !== 'habbo_club')) return; setPurse(prevValue => - { - const newValue = Purse.from(prevValue as Purse); + { + const newValue = Purse.from(prevValue as Purse); - newValue.clubDays = Math.max(0, parser.daysToPeriodEnd); - newValue.clubPeriods = Math.max(0, parser.periodsSubscribedAhead); - newValue.isVip = parser.isVip; - newValue.pastClubDays = parser.pastClubDays; - newValue.pastVipDays = parser.pastVipDays; - newValue.isExpiring = ((parser.responseType === UserSubscriptionParser.RESPONSE_TYPE_DISCOUNT_AVAILABLE) ? true : false); - newValue.minutesUntilExpiration = parser.minutesUntilExpiration; - newValue.minutesSinceLastModified = parser.minutesSinceLastModified; + newValue.clubDays = Math.max(0, parser.daysToPeriodEnd); + newValue.clubPeriods = Math.max(0, parser.periodsSubscribedAhead); + newValue.isVip = parser.isVip; + newValue.pastClubDays = parser.pastClubDays; + newValue.pastVipDays = parser.pastVipDays; + newValue.isExpiring = ((parser.responseType === UserSubscriptionParser.RESPONSE_TYPE_DISCOUNT_AVAILABLE) ? true : false); + newValue.minutesUntilExpiration = parser.minutesUntilExpiration; + newValue.minutesSinceLastModified = parser.minutesSinceLastModified; - return newValue; - }); + return newValue; + }); }, []); UseMessageEventHook(UserSubscriptionEvent, onUserSubscriptionEvent); diff --git a/src/components/room/widgets/avatar-info/AvatarInfoWidgetAvatarView.tsx b/src/components/room/widgets/avatar-info/AvatarInfoWidgetAvatarView.tsx index 98a04354..4cfc01c4 100644 --- a/src/components/room/widgets/avatar-info/AvatarInfoWidgetAvatarView.tsx +++ b/src/components/room/widgets/avatar-info/AvatarInfoWidgetAvatarView.tsx @@ -107,7 +107,7 @@ export const AvatarInfoWidgetAvatarView: FC = p messageType = RoomWidgetUserActionMessage.WHISPER_USER; break; case 'friend': - //userData.canBeAskedAsFriend = false; + //userData.canBeAskedAsFriend = false; messageType = RoomWidgetUserActionMessage.SEND_FRIEND_REQUEST; break; case 'relationship': diff --git a/src/components/room/widgets/avatar-info/AvatarInfoWidgetOwnAvatarView.tsx b/src/components/room/widgets/avatar-info/AvatarInfoWidgetOwnAvatarView.tsx index 228ca6cf..700289f7 100644 --- a/src/components/room/widgets/avatar-info/AvatarInfoWidgetOwnAvatarView.tsx +++ b/src/components/room/widgets/avatar-info/AvatarInfoWidgetOwnAvatarView.tsx @@ -152,11 +152,11 @@ export const AvatarInfoWidgetOwnAvatarView: FC } processAction('expressions') }> - + { LocalizeText('infostand.link.expressions') } processAction('signs') }> - + { LocalizeText('infostand.show.signs') } { (userData.carryItem > 0) && @@ -203,12 +203,12 @@ export const AvatarInfoWidgetOwnAvatarView: FC } { GetCanUseExpression() && processAction('laugh') }> - { !HasHabboVip() && } + { !HasHabboVip() && } { LocalizeText('widget.memenu.laugh') } } { GetCanUseExpression() && processAction('blow') }> - { !HasHabboVip() && } + { !HasHabboVip() && } { LocalizeText('widget.memenu.blow') } } processAction('idle') }> diff --git a/src/components/room/widgets/avatar-info/AvatarInfoWidgetOwnPetView.tsx b/src/components/room/widgets/avatar-info/AvatarInfoWidgetOwnPetView.tsx index cfebe133..4b7d2632 100644 --- a/src/components/room/widgets/avatar-info/AvatarInfoWidgetOwnPetView.tsx +++ b/src/components/room/widgets/avatar-info/AvatarInfoWidgetOwnPetView.tsx @@ -72,7 +72,7 @@ export const AvatarInfoWidgetOwnPetView: FC = p messageType = RoomWidgetUserActionMessage.GIVE_CARRY_ITEM_TO_PET; break; case 'train': - //this.widget._Str_23877(); + //this.widget._Str_23877(); break; case 'pick_up': messageType = RoomWidgetUserActionMessage.PICKUP_PET; @@ -95,10 +95,10 @@ export const AvatarInfoWidgetOwnPetView: FC = p case 'breed': if(mode === _Str_2906) { - // _local_7 = RoomWidgetPetCommandMessage._Str_16282; - // _local_8 = ("pet.command." + _local_7); - // _local_9 = _Str_2268.catalog.localization.getLocalization(_local_8); - // _local_4 = new RoomWidgetPetCommandMessage(RoomWidgetPetCommandMessage.RWPCM_PET_COMMAND, this._Str_594.id, ((this._Str_594.name + " ") + _local_9)); + // _local_7 = RoomWidgetPetCommandMessage._Str_16282; + // _local_8 = ("pet.command." + _local_7); + // _local_9 = _Str_2268.catalog.localization.getLocalization(_local_8); + // _local_4 = new RoomWidgetPetCommandMessage(RoomWidgetPetCommandMessage.RWPCM_PET_COMMAND, this._Str_594.id, ((this._Str_594.name + " ") + _local_9)); } else if(mode === _Str_10946) @@ -133,13 +133,13 @@ export const AvatarInfoWidgetOwnPetView: FC = p BatchUpdates(() => { setMode(prevValue => - { - if(petData.petType === PetType.MONSTERPLANT) return _Str_10946; - else if(petData.saddle && !petData.rider) return _Str_5818; - else if(petData.rider) return _Str_5938; + { + if(petData.petType === PetType.MONSTERPLANT) return _Str_10946; + else if(petData.saddle && !petData.rider) return _Str_5818; + else if(petData.rider) return _Str_5938; - return _Str_2906; - }); + return _Str_2906; + }); setRespectsLeft(petData.respectsPetLeft); }); diff --git a/src/components/room/widgets/avatar-info/AvatarInfoWidgetPetView.tsx b/src/components/room/widgets/avatar-info/AvatarInfoWidgetPetView.tsx index 5f09818f..3ea427f7 100644 --- a/src/components/room/widgets/avatar-info/AvatarInfoWidgetPetView.tsx +++ b/src/components/room/widgets/avatar-info/AvatarInfoWidgetPetView.tsx @@ -100,13 +100,13 @@ export const AvatarInfoWidgetPetView: FC = props = BatchUpdates(() => { setMode(prevValue => - { - if(petData.petType === PetType.MONSTERPLANT) return _Str_13388; - else if(petData.saddle && !petData.rider) return _Str_5818; - else if(petData.rider) return _Str_5938; + { + if(petData.petType === PetType.MONSTERPLANT) return _Str_13388; + else if(petData.saddle && !petData.rider) return _Str_5818; + else if(petData.rider) return _Str_5938; - return _Str_2906; - }); + return _Str_2906; + }); setRespectsLeft(petData.respectsPetLeft); }); diff --git a/src/components/room/widgets/avatar-info/AvatarInfoWidgetView.tsx b/src/components/room/widgets/avatar-info/AvatarInfoWidgetView.tsx index a5f4652b..93158743 100644 --- a/src/components/room/widgets/avatar-info/AvatarInfoWidgetView.tsx +++ b/src/components/room/widgets/avatar-info/AvatarInfoWidgetView.tsx @@ -30,26 +30,26 @@ export const AvatarInfoWidgetView: FC<{}> = props => const removeNameBubble = useCallback((index: number) => { setNameBubbles(prevValue => - { - const newValue = [ ...prevValue ]; + { + const newValue = [ ...prevValue ]; - newValue.splice(index, 1); + newValue.splice(index, 1); - return newValue; - }); + return newValue; + }); }, []); const removeProductBubble = useCallback((index: number) => { setProductBubbles(prevValue => - { - const newValue = [ ...prevValue ]; - const item = newValue.splice(index, 1)[0]; + { + const newValue = [ ...prevValue ]; + const item = newValue.splice(index, 1)[0]; - if(confirmingProduct === item) setConfirmingProduct(null); + if(confirmingProduct === item) setConfirmingProduct(null); - return newValue; - }); + return newValue; + }); }, [ confirmingProduct ]); const clearProductBubbles = useCallback(() => @@ -101,21 +101,21 @@ export const AvatarInfoWidgetView: FC<{}> = props => if(event.category === RoomObjectCategory.UNIT) { const nameBubbleIndex = nameBubbles.findIndex(bubble => - { - return (bubble.roomIndex === event.id); - }); + { + return (bubble.roomIndex === event.id); + }); if(nameBubbleIndex > -1) removeNameBubble(nameBubbleIndex); if(productBubbles.length) { setProductBubbles(prevValue => + { + return prevValue.filter(bubble => { - return prevValue.filter(bubble => - { - return (bubble.id !== event.id); - }); + return (bubble.id !== event.id); }); + }); } } @@ -124,12 +124,12 @@ export const AvatarInfoWidgetView: FC<{}> = props => if(productBubbles.length) { setProductBubbles(prevValue => + { + return prevValue.filter(bubble => { - return prevValue.filter(bubble => - { - return (bubble.requestRoomObjectId !== event.id); - }); + return (bubble.requestRoomObjectId !== event.id); }); + }); } } @@ -236,20 +236,20 @@ export const AvatarInfoWidgetView: FC<{}> = props => { setConfirmingProduct(null); setProductBubbles(prevValue => + { + const newBubbles = [ ...prevValue ]; + + for(const item of event.items) { - const newBubbles = [ ...prevValue ]; + const index = newBubbles.findIndex(bubble => (bubble.id === item.id)); - for(const item of event.items) - { - const index = newBubbles.findIndex(bubble => (bubble.id === item.id)); + if(index > -1) newBubbles.splice(index, 1); - if(index > -1) newBubbles.splice(index, 1); + newBubbles.push(item); + } - newBubbles.push(item); - } - - return newBubbles; - }); + return newBubbles; + }); }, []); UseEventDispatcherHook(RoomWidgetUseProductBubbleEvent.USE_PRODUCT_BUBBLES, eventDispatcher, onRoomWidgetUseProductBubbleEvent); @@ -293,9 +293,9 @@ export const AvatarInfoWidgetView: FC<{}> = props => if(name) { const nameBubbleIndex = nameBubbles.findIndex(bubble => - { - return (bubble.roomIndex === name.roomIndex); - }); + { + return (bubble.roomIndex === name.roomIndex); + }); if(nameBubbleIndex > -1) removeNameBubble(nameBubbleIndex); @@ -313,9 +313,9 @@ export const AvatarInfoWidgetView: FC<{}> = props => if(event.isSpectatorMode) return null; const nameBubbleIndex = nameBubbles.findIndex(bubble => - { - return (bubble.roomIndex === event.roomIndex); - }); + { + return (bubble.roomIndex === event.roomIndex); + }); if(nameBubbleIndex > -1) removeNameBubble(nameBubbleIndex); @@ -354,13 +354,13 @@ export const AvatarInfoWidgetView: FC<{}> = props => <> { currentView } { (nameBubbles.length > 0) && nameBubbles.map((name, index) => - { - return removeNameBubble(index) } />; - }) } + { + return removeNameBubble(index) } />; + }) } { (productBubbles.length > 0) && productBubbles.map((item, index) => - { - return removeProductBubble(index) } />; - }) } + { + return removeProductBubble(index) } />; + }) } { rentableBotChatEvent && setRentableBotChatEvent(null)}/> } { confirmingProduct && setConfirmingProduct(null) } /> } diff --git a/src/components/room/widgets/chat-input/ChatInputStyleSelectorView.tsx b/src/components/room/widgets/chat-input/ChatInputStyleSelectorView.tsx index 8e7a4b43..1e3f6717 100644 --- a/src/components/room/widgets/chat-input/ChatInputStyleSelectorView.tsx +++ b/src/components/room/widgets/chat-input/ChatInputStyleSelectorView.tsx @@ -32,11 +32,11 @@ export const ChatInputStyleSelectorView: FC = p let visible = false; setSelectorVisible(prevValue => - { - visible = !prevValue; + { + visible = !prevValue; - return visible; - }); + return visible; + }); if(visible) setTarget((event.target as (EventTarget & HTMLElement))); }) @@ -57,15 +57,15 @@ export const ChatInputStyleSelectorView: FC = p { chatStyleIds && (chatStyleIds.length > 0) && chatStyleIds.map((styleId) => - { - return ( - selectStyle(styleId) }> - -   - - - ); - }) } + { + return ( + selectStyle(styleId) }> + +   + + + ); + }) } diff --git a/src/components/room/widgets/chat-input/ChatInputView.tsx b/src/components/room/widgets/chat-input/ChatInputView.tsx index f21fdc51..a6e42296 100644 --- a/src/components/room/widgets/chat-input/ChatInputView.tsx +++ b/src/components/room/widgets/chat-input/ChatInputView.tsx @@ -64,11 +64,11 @@ export const ChatInputView: FC<{}> = props => const checkSpecialKeywordForInput = useCallback(() => { setChatValue(prevValue => - { - if((prevValue !== chatModeIdWhisper) || !selectedUsername.length) return prevValue; + { + if((prevValue !== chatModeIdWhisper) || !selectedUsername.length) return prevValue; - return (`${ prevValue } ${ selectedUsername }`); - }); + return (`${ prevValue } ${ selectedUsername }`); + }); }, [ selectedUsername, chatModeIdWhisper ]); const sendChat = useCallback((text: string, chatType: number, recipientName: string = '', styleId: number = 0) => @@ -324,11 +324,11 @@ export const ChatInputView: FC<{}> = props => const interval = setInterval(() => { setFloodBlockedSeconds(prevValue => - { - seconds = ((prevValue || 0) - 1); + { + seconds = ((prevValue || 0) - 1); - return seconds; - }); + return seconds; + }); if(seconds < 0) { @@ -360,14 +360,14 @@ export const ChatInputView: FC<{}> = props => return ( createPortal( -
-
- { !floodBlocked && +
+
+ { !floodBlocked && updateChatInput(event.target.value) } onMouseDown={ event => setInputFocus() } /> } - { floodBlocked && + { floodBlocked && { LocalizeText('chat.input.alert.flood', [ 'time' ], [ floodBlockedSeconds.toString() ]) } } -
- -
, document.getElementById('toolbar-chat-input-container')) +
+ +
, document.getElementById('toolbar-chat-input-container')) ); } diff --git a/src/components/room/widgets/chat/ChatWidgetView.tsx b/src/components/room/widgets/chat/ChatWidgetView.tsx index d552449c..7da4c033 100644 --- a/src/components/room/widgets/chat/ChatWidgetView.tsx +++ b/src/components/room/widgets/chat/ChatWidgetView.tsx @@ -26,39 +26,39 @@ export const ChatWidgetView: FC<{}> = props => const removeHiddenChats = useCallback(() => { setChatMessages(prevValue => + { + if(prevValue) { - if(prevValue) - { - const newMessages = prevValue.filter(chat => ((chat.top > (-(chat.height) * 2)))); + const newMessages = prevValue.filter(chat => ((chat.top > (-(chat.height) * 2)))); - if(newMessages.length !== prevValue.length) return newMessages; - } + if(newMessages.length !== prevValue.length) return newMessages; + } - return prevValue; - }) + return prevValue; + }) }, []); const moveAllChatsUp = useCallback((amount: number) => { setChatMessages(prevValue => + { + if(prevValue) { - if(prevValue) + prevValue.forEach(chat => { - prevValue.forEach(chat => - { - if(chat.skipMovement) - { - chat.skipMovement = false; + if(chat.skipMovement) + { + chat.skipMovement = false; - return; - } + return; + } - chat.top -= amount; - }); - } + chat.top -= amount; + }); + } - return prevValue; - }); + return prevValue; + }); removeHiddenChats(); }, [ removeHiddenChats ]); diff --git a/src/components/room/widgets/choosers/ChooserWidgetView.tsx b/src/components/room/widgets/choosers/ChooserWidgetView.tsx index 210ea2f7..9b5e56d2 100644 --- a/src/components/room/widgets/choosers/ChooserWidgetView.tsx +++ b/src/components/room/widgets/choosers/ChooserWidgetView.tsx @@ -36,7 +36,7 @@ export const ChooserWidgetView: FC = props => setSelectedItem(item); widgetHandler.processWidgetMessage(new RoomWidgetRoomObjectMessage(RoomWidgetRoomObjectMessage.SELECT_OBJECT, item.id, item.category)); - }, [ widgetHandler, setSelectedItem]); + }, [ widgetHandler, setSelectedItem ]); const rowRenderer: ListRowRenderer = (props: ListRowProps) => { @@ -57,14 +57,14 @@ export const ChooserWidgetView: FC = props => { ({ width, height }) => - { - return () - } } + { + return () + } } diff --git a/src/components/room/widgets/choosers/FurniChooserWidgetView.tsx b/src/components/room/widgets/choosers/FurniChooserWidgetView.tsx index 820b5c2f..3cc39885 100644 --- a/src/components/room/widgets/choosers/FurniChooserWidgetView.tsx +++ b/src/components/room/widgets/choosers/FurniChooserWidgetView.tsx @@ -17,11 +17,11 @@ export const FurniChooserWidgetView: FC<{}> = props => if(!isVisible) return; setRefreshTimeout(prevValue => - { - if(prevValue) clearTimeout(prevValue); + { + if(prevValue) clearTimeout(prevValue); - return setTimeout(() => widgetHandler.processWidgetMessage(new RoomWidgetRequestWidgetMessage(RoomWidgetRequestWidgetMessage.FURNI_CHOOSER)), 100); - }); + return setTimeout(() => widgetHandler.processWidgetMessage(new RoomWidgetRequestWidgetMessage(RoomWidgetRequestWidgetMessage.FURNI_CHOOSER)), 100); + }); }, [ isVisible, widgetHandler ]); const onRoomWidgetChooserContentEvent = useCallback((event: RoomWidgetChooserContentEvent) => diff --git a/src/components/room/widgets/choosers/UserChooserWidgetView.tsx b/src/components/room/widgets/choosers/UserChooserWidgetView.tsx index 6f8641b8..289e2caf 100644 --- a/src/components/room/widgets/choosers/UserChooserWidgetView.tsx +++ b/src/components/room/widgets/choosers/UserChooserWidgetView.tsx @@ -16,11 +16,11 @@ export const UserChooserWidgetView: FC<{}> = props => if(!isVisible) return; setRefreshTimeout(prevValue => - { - if(prevValue) clearTimeout(prevValue); + { + if(prevValue) clearTimeout(prevValue); - return setTimeout(() => widgetHandler.processWidgetMessage(new RoomWidgetRequestWidgetMessage(RoomWidgetRequestWidgetMessage.USER_CHOOSER)), 100); - }) + return setTimeout(() => widgetHandler.processWidgetMessage(new RoomWidgetRequestWidgetMessage(RoomWidgetRequestWidgetMessage.USER_CHOOSER)), 100); + }) }, [ isVisible, widgetHandler ]); const onRoomWidgetChooserContentEvent = useCallback((event: RoomWidgetChooserContentEvent) => diff --git a/src/components/room/widgets/context-menu/ContextMenuView.tsx b/src/components/room/widgets/context-menu/ContextMenuView.tsx index 3583d521..c20ba1ff 100644 --- a/src/components/room/widgets/context-menu/ContextMenuView.tsx +++ b/src/components/room/widgets/context-menu/ContextMenuView.tsx @@ -55,11 +55,11 @@ export const ContextMenuView: FC = props => if(isFading) { setFadeTime(prevValue => - { - newFadeTime += prevValue; + { + newFadeTime += prevValue; - return newFadeTime; - }); + return newFadeTime; + }); newOpacity = ((1 - (newFadeTime / fadeLength)) * 1); diff --git a/src/components/room/widgets/doorbell/DoorbellWidgetView.tsx b/src/components/room/widgets/doorbell/DoorbellWidgetView.tsx index 5331738b..48a9b096 100644 --- a/src/components/room/widgets/doorbell/DoorbellWidgetView.tsx +++ b/src/components/room/widgets/doorbell/DoorbellWidgetView.tsx @@ -75,23 +75,23 @@ export const DoorbellWidgetView: FC<{}> = props => { users && (users.length > 0) && users.map(userName => - { - return ( - - { userName } - - - - - - - - ); - }) } + { + return ( + + { userName } + + + + + + + + ); + }) } diff --git a/src/components/room/widgets/friend-request/FriendRequestWidgetView.tsx b/src/components/room/widgets/friend-request/FriendRequestWidgetView.tsx index 996af565..4d252f53 100644 --- a/src/components/room/widgets/friend-request/FriendRequestWidgetView.tsx +++ b/src/components/room/widgets/friend-request/FriendRequestWidgetView.tsx @@ -16,13 +16,13 @@ export const FriendRequestWidgetView: FC<{}> = props => if(index >= 0) return; setFriendRequests(prevValue => - { - const newValue = [ ...prevValue ]; + { + const newValue = [ ...prevValue ]; - newValue.push({ requestId, userId, userName }); + newValue.push({ requestId, userId, userName }); - return newValue; - }); + return newValue; + }); }, [ friendRequests ]); const hideFriendRequest = useCallback((requestId: number) => @@ -32,13 +32,13 @@ export const FriendRequestWidgetView: FC<{}> = props => if(index === -1) return; setFriendRequests(prevValue => - { - const newValue = [ ...prevValue ]; + { + const newValue = [ ...prevValue ]; - newValue.splice(index, 1); + newValue.splice(index, 1); - return newValue; - }); + return newValue; + }); }, [ friendRequests ]); const onRoomWidgetUpdateFriendRequestEvent = useCallback((event: RoomWidgetUpdateFriendRequestEvent) => @@ -62,9 +62,9 @@ export const FriendRequestWidgetView: FC<{}> = props => return ( <> { friendRequests.map((request, index) => - { - return hideFriendRequest(request.userId) } /> - }) } + { + return hideFriendRequest(request.userId) } /> + }) } ); } diff --git a/src/components/room/widgets/furniture/badge-display/FurnitureBadgeDisplayView.tsx b/src/components/room/widgets/furniture/badge-display/FurnitureBadgeDisplayView.tsx index 079fc733..22a15b8a 100644 --- a/src/components/room/widgets/furniture/badge-display/FurnitureBadgeDisplayView.tsx +++ b/src/components/room/widgets/furniture/badge-display/FurnitureBadgeDisplayView.tsx @@ -39,11 +39,11 @@ export const FurnitureBadgeDisplayView: FC<{}> = props => const widgetEvent = (event as RoomWidgetUpdateRoomObjectEvent); setTrophyData(prevState => - { - if(!prevState || (widgetEvent.id !== prevState.objectId) || (widgetEvent.category !== prevState.category)) return prevState; + { + if(!prevState || (widgetEvent.id !== prevState.objectId) || (widgetEvent.category !== prevState.category)) return prevState; - return null; - }); + return null; + }); return; } } diff --git a/src/components/room/widgets/furniture/dimmer/DimmerFurnitureWidgetPresetItem.ts b/src/components/room/widgets/furniture/dimmer/DimmerFurnitureWidgetPresetItem.ts index 3e8009af..1a2759f6 100644 --- a/src/components/room/widgets/furniture/dimmer/DimmerFurnitureWidgetPresetItem.ts +++ b/src/components/room/widgets/furniture/dimmer/DimmerFurnitureWidgetPresetItem.ts @@ -4,5 +4,6 @@ export class DimmerFurnitureWidgetPresetItem public id: number = 0, public type: number = 0, public color: number = 0, - public light: number = 0) {} + public light: number = 0) + {} } diff --git a/src/components/room/widgets/furniture/dimmer/FurnitureDimmerView.tsx b/src/components/room/widgets/furniture/dimmer/FurnitureDimmerView.tsx index 4b1b4182..e02de668 100644 --- a/src/components/room/widgets/furniture/dimmer/FurnitureDimmerView.tsx +++ b/src/components/room/widgets/furniture/dimmer/FurnitureDimmerView.tsx @@ -8,8 +8,8 @@ import { BatchUpdates, UseEventDispatcherHook } from '../../../../../hooks'; import { useRoomContext } from '../../../RoomContext'; import { DimmerFurnitureWidgetPresetItem } from './DimmerFurnitureWidgetPresetItem'; -const AVAILABLE_COLORS: number[] = [7665141, 21495, 15161822, 15353138, 15923281, 8581961, 0]; -const HTML_COLORS: string[] = ['#74F5F5', '#0053F7', '#E759DE', '#EA4532', '#F2F851', '#82F349', '#000000']; +const AVAILABLE_COLORS: number[] = [ 7665141, 21495, 15161822, 15353138, 15923281, 8581961, 0 ]; +const HTML_COLORS: string[] = [ '#74F5F5', '#0053F7', '#E759DE', '#EA4532', '#F2F851', '#82F349', '#000000' ]; const MIN_BRIGHTNESS: number = 76; const MAX_BRIGHTNESS: number = 255; @@ -117,13 +117,13 @@ export const FurnitureDimmerView: FC<{}> = props => if(!preset || ((selectedEffectId === preset.type) && (selectedColor === preset.color) && (selectedBrightness === preset.light))) return; setPresets(prevValue => - { - const newValue = [ ...prevValue ]; + { + const newValue = [ ...prevValue ]; - newValue[selectedPresetIndex] = new DimmerFurnitureWidgetPresetItem(preset.id, selectedEffectId, selectedColor, selectedBrightness); + newValue[selectedPresetIndex] = new DimmerFurnitureWidgetPresetItem(preset.id, selectedEffectId, selectedColor, selectedBrightness); - return newValue; - }); + return newValue; + }); widgetHandler.processWidgetMessage(new RoomWidgetDimmerSavePresetMessage(preset.id, selectedEffectId, selectedColor, selectedBrightness, true)); }, [ widgetHandler, dimmerState, selectedPresetId, presets, selectedEffectId, selectedColor, selectedBrightness ]); @@ -167,11 +167,11 @@ export const FurnitureDimmerView: FC<{}> = props => { !isFreeColorMode && { AVAILABLE_COLORS.map((color, index) => - { - return ( - setSelectedColor(color) } style={{ backgroundColor: HTML_COLORS[index] }} /> - ); - }) } + { + return ( + setSelectedColor(color) } style={{ backgroundColor: HTML_COLORS[index] }} /> + ); + }) } } diff --git a/src/components/room/widgets/furniture/friend-furni/FriendFurniLockData.ts b/src/components/room/widgets/furniture/friend-furni/FriendFurniLockData.ts index 7a58ecdc..da7e349e 100644 --- a/src/components/room/widgets/furniture/friend-furni/FriendFurniLockData.ts +++ b/src/components/room/widgets/furniture/friend-furni/FriendFurniLockData.ts @@ -6,5 +6,6 @@ export class FurnitureEngravingLockData public type: number = 0, public usernames: string[] = [], public figures: string[] = [], - public date: string = null) {} + public date: string = null) + {} } diff --git a/src/components/room/widgets/furniture/friend-furni/FurnitureFriendFurniView.tsx b/src/components/room/widgets/furniture/friend-furni/FurnitureFriendFurniView.tsx index 59406bcb..d0f99869 100644 --- a/src/components/room/widgets/furniture/friend-furni/FurnitureFriendFurniView.tsx +++ b/src/components/room/widgets/furniture/friend-furni/FurnitureFriendFurniView.tsx @@ -42,11 +42,11 @@ export const FurnitureFriendFurniView: FC<{}> = props => const widgetEvent = (event as RoomWidgetUpdateRoomObjectEvent); setEngravingLockData(prevState => - { - if(!prevState || (widgetEvent.id !== prevState.objectId) || (widgetEvent.category !== prevState.category)) return prevState; + { + if(!prevState || (widgetEvent.id !== prevState.objectId) || (widgetEvent.category !== prevState.category)) return prevState; - return null; - }); + return null; + }); return; } } diff --git a/src/components/room/widgets/furniture/high-score/FurnitureHighScoreView.tsx b/src/components/room/widgets/furniture/high-score/FurnitureHighScoreView.tsx index 638f50fb..646b12bd 100644 --- a/src/components/room/widgets/furniture/high-score/FurnitureHighScoreView.tsx +++ b/src/components/room/widgets/furniture/high-score/FurnitureHighScoreView.tsx @@ -8,8 +8,8 @@ import { ContextMenuHeaderView } from '../../context-menu/ContextMenuHeaderView' import { ContextMenuListView } from '../../context-menu/ContextMenuListView'; import { ObjectLocationView } from '../../object-location/ObjectLocationView'; -const SCORE_TYPES = ['perteam', 'mostwins', 'classic']; -const CLEAR_TYPES = ['alltime', 'daily', 'weekly', 'monthly']; +const SCORE_TYPES = [ 'perteam', 'mostwins', 'classic' ]; +const CLEAR_TYPES = [ 'alltime', 'daily', 'weekly', 'monthly' ]; export const FurnitureHighScoreView: FC<{}> = props => { @@ -31,26 +31,26 @@ export const FurnitureHighScoreView: FC<{}> = props => stuffData.initializeFromRoomObjectModel(object.model); setStuffDatas(prevValue => - { - const newValue = new Map(prevValue); + { + const newValue = new Map(prevValue); - newValue.set(object.id, stuffData); + newValue.set(object.id, stuffData); - return newValue; - }); + return newValue; + }); return; } case RoomEngineTriggerWidgetEvent.REQUEST_HIDE_HIGH_SCORE_DISPLAY: if(event.roomId !== roomSession.roomId) return; setStuffDatas(prevValue => - { - const newValue = new Map(prevValue); + { + const newValue = new Map(prevValue); - newValue.delete(event.objectId); + newValue.delete(event.objectId); - return newValue; - }); + return newValue; + }); return; } }, [ roomSession ]); @@ -63,45 +63,45 @@ export const FurnitureHighScoreView: FC<{}> = props => return ( <> { Array.from(stuffDatas.entries()).map(([ objectId, stuffData ], index) => - { - return ( - - - - { LocalizeText('high.score.display.caption', [ 'scoretype', 'cleartype' ], [ LocalizeText(`high.score.display.scoretype.${ SCORE_TYPES[stuffData.scoreType] }`), LocalizeText(`high.score.display.cleartype.${ CLEAR_TYPES[stuffData.clearType] }`)]) } - - - - - - { LocalizeText('high.score.display.users.header') } - - - { LocalizeText('high.score.display.score.header') } - - -
- - - { stuffData.entries.map((entry, index) => - { - return ( - - - { entry.users.join(', ') } - - - { entry.score } - - - ); - })} - - - - - ); - }) } + { + return ( + + + + { LocalizeText('high.score.display.caption', [ 'scoretype', 'cleartype' ], [ LocalizeText(`high.score.display.scoretype.${ SCORE_TYPES[stuffData.scoreType] }`), LocalizeText(`high.score.display.cleartype.${ CLEAR_TYPES[stuffData.clearType] }`) ]) } + + + + + + { LocalizeText('high.score.display.users.header') } + + + { LocalizeText('high.score.display.score.header') } + + +
+ + + { stuffData.entries.map((entry, index) => + { + return ( + + + { entry.users.join(', ') } + + + { entry.score } + + + ); + })} + + + + + ); + }) } ); } diff --git a/src/components/room/widgets/furniture/mannequin/FurnitureMannequinData.ts b/src/components/room/widgets/furniture/mannequin/FurnitureMannequinData.ts index 10928618..1cf1160d 100644 --- a/src/components/room/widgets/furniture/mannequin/FurnitureMannequinData.ts +++ b/src/components/room/widgets/furniture/mannequin/FurnitureMannequinData.ts @@ -7,5 +7,6 @@ export class FurnitureMannequinData public figure: string, public gender: string, public clubLevel: number, - public renderedFigure: string = null) {} + public renderedFigure: string = null) + {} } diff --git a/src/components/room/widgets/furniture/mannequin/FurnitureMannequinView.tsx b/src/components/room/widgets/furniture/mannequin/FurnitureMannequinView.tsx index ec83fe99..7d6c983d 100644 --- a/src/components/room/widgets/furniture/mannequin/FurnitureMannequinView.tsx +++ b/src/components/room/widgets/furniture/mannequin/FurnitureMannequinView.tsx @@ -16,7 +16,7 @@ const ACTION_SET_NAME: number = 1; const ACTION_WEAR: number = 2; const ACTION_SAVE: number = 3; -const MANNEQUIN_FIGURE = ['hd', 99999, [ 99998 ]]; +const MANNEQUIN_FIGURE = [ 'hd', 99999, [ 99998 ] ]; const MANNEQUIN_CLOTHING_PART_TYPES = [ AvatarFigurePartType.CHEST_ACCESSORY, AvatarFigurePartType.COAT_CHEST, diff --git a/src/components/room/widgets/furniture/stickie/FurnitureStickieData.ts b/src/components/room/widgets/furniture/stickie/FurnitureStickieData.ts index dde5d714..7ab1b184 100644 --- a/src/components/room/widgets/furniture/stickie/FurnitureStickieData.ts +++ b/src/components/room/widgets/furniture/stickie/FurnitureStickieData.ts @@ -6,5 +6,6 @@ export class FurnitureStickieData public color: string, public text: string, public canModify: boolean = false, - public isEditing: boolean = false) {} + public isEditing: boolean = false) + {} } diff --git a/src/components/room/widgets/furniture/stickie/FurnitureStickieUtils.ts b/src/components/room/widgets/furniture/stickie/FurnitureStickieUtils.ts index ed953c87..2894294d 100644 --- a/src/components/room/widgets/furniture/stickie/FurnitureStickieUtils.ts +++ b/src/components/room/widgets/furniture/stickie/FurnitureStickieUtils.ts @@ -1,4 +1,4 @@ -export const STICKIE_COLORS = ['9CCEFF','FF9CFF', '9CFF9C','FFFF33']; +export const STICKIE_COLORS = [ '9CCEFF','FF9CFF', '9CFF9C','FFFF33' ]; export const STICKIE_COLOR_NAMES = [ 'blue', 'pink', 'green', 'yellow' ]; export function getStickieColorName(color: string): string diff --git a/src/components/room/widgets/furniture/stickie/FurnitureStickieView.tsx b/src/components/room/widgets/furniture/stickie/FurnitureStickieView.tsx index 4d591075..50c0ff66 100644 --- a/src/components/room/widgets/furniture/stickie/FurnitureStickieView.tsx +++ b/src/components/room/widgets/furniture/stickie/FurnitureStickieView.tsx @@ -47,11 +47,11 @@ export const FurnitureStickieView: FC<{}> = props => const widgetEvent = (event as RoomWidgetUpdateRoomObjectEvent); setStickieData(prevState => - { - if(!prevState || (widgetEvent.id !== prevState.objectId) || (widgetEvent.category !== prevState.category)) return prevState; + { + if(!prevState || (widgetEvent.id !== prevState.objectId) || (widgetEvent.category !== prevState.category)) return prevState; - return null; - }); + return null; + }); return; } } @@ -69,41 +69,41 @@ export const FurnitureStickieView: FC<{}> = props => return; case 'trash': setStickieData(prevState => - { - if(!prevState) return null; + { + if(!prevState) return null; - GetRoomEngine().deleteRoomObject(prevState.objectId, prevState.category); + GetRoomEngine().deleteRoomObject(prevState.objectId, prevState.category); - return null; - }); + return null; + }); return; case 'changeColor': setStickieData(prevState => - { - const newStickieData = new FurnitureStickieData(prevState.objectId, prevState.category, value, prevState.text, prevState.canModify); + { + const newStickieData = new FurnitureStickieData(prevState.objectId, prevState.category, value, prevState.text, prevState.canModify); - GetRoomEngine().modifyRoomObjectData(newStickieData.objectId, newStickieData.category, newStickieData.color, newStickieData.text); + GetRoomEngine().modifyRoomObjectData(newStickieData.objectId, newStickieData.category, newStickieData.color, newStickieData.text); - return newStickieData; - }); + return newStickieData; + }); return; case 'changeText': setStickieData(prevState => - { - const newStickieData = new FurnitureStickieData(prevState.objectId, prevState.category, prevState.color, value, prevState.canModify); + { + const newStickieData = new FurnitureStickieData(prevState.objectId, prevState.category, prevState.color, value, prevState.canModify); - GetRoomEngine().modifyRoomObjectData(newStickieData.objectId, newStickieData.category, newStickieData.color, newStickieData.text); + GetRoomEngine().modifyRoomObjectData(newStickieData.objectId, newStickieData.category, newStickieData.color, newStickieData.text); - return newStickieData; - }); + return newStickieData; + }); return; case 'editMode': setStickieData(prevValue => - { - if(!prevValue.canModify) return prevValue; + { + if(!prevValue.canModify) return prevValue; - return new FurnitureStickieData(prevValue.objectId, prevValue.category, prevValue.color, prevValue.text, prevValue.canModify, true); - }); + return new FurnitureStickieData(prevValue.objectId, prevValue.category, prevValue.color, prevValue.text, prevValue.canModify, true); + }); return; } }, []); @@ -119,9 +119,9 @@ export const FurnitureStickieView: FC<{}> = props => <>
processAction('trash') }>
{ STICKIE_COLORS.map(color => - { - return
processAction('changeColor', color) } style={ { backgroundColor: ColorUtils.makeColorHex(color) } } /> - })} + { + return
processAction('changeColor', color) } style={ { backgroundColor: ColorUtils.makeColorHex(color) } } /> + })} }
processAction('close') }>
diff --git a/src/components/room/widgets/furniture/trophy/FurnitureTrophyData.ts b/src/components/room/widgets/furniture/trophy/FurnitureTrophyData.ts index c1411c24..66b50e61 100644 --- a/src/components/room/widgets/furniture/trophy/FurnitureTrophyData.ts +++ b/src/components/room/widgets/furniture/trophy/FurnitureTrophyData.ts @@ -7,5 +7,6 @@ export class FurnitureTrophyData public ownerName: string, public date: string, public message: string, - public customTitle?: string) {} + public customTitle?: string) + {} } diff --git a/src/components/room/widgets/furniture/trophy/FurnitureTrophyView.tsx b/src/components/room/widgets/furniture/trophy/FurnitureTrophyView.tsx index 0ad805d9..7d9749c1 100644 --- a/src/components/room/widgets/furniture/trophy/FurnitureTrophyView.tsx +++ b/src/components/room/widgets/furniture/trophy/FurnitureTrophyView.tsx @@ -43,11 +43,11 @@ export const FurnitureTrophyView: FC<{}> = props => const widgetEvent = (event as RoomWidgetUpdateRoomObjectEvent); setTrophyData(prevState => - { - if(!prevState || (widgetEvent.id !== prevState.objectId) || (widgetEvent.category !== prevState.category)) return prevState; + { + if(!prevState || (widgetEvent.id !== prevState.objectId) || (widgetEvent.category !== prevState.category)) return prevState; - return null; - }); + return null; + }); return; } } diff --git a/src/components/room/widgets/furniture/youtube-tv/FurnitureYoutubeDisplayView.tsx b/src/components/room/widgets/furniture/youtube-tv/FurnitureYoutubeDisplayView.tsx index 15e90b7c..aa57211a 100644 --- a/src/components/room/widgets/furniture/youtube-tv/FurnitureYoutubeDisplayView.tsx +++ b/src/components/room/widgets/furniture/youtube-tv/FurnitureYoutubeDisplayView.tsx @@ -9,15 +9,15 @@ import { YoutubeVideoPlaybackStateEnum } from './utils/YoutubeVideoPlaybackState export const FurnitureYoutubeDisplayView: FC<{}> = props => { - const [objectId, setObjectId] = useState(-1); - const [videoId, setVideoId] = useState(null); - const [videoStart, setVideoStart] = useState(null); - const [videoEnd, setVideoEnd] = useState(null); - const [currentVideoState, setCurrentVideoState] = useState(-1); - const [selectedItem, setSelectedItem] = useState(null); - const [playlists, setPlaylists] = useState(null); - const [hasControl, setHasControl] = useState(false); - const [player, setPlayer] = useState(null); + const [ objectId, setObjectId ] = useState(-1); + const [ videoId, setVideoId ] = useState(null); + const [ videoStart, setVideoStart ] = useState(null); + const [ videoEnd, setVideoEnd ] = useState(null); + const [ currentVideoState, setCurrentVideoState ] = useState(-1); + const [ selectedItem, setSelectedItem ] = useState(null); + const [ playlists, setPlaylists ] = useState(null); + const [ hasControl, setHasControl ] = useState(false); + const [ player, setPlayer ] = useState(null); const { eventDispatcher = null } = useRoomContext(); const onRoomWidgetUpdateYoutubeDisplayEvent = useCallback((event: RoomWidgetUpdateYoutubeDisplayEvent) => @@ -60,7 +60,7 @@ export const FurnitureYoutubeDisplayView: FC<{}> = props => setVideoEnd(parser.endAtSeconds); setCurrentVideoState(parser.state); }); - }, [objectId]); + }, [ objectId ]); const onPlaylists = useCallback((event: YoutubeDisplayPlaylistsEvent) => { @@ -79,7 +79,7 @@ export const FurnitureYoutubeDisplayView: FC<{}> = props => setVideoEnd(null); setVideoStart(null); }); - }, [objectId]); + }, [ objectId ]); const onControlVideo = useCallback((event: YoutubeControlVideoMessageEvent) => { @@ -102,7 +102,7 @@ export const FurnitureYoutubeDisplayView: FC<{}> = props => player.pauseVideo(); break; } - }, [objectId, player]); + }, [ objectId, player ]); UseMessageEventHook(YoutubeDisplayVideoMessageEvent, onVideo); UseMessageEventHook(YoutubeDisplayPlaylistsEvent, onPlaylists); @@ -140,7 +140,7 @@ export const FurnitureYoutubeDisplayView: FC<{}> = props => SendMessageComposer(new SetYoutubeDisplayPlaylistMessageComposer(objectId, action)); setSelectedItem(action); } - }, [hasControl, objectId, selectedItem, videoId]); + }, [ hasControl, objectId, selectedItem, videoId ]); const onReady = useCallback((event: any) => { @@ -158,7 +158,7 @@ export const FurnitureYoutubeDisplayView: FC<{}> = props => case 1: if(currentVideoState === 2) { - //event.target.pauseVideo(); + //event.target.pauseVideo(); } if(currentVideoState !== 1) { @@ -172,7 +172,7 @@ export const FurnitureYoutubeDisplayView: FC<{}> = props => } } } - }, [currentVideoState, objectId, processAction]); + }, [ currentVideoState, objectId, processAction ]); const getYoutubeOpts = useMemo( () => { @@ -204,7 +204,7 @@ export const FurnitureYoutubeDisplayView: FC<{}> = props => end: videoEnd } } - }, [videoEnd, videoStart]); + }, [ videoEnd, videoStart ]); if((objectId === -1)) return null; diff --git a/src/components/room/widgets/infostand/InfoStandWidgetFurniView.tsx b/src/components/room/widgets/infostand/InfoStandWidgetFurniView.tsx index fc7f6623..48d4f979 100644 --- a/src/components/room/widgets/infostand/InfoStandWidgetFurniView.tsx +++ b/src/components/room/widgets/infostand/InfoStandWidgetFurniView.tsx @@ -329,13 +329,13 @@ export const InfoStandWidgetFurniView: FC = props
{ furniKeys.map((key, index) => - { - return ( - - { key } - onFurniSettingChange(index, event.target.value) }/> - ); - }) } + { + return ( + + { key } + onFurniSettingChange(index, event.target.value) }/> + ); + }) } } } @@ -344,13 +344,13 @@ export const InfoStandWidgetFurniView: FC = props
{ customKeys.map((key, index) => - { - return ( - - { key } - onCustomVariableChange(index, event.target.value) }/> - ); - }) } + { + return ( + + { key } + onCustomVariableChange(index, event.target.value) }/> + ); + }) } } diff --git a/src/components/room/widgets/infostand/InfoStandWidgetUserView.tsx b/src/components/room/widgets/infostand/InfoStandWidgetUserView.tsx index 5a81ee53..476cac89 100644 --- a/src/components/room/widgets/infostand/InfoStandWidgetUserView.tsx +++ b/src/components/room/widgets/infostand/InfoStandWidgetUserView.tsx @@ -51,13 +51,13 @@ export const InfoStandWidgetUserView: FC = props = if(!userData || (userData.webID !== event.userId)) return; setUserData(prevValue => - { - const newValue = CloneObject(prevValue); + { + const newValue = CloneObject(prevValue); - newValue.badges = event.badges; + newValue.badges = event.badges; - return newValue; - }); + return newValue; + }); }, [ userData, setUserData ]); UseEventDispatcherHook(RoomSessionUserBadgesEvent.RSUBE_BADGES, eventDispatcher, onRoomSessionUserBadgesEvent); @@ -67,15 +67,15 @@ export const InfoStandWidgetUserView: FC = props = if(!userData || (userData.roomIndex !== event.roomIndex)) return; setUserData(prevValue => - { - const newValue = CloneObject(prevValue); + { + const newValue = CloneObject(prevValue); - newValue.figure = event.figure; - newValue.motto = event.customInfo; - newValue.achievementScore = event.activityPoints; + newValue.figure = event.figure; + newValue.motto = event.customInfo; + newValue.achievementScore = event.activityPoints; - return newValue; - }); + return newValue; + }); }, [ userData, setUserData ]); UseEventDispatcherHook(RoomSessionUserFigureUpdateEvent.USER_FIGURE, eventDispatcher, onRoomSessionUserFigureUpdateEvent); @@ -85,17 +85,17 @@ export const InfoStandWidgetUserView: FC = props = if(!userData || (userData.roomIndex !== event.roomIndex)) return; setUserData(prevValue => - { - const newValue = CloneObject(prevValue); + { + const newValue = CloneObject(prevValue); - const clearGroup = ((event.status === -1) || (event.habboGroupId <= 0)); + const clearGroup = ((event.status === -1) || (event.habboGroupId <= 0)); - newValue.groupId = clearGroup ? -1 : event.habboGroupId; - newValue.groupName = clearGroup ? null : event.habboGroupName - newValue.groupBadgeId = clearGroup ? null : GetSessionDataManager().getGroupBadge(event.habboGroupId); + newValue.groupId = clearGroup ? -1 : event.habboGroupId; + newValue.groupName = clearGroup ? null : event.habboGroupName + newValue.groupBadgeId = clearGroup ? null : GetSessionDataManager().getGroupBadge(event.habboGroupId); - return newValue; - }); + return newValue; + }); }, [ userData, setUserData ]); UseEventDispatcherHook(RoomSessionFavoriteGroupUpdateEvent.FAVOURITE_GROUP_UPDATE, eventDispatcher, onRoomSessionFavoriteGroupUpdateEvent); diff --git a/src/components/room/widgets/infostand/InfoStandWidgetView.tsx b/src/components/room/widgets/infostand/InfoStandWidgetView.tsx index b8122eb8..014638b3 100644 --- a/src/components/room/widgets/infostand/InfoStandWidgetView.tsx +++ b/src/components/room/widgets/infostand/InfoStandWidgetView.tsx @@ -40,30 +40,30 @@ export const InfoStandWidgetView: FC<{}> = props => const roomObjectEvent = (event as RoomWidgetUpdateRoomObjectEvent); setInfoStandEvent(prevValue => + { + switch(event.type) { - switch(event.type) - { - case RoomWidgetUpdateRoomObjectEvent.FURNI_REMOVED: - if(prevValue instanceof RoomWidgetUpdateInfostandFurniEvent) - { - if(prevValue.id === roomObjectEvent.id) return null; - } - break; - case RoomWidgetUpdateRoomObjectEvent.USER_REMOVED: - if(prevValue instanceof RoomWidgetUpdateInfostandUserEvent || prevValue instanceof RoomWidgetUpdateInfostandRentableBotEvent) - { - if(prevValue.roomIndex === roomObjectEvent.id) return null; - } + case RoomWidgetUpdateRoomObjectEvent.FURNI_REMOVED: + if(prevValue instanceof RoomWidgetUpdateInfostandFurniEvent) + { + if(prevValue.id === roomObjectEvent.id) return null; + } + break; + case RoomWidgetUpdateRoomObjectEvent.USER_REMOVED: + if(prevValue instanceof RoomWidgetUpdateInfostandUserEvent || prevValue instanceof RoomWidgetUpdateInfostandRentableBotEvent) + { + if(prevValue.roomIndex === roomObjectEvent.id) return null; + } - else if(prevValue instanceof RoomWidgetUpdateInfostandPetEvent) - { - if(prevValue.roomIndex === roomObjectEvent.id) return null; - } - break; - } + else if(prevValue instanceof RoomWidgetUpdateInfostandPetEvent) + { + if(prevValue.roomIndex === roomObjectEvent.id) return null; + } + break; + } - return prevValue; - }); + return prevValue; + }); return; } case RoomWidgetUpdateInfostandFurniEvent.FURNI: diff --git a/src/components/room/widgets/word-quiz/WordQuizWidgetView.tsx b/src/components/room/widgets/word-quiz/WordQuizWidgetView.tsx index b4220560..a9eab9e6 100644 --- a/src/components/room/widgets/word-quiz/WordQuizWidgetView.tsx +++ b/src/components/room/widgets/word-quiz/WordQuizWidgetView.tsx @@ -40,18 +40,18 @@ export const WordQuizWidgetView: FC<{}> = props => setUserAnswers(new Map()); setQuestionClearTimeout(prevValue => - { - if(prevValue) clearTimeout(prevValue); + { + if(prevValue) clearTimeout(prevValue); - if(event.duration > 0) - { - const delay = event.duration < 1000 ? DEFAULT_DISPLAY_DELAY : event.duration; + if(event.duration > 0) + { + const delay = event.duration < 1000 ? DEFAULT_DISPLAY_DELAY : event.duration; - return setTimeout(() => clearQuestion(), delay) as unknown as number; - } + return setTimeout(() => clearQuestion(), delay) as unknown as number; + } - return null; - }); + return null; + }); }); break; case RoomWidgetWordQuizUpdateEvent.QUESTION_ANSWERED: { @@ -64,18 +64,18 @@ export const WordQuizWidgetView: FC<{}> = props => setAnswerCounts(event.answerCounts); setUserAnswers(prevValue => + { + if(!prevValue.has(userData.roomIndex)) { - if(!prevValue.has(userData.roomIndex)) - { - const newValue = new Map(userAnswers); + const newValue = new Map(userAnswers); - newValue.set(userData.roomIndex, { value: event.value, secondsLeft: SIGN_FADE_DELAY }); + newValue.set(userData.roomIndex, { value: event.value, secondsLeft: SIGN_FADE_DELAY }); - return newValue; - } + return newValue; + } - return prevValue; - }); + return prevValue; + }); }); break; } @@ -112,7 +112,7 @@ export const WordQuizWidgetView: FC<{}> = props => const updateMessage = new RoomWidgetPollMessage(RoomWidgetPollMessage.ANSWER, pollId); updateMessage.questionId = question.id; - updateMessage.answers = [vote]; + updateMessage.answers = [ vote ]; widgetHandler.processWidgetMessage(updateMessage); @@ -167,7 +167,7 @@ export const WordQuizWidgetView: FC<{}> = props => { question && } { userAnswers && - Array.from(userAnswers.entries()).map(([key, value], index) => ) } + Array.from(userAnswers.entries()).map(([ key, value ], index) => ) } ); } diff --git a/src/components/user-profile/UserProfileView.tsx b/src/components/user-profile/UserProfileView.tsx index ba0e603c..2f10f124 100644 --- a/src/components/user-profile/UserProfileView.tsx +++ b/src/components/user-profile/UserProfileView.tsx @@ -62,11 +62,11 @@ export const UserProfileView: FC<{}> = props => BatchUpdates(() => { setUserProfile(prevValue => - { - if(prevValue && prevValue.id) isSameProfile = (prevValue.id === parser.id); + { + if(prevValue && prevValue.id) isSameProfile = (prevValue.id === parser.id); - return parser; - }); + return parser; + }); if(!isSameProfile) { diff --git a/src/components/user-profile/views/BadgesContainerView.tsx b/src/components/user-profile/views/BadgesContainerView.tsx index 06180be6..ca59fc21 100644 --- a/src/components/user-profile/views/BadgesContainerView.tsx +++ b/src/components/user-profile/views/BadgesContainerView.tsx @@ -12,7 +12,7 @@ export const BadgesContainerView: FC = props => return ( <> - { badges && (badges.length > 0) && badges.map((badge, index) => + { badges && (badges.length > 0) && badges.map((badge, index) => { return ( diff --git a/src/components/user-profile/views/GroupsContainerView.tsx b/src/components/user-profile/views/GroupsContainerView.tsx index 56643e46..7aa49a63 100644 --- a/src/components/user-profile/views/GroupsContainerView.tsx +++ b/src/components/user-profile/views/GroupsContainerView.tsx @@ -45,14 +45,14 @@ export const GroupsContainerView: FC = props => if(groups.length > 0) { setSelectedGroupId(prevValue => + { + if(prevValue === groups[0].groupId) { - if(prevValue === groups[0].groupId) - { - SendMessageComposer(new GroupInformationComposer(groups[0].groupId, false)); - } + SendMessageComposer(new GroupInformationComposer(groups[0].groupId, false)); + } - return groups[0].groupId; - }); + return groups[0].groupId; + }); } }); }, [ groups ]); @@ -75,15 +75,15 @@ export const GroupsContainerView: FC = props => { groups.map((group, index) => - { - return ( - setSelectedGroupId(group.groupId) } className="p-1"> - { itsMe && + { + return ( + setSelectedGroupId(group.groupId) } className="p-1"> + { itsMe && ToggleFavoriteGroup(group) } /> } - - - ) - }) } + + + ) + }) } diff --git a/src/components/wired/WiredView.tsx b/src/components/wired/WiredView.tsx index 0bf69117..63d42d95 100644 --- a/src/components/wired/WiredView.tsx +++ b/src/components/wired/WiredView.tsx @@ -38,9 +38,9 @@ export const WiredView: FC<{}> = props => if(!IsOwnerOfFloorFurniture(trigger.id)) { NotificationUtilities.confirm(LocalizeText('wiredfurni.nonowner.change.confirm.body'), () => - { - save(trigger) - }, null, null, null, LocalizeText('wiredfurni.nonowner.change.confirm.title')); + { + save(trigger) + }, null, null, null, LocalizeText('wiredfurni.nonowner.change.confirm.title')); } else { diff --git a/src/components/wired/views/WiredBaseView.tsx b/src/components/wired/views/WiredBaseView.tsx index c8f3ca79..452d6593 100644 --- a/src/components/wired/views/WiredBaseView.tsx +++ b/src/components/wired/views/WiredBaseView.tsx @@ -71,18 +71,18 @@ export const WiredBaseView: FC = props => if(requiresFurni > WiredFurniType.STUFF_SELECTION_OPTION_NONE) { setFurniIds(prevValue => + { + if(prevValue && prevValue.length) WiredSelectionVisualizer.clearSelectionShaderFromFurni(prevValue); + + if(trigger.selectedItems && trigger.selectedItems.length) { - if(prevValue && prevValue.length) WiredSelectionVisualizer.clearSelectionShaderFromFurni(prevValue); + WiredSelectionVisualizer.applySelectionShaderToFurni(trigger.selectedItems); - if(trigger.selectedItems && trigger.selectedItems.length) - { - WiredSelectionVisualizer.applySelectionShaderToFurni(trigger.selectedItems); + return trigger.selectedItems; + } - return trigger.selectedItems; - } - - return []; - }); + return []; + }); } }); @@ -94,11 +94,11 @@ export const WiredBaseView: FC = props => setIntParams([]); setStringParam(null); setFurniIds(prevValue => - { - if(prevValue && prevValue.length) WiredSelectionVisualizer.clearSelectionShaderFromFurni(prevValue); + { + if(prevValue && prevValue.length) WiredSelectionVisualizer.clearSelectionShaderFromFurni(prevValue); - return []; - }); + return []; + }); }); } }, [ trigger, hasSpecialInput, requiresFurni, setIntParams, setStringParam, setFurniIds ]); diff --git a/src/components/wired/views/WiredFurniSelectorView.tsx b/src/components/wired/views/WiredFurniSelectorView.tsx index 8847ab30..38bf5b16 100644 --- a/src/components/wired/views/WiredFurniSelectorView.tsx +++ b/src/components/wired/views/WiredFurniSelectorView.tsx @@ -16,34 +16,34 @@ export const WiredFurniSelectorView: FC<{}> = props => if(furniId <= 0) return; setFurniIds(prevValue => + { + const newFurniIds = [ ...prevValue ]; + + const index = prevValue.indexOf(furniId); + + if(index >= 0) { - const newFurniIds = [ ...prevValue ]; + newFurniIds.splice(index, 1); - const index = prevValue.indexOf(furniId); + WiredSelectionVisualizer.hide(furniId); + } - if(index >= 0) - { - newFurniIds.splice(index, 1); + else if(newFurniIds.length < trigger.maximumItemSelectionCount) + { + newFurniIds.push(furniId); - WiredSelectionVisualizer.hide(furniId); - } + WiredSelectionVisualizer.show(furniId); + } - else if(newFurniIds.length < trigger.maximumItemSelectionCount) - { - newFurniIds.push(furniId); - - WiredSelectionVisualizer.show(furniId); - } - - return newFurniIds; - }); + return newFurniIds; + }); }, [ trigger, setFurniIds ]); UseUiEvent(WiredSelectObjectEvent.SELECT_OBJECT, onWiredSelectObjectEvent); return ( - { LocalizeText('wiredfurni.pickfurnis.caption', ['count', 'limit'], [ furniIds.length.toString(), trigger.maximumItemSelectionCount.toString() ]) } + { LocalizeText('wiredfurni.pickfurnis.caption', [ 'count', 'limit' ], [ furniIds.length.toString(), trigger.maximumItemSelectionCount.toString() ]) } { LocalizeText('wiredfurni.pickfurnis.desc') } ); diff --git a/src/components/wired/views/actions/WiredActionGiveRewardView.tsx b/src/components/wired/views/actions/WiredActionGiveRewardView.tsx index 347abe9f..89610a20 100644 --- a/src/components/wired/views/actions/WiredActionGiveRewardView.tsx +++ b/src/components/wired/views/actions/WiredActionGiveRewardView.tsx @@ -22,19 +22,19 @@ export const WiredActionGiveRewardView: FC<{}> = props => const addReward = useCallback(() => { - setRewards(rewards => [...rewards, { isBadge: false, itemCode: '', probability: null }]); + setRewards(rewards => [ ...rewards, { isBadge: false, itemCode: '', probability: null } ]); }, [ setRewards ]); const removeReward = useCallback((index: number) => { setRewards(prevValue => - { - const newValues = Array.from(prevValue); + { + const newValues = Array.from(prevValue); - newValues.splice(index, 1); + newValues.splice(index, 1); - return newValues; - }); + return newValues; + }); }, [ setRewards ]); const updateReward = useCallback((index: number, isBadge: boolean, itemCode: string, probability: number) => @@ -59,7 +59,7 @@ export const WiredActionGiveRewardView: FC<{}> = props => { if(!reward.itemCode) continue; - const rewardsString = [reward.isBadge ? '0' : '1', reward.itemCode, reward.probability.toString()]; + const rewardsString = [ reward.isBadge ? '0' : '1', reward.itemCode, reward.probability.toString() ]; stringRewards.push(rewardsString.join(',')); } @@ -68,7 +68,7 @@ export const WiredActionGiveRewardView: FC<{}> = props => BatchUpdates(() => { setStringParam(stringRewards.join(';')); - setIntParams([rewardTime, uniqueRewards ? 1 : 0, rewardsLimit, limitationInterval]); + setIntParams([ rewardTime, uniqueRewards ? 1 : 0, rewardsLimit, limitationInterval ]); }); } }, [ rewardTime, uniqueRewards, rewardsLimit, limitationInterval, rewards, setIntParams, setStringParam ]); @@ -108,7 +108,7 @@ export const WiredActionGiveRewardView: FC<{}> = props => setLimitEnabled(event.target.checked)} /> - { LocalizeText('wiredfurni.params.prizelimit', ['amount'], [limitEnabled ? rewardsLimit.toString() : '']) } + { LocalizeText('wiredfurni.params.prizelimit', [ 'amount' ], [ limitEnabled ? rewardsLimit.toString() : '' ]) } { !limitEnabled && @@ -151,22 +151,22 @@ export const WiredActionGiveRewardView: FC<{}> = props => { rewards && rewards.map((reward, index) => - { - return ( - - - updateReward(index, e.target.checked, reward.itemCode, reward.probability)} /> - Badge? - - updateReward(index, reward.isBadge, e.target.value, reward.probability) } placeholder="Item Code" /> - updateReward(index, reward.isBadge, reward.itemCode, Number(e.target.value)) } placeholder="Probability" /> - { (index > 0) && + { + return ( + + + updateReward(index, e.target.checked, reward.itemCode, reward.probability)} /> + Badge? + + updateReward(index, reward.isBadge, e.target.value, reward.probability) } placeholder="Item Code" /> + updateReward(index, reward.isBadge, reward.itemCode, Number(e.target.value)) } placeholder="Probability" /> + { (index > 0) && } - - ) - }) } + + ) + }) } ); diff --git a/src/components/wired/views/actions/WiredActionGiveScoreToPredefinedTeamView.tsx b/src/components/wired/views/actions/WiredActionGiveScoreToPredefinedTeamView.tsx index 1213d357..de67a237 100644 --- a/src/components/wired/views/actions/WiredActionGiveScoreToPredefinedTeamView.tsx +++ b/src/components/wired/views/actions/WiredActionGiveScoreToPredefinedTeamView.tsx @@ -56,15 +56,15 @@ export const WiredActionGiveScoreToPredefinedTeamView: FC<{}> = props => { LocalizeText('wiredfurni.params.team') } - { [1, 2, 3, 4].map(value => - { - return ( - - setSelectedTeam(value) } /> - { LocalizeText('wiredfurni.params.team.' + value) } - - ); - }) } + { [ 1, 2, 3, 4 ].map(value => + { + return ( + + setSelectedTeam(value) } /> + { LocalizeText('wiredfurni.params.team.' + value) } + + ); + }) } ); diff --git a/src/components/wired/views/actions/WiredActionJoinTeamView.tsx b/src/components/wired/views/actions/WiredActionJoinTeamView.tsx index 197fc162..9684ec23 100644 --- a/src/components/wired/views/actions/WiredActionJoinTeamView.tsx +++ b/src/components/wired/views/actions/WiredActionJoinTeamView.tsx @@ -20,15 +20,15 @@ export const WiredActionJoinTeamView: FC<{}> = props => { LocalizeText('wiredfurni.params.team') } - { [1, 2, 3, 4].map(team => - { - return ( - - setSelectedTeam(team) } /> - { LocalizeText(`wiredfurni.params.team.${ team }`) } - - ) - }) } + { [ 1, 2, 3, 4 ].map(team => + { + return ( + + setSelectedTeam(team) } /> + { LocalizeText(`wiredfurni.params.team.${ team }`) } + + ) + }) } ); diff --git a/src/components/wired/views/actions/WiredActionMoveAndRotateFurniView.tsx b/src/components/wired/views/actions/WiredActionMoveAndRotateFurniView.tsx index 8f33d2a3..1446aaae 100644 --- a/src/components/wired/views/actions/WiredActionMoveAndRotateFurniView.tsx +++ b/src/components/wired/views/actions/WiredActionMoveAndRotateFurniView.tsx @@ -24,7 +24,7 @@ const directionOptions: { value: number, icon: string }[] = [ } ]; -const rotationOptions: number[] = [0, 1, 2, 3, 4, 5, 6]; +const rotationOptions: number[] = [ 0, 1, 2, 3, 4, 5, 6 ]; export const WiredActionMoveAndRotateFurniView: FC<{}> = props => { @@ -57,29 +57,29 @@ export const WiredActionMoveAndRotateFurniView: FC<{}> = props => { LocalizeText('wiredfurni.params.startdir') } { directionOptions.map(option => - { - return ( - - setMovement(option.value) } /> - - - - - ) - }) } + { + return ( + + setMovement(option.value) } /> + + + + + ) + }) } { LocalizeText('wiredfurni.params.turn') } { rotationOptions.map(option => - { - return ( - - setRotation(option) } /> - { LocalizeText(`wiredfurni.params.turn.${ option }`) } - - ) - }) } + { + return ( + + setRotation(option) } /> + { LocalizeText(`wiredfurni.params.turn.${ option }`) } + + ) + }) } ); diff --git a/src/components/wired/views/actions/WiredActionMoveFurniToView.tsx b/src/components/wired/views/actions/WiredActionMoveFurniToView.tsx index 7dfc5dc4..89a4d253 100644 --- a/src/components/wired/views/actions/WiredActionMoveFurniToView.tsx +++ b/src/components/wired/views/actions/WiredActionMoveFurniToView.tsx @@ -65,14 +65,14 @@ export const WiredActionMoveFurniToView: FC<{}> = props => { LocalizeText('wiredfurni.params.startdir') } { directionOptions.map(value => - { - return ( - - setMovement(value.value) } /> - - - ) - }) } + { + return ( + + setMovement(value.value) } /> + + + ) + }) } diff --git a/src/components/wired/views/actions/WiredActionMoveFurniView.tsx b/src/components/wired/views/actions/WiredActionMoveFurniView.tsx index 7d221fb4..32866ba8 100644 --- a/src/components/wired/views/actions/WiredActionMoveFurniView.tsx +++ b/src/components/wired/views/actions/WiredActionMoveFurniView.tsx @@ -36,7 +36,7 @@ const directionOptions: { value: number, icon: string }[] = [ } ]; -const rotationOptions: number[] = [0, 1, 2, 3]; +const rotationOptions: number[] = [ 0, 1, 2, 3 ]; export const WiredActionMoveFurniView: FC<{}> = props => { @@ -73,31 +73,31 @@ export const WiredActionMoveFurniView: FC<{}> = props => { directionOptions.map(option => - { - return ( - - setMovement(option.value) } /> - - - ) - }) } + { + return ( + + setMovement(option.value) } /> + + + ) + }) }
{ LocalizeText('wiredfurni.params.rotatefurni') } { rotationOptions.map(option => - { - return ( - - setRotation(option) } /> - - { [1, 2].includes(option) && } - { LocalizeText(`wiredfurni.params.rotatefurni.${ option }`) } - - - ) - }) } + { + return ( + + setRotation(option) } /> + + { [ 1, 2 ].includes(option) && } + { LocalizeText(`wiredfurni.params.rotatefurni.${ option }`) } + + + ) + }) } ); diff --git a/src/components/wired/views/actions/WiredActionMuteUserView.tsx b/src/components/wired/views/actions/WiredActionMuteUserView.tsx index 9ac241a8..325d3c0f 100644 --- a/src/components/wired/views/actions/WiredActionMuteUserView.tsx +++ b/src/components/wired/views/actions/WiredActionMuteUserView.tsx @@ -33,7 +33,7 @@ export const WiredActionMuteUserView: FC<{}> = props => return ( - { LocalizeText('wiredfurni.params.length.minutes', ['minutes'], [ time.toString() ]) } + { LocalizeText('wiredfurni.params.length.minutes', [ 'minutes' ], [ time.toString() ]) } = props => { LocalizeText('wiredfurni.params.handitem') } diff --git a/src/components/wired/views/conditions/WiredConditionActorIsTeamMemberView.tsx b/src/components/wired/views/conditions/WiredConditionActorIsTeamMemberView.tsx index 300858c3..31bad9d9 100644 --- a/src/components/wired/views/conditions/WiredConditionActorIsTeamMemberView.tsx +++ b/src/components/wired/views/conditions/WiredConditionActorIsTeamMemberView.tsx @@ -23,14 +23,14 @@ export const WiredConditionActorIsTeamMemberView: FC<{}> = props => { LocalizeText('wiredfurni.params.team') } { teamIds.map(value => - { - return ( - - setSelectedTeam(value) } /> - { LocalizeText(`wiredfurni.params.team.${ value }`) } - - ) - }) } + { + return ( + + setSelectedTeam(value) } /> + { LocalizeText(`wiredfurni.params.team.${ value }`) } + + ) + }) } ); diff --git a/src/components/wired/views/conditions/WiredConditionDateRangeView.tsx b/src/components/wired/views/conditions/WiredConditionDateRangeView.tsx index a3b177cd..7c95e748 100644 --- a/src/components/wired/views/conditions/WiredConditionDateRangeView.tsx +++ b/src/components/wired/views/conditions/WiredConditionDateRangeView.tsx @@ -25,7 +25,7 @@ export const WiredConditionDateRangeView: FC<{}> = props => endDateMili = endDateInstance.getTime() / 1000; } - setIntParams([startDateMili, endDateMili]); + setIntParams([ startDateMili, endDateMili ]); } useEffect(() => diff --git a/src/components/wired/views/conditions/WiredConditionFurniHasFurniOnView.tsx b/src/components/wired/views/conditions/WiredConditionFurniHasFurniOnView.tsx index 3bc1e424..33a450a8 100644 --- a/src/components/wired/views/conditions/WiredConditionFurniHasFurniOnView.tsx +++ b/src/components/wired/views/conditions/WiredConditionFurniHasFurniOnView.tsx @@ -20,15 +20,15 @@ export const WiredConditionFurniHasFurniOnView: FC<{}> = props => { LocalizeText('wiredfurni.params.requireall') } - { [0, 1].map(value => - { - return ( - - setRequireAll(value) } /> - { LocalizeText('wiredfurni.params.requireall.' + value) } - - ) - }) } + { [ 0, 1 ].map(value => + { + return ( + + setRequireAll(value) } /> + { LocalizeText('wiredfurni.params.requireall.' + value) } + + ) + }) } ); diff --git a/src/components/wired/views/conditions/WiredConditionFurniHasNotFurniOnView.tsx b/src/components/wired/views/conditions/WiredConditionFurniHasNotFurniOnView.tsx index 6e4af909..9852542f 100644 --- a/src/components/wired/views/conditions/WiredConditionFurniHasNotFurniOnView.tsx +++ b/src/components/wired/views/conditions/WiredConditionFurniHasNotFurniOnView.tsx @@ -20,15 +20,15 @@ export const WiredConditionFurniHasNotFurniOnView: FC<{}> = props => { LocalizeText('wiredfurni.params.not_requireall') } - { [0, 1].map(value => - { - return ( - - setRequireAll(value) } /> - { LocalizeText(`wiredfurni.params.not_requireall.${ value }`) } - - ) - }) } + { [ 0, 1 ].map(value => + { + return ( + + setRequireAll(value) } /> + { LocalizeText(`wiredfurni.params.not_requireall.${ value }`) } + + ) + }) } ); diff --git a/src/workers/IntervalWebWorker.ts b/src/workers/IntervalWebWorker.ts index 4d5ddbc0..b2c145fe 100644 --- a/src/workers/IntervalWebWorker.ts +++ b/src/workers/IntervalWebWorker.ts @@ -1,4 +1,3 @@ -// eslint-disable-next-line import/no-anonymous-default-export export default () => { const intervals: { diff --git a/src/workers/WorkerBuilder.ts b/src/workers/WorkerBuilder.ts index be3454ab..dc2ce67e 100644 --- a/src/workers/WorkerBuilder.ts +++ b/src/workers/WorkerBuilder.ts @@ -3,7 +3,7 @@ export class WorkerBuilder extends Worker constructor(worker) { const code = worker.toString(); - const blob = new Blob([`(${code})()`]); + const blob = new Blob([ `(${code})()` ]); super(URL.createObjectURL(blob)); } diff --git a/yarn.lock b/yarn.lock index ff392b0f..87adaaae 100644 --- a/yarn.lock +++ b/yarn.lock @@ -58,17 +58,17 @@ source-map "^0.5.0" "@babel/core@^7.1.0", "@babel/core@^7.12.3", "@babel/core@^7.16.0", "@babel/core@^7.7.5", "@babel/core@^7.8.4": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.7.tgz#f7c28228c83cdf2dbd1b9baa06eaf9df07f0c2f9" - integrity sha512-djHlEfFHnSnTAcPb7dATbiM5HxGOP98+3JLBZtjRb5I7RXrw7kFRoG2dXM8cm3H+o11A8IFH/uprmJpwFynRNQ== + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.8.tgz#3dac27c190ebc3a4381110d46c80e77efe172e1a" + integrity sha512-OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ== dependencies: "@ampproject/remapping" "^2.1.0" "@babel/code-frame" "^7.16.7" "@babel/generator" "^7.17.7" "@babel/helper-compilation-targets" "^7.17.7" "@babel/helper-module-transforms" "^7.17.7" - "@babel/helpers" "^7.17.7" - "@babel/parser" "^7.17.7" + "@babel/helpers" "^7.17.8" + "@babel/parser" "^7.17.8" "@babel/template" "^7.16.7" "@babel/traverse" "^7.17.3" "@babel/types" "^7.17.0" @@ -112,7 +112,7 @@ browserslist "^4.17.5" semver "^6.3.0" -"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.1", "@babel/helper-create-class-features-plugin@^7.17.6": +"@babel/helper-create-class-features-plugin@^7.16.10", "@babel/helper-create-class-features-plugin@^7.16.7", "@babel/helper-create-class-features-plugin@^7.17.6": version "7.17.6" resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz#3778c1ed09a7f3e65e6d6e0f6fbfcc53809d92c9" integrity sha512-SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg== @@ -285,10 +285,10 @@ "@babel/traverse" "^7.16.8" "@babel/types" "^7.16.8" -"@babel/helpers@^7.12.1", "@babel/helpers@^7.17.7": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.7.tgz#6fc0a24280fd00026e85424bbfed4650e76d7127" - integrity sha512-TKsj9NkjJfTBxM7Phfy7kv6yYc4ZcOo+AaWGqQOKTPDOmcGkIFb5xNA746eKisQkm4yavUYh4InYM9S+VnO01w== +"@babel/helpers@^7.12.1", "@babel/helpers@^7.17.8": + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.8.tgz#288450be8c6ac7e4e44df37bcc53d345e07bc106" + integrity sha512-QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw== dependencies: "@babel/template" "^7.16.7" "@babel/traverse" "^7.17.3" @@ -303,10 +303,10 @@ chalk "^2.0.0" js-tokens "^4.0.0" -"@babel/parser@^7.1.0", "@babel/parser@^7.12.3", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.3", "@babel/parser@^7.17.7", "@babel/parser@^7.7.0": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.7.tgz#fc19b645a5456c8d6fdb6cecd3c66c0173902800" - integrity sha512-bm3AQf45vR4gKggRfvJdYJ0gFLoCbsPxiFLSH6hTVYABptNHY6l9NrhnucVjQ/X+SPtLANT9lc0fFhikj+VBRA== +"@babel/parser@^7.1.0", "@babel/parser@^7.12.3", "@babel/parser@^7.14.7", "@babel/parser@^7.16.7", "@babel/parser@^7.17.3", "@babel/parser@^7.17.8", "@babel/parser@^7.7.0": + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.8.tgz#2817fb9d885dd8132ea0f8eb615a6388cca1c240" + integrity sha512-BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ== "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7": version "7.16.7" @@ -351,11 +351,11 @@ "@babel/plugin-syntax-class-static-block" "^7.14.5" "@babel/plugin-proposal-decorators@^7.16.4": - version "7.17.2" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.2.tgz#c36372ddfe0360cac1ee331a238310bddca11493" - integrity sha512-WH8Z95CwTq/W8rFbMqb9p3hicpt4RX4f0K659ax2VHxgOyT6qQmUaEVEjIh4WR9Eh9NymkVn5vwsrE68fAQNUw== + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.8.tgz#4f0444e896bee85d35cf714a006fc5418f87ff00" + integrity sha512-U69odN4Umyyx1xO1rTII0IDkAEC+RNlcKXtqOblfpzqy1C+aOplb76BQNq0+XdpVkOaPlpEDwd++joY8FNFJKA== dependencies: - "@babel/helper-create-class-features-plugin" "^7.17.1" + "@babel/helper-create-class-features-plugin" "^7.17.6" "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-replace-supers" "^7.16.7" "@babel/plugin-syntax-decorators" "^7.17.0" @@ -742,12 +742,12 @@ babel-plugin-dynamic-import-node "^2.3.3" "@babel/plugin-transform-modules-systemjs@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz#887cefaef88e684d29558c2b13ee0563e287c2d7" - integrity sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw== + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.8.tgz#81fd834024fae14ea78fbe34168b042f38703859" + integrity sha512-39reIkMTUVagzgA5x88zDYXPCMT6lcaRKs1+S9K6NKBPErbgO/w/kP8GlNQTC87b412ZTlmNgr3k2JrWgHH+Bw== dependencies: "@babel/helper-hoist-variables" "^7.16.7" - "@babel/helper-module-transforms" "^7.16.7" + "@babel/helper-module-transforms" "^7.17.7" "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-validator-identifier" "^7.16.7" babel-plugin-dynamic-import-node "^2.3.3" @@ -1035,17 +1035,17 @@ "@babel/plugin-transform-typescript" "^7.16.7" "@babel/runtime-corejs3@^7.10.2": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.17.7.tgz#cf914f474c490ef1aa8661d47adaa0a993636e7e" - integrity sha512-TvliGJjhxis5m7xIMvlXH/xG8Oa/LK0SCUCyfKD6nLi42n5fB4WibDJ0g9trmmBB6hwpMNx+Lzbxy9/4gpMaVw== + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.17.8.tgz#d7dd49fb812f29c61c59126da3792d8740d4e284" + integrity sha512-ZbYSUvoSF6dXZmMl/CYTMOvzIFnbGfv4W3SEHYgMvNsFTeLaF2gkGAF4K2ddmtSK4Emej+0aYcnSC6N5dPCXUQ== dependencies: core-js-pure "^3.20.2" regenerator-runtime "^0.13.4" "@babel/runtime@^7.10.2", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.16", "@babel/runtime@^7.16.3", "@babel/runtime@^7.17.2", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.6.3", "@babel/runtime@^7.7.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7": - version "7.17.7" - resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.7.tgz#a5f3328dc41ff39d803f311cfe17703418cf9825" - integrity sha512-L6rvG9GDxaLgFjg41K+5Yv9OMrU98sWe+Ykmc6FDJW/+vYZMhdOMKkISgzptMaERHvS2Y2lw9MDRm2gHhlQQoA== + version "7.17.8" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz#3e56e4aff81befa55ac3ac6a0967349fd1c5bca2" + integrity sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA== dependencies: regenerator-runtime "^0.13.4" @@ -1144,29 +1144,44 @@ minimatch "^3.0.4" strip-json-comments "^3.1.1" -"@fortawesome/fontawesome-common-types@6.1.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.0.tgz#5a9468da0e5c2a3ccc161882ef5ffafbd3d4882f" - integrity sha512-lFIJ5opxOKG9q88xOsuJJAdRZ+2WRldsZwUR/7MJoOMUMhF/LkHUjwWACIEPTa5Wo6uTDHvGRIX+XutdN7zYxA== +"@eslint/eslintrc@^1.2.1": + version "1.2.1" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-1.2.1.tgz#8b5e1c49f4077235516bc9ec7d41378c0f69b8c6" + integrity sha512-bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ== + dependencies: + ajv "^6.12.4" + debug "^4.3.2" + espree "^9.3.1" + globals "^13.9.0" + ignore "^5.2.0" + import-fresh "^3.2.1" + js-yaml "^4.1.0" + minimatch "^3.0.4" + strip-json-comments "^3.1.1" + +"@fortawesome/fontawesome-common-types@6.1.1": + version "6.1.1" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.1.1.tgz#7dc996042d21fc1ae850e3173b5c67b0549f9105" + integrity sha512-wVn5WJPirFTnzN6tR95abCx+ocH+3IFLXAgyavnf9hUmN0CfWoDjPT/BAWsUVwSlYYVBeCLJxaqi7ZGe4uSjBA== "@fortawesome/fontawesome-svg-core@^6.1.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.1.0.tgz#b78a43df315a6b1568d803ee48a9f1edea0714aa" - integrity sha512-racj+/EDnMZN0jcuHePOa+9kdHHOCpCAbBvVRnEi4G4DA5SWQiT/uXJ8WcfVEbLN51vPJjhukP4o+zH0cfYplg== + version "6.1.1" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.1.1.tgz#3424ec6182515951816be9b11665d67efdce5b5f" + integrity sha512-NCg0w2YIp81f4V6cMGD9iomfsIj7GWrqmsa0ZsPh59G7PKiGN1KymZNxmF00ssuAlo/VZmpK6xazsGOwzKYUMg== dependencies: - "@fortawesome/fontawesome-common-types" "6.1.0" + "@fortawesome/fontawesome-common-types" "6.1.1" "@fortawesome/free-solid-svg-icons@^6.1.0": - version "6.1.0" - resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.1.0.tgz#1bdc3ce6ddd2336348ba324ac4a72161725b0d95" - integrity sha512-OOr0jRHl5d41RzBS3sZh5Z3HmdPjMr43PxxKlYeLtQxFSixPf4sJFVM12/rTepB2m0rVShI0vtjHQmzOTlBaXg== + version "6.1.1" + resolved "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-6.1.1.tgz#3369e673f8fe8be2fba30b1ec274d47490a830a6" + integrity sha512-0/5exxavOhI/D4Ovm2r3vxNojGZioPwmFrKg0ZUH69Q68uFhFPs6+dhAToh6VEQBntxPRYPuT5Cg1tpNa9JUPg== dependencies: - "@fortawesome/fontawesome-common-types" "6.1.0" + "@fortawesome/fontawesome-common-types" "6.1.1" "@fortawesome/react-fontawesome@^0.1.17": - version "0.1.17" - resolved "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.17.tgz#06fc06cb1a721e38e5b50b4a1cb851e9b9c77d7a" - integrity sha512-dX43Z5IvMaW7fwzU8farosYjKNGfRb2HB/DgjVBHeJZ/NSnuuaujPPx0YOdcAq+n3mqn70tyCde2HM1mqbhiuw== + version "0.1.18" + resolved "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.18.tgz#dae37f718a24e14d7a99a5496c873d69af3fbd73" + integrity sha512-RwLIB4TZw0M9gvy5u+TusAA0afbwM4JQIimNH/j3ygd6aIvYPQLqXMhC9ErY26J23rDPyDZldIfPq/HpTTJ/tQ== dependencies: prop-types "^15.8.1" @@ -1216,7 +1231,16 @@ debug "^4.1.1" minimatch "^3.0.4" -"@humanwhocodes/object-schema@^1.2.0": +"@humanwhocodes/config-array@^0.9.2": + version "0.9.5" + resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz#2cbaf9a89460da24b5ca6531b8bbfc23e1df50c7" + integrity sha512-ObyMyWxZiCu/yTisA7uzx81s40xR2fD5Cg/2Kq7G02ajkNubJf6BopgDTmDyc3U7sXpNKM8cYOw7s7Tyr+DnCw== + dependencies: + "@humanwhocodes/object-schema" "^1.2.1" + debug "^4.1.1" + minimatch "^3.0.4" + +"@humanwhocodes/object-schema@^1.2.0", "@humanwhocodes/object-schema@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.1.tgz#b520529ec21d8e5945a1851dfd1c32e94e39ff45" integrity sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA== @@ -1702,9 +1726,9 @@ "@babel/runtime" "^7.6.2" "@restart/hooks@^0.4.0", "@restart/hooks@^0.4.5": - version "0.4.5" - resolved "https://registry.yarnpkg.com/@restart/hooks/-/hooks-0.4.5.tgz#e7acbea237bfc9e479970500cf87538b41a1ed02" - integrity sha512-tLGtY0aHeIfT7aPwUkvQuhIy3+q3w4iqmUzFLPlOAf/vNUacLaBt1j/S//jv/dQhenRh8jvswyMojCwmLvJw8A== + version "0.4.6" + resolved "https://registry.yarnpkg.com/@restart/hooks/-/hooks-0.4.6.tgz#15dcf34631a618c513efc924705c7cbe349a4a0c" + integrity sha512-FzpEzy6QeLB3OpUrC9OQD/lWCluQmilLfRGa/DqbB6OmV05AEt/0Lgn3Jf6l27UIJMK0qFmNcps6p8DNLXa6Pw== dependencies: dequal "^2.0.2" @@ -1902,9 +1926,9 @@ integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA== "@types/babel__core@^7.0.0", "@types/babel__core@^7.1.7": - version "7.1.18" - resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.18.tgz#1a29abcc411a9c05e2094c98f9a1b7da6cdf49f8" - integrity sha512-S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ== + version "7.1.19" + resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.19.tgz#7b497495b7d1b4812bdb9d02804d0576f43ee460" + integrity sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw== dependencies: "@babel/parser" "^7.1.0" "@babel/types" "^7.0.0" @@ -2001,10 +2025,10 @@ dependencies: "@types/istanbul-lib-report" "*" -"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8": - version "7.0.9" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.9.tgz#97edc9037ea0c38585320b28964dde3b39e4660d" - integrity sha512-qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ== +"@types/json-schema@*", "@types/json-schema@^7.0.3", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9": + version "7.0.11" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" + integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== "@types/json5@^0.0.29": version "0.0.29" @@ -2022,9 +2046,9 @@ integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ== "@types/node@*": - version "17.0.21" - resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.21.tgz#864b987c0c68d07b4345845c3e63b75edd143644" - integrity sha512-DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ== + version "17.0.23" + resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.23.tgz#3b41a6e643589ac6442bdbd7a4a3ded62f33f7da" + integrity sha512-UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw== "@types/node@^12.20.19": version "12.20.47" @@ -2062,9 +2086,9 @@ integrity sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ== "@types/react-dom@^17.0.9": - version "17.0.13" - resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.13.tgz#a3323b974ee4280070982b3112351bb1952a7809" - integrity sha512-wEP+B8hzvy6ORDv1QBhcQia4j6ea4SFIBttHYpXKPFZRviBvknq0FRh3VrIxeXUmsPkwuXVZrVGG7KUVONmXCQ== + version "17.0.14" + resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-17.0.14.tgz#c8f917156b652ddf807711f5becbd2ab018dea9f" + integrity sha512-H03xwEP1oXmSfl3iobtmQ/2dHF5aBHr8aUMwyGZya6OW45G+xtdzmq6HkncefiBt5JU8DVyaWl/nWZbjZCnzAQ== dependencies: "@types/react" "*" @@ -2091,9 +2115,9 @@ "@types/react" "*" "@types/react@*", "@types/react@>=16.14.8", "@types/react@>=16.9.11", "@types/react@^17.0.15": - version "17.0.40" - resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.40.tgz#dc010cee6254d5239a138083f3799a16638e6bad" - integrity sha512-UrXhD/JyLH+W70nNSufXqMZNuUD2cXHu6UjCllC6pmOQgBX4SGXOH8fjRka0O0Ee0HrFxapDD8Bwn81Kmiz6jQ== + version "17.0.43" + resolved "https://registry.yarnpkg.com/@types/react/-/react-17.0.43.tgz#4adc142887dd4a2601ce730bc56c3436fdb07a55" + integrity sha512-8Q+LNpdxf057brvPu1lMtC5Vn7J119xrP1aq4qiaefNioQUYANF/CYeK4NsKorSZyUGJ66g0IM+4bbjwx45o2A== dependencies: "@types/prop-types" "*" "@types/scheduler" "*" @@ -2171,7 +2195,7 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^4.29.1", "@typescript-eslint/eslint-plugin@^4.5.0": +"@typescript-eslint/eslint-plugin@^4.5.0": version "4.33.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.33.0.tgz#c24dc7c8069c7706bc40d99f6fa87edcb2005276" integrity sha512-aINiAxGVdOl1eJyVjaWn/YcVAq4Gi/Yo35qHGCnqbWVz61g39D0h23veY/MA0rFFGfxK7TySg2uwDeNv+JgVpg== @@ -2185,6 +2209,21 @@ semver "^7.3.5" tsutils "^3.21.0" +"@typescript-eslint/eslint-plugin@^5.17.0": + version "5.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.17.0.tgz#704eb4e75039000531255672bf1c85ee85cf1d67" + integrity sha512-qVstvQilEd89HJk3qcbKt/zZrfBZ+9h2ynpAGlWjWiizA7m/MtLT9RoX6gjtpE500vfIg8jogAkDzdCxbsFASQ== + dependencies: + "@typescript-eslint/scope-manager" "5.17.0" + "@typescript-eslint/type-utils" "5.17.0" + "@typescript-eslint/utils" "5.17.0" + debug "^4.3.2" + functional-red-black-tree "^1.0.1" + ignore "^5.1.8" + regexpp "^3.2.0" + semver "^7.3.5" + tsutils "^3.21.0" + "@typescript-eslint/experimental-utils@4.33.0", "@typescript-eslint/experimental-utils@^4.0.1": version "4.33.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.33.0.tgz#6f2a786a4209fa2222989e9380b5331b2810f7fd" @@ -2218,6 +2257,16 @@ "@typescript-eslint/typescript-estree" "4.33.0" debug "^4.3.1" +"@typescript-eslint/parser@^5.17.0": + version "5.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.17.0.tgz#7def77d5bcd8458d12d52909118cf3f0a45f89d5" + integrity sha512-aRzW9Jg5Rlj2t2/crzhA2f23SIYFlF9mchGudyP0uiD6SenIxzKoLjwzHbafgHn39dNV/TV7xwQkLfFTZlJ4ig== + dependencies: + "@typescript-eslint/scope-manager" "5.17.0" + "@typescript-eslint/types" "5.17.0" + "@typescript-eslint/typescript-estree" "5.17.0" + debug "^4.3.2" + "@typescript-eslint/scope-manager@4.33.0": version "4.33.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.33.0.tgz#d38e49280d983e8772e29121cf8c6e9221f280a3" @@ -2226,6 +2275,23 @@ "@typescript-eslint/types" "4.33.0" "@typescript-eslint/visitor-keys" "4.33.0" +"@typescript-eslint/scope-manager@5.17.0": + version "5.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.17.0.tgz#4cea7d0e0bc0e79eb60cad431c89120987c3f952" + integrity sha512-062iCYQF/doQ9T2WWfJohQKKN1zmmXVfAcS3xaiialiw8ZUGy05Em6QVNYJGO34/sU1a7a+90U3dUNfqUDHr3w== + dependencies: + "@typescript-eslint/types" "5.17.0" + "@typescript-eslint/visitor-keys" "5.17.0" + +"@typescript-eslint/type-utils@5.17.0": + version "5.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.17.0.tgz#1c4549d68c89877662224aabb29fbbebf5fc9672" + integrity sha512-3hU0RynUIlEuqMJA7dragb0/75gZmwNwFf/QJokWzPehTZousP/MNifVSgjxNcDCkM5HI2K22TjQWUmmHUINSg== + dependencies: + "@typescript-eslint/utils" "5.17.0" + debug "^4.3.2" + tsutils "^3.21.0" + "@typescript-eslint/types@3.10.1": version "3.10.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-3.10.1.tgz#1d7463fa7c32d8a23ab508a803ca2fe26e758727" @@ -2236,6 +2302,11 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.33.0.tgz#a1e59036a3b53ae8430ceebf2a919dc7f9af6d72" integrity sha512-zKp7CjQzLQImXEpLt2BUw1tvOMPfNoTAfb8l51evhYbOEEzdWyQNmHWWGPR6hwKJDAi+1VXSBmnhL9kyVTTOuQ== +"@typescript-eslint/types@5.17.0": + version "5.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.17.0.tgz#861ec9e669ffa2aa9b873dd4d28d9b1ce26d216f" + integrity sha512-AgQ4rWzmCxOZLioFEjlzOI3Ch8giDWx8aUDxyNw9iOeCvD3GEYAB7dxWGQy4T/rPVe8iPmu73jPHuaSqcjKvxw== + "@typescript-eslint/typescript-estree@3.10.1": version "3.10.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.1.tgz#fd0061cc38add4fad45136d654408569f365b853" @@ -2263,6 +2334,31 @@ semver "^7.3.5" tsutils "^3.21.0" +"@typescript-eslint/typescript-estree@5.17.0": + version "5.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.17.0.tgz#a7cba7dfc8f9cc2ac78c18584e684507df4f2488" + integrity sha512-X1gtjEcmM7Je+qJRhq7ZAAaNXYhTgqMkR10euC4Si6PIjb+kwEQHSxGazXUQXFyqfEXdkGf6JijUu5R0uceQzg== + dependencies: + "@typescript-eslint/types" "5.17.0" + "@typescript-eslint/visitor-keys" "5.17.0" + debug "^4.3.2" + globby "^11.0.4" + is-glob "^4.0.3" + semver "^7.3.5" + tsutils "^3.21.0" + +"@typescript-eslint/utils@5.17.0": + version "5.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.17.0.tgz#549a9e1d491c6ccd3624bc3c1b098f5cfb45f306" + integrity sha512-DVvndq1QoxQH+hFv+MUQHrrWZ7gQ5KcJzyjhzcqB1Y2Xes1UQQkTRPUfRpqhS8mhTWsSb2+iyvDW1Lef5DD7vA== + dependencies: + "@types/json-schema" "^7.0.9" + "@typescript-eslint/scope-manager" "5.17.0" + "@typescript-eslint/types" "5.17.0" + "@typescript-eslint/typescript-estree" "5.17.0" + eslint-scope "^5.1.1" + eslint-utils "^3.0.0" + "@typescript-eslint/visitor-keys@3.10.1": version "3.10.1" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.1.tgz#cd4274773e3eb63b2e870ac602274487ecd1e931" @@ -2278,6 +2374,14 @@ "@typescript-eslint/types" "4.33.0" eslint-visitor-keys "^2.0.0" +"@typescript-eslint/visitor-keys@5.17.0": + version "5.17.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.17.0.tgz#52daae45c61b0211b4c81b53a71841911e479128" + integrity sha512-6K/zlc4OfCagUu7Am/BD5k8PSWQOgh34Nrv9Rxe2tBzlJ7uOeJ/h7ugCGDCeEZHT6k2CJBhbk9IsbkPI0uvUkA== + dependencies: + "@typescript-eslint/types" "5.17.0" + eslint-visitor-keys "^3.0.0" + "@webassemblyjs/ast@1.9.0": version "1.9.0" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.9.0.tgz#bd850604b4042459a5a41cd7d338cbed695ed964" @@ -2484,7 +2588,7 @@ acorn@^7.1.0, acorn@^7.1.1, acorn@^7.4.0: resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0: +acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.0: version "8.7.0" resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.0.tgz#90951fde0f8f09df93549481e5fc141445b791cf" integrity sha512-V/LGr1APy+PXIwKebEWrkZPwoeoF+w1jiOBUmuxuiUIaOHtob8Qc9BTrYo7VuI5fR8tqsy+buA2WFooR5olqvQ== @@ -2538,9 +2642,9 @@ ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5: uri-js "^4.2.2" ajv@^8.0.1: - version "8.10.0" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.10.0.tgz#e573f719bd3af069017e3b66538ab968d040e54d" - integrity sha512-bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw== + version "8.11.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.11.0.tgz#977e91dd96ca669f54a11e23e378e33b884a565f" + integrity sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg== dependencies: fast-deep-equal "^3.1.1" json-schema-traverse "^1.0.0" @@ -2659,6 +2763,11 @@ argparse@^1.0.7: dependencies: sprintf-js "~1.0.2" +argparse@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38" + integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q== + aria-query@^4.2.2: version "4.2.2" resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz#0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b" @@ -2697,7 +2806,7 @@ array-flatten@^2.1.0: resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099" integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ== -array-includes@^3.1.3, array-includes@^3.1.4: +array-includes@^3.1.4: version "3.1.4" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.4.tgz#f5b493162c760f3539631f005ba2bb46acb45ba9" integrity sha512-ZTNSQkmWumEbiHO2GF4GmWxYVTiQyJy2XOTa15sdQSrvKn7l+180egQMqlrMOUMCyLMD7pmyQe4mMDUT6Behrw== @@ -3206,7 +3315,7 @@ braces@^2.3.1, braces@^2.3.2: split-string "^3.0.2" to-regex "^3.0.1" -braces@^3.0.1, braces@~3.0.2: +braces@^3.0.2, braces@~3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107" integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A== @@ -3486,9 +3595,9 @@ caniuse-api@^3.0.0: lodash.uniq "^4.5.0" caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001125, caniuse-lite@^1.0.30001317: - version "1.0.30001317" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001317.tgz#0548fb28fd5bc259a70b8c1ffdbe598037666a1b" - integrity sha512-xIZLh8gBm4dqNX0gkzrBeyI86J2eCjWzYAs40q88smG844YIrN4tVQl/RhquHvKEKImWWFIVh1Lxe5n1G/N+GQ== + version "1.0.30001323" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001323.tgz#a451ff80dec7033016843f532efda18f02eec011" + integrity sha512-e4BF2RlCVELKx8+RmklSEIVub1TWrmdhvA5kEUueummz1XyySW0DVk+3x9HyhU9MuWTa2BhqLgEuEmUwASAdCA== capture-exit@^2.0.0: version "2.0.0" @@ -4112,13 +4221,13 @@ css-select@^2.0.0: nth-check "^1.0.2" css-select@^4.1.3: - version "4.2.1" - resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.2.1.tgz#9e665d6ae4c7f9d65dbe69d0316e3221fb274cdd" - integrity sha512-/aUslKhzkTNCQUB2qTX84lVmfia9NyjP3WpDGtj/WxhwBzWBYUV3DgUpurHTme8UTPcPlAD1DJ+b0nN/t50zDQ== + version "4.3.0" + resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.3.0.tgz#db7129b2846662fd8628cfc496abb2b59e41529b" + integrity sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ== dependencies: boolbase "^1.0.0" - css-what "^5.1.0" - domhandler "^4.3.0" + css-what "^6.0.1" + domhandler "^4.3.1" domutils "^2.8.0" nth-check "^2.0.1" @@ -4143,10 +4252,10 @@ css-what@^3.2.1: resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4" integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ== -css-what@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" - integrity sha512-arSMRWIIFY0hV8pIxZMEfmMI47Wj3R/aWpZDDxWYCPEiOMv6tfOrnpDtgxBYPEQD4V0Y/958+1TdC3iWTFcUPw== +css-what@^6.0.1: + version "6.1.0" + resolved "https://registry.yarnpkg.com/css-what/-/css-what-6.1.0.tgz#fb5effcf76f1ddea2c81bdfaa4de44e79bac70f4" + integrity sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw== css@^2.0.0: version "2.2.4" @@ -4311,10 +4420,10 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.6, debug@^2.6. dependencies: ms "2.0.0" -debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1: - version "4.3.3" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.3.tgz#04266e0b70a98d4462e6e288e38259213332b664" - integrity sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q== +debug@4, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2: + version "4.3.4" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865" + integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" @@ -4590,10 +4699,10 @@ domexception@^2.0.1: dependencies: webidl-conversions "^5.0.0" -domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.0.tgz#16c658c626cf966967e306f966b431f77d4a5626" - integrity sha512-fC0aXNQXqKSFTr2wDNZDhsEYjCiYsDWl3D01kwt25hm1YIPyDGHvvi3rw+PLqHAl/m71MaiF7d5zvBr0p5UB2g== +domhandler@^4.0.0, domhandler@^4.2.0, domhandler@^4.3.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.3.1.tgz#8d792033416f59d68bc03a5aa7b018c1ca89279c" + integrity sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ== dependencies: domelementtype "^2.2.0" @@ -4678,9 +4787,9 @@ ejs@^2.6.1: integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA== electron-to-chromium@^1.3.564, electron-to-chromium@^1.4.84: - version "1.4.85" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.85.tgz#a3666ba42147026b9f34d4d8d4caf0740e80f751" - integrity sha512-K9AsQ41WS2bjZUFpRWfvaS4RjEcRCamEkBJN1Z1TQILBfP1H8QnJ9ti0wiLiMv0sRjX3EHKzgs9jDnmGFx2jXg== + version "1.4.103" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.103.tgz#abfe376a4d70fa1e1b4b353b95df5d6dfd05da3a" + integrity sha512-c/uKWR1Z/W30Wy/sx3dkZoj4BijbXX85QKWu9jJfjho3LBAXNEGAEW3oWiGb+dotA6C6BzCTxL2/aLes7jlUeg== elliptic@^6.5.3: version "6.5.4" @@ -4790,9 +4899,9 @@ error-stack-parser@^2.0.6: stackframe "^1.1.1" es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1: - version "1.19.1" - resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" - integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w== + version "1.19.2" + resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.2.tgz#8f7b696d8f15b167ae3640b4060670f3d054143f" + integrity sha512-gfSBJoZdlL2xRiOCy0g8gLMryhoe1TlimjzU99L/31Z8QEGIhVQI+EWwt5lT+AuU9SnorVupXFqqOGqGfsyO6w== dependencies: call-bind "^1.0.2" es-to-primitive "^1.2.1" @@ -4800,15 +4909,15 @@ es-abstract@^1.17.2, es-abstract@^1.19.0, es-abstract@^1.19.1: get-intrinsic "^1.1.1" get-symbol-description "^1.0.0" has "^1.0.3" - has-symbols "^1.0.2" + has-symbols "^1.0.3" internal-slot "^1.0.3" is-callable "^1.2.4" - is-negative-zero "^2.0.1" + is-negative-zero "^2.0.2" is-regex "^1.1.4" is-shared-array-buffer "^1.0.1" is-string "^1.0.7" - is-weakref "^1.0.1" - object-inspect "^1.11.0" + is-weakref "^1.0.2" + object-inspect "^1.12.0" object-keys "^1.1.1" object.assign "^4.1.2" string.prototype.trimend "^1.0.4" @@ -4825,9 +4934,9 @@ es-to-primitive@^1.2.1: is-symbol "^1.0.2" es5-ext@^0.10.35, es5-ext@^0.10.50: - version "0.10.58" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.58.tgz#5b97d94236285fb87c8ffc782cf42eb0a25d2ae0" - integrity sha512-LHO+KBBaHGwjy32ibSaMY+ZzjpC4K4I5bPoijICMBL7gXEXfrEUrzssmNP+KigbQEp1dRUnGkry/vUnxOqptLQ== + version "0.10.59" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.59.tgz#71038939730eb6f4f165f1421308fb60be363bc6" + integrity sha512-cOgyhW0tIJyQY1Kfw6Kr0viu9ZlUctVchRMZ7R0HiH3dxTSp5zJDLecwxUqPUrGKMsgBI1wd1FL+d9Jxfi4cLw== dependencies: es6-iterator "^2.0.3" es6-symbol "^3.1.3" @@ -4918,7 +5027,7 @@ eslint-plugin-flowtype@^5.2.0: lodash "^4.17.15" string-natural-compare "^3.0.1" -eslint-plugin-import@^2.22.1: +eslint-plugin-import@^2.22.1, eslint-plugin-import@^2.25.4: version "2.25.4" resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.25.4.tgz#322f3f916a4e9e991ac7af32032c25ce313209f1" integrity sha512-/KJBASVFxpu0xg1kIBn9AUa8hQVnszpwgE7Ld0lKAlx7Ie87yzEzCgSkekt+le/YVhiaosO4Y14GDAOc41nfxA== @@ -4944,7 +5053,7 @@ eslint-plugin-jest@^24.1.0: dependencies: "@typescript-eslint/experimental-utils" "^4.0.1" -eslint-plugin-jsx-a11y@^6.3.1: +eslint-plugin-jsx-a11y@^6.3.1, eslint-plugin-jsx-a11y@^6.5.1: version "6.5.1" resolved "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.5.1.tgz#cdbf2df901040ca140b6ec14715c988889c2a6d8" integrity sha512-sVCFKX9fllURnXT2JwLN5Qgo24Ug5NF6dxhkmxsMEUZhXRcGg+X3e1JbJ84YePQKBl5E0ZjAH5Q4rkdcGY99+g== @@ -4962,12 +5071,12 @@ eslint-plugin-jsx-a11y@^6.3.1: language-tags "^1.0.5" minimatch "^3.0.4" -eslint-plugin-react-hooks@^4.2.0: - version "4.3.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.3.0.tgz#318dbf312e06fab1c835a4abef00121751ac1172" - integrity sha512-XslZy0LnMn+84NEG9jSGR6eGqaZB3133L8xewQo3fQagbQuGt7a63gf+P1NGKZavEYEC3UXaWEAA/AqDkuN6xA== +eslint-plugin-react-hooks@^4.2.0, eslint-plugin-react-hooks@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.4.0.tgz#71c39e528764c848d8253e1aa2c7024ed505f6c4" + integrity sha512-U3RVIfdzJaeKDQKEJbz5p3NW8/L80PCATJAfuojwbaEL+gBjfGdhUcGde+WGUW46Q5sr/NgxevsIiDtNXrvZaQ== -eslint-plugin-react@^7.21.5: +eslint-plugin-react@^7.21.5, eslint-plugin-react@^7.29.4: version "7.29.4" resolved "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.29.4.tgz#4717de5227f55f3801a5fd51a16a4fa22b5914d2" integrity sha512-CVCXajliVh509PcZYRFyu/BoUEz452+jtQJq2b3Bae4v3xBUWPLCmtmBM+ZinG4MzwmxJgJ2M5rMqhqLVn7MtQ== @@ -5010,6 +5119,14 @@ eslint-scope@^5.0.0, eslint-scope@^5.1.1: esrecurse "^4.3.0" estraverse "^4.1.1" +eslint-scope@^7.1.1: + version "7.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.1.1.tgz#fff34894c2f65e5226d3041ac480b4513a163642" + integrity sha512-QKQM/UXpIiHcLqJ5AOyIW7XZmzjkzQXYE54n1++wb0u9V/abW3l9uQnxX8Z5Xd18xyKIMTUAyQ0k1e8pz6LUrw== + dependencies: + esrecurse "^4.3.0" + estraverse "^5.2.0" + eslint-utils@^2.0.0, eslint-utils@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" @@ -5034,6 +5151,11 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== +eslint-visitor-keys@^3.0.0, eslint-visitor-keys@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.3.0.tgz#f6480fa6b1f30efe2d1968aa8ac745b862469826" + integrity sha512-mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA== + eslint-webpack-plugin@^2.5.2: version "2.6.0" resolved "https://registry.yarnpkg.com/eslint-webpack-plugin/-/eslint-webpack-plugin-2.6.0.tgz#3bd4ada4e539cb1f6687d2f619073dbb509361cd" @@ -5092,6 +5214,47 @@ eslint@^7.11.0: text-table "^0.2.0" v8-compile-cache "^2.0.3" +eslint@^8.12.0: + version "8.12.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.12.0.tgz#c7a5bd1cfa09079aae64c9076c07eada66a46e8e" + integrity sha512-it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q== + dependencies: + "@eslint/eslintrc" "^1.2.1" + "@humanwhocodes/config-array" "^0.9.2" + ajv "^6.10.0" + chalk "^4.0.0" + cross-spawn "^7.0.2" + debug "^4.3.2" + doctrine "^3.0.0" + escape-string-regexp "^4.0.0" + eslint-scope "^7.1.1" + eslint-utils "^3.0.0" + eslint-visitor-keys "^3.3.0" + espree "^9.3.1" + esquery "^1.4.0" + esutils "^2.0.2" + fast-deep-equal "^3.1.3" + file-entry-cache "^6.0.1" + functional-red-black-tree "^1.0.1" + glob-parent "^6.0.1" + globals "^13.6.0" + ignore "^5.2.0" + import-fresh "^3.0.0" + imurmurhash "^0.1.4" + is-glob "^4.0.0" + js-yaml "^4.1.0" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.4.1" + lodash.merge "^4.6.2" + minimatch "^3.0.4" + natural-compare "^1.4.0" + optionator "^0.9.1" + regexpp "^3.2.0" + strip-ansi "^6.0.1" + strip-json-comments "^3.1.0" + text-table "^0.2.0" + v8-compile-cache "^2.0.3" + espree@^7.3.0, espree@^7.3.1: version "7.3.1" resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" @@ -5101,6 +5264,15 @@ espree@^7.3.0, espree@^7.3.1: acorn-jsx "^5.3.1" eslint-visitor-keys "^1.3.0" +espree@^9.3.1: + version "9.3.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-9.3.1.tgz#8793b4bc27ea4c778c19908e0719e7b8f4115bcd" + integrity sha512-bvdyLmJMfwkV3NCRl5ZhJf22zBFo1y8bYh3VYb+bfzqNB4Je68P2sSuXyuFquzWLebHpNd2/d5uv7yoP9ISnGQ== + dependencies: + acorn "^8.7.0" + acorn-jsx "^5.3.1" + eslint-visitor-keys "^3.3.0" + esprima@^4.0.0, esprima@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" @@ -5751,6 +5923,13 @@ glob-parent@^5.1.2, glob-parent@~5.1.2: dependencies: is-glob "^4.0.1" +glob-parent@^6.0.1: + version "6.0.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.2.tgz#6d237d99083950c79290f24c7642a3de9a28f9e3" + integrity sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A== + dependencies: + is-glob "^4.0.3" + glob@^7.0.0, glob@^7.0.3, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.2.0" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023" @@ -5815,7 +5994,7 @@ globby@11.0.1: merge2 "^1.3.0" slash "^3.0.0" -globby@^11.0.3: +globby@^11.0.3, globby@^11.0.4: version "11.1.0" resolved "https://registry.yarnpkg.com/globby/-/globby-11.1.0.tgz#bd4be98bb042f83d796f7e3811991fbe82a0d34b" integrity sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g== @@ -5915,7 +6094,7 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -has-symbols@^1.0.1, has-symbols@^1.0.2: +has-symbols@^1.0.1, has-symbols@^1.0.2, has-symbols@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8" integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A== @@ -6577,7 +6756,7 @@ is-module@^1.0.0: resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE= -is-negative-zero@^2.0.1: +is-negative-zero@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.2.tgz#7bf6f03a28003b8b3965de3ac26f664d765f3150" integrity sha512-dqJvarLawXsFbNDeJW7zAz8ItJ9cd28YufuuFzh0G8pNHjJMnY08Dv7sYX2uF5UpQOwieAeOExEYAWWfu7ZZUA== @@ -6704,7 +6883,7 @@ is-typedarray@^1.0.0, is-typedarray@~1.0.0: resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a" integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo= -is-weakref@^1.0.1: +is-weakref@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-weakref/-/is-weakref-1.0.2.tgz#9529f383a9338205e89765e0392efc2f100f06f2" integrity sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ== @@ -7274,6 +7453,13 @@ js-yaml@^3.13.1: argparse "^1.0.7" esprima "^4.0.0" +js-yaml@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602" + integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA== + dependencies: + argparse "^2.0.1" + jsbn@~0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" @@ -7365,11 +7551,9 @@ json5@^1.0.1: minimist "^1.2.0" json5@^2.1.2: - version "2.2.0" - resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.0.tgz#2dfefe720c6ba525d9ebd909950f0515316c89a3" - integrity sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA== - dependencies: - minimist "^1.2.5" + version "2.2.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" + integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== jsonfile@^4.0.0: version "4.0.0" @@ -7398,11 +7582,11 @@ jsprim@^1.2.2: verror "1.10.0" "jsx-ast-utils@^2.4.1 || ^3.0.0", jsx-ast-utils@^3.2.1: - version "3.2.1" - resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.1.tgz#720b97bfe7d901b927d87c3773637ae8ea48781b" - integrity sha512-uP5vu8xfy2F9A6LGC22KO7e2/vGTS1MhP+18f++ZNlf0Ohaxbc9nIEwHAsejlJKyzfZzU5UIhe5ItYkitcZnZA== + version "3.2.2" + resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.2.tgz#6ab1e52c71dfc0c0707008a91729a9491fe9f76c" + integrity sha512-HDAyJ4MNQBboGpUnHAVUNJs6X0lh058s6FuixsFGP7MgJYpD6Vasd6nzSG5iIfXu1zAYlHJ/zsOKNlrenTUBnw== dependencies: - array-includes "^3.1.3" + array-includes "^3.1.4" object.assign "^4.1.2" killable@^1.0.1: @@ -7801,12 +7985,12 @@ micromatch@^3.1.10, micromatch@^3.1.4: to-regex "^3.0.2" micromatch@^4.0.2, micromatch@^4.0.4: - version "4.0.4" - resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9" - integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg== + version "4.0.5" + resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" + integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== dependencies: - braces "^3.0.1" - picomatch "^2.2.3" + braces "^3.0.2" + picomatch "^2.3.1" miller-rabin@^4.0.0: version "4.0.1" @@ -7898,10 +8082,10 @@ minimist-options@4.1.0: is-plain-obj "^1.1.0" kind-of "^6.0.3" -minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== +minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.6: + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== minipass-collect@^1.0.2: version "1.0.2" @@ -7964,11 +8148,11 @@ mixin-deep@^1.2.0: is-extendable "^1.0.1" mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1: - version "0.5.5" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== + version "0.5.6" + resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6" + integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw== dependencies: - minimist "^1.2.5" + minimist "^1.2.6" mkdirp@^1.0.3, mkdirp@^1.0.4: version "1.0.4" @@ -8021,9 +8205,9 @@ nan@^2.12.1, nan@^2.13.2: integrity sha512-8ZtvEnA2c5aYCZYd1cvgdnU6cqwixRoYg70xPLWUws5ORTa/lnw+u4amixRS/Ac5U5mQVgp9pnlSUnbNWFaWZQ== nanoid@^3.3.1: - version "3.3.1" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.1.tgz#6347a18cac88af88f58af0b3594b723d5e99bb35" - integrity sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw== + version "3.3.2" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.2.tgz#c89622fafb4381cd221421c69ec58547a1eec557" + integrity sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA== nanomatch@^1.2.9: version "1.2.13" @@ -8311,7 +8495,7 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" -object-inspect@^1.11.0, object-inspect@^1.9.0: +object-inspect@^1.12.0, object-inspect@^1.9.0: version "1.12.0" resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.0.tgz#6e2c120e868fd1fd18cb4f18c31741d0d6e776f0" integrity sha512-Ho2z80bVIvJloH+YzRmpZVQe87+qASmBUKZDWgx9cu+KDrX2ZDH/3tMy+gXbZETVGs2M8YdxObOh7XAtim9Y0g== @@ -8735,7 +8919,7 @@ picocolors@^1.0.0: resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c" integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ== -picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3: +picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.3.1: version "2.3.1" resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== @@ -9446,9 +9630,9 @@ postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4: uniq "^1.0.1" postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2: - version "6.0.9" - resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.9.tgz#ee71c3b9ff63d9cd130838876c13a2ec1a992b2f" - integrity sha512-UO3SgnZOVTwu4kyLR22UQ1xZh086RyNZppb7lLAKBFK8a32ttG5i87Y/P3+2bRSjZNyJ1B7hfFNo273tKe9YxQ== + version "6.0.10" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.10.tgz#79b61e2c0d1bfc2602d549e11d0876256f8df88d" + integrity sha512-IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w== dependencies: cssesc "^3.0.0" util-deprecate "^1.0.2" @@ -9508,9 +9692,9 @@ postcss@^7, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, po source-map "^0.6.1" postcss@^8.1.0: - version "8.4.11" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.11.tgz#a06229f23820b4ddd46500a3e38dbca1598a8e8d" - integrity sha512-D+jFLnT0ilGfy4CVBGbC+XE68HkVpT8+CUkDrcSpgxmo4RKco2uaZ4kIoyVGEm+m8KN/+Vwgs8MtpNbQ3/ma9w== + version "8.4.12" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.12.tgz#1e7de78733b28970fa4743f7da6f3763648b1905" + integrity sha512-lg6eITwYe9v6Hr5CncVbK70SoioNQIq81nsaG86ev5hAidQvmOeETBqs7jm43K2F5/Ley3ytDtriImV6TpNiSg== dependencies: nanoid "^3.3.1" picocolors "^1.0.0" @@ -10110,7 +10294,7 @@ regex-parser@^2.2.11: resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.11.tgz#3b37ec9049e19479806e878cabe7c1ca83ccfe58" integrity sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q== -regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.1: +regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/regexp.prototype.flags/-/regexp.prototype.flags-1.4.1.tgz#b3f4c0059af9e47eca9f3f660e51d81307e72307" integrity sha512-pMR7hBVUUGI7PMA37m2ofIdQCsomVnas+Jn5UPGAHQ+/LlwKm/aTLJHdasmHRzlfeZwHiAOaRSo2rbBDm3nNUQ== @@ -10118,7 +10302,7 @@ regexp.prototype.flags@^1.2.0, regexp.prototype.flags@^1.3.1: call-bind "^1.0.2" define-properties "^1.1.3" -regexpp@^3.1.0: +regexpp@^3.1.0, regexpp@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== @@ -11066,17 +11250,17 @@ string-width@^3.0.0, string-width@^3.1.0: strip-ansi "^5.1.0" string.prototype.matchall@^4.0.6: - version "4.0.6" - resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.6.tgz#5abb5dabc94c7b0ea2380f65ba610b3a544b15fa" - integrity sha512-6WgDX8HmQqvEd7J+G6VtAahhsQIssiZ8zl7zKh1VDMFyL3hRTJP4FTNA3RbIp2TOQ9AYNDcc7e3fH0Qbup+DBg== + version "4.0.7" + resolved "https://registry.yarnpkg.com/string.prototype.matchall/-/string.prototype.matchall-4.0.7.tgz#8e6ecb0d8a1fb1fda470d81acecb2dba057a481d" + integrity sha512-f48okCX7JiwVi1NXCVWcFnZgADDC/n2vePlQ/KUCNqCikLLilQvwjMO8+BHVKvgzH0JB0J9LEPgxOGT02RoETg== dependencies: call-bind "^1.0.2" define-properties "^1.1.3" es-abstract "^1.19.1" get-intrinsic "^1.1.1" - has-symbols "^1.0.2" + has-symbols "^1.0.3" internal-slot "^1.0.3" - regexp.prototype.flags "^1.3.1" + regexp.prototype.flags "^1.4.1" side-channel "^1.0.4" string.prototype.trimend@^1.0.4: @@ -11539,13 +11723,13 @@ ts-pnp@1.2.0, ts-pnp@^1.1.6: integrity sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw== tsconfig-paths@^3.12.0: - version "3.14.0" - resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.0.tgz#4fcc48f9ccea8826c41b9ca093479de7f5018976" - integrity sha512-cg/1jAZoL57R39+wiw4u/SCC6Ic9Q5NqjBOb+9xISedOYurfog9ZNmKJSxAnb2m/5Bq4lE9lhUcau33Ml8DM0g== + version "3.14.1" + resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a" + integrity sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ== dependencies: "@types/json5" "^0.0.29" json5 "^1.0.1" - minimist "^1.2.0" + minimist "^1.2.6" strip-bom "^3.0.0" tslib@^1.8.1: @@ -11662,9 +11846,9 @@ typedarray@^0.0.6: integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= typescript@^4.3.5: - version "4.6.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.2.tgz#fe12d2727b708f4eef40f51598b3398baa9611d4" - integrity sha512-HM/hFigTBHZhLXshn9sN37H085+hQGeJHJ/X7LpBWLID/fbc2acUMfU+lGD98X81sKP+pFa9f0DZmCwB9GnbAg== + version "4.6.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.3.tgz#eefeafa6afdd31d725584c67a0eaba80f6fc6c6c" + integrity sha512-yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw== unbox-primitive@^1.0.1: version "1.0.1"