Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 52 additions & 0 deletions src/client/grid/building_dialog.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,55 @@
flex-direction: column;
align-content: center;
}

.sidePanel {
position: fixed;
bottom: 0;
left: 0;
right: 0;
height: 300px;
background: white;
box-shadow: 0 -3px 12px rgba(0, 0, 0, 0.25);
display: flex;
flex-direction: column;
z-index: 1000;
}

.sidePanelHeader {
display: flex;
justify-content: space-between;
align-items: center;
padding: 8px 14px;
border-bottom: 1px solid #ddd;
background: #f4f4f4;
font-size: 1.1em;
font-weight: bold;
flex-shrink: 0;
}

.sidePanelContent {
flex: 1;
overflow-x: auto;
overflow-y: hidden;
padding: 10px 12px;
display: flex;
flex-direction: column;
}

.sidePanelContent .buildingDialogContainer {
flex-wrap: nowrap;
}

.sidePanelClose {
background: none;
border: none;
font-size: 1.2em;
cursor: pointer;
padding: 2px 6px;
line-height: 1;
}

.sidePanelClose:hover {
background: #e0e0e0;
border-radius: 4px;
}
140 changes: 94 additions & 46 deletions src/client/grid/building_dialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ import {
buildingDialogContainer,
buildingOption,
dialogContent,
sidePanel,
sidePanelClose,
sidePanelContent,
sidePanelHeader,
} from "./building_dialog.module.css";
import { ClickTarget } from "./click_target";
import { HexGrid } from "./hex_grid";
Expand All @@ -58,6 +62,8 @@ interface BuildingProps {
coordinates?: Coordinates;
}

const SIDE_PANEL_KEY = "buildingDialogSidePanel";

export function BuildingDialog({
coordinates,
settings,
Expand All @@ -73,6 +79,9 @@ export function BuildingDialog({
const availableCities = useInjectedState(AVAILABLE_CITIES);
const grid = useInjected(GridHelper);
const [showReasons, setShowReasons] = useState(false);
const [useSidePanel, setUseSidePanel] = useState(
() => localStorage.getItem(SIDE_PANEL_KEY) === "true",
);
const [direction, rotate] = useReducer(
(prev: Direction, _: object) => rotateDirectionClockwise(prev),
Direction.TOP,
Expand Down Expand Up @@ -101,6 +110,14 @@ export function BuildingDialog({
[space, emitUrbanize],
);

const toggleMode = useCallback(() => {
setUseSidePanel((prev) => {
const next = !prev;
localStorage.setItem(SIDE_PANEL_KEY, String(next));
return next;
});
}, []);

const eligibleCities: number[] = [];
availableCities.forEach((_, idx) => {
if (canUrbanizeSpace(urbanizeAction, coordinates, idx)) {
Expand All @@ -121,57 +138,88 @@ export function BuildingDialog({
}
}, [coordinates, hasBuildingOptions, cancelBuild]);

return (
const innerContent = (
<>
<Modal closeIcon open={isOpen} onClose={cancelBuild}>
<ModalHeader>Select a tile to place</ModalHeader>
<ModalContent className={dialogContent}>
<p>
<Checkbox
label="Show failure reasons"
checked={showReasons}
onChange={(e, data) => setShowReasons(!!data.checked)}
<p
style={{
display: "flex",
justifyContent: "space-between",
alignItems: "center",
}}
>
<Checkbox
label="Show failure reasons"
checked={showReasons}
onChange={(_e, data) => setShowReasons(!!data.checked)}
/>
{!useSidePanel && (
<Button size="small" onClick={toggleMode}>
Dock
</Button>
)}
</p>
{showReasons && (
<Button primary onClick={rotate}>
Rotate
</Button>
)}
<div className={buildingDialogContainer} data-building-options>
{canUrbanize &&
eligibleCities.map((cityIdx) => (
<div key={cityIdx} className={buildingOption}>
<ModifiedSpace
space={space!}
settings={settings}
asCity={availableCities[cityIdx]}
onClick={() => selectAvailableCity(cityIdx)}
/>
</div>
))}
{eligible.map((build, index) => (
<div
key={index}
className={buildingOption}
data-tile-type={build.tile.tileType}
data-orientation={build.tile.orientation}
>
<ModifiedSpace
space={space!}
settings={settings}
tile={build.tile}
onClick={() => build.reason == null && onSelect(build.action)}
/>
</p>
{showReasons && (
<Button primary onClick={rotate}>
Rotate
</Button>
)}
<div className={buildingDialogContainer} data-building-options>
{canUrbanize &&
eligibleCities.map((cityIdx) => (
<div key={cityIdx} className={buildingOption}>
<ModifiedSpace
space={space!}
settings={settings}
asCity={availableCities[cityIdx]}
onClick={() => selectAvailableCity(cityIdx)}
/>
</div>
))}
{eligible.map((build, index) => (
<div
key={index}
className={buildingOption}
data-tile-type={build.tile.tileType}
data-orientation={build.tile.orientation}
>
<ModifiedSpace
space={space!}
settings={settings}
tile={build.tile}
onClick={() => build.reason == null && onSelect(build.action)}
/>
<div style={{ textAlign: "center" }}>${build.cost}</div>
{build.reason}
</div>
))}
<div style={{ textAlign: "center" }}>${build.cost}</div>
{build.reason}
</div>
</ModalContent>
</Modal>
))}
</div>
</>
);

if (useSidePanel) {
if (!isOpen) return null;
return (
<div className={sidePanel}>
<div className={sidePanelHeader}>
<Button size="small" onClick={toggleMode}>
Float
</Button>
<span>Select a tile to place</span>
<button className={sidePanelClose} onClick={cancelBuild}>
</button>
</div>
<div className={sidePanelContent}>{innerContent}</div>
</div>
);
}

return (
<Modal closeIcon open={isOpen} onClose={cancelBuild}>
<ModalHeader>Select a tile to place</ModalHeader>
<ModalContent className={dialogContent}>{innerContent}</ModalContent>
</Modal>
);
}

interface PlaceDialogProps {
Expand Down
2 changes: 1 addition & 1 deletion src/client/grid/hex_grid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,7 @@ export function HexGrid({
if (!deepEquals(newViewBox, internalViewBox)) {
setViewBox(newViewBox);
}
}, [ref, internalViewBox]);
}, [ref, spaces, internalViewBox]);

const viewBox = useMemo(
() => ({
Expand Down
Loading