Implement zone data management and dropdown functionality in Outline component
This commit is contained in:
@@ -1,23 +1,62 @@
|
|||||||
import React, { useState } from "react";
|
import React, { useState, useEffect } from "react";
|
||||||
import Search from "../../ui/inputs/Search";
|
import Search from "../../ui/inputs/Search";
|
||||||
import DropDownList from "../../ui/list/DropDownList";
|
import DropDownList from "../../ui/list/DropDownList";
|
||||||
|
import { useSceneContext } from "../../../modules/scene/sceneContext";
|
||||||
|
import { isPointInsidePolygon } from "../../../functions/isPointInsidePolygon";
|
||||||
|
|
||||||
|
interface ZoneData {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
assets: { id: string; name: string; position?: []; rotation?: {} }[];
|
||||||
|
}
|
||||||
|
|
||||||
const Outline: React.FC = () => {
|
const Outline: React.FC = () => {
|
||||||
const [searchValue, setSearchValue] = useState<string>("");
|
const [searchValue, setSearchValue] = useState<string>("");
|
||||||
|
const [zoneDataList, setZoneDataList] = useState<ZoneData[]>([]);
|
||||||
|
const [buildingsList, setBuildingsList] = useState<{ id: string; name: string }[]>([]);
|
||||||
|
const [isLayersOpen, setIsLayersOpen] = useState(true);
|
||||||
|
const [isBuildingsOpen, setIsBuildingsOpen] = useState(false);
|
||||||
|
const [isZonesOpen, setIsZonesOpen] = useState(false);
|
||||||
|
const { assetStore, zoneStore } = useSceneContext();
|
||||||
|
const { assets } = assetStore();
|
||||||
|
const { zones } = zoneStore();
|
||||||
|
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const updatedZoneList: ZoneData[] = zones?.map((zone: any) => {
|
||||||
|
const polygon2D = zone.points.map((p: [number, number, number]) => [p[0], p[2],]);
|
||||||
|
|
||||||
|
const assetsInZone = assets.filter((item: any) => {
|
||||||
|
const [x, , z] = item.position;
|
||||||
|
return isPointInsidePolygon([x, z], polygon2D as [number, number][]);
|
||||||
|
})
|
||||||
|
.map((item: any) => ({
|
||||||
|
id: item.modelUuid,
|
||||||
|
name: item.modelName,
|
||||||
|
position: item.position,
|
||||||
|
rotation: item.rotation,
|
||||||
|
}));
|
||||||
|
|
||||||
|
return {
|
||||||
|
id: zone.zoneUuid,
|
||||||
|
name: zone.zoneName,
|
||||||
|
assets: assetsInZone,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
setZoneDataList(updatedZoneList);
|
||||||
|
}, [zones, assets]);
|
||||||
|
|
||||||
const handleSearchChange = (value: string) => {
|
const handleSearchChange = (value: string) => {
|
||||||
setSearchValue(value);
|
setSearchValue(value);
|
||||||
// console.log(value); // Log the search value if needed
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const dropdownItems = [
|
const dropdownItems = [{ id: "1", name: "Ground Floor" }];
|
||||||
{ id: "1", name: "Ground Floor", active: true },
|
|
||||||
// { id: "2", name: "Floor 1" },
|
|
||||||
]; // Example dropdown items
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="outline-container">
|
<div className="outline-container">
|
||||||
<Search onChange={handleSearchChange} />
|
<Search onChange={handleSearchChange} />
|
||||||
|
|
||||||
{searchValue ? (
|
{searchValue ? (
|
||||||
<div className="searched-content">
|
<div className="searched-content">
|
||||||
<p>Results for "{searchValue}"</p>
|
<p>Results for "{searchValue}"</p>
|
||||||
@@ -28,7 +67,8 @@ const Outline: React.FC = () => {
|
|||||||
<DropDownList
|
<DropDownList
|
||||||
value="Layers"
|
value="Layers"
|
||||||
items={dropdownItems}
|
items={dropdownItems}
|
||||||
defaultOpen={true}
|
isOpen={isLayersOpen}
|
||||||
|
onToggle={() => setIsLayersOpen((prev) => !prev)}
|
||||||
showKebabMenu={false}
|
showKebabMenu={false}
|
||||||
showFocusIcon={true}
|
showFocusIcon={true}
|
||||||
remove
|
remove
|
||||||
@@ -36,10 +76,18 @@ const Outline: React.FC = () => {
|
|||||||
</section>
|
</section>
|
||||||
<section className="outline-section overflow">
|
<section className="outline-section overflow">
|
||||||
<DropDownList
|
<DropDownList
|
||||||
value="Scene"
|
value="Buildings"
|
||||||
items={dropdownItems}
|
items={buildingsList}
|
||||||
defaultOpen={true}
|
isOpen={isBuildingsOpen}
|
||||||
listType="outline"
|
onToggle={() => setIsBuildingsOpen((prev) => !prev)}
|
||||||
|
showKebabMenu={false}
|
||||||
|
showAddIcon={false}
|
||||||
|
/>
|
||||||
|
<DropDownList
|
||||||
|
value="Zones"
|
||||||
|
items={zoneDataList}
|
||||||
|
isOpen={isZonesOpen}
|
||||||
|
onToggle={() => setIsZonesOpen((prev) => !prev)}
|
||||||
showKebabMenu={false}
|
showKebabMenu={false}
|
||||||
showAddIcon={false}
|
showAddIcon={false}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -1,30 +1,18 @@
|
|||||||
import React, { useEffect, useState } from "react";
|
import React from "react";
|
||||||
import List from "./List";
|
import List from "./List";
|
||||||
import { AddIcon, ArrowIcon, FocusIcon } from "../../icons/ExportCommonIcons";
|
import { AddIcon, ArrowIcon, FocusIcon } from "../../icons/ExportCommonIcons";
|
||||||
import KebabMenuListMultiSelect from "./KebebMenuListMultiSelect";
|
import KebabMenuListMultiSelect from "./KebebMenuListMultiSelect";
|
||||||
import { useSceneContext } from "../../../modules/scene/sceneContext";
|
|
||||||
|
|
||||||
interface DropDownListProps {
|
interface DropDownListProps {
|
||||||
value?: string; // Value to display in the DropDownList
|
value?: string;
|
||||||
items?: { id: string; name: string }[]; // Items to display in the dropdown list
|
items?: { id: string; name: string }[];
|
||||||
showFocusIcon?: boolean; // Determines if the FocusIcon should be displayed
|
showFocusIcon?: boolean;
|
||||||
showAddIcon?: boolean; // Determines if the AddIcon should be displayed
|
showAddIcon?: boolean;
|
||||||
showKebabMenu?: boolean; // Determines if the KebabMenuList should be displayed
|
showKebabMenu?: boolean;
|
||||||
kebabMenuItems?: { id: string; name: string }[]; // Items for the KebabMenuList
|
kebabMenuItems?: { id: string; name: string }[];
|
||||||
defaultOpen?: boolean; // Determines if the dropdown list should be open by default
|
|
||||||
listType?: string; // Type of list to display
|
|
||||||
remove?: boolean;
|
remove?: boolean;
|
||||||
}
|
isOpen: boolean;
|
||||||
|
onToggle: () => void;
|
||||||
interface Zone {
|
|
||||||
zoneUuid: string;
|
|
||||||
zoneName: string;
|
|
||||||
points: [number, number, number][]; // polygon vertices
|
|
||||||
}
|
|
||||||
interface ZoneData {
|
|
||||||
id: string;
|
|
||||||
name: string;
|
|
||||||
assets: { id: string; name: string; position?: []; rotation?: {} }[];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const DropDownList: React.FC<DropDownListProps> = ({
|
const DropDownList: React.FC<DropDownListProps> = ({
|
||||||
@@ -38,76 +26,13 @@ const DropDownList: React.FC<DropDownListProps> = ({
|
|||||||
{ id: "Paths", name: "Paths" },
|
{ id: "Paths", name: "Paths" },
|
||||||
{ id: "Zones", name: "Zones" },
|
{ id: "Zones", name: "Zones" },
|
||||||
],
|
],
|
||||||
defaultOpen = false,
|
|
||||||
listType = "default",
|
|
||||||
remove,
|
remove,
|
||||||
|
isOpen,
|
||||||
|
onToggle,
|
||||||
}) => {
|
}) => {
|
||||||
const [isOpen, setIsOpen] = useState<boolean>(defaultOpen);
|
|
||||||
|
|
||||||
const handleToggle = () => {
|
|
||||||
setIsOpen((prev) => !prev); // Toggle the state
|
|
||||||
};
|
|
||||||
|
|
||||||
const [zoneDataList, setZoneDataList] = useState<ZoneData[]>([]);
|
|
||||||
const { assetStore, zoneStore } = useSceneContext();
|
|
||||||
const { assets } = assetStore();
|
|
||||||
const { zones } = zoneStore()
|
|
||||||
|
|
||||||
|
|
||||||
const isPointInsidePolygon = (
|
|
||||||
point: [number, number],
|
|
||||||
polygon: [number, number][]
|
|
||||||
) => {
|
|
||||||
let inside = false;
|
|
||||||
for (let i = 0, j = polygon.length - 1; i < polygon.length; j = i++) {
|
|
||||||
const xi = polygon[i][0],
|
|
||||||
zi = polygon[i][1];
|
|
||||||
const xj = polygon[j][0],
|
|
||||||
zj = polygon[j][1];
|
|
||||||
|
|
||||||
const intersect =
|
|
||||||
// eslint-disable-next-line no-mixed-operators
|
|
||||||
zi > point[1] !== zj > point[1] &&
|
|
||||||
point[0] < ((xj - xi) * (point[1] - zi)) / (zj - zi + 0.000001) + xi;
|
|
||||||
|
|
||||||
if (intersect) inside = !inside;
|
|
||||||
}
|
|
||||||
return inside;
|
|
||||||
};
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const updatedZoneList: ZoneData[] = zones?.map((zone: any) => {
|
|
||||||
const polygon2D = zone.points.map((p: [number, number, number]) => [
|
|
||||||
p[0],
|
|
||||||
p[2],
|
|
||||||
]);
|
|
||||||
|
|
||||||
const assetsInZone = assets
|
|
||||||
.filter((item: any) => {
|
|
||||||
const [x, , z] = item.position;
|
|
||||||
return isPointInsidePolygon([x, z], polygon2D as [number, number][]);
|
|
||||||
})
|
|
||||||
.map((item: any) => ({
|
|
||||||
id: item.modelUuid,
|
|
||||||
name: item.modelName,
|
|
||||||
position: item.position,
|
|
||||||
rotation: item.rotation,
|
|
||||||
}));
|
|
||||||
|
|
||||||
return {
|
|
||||||
id: zone.zoneUuid,
|
|
||||||
name: zone.zoneName,
|
|
||||||
assets: assetsInZone,
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
setZoneDataList(updatedZoneList);
|
|
||||||
}, [zones, assets]);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="dropdown-list-container">
|
<div className="dropdown-list-container">
|
||||||
{/* eslint-disable-next-line */}
|
<div className="head" onClick={onToggle}>
|
||||||
<div className="head" onClick={handleToggle}>
|
|
||||||
<div className="value">{value}</div>
|
<div className="value">{value}</div>
|
||||||
<div className="options">
|
<div className="options">
|
||||||
{showFocusIcon && (
|
{showFocusIcon && (
|
||||||
@@ -130,31 +55,15 @@ const DropDownList: React.FC<DropDownListProps> = ({
|
|||||||
title="collapse-btn"
|
title="collapse-btn"
|
||||||
className="collapse-icon option"
|
className="collapse-icon option"
|
||||||
style={{ transform: isOpen ? "rotate(0deg)" : "rotate(-90deg)" }}
|
style={{ transform: isOpen ? "rotate(0deg)" : "rotate(-90deg)" }}
|
||||||
// onClick={handleToggle}
|
|
||||||
>
|
>
|
||||||
<ArrowIcon />
|
<ArrowIcon />
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{isOpen && (
|
{isOpen && (
|
||||||
<div className="lists-container">
|
<div className="lists-container">
|
||||||
{listType === "default" && <List items={items} remove={remove} />}
|
<List items={items} remove={remove} />
|
||||||
{listType === "outline" && (
|
|
||||||
<>
|
|
||||||
<DropDownList
|
|
||||||
value="Buildings"
|
|
||||||
showKebabMenu={false}
|
|
||||||
showAddIcon={false}
|
|
||||||
// items={zoneDataList}
|
|
||||||
/>
|
|
||||||
<DropDownList
|
|
||||||
value="Zones"
|
|
||||||
showKebabMenu={false}
|
|
||||||
showAddIcon={false}
|
|
||||||
items={zoneDataList}
|
|
||||||
/>
|
|
||||||
</>
|
|
||||||
)}
|
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
20
app/src/functions/isPointInsidePolygon.ts
Normal file
20
app/src/functions/isPointInsidePolygon.ts
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
export const isPointInsidePolygon = (
|
||||||
|
point: [number, number],
|
||||||
|
polygon: [number, number][]
|
||||||
|
) => {
|
||||||
|
let inside = false;
|
||||||
|
for (let i = 0, j = polygon.length - 1; i < polygon.length; j = i++) {
|
||||||
|
const xi = polygon[i][0],
|
||||||
|
zi = polygon[i][1];
|
||||||
|
const xj = polygon[j][0],
|
||||||
|
zj = polygon[j][1];
|
||||||
|
|
||||||
|
const intersect =
|
||||||
|
// eslint-disable-next-line no-mixed-operators
|
||||||
|
zi > point[1] !== zj > point[1] &&
|
||||||
|
point[0] < ((xj - xi) * (point[1] - zi)) / (zj - zi + 0.000001) + xi;
|
||||||
|
|
||||||
|
if (intersect) inside = !inside;
|
||||||
|
}
|
||||||
|
return inside;
|
||||||
|
};
|
||||||
Reference in New Issue
Block a user