@@ -258,14 +253,14 @@ function VehicleMechanics() {
{activeOption === "travel" && (
+
+
+
+
)}
@@ -289,4 +321,4 @@ function VehicleMechanics() {
);
}
-export default VehicleMechanics;
+export default VehicleMechanics;
\ No newline at end of file
diff --git a/app/src/components/layout/sidebarRight/properties/eventProperties/trigger/Trigger.tsx b/app/src/components/layout/sidebarRight/properties/eventProperties/trigger/Trigger.tsx
index eb4b0ac..0697c7b 100644
--- a/app/src/components/layout/sidebarRight/properties/eventProperties/trigger/Trigger.tsx
+++ b/app/src/components/layout/sidebarRight/properties/eventProperties/trigger/Trigger.tsx
@@ -65,8 +65,11 @@ const Trigger = ({ selectedPointData, type }: TriggerProps) => {
const action = getActionByUuid(selectedProduct.productUuid, currentAction);
const actionTriggers = action?.triggers || [];
setTriggers(actionTriggers);
+ if (actionTriggers.length === 0) {
+ setSelectedTrigger(undefined);
+ }
setSelectedTrigger(actionTriggers[0]);
- }, [currentAction, selectedProduct]);
+ }, [currentAction, selectedProduct, selectedTrigger, selectedPointData]);
const triggeredModel = useMemo(() => {
if (!selectedProduct || !selectedTrigger?.triggeredAsset?.triggeredModel?.modelUuid)
diff --git a/app/src/components/ui/Tools.tsx b/app/src/components/ui/Tools.tsx
index 1aeb646..e834f28 100644
--- a/app/src/components/ui/Tools.tsx
+++ b/app/src/components/ui/Tools.tsx
@@ -22,7 +22,6 @@ import { useSelectedZoneStore } from "../../store/visualization/useZoneStore";
import {
useActiveTool,
useAddAction,
- useRefTextUpdate,
useSelectedWallItem,
useSocketStore,
useToggleView,
@@ -75,7 +74,6 @@ const Tools: React.FC = () => {
const { setActiveSubTool, activeSubTool } = useActiveSubTool();
const { setSelectedWallItem } = useSelectedWallItem();
- const { setRefTextUpdate } = useRefTextUpdate();
const { setToggleUI } = useToggleStore();
const { setToggleView, toggleView } = useToggleView();
@@ -131,7 +129,6 @@ const Tools: React.FC = () => {
const resetTools = () => {
setToolMode(null);
setAddAction(null);
- setRefTextUpdate((prev) => prev - 1);
};
const updateToolBehavior = (tool: string, is2D: boolean) => {
@@ -406,7 +403,6 @@ const useStoreHooks = () => {
...useActiveTool(),
...useToolMode(),
...useAddAction(),
- ...useRefTextUpdate(),
};
};
diff --git a/app/src/components/ui/inputs/InputWithDropDown.tsx b/app/src/components/ui/inputs/InputWithDropDown.tsx
index 61fbaf4..486faea 100644
--- a/app/src/components/ui/inputs/InputWithDropDown.tsx
+++ b/app/src/components/ui/inputs/InputWithDropDown.tsx
@@ -2,93 +2,89 @@ import React, { useState } from "react";
import RenameInput from "./RenameInput";
type InputWithDropDownProps = {
- label: string;
- value: string;
- min?: number;
- max?: number;
- step?: number;
- defaultValue?: string;
- disabled?: boolean;
- options?: string[]; // Array of dropdown options
- activeOption?: string; // The currently active dropdown option
- onClick?: () => void;
- onChange: (newValue: string) => void;
- editableLabel?: boolean;
- placeholder?: string; // New placeholder prop
+ label: string;
+ value: string;
+ min?: number;
+ max?: number;
+ step?: number;
+ defaultValue?: string;
+ disabled?: boolean;
+ options?: string[];
+ activeOption?: string;
+ onClick?: () => void;
+ onChange: (newValue: string) => void;
+ editableLabel?: boolean;
+ placeholder?: string;
};
const InputWithDropDown: React.FC
= ({
- label,
- value,
- min,
- max,
- step,
- defaultValue,
- disabled = false,
- options,
- activeOption,
- onClick,
- onChange,
- editableLabel = false,
- placeholder = "Inherit", // Default empty placeholder
+ label,
+ value,
+ min,
+ max,
+ step,
+ defaultValue,
+ disabled = false,
+ options,
+ activeOption,
+ onClick,
+ onChange,
+ editableLabel = false,
+ placeholder = "Inherit",
}) => {
- const separatedWords = label
- .split(/(?=[A-Z])/)
- .map((word) => word.trim())
- .toString();
+ const [openDropdown, setOpenDropdown] = useState(false);
- const [openDropdown, setOpenDropdown] = useState(false);
+ const separatedWords = label
+ .split(/(?=[A-Z])/)
+ .map((word) => word.trim())
+ .join(" ");
- return (
-
- {editableLabel ? (
-
- ) : (
-
- )}
-
-
{
- onChange(e.target.value);
- }}
- placeholder={placeholder} // Added placeholder prop
- />
-
- {activeOption && (
-
{
- setOpenDropdown(true);
- }}
- >
-
{activeOption}
- {options && openDropdown && (
-
- {options.map((option, index) => (
-
- {option}
-
- ))}
-
+ return (
+
+ {editableLabel ? (
+
+ ) : (
+
)}
-
- )}
-
-
- );
+
+
+
onChange(e.target.value)}
+ placeholder={placeholder}
+ />
+
+ {activeOption && (
+
setOpenDropdown((prev) => !prev)}
+ >
+
{activeOption}
+ {options && openDropdown && (
+
+ {options.map((option, index) => (
+
+ {option}
+
+ ))}
+
+ )}
+
+ )}
+
+
+
+
+
+
+
+
+
+
+
+
- return (
-
-
-
-
-
-
-
-
-
-
-
+
-
-
- {selectedUser && }
- {isLogListVisible && (
-
-
-
- )}
-
- );
+ {selectedUser &&
}
+ {isLogListVisible && (
+
+
+
+ )}
+