mirror of
https://github.com/Crosstalk-Solutions/project-nomad.git
synced 2026-05-31 00:26:49 +02:00
c46a673812
Resolved 2 conflicts. PR #813 was based on dev (pre-#786/#802 merges) so it re-introduced overlapping changes: ScaleUnitToggle.tsx: - PR #813 used inline `cursor: 'pointer'`. Kept HEAD's `cursor-pointer` Tailwind class to match codebase convention. Functionally identical. MapComponent.tsx: - Took PR #813's full file as the base (it includes #786 + #802 work plus #813's new MapCommand prop, getMapLocationParams URL helper, targetIndicator state, fly-to/marker command useEffect, handleMapLoad). - Preserved one HEAD-only addition: `.maplibregl-popup` selector inclusion in both `target?.closest()` calls (handleMouseMove + onMouseMoveCapture). PR #813 takes a different approach (passing `onMouseEnter={hideCoordinates}` as a prop to ViewMapMarkerPopup and MapMarkerFormPopup), but adding the popup selector is belt-and-suspenders coverage and harmless. |
||
|---|---|---|
| .. | ||
| app | ||
| bin | ||
| commands | ||
| config | ||
| constants | ||
| database | ||
| docs | ||
| inertia | ||
| providers | ||
| public | ||
| resources/views | ||
| start | ||
| tests | ||
| types | ||
| util | ||
| views | ||
| .editorconfig | ||
| .env.example | ||
| ace.js | ||
| adonisrc.ts | ||
| eslint.config.js | ||
| package-lock.json | ||
| package.json | ||
| tailwind.config.ts | ||
| tsconfig.json | ||
| vite.config.ts | ||