diff --git a/src/views/wired/common/GetWiredConditionLayout.tsx b/src/views/wired/common/GetWiredConditionLayout.tsx index ac6dc69a..4e5d38bb 100644 --- a/src/views/wired/common/GetWiredConditionLayout.tsx +++ b/src/views/wired/common/GetWiredConditionLayout.tsx @@ -56,4 +56,6 @@ export function GetWiredConditionLayout(code: number): JSX.Element case WiredConditionlayout.NOT_USER_COUNT_IN: return ; } + + return null; } diff --git a/src/views/wired/views/conditions/actor-has-hand-item/WiredConditionActorHasHandItem.tsx b/src/views/wired/views/conditions/actor-has-hand-item/WiredConditionActorHasHandItem.tsx index fe746924..fe4aefe3 100644 --- a/src/views/wired/views/conditions/actor-has-hand-item/WiredConditionActorHasHandItem.tsx +++ b/src/views/wired/views/conditions/actor-has-hand-item/WiredConditionActorHasHandItem.tsx @@ -4,10 +4,10 @@ import { useWiredContext } from '../../../context/WiredContext'; import { WiredFurniType } from '../../../WiredView.types'; import { WiredConditionBaseView } from '../base/WiredConditionBaseView'; +const allowedHanditemIds: number[] = [ 2, 5, 7, 8, 9, 10, 27 ]; + export const WiredConditionActorHasHandItemView: FC<{}> = props => { - const allowedHanditemIds: number[] = [2, 5, 7, 8, 9, 10, 27]; - const [ handItemId, setHandItemId ] = useState(-1); const { trigger = null, setIntParams = null } = useWiredContext(); @@ -18,18 +18,20 @@ export const WiredConditionActorHasHandItemView: FC<{}> = props => const save = useCallback(() => { - setIntParams([handItemId]); + setIntParams([ handItemId ]); }, [ handItemId, setIntParams ]); return ( -
{ LocalizeText('wiredfurni.params.handitem') }
- +
+ + +
); } diff --git a/src/views/wired/views/conditions/actor-is-group-member/WiredConditionActorIsGroupMemberView.tsx b/src/views/wired/views/conditions/actor-is-group-member/WiredConditionActorIsGroupMemberView.tsx index cfda370f..8221f74b 100644 --- a/src/views/wired/views/conditions/actor-is-group-member/WiredConditionActorIsGroupMemberView.tsx +++ b/src/views/wired/views/conditions/actor-is-group-member/WiredConditionActorIsGroupMemberView.tsx @@ -4,7 +4,5 @@ import { WiredConditionBaseView } from '../base/WiredConditionBaseView'; export const WiredConditionActorIsGroupMemberView: FC<{}> = props => { - return ( - - ); + return ; } diff --git a/src/views/wired/views/conditions/actor-is-on-furni/WiredConditionActorIsOnFurniView.tsx b/src/views/wired/views/conditions/actor-is-on-furni/WiredConditionActorIsOnFurniView.tsx index b71c5415..fbafd294 100644 --- a/src/views/wired/views/conditions/actor-is-on-furni/WiredConditionActorIsOnFurniView.tsx +++ b/src/views/wired/views/conditions/actor-is-on-furni/WiredConditionActorIsOnFurniView.tsx @@ -4,7 +4,5 @@ import { WiredConditionBaseView } from '../base/WiredConditionBaseView'; export const WiredConditionActorIsOnFurniView: FC<{}> = props => { - return ( - - ); + return ; } diff --git a/src/views/wired/views/conditions/actor-is-team-member/WiredConditionActorIsTeamMemberView.tsx b/src/views/wired/views/conditions/actor-is-team-member/WiredConditionActorIsTeamMemberView.tsx index 58b394e6..851088a3 100644 --- a/src/views/wired/views/conditions/actor-is-team-member/WiredConditionActorIsTeamMemberView.tsx +++ b/src/views/wired/views/conditions/actor-is-team-member/WiredConditionActorIsTeamMemberView.tsx @@ -4,6 +4,8 @@ import { useWiredContext } from '../../../context/WiredContext'; import { WiredFurniType } from '../../../WiredView.types'; import { WiredConditionBaseView } from '../base/WiredConditionBaseView'; +const teamIds: number[] = [ 1, 2, 3, 4 ]; + export const WiredConditionActorIsTeamMemberView: FC<{}> = props => { const [ selectedTeam, setSelectedTeam ] = useState(-1); @@ -16,23 +18,25 @@ export const WiredConditionActorIsTeamMemberView: FC<{}> = props => const save = useCallback(() => { - setIntParams([selectedTeam]); + setIntParams([ selectedTeam ]); }, [ selectedTeam, setIntParams ]); return ( -
{ LocalizeText('wiredfurni.params.team') }
- { [1, 2, 3, 4].map(team => - { - return ( -
- setSelectedTeam(team)} /> - -
- ) - }) } +
+ + { teamIds.map((value, index) => + { + return ( +
+ setSelectedTeam(value) } /> + +
+ ) + }) } +
); } diff --git a/src/views/wired/views/conditions/actor-is-wearing-badge/WiredConditionActorIsWearingBadgeView.tsx b/src/views/wired/views/conditions/actor-is-wearing-badge/WiredConditionActorIsWearingBadgeView.tsx index 8c3761cd..cfeef2ce 100644 --- a/src/views/wired/views/conditions/actor-is-wearing-badge/WiredConditionActorIsWearingBadgeView.tsx +++ b/src/views/wired/views/conditions/actor-is-wearing-badge/WiredConditionActorIsWearingBadgeView.tsx @@ -21,7 +21,7 @@ export const WiredConditionActorIsWearingBadgeView: FC<{}> = props => return ( -
+
setBadge(event.target.value) } />
diff --git a/src/views/wired/views/conditions/actor-is-wearing-effect/WiredConditionActorIsWearingEffectView.tsx b/src/views/wired/views/conditions/actor-is-wearing-effect/WiredConditionActorIsWearingEffectView.tsx index 41a4c739..4242720a 100644 --- a/src/views/wired/views/conditions/actor-is-wearing-effect/WiredConditionActorIsWearingEffectView.tsx +++ b/src/views/wired/views/conditions/actor-is-wearing-effect/WiredConditionActorIsWearingEffectView.tsx @@ -16,14 +16,14 @@ export const WiredConditionActorIsWearingEffectView: FC<{}> = props => const save = useCallback(() => { - setIntParams([effect]); + setIntParams([ effect ]); }, [ effect, setIntParams ]); return ( -
+
- setEffect(Number(event.target.value)) } /> + setEffect(parseInt(event.target.value)) } />
); diff --git a/src/views/wired/views/conditions/furni-has-avatar-on/WiredConditionFurniHasAvatarOnView.tsx b/src/views/wired/views/conditions/furni-has-avatar-on/WiredConditionFurniHasAvatarOnView.tsx index 9af8f481..286273ae 100644 --- a/src/views/wired/views/conditions/furni-has-avatar-on/WiredConditionFurniHasAvatarOnView.tsx +++ b/src/views/wired/views/conditions/furni-has-avatar-on/WiredConditionFurniHasAvatarOnView.tsx @@ -4,7 +4,5 @@ import { WiredConditionBaseView } from '../base/WiredConditionBaseView'; export const WiredConditionFurniHasAvatarOnView: FC<{}> = props => { - return ( - - ); + return ; } diff --git a/src/views/wired/views/conditions/furni-has-furni-on/WiredConditionFurniHasFurniOnView.tsx b/src/views/wired/views/conditions/furni-has-furni-on/WiredConditionFurniHasFurniOnView.tsx index 62e2db0d..1a41594f 100644 --- a/src/views/wired/views/conditions/furni-has-furni-on/WiredConditionFurniHasFurniOnView.tsx +++ b/src/views/wired/views/conditions/furni-has-furni-on/WiredConditionFurniHasFurniOnView.tsx @@ -16,23 +16,25 @@ export const WiredConditionFurniHasFurniOnView: FC<{}> = props => const save = useCallback(() => { - setIntParams([requireAll]); + setIntParams([ requireAll ]); }, [ requireAll, setIntParams ]); return ( -
{ LocalizeText('wiredfurni.params.requireall') }
- { [0, 1].map(option => - { - return ( -
- setRequireAll(option)} /> - -
- ) - }) } +
+ + { [0, 1].map(value => + { + return ( +
+ setRequireAll(value) } /> + +
+ ) + }) } +
); } diff --git a/src/views/wired/views/conditions/furni-has-not-furni-on/WiredConditionFurniHasNotFurniOnView.tsx b/src/views/wired/views/conditions/furni-has-not-furni-on/WiredConditionFurniHasNotFurniOnView.tsx index 4ed0a2e1..b9002190 100644 --- a/src/views/wired/views/conditions/furni-has-not-furni-on/WiredConditionFurniHasNotFurniOnView.tsx +++ b/src/views/wired/views/conditions/furni-has-not-furni-on/WiredConditionFurniHasNotFurniOnView.tsx @@ -16,23 +16,25 @@ export const WiredConditionFurniHasNotFurniOnView: FC<{}> = props => const save = useCallback(() => { - setIntParams([requireAll]); + setIntParams([ requireAll ]); }, [ requireAll, setIntParams ]); return ( -
{ LocalizeText('wiredfurni.params.not_requireall') }
- { [0, 1].map(option => - { - return ( -
- setRequireAll(option)} /> - -
- ) - }) } +
+ + { [0, 1].map(value => + { + return ( +
+ setRequireAll(value) } /> + +
+ ) + }) } +
); } diff --git a/src/views/wired/views/conditions/furni-is-of-type/WiredConditionFurniIsOfTypeView.tsx b/src/views/wired/views/conditions/furni-is-of-type/WiredConditionFurniIsOfTypeView.tsx index b28a2782..2f2514a7 100644 --- a/src/views/wired/views/conditions/furni-is-of-type/WiredConditionFurniIsOfTypeView.tsx +++ b/src/views/wired/views/conditions/furni-is-of-type/WiredConditionFurniIsOfTypeView.tsx @@ -4,7 +4,5 @@ import { WiredConditionBaseView } from '../base/WiredConditionBaseView'; export const WiredConditionFurniIsOfTypeView: FC<{}> = props => { - return ( - - ); + return ; } diff --git a/src/views/wired/views/conditions/furni-matches-snapshot/WiredConditionFurniMatchesSnapshotView.tsx b/src/views/wired/views/conditions/furni-matches-snapshot/WiredConditionFurniMatchesSnapshotView.tsx index 37892b21..5fdffee8 100644 --- a/src/views/wired/views/conditions/furni-matches-snapshot/WiredConditionFurniMatchesSnapshotView.tsx +++ b/src/views/wired/views/conditions/furni-matches-snapshot/WiredConditionFurniMatchesSnapshotView.tsx @@ -20,29 +20,31 @@ export const WiredConditionFurniMatchesSnapshotView: FC<{}> = props => const save = useCallback(() => { - setIntParams([stateFlag, directionFlag, positionFlag]); - }, [ directionFlag, positionFlag, setIntParams, stateFlag ]); + setIntParams([ stateFlag, directionFlag, positionFlag ]); + }, [ directionFlag, positionFlag, stateFlag, setIntParams ]); return ( -
{ LocalizeText('wiredfurni.params.conditions') }
-
- setStateFlag(e.target.checked ? 1 : 0)} /> - -
-
- setDirectionFlag(e.target.checked ? 1 : 0)} /> - -
-
- setPositionFlag(e.target.checked ? 1 : 0)} /> - +
+ +
+ setStateFlag(event.target.checked ? 1 : 0) } /> + +
+
+ setDirectionFlag(event.target.checked ? 1 : 0) } /> + +
+
+ setPositionFlag(event.target.checked ? 1 : 0) } /> + +
); diff --git a/src/views/wired/views/conditions/time-elapsed-less/WiredConditionTimeElapsedLessView.tsx b/src/views/wired/views/conditions/time-elapsed-less/WiredConditionTimeElapsedLessView.tsx index 31465e6d..72210acf 100644 --- a/src/views/wired/views/conditions/time-elapsed-less/WiredConditionTimeElapsedLessView.tsx +++ b/src/views/wired/views/conditions/time-elapsed-less/WiredConditionTimeElapsedLessView.tsx @@ -1,6 +1,7 @@ import Slider from 'rc-slider/lib/Slider'; import { FC, useCallback, useEffect, useState } from 'react'; import { LocalizeText } from '../../../../../utils/LocalizeText'; +import { GetWiredTimeLocale } from '../../../common/GetWiredTimeLocale'; import { useWiredContext } from '../../../context/WiredContext'; import { WiredFurniType } from '../../../WiredView.types'; import { WiredConditionBaseView } from '../base/WiredConditionBaseView'; @@ -17,20 +18,19 @@ export const WiredConditionTimeElapsedLessView: FC<{}> = props => const save = useCallback(() => { - setIntParams([time]); + setIntParams([ time ]); }, [ time, setIntParams ]); return ( -
{ LocalizeText('wiredfurni.params.allowbefore', ['seconds'], [time.toString()]) }
- setTime(event) } - /> +
+ + setTime(event) } /> +
); } diff --git a/src/views/wired/views/conditions/time-elapsed-more/WiredConditionTimeElapsedMoreView.tsx b/src/views/wired/views/conditions/time-elapsed-more/WiredConditionTimeElapsedMoreView.tsx index 4e3947d3..a8210ccc 100644 --- a/src/views/wired/views/conditions/time-elapsed-more/WiredConditionTimeElapsedMoreView.tsx +++ b/src/views/wired/views/conditions/time-elapsed-more/WiredConditionTimeElapsedMoreView.tsx @@ -1,6 +1,7 @@ import Slider from 'rc-slider/lib/Slider'; import { FC, useCallback, useEffect, useState } from 'react'; import { LocalizeText } from '../../../../../utils/LocalizeText'; +import { GetWiredTimeLocale } from '../../../common/GetWiredTimeLocale'; import { useWiredContext } from '../../../context/WiredContext'; import { WiredFurniType } from '../../../WiredView.types'; import { WiredConditionBaseView } from '../base/WiredConditionBaseView'; @@ -17,20 +18,19 @@ export const WiredConditionTimeElapsedMoreView: FC<{}> = props => const save = useCallback(() => { - setIntParams([time]); + setIntParams([ time ]); }, [ time, setIntParams ]); return ( -
{ LocalizeText('wiredfurni.params.allowafter', ['seconds'], [time.toString()]) }
- setTime(event) } - /> +
+ + setTime(event) } /> +
); } diff --git a/src/views/wired/views/conditions/user-count-in-room/WiredConditionUserCountInRoomView.tsx b/src/views/wired/views/conditions/user-count-in-room/WiredConditionUserCountInRoomView.tsx index 5e00ff4f..aa07267b 100644 --- a/src/views/wired/views/conditions/user-count-in-room/WiredConditionUserCountInRoomView.tsx +++ b/src/views/wired/views/conditions/user-count-in-room/WiredConditionUserCountInRoomView.tsx @@ -18,34 +18,36 @@ export const WiredConditionUserCountInRoomView: FC<{}> = props => setMin(trigger.intData[0]); setMax(trigger.intData[1]); } + else + { + setMin(1); + setMax(1); + } }, [ trigger ]); const save = useCallback(() => { - setIntParams([min, max]); + setIntParams([ min, max ]); }, [ min, max, setIntParams ]); return ( -
{ LocalizeText('wiredfurni.params.usercountmin', ['value'], [min.toString()]) }
- setMin(event) } - /> -
-
{ LocalizeText('wiredfurni.params.usercountmax', ['value'], [max.toString()]) }
- setMax(event) } - /> +
+ + setMin(event) } /> +
+
+ + setMax(event) } /> +
); }