Skip to content

Commit

Permalink
Improve inspect hover UI (#879)
Browse files Browse the repository at this point in the history
Fixes #868
- #868

It solves all the block within blocks and all kind of controls that are
not required which creates gaps.
I use a simple table, so the width is dynamic but it is always aligned
for all the properties and the features.

![image](https://github.com/maplibre/maputnik/assets/3269297/75138b00-ec7b-4e8d-b51b-f8ff6abcd5cb)

Vary basic stuff.
There's still the layer popup, which I'm not sure I know what it is and
might need to be fixed as well.
CC: @zstadler
  • Loading branch information
HarelM authored Feb 21, 2024
1 parent 079c5f6 commit 3727f5d
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 24 deletions.
43 changes: 19 additions & 24 deletions src/components/MapMaplibreGlFeaturePropertyPopup.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
import React from 'react'
import Block from './Block'
import FieldString from './FieldString'

export type InspectFeature = {
id: string
Expand All @@ -21,30 +19,25 @@ function displayValue(value: string | number | Date | object) {
return value;
}

function renderProperties(feature: InspectFeature) {
return Object.keys(feature.properties).map(propertyName => {
const property = feature.properties[propertyName]
return <Block key={propertyName} label={propertyName}>
<FieldString value={displayValue(property)} style={{backgroundColor: 'transparent'}}/>
</Block>
})
}

function renderFeatureId(feature: InspectFeature) {
return <Block key={"feature-id"} label={"feature_id"}>
<FieldString value={displayValue(feature.id)} style={{backgroundColor: 'transparent'}} />
</Block>
function renderKeyValueTableRow(key: string, value: string) {
return <tr key={key}>
<td className="maputnik-popup-table-cell">{key}</td>
<td className="maputnik-popup-table-cell">{value}</td>
</tr>
}

function renderFeature(feature: InspectFeature, idx: number) {
return <div key={`${feature.sourceLayer}-${idx}`}>
<div className="maputnik-popup-layer-id">{feature.layer['source']}: {feature.layer['source-layer']}{feature.inspectModeCounter && <span> × {feature.inspectModeCounter}</span>}</div>
<Block key={"property-type"} label={"$type"}>
<FieldString value={feature.geometry.type} style={{backgroundColor: 'transparent'}} />
</Block>
{renderFeatureId(feature)}
{renderProperties(feature)}
</div>
return <>
<tr key={`${feature.sourceLayer}-${idx}`}>
<td colSpan={2} className="maputnik-popup-layer-id">{feature.layer['source']}: {feature.layer['source-layer']}{feature.inspectModeCounter && <span> × {feature.inspectModeCounter}</span>}</td>
</tr>
{renderKeyValueTableRow("$type", feature.geometry.type)}
{renderKeyValueTableRow("Feature ID", displayValue(feature.id))}
{Object.keys(feature.properties).map(propertyName => {
const property = feature.properties[propertyName];
return renderKeyValueTableRow(propertyName, displayValue(property))
})}
</>
}

function removeDuplicatedFeatures(features: InspectFeature[]) {
Expand Down Expand Up @@ -78,7 +71,9 @@ class FeaturePropertyPopup extends React.Component<FeaturePropertyPopupProps> {
render() {
const features = removeDuplicatedFeatures(this.props.features)
return <div className="maputnik-feature-property-popup">
{features.map(renderFeature)}
<table className="maputnik-popup-table">
{features.map(renderFeature)}
</table>
</div>
}
}
Expand Down
9 changes: 9 additions & 0 deletions src/styles/_popup.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,12 @@
margin-top: $margin-2;
}
}

.maputnik-popup-table {
width: 100%;
}

.maputnik-popup-table-cell {
color: $color-lowgray;
padding-left: $margin-2;
}

0 comments on commit 3727f5d

Please # to comment.