- setActiveModelKey(modelKey) }>
@@ -101,12 +105,14 @@ export const AvatarEditorView: FC<{}> = props =>
diff --git a/src/components/avatar-editor/AvatarEditorIcon.tsx b/src/components/avatar-editor/AvatarEditorIcon.tsx
index f5623ed..e992373 100644
--- a/src/components/avatar-editor/AvatarEditorIcon.tsx
+++ b/src/components/avatar-editor/AvatarEditorIcon.tsx
@@ -1,45 +1,81 @@
import { DetailedHTMLProps, HTMLAttributes, PropsWithChildren, forwardRef } from 'react';
import { classNames } from '../../layout';
-type AvatarIconType = 'male' | 'female' | 'clear' | 'sellable';
+import arrowLeftIcon from '../../assets/images/avatareditor/arrow-left-icon.png';
+import arrowRightIcon from '../../assets/images/avatareditor/arrow-right-icon.png';
+import caIcon from '../../assets/images/avatareditor/ca-icon.png';
+import caSelectedIcon from '../../assets/images/avatareditor/ca-selected-icon.png';
+import ccIcon from '../../assets/images/avatareditor/cc-icon.png';
+import ccSelectedIcon from '../../assets/images/avatareditor/cc-selected-icon.png';
+import chIcon from '../../assets/images/avatareditor/ch-icon.png';
+import chSelectedIcon from '../../assets/images/avatareditor/ch-selected-icon.png';
+import clearIcon from '../../assets/images/avatareditor/clear-icon.png';
+import cpIcon from '../../assets/images/avatareditor/cp-icon.png';
+import cpSelectedIcon from '../../assets/images/avatareditor/cp-selected-icon.png';
+import eaIcon from '../../assets/images/avatareditor/ea-icon.png';
+import eaSelectedIcon from '../../assets/images/avatareditor/ea-selected-icon.png';
+import faIcon from '../../assets/images/avatareditor/fa-icon.png';
+import faSelectedIcon from '../../assets/images/avatareditor/fa-selected-icon.png';
+import femaleIcon from '../../assets/images/avatareditor/female-icon.png';
+import femaleSelectedIcon from '../../assets/images/avatareditor/female-selected-icon.png';
+import haIcon from '../../assets/images/avatareditor/ha-icon.png';
+import haSelectedIcon from '../../assets/images/avatareditor/ha-selected-icon.png';
+import heIcon from '../../assets/images/avatareditor/he-icon.png';
+import heSelectedIcon from '../../assets/images/avatareditor/he-selected-icon.png';
+import hrIcon from '../../assets/images/avatareditor/hr-icon.png';
+import hrSelectedIcon from '../../assets/images/avatareditor/hr-selected-icon.png';
+import lgIcon from '../../assets/images/avatareditor/lg-icon.png';
+import lgSelectedIcon from '../../assets/images/avatareditor/lg-selected-icon.png';
+import maleIcon from '../../assets/images/avatareditor/male-icon.png';
+import maleSelectedIcon from '../../assets/images/avatareditor/male-selected-icon.png';
+import sellableIcon from '../../assets/images/avatareditor/sellable-icon.png';
+import shIcon from '../../assets/images/avatareditor/sh-icon.png';
+import shSelectedIcon from '../../assets/images/avatareditor/sh-selected-icon.png';
+import waIcon from '../../assets/images/avatareditor/wa-icon.png';
+import waSelectedIcon from '../../assets/images/avatareditor/wa-selected-icon.png';
+
+const ICON_MAP: Record = {
+ 'arrow-left': { normal: arrowLeftIcon },
+ 'arrow-right': { normal: arrowRightIcon },
+ 'ca': { normal: caIcon, selected: caSelectedIcon },
+ 'cc': { normal: ccIcon, selected: ccSelectedIcon },
+ 'ch': { normal: chIcon, selected: chSelectedIcon },
+ 'clear': { normal: clearIcon },
+ 'cp': { normal: cpIcon, selected: cpSelectedIcon },
+ 'ea': { normal: eaIcon, selected: eaSelectedIcon },
+ 'fa': { normal: faIcon, selected: faSelectedIcon },
+ 'female': { normal: femaleIcon, selected: femaleSelectedIcon },
+ 'ha': { normal: haIcon, selected: haSelectedIcon },
+ 'he': { normal: heIcon, selected: heSelectedIcon },
+ 'hr': { normal: hrIcon, selected: hrSelectedIcon },
+ 'lg': { normal: lgIcon, selected: lgSelectedIcon },
+ 'male': { normal: maleIcon, selected: maleSelectedIcon },
+ 'sellable': { normal: sellableIcon },
+ 'sh': { normal: shIcon, selected: shSelectedIcon },
+ 'wa': { normal: waIcon, selected: waSelectedIcon },
+};
export const AvatarEditorIcon = forwardRef & DetailedHTMLProps, HTMLDivElement>>((props, ref) =>
{
- const { icon = null, selected = false, className = null, ...rest } = props;
+ const { icon = null, selected = false, className = null, children, ...rest } = props;
- /*
- switch (icon)
- {
- case 'male':
+ const iconEntry = icon ? ICON_MAP[icon] : null;
+ if(!iconEntry) return null;
- break;
+ const src = (selected && iconEntry.selected) ? iconEntry.selected : iconEntry.normal;
- case 'arrow-left':
-
- break;
-
- default:
- //statements;
- break;
-
- }
-*/
return (
+ className={ classNames('flex items-center justify-center cursor-pointer', className) }
+ { ...rest }>
+ 
+ { children }
+
);
});
diff --git a/src/components/avatar-editor/AvatarEditorNftView.tsx b/src/components/avatar-editor/AvatarEditorNftView.tsx
new file mode 100644
index 0000000..405f5ec
--- /dev/null
+++ b/src/components/avatar-editor/AvatarEditorNftView.tsx
@@ -0,0 +1,117 @@
+import { AvatarFigurePartType, FigureDataContainer } from '@nitrots/nitro-renderer';
+import { FC, useCallback, useEffect, useMemo, useState } from 'react';
+import { CreateLinkEvent, GetClubMemberLevel, IAvatarEditorCategory } from '../../api';
+import { LayoutAvatarImageView, LayoutCurrencyIcon } from '../../common';
+import { useAvatarEditor } from '../../hooks';
+import { AvatarEditorIcon } from './AvatarEditorIcon';
+import { AvatarEditorFigureSetView } from './figure-set';
+import { AvatarEditorAdvancedColorView, AvatarEditorPaletteSetView } from './palette-set';
+
+export const AvatarEditorNftView: FC<{
+ categories: IAvatarEditorCategory[];
+}> = props =>
+{
+ const { categories = [] } = props;
+ const [ didChange, setDidChange ] = useState(false);
+ const [ activeSetType, setActiveSetType ] = useState('');
+ const [ advancedColorMode, setAdvancedColorMode ] = useState(false);
+ const hasHC = GetClubMemberLevel() > 0;
+ const { maxPaletteCount = 1, selectedColorParts = null, getFirstSelectableColor = null, selectEditorColor = null, gender = null, setGender = null, getFigureString = '' } = useAvatarEditor();
+
+ const activeCategory = useMemo(() =>
+ {
+ return categories.find(category => category.setType === activeSetType) ?? null;
+ }, [ categories, activeSetType ]);
+
+ const selectSet = useCallback((setType: string) =>
+ {
+ const selectedPalettes = selectedColorParts[setType];
+
+ if(!selectedPalettes || !selectedPalettes.length) selectEditorColor(setType, 0, getFirstSelectableColor(setType));
+
+ setActiveSetType(setType);
+ }, [ getFirstSelectableColor, selectEditorColor, selectedColorParts ]);
+
+ useEffect(() =>
+ {
+ if(!categories || !categories.length || !didChange) return;
+
+ selectSet(categories[0]?.setType);
+ setDidChange(false);
+ }, [ categories, didChange, selectSet ]);
+
+ useEffect(() =>
+ {
+ setDidChange(true);
+ }, [ categories ]);
+
+ if(!categories.length || !activeCategory)
+ {
+ return (
+
+
+ );
+ }
+
+ return (
+ NFT
+ No NFT items available.
+
+
+ );
+};
diff --git a/src/components/avatar-editor/AvatarEditorView.tsx b/src/components/avatar-editor/AvatarEditorView.tsx
index f080e21..6d23a3c 100644
--- a/src/components/avatar-editor/AvatarEditorView.tsx
+++ b/src/components/avatar-editor/AvatarEditorView.tsx
@@ -6,6 +6,7 @@ import { Button, ButtonGroup, NitroCardContentView, NitroCardHeaderView, NitroCa
import { useAvatarEditor } from '../../hooks';
import { AvatarEditorFigurePreviewView } from './AvatarEditorFigurePreviewView';
import { AvatarEditorModelView } from './AvatarEditorModelView';
+import { AvatarEditorNftView } from './AvatarEditorNftView';
import { AvatarEditorPetView } from './AvatarEditorPetView';
import { AvatarEditorWardrobeView } from './AvatarEditorWardrobeView';
@@ -16,6 +17,7 @@ export const AvatarEditorView: FC<{}> = props =>
const isWardrobeOpen = (activeModelKey === AvatarEditorFigureCategory.WARDROBE);
const isPetsOpen = (activeModelKey === AvatarEditorFigureCategory.PETS);
+ const isNftOpen = (activeModelKey === AvatarEditorFigureCategory.NFT);
const processAction = (action: string) =>
{
@@ -85,10 +87,12 @@ export const AvatarEditorView: FC<{}> = props =>
const isActive = (activeModelKey === modelKey);
const isWardrobe = (modelKey === AvatarEditorFigureCategory.WARDROBE);
const isPets = (modelKey === AvatarEditorFigureCategory.PETS);
+ const isNft = (modelKey === AvatarEditorFigureCategory.NFT);
let tabClass = `tab ${ modelKey }`;
if(isWardrobe) tabClass = 'tab-wardrobe';
else if(isPets) tabClass = 'tab-pets';
+ else if(isNft) tabClass = 'tab-nft';
return (
+ { categories.map(category =>
+
+
+ { (activeSetType === AvatarFigurePartType.HEAD) &&
+ selectSet(category.setType) }>
+ { (category.setType === AvatarFigurePartType.HEAD)
+ ? (
+
+ ) }
+
+
+ )
+ :
+
}
+
+ setGender(AvatarFigurePartType.MALE) }>
+
+ setGender(AvatarFigurePartType.FEMALE) }>
+
+
+
+
+
+
+
+
+
+ { (maxPaletteCount >= 1) &&
+
+
+ { advancedColorMode
+ ?
}
+ { (maxPaletteCount === 2) &&
+
+ { advancedColorMode
+ ?
}
+
{ /* left: model view or wardrobe */ }
- { (activeModelKey.length > 0 && !isWardrobeOpen && !isPetsOpen) &&
+ { (activeModelKey.length > 0 && !isWardrobeOpen && !isPetsOpen && !isNftOpen) &&
{ /* right: preview + actions */ }
diff --git a/src/components/avatar-editor/figure-set/AvatarEditorFigureSetItemView.tsx b/src/components/avatar-editor/figure-set/AvatarEditorFigureSetItemView.tsx
index fb33358..789dc74 100644
--- a/src/components/avatar-editor/figure-set/AvatarEditorFigureSetItemView.tsx
+++ b/src/components/avatar-editor/figure-set/AvatarEditorFigureSetItemView.tsx
@@ -1,4 +1,3 @@
-import { AvatarFigurePartType } from '@nitrots/nitro-renderer';
import { FC, useEffect, useState } from 'react';
import { AvatarEditorThumbnailsHelper, GetClubMemberLevel, GetConfigurationValue, IAvatarEditorCategoryPartItem } from '../../../api';
import { LayoutCurrencyIcon, LayoutGridItemProps } from '../../../common';
@@ -20,10 +19,13 @@ export const AvatarEditorFigureSetItemView: FC<{
const clubLevel = partItem.partSet?.clubLevel ?? 0;
const isHC = !GetConfigurationValue('hc.disabled', false) && (clubLevel > 0);
const isLocked = isHC && (GetClubMemberLevel() < clubLevel);
+ const isSellableNotOwned = partItem.isSellableNotOwned ?? false;
useEffect(() =>
{
- if(!setType || !setType.length || !partItem) return;
+ setAssetUrl('');
+
+ if(!setType || !setType.length || !partItem || partItem.isClear) return;
const loadImage = async () =>
{
@@ -33,28 +35,53 @@ export const AvatarEditorFigureSetItemView: FC<{
let url: string = null;
- if(setType === AvatarFigurePartType.HEAD)
+ if(setType === 'hd')
{
- url = await AvatarEditorThumbnailsHelper.buildForFace(getFigureStringWithFace(partItem.id), partIsLocked);
+ url = await AvatarEditorThumbnailsHelper.buildForFace(getFigureStringWithFace(partItem.id), partIsLocked || isSellableNotOwned);
}
else
{
- url = await AvatarEditorThumbnailsHelper.build(setType, partItem, partItem.usesColor, selectedColorParts[setType] ?? null, partIsLocked);
+ url = await AvatarEditorThumbnailsHelper.build(
+ setType,
+ partItem,
+ partItem.usesColor,
+ selectedColorParts[setType] ?? null,
+ partIsLocked || isSellableNotOwned
+ );
}
if(url && url.length) setAssetUrl(url);
};
loadImage();
- }, [ setType, partItem, selectedColorParts, getFigureStringWithFace ]);
+ }, [ setType, partItem, selectedColorParts, getFigureStringWithFace, isSellableNotOwned ]);
if(!partItem) return null;
+ const isHead = (setType === 'hd');
+
return (
-
+
+ { !partItem.isClear && assetUrl && !isHead &&
+ }
{ !partItem.isClear && isHC &&
);
};
diff --git a/src/components/avatar-editor/figure-set/AvatarEditorFigureSetView.tsx b/src/components/avatar-editor/figure-set/AvatarEditorFigureSetView.tsx
index 7d7bd68..179f894 100644
--- a/src/components/avatar-editor/figure-set/AvatarEditorFigureSetView.tsx
+++ b/src/components/avatar-editor/figure-set/AvatarEditorFigureSetView.tsx
@@ -7,9 +7,10 @@ import { AvatarEditorFigureSetItemView } from './AvatarEditorFigureSetItemView';
export const AvatarEditorFigureSetView: FC<{
category: IAvatarEditorCategory;
columnCount: number;
+ estimateSize?: number;
}> = props =>
{
- const { category = null, columnCount = 3 } = props;
+ const { category = null, columnCount = 3, estimateSize = 50 } = props;
const { selectedParts = null, selectEditorPart } = useAvatarEditor();
const isPartItemSelected = (partItem: IAvatarEditorCategoryPartItem) =>
@@ -29,7 +30,7 @@ export const AvatarEditorFigureSetView: FC<{
};
return (
- columnCount={ columnCount } estimateSize={ 50 } itemRender={ (item: IAvatarEditorCategoryPartItem) =>
+ columnCount={ columnCount } estimateSize={ estimateSize } itemRender={ (item: IAvatarEditorCategoryPartItem) =>
{
if(!item) return null;
diff --git a/src/components/avatar-editor/index.ts b/src/components/avatar-editor/index.ts
index 30769a7..5b21fd7 100644
--- a/src/components/avatar-editor/index.ts
+++ b/src/components/avatar-editor/index.ts
@@ -1,6 +1,7 @@
export * from './AvatarEditorFigurePreviewView';
export * from './AvatarEditorIcon';
export * from './AvatarEditorModelView';
+export * from './AvatarEditorNftView';
export * from './AvatarEditorPetView';
export * from './AvatarEditorView';
export * from './AvatarEditorWardrobeView';
diff --git a/src/components/catalog/CatalogModernView.tsx b/src/components/catalog/CatalogModernView.tsx
index ec19b70..95368b0 100644
--- a/src/components/catalog/CatalogModernView.tsx
+++ b/src/components/catalog/CatalogModernView.tsx
@@ -111,7 +111,7 @@ const CatalogModernViewInner: FC<{}> = () =>
className={ `flex items-center gap-2 mx-1 px-1.5 py-1.5 rounded cursor-pointer transition-all duration-150 ${ showFavorites ? 'bg-primary text-white' : 'hover:bg-card-grid-item-active' }` }
onClick={ () => setShowFavorites(!showFavorites) }
>
-
+
}
+
0 ? 'text-danger' : 'text-muted' }` } />
{ totalFavs > 0 &&
@@ -163,7 +163,7 @@ const CatalogModernViewInner: FC<{}> = () =>
activateNode(child);
} }
>
-
+
= props =>
{
- const { icon = 0 } = props;
+ const { icon = 0, className = '' } = props;
- const getIconUrl = useMemo(() =>
+ const iconUrl = useMemo(() =>
{
return ((GetConfigurationValue('catalog.asset.icon.url')).replace('%name%', icon.toString()));
}, [ icon ]);
- return = props =>
title={ node.localization }
onClick={ onClick }
>
-
- = props =>
onClick={ () => { openPageByOfferId(fav.offerId); onClose(); } }
>
{ /* Furni icon */ }
-
+
{ node.localization }
diff --git a/src/components/catalog/views/favorites/CatalogFavoritesView.tsx b/src/components/catalog/views/favorites/CatalogFavoritesView.tsx
index 676f771..77b02e6 100644
--- a/src/components/catalog/views/favorites/CatalogFavoritesView.tsx
+++ b/src/components/catalog/views/favorites/CatalogFavoritesView.tsx
@@ -121,7 +121,7 @@ export const CatalogFavoritesView: FC
+
{ fav.iconUrl
?
: fav.nodeIconId !== null
diff --git a/src/components/catalog/views/navigation/CatalogNavigationItemView.tsx b/src/components/catalog/views/navigation/CatalogNavigationItemView.tsx
index d31d801..f897cad 100644
--- a/src/components/catalog/views/navigation/CatalogNavigationItemView.tsx
+++ b/src/components/catalog/views/navigation/CatalogNavigationItemView.tsx
@@ -86,7 +86,7 @@ export const CatalogNavigationItemView: FC = pro
>
{ adminMode &&
+
= props => {
- const { isError = false, message = '' } = props;
+ const { isError = false, message = '', homeUrl = '' } = props;
return (
@@ -19,11 +20,16 @@ export const LoadingView: FC = props => {
{ isError && (message && message.length) ?
- Something went wrong while loading
-
-
:
diff --git a/src/components/reconnect/ReconnectView.tsx b/src/components/reconnect/ReconnectView.tsx
index 4c13094..af8e896 100644
--- a/src/components/reconnect/ReconnectView.tsx
+++ b/src/components/reconnect/ReconnectView.tsx
@@ -48,14 +48,14 @@ export const ReconnectView: FC<{}> = props =>
const handleReload = useCallback(() =>
{
- window.location.reload();
+ window.location.href = window.location.origin + '/';
}, []);
const handleGoHome = useCallback(() =>
{
sessionStorage.removeItem('nitro.session.lastRoomId');
sessionStorage.removeItem('nitro.session.lastRoomPassword');
- window.location.reload();
+ window.location.href = window.location.origin + '/';
}, []);
if(!isReconnecting && !hasFailed) return null;
@@ -92,24 +92,18 @@ export const ReconnectView: FC<{}> = props =>
<>
⚠
- Connection failed
+ Session expired
- Unable to reconnect to the server after multiple attempts.
+ Your session has expired. Please log in again to enter the hotel.
= props
onClick={ () => setDropdownOpen(!dropdownOpen) }>
{ dropdownOpen ? `${LocalizeText('widget.furni.present.close')} Buildtools` : `${LocalizeText('navigator.roomsettings.doormode.open')} Buildtools` }
-
{ dropdownOpen &&
{ /* Left panel: position + rotation */ }
diff --git a/src/components/toolbar/ToolbarView.tsx b/src/components/toolbar/ToolbarView.tsx
index fbb5ae8..ea9fb16 100644
--- a/src/components/toolbar/ToolbarView.tsx
+++ b/src/components/toolbar/ToolbarView.tsx
@@ -96,8 +96,6 @@ export const ToolbarView: FC<{ isInRoom: boolean }> = props =>
CreateLinkEvent('camera/toggle') } /> }
{ isMod &&
CreateLinkEvent('mod-tools/toggle') } /> }
- { isMod &&
- CreateLinkEvent('furni-editor/toggle') } /> }
diff --git a/src/components/wired/views/actions/WiredActionLayoutView.tsx b/src/components/wired/views/actions/WiredActionLayoutView.tsx
index 051ae58..2ebefff 100644
--- a/src/components/wired/views/actions/WiredActionLayoutView.tsx
+++ b/src/components/wired/views/actions/WiredActionLayoutView.tsx
@@ -57,8 +57,10 @@ import { WiredExtraMoveCarryUsersView } from '../extras/WiredExtraMoveCarryUsers
import { WiredExtraExecuteInOrderView } from '../extras/WiredExtraExecuteInOrderView';
import { WiredExtraExecutionLimitView } from '../extras/WiredExtraExecutionLimitView';
import { WiredExtraMoveNoAnimationView } from '../extras/WiredExtraMoveNoAnimationView';
+import { WiredExtraOrEvalView } from '../extras/WiredExtraOrEvalView';
import { WiredExtraMovePhysicsView } from '../extras/WiredExtraMovePhysicsView';
import { WiredExtraRandomView } from '../extras/WiredExtraRandomView';
+import { WiredExtraTextOutputUsernameView } from '../extras/WiredExtraTextOutputUsernameView';
import { WiredExtraUnseenView } from '../extras/WiredExtraUnseenView';
export const WiredActionLayoutView = (code: number) =>
@@ -189,6 +191,10 @@ export const WiredActionLayoutView = (code: number) =>
return setFurniSource(normalizeFurniSource(value)) } /> }>
+
+ );
+};
diff --git a/src/components/wired/views/extras/WiredExtraTextOutputUsernameView.tsx b/src/components/wired/views/extras/WiredExtraTextOutputUsernameView.tsx
new file mode 100644
index 0000000..1aa3856
--- /dev/null
+++ b/src/components/wired/views/extras/WiredExtraTextOutputUsernameView.tsx
@@ -0,0 +1,123 @@
+import { FC, useEffect, useMemo, useState } from 'react';
+import { LocalizeText, WiredFurniType } from '../../../../api';
+import { Text } from '../../../../common';
+import { useWired } from '../../../../hooks';
+import { NitroInput } from '../../../../layout';
+import { WiredSourcesSelector, CLICKED_USER_SOURCE_VALUE } from '../WiredSourcesSelector';
+import { WiredExtraBaseView } from './WiredExtraBaseView';
+
+const TYPE_SINGLE = 1;
+const TYPE_MULTIPLE = 2;
+const DEFAULT_PLACEHOLDER_NAME = '';
+const DEFAULT_DELIMITER = ', ';
+const MAX_PLACEHOLDER_NAME_LENGTH = 32;
+const MAX_DELIMITER_LENGTH = 16;
+const PLACEHOLDER_WRAPPER_PATTERN = /^\$\((.*)\)$/;
+
+const normalizePlaceholderType = (value: number) => ((value === TYPE_MULTIPLE) ? TYPE_MULTIPLE : TYPE_SINGLE);
+const normalizeUserSource = (value: number) => ((value === 0) || (value === 200) || (value === 201) || (value === CLICKED_USER_SOURCE_VALUE) ? value : 0);
+const normalizePlaceholderName = (value: string) =>
+{
+ let normalizedValue = (value ?? '').trim().replace(/[\t\r\n]/g, '');
+
+ if(PLACEHOLDER_WRAPPER_PATTERN.test(normalizedValue))
+ {
+ normalizedValue = normalizedValue.substring(2, normalizedValue.length - 1).trim();
+ }
+
+ return normalizedValue.slice(0, MAX_PLACEHOLDER_NAME_LENGTH);
+};
+
+const normalizeDelimiter = (value: string) =>
+{
+ if(value === undefined || value === null) return DEFAULT_DELIMITER;
+
+ return value.replace(/[\t\r\n]/g, '').slice(0, MAX_DELIMITER_LENGTH);
+};
+
+const splitStringData = (value: string) =>
+{
+ if(!value?.length) return [ DEFAULT_PLACEHOLDER_NAME, DEFAULT_DELIMITER ];
+
+ const parts = value.split('\t');
+
+ if(parts.length <= 1) return [ value, DEFAULT_DELIMITER ];
+
+ return [ parts[0], parts[1] ];
+};
+
+const escapeHtml = (value: string) => value
+ .replace(/&/g, '&')
+ .replace(//g, '>')
+ .replace(/"/g, '"')
+ .replace(/'/g, ''');
+
+export const WiredExtraTextOutputUsernameView: FC<{}> = () =>
+{
+ const { trigger = null, setIntParams = null, setStringParam = null } = useWired();
+ const [ placeholderName, setPlaceholderName ] = useState(DEFAULT_PLACEHOLDER_NAME);
+ const [ placeholderType, setPlaceholderType ] = useState(TYPE_SINGLE);
+ const [ delimiter, setDelimiter ] = useState(DEFAULT_DELIMITER);
+ const [ userSource, setUserSource ] = useState(0);
+
+ useEffect(() =>
+ {
+ if(!trigger) return;
+
+ const [ nextPlaceholderName, nextDelimiter ] = splitStringData(trigger.stringData);
+
+ setPlaceholderName(normalizePlaceholderName(nextPlaceholderName));
+ setDelimiter(normalizeDelimiter(nextDelimiter));
+ setPlaceholderType(normalizePlaceholderType((trigger.intData.length > 0) ? trigger.intData[0] : TYPE_SINGLE));
+ setUserSource(normalizeUserSource((trigger.intData.length > 1) ? trigger.intData[1] : 0));
+ }, [ trigger ]);
+
+ const previewToken = useMemo(() =>
+ {
+ const effectiveName = normalizePlaceholderName(placeholderName) || 'placeholder';
+
+ return `$(${ effectiveName })`;
+ }, [ placeholderName ]);
+
+ const previewHtml = useMemo(() => LocalizeText('wiredfurni.params.texts.placeholder_preview', [ 'placeholder' ], [ escapeHtml(previewToken) ]), [ previewToken ]);
+
+ const save = () =>
+ {
+ setIntParams([ normalizePlaceholderType(placeholderType), normalizeUserSource(userSource) ]);
+ setStringParam(`${ normalizePlaceholderName(placeholderName) }\t${ normalizeDelimiter(delimiter) }`);
+ };
+
+ return (
+ setUserSource(normalizeUserSource(value)) } /> }>
+
+ );
+};
diff --git a/src/css/index.css b/src/css/index.css
index 0e0dc01..709acdb 100644
--- a/src/css/index.css
+++ b/src/css/index.css
@@ -30,51 +30,45 @@ body {
}
::-webkit-scrollbar {
- width: .5rem
+ width: .625rem;
}
::-webkit-scrollbar:horizontal {
- height: .5rem
+ height: .625rem;
}
::-webkit-scrollbar:not(:horizontal) {
- width: .5rem
+ width: .625rem;
}
-::-webkit-scrollbar-track:horizontal {
- border-bottom: .25rem solid rgba(0, 0, 0, .1)
+::-webkit-scrollbar-track {
+ background: rgba(0, 0, 0, .08);
+ border-radius: .5rem;
}
-::-webkit-scrollbar-track:not(:horizontal) {
- border-right: .25rem solid rgba(0, 0, 0, .1)
+::-webkit-scrollbar-thumb {
+ background: rgba(30, 114, 149, .35);
+ border-radius: .5rem;
+ border: 2px solid transparent;
+ background-clip: padding-box;
}
-::-webkit-scrollbar-thumb:horizontal {
- border-bottom: .25rem solid rgba(30, 114, 149, .4)
+::-webkit-scrollbar-thumb:hover {
+ background: rgba(30, 114, 149, .6);
+ border-radius: .5rem;
+ border: 2px solid transparent;
+ background-clip: padding-box;
}
-::-webkit-scrollbar-thumb:horizontal:hover {
- border-bottom: .25rem solid rgba(30, 114, 149, .8)
-}
-
-::-webkit-scrollbar-thumb:horizontal:active {
- border-bottom: .25rem solid #185D79
-}
-
-::-webkit-scrollbar-thumb:not(:horizontal) {
- border-right: .25rem solid rgba(30, 114, 149, .4)
-}
-
-::-webkit-scrollbar-thumb:not(:horizontal):hover {
- border-right: .25rem solid rgba(30, 114, 149, .8)
-}
-
-::-webkit-scrollbar-thumb:not(:horizontal):active {
- border-right: .25rem solid #185D79
+::-webkit-scrollbar-thumb:active {
+ background: #185D79;
+ border-radius: .5rem;
+ border: 2px solid transparent;
+ background-clip: padding-box;
}
::-webkit-scrollbar-corner {
- background: rgba(0, 0, 0, .1)
+ background: rgba(0, 0, 0, .08);
}
@layer components {
@@ -447,219 +441,7 @@ body {
}
}
-.nitro-avatar-editor-spritesheet {
- background: url('@/assets/images/avatareditor/avatar-editor-spritesheet.png') transparent no-repeat;
-
- &.arrow-left-icon {
- width: 28px;
- height: 21px;
- background-position: -226px -131px;
- }
-
- &.arrow-right-icon {
- width: 28px;
- height: 21px;
- background-position: -226px -162px;
- }
-
- &.ca-icon {
- width: 25px;
- height: 25px;
- background-position: -226px -61px;
-
- &.selected {
- width: 25px;
- height: 25px;
- background-position: -226px -96px;
- }
- }
-
- &.cc-icon {
- width: 31px;
- height: 29px;
- background-position: -145px -5px;
-
- &.selected {
- width: 31px;
- height: 29px;
- background-position: -145px -44px;
- }
- }
-
- &.ch-icon {
- width: 29px;
- height: 24px;
- background-position: -186px -39px;
-
- &.selected {
- width: 29px;
- height: 24px;
- background-position: -186px -73px;
- }
- }
-
- &.clear-icon {
- width: 27px;
- height: 27px;
- background-position: -145px -157px;
- }
-
- &.cp-icon {
- width: 30px;
- height: 24px;
- background-position: -145px -264px;
-
- &.selected {
- width: 30px;
- height: 24px;
- background-position: -186px -5px;
- }
- }
-
-
- &.ea-icon {
- width: 35px;
- height: 16px;
- background-position: -226px -193px;
-
- &.selected {
- width: 35px;
- height: 16px;
- background-position: -226px -219px;
- }
- }
-
- &.fa-icon {
- width: 27px;
- height: 20px;
- background-position: -186px -137px;
-
- &.selected {
- width: 27px;
- height: 20px;
- background-position: -186px -107px;
- }
- }
-
- &.female-icon {
- width: 18px;
- height: 27px;
- background-position: -186px -202px;
-
- &.selected {
- width: 18px;
- height: 27px;
- background-position: -186px -239px;
- }
- }
-
- &.ha-icon {
- width: 25px;
- height: 22px;
- background-position: -226px -245px;
-
- &.selected {
- width: 25px;
- height: 22px;
- background-position: -226px -277px;
- }
- }
-
- &.he-icon {
- width: 31px;
- height: 27px;
- background-position: -145px -83px;
-
- &.selected {
- width: 31px;
- height: 27px;
- background-position: -145px -120px;
- }
- }
-
- &.hr-icon {
- width: 29px;
- height: 25px;
- background-position: -145px -194px;
-
- &.selected {
- width: 29px;
- height: 25px;
- background-position: -145px -229px;
- }
- }
-
- &.lg-icon {
- width: 19px;
- height: 20px;
- background-position: -303px -45px;
-
- &.selected {
- width: 19px;
- height: 20px;
- background-position: -303px -75px;
- }
- }
-
- &.loading-icon {
- width: 21px;
- height: 25px;
- background-position: -186px -167px;
- }
-
-
- &.male-icon {
- width: 21px;
- height: 21px;
- background-position: -186px -276px;
-
- &.selected {
- width: 21px;
- height: 21px;
- background-position: -272px -5px;
- }
- }
-
-
- &.sellable-icon {
- width: 17px;
- height: 15px;
- background-position: -303px -105px;
- }
-
-
- &.sh-icon {
- width: 37px;
- height: 10px;
- background-position: -303px -5px;
-
- &.selected {
- width: 37px;
- height: 10px;
- background-position: -303px -25px;
- }
- }
-
-
- &.spotlight-icon {
- width: 130px;
- height: 305px;
- background-position: -5px -5px;
- }
-
-
- &.wa-icon {
- width: 36px;
- height: 18px;
- background-position: -226px -5px;
-
- &.selected {
- width: 36px;
- height: 18px;
- background-position: -226px -33px;
- }
- }
-}
+/* Avatar editor icons are now rendered as ![]()
tags via AvatarEditorIcon.tsx */
.nitro-avatar-editor-wardrobe-figure-preview {
background-color: #677181;
@@ -710,7 +492,7 @@ body {
.category-item {
- height: 40px;
+ height: 32px;
}
.figure-preview-container {
@@ -1180,6 +962,15 @@ body {
background-position: center;
background-size: 22px 22px;
}
+
+ .tab-nft {
+ width: 34px;
+ height: 22px;
+ background-image: url('@/assets/images/wardrobe/nft.png');
+ background-repeat: no-repeat;
+ background-position: center;
+ background-size: 22px 22px;
+ }
}
/* ── Avatar Editor misc ─────────────────────────────────────────────────── */
@@ -1232,6 +1023,27 @@ body {
overflow: hidden !important;
}
+.pet-sellable-locked {
+ opacity: 0.5;
+ cursor: not-allowed !important;
+ position: relative;
+}
+
+.pet-sellable-badge {
+ position: absolute;
+ bottom: 2px;
+ right: 2px;
+ display: flex;
+ align-items: center;
+ gap: 1px;
+ background-color: rgba(0, 0, 0, 0.6);
+ border-radius: 3px;
+ padding: 1px 3px;
+ font-size: 9px;
+ color: #ffd700;
+ font-weight: bold;
+}
+
.pet-remove-btn {
background: none;
border: none;
diff --git a/src/hooks/avatar-editor/useAvatarEditor.ts b/src/hooks/avatar-editor/useAvatarEditor.ts
index 21a1cc0..19a39bb 100644
--- a/src/hooks/avatar-editor/useAvatarEditor.ts
+++ b/src/hooks/avatar-editor/useAvatarEditor.ts
@@ -15,6 +15,7 @@ const useAvatarEditorState = () =>
const [ maxPaletteCount, setMaxPaletteCount ] = useState(1);
const [ figureSetIds, setFigureSetIds ] = useState([]);
const [ boundFurnitureNames, setBoundFurnitureNames ] = useState([]);
+ const [ figureSetNames, setFigureSetNames ] = useState>({});
const [ savedFigures, setSavedFigures ] = useState<[ IAvatarFigureContainer, string ][]>(null);
const { selectedColors, gender, setGender, loadAvatarData, selectPart, selectColor, getFigureString, getFigureStringWithFace, selectedParts } = useFigureData();
@@ -65,6 +66,8 @@ const useAvatarEditorState = () =>
if(GetClubMemberLevel() < partItem.partSet.clubLevel) return;
+ if(partItem.isSellableNotOwned) return;
+
setMaxPaletteCount(partItem.maxPaletteCount || 1);
selectPart(setType, partId);
@@ -194,12 +197,27 @@ const useAvatarEditorState = () =>
loadAvatarData(figureContainer.getFigureString(), gender);
}, [ figureSetIds, gender, loadAvatarData, selectedColors, selectedParts ]);
+ const nftFigureSetIds = useMemo(() =>
+ {
+ const nftSetIds = new Set();
+
+ for(const [ setId, furnitureName ] of Object.entries(figureSetNames))
+ {
+ if(!furnitureName?.toLowerCase().includes('nft')) continue;
+
+ nftSetIds.add(Number(setId));
+ }
+
+ return nftSetIds;
+ }, [ figureSetNames ]);
+
useMessageEvent(FigureSetIdsMessageEvent, event =>
{
const parser = event.getParser();
setFigureSetIds(parser.figureSetIds);
setBoundFurnitureNames(parser.boundsFurnitureNames);
+ setFigureSetNames(parser.figureSetNameMap);
});
useMessageEvent(UserWardrobePageEvent, event =>
@@ -236,8 +254,10 @@ const useAvatarEditorState = () =>
if(!isVisible) return;
const newAvatarModels: { [index: string]: IAvatarEditorCategory[] } = {};
+ const buildModeDefault = 'default';
+ const buildModeNft = 'nft';
- const buildCategory = (setType: string) =>
+ const buildCategory = (setType: string, buildMode: string = buildModeDefault) =>
{
const partItems: IAvatarEditorCategoryPartItem[] = [];
const colorItems: IPartColor[][] = [];
@@ -245,12 +265,9 @@ const useAvatarEditorState = () =>
for(let i = 0; i < MAX_PALETTES; i++) colorItems.push([]);
const set = GetAvatarRenderManager().structureData.getSetType(setType);
-
- if(!set) return null;
-
const palette = GetAvatarRenderManager().structureData.getPalette(set.paletteID);
- if(!palette) return null;
+ if(!set || !palette) return null;
for(const partColor of palette.colors.getValues())
{
@@ -274,13 +291,22 @@ const useAvatarEditorState = () =>
if(!partSet || !partSet.isSelectable || ((partSet.gender !== gender) && (partSet.gender !== AvatarFigurePartType.UNISEX))) continue;
- if(partSet.isSellable && figureSetIds.indexOf(partSet.id) === -1) continue;
+ const isNftPartSet = nftFigureSetIds.size > 0
+ ? nftFigureSetIds.has(partSet.id)
+ : GetAvatarRenderManager().downloadManager.isNftPartSet(partSet);
+
+ if((buildMode === buildModeDefault) && isNftPartSet) continue;
+ if((buildMode === buildModeNft) && !isNftPartSet) continue;
+
+ const isSellableNotOwned = partSet.isSellable && figureSetIds.indexOf(partSet.id) === -1;
+
+ if(isSellableNotOwned && (buildMode !== buildModeNft) && setType !== AvatarFigurePartType.PET) continue;
let maxPaletteCount = 0;
for(const part of partSet.parts) maxPaletteCount = Math.max(maxPaletteCount, part.colorLayerIndex);
- partItems.push({ id: partSet.id, partSet, usesColor, maxPaletteCount });
+ partItems.push({ id: partSet.id, partSet, usesColor, maxPaletteCount, isSellableNotOwned });
}
partItems.sort(AvatarEditorPartSorter(false));
@@ -290,16 +316,31 @@ const useAvatarEditorState = () =>
return { setType, partItems, colorItems };
};
- newAvatarModels[AvatarEditorFigureCategory.GENERIC] = [ AvatarFigurePartType.HEAD ].map(setType => buildCategory(setType)).filter(Boolean);
- newAvatarModels[AvatarEditorFigureCategory.HEAD] = [ AvatarFigurePartType.HAIR, AvatarFigurePartType.HEAD_ACCESSORY, AvatarFigurePartType.HEAD_ACCESSORY_EXTRA, AvatarFigurePartType.EYE_ACCESSORY, AvatarFigurePartType.FACE_ACCESSORY ].map(setType => buildCategory(setType)).filter(Boolean);
- newAvatarModels[AvatarEditorFigureCategory.TORSO] = [ AvatarFigurePartType.CHEST, AvatarFigurePartType.CHEST_PRINT, AvatarFigurePartType.COAT_CHEST, AvatarFigurePartType.CHEST_ACCESSORY ].map(setType => buildCategory(setType)).filter(Boolean);
- newAvatarModels[AvatarEditorFigureCategory.LEGS] = [ AvatarFigurePartType.LEGS, AvatarFigurePartType.SHOES, AvatarFigurePartType.WAIST_ACCESSORY ].map(setType => buildCategory(setType)).filter(Boolean);
+ newAvatarModels[AvatarEditorFigureCategory.GENERIC] = [ AvatarFigurePartType.HEAD ].map(setType => buildCategory(setType, buildModeDefault));
+ newAvatarModels[AvatarEditorFigureCategory.HEAD] = [ AvatarFigurePartType.HAIR, AvatarFigurePartType.HEAD_ACCESSORY, AvatarFigurePartType.HEAD_ACCESSORY_EXTRA, AvatarFigurePartType.EYE_ACCESSORY, AvatarFigurePartType.FACE_ACCESSORY ].map(setType => buildCategory(setType, buildModeDefault));
+ newAvatarModels[AvatarEditorFigureCategory.TORSO] = [ AvatarFigurePartType.CHEST, AvatarFigurePartType.CHEST_PRINT, AvatarFigurePartType.COAT_CHEST, AvatarFigurePartType.CHEST_ACCESSORY ].map(setType => buildCategory(setType, buildModeDefault));
+ newAvatarModels[AvatarEditorFigureCategory.LEGS] = [ AvatarFigurePartType.LEGS, AvatarFigurePartType.SHOES, AvatarFigurePartType.WAIST_ACCESSORY ].map(setType => buildCategory(setType, buildModeDefault));
newAvatarModels[AvatarEditorFigureCategory.PETS] = [ AvatarFigurePartType.PET ].map(setType => buildCategory(setType)).filter(Boolean);
+ newAvatarModels[AvatarEditorFigureCategory.NFT] = [
+ AvatarFigurePartType.HEAD,
+ AvatarFigurePartType.HAIR,
+ AvatarFigurePartType.HEAD_ACCESSORY,
+ AvatarFigurePartType.HEAD_ACCESSORY_EXTRA,
+ AvatarFigurePartType.EYE_ACCESSORY,
+ AvatarFigurePartType.FACE_ACCESSORY,
+ AvatarFigurePartType.CHEST,
+ AvatarFigurePartType.CHEST_PRINT,
+ AvatarFigurePartType.COAT_CHEST,
+ AvatarFigurePartType.CHEST_ACCESSORY,
+ AvatarFigurePartType.LEGS,
+ AvatarFigurePartType.SHOES,
+ AvatarFigurePartType.WAIST_ACCESSORY
+ ].map(setType => buildCategory(setType, buildModeNft)).filter(Boolean);
newAvatarModels[AvatarEditorFigureCategory.WARDROBE] = [];
setAvatarModels(newAvatarModels);
setActiveModelKey(AvatarEditorFigureCategory.GENERIC);
- }, [ isVisible, gender, figureSetIds ]);
+ }, [ isVisible, gender, figureSetIds, nftFigureSetIds ]);
useEffect(() =>
{
diff --git a/src/hooks/furni-editor/index.ts b/src/hooks/furni-editor/index.ts
deleted file mode 100644
index 47ce6ef..0000000
--- a/src/hooks/furni-editor/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './useFurniEditor';
diff --git a/src/hooks/furni-editor/useFurniEditor.ts b/src/hooks/furni-editor/useFurniEditor.ts
deleted file mode 100644
index e4258e5..0000000
--- a/src/hooks/furni-editor/useFurniEditor.ts
+++ /dev/null
@@ -1,239 +0,0 @@
-import { useCallback, useState } from 'react';
-
-export interface FurniItem
-{
- id: number;
- spriteId: number;
- itemName: string;
- publicName: string;
- type: string;
- width: number;
- length: number;
- stackHeight: number;
- allowStack: boolean;
- allowWalk: boolean;
- allowSit: boolean;
- allowLay: boolean;
- interactionType: string;
- interactionModesCount: number;
-}
-
-export interface FurniDetail extends FurniItem
-{
- allowGift: boolean;
- allowTrade: boolean;
- allowRecycle: boolean;
- allowMarketplaceSell: boolean;
- allowInventoryStack: boolean;
- vendingIds: string;
- customparams: string;
- effectIdMale: number;
- effectIdFemale: number;
- clothingOnWalk: string;
- multiheight: string;
- description: string;
- usageCount: number;
-}
-
-export interface CatalogRef
-{
- id: number;
- catalogName: string;
- costCredits: number;
- costPoints: number;
- pointsType: number;
- pageId: number;
- pageName: string;
-}
-
-const API_BASE = '/api/admin/furni-editor';
-
-async function apiFetch(url: string, options?: RequestInit): Promise
-{
- const res = await fetch(url, { credentials: 'include', ...options });
- const data = await res.json();
-
- if(!res.ok || data.error) throw new Error(data.error || 'API error');
-
- return data;
-}
-
-export const useFurniEditor = () =>
-{
- const [ items, setItems ] = useState([]);
- const [ total, setTotal ] = useState(0);
- const [ page, setPage ] = useState(1);
- const [ loading, setLoading ] = useState(false);
- const [ error, setError ] = useState(null);
- const [ selectedItem, setSelectedItem ] = useState(null);
- const [ catalogItems, setCatalogItems ] = useState([]);
- const [ interactions, setInteractions ] = useState([]);
- const [ furniDataEntry, setFurniDataEntry ] = useState | null>(null);
-
- const clearError = useCallback(() => setError(null), []);
-
- const searchItems = useCallback(async (query: string, type: string, pg: number) =>
- {
- setLoading(true);
- setError(null);
-
- try
- {
- const params = new URLSearchParams({ q: query, limit: '20', page: String(pg) });
-
- if(type) params.set('type', type);
-
- const data = await apiFetch<{ items: FurniItem[]; total: number; page: number }>(`${ API_BASE }?${ params }`);
-
- setItems(data.items);
- setTotal(data.total);
- setPage(data.page);
- }
- catch(e: any)
- {
- setError(e.message);
- }
- finally
- {
- setLoading(false);
- }
- }, []);
-
- const loadDetail = useCallback(async (id: number): Promise =>
- {
- setLoading(true);
- setError(null);
-
- try
- {
- const data = await apiFetch<{ item: FurniDetail; catalogItems: CatalogRef[]; furniDataEntry: Record | null }>(`${ API_BASE }/detail?id=${ id }`);
-
- setSelectedItem(data.item);
- setCatalogItems(data.catalogItems);
- setFurniDataEntry(data.furniDataEntry);
-
- return true;
- }
- catch(e: any)
- {
- setError(e.message);
-
- return false;
- }
- finally
- {
- setLoading(false);
- }
- }, []);
-
- const updateItem = useCallback(async (id: number, fields: Record) =>
- {
- setLoading(true);
- setError(null);
-
- try
- {
- await apiFetch(`${ API_BASE }/update?id=${ id }`, {
- method: 'POST',
- headers: { 'Content-Type': 'application/json' },
- body: JSON.stringify(fields)
- });
-
- return true;
- }
- catch(e: any)
- {
- setError(e.message);
-
- return false;
- }
- finally
- {
- setLoading(false);
- }
- }, []);
-
- const createItem = useCallback(async (fields: Record) =>
- {
- setLoading(true);
- setError(null);
-
- try
- {
- const data = await apiFetch<{ id: number }>(`${ API_BASE }`, {
- method: 'POST',
- headers: { 'Content-Type': 'application/json' },
- body: JSON.stringify(fields)
- });
-
- return data.id;
- }
- catch(e: any)
- {
- setError(e.message);
-
- return null;
- }
- finally
- {
- setLoading(false);
- }
- }, []);
-
- const deleteItem = useCallback(async (id: number) =>
- {
- setLoading(true);
- setError(null);
-
- try
- {
- await apiFetch(`${ API_BASE }/delete?id=${ id }`, { method: 'POST' });
-
- return true;
- }
- catch(e: any)
- {
- setError(e.message);
-
- return false;
- }
- finally
- {
- setLoading(false);
- }
- }, []);
-
- const loadInteractions = useCallback(async () =>
- {
- try
- {
- const data = await apiFetch<{ interactions: Array }>(`${ API_BASE }/interactions`);
-
- setInteractions(data.interactions.map(i => typeof i === 'string' ? i : i.name));
- }
- catch {}
- }, []);
-
- const loadBySpriteId = useCallback(async (spriteId: number): Promise =>
- {
- try
- {
- const data = await apiFetch<{ id: number }>(`${ API_BASE }/by-sprite?spriteId=${ spriteId }`);
-
- return await loadDetail(data.id);
- }
- catch(e: any)
- {
- setError(e.message);
-
- return false;
- }
- }, [ loadDetail ]);
-
- return {
- items, total, page, loading, error, clearError,
- selectedItem, setSelectedItem, catalogItems, furniDataEntry,
- interactions,
- searchItems, loadDetail, loadBySpriteId, updateItem, createItem, deleteItem, loadInteractions
- };
-};
diff --git a/src/hooks/wired/useWired.ts b/src/hooks/wired/useWired.ts
index e6e3b53..e35e211 100644
--- a/src/hooks/wired/useWired.ts
+++ b/src/hooks/wired/useWired.ts
@@ -75,14 +75,37 @@ const useWiredState = () =>
return rawValue.toLowerCase();
};
+ const getComparableInteractionNames = (furniData: any): string[] =>
+ {
+ if(!furniData) return [];
+
+ const values = [
+ getInteractionTypeName(furniData),
+ (typeof (furniData as any).className === 'string') ? (furniData as any).className.toLowerCase() : null,
+ (typeof (furniData as any).fullName === 'string') ? (furniData as any).fullName.toLowerCase() : null,
+ (typeof (furniData as any).name === 'string') ? (furniData as any).name.toLowerCase() : null
+ ];
+
+ return values.filter((value, index, array): value is string => !!value && (array.indexOf(value) === index));
+ };
+
+ const matchesAllowedPattern = (value: string, pattern: string) =>
+ {
+ const normalizedPattern = pattern.toLowerCase();
+
+ if(normalizedPattern.endsWith('*')) return value.startsWith(normalizedPattern.slice(0, -1));
+
+ return (normalizedPattern === value);
+ };
+
const isAllowedInteraction = (furniData: any): boolean =>
{
if(!allowedInteractionTypes || !allowedInteractionTypes.length) return true;
- const interactionType = getInteractionTypeName(furniData);
- if(!interactionType) return true;
+ const comparableNames = getComparableInteractionNames(furniData);
+ if(!comparableNames.length) return true;
- return allowedInteractionTypes.some(type => (type && type.toLowerCase() === interactionType));
+ return comparableNames.some(value => allowedInteractionTypes.some(type => !!type && matchesAllowedPattern(value, type)));
};
const handleDisallowedInteraction = () =>
+ { LocalizeText('wiredfurni.params.eval_mode') }
+ { MODE_OPTIONS.map(mode =>
+ {
+ return (
+
+ );
+ }) }
+ { COMPARISON_OPTIONS.map(mode =>
+ {
+ const isSelected = (evaluationMode === mode);
+
+ return (
+
+ );
+ }) }
+
+
+
+
+ { LocalizeText('wiredfurni.params.texts.placeholder_name') }
+ setPlaceholderName(normalizePlaceholderName(event.target.value)) } />
+
+
+ { LocalizeText('wiredfurni.params.texts.placeholder_type') }
+
+
+
+ { placeholderType === TYPE_MULTIPLE &&
+
+ { LocalizeText('wiredfurni.params.texts.select_delimiter') }
+ setDelimiter(normalizeDelimiter(event.target.value)) } />
+
}
+